symfony
diff --git a/‎src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php‎
Lines changed: 10 additions & 12 deletions b/‎src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php‎
Lines changed: 10 additions & 12 deletions
diff --git a/‎src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php‎
Lines changed: 3 additions & 6 deletions b/‎src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php‎
Lines changed: 3 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Routing/RouteCompiler.php‎
Lines changed: 0 additions & 1 deletion b/‎src/Symfony/Component/Routing/RouteCompiler.php‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php‎
Lines changed: 0 additions & 1 deletion b/‎src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php‎
Lines changed: 0 additions & 1 deletion
@@ -45,7 +45,7 @@ public function add($child)
     }
 
     /**
-     * Sets children
+     * Sets children.
      *
      * @param array $children The children
      */
@@ -100,9 +100,10 @@ protected function setParent(DumperCollection $parent)
     }
 
     /**
-     * Returns true if the attribute is defined
+     * Returns true if the attribute is defined.
      *
      * @param  string  $name The attribute name
+     *
      * @return Boolean true if the attribute is defined, false otherwise
      */
     public function hasAttribute($name)
@@ -111,23 +112,20 @@ public function hasAttribute($name)
     }
 
     /**
-     * Returns an attribute by name
+     * Returns an attribute by name.
+     *
+     * @param string $name    The attribute name
+     * @param mixed  $default Default value is the attribute doesn't exist
      *
-     * @param  string $name      The attribute name
-     * @param  mixed  $default   Default value is the attribute doesn't exist
      * @return mixed  The attribute value
      */
     public function getAttribute($name, $default = null)
     {
-        if ($this->hasAttribute($name)) {
-            return $this->attributes[$name];
-        } else {
-            return $default;
-        }
+        return $this->hasAttribute($name) ? $this->attributes[$name] : $default;
     }
 
     /**
-     * Sets an attribute by name
+     * Sets an attribute by name.
      *
      * @param string $name  The attribute name
      * @param mixed  $value The attribute value
@@ -138,7 +136,7 @@ public function setAttribute($name, $value)
     }
 
     /**
-     * Sets multiple attributes
+     * Sets multiple attributes.
      *
      * @param array $attributes  The attributes
      */
 
