diff --git a/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php b/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
index 0c1d055127..edc57db548 100644
--- a/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
+++ b/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
@@ -54,9 +54,9 @@ class PhpGeneratorDumper extends GeneratorDumper
             $compiledRoute = $route->compile();
 
             $variables = str_replace("\n", '', var_export($compiledRoute->getVariables(), true));
-            $defaultsMerge='';
+            $defaultsMerge = '';
             foreach ($compiledRoute->getDefaults() as $key => $value) {
-                $defaultsMerge.='        $defaults[\''.$key.'\']='.str_replace("\n", '', var_export($value, true)).';'."\n";
+                $defaultsMerge .= '        $defaults[\''.$key.'\'] = '.str_replace("\n", '', var_export($value, true)).';'."\n";
             }
             $requirements = str_replace("\n", '', var_export($compiledRoute->getRequirements(), true));
             $tokens = str_replace("\n", '', var_export($compiledRoute->getTokens(), true));
@@ -66,7 +66,7 @@ class PhpGeneratorDumper extends GeneratorDumper
             $methods[] = <<<EOF
     protected function get{$escapedName}RouteInfo()
     {
-        \$defaults=\$this->defaults;
+        \$defaults = \$this->defaults;
 $defaultsMerge
         return array($variables, \$defaults, $requirements, $tokens);
     }
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
index 0e42fa339d..e2d7cc856b 100644
--- a/src/Symfony/Component/Routing/Router.php
+++ b/src/Symfony/Component/Routing/Router.php
@@ -79,6 +79,7 @@ class Router implements RouterInterface
                 $invalid[] = $key;
             }
         }
+
         if ($isInvalid) {
             throw new \InvalidArgumentException(sprintf('The Router does not support the following options: \'%s\'.', implode('\', \'', $invalid)));
         }