[Routing] removed unused defaults variable

src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php

@@ -54,10 +54,7 @@ class PhpGeneratorDumper extends GeneratorDumper
             $compiledRoute = $route->compile();
 
             $variables = str_replace("\n", '', var_export($compiledRoute->getVariables(), true));
-            $defaultsMerge = '';
-            foreach ($compiledRoute->getDefaults() as $key => $value) {
-                $defaultsMerge .= '        $defaults[\''.$key.'\'] = '.str_replace("\n", '', var_export($value, true)).';'."\n";
-            }
+            $defaults = str_replace("\n", '', var_export($compiledRoute->getDefaults(), true));
             $requirements = str_replace("\n", '', var_export($compiledRoute->getRequirements(), true));
             $tokens = str_replace("\n", '', var_export($compiledRoute->getTokens(), true));
 
@@ -66,9 +63,7 @@ class PhpGeneratorDumper extends GeneratorDumper
             $methods[] = <<<EOF
     private function get{$escapedName}RouteInfo()
     {
-        \$defaults = \$this->defaults;
-$defaultsMerge
-        return array($variables, \$defaults, $requirements, $tokens);
+        return array($variables, $defaults, $requirements, $tokens);
     }
 
 EOF
@@ -131,10 +126,9 @@ EOF;
     /**
      * Constructor.
      */
-    public function __construct(RequestContext \$context, array \$defaults = array())
+    public function __construct(RequestContext \$context)
     {
         \$this->context = \$context;
-        \$this->defaults = \$defaults;
     }
 
 EOF;

src/Symfony/Component/Routing/Generator/UrlGenerator.php

@@ -22,7 +22,6 @@ use Symfony\Component\Routing\RequestContext;
  */
 class UrlGenerator implements UrlGeneratorInterface
 {
-    protected $defaults;
     protected $context;
 
     private $routes;
@@ -33,13 +32,11 @@ class UrlGenerator implements UrlGeneratorInterface
      *
      * @param RouteCollection $routes   A RouteCollection instance
      * @param RequestContext  $context  The context
-     * @param array           $defaults The default values
      */
-    public function __construct(RouteCollection $routes, RequestContext $context, array $defaults = array())
+    public function __construct(RouteCollection $routes, RequestContext $context)
     {
         $this->routes = $routes;
         $this->context = $context;
-        $this->defaults = $defaults;
         $this->cache = array();
     }
 
@@ -82,7 +79,6 @@ class UrlGenerator implements UrlGeneratorInterface
      */
     protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute)
     {
-        $defaults = array_merge($this->defaults, $defaults);
         $tparams = array_merge($defaults, $parameters);
 
         // all params must be given

src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php

@@ -195,10 +195,9 @@ EOF;
     /**
      * Constructor.
      */
-    public function __construct(RequestContext \$context, array \$defaults = array())
+    public function __construct(RequestContext \$context)
     {
         \$this->context = \$context;
-        \$this->defaults = \$defaults;
     }
 
 EOF;

src/Symfony/Component/Routing/Matcher/UrlMatcher.php

@@ -24,7 +24,6 @@ use Symfony\Component\Routing\RequestContext;
  */
 class UrlMatcher implements UrlMatcherInterface
 {
-    protected $defaults;
     protected $context;
 
     private $routes;
@@ -34,13 +33,11 @@ class UrlMatcher implements UrlMatcherInterface
      *
      * @param RouteCollection $routes   A RouteCollection instance
      * @param RequestContext  $context  The context
-     * @param array           $defaults The default values
      */
-    public function __construct(RouteCollection $routes, RequestContext $context, array $defaults = array())
+    public function __construct(RouteCollection $routes, RequestContext $context)
     {
         $this->routes = $routes;
         $this->context = $context;
-        $this->defaults = $defaults;
     }
 
     /**
@@ -95,7 +92,7 @@ class UrlMatcher implements UrlMatcherInterface
 
     protected function mergeDefaults($params, $defaults)
     {
-        $parameters = array_merge($this->defaults, $defaults);
+        $parameters = $defaults;
         foreach ($params as $key => $value) {
             if (!is_int($key)) {
                 $parameters[$key] = urldecode($value);

tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php

@@ -15,10 +15,9 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
     /**
      * Constructor.
      */
-    public function __construct(RequestContext $context, array $defaults = array())
+    public function __construct(RequestContext $context)
     {
         $this->context = $context;
-        $this->defaults = $defaults;
     }
 
     public function match($pathinfo)

tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher2.php

@@ -15,10 +15,9 @@ class ProjectUrlMatcher extends Symfony\Tests\Component\Routing\Fixtures\Redirec
     /**
      * Constructor.
      */
-    public function __construct(RequestContext $context, array $defaults = array())
+    public function __construct(RequestContext $context)
     {
         $this->context = $context;
-        $this->defaults = $defaults;
     }
 
     public function match($pathinfo)