Merge branch 'release/2.2.0'

Author: zero2one

CHANGELOG.md

@@ -2,11 +2,28 @@
 
 All Notable changes to the **Quality Assurance - PHP** package.
 
-## [Unreleased]
+## [2.2.0]
+
+### Added
+
+- Add phpunit 10, 11 and 12 support.
+- Add phpstan 2.x support.
+- Add systemsdk/phpcpd.
+
+### Updated
+
+- Updated grumphp config.
+
+### Removed
+
+- Removed sebiastian/phpcpd.
+
+## [2.1.0]
 
 ### Added
 
 - Add Unused use statement rule to PHPCS checks.
+- 'Revert' is now a valid start of a commit message.
 
 ## [2.0.0]
 
@@ -52,6 +69,7 @@ Initial setup of the qa-php package:
 - Add support for PHP 7.3+
 - Add support for PHP 8.0+
 
+[2.2.0]: https://github.com/district09/php_package_qa-php/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/district09/php_package_qa-php/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/district09/php_package_qa-php/compare/1.1.0...2.0.0
 [1.1.0]: https://github.com/district09/php_package_qa-php/compare/1.0.1...1.1.0

composer.json

@@ -51,12 +51,12 @@
         "phpro/grumphp-shim": "^2.0",
         "phpspec/prophecy": "^1.10",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan": "^1.0 || ^2.0",
         "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpunit/phpunit": "^9",
-        "sebastian/phpcpd": "^6.0",
+        "phpunit/phpunit": "^9 || ^10 || ^11 || ^12",
         "slevomat/coding-standard": "^8.15",
         "squizlabs/php_codesniffer": "^3.5.6",
-        "symfony/filesystem": "^5.2|^6.0|^7.0"
+        "symfony/filesystem": "^5.2|^6.0|^7.0",
+        "systemsdk/phpcpd": "^7.0 || ^8.0"
     }
 }

configs/grumphp.yml

@@ -51,11 +51,12 @@ grumphp:
                 - "#^main|^master|^develop|^\\d+(\\.\\d+)?\\.x|^(release|hotfix)/\\d+\\.\\d+\\.\\d+|^feature/([A-Z][A-Z\\d]+-\\d+|[a-z][a-z\\d]*(-[a-z\\d]+)*)$#"
         git_commit_message:
             matchers:
-                - "/^([A-Z][A-Z\\d]+-\\d+(, [A-Z][A-Z\\d]+-\\d+)*: )?(Add|Change|Fix|Update|Remove|Refactor|Merge|RELEASE) /"
+                - "/^([A-Z][A-Z\\d]+-\\d+(, [A-Z][A-Z\\d]+-\\d+)*: )?(Add|Change|Fix|Update|Remove|Refactor|Revert|Merge|RELEASE) /"
             case_insensitive: false
         phpcpd:
             exclude:
                 - build
+                - var
                 - examples
                 - tests
                 - vendor
@@ -79,8 +80,6 @@ grumphp:
                 - inc
                 - js
                 - php
-                - twig
-                - yml
         phpmd:
             ruleset:
                 - phpmd.qa-php.xml

src/GrumPHP/EventListener/TaskEventListener.php

@@ -26,6 +26,12 @@ final class TaskEventListener
     private const FILETYPE_YAML = 'yaml';
     private const FILETYPE_NEON = 'neon';
 
+    /**
+     * Blockmode for Neon::encode()
+     * Neon::BLOCK is deprecated, we need to use the `$blockMode` parameter.
+     */
+    private const BLOCK_MODE = true;
+
     /**
      * Mapping of task types and their configuration files.
      *
@@ -102,7 +108,7 @@ public function createTaskConfig(TaskEvent $event): void
 
         // Search for the candidates and merge or copy them.
         $filesystem = new Filesystem();
-        $dataMerged = null;
+        $dataMerged = [];
 
         foreach ($candidates as $env_var => $file) {
             // Ignore if configured to skip or if the file is missing.
@@ -119,13 +125,7 @@ public function createTaskConfig(TaskEvent $event): void
                 return;
             }
 
-            // Merge the data.
-            if ($dataMerged === null) {
-                $dataMerged = $data;
-            } elseif ($data) {
-                $beforeMerged = $dataMerged;
-                $dataMerged = $this->arrayMergeRecursiveDistinct($data, $dataMerged);
-            }
+            $dataMerged = $this->arrayMergeRecursiveDistinct($data, $dataMerged);
         }
 
         // Save the configuration file.
@@ -170,7 +170,7 @@ private function getTaskConfigFileInfo(TaskInterface $task): ?array
      * @return array|false
      *   The configuration data or false if not supported.
      */
-    private function readTaskConfigFile(string $type, string $file)
+    private function readTaskConfigFile(string $type, string $file): array|bool
     {
         switch ($type) {
             case self::FILETYPE_YAML:
@@ -201,7 +201,7 @@ private function writeTaskConfigFile(string $type, string $file, array $data): v
                 break;
 
             case self::FILETYPE_NEON:
-                $rawData = Neon::encode($data, Neon::BLOCK);
+                $rawData = Neon::encode($data, self::BLOCK_MODE);
                 break;
 
             default:
@@ -233,7 +233,7 @@ private function writeTaskConfigFile(string $type, string $file, array $data): v
      */
     private function arrayMergeRecursiveDistinct(array $array1, array $array2): array
     {
-        foreach ($array2 as $key => $value ) {
+        foreach ($array2 as $key => $value) {
             if (is_array($value) && isset($array1[$key]) && is_array($array1[$key])) {
                 $array1[$key] = $this->arrayMergeRecursiveDistinct($array1[$key], $value);
                 continue;