Add typehint on getters (#32)

Add typehint on getters

Author: janlam7

src/Resources/templates/get.php.twig

@@ -18,10 +18,14 @@
  {% if property.collection -%}
  * @return {{ property.fullyQualifiedType }}[]|ImmutableCollection
  {% else -%}
- * @return {{ (property.isComplexType ? property.typeHint : property.type) | phptype }}{{ not property.willGenerateStrict ? '|null' }}
+ * @return {{ (property.isComplexType ? property.typeHint : property.type) | phptype }}{{ property.isNullable or not property.willGenerateStrict ? '|null' }}
  {% endif -%}
  */
-{{ property.getGetVisibility() }} function {{ getter }}()
+{{ property.getGetVisibility() }} function {{ getter }}(){% if property.type != 'resource' and property.type != 'object' %}: {% if property.collection -%} iterable
+{% else -%}{{ property.isNullable or not property.willGenerateStrict ? '?' }}{{ (property.isComplexType ? property.typeHint : property.type) | phptype }}
+{% endif %}{% else %}
+
+{% endif %}
 {
     if (func_num_args() > 0) {
         throw new \BadMethodCallException(

test/Generator/ProductTest.php

@@ -177,9 +177,9 @@ public function testGetSystemNameTooManyArguments()
     public function testGetDuration()
     {
         $duration = new Period();
-        $duration = new \ReflectionProperty(Product::class, 'duration');
-        $duration->setAccessible(true);
-        $duration->setValue($this->product, $duration);
+        $property = new \ReflectionProperty(Product::class, 'duration');
+        $property->setAccessible(true);
+        $property->setValue($this->product, $duration);
 
         self::assertSame($duration, $this->product->getDuration());
     }

test/Generator/TypesTest.php

@@ -53,9 +53,8 @@ public function typeProvider()
 
     public function getTypeProvider()
     {
-        $values = [['id', 0]];
-
-        $class = new \ReflectionClass(Types::class);
+        $values = [['id', '0']];
+        $class  = new \ReflectionClass(Types::class);
 
         foreach ($class->getProperties() as $property) {
             $values[] = [$property->getName(), null, \BadMethodCallException::class, 1];
@@ -64,7 +63,6 @@ public function getTypeProvider()
         foreach ($class->getProperties() as $property) {
             $values[] = [$property->getName(), null, \LogicException::class];
         }
-
         return array_merge($this->typeProvider(), $values);
     }
 

test/Generator/fixtures/expected/ActorMethodsTrait.php

@@ -17,7 +17,7 @@ trait ActorMethodsTrait
      *
      * @return \Hostnet\Component\AccessorGenerator\Generator\fixtures\Movie[]|ImmutableCollection
      */
-    public function getMovies()
+    public function getMovies(): iterable
     {
         if (func_num_args() > 0) {
             throw new \BadMethodCallException(

test/Generator/fixtures/expected/AnnotationsMethodsTrait.php

@@ -17,7 +17,7 @@ trait AnnotationsMethodsTrait
      *
      * @return \DateTime
      */
-    public function getStupid()
+    public function getStupid(): \DateTime
     {
         if (func_num_args() > 0) {
             throw new \BadMethodCallException(

test/Generator/fixtures/expected/CartMethodsTrait.php

@@ -18,7 +18,7 @@ trait CartMethodsTrait
      *
      * @return Client|null
      */
-    public function getCustomer()
+    public function getCustomer(): ?Client
     {
         if (func_num_args() > 0) {
             throw new \BadMethodCallException(

test/Generator/fixtures/expected/CategoryMethodsTrait.php

@@ -17,7 +17,7 @@ trait CategoryMethodsTrait
      *
      * @return \Hostnet\Component\AccessorGenerator\Generator\fixtures\Category[]|ImmutableCollection
      */
-    public function getChildren()
+    public function getChildren(): iterable
     {
         if (func_num_args() > 0) {
             throw new \BadMethodCallException(
@@ -124,9 +124,9 @@ public function removeChild(Category $child)
      *
      * @throws \BadMethodCallException
      *
-     * @return Category
+     * @return Category|null
      */
-    public function getParent()
+    public function getParent(): ?Category
     {
         if (func_num_args() > 0) {
             throw new \BadMethodCallException(

test/Generator/fixtures/expected/CleanCarsMethodsTrait.php

@@ -19,7 +19,7 @@ trait CleanCarsMethodsTrait
      *
      * @return \Hostnet\Component\AccessorGenerator\Generator\fixtures\Car[]|ImmutableCollection
      */
-    public function getCars()
+    public function getCars(): iterable
     {
         if (func_num_args() > 0) {
             throw new \BadMethodCallException(

test/Generator/fixtures/expected/CommentMethodsTrait.php

@@ -14,9 +14,9 @@ trait CommentMethodsTrait
      *
      * @throws \BadMethodCallException
      *
-     * @return string
+     * @return string|null
      */
-    public function getCol()
+    public function getCol(): ?string
     {
         if (func_num_args() > 0) {
             throw new \BadMethodCallException(

test/Generator/fixtures/expected/ConstantDefaultMethodsTrait.php

@@ -18,7 +18,7 @@ trait ConstantDefaultMethodsTrait
      *
      * @return int
      */
-    public function getWeather()
+    public function getWeather(): int
     {
         if (func_num_args() > 0) {
             throw new \BadMethodCallException(