[HttpKernel] handle anonymous classes when generating the dumped container class name

nicolas-grekas · nicolas-grekas · commit ac84cb2fbe24 · 2018-11-26T10:17:19.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -225,7 +225,10 @@ public function getBundles()
     public function getBundle($name)
     {
         if (!isset($this->bundles[$name])) {
-            throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, \get_class($this)));
+            $class = \get_class($this);
+            $class = 'c' === $class[0] && 0 === strpos($class, "class@anonymous\0") ? get_parent_class($class).'@anonymous' : $class;
+
+            throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, $class));
         }
 
         return $this->bundles[$name];
@@ -443,7 +446,10 @@ protected function build(ContainerBuilder $container)
      */
     protected function getContainerClass()
     {
-        return $this->name.str_replace('\\', '_', \get_class($this)).ucfirst($this->environment).($this->debug ? 'Debug' : '').'Container';
+        $class = \get_class($this);
+        $class = 'c' === $class[0] && 0 === strpos($class, "class@anonymous\0") ? get_parent_class($class).ContainerBuilder::hash($class) : $class;
+
+        return $this->name.str_replace('\\', '_', $class).ucfirst($this->environment).($this->debug ? 'Debug' : '').'Container';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,10 @@ public function getBundles()`
`225`	`225`	`public function getBundle($name)`
`226`	`226`	`{`
`227`	`227`	`if (!isset($this->bundles[$name])) {`
`228`		`- throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, \get_class($this)));`
	`228`	`+ $class = \get_class($this);`
	`229`	`+ $class = 'c' === $class[0] && 0 === strpos($class, "class@anonymous\0") ? get_parent_class($class).'@anonymous' : $class;`
	`230`	`+`
	`231`	`+ throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, $class));`
`229`	`232`	`}`
`230`	`233`
`231`	`234`	`return $this->bundles[$name];`
`@@ -443,7 +446,10 @@ protected function build(ContainerBuilder $container)`
`443`	`446`	`*/`
`444`	`447`	`protected function getContainerClass()`
`445`	`448`	`{`
`446`		`- return $this->name.str_replace('\\', '_', \get_class($this)).ucfirst($this->environment).($this->debug ? 'Debug' : '').'Container';`
	`449`	`+ $class = \get_class($this);`
	`450`	`+ $class = 'c' === $class[0] && 0 === strpos($class, "class@anonymous\0") ? get_parent_class($class).ContainerBuilder::hash($class) : $class;`
	`451`	`+`
	`452`	`+ return $this->name.str_replace('\\', '_', $class).ucfirst($this->environment).($this->debug ? 'Debug' : '').'Container';`
`447`	`453`	`}`
`448`	`454`
`449`	`455`	`/**`