Fix ReadOnly method proxy return when parent return type is void

steevanb · Feb 14, 2018 · 35e6249 · 35e6249
1 parent d1fd4e5
commit 35e6249
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/Hydrator/ReadOnlyHydrator.php b/Hydrator/ReadOnlyHydrator.php
@@ -170,7 +170,7 @@ protected function getProxyDirectory()
     /**
      * @param \ReflectionMethod $reflectionMethod
      * @param array $properties
-     * @return string|false
+     * @return array
      */
     protected function getUsedProperties(\ReflectionMethod $reflectionMethod, $properties)
     {
@@ -276,19 +276,24 @@ protected function getPhpForMethod(\ReflectionMethod $reflectionMethod, array $p
                     case 'parent':
                         throw new \Exception('Function with return type parent can\'t be overloaded.');
                     default:
-                        $returnType = $this->getFullQualifiedClassName(static::extractNameFromReflexionType($reflectionMethod->getReturnType()));
+                        $returnType = $this->getFullQualifiedClassName(
+                            static::extractNameFromReflexionType($reflectionMethod->getReturnType())
+                        );
                 }
             }
+            $returnKeyWord = ($returnType === 'void') ? null : 'return ';
 
             $signature .= $returnType;
+        } else {
+            $returnKeyWord = 'return ';
         }
 
         $php = <<<PHP
     $signature
     {
         \$this->assertReadOnlyPropertiesAreLoaded(array($propertiesToAssert));
 
-        return call_user_func_array(array('parent', '$method'), func_get_args());
+        ${returnKeyWord}call_user_func_array(array('parent', '$method'), func_get_args());
     }
 PHP;
 

diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
-[![version](https://img.shields.io/badge/version-2.2.1-green.svg)](https://github.com/steevanb/doctrine-read-only-hydrator/tree/2.2.1)
+[![version](https://img.shields.io/badge/version-2.2.2-green.svg)](https://github.com/steevanb/doctrine-read-only-hydrator/tree/2.2.2)
 [![doctrine](https://img.shields.io/badge/doctrine/orm-^2.4.8-blue.svg)](http://www.doctrine-project.org)
 [![php](https://img.shields.io/badge/php-^5.4.6%20||%20^7.0-blue.svg)](http://www.doctrine-project.org)
-![Lines](https://img.shields.io/badge/code%20lines-1227-green.svg)
+![Lines](https://img.shields.io/badge/code%20lines-1226-green.svg)
 ![Total Downloads](https://poser.pugx.org/steevanb/doctrine-read-only-hydrator/downloads)
-[![SensionLabsInsight](https://img.shields.io/badge/SensionLabsInsight-platinum-brightgreen.svg)](https://insight.sensiolabs.com/projects/bd1b7a42-6a2c-4918-9986-3361dd40cc86/analyses/27)
+[![SensionLabsInsight](https://img.shields.io/badge/SensionLabsInsight-platinum-brightgreen.svg)](https://insight.sensiolabs.com/projects/bd1b7a42-6a2c-4918-9986-3361dd40cc86/analyses/30)
 [![Scrutinizer](https://scrutinizer-ci.com/g/steevanb/doctrine-read-only-hydrator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/steevanb/doctrine-read-only-hydrator/)
 
 doctrine-read-only-hydrator

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,7 @@
+### [2.2.2](../../compare/2.2.1...2.2.2) (2018-02-14)
+
+- Fix ReadOnly method proxy return when parent return type is void
+
 ### [2.2.1](../../compare/2.2.0...2.2.1) (2017-09-04)
 
 - Fix ReadOnlyProxy not added to classMetadata list, you can now use $queryBuilder->getParameter('foo', $foo) instead of $queryBuilder->getParameter('foo', $foo->getId()