[Routing] removed an optimization as it does not always work as expected

fabpot · fabpot · commit c536797cc9ee · 2011-06-17T14:28:23.000+02:00
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -125,7 +125,6 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections, $
                 }
 
                 if ($optimizable && $prefix !== $parentPrefix) {
-                    $code[] = "            throw 0 < count(\$allow) ? new MethodNotAllowedException(array_unique(\$allow)) : new ResourceNotFoundException();";
                     $code[] = "        }\n";
                 }
             } else {
diff --git a/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php b/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php
@@ -125,7 +125,6 @@ public function match($pathinfo)
                     return $matches;
                 }
         
-                throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
             }
     
             // ababa
@@ -139,7 +138,6 @@ public function match($pathinfo)
                 return $matches;
             }
     
-            throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
         }
 
         // foo
diff --git a/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher2.php b/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher2.php
@@ -137,7 +137,6 @@ public function match($pathinfo)
                     return $matches;
                 }
         
-                throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
             }
     
             // ababa
@@ -151,7 +150,6 @@ public function match($pathinfo)
                 return $matches;
             }
     
-            throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
         }
 
         // foo

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections, $`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if ($optimizable && $prefix !== $parentPrefix) {`
`128`		`- $code[] = " throw 0 < count(\$allow) ? new MethodNotAllowedException(array_unique(\$allow)) : new ResourceNotFoundException();";`
`129`	`128`	`$code[] = " }\n";`
`130`	`129`	`}`
`131`	`130`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ public function match($pathinfo)`
`125`	`125`	`return $matches;`
`126`	`126`	`}`
`127`	`127`
`128`		`- throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`// ababa`
`@@ -139,7 +138,6 @@ public function match($pathinfo)`
`139`	`138`	`return $matches;`
`140`	`139`	`}`
`141`	`140`
`142`		`- throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();`
`143`	`141`	`}`
`144`	`142`
`145`	`143`	`// foo`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,6 @@ public function match($pathinfo)`
`137`	`137`	`return $matches;`
`138`	`138`	`}`
`139`	`139`
`140`		`- throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();`
`141`	`140`	`}`
`142`	`141`
`143`	`142`	`// ababa`
`@@ -151,7 +150,6 @@ public function match($pathinfo)`
`151`	`150`	`return $matches;`
`152`	`151`	`}`
`153`	`152`
`154`		`- throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();`
`155`	`153`	`}`
`156`	`154`
`157`	`155`	`// foo`