Merge pull request #76 from bitExpert/fix/75_strategy_static

#75 Static matcher now canonicalizes url and rule to omit differences…
bitExpert · Jul 11, 2017 · dc623ef · dc623ef
2 parents e51140e + 7e9fcd3
commit dc623ef
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- #75 Static matcher now canonicalizes url and rule to omit differences of trailing slashes
 - #74 Provides backwards compatibility by set strategy for existing rules to regex matcher instead of static
 - #72 Fixes on class resolution
 

diff --git a/Helper/Strategy/StaticMatcher.php b/Helper/Strategy/StaticMatcher.php
@@ -50,15 +50,25 @@ public function getName()
      */
     public function isMatch($url, WhitelistEntry $rule)
     {
-        return ($this->getCleanUrl($url) === $rule->getUrlRule());
+        return ($this->getCanonicalUrl($url) === $this->getCanonicalRule($rule->getUrlRule()));
     }
 
     /**
-     * @param $url
+     * @param string $url
      * @return string
      */
-    private function getCleanUrl($url)
+    private function getCanonicalUrl($url)
     {
-        return str_replace(self::REWRITE_DISABLED_URL_PREFIX, '', $url);
+        $canonicalUrl = rtrim($url,'/') . '/';
+        return str_replace(self::REWRITE_DISABLED_URL_PREFIX, '', $canonicalUrl);
+    }
+
+    /**
+     * @param string $rule
+     * @return string
+     */
+    private function getCanonicalRule($rule)
+    {
+        return rtrim($rule,'/') . '/';
     }
 }
diff --git a/Test/Unit/Helper/Strategy/StaticMatcherUnitTest.php b/Test/Unit/Helper/Strategy/StaticMatcherUnitTest.php
@@ -40,9 +40,13 @@ public function matchStaticRulesCorrectly()
          */
         // simple
         $this->assertTrue($matcher->isMatch('/foobar', $rule));
+        $this->assertTrue($matcher->isMatch('/foobar/', $rule));
         $this->assertFalse($matcher->isMatch('/bar', $rule));
+        $this->assertFalse($matcher->isMatch('/bar/', $rule));
         // without rewrite
         $this->assertTrue($matcher->isMatch('/index.php/foobar', $rule));
+        $this->assertTrue($matcher->isMatch('/index.php/foobar/', $rule));
         $this->assertFalse($matcher->isMatch('/index.php/bar', $rule));
+        $this->assertFalse($matcher->isMatch('/index.php/bar/', $rule));
     }
 }