PhpGenerator: improved optional parameter detection (PHP is buggy until version 5.4.7)

Author: dg

src/PhpGenerator/Parameter.php

@@ -50,8 +50,6 @@ public static function from(\ReflectionParameter $from)
 		$param = new static;
 		$param->name = $from->getName();
 		$param->reference = $from->isPassedByReference();
-		$param->optional = $from->isOptional() || $from->allowsNull();
-		$param->defaultValue = $from->isOptional() ? $from->getDefaultValue() : NULL; // PHP bug #62988
 		try {
 			$param->typeHint = $from->isArray() ? 'array' : ($from->getClass() ? '\\' . $from->getClass()->getName() : '');
 		} catch (\ReflectionException $e) {
@@ -61,6 +59,9 @@ public static function from(\ReflectionParameter $from)
 				throw $e;
 			}
 		}
+		$param->optional = PHP_VERSION_ID < 50407 ? $from->isOptional() || ($param->typeHint && $from->allowsNull()) : $from->isDefaultValueAvailable();
+		$param->defaultValue = (PHP_VERSION_ID === 50316 ? $from->isOptional() : $from->isDefaultValueAvailable()) ? $from->getDefaultValue() : NULL;
+
 		$namespace = /*5.2*PHP_VERSION_ID < 50300 ? '' : */$from->getDeclaringClass()->getNamespaceName();
 		$namespace = $namespace ? "\\$namespace\\" : "\\";
 		if (Nette\Utils\Strings::startsWith($param->typeHint, $namespace)) {

tests/PhpGenerator/PhpGenerator.reflection.expect

@@ -57,7 +57,7 @@ class Class2 extends Class1 implements Interface2
 	 * @return Class1
 	 *
 	 */
-	private function & func3(array $a, Class2 $b = NULL, Unknown $c, \Xyz\Unknown $d)
+	private function & func3(array $a%a?%, Class2 $b = NULL, Unknown $c, \Xyz\Unknown $d, $e)
 	{
 
 	}

tests/PhpGenerator/PhpGenerator.reflection.phpt

@@ -61,7 +61,7 @@ class Class2 extends Class1 implements Interface2
 	 * Func3
 	 * @return Class1
 	 */
-	private function & func3(array $a = array(), Class2 $b = NULL, \Abc\Unknown $c, \Xyz\Unknown $d)
+	private function & func3(array $a = array(), Class2 $b = NULL, \Abc\Unknown $c, \Xyz\Unknown $d, $e)
 	{}
 
 	final function func2()