Merge pull request #419 from fredden/issue-416/windows-paths-preg_quote

Remove DIRECTORY_SEPARATOR replacement in regular expression
maglnet · Sep 27, 2023 · e49c58b · e49c58b
2 parents a80a012 + e2c7d31
commit e49c58b
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/ComposerRequireChecker/FileLocator/LocateAllFilesByExtension.php b/src/ComposerRequireChecker/FileLocator/LocateAllFilesByExtension.php
@@ -12,7 +12,6 @@
 use function implode;
 use function preg_match;
 use function preg_quote;
-use function preg_replace;
 use function str_replace;
 use function trim;
 
@@ -79,14 +78,9 @@ private function prepareBlacklistPatterns(array|null $blacklistPaths): array
         $dirSep = preg_quote(DIRECTORY_SEPARATOR, '{}');
 
         foreach ($blacklistPaths as &$path) {
-            $path = preg_replace(
-                '{' . $dirSep . '+}',
-                DIRECTORY_SEPARATOR,
-                preg_quote(
-                    trim(str_replace('/', DIRECTORY_SEPARATOR, $path), DIRECTORY_SEPARATOR),
-                    '{}',
-                ),
-            );
+            $path = str_replace('/', DIRECTORY_SEPARATOR, $path);
+            $path = trim($path, DIRECTORY_SEPARATOR);
+            $path = preg_quote($path, '{}');
             $path = str_replace('\\*\\*', '.+?', $path);
             $path = str_replace('\\*', '[^' . $dirSep . ']+?', $path);
         }