Merge branch 'fix/#95-non-optional-parameters-can-be-nullable'

Close #95

Author: Ocramius

src/Generator/ParameterGenerator.php

@@ -63,7 +63,7 @@ public static function fromReflection(ParameterReflection $reflectionParameter)
 
         $param->setVariadic($variadic);
 
-        if (! $variadic && $reflectionParameter->isOptional()) {
+        if (! $variadic && ($reflectionParameter->isOptional() || $reflectionParameter->isDefaultValueAvailable())) {
             try {
                 $param->setDefaultValue($reflectionParameter->getDefaultValue());
             } catch (\ReflectionException $e) {

test/Generator/ParameterGeneratorTest.php

@@ -11,7 +11,9 @@
 
 use Zend\Code\Generator\ParameterGenerator;
 use Zend\Code\Generator\ValueGenerator;
+use Zend\Code\Reflection\MethodReflection;
 use Zend\Code\Reflection\ParameterReflection;
+use ZendTest\Code\Generator\TestAsset\ParameterClass;
 use ZendTest\Code\TestAsset\ClassTypeHintedClass;
 use ZendTest\Code\TestAsset\DocBlockOnlyHintsClass;
 use ZendTest\Code\TestAsset\InternalHintsClass;
@@ -98,6 +100,22 @@ public function testFromReflectionGetDefaultValue()
         $this->assertEquals('\'foo\'', (string) $defaultValue);
     }
 
+    /**
+     * @group 95
+     */
+    public function testFromReflectionGetDefaultValueNotOptional()
+    {
+        $method = new MethodReflection(ParameterClass::class, 'defaultObjectEqualsNullAndNotOptional');
+
+        $params = $method->getParameters();
+
+        $this->assertCount(2, $params);
+
+        $firstParameter = ParameterGenerator::fromReflection($params[0]);
+        $this->assertInstanceOf(ValueGenerator::class, $firstParameter->getDefaultValue());
+        $this->assertNull($firstParameter->getDefaultValue()->getSourceContent());
+    }
+
     public function testFromReflectionGetArrayHint()
     {
         $reflectionParameter = $this->getFirstReflectionParameter('fromArray');

test/Generator/TestAsset/ParameterClass.php

@@ -82,6 +82,11 @@ public function defaultConstant($con = self::FOO)
 
     }
 
+    public function defaultObjectEqualsNullAndNotOptional(\stdClass $a = null, $b)
+    {
+
+    }
+
     /**
      * @param int $integer
      */