Merge pull request #905 from plopesc/master

Fix suffix property for PhpCpd v6
phpro · May 12, 2021 · e934e0d · e934e0d
2 parents 244c871 + 943e93d
commit e934e0d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/Task/PhpCpd.php b/src/Task/PhpCpd.php
@@ -60,13 +60,13 @@ public function run(ContextInterface $context): TaskResultInterface
 
         $arguments = $this->processBuilder->createArgumentsForCommand('phpcpd');
         $extensions = array_map(function (string $extension) {
-            return sprintf('*.%s', $extension);
+            return sprintf('.%s', $extension);
         }, $config['triggered_by']);
 
         $arguments->addArgumentArray('--exclude=%s', $config['exclude']);
         $arguments->addRequiredArgument('--min-lines=%u', (string) $config['min_lines']);
         $arguments->addRequiredArgument('--min-tokens=%u', (string) $config['min_tokens']);
-        $arguments->addOptionalCommaSeparatedArgument('--suffix=%s', $extensions);
+        $arguments->addArgumentArray('--suffix=%s', $extensions);
         $arguments->addOptionalArgument('--fuzzy', $config['fuzzy']);
         $arguments->addArgumentArray('%s', $config['directory']);
 

diff --git a/test/Unit/Task/PhpCpdTest.php b/test/Unit/Task/PhpCpdTest.php
@@ -29,7 +29,7 @@ public function provideExternalTaskRuns(): iterable
                 '--exclude=vendor',
                 '--min-lines=5',
                 '--min-tokens=70',
-                '--suffix=*.php',
+                '--suffix=.php',
                 '.',
             ],
         ];
@@ -44,7 +44,7 @@ public function provideExternalTaskRuns(): iterable
                 '--exclude=vendor',
                 '--min-lines=5',
                 '--min-tokens=70',
-                '--suffix=*.php',
+                '--suffix=.php',
                 'folder-1',
                 'folder-2',
             ],
@@ -61,7 +61,7 @@ public function provideExternalTaskRuns(): iterable
                 '--exclude=folder-2',
                 '--min-lines=5',
                 '--min-tokens=70',
-                '--suffix=*.php',
+                '--suffix=.php',
                 '.',
             ],
         ];
@@ -76,7 +76,7 @@ public function provideExternalTaskRuns(): iterable
                 '--exclude=vendor',
                 '--min-lines=5',
                 '--min-tokens=70',
-                '--suffix=*.php',
+                '--suffix=.php',
                 '--fuzzy',
                 '.',
             ],
@@ -92,7 +92,7 @@ public function provideExternalTaskRuns(): iterable
                 '--exclude=vendor',
                 '--min-lines=10',
                 '--min-tokens=70',
-                '--suffix=*.php',
+                '--suffix=.php',
                 '.',
             ],
         ];
@@ -107,7 +107,7 @@ public function provideExternalTaskRuns(): iterable
                 '--exclude=vendor',
                 '--min-lines=5',
                 '--min-tokens=10',
-                '--suffix=*.php',
+                '--suffix=.php',
                 '.',
             ],
         ];
@@ -122,7 +122,8 @@ public function provideExternalTaskRuns(): iterable
                 '--exclude=vendor',
                 '--min-lines=5',
                 '--min-tokens=70',
-                '--suffix=*.php,*.html',
+                '--suffix=.php',
+                '--suffix=.html',
                 '.',
             ],
         ];