Merge pull request moodlehq#244 from stronk7/phpmd_bump

Now working with phpmd/phpmd 2.14.0 and up
stronk7 · Sep 28, 2023 · ee2c559 · ee2c559
2 parents 53e5192 + ace4420
commit ee2c559
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
     "sebastian/phpcpd": "^6.0.3",
     "sebastian/version": "^3.0.2",
     "phpunit/php-timer": "^5.0.3",
-    "phpmd/phpmd": "2.13.*",
+    "phpmd/phpmd": "^2.14.0",
     "symfony/dotenv": "^5.4",
     "symfony/filesystem": "^5.4",
     "symfony/finder": "^5.4",

diff --git a/composer.lock b/composer.lock
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -9,6 +9,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 The format of this change log follows the advice given at [Keep a CHANGELOG](http://keepachangelog.com).
 
 ## [Unreleased]
+### Fixed
+- Fixed the `phpcmd` command for compatibility with versions `^2.14.0`.
+
 ## [4.1.6] - 2023-09-28
 ### Changed
 - Updated project dependencies to current [moodle-cs](https://github.com/moodlehq/moodle-cs) and [moodle-local_ci](https://github.com/moodlehq/moodle-local_ci) versions.

diff --git a/src/Command/MessDetectorCommand.php b/src/Command/MessDetectorCommand.php
@@ -51,9 +51,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $ruleSetFactory = new RuleSetFactory();
         $ruleSetFactory->setMinimumPriority(5);
+        $ruleSets = $ruleSetFactory->createRuleSets($rules);
 
         $messDetector = new PHPMD();
-        $messDetector->processFiles(implode(',', $files), $rules, [$renderer], $ruleSetFactory, new Report());
+        $messDetector->processFiles(
+            implode(',', $files),
+            [], // Ignored paths and files are managed by the plugin, so they are not needed here.
+            [$renderer],
+            $ruleSets,
+            new Report(),
+        );
 
         return 0;
     }