Use preg_quote() instead of escapeshellcmd to prepare string to b…

…e a regular expression
infection · Jul 25, 2021 · 1eff6c2 · 1eff6c2
1 parent 50f972a
commit 1eff6c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/TestFramework/PhpUnit/CommandLine/ArgumentsAndOptionsBuilder.php b/src/TestFramework/PhpUnit/CommandLine/ArgumentsAndOptionsBuilder.php
@@ -39,11 +39,13 @@
 use function array_map;
 use function array_merge;
 use function count;
+use function escapeshellarg;
 use function escapeshellcmd;
 use function explode;
 use Infection\AbstractTestFramework\Coverage\TestLocation;
 use Infection\TestFramework\CommandLineArgumentsAndOptionsBuilder;
 use function ltrim;
+use function preg_quote;
 use function rtrim;
 
 /**
@@ -97,7 +99,7 @@ public function buildForMutant(string $configPath, string $extraOptions, array $
 
                 $usedTestCases[$testCaseString] = true;
 
-                $filterString .= escapeshellcmd($testCaseString) . '|';
+                $filterString .= preg_quote($testCaseString, '/') . '|';
             }
 
             $filterString = rtrim($filterString, '|') . '/';

diff --git a/tests/phpunit/TestFramework/PhpUnit/CommandLine/ArgumentsAndOptionsBuilderTest.php b/tests/phpunit/TestFramework/PhpUnit/CommandLine/ArgumentsAndOptionsBuilderTest.php
@@ -142,7 +142,7 @@ public function provideTestCases(): Generator
             [
                 'App\Test::test_case1',
             ],
-            '/App\\\\Test::test_case1/',
+            '/App\\\\Test\:\:test_case1/',
         ];
 
         yield '2 test cases' => [
@@ -151,7 +151,7 @@ public function provideTestCases(): Generator
                 'App\Test::test_case1',
                 'App\Test::test_case2',
             ],
-            '/App\\\\Test::test_case1|App\\\\Test::test_case2/',
+            '/App\\\\Test\:\:test_case1|App\\\\Test\:\:test_case2/',
         ];
 
         yield '2 simple test cases, 1 with data set and special character >' => [
@@ -160,7 +160,7 @@ public function provideTestCases(): Generator
                 'App\Test::test_case1 with data set "With special character >"',
                 'App\Test::test_case2',
             ],
-            '/App\\\\Test::test_case1 with data set "With special character \\>"|App\\\\Test::test_case2/',
+            '/App\\\\Test\:\:test_case1 with data set "With special character \\>"|App\\\\Test\:\:test_case2/',
         ];
 
         yield '2 simple test cases, 1 with data set and special character @' => [
@@ -169,7 +169,7 @@ public function provideTestCases(): Generator
                 'App\Test::test_case1 with data set "With special character @"',
                 'App\Test::test_case2',
             ],
-            '/App\\\\Test::test_case1 with data set "With special character @"|App\\\\Test::test_case2/',
+            '/App\\\\Test\:\:test_case1 with data set "With special character @"|App\\\\Test\:\:test_case2/',
         ];
     }
 }