remove unneeded generated code for never returning methods

Ocramius · May 3, 2022 · 818c8ee · 818c8ee
1 parent 5260382
commit 818c8ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/ProxyManager/ProxyGenerator/NullObject/MethodGenerator/NullObjectMethodInterceptor.php b/src/ProxyManager/ProxyGenerator/NullObject/MethodGenerator/NullObjectMethodInterceptor.php
@@ -7,7 +7,6 @@
 use Laminas\Code\Reflection\MethodReflection;
 use ProxyManager\Generator\MethodGenerator;
 use ProxyManager\Generator\Util\IdentifierSuffixer;
-use ReflectionNamedType;
 
 /**
  * Method decorator for null objects
@@ -19,14 +18,10 @@ class NullObjectMethodInterceptor extends MethodGenerator
      */
     public static function generateMethod(MethodReflection $originalMethod): self
     {
-        $method             = static::fromReflectionWithoutBodyAndDocBlock($originalMethod);
-        $originalReturnType = $originalMethod->getReturnType();
+        $method = static::fromReflectionWithoutBodyAndDocBlock($originalMethod);
 
-        if ($originalReturnType instanceof ReflectionNamedType && $originalReturnType->getName() === 'never') {
-            $method->setBody('throw new \Exception();');
-        } elseif ($originalMethod->returnsReference()) {
+        if ($originalMethod->returnsReference()) {
             $reference = IdentifierSuffixer::getIdentifier('ref');
-
             $method->setBody("\$reference = null;\nreturn \$" . $reference . ';');
         }
 

diff --git a/tests/ProxyManagerTest/Functional/NullObjectFunctionalTest.php b/tests/ProxyManagerTest/Functional/NullObjectFunctionalTest.php
@@ -145,7 +145,7 @@ public function testNeverReturningMethodCalls(): void
         self::assertIsCallable($method);
 
         $this->expectException(Throwable::class);
-        $this->expectExceptionMessage('');
+        $this->expectExceptionMessage('never-returning function must not implicitly return');
         $method(random_int(10, 1000));
     }