Merge pull request #98 from oliverklee/bugfix/transitive-dep

[BUGFIX] Throw ShouldNotHappenException if ServerRequestInterface is missing
sascha-egerer · Oct 30, 2022 · 778aa50 · 778aa50
2 parents 3d6d7d2 + 0e14a31
commit 778aa50
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/Rule/RequestAttributeValidationRule.php b/src/Rule/RequestAttributeValidationRule.php
@@ -45,9 +45,11 @@ public function processNode(Node $node, Scope $scope): array
 
 		$declaringClass = $methodReflection->getDeclaringClass();
 
-		if (!$declaringClass->implementsInterface(ServerRequestInterface::class)
-			&& $declaringClass->getName() !== ServerRequestInterface::class) {
-			return [];
+		if (interface_exists(ServerRequestInterface::class)) {
+			if (!$declaringClass->implementsInterface(ServerRequestInterface::class)
+				&& $declaringClass->getName() !== ServerRequestInterface::class) {
+				return [];
+			}
 		}
 
 		$argument = $node->getArgs()[0] ?? null;

diff --git a/src/Type/RequestDynamicReturnTypeExtension.php b/src/Type/RequestDynamicReturnTypeExtension.php
@@ -10,6 +10,7 @@
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use Psr\Http\Message\ServerRequestInterface;
 
 class RequestDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
@@ -31,7 +32,13 @@ public function __construct(array $requestGetAttributeMapping, TypeStringResolve
 
 	public function getClass(): string
 	{
-		return \Psr\Http\Message\ServerRequestInterface::class;
+		if (!interface_exists(ServerRequestInterface::class)) {
+			throw new \PHPStan\ShouldNotHappenException(
+				'The package "psr/http-message" is not installed, but should be.'
+			);
+		}
+
+		return ServerRequestInterface::class;
 	}
 
 	public function getTypeFromMethodCall(