Require PHPMD 2.14+, fix process call, and allow tests to run on 8.1+

phingofficial · Nov 6, 2023 · d2ee9b2 · d2ee9b2
1 parent 29ea57a
commit d2ee9b2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -98,7 +98,7 @@
         "pear/versioncontrol_git": "dev-master",
         "pear/versioncontrol_svn": "^0.7.0",
         "phing/phing-composer-configurator": "dev-master",
-        "phpmd/phpmd": "^2.10",
+        "phpmd/phpmd": "^2.14",
         "phpstan/phpstan": "^0.12.87 || ^1.0",
         "phpunit/phpunit": "^9.5.10",
         "psr/http-message": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Phing/Task/Ext/Analyzer/Phpmd/PHPMDTask.php b/src/Phing/Task/Ext/Analyzer/Phpmd/PHPMDTask.php
@@ -128,7 +128,7 @@ public function setMinimumPriority($minimumPriority)
      *
      * @param string $ruleSetFileNames Comma-separated string of rule-set filenames or identifier.
      */
-    public function setRulesets($ruleSetFileNames)
+    public function setRulesets(string $ruleSetFileNames)
     {
         $this->rulesets = $ruleSetFileNames;
     }
@@ -285,6 +285,17 @@ protected function getFilesToParse()
         return $filesToParse;
     }
 
+    /**
+     * @return \PHPMD\RuleSet[]
+     */
+    protected function getRuleSets(): array
+    {
+        $ruleSetFactory = new RuleSetFactory();
+        $ruleSetFactory->setMinimumPriority($this->minimumPriority);
+        $rulesets = $ruleSetFactory->createRuleSets($this->rulesets);
+        return $rulesets;
+    }
+
     /**
      * Executes PHPMD against PhingFile or a FileSet
      *
@@ -327,9 +338,7 @@ public function main()
             $this->cache = null; // cache not compatible to old version
         }
 
-        // Create a rule set factory
-        $ruleSetFactory = new RuleSetFactory();
-        $ruleSetFactory->setMinimumPriority($this->minimumPriority);
+        $rulesets = $this->getRuleSets();
 
         /**
          * @var PHPMD $phpmd
@@ -346,7 +355,7 @@ public function main()
             $this->log('Processing files...');
 
             $report = new Report();
-            $phpmd->processFiles($inputPath, $this->rulesets, $reportRenderers, $ruleSetFactory, $report);
+            $phpmd->processFiles($inputPath, $this->ignorePatterns, $reportRenderers, $rulesets, $report);
 
             if ($this->cache) {
                 $this->cache->commit();

diff --git a/tests/Phing/Test/Task/Ext/Analyzer/PHPMDTaskTest.php b/tests/Phing/Test/Task/Ext/Analyzer/PHPMDTaskTest.php
@@ -34,9 +34,6 @@ public function setUp(): void
         $this->configureProject(PHING_TEST_BASE . '/etc/tasks/ext/phpmd/build.xml');
     }
 
-    /**
-     * @requires PHP < 8.1
-     */
     public function testReportText(): void
     {
         $this->executeTarget(__FUNCTION__);
@@ -46,9 +43,6 @@ public function testReportText(): void
         unlink(PHING_TEST_BASE . '/etc/tasks/ext/phpmd/phpmd-report.txt');
     }
 
-    /**
-     * @requires PHP < 8.1
-     */
     public function testReportHtml(): void
     {
         $this->executeTarget(__FUNCTION__);
@@ -58,9 +52,6 @@ public function testReportHtml(): void
         unlink(PHING_TEST_BASE . '/etc/tasks/ext/phpmd/phpmd-report.html');
     }
 
-    /**
-     * @requires PHP < 8.1
-     */
     public function testReportXml(): void
     {
         $this->executeTarget(__FUNCTION__);