Merge branch 'directory-exclude-pattern' of https://github.com/Solviq…

…-forks/PHP_CodeSniffer
squizlabs · Sep 1, 2020 · 85f3521 · 85f3521
2 parents d2deedd + 367c60c
commit 85f3521
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Filters/Filter.php b/src/Filters/Filter.php
@@ -218,7 +218,7 @@ protected function shouldIgnorePath($path)
                     // Need to check this pattern for dirs as well as individual file paths.
                     $this->ignoreFilePatterns[$pattern] = $type;
 
-                    $pattern = substr($pattern, 0, -2);
+                    $pattern = substr($pattern, 0, -2).'(?=/|$)';
                     $this->ignoreDirPatterns[$pattern] = $type;
                 } else {
                     // This is a file-specific pattern, so only need to check this

diff --git a/tests/Core/Filters/Filter/AcceptTest.php b/tests/Core/Filters/Filter/AcceptTest.php
@@ -111,9 +111,13 @@ public function dataExcludePatterns()
                     '/path/to/src/Main.php',
                     '/path/to/src/Something/Main.php',
                     '/path/to/src/Somethingelse/Main.php',
+                    '/path/to/src/SomethingelseEvenLonger/Main.php',
                     '/path/to/src/Other/Main.php',
                 ],
-                ['/path/to/src/Main.php'],
+                [
+                    '/path/to/src/Main.php',
+                    '/path/to/src/SomethingelseEvenLonger/Main.php',
+                ],
             ],
 
             // Test ignoring standard/sniff specific exclude patterns.