Bug #16343 [Router] Too many Routes ?

Jelte Steijaert · Jelte Steijaert · commit 98314f2a6277 · 2015-10-30T08:39:22.000+01:00
diff --git a/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php b/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
@@ -53,7 +53,7 @@ public function dump(array $options = array())
  */
 class {$options['class']} extends {$options['base_class']}
 {
-    private static \$declaredRoutes = {$this->generateDeclaredRoutes()};
+    private \$declaredRoutes;
 
     /**
      * Constructor.
@@ -62,6 +62,7 @@ public function __construct(RequestContext \$context, LoggerInterface \$logger =
     {
         \$this->context = \$context;
         \$this->logger = \$logger;
+        \$this->declaredRoutes = {$this->generateDeclaredRoutes()};
     }
 
 {$this->generateGenerateMethod()}
@@ -107,11 +108,11 @@ private function generateGenerateMethod()
         return <<<EOF
     public function generate(\$name, \$parameters = array(), \$referenceType = self::ABSOLUTE_PATH)
     {
-        if (!isset(self::\$declaredRoutes[\$name])) {
+        if (!isset(\$this->declaredRoutes[\$name])) {
             throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', \$name));
         }
 
-        list(\$variables, \$defaults, \$requirements, \$tokens, \$hostTokens, \$requiredSchemes) = self::\$declaredRoutes[\$name];
+        list(\$variables, \$defaults, \$requirements, \$tokens, \$hostTokens, \$requiredSchemes) = \$this->declaredRoutes[\$name];
 
         return \$this->doGenerate(\$variables, \$defaults, \$requirements, \$tokens, \$parameters, \$name, \$referenceType, \$hostTokens, \$requiredSchemes);
     }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function dump(array $options = array())`
`53`	`53`	`*/`
`54`	`54`	`class {$options['class']} extends {$options['base_class']}`
`55`	`55`	`{`
`56`		`- private static \$declaredRoutes = {$this->generateDeclaredRoutes()};`
	`56`	`+ private \$declaredRoutes;`
`57`	`57`
`58`	`58`	`/**`
`59`	`59`	`* Constructor.`
`@@ -62,6 +62,7 @@ public function __construct(RequestContext \$context, LoggerInterface \$logger =`
`62`	`62`	`{`
`63`	`63`	`\$this->context = \$context;`
`64`	`64`	`\$this->logger = \$logger;`
	`65`	`+ \$this->declaredRoutes = {$this->generateDeclaredRoutes()};`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`{$this->generateGenerateMethod()}`
`@@ -107,11 +108,11 @@ private function generateGenerateMethod()`
`107`	`108`	`return <<<EOF`
`108`	`109`	`public function generate(\$name, \$parameters = array(), \$referenceType = self::ABSOLUTE_PATH)`
`109`	`110`	`{`
`110`		`- if (!isset(self::\$declaredRoutes[\$name])) {`
	`111`	`+ if (!isset(\$this->declaredRoutes[\$name])) {`
`111`	`112`	`throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', \$name));`
`112`	`113`	`}`
`113`	`114`
`114`		`- list(\$variables, \$defaults, \$requirements, \$tokens, \$hostTokens, \$requiredSchemes) = self::\$declaredRoutes[\$name];`
	`115`	`+ list(\$variables, \$defaults, \$requirements, \$tokens, \$hostTokens, \$requiredSchemes) = \$this->declaredRoutes[\$name];`
`115`	`116`
`116`	`117`	`return \$this->doGenerate(\$variables, \$defaults, \$requirements, \$tokens, \$parameters, \$name, \$referenceType, \$hostTokens, \$requiredSchemes);`
`117`	`118`	`}`