Merge branch 'feature/#62-allow-methodgenerator-set-return-type-when-…

…rebuilding-from-array' into develop Close #62
zendframework · Sep 20, 2016 · da7ef15 · da7ef15
2 parents 3a9ec93 + 55dfafa
commit da7ef15
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/Generator/MethodGenerator.php b/src/Generator/MethodGenerator.php
@@ -165,6 +165,9 @@ public static function fromArray(array $array)
                 case 'visibility':
                     $method->setVisibility($value);
                     break;
+                case 'returntype':
+                    $method->setReturnType($value);
+                    break;
             }
         }
 
@@ -283,6 +286,14 @@ public function setReturnType($returnType = null)
         return $this;
     }
 
+    /**
+     * @return TypeGenerator|null
+     */
+    public function getReturnType()
+    {
+        return $this->returnType;
+    }
+
     /**
      * @param bool $returnsReference
      *

diff --git a/test/Generator/MethodGeneratorTest.php b/test/Generator/MethodGeneratorTest.php
@@ -237,6 +237,7 @@ public function testCreateFromArray()
             'final'      => true,
             'static'     => true,
             'visibility' => MethodGenerator::VISIBILITY_PROTECTED,
+            'returntype' => '\\SampleType',
         ]);
 
         $this->assertEquals('SampleMethod', $methodGenerator->getName());
@@ -246,6 +247,8 @@ public function testCreateFromArray()
         $this->assertTrue($methodGenerator->isFinal());
         $this->assertTrue($methodGenerator->isStatic());
         $this->assertEquals(MethodGenerator::VISIBILITY_PROTECTED, $methodGenerator->getVisibility());
+        $this->assertInstanceOf('Zend\Code\Generator\TypeGenerator', $methodGenerator->getReturnType());
+        $this->assertEquals('\\SampleType', $methodGenerator->getReturnType()->generate());
     }
 
     public function testCreateInterfaceMethodFromArray()