Revert "fixed tests"

fabpot · fabpot · commit 544b6ca6aa96 · 2011-06-04T19:24:45.000+02:00
This reverts commit 7dc3af6.
diff --git a/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php b/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php
@@ -117,18 +117,6 @@ public function match($pathinfo)
     
         }
 
-        // foo
-        if (preg_match('#^/(?P<_locale>[^/]+?)/b/(?P<foo>[^/]+?)$#x', $pathinfo, $matches)) {
-            $matches['_route'] = 'foo';
-            return $matches;
-        }
-
-        // bar
-        if (preg_match('#^/(?P<_locale>[^/]+?)/b/(?P<bar>[^/]+?)$#x', $pathinfo, $matches)) {
-            $matches['_route'] = 'bar';
-            return $matches;
-        }
-
         throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();
     }
 }
diff --git a/tests/Symfony/Tests/Component/Routing/Matcher/Dumper/PhpMatcherDumperTest.php b/tests/Symfony/Tests/Component/Routing/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -82,14 +82,6 @@ public function testDump()
         $collection2->addCollection($collection1, '/b');
         $collection->addCollection($collection2, '/a');
 
-        // "dynamic" prefix
-        $collection1 = new RouteCollection();
-        $collection1->add('foo', new Route('/{foo}'));
-        $collection1->add('bar', new Route('/{bar}'));
-        $collection2 = new RouteCollection();
-        $collection2->addCollection($collection1, '/b');
-        $collection->addCollection($collection2, '/{_locale}');
-
         $dumper = new PhpMatcherDumper($collection, new RequestContext());
         $this->assertStringEqualsFile(__DIR__.'/../../Fixtures/dumper/url_matcher1.php', $dumper->dump(), '->dump() dumps basic routes to the correct PHP file.');
 

Original file line number	Diff line number	Diff line change
`@@ -117,18 +117,6 @@ public function match($pathinfo)`
`117`	`117`
`118`	`118`	`}`
`119`	`119`
`120`		`- // foo`
`121`		`- if (preg_match('#^/(?P<_locale>[^/]+?)/b/(?P<foo>[^/]+?)$#x', $pathinfo, $matches)) {`
`122`		`- $matches['_route'] = 'foo';`
`123`		`- return $matches;`
`124`		`- }`
`125`		`-`
`126`		`- // bar`
`127`		`- if (preg_match('#^/(?P<_locale>[^/]+?)/b/(?P<bar>[^/]+?)$#x', $pathinfo, $matches)) {`
`128`		`- $matches['_route'] = 'bar';`
`129`		`- return $matches;`
`130`		`- }`
`131`		`-`
`132`	`120`	`throw 0 < count($allow) ? new MethodNotAllowedException(array_unique($allow)) : new ResourceNotFoundException();`
`133`	`121`	`}`
`134`	`122`	`}`