Merge pull request #1 from jmikola/fix-matchStrings

Use start/end anchors in matchStrings() regex
dflydev · Jan 23, 2023 · c8406d2 · c8406d2
2 parents 66e0ed7 + 0cb74fb
commit c8406d2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -20,6 +20,9 @@
     "require": {
         "php": ">=5.3"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^4|^5|^6|^7|^8|^9"
+    },
     "autoload": {
         "psr-0": { "dflydev\\util\\antPathMatcher": "src" }
     }

diff --git a/src/dflydev/util/antPathMatcher/AntPathMatcher.php b/src/dflydev/util/antPathMatcher/AntPathMatcher.php
@@ -221,7 +221,7 @@ protected function matchStrings($pattern, $str)
     {
         $re = preg_replace_callback('([\?\*\.\+])', array($this, 'matchStringsCallback'), $pattern);
 
-        return preg_match('/'.$re.'/', $str);
+        return preg_match('/^'.$re.'$/', $str);
     }
 
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -10,3 +10,7 @@
 
 $loader = require dirname(__DIR__).'/vendor/autoload.php';
 $loader->add('dflydev\\tests\\util\\antPathMatcher', 'tests');
+
+if (class_exists('PHPUnit\Framework\TestCase') && ! class_exists('PHPUnit_Framework_TestCase')) {
+    class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
+}
diff --git a/tests/dflydev/tests/util/antPathMatcher/AntPathMatcherTest.php b/tests/dflydev/tests/util/antPathMatcher/AntPathMatcherTest.php
@@ -30,7 +30,7 @@ public function testLeadingPathCharacterMismatch() {
     }
 
     /**
-     * @dataProvider testMatchesProvider
+     * @dataProvider provideMatches
      */
     public function testMatches($pattern, $shouldMatch, $shouldNotMatch)
     {
@@ -48,11 +48,16 @@ public function formatTestMatchesMessage($pattern, $path)
         return 'Testing path "' . $path . '" against pattern "' . $pattern . '"';
     }
 
-    public function testMatchesProvider()
+    public function provideMatches()
     {
         return array(
             array(
                 'com/t?st',
+                array('com/test', 'com/tast', 'com/txst'),
+                array('com/test.jsp', 'com/tast.jsp', 'com/txst.jsp'),
+            ),
+            array(
+                'com/t?st.jsp',
                 array('com/test.jsp', 'com/tast.jsp', 'com/txst.jsp'),
                 array('com/toast.jsp', 'com/README.md')
             ),
@@ -95,7 +100,12 @@ public function testMatchesProvider()
                 'com/foo/',
                 array('com/foo/bar.jsp','com/foo/bar/baz.jsp',),
                 array('com.txt', 'com/foo.txt'),
-            )
+            ),
+            array(
+                'com/**',
+                array('com/foo'),
+                array('com2/foo', '_com/foo'),
+            ),
         );
     }