bug #16229 [DI] Autowiring: w/a https://bugs.php.net/62715 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit eca3e3722561 · 2015-10-14T16:12:48.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [DI] Autowiring: w/a https://bugs.php.net/62715 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - See https://ci.appveyor.com/project/fabpot/symfony/build/1.0.2384#L722 Commits ------- 8d49573 [DI] Autowiring: w/a https://bugs.php.net/62715
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -91,11 +91,13 @@ private function completeDefinition($id, Definition $definition)
                     try {
                         $value = $this->createAutowiredDefinition($typeHint, $id);
                     } catch (RuntimeException $e) {
-                        if (!$parameter->isDefaultValueAvailable()) {
+                        if ($parameter->allowsNull()) {
+                            $value = null;
+                        } elseif ($parameter->isDefaultValueAvailable()) {
+                            $value = $parameter->getDefaultValue();
+                        } else {
                             throw $e;
                         }
-
-                        $value = $parameter->getDefaultValue();
                     }
                 }
             } catch (\ReflectionException $reflectionException) {

Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,13 @@ private function completeDefinition($id, Definition $definition)`
`91`	`91`	`try {`
`92`	`92`	`$value = $this->createAutowiredDefinition($typeHint, $id);`
`93`	`93`	`} catch (RuntimeException $e) {`
`94`		`- if (!$parameter->isDefaultValueAvailable()) {`
	`94`	`+ if ($parameter->allowsNull()) {`
	`95`	`+ $value = null;`
	`96`	`+ } elseif ($parameter->isDefaultValueAvailable()) {`
	`97`	`+ $value = $parameter->getDefaultValue();`
	`98`	`+ } else {`
`95`	`99`	`throw $e;`
`96`	`100`	`}`
`97`		`-`
`98`		`- $value = $parameter->getDefaultValue();`
`99`	`101`	`}`
`100`	`102`	`}`
`101`	`103`	`} catch (\ReflectionException $reflectionException) {`