@@ -117,7 +117,6 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections)
 
         foreach ($groups as $collection) {
             if (null !== $regex = $collection->getAttribute('hostname_regex')) {
-
                 if (!$fetchedHostname) {
                     $code .= "        \$hostname = \$this->context->getHost();\n\n";
                     $fetchedHostname = true;
@@ -296,7 +295,6 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
 
         // optimize parameters array
         if (($matches || $hostnameMatches) && $route->getDefaults()) {
-
             $vars = array();
             if ($matches) {
                 $vars[] = '$matches';
@@ -336,7 +334,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
     }
 
     /**
-     * Flattens a tree of routes to a single collection
+     * Flattens a tree of routes to a single collection.
      *
      * @param  RouteCollection  $routes Collection of routes
      * @param  DumperCollection $to A DumperCollection to add routes to
@@ -361,10 +359,9 @@ private function flattenRouteCollection(RouteCollection $routes, DumperCollectio
     }
 
     /**
-     * Groups consecutive routes having the same hostname regex
+     * Groups consecutive routes having the same hostname regex.
      *
-     * The results is a collection of collections of routes having the same
-     * hostnameRegex
+     * The results is a collection of collections of routes having the same hostname regex.
      *
      * @param DumperCollection $routes Flat collection of DumperRoutes
      *
 
@@ -47,7 +47,6 @@ public function compile(Route $route)
         $hostnameTokens = array();
 
         if (null !== $hostnamePattern = $route->getHostnamePattern()) {
-
             $result = $this->compilePattern($route, $hostnamePattern, true);
 
             $hostnameVariables = $result['variables'];
 
@@ -15,7 +15,6 @@
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper;
 use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Matcher\Dumper\DumperCollection;
 
 class PhpGeneratorDumperTest extends \PHPUnit_Framework_TestCase
 {
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function add($child)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
`48`		`- * Sets children`
	`48`	`+ * Sets children.`
`49`	`49`	`*`
`50`	`50`	`* @param array $children The children`
`51`	`51`	`*/`
`@@ -100,9 +100,10 @@ protected function setParent(DumperCollection $parent)`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`/**`
`103`		`- * Returns true if the attribute is defined`
	`103`	`+ * Returns true if the attribute is defined.`
`104`	`104`	`*`
`105`	`105`	`* @param string $name The attribute name`
	`106`	`+ *`
`106`	`107`	`* @return Boolean true if the attribute is defined, false otherwise`
`107`	`108`	`*/`
`108`	`109`	`public function hasAttribute($name)`
`@@ -111,23 +112,20 @@ public function hasAttribute($name)`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`/**`
`114`		`- * Returns an attribute by name`
	`115`	`+ * Returns an attribute by name.`
	`116`	`+ *`
	`117`	`+ * @param string $name The attribute name`
	`118`	`+ * @param mixed $default Default value is the attribute doesn't exist`
`115`	`119`	`*`
`116`		`- * @param string $name The attribute name`
`117`		`- * @param mixed $default Default value is the attribute doesn't exist`
`118`	`120`	`* @return mixed The attribute value`
`119`	`121`	`*/`
`120`	`122`	`public function getAttribute($name, $default = null)`
`121`	`123`	`{`
`122`		`- if ($this->hasAttribute($name)) {`
`123`		`- return $this->attributes[$name];`
`124`		`- } else {`
`125`		`- return $default;`
`126`		`- }`
	`124`	`+ return $this->hasAttribute($name) ? $this->attributes[$name] : $default;`
`127`	`125`	`}`
`128`	`126`
`129`	`127`	`/**`
`130`		`- * Sets an attribute by name`
	`128`	`+ * Sets an attribute by name.`
`131`	`129`	`*`
`132`	`130`	`* @param string $name The attribute name`
`133`	`131`	`* @param mixed $value The attribute value`
`@@ -138,7 +136,7 @@ public function setAttribute($name, $value)`
`138`	`136`	`}`
`139`	`137`
`140`	`138`	`/**`
`141`		`- * Sets multiple attributes`
	`139`	`+ * Sets multiple attributes.`
`142`	`140`	`*`
`143`	`141`	`* @param array $attributes The attributes`
`144`	`142`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,6 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections)`
`117`	`117`
`118`	`118`	`foreach ($groups as $collection) {`
`119`	`119`	`if (null !== $regex = $collection->getAttribute('hostname_regex')) {`
`120`		`-`
`121`	`120`	`if (!$fetchedHostname) {`
`122`	`121`	`$code .= " \$hostname = \$this->context->getHost();\n\n";`
`123`	`122`	`$fetchedHostname = true;`
`@@ -296,7 +295,6 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren`
`296`	`295`
`297`	`296`	`// optimize parameters array`
`298`	`297`	`if (($matches \|\| $hostnameMatches) && $route->getDefaults()) {`
`299`		`-`
`300`	`298`	`$vars = array();`
`301`	`299`	`if ($matches) {`
`302`	`300`	`$vars[] = '$matches';`
`@@ -336,7 +334,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren`
`336`	`334`	`}`
`337`	`335`
`338`	`336`	`/**`
`339`		`- * Flattens a tree of routes to a single collection`
	`337`	`+ * Flattens a tree of routes to a single collection.`
`340`	`338`	`*`
`341`	`339`	`* @param RouteCollection $routes Collection of routes`
`342`	`340`	`* @param DumperCollection $to A DumperCollection to add routes to`
`@@ -361,10 +359,9 @@ private function flattenRouteCollection(RouteCollection $routes, DumperCollectio`
`361`	`359`	`}`
`362`	`360`
`363`	`361`	`/**`
`364`		`- * Groups consecutive routes having the same hostname regex`
	`362`	`+ * Groups consecutive routes having the same hostname regex.`
`365`	`363`	`*`
`366`		`- * The results is a collection of collections of routes having the same`
`367`		`- * hostnameRegex`
	`364`	`+ * The results is a collection of collections of routes having the same hostname regex.`
`368`	`365`	`*`
`369`	`366`	`* @param DumperCollection $routes Flat collection of DumperRoutes`
`370`	`367`	`*`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`use Symfony\Component\Routing\Route;`
`16`	`16`	`use Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper;`
`17`	`17`	`use Symfony\Component\Routing\RequestContext;`
`18`		`-use Symfony\Component\Routing\Matcher\Dumper\DumperCollection;`
`19`	`18`
`20`	`19`	`class PhpGeneratorDumperTest extends \PHPUnit_Framework_TestCase`
`21`	`20`	`{`