Merge branch 'release/1.2.3'

CHANGELOG.md

@@ -1,5 +1,18 @@
 # nystudio107/plugindev Change Log
 
+## 1.2.3 - 2024.01.30
+### Added
+* Add `nystudio107/craft-autocomplete` to the `cms_v5/composer.json`
+* Add `nystudio107/craft-closure` to the `cms_v4/composer.json`
+* Add `nystudio107/craft-closure` to the `cms_v5/composer.json`
+
+### Changed
+* Use `phpstan` level `5` by default
+* Add `craftcms/ecs`, `craftcms/phpstan` & `craftcms/rector`
+
+### Fixed
+* Update `ecs.php` to be compatible with the latest `ECSConfig` spec
+
 ## 1.2.2 - 2024.01.22
 ### Added
 * Explicitly set `charset` & `collation` in `config/db.php` and `example.env` rather than depending on defaults

README.md

@@ -163,7 +163,7 @@ You can run the following from terminal in the `cms_v3` or `cms_v4` CMS director
 - `make composer xxx` - runs the `composer` command passed in, e.g. `make composer install` in the php container
 - `make craft xxx` - runs the `craft` [console command](https://craftcms.com/docs/3.x/console-commands.html) passed in, e.g.: `make craft project-config/apply` in the php container
 - `make codecept xxx` - runs the [Codeception](https://codeception.com/) testing framework with the passed in commands, e.g.: `make codecept run -c ./vendor/putyourlightson/craft-blitz` in the php container
-- `make ecs xxx` - runs [Easy Coding Standard](https://github.com/symplify/easy-coding-standard) using the [Craft CMS ECS config](https://github.com/craftcms/ecs), with the passed in path, e.g.: `make ecs check vendor/nystudio107/craft-seomatic/src`. Additional settings are available in the `ecs.php` file
+- `make ecs xxx` - runs [Easy Coding Standard](https://github.com/symplify/easy-coding-standard) using the [Craft CMS ECS config](https://github.com/craftcms/ecs), with the passed in path, e.g.: `make ecs check vendor/nystudio107/craft-seomatic/src`. To automatically fix, add the `--fix` flag, e.g.: `make -- ecs check vendor/nystudio107/craft-seomatic/src --fix`. Additional settings are available in the `ecs.php` file
 - `make mysql` - switches the project to use the MySQL database container; just reload the browser
 - `make phpstan xxx` - runs [PHPStan](https://github.com/phpstan/phpstan) using the [Craft CMS PHPStan config](https://github.com/craftcms/phpstan), with the passed in path, e.g.: `make phpstan analyze vendor/nystudio107/craft-seomatic/src`. Additional settings are available in the `phpstan.neon` file
 - `make postgres` - switches the project to use the Postgres database container; just reload the browser

cms_v3/ecs.php

@@ -1,13 +1,9 @@
 <?php
 
-declare(strict_types=1);
+use craft\ecs\SetList;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
 
-use craft\ecs\SetList as CraftSetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symplify\EasyCodingStandard\ValueObject\Option;
-
-return static function (ContainerConfigurator $containerConfigurator) {
-    $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::PARALLEL, true);
-    $containerConfigurator->import(CraftSetList::CRAFT_CMS_3);
+return static function(ECSConfig $ecsConfig): void {
+    $ecsConfig->parallel();
+    $ecsConfig->sets([SetList::CRAFT_CMS_3]);
 };

cms_v3/phpstan.neon

@@ -2,4 +2,4 @@ includes:
     - vendor/craftcms/phpstan/phpstan.neon
 
 parameters:
-    level: 0
+    level: 5

cms_v4/composer.json

@@ -12,6 +12,7 @@
     "craftcms/digital-products": "^3.0.0",
     "craftcms/redactor": "^3.0.0",
     "craftcms/shopify": "^3.0.0",
+    "nystudio107/craft-closure": "^1.0.0",
     "nystudio107/craft-code-field": "^4.0.0",
     "nystudio107/craft-connect": "^4.0.0",
     "nystudio107/craft-cookies": "^4.0.0",

cms_v4/ecs.php

@@ -1,13 +1,9 @@
 <?php
 
-declare(strict_types=1);
+use craft\ecs\SetList;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
 
-use craft\ecs\SetList as CraftSetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symplify\EasyCodingStandard\ValueObject\Option;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::PARALLEL, true);
-    $containerConfigurator->import(CraftSetList::CRAFT_CMS_4);
+return static function(ECSConfig $ecsConfig): void {
+    $ecsConfig->parallel();
+    $ecsConfig->sets([SetList::CRAFT_CMS_4]);
 };

cms_v4/phpstan.neon

@@ -2,4 +2,4 @@ includes:
     - vendor/craftcms/phpstan/phpstan.neon
 
 parameters:
-    level: 0
+    level: 5

cms_v5/composer.json

@@ -8,6 +8,7 @@
     "craftcms/cms": "^5.0.0-alpha.1",
     "craftcms/ckeditor": "4.0.x-dev",
     "craftcms/redactor": "4.0.x-dev",
+    "nystudio107/craft-closure": "^1.0.1",
     "nystudio107/craft-code-field": "^5.0.0-beta.1",
     "nystudio107/craft-seomatic": "^5.0.0-beta.1",
     "nystudio107/craft-twig-base-templates": "^1.0.0",
@@ -17,7 +18,11 @@
     "yiisoft/yii2-redis": "^2.0.6"
   },
   "require-dev": {
-    "craftcms/generator": "2.0.x-dev"
+    "craftcms/ecs": "dev-main",
+    "craftcms/generator": "2.0.x-dev",
+    "craftcms/phpstan": "dev-main",
+    "craftcms/rector": "dev-main",
+    "nystudio107/craft-autocomplete": "^1.12.0"
   },
   "autoload": {
     "psr-4": {

cms_v5/ecs.php

@@ -1,13 +1,9 @@
 <?php
 
-declare(strict_types=1);
+use craft\ecs\SetList;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
 
-use craft\ecs\SetList as CraftSetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
-use Symplify\EasyCodingStandard\ValueObject\Option;
-
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::PARALLEL, true);
-    $containerConfigurator->import(CraftSetList::CRAFT_CMS_4);
+return static function(ECSConfig $ecsConfig): void {
+    $ecsConfig->parallel();
+    $ecsConfig->sets([SetList::CRAFT_CMS_4]);
 };

cms_v5/phpstan.neon

@@ -2,4 +2,4 @@ includes:
     - vendor/craftcms/phpstan/phpstan.neon
 
 parameters:
-    level: 0
+    level: 5