fix regression when extending the Container class without a constructor

lsmith77 · lsmith77 · commit ae94ed62462d · 2018-03-08T09:45:12.000+01:00
regression introduced in c026ec6#diff-f7b23d463cba27ac5e4cb677f2be7623R985
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -981,9 +981,13 @@ public function __construct()
         if ($this->container->isCompiled()) {
             if (Container::class !== $baseClassWithNamespace) {
                 $r = $this->container->getReflectionClass($baseClassWithNamespace, false);
-
-                if (null !== $r && (null !== $constructor = $r->getConstructor()) && 0 === $constructor->getNumberOfRequiredParameters()) {
-                    $code .= "        parent::__construct();\n\n";
+                if (null !== $r
+                    && (null !== $constructor = $r->getConstructor())
+                    && 0 === $constructor->getNumberOfRequiredParameters()
+                    && $constructor->getDeclaringClass()->name !== Container::class
+                ) {
+                    $code .= "        parent::__construct();\n";
+                    $code .= "        \$this->parameterBag = null;\n\n";
                 }
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Container/NoConstructorContainer.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Container/NoConstructorContainer.php
@@ -2,6 +2,8 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container;
 
-class NoConstructorContainer
+use Symfony\Component\DependencyInjection\Container;
+
+class NoConstructorContainer extends Container
 {
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/custom_container_class_with_optional_constructor_arguments.php
@@ -24,6 +24,7 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes
     public function __construct()
     {
         parent::__construct();
+        $this->parameterBag = null;
 
         $this->services = array();
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Container;`
`4`	`4`
`5`		`-class NoConstructorContainer`
	`5`	`+use Symfony\Component\DependencyInjection\Container;`
	`6`	`+`
	`7`	`+class NoConstructorContainer extends Container`
`6`	`8`	`{`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes`
`24`	`24`	`public function __construct()`
`25`	`25`	`{`
`26`	`26`	`parent::__construct();`
	`27`	`+ $this->parameterBag = null;`
`27`	`28`
`28`	`29`	`$this->services = array();`
`29`	`30`