Regression of the AllowParser, performance not as expected

VIPnytt · Aug 10, 2016 · 17cd7a2 · 17cd7a2
1 parent b73e7ba
commit 17cd7a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/Parser/Directives/AllowParser.php b/src/Parser/Directives/AllowParser.php
@@ -107,10 +107,12 @@ public function add($line)
     private function addPath($path)
     {
         $path = rtrim($path, '*');
-        if (in_array(mb_substr($path, 0, 1), [
-            '/',
-            '*',
-        ])) {
+        if (!in_array('/', $this->path) &&
+            in_array(mb_substr($path, 0, 1), [
+                '/',
+                '*',
+            ])
+        ) {
             $this->path[] = $path;
             $this->optimized = false;
         }
@@ -149,9 +151,7 @@ private function removeOverlapping()
         foreach ($this->path as $key1 => &$path1) {
             foreach ($this->path as $key2 => &$path2) {
                 if ($key1 !== $key2 &&
-                    (mb_strpos($path1, $path2) === 0 ||
-                        mb_strpos(str_replace('*', '/', $path1), $path2) === 0
-                    )
+                    mb_strpos($path1, $path2) === 0
                 ) {
                     unset($this->path[$key1]);
                 }

diff --git a/tests/DisallowAllTest.php b/tests/DisallowAllTest.php
@@ -61,9 +61,9 @@ public function generateDataForTest()
             [
                 <<<ROBOTS
 User-agent: *
-Disallow: *test*
-Disallow: /admin/
 Disallow: /
+Disallow: /admin/
+Disallow: *test*
 ROBOTS
                 ,
                 <<<RENDERED

diff --git a/tests/EndAnchorTest.php b/tests/EndAnchorTest.php
@@ -57,7 +57,7 @@ public function generateDataForTest()
             [
                 <<<ROBOTS
 User-Agent: *
-Noindex: *$
+Noindex: $
 Disallow: /*
 Allow: /$
 
@@ -73,6 +73,7 @@ public function generateDataForTest()
 Allow: /$
 
 User-agent: denyme
+Disallow: *deny_all/$
 Disallow: /deny_all/$
 RENDERED
             ]