Helpers::autowireArguments() checks for isDefaultValueAvailable() ins…

…tead of isOptional() Works with signatures like function($a = NULL, $b) since PHP 5.3.17
nette · Feb 5, 2015 · 22494a3 · 22494a3
1 parent 43c60cd
commit 22494a3
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/DI/Helpers.php b/src/DI/Helpers.php
@@ -116,9 +116,8 @@ public static function autowireArguments(\ReflectionFunctionAbstract $method, ar
 					$optCount = 0;
 				}
 
-			} elseif ($parameter->isOptional()) {
-				// PDO::__construct has optional parameter without default value (and isArray() and allowsNull() returns FALSE)
-				$res[$num] = $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : NULL;
+			} elseif ($parameter->isDefaultValueAvailable()) {
+				$res[$num] = $parameter->getDefaultValue();
 				$optCount++;
 
 			} else {