Commitae94ed6

committed

fix regression when extending the Container class without a constructor

1 parent07cccd5 commitae94ed6Copy full SHA for ae94ed6

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -981,9 +981,13 @@ public function __construct()`
`981`	`981`	`if ($this->container->isCompiled()) {`
`982`	`982`	`if (Container::class !==$baseClassWithNamespace) {`
`983`	`983`	`$r =$this->container->getReflectionClass($baseClassWithNamespace,false);`
`984`		`-`
`985`		`-if (null !==$r && (null !==$constructor =$r->getConstructor()) &&0 ===$constructor->getNumberOfRequiredParameters()) {`
`986`		`-$code .=" parent::__construct();\n\n";`
	`984`	`+if (null !==$r`
	`985`	`+ && (null !==$constructor =$r->getConstructor())`
	`986`	`+ &&0 ===$constructor->getNumberOfRequiredParameters()`
	`987`	`+ &&$constructor->getDeclaringClass()->name !== Container::class`
	`988`	`+ ) {`
	`989`	`+$code .=" parent::__construct();\n";`
	`990`	`+$code .="\$this->parameterBag = null;\n\n";`
`987`	`991`	`}`
`988`	`992`	`}`
`989`	`993`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`namespaceSymfony\Component\DependencyInjection\Tests\Fixtures\Container;`
`4`	`4`
`5`		`-class NoConstructorContainer`
	`5`	`+useSymfony\Component\DependencyInjection\Container;`
	`6`	`+`
	`7`	`+class NoConstructorContainerextends Container`
`6`	`8`	`{`
`7`	`9`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tes`
`24`	`24`	`publicfunction__construct()`
`25`	`25`	`{`
`26`	`26`	`parent::__construct();`
	`27`	`+$this->parameterBag =null;`
`27`	`28`
`28`	`29`	`$this->services =array();`
`29`	`30`

Comments

(0)