Add null as possible return type of Request::getAttribute()

Author: sascha-egerer

src/Type/RequestDynamicReturnTypeExtension.php

@@ -9,6 +9,7 @@
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
 
 class RequestDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
@@ -46,7 +47,7 @@ public function getTypeFromMethodCall(
 		}
 
 		if (isset($this->requestGetAttributeMapping[$argument->value->value])) {
-			return $this->typeStringResolver->resolve($this->requestGetAttributeMapping[$argument->value->value]);
+			return TypeCombinator::addNull($this->typeStringResolver->resolve($this->requestGetAttributeMapping[$argument->value->value]));
 		}
 
 		return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();

tests/Unit/Type/data/request-get-attribute-return-types.neon

@@ -2,4 +2,4 @@ parameters:
     typo3:
         requestGetAttributeMapping:
             myCustomAttribute: FlowdGmbh\MyProject\Http\MyAttribute
-            myCustomNullableAttribute: FlowdGmbh\MyProject\Http\MyAttribute|null
+            myCustomThatCanBeIntAttribute: FlowdGmbh\MyProject\Http\MyAttribute|int

tests/Unit/Type/data/request-get-attribute-return-types.php

@@ -14,12 +14,12 @@ class MyRequest
 
 	public function getAttributeTests(ServerRequestInterface $request): void
 	{
-		assertType(SiteLanguage::class, $request->getAttribute('language'));
-		assertType(Site::class, $request->getAttribute('site'));
-		assertType(NormalizedParams::class, $request->getAttribute('normalizedParams'));
-		assertType('1|2|4|8|16', $request->getAttribute('applicationType'));
-		assertType('FlowdGmbh\\MyProject\\Http\\MyAttribute', $request->getAttribute('myCustomAttribute'));
-		assertType('FlowdGmbh\\MyProject\\Http\\MyAttribute|null', $request->getAttribute('myCustomNullableAttribute'));
+		assertType(SiteLanguage::class . '|null', $request->getAttribute('language'));
+		assertType(Site::class . '|null', $request->getAttribute('site'));
+		assertType(NormalizedParams::class . '|null', $request->getAttribute('normalizedParams'));
+		assertType('1|2|4|8|16|null', $request->getAttribute('applicationType'));
+		assertType('FlowdGmbh\\MyProject\\Http\\MyAttribute|null', $request->getAttribute('myCustomAttribute'));
+		assertType('FlowdGmbh\\MyProject\\Http\\MyAttribute|int|null', $request->getAttribute('myCustomThatCanBeIntAttribute'));
 	}
 
 }