Merge pull request #6 from Tobion/hostname-routes

arnaud-lb · arnaud-lb · commit 17f51a187317 · 2012-11-12T04:09:53.000-08:00
fix API of RouteCollection
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
@@ -212,7 +212,9 @@ public function addCollection(RouteCollection $collection, $prefix = '', $defaul
         // necessarily already have it applied (depending on the order RouteCollections are added to each other)
         $collection->addPrefix($this->getPrefix() . $prefix, $defaults, $requirements, $options);
 
-        $collection->setHostnamePattern($hostnamePattern);
+        if ('' !== $hostnamePattern) {
+            $collection->setHostnamePattern($hostnamePattern);
+        }
 
         $this->routes[] = $collection;
     }
@@ -284,10 +286,6 @@ public function setHostnamePattern($pattern)
     {
         $this->hostnamePattern = (string) $pattern;
 
-        if ('' === $pattern) {
-            return;
-        }
-
         foreach ($this->routes as $name => $route) {
             $route->setHostnamePattern($pattern);
         }

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,9 @@ public function addCollection(RouteCollection $collection, $prefix = '', $defaul`
`212`	`212`	`// necessarily already have it applied (depending on the order RouteCollections are added to each other)`
`213`	`213`	`$collection->addPrefix($this->getPrefix() . $prefix, $defaults, $requirements, $options);`
`214`	`214`
`215`		`- $collection->setHostnamePattern($hostnamePattern);`
	`215`	`+ if ('' !== $hostnamePattern) {`
	`216`	`+ $collection->setHostnamePattern($hostnamePattern);`
	`217`	`+ }`
`216`	`218`
`217`	`219`	`$this->routes[] = $collection;`
`218`	`220`	`}`
`@@ -284,10 +286,6 @@ public function setHostnamePattern($pattern)`
`284`	`286`	`{`
`285`	`287`	`$this->hostnamePattern = (string) $pattern;`
`286`	`288`
`287`		`- if ('' === $pattern) {`
`288`		`- return;`
`289`		`- }`
`290`		`-`
`291`	`289`	`foreach ($this->routes as $name => $route) {`
`292`	`290 428C`	`$route->setHostnamePattern($pattern);`
`293`	`291`	`}`