Refactor - Improve default value handling and return type detection in StopwatchDecorator

Author: tarlepp

src/Decorator/StopwatchDecorator.php

@@ -231,39 +231,41 @@ private function getParameterDefaultValue(\ReflectionParameter $param): string
 
     private function getDefaultValueString(\ReflectionParameter $param): string
     {
+        $result = '';
+
         try {
-            if (!$param->isDefaultValueAvailable()) {
-                return '';
+            if ($param->isDefaultValueAvailable()) {
+                /** @psalm-suppress MixedAssignment */
+                $defaultValue = $param->getDefaultValue();
+                $result = ' = ' . var_export($defaultValue, true);
             }
-
-            /** @psalm-suppress MixedAssignment */
-            $defaultValue = $param->getDefaultValue();
-
-            return ' = ' . var_export($defaultValue, true);
         } catch (Throwable) {
             // Default value cannot be determined for internal classes or certain parameter types
-            return '';
+            $result = '';
         }
+
+        return $result;
     }
 
     /**
      * @return array{0: string, 1: bool}
      */
     private function getMethodReturnType(ReflectionMethod $method): array
     {
-        if (!$method->hasReturnType()) {
-            return ['', false];
-        }
+        $returnType = '';
+        $isVoid = false;
 
-        $type = $method->getReturnType();
+        if ($method->hasReturnType()) {
+            $type = $method->getReturnType();
 
-        if ($type === null) {
-            return ['', false];
+            if ($type !== null) {
+                $typeString = (string)$type;
+                $returnType = ': ' . $typeString;
+                $isVoid = $typeString === 'void';
+            }
         }
 
-        $typeString = (string)$type;
-
-        return [': ' . $typeString, $typeString === 'void'];
+        return [$returnType, $isVoid];
     }
 
     private function generateMethodBody(string $methodName, string $argsList, bool $isVoid): string

tests/Integration/Decorator/StopwatchDecoratorTest.php

@@ -156,11 +156,11 @@ public function testThatDecoratorDoesNotTryToDecorateEntityObjects(): void
     }
 
     /**
-     * @return Generator<array{0: string, 1: object}>
+     * @return Generator<array-key, array{0: class-string, 1: object}>
      */
     public static function dataProviderTestThatDecorateMethodReturnsExpected(): Generator
     {
-        yield ['object', new EntityReferenceExists()];
+        yield [EntityReferenceExists::class, new EntityReferenceExists()];
         yield [stdClass::class, new stdClass()];
     }
 }