some type fixes

Tobion · arnaud-lb · commit 26e56842dc00 · 2012-11-12T11:54:32.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Console\Output\Output;
 
 /**
  * A console command for retrieving information about routes
@@ -112,7 +111,7 @@ protected function outputRoutes(OutputInterface $output, $routes = null)
                     ? implode(', ', $requirements['_method']) : $requirements['_method']
                 )
                 : 'ANY';
-            $hostname = null !== $route->getHostnamePattern()
+            $hostname = '' !== $route->getHostnamePattern()
                 ? $route->getHostnamePattern() : 'ANY';
             $output->writeln(sprintf($format, $name, $method, $hostname, $route->getPattern()));
         }
diff --git a/src/Symfony/Component/Routing/CompiledRoute.php b/src/Symfony/Component/Routing/CompiledRoute.php
@@ -30,18 +30,18 @@ class CompiledRoute
     /**
      * Constructor.
      *
-     * @param string $staticPrefix       The static prefix of the compiled route
-     * @param string $regex              The regular expression to use to match this route
-     * @param array  $tokens             An array of tokens to use to generate URL for this route
-     * @param array  $pathVariables      An array of path variables
-     * @param array  $hostnameRegex|null Hostname regex
-     * @param array  $hostnameTokens     Hostname tokens
-     * @param array  $hostnameVariables  An array of hostname variables
-     * @param array  $variables          An array of variables (variables defined in the path and in the hostname patterns)
+     * @param string      $staticPrefix       The static prefix of the compiled route
+     * @param string      $regex              The regular expression to use to match this route
+     * @param array       $tokens             An array of tokens to use to generate URL for this route
+     * @param array       $pathVariables      An array of path variables
+     * @param string|null $hostnameRegex      Hostname regex
+     * @param array       $hostnameTokens     Hostname tokens
+     * @param array       $hostnameVariables  An array of hostname variables
+     * @param array       $variables          An array of variables (variables defined in the path and in the hostname patterns)
      */
     public function __construct($staticPrefix, $regex, array $tokens, array $pathVariables, $hostnameRegex = null, array $hostnameTokens = array(), array $hostnameVariables = array(), array $variables = array())
     {
-        $this->staticPrefix = $staticPrefix;
+        $this->staticPrefix = (string) $staticPrefix;
         $this->regex = $regex;
         $this->tokens = $tokens;
         $this->pathVariables = $pathVariables;
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php b/src/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php
@@ -20,6 +20,7 @@ class DumperCollection implements \IteratorAggregate
 {
     private $parent;
     private $children = array();
+    private $attributes = array();
 
     /**
      * Returns the children routes and collections.
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
@@ -282,7 +282,7 @@ public function getHostnamePattern()
      */
     public function setHostnamePattern($pattern)
     {
-        $this->hostnamePattern = $pattern;
+        $this->hostnamePattern = (string) $pattern;
 
         if ('' === $pattern) {
             return;

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ class DumperCollection implements \IteratorAggregate`
`20`	`20`	`{`
`21`	`21`	`private $parent;`
`22`	`22`	`private $children = array();`
	`23`	`+ private $attributes = array();`
`23`	`24`
`24`	`25`	`/**`
`25`	`26`	`* Returns the children routes and collections.`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ public function getHostnamePattern()`
`282`	`282`	`*/`
`283`	`283`	`public function setHostnamePattern($pattern)`
`284`	`284`	`{`
`285`		`- $this->hostnamePattern = $pattern;`
	`285`	`+ $this->hostnamePattern = (string) $pattern;`
`286`	`286`
`287`	`287`	`if ('' === $pattern) {`
`288`	`288`	`return;`