Merge pull request #14 from Space48/support_php8.4

Added php8.4 support
Update dependencies
Removed StyleLint (as it don’t have php 8.4 support yet)

Author: stkec

README.md

@@ -151,6 +151,9 @@ CQ_STARTING_COMMIT_DATE='01/01/2021'
 
 -include 'vendor/space48/magento2-code-quality/code-quality.mk'
 ```
+(_If you don`t have 'vendor' under VCS - copy vendor/space48/magento2-code-quality/code-quality.mk file somewhere 
+to your project and link it from there_)
+
 It contains following commands:
 
 - `linters-init` - init linters on local machine

composer.json

@@ -4,18 +4,18 @@
     "description": "Provides rulesets for phpmd, phpcs and eslint that overrides some Magento sniffs and provides some new ones as well",
     "license": "proprietary",
     "require": {
-        "phpro/grumphp": "^1.3",
-        "symfony/dom-crawler": "*",
+        "php": "^8",
+        "phpro/grumphp": "^2",
+        "symfony/dom-crawler": "^7",
         "magento/magento-coding-standard": "*",
         "phpmd/phpmd": "^2",
-        "squizlabs/php_codesniffer": ">=2.9.2 <4.0.0",
-        "space48/grumphp-stylelint-task": "^1.0"
+        "squizlabs/php_codesniffer": "^3"
     },
     "require-dev": {
     },
     "config": {
         "platform": {
-            "php": "7.0.33"
+            "php": "8.4"
         }
     },
     "authors": [

grumphp.yml

@@ -98,10 +98,11 @@ grumphp:
             max_warnings: ~
             no_eslintrc: false
             quiet: false
-        stylelint:
-            bin: node_modules/.bin/stylelint
-            triggered_by: [ css, scss, less ]
-            allowed_paths:
-                - /^app/
-    extensions:
-        - Space48\GrumPHPStylelintTask\Extension
+# Needs PHP 8.4 support
+#        stylelint:
+#            bin: node_modules/.bin/stylelint
+#            triggered_by: [ css, scss, less ]
+#            allowed_paths:
+#                - /^app/
+#    extensions:
+#        - Space48\GrumPHPStylelintTask\Extension

src/Task/PhpMd.php

@@ -2,19 +2,34 @@
 
 namespace Space48\CodeQuality\Task;
 
+use GrumPHP\Task\Config\ConfigOptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * PhpMd task.
  */
 class PhpMd extends \GrumPHP\Task\PhpMd
 {
-    public static function getConfigurableOptions(): OptionsResolver
+    public static function getConfigurableOptions(): ConfigOptionsResolver
     {
-        $resolver = parent::getConfigurableOptions();
-        $resolver->addAllowedValues('report_format', ['xml']);
+        // due to Factory pattern they used we can no longer extend Options after calling parent method
+        // copy from parent, changes are marked with "@added-by-Space48"
+        $resolver = new OptionsResolver();
+        $resolver->setDefaults([
+            'whitelist_patterns' => [],
+            'exclude' => [],
+            'report_format' => 'text',
+            'ruleset' => ['cleancode', 'codesize', 'naming'],
+            'triggered_by' => ['php'],
+        ]);
 
-        return $resolver;
-    }
+        $resolver->addAllowedTypes('whitelist_patterns', ['array']);
+        $resolver->addAllowedTypes('exclude', ['array']);
+        $resolver->addAllowedTypes('report_format', ['string']);
+        $resolver->addAllowedValues('report_format', ['text', 'ansi', 'xml']); // @added-by-Space48: "xml" format
+        $resolver->addAllowedTypes('ruleset', ['array']);
+        $resolver->addAllowedTypes('triggered_by', ['array']);
 
+        return ConfigOptionsResolver::fromOptionsResolver($resolver);
+    }
 }