Fix Envelope::all() return type

phpstan · Nov 4, 2022 · d6ea162 · d6ea162
1 parent 7210072
commit d6ea162
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
   "require": {
     "php": "^7.2 || ^8.0",
     "ext-simplexml": "*",
-    "phpstan/phpstan": "^1.8.2"
+    "phpstan/phpstan": "^1.9.1"
   },
   "conflict": {
     "symfony/framework-bundle": "<3.0"

diff --git a/src/Type/Symfony/EnvelopeReturnTypeExtension.php b/src/Type/Symfony/EnvelopeReturnTypeExtension.php
@@ -5,10 +5,12 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
-use PHPStan\Type\MixedType;
+use PHPStan\Type\Generic\GenericClassStringType;
+use PHPStan\Type\IntegerType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use function count;
@@ -33,15 +35,18 @@ public function getTypeFromMethodCall(
 	): Type
 	{
 		if (count($methodCall->getArgs()) === 0) {
-			return new ArrayType(new MixedType(), new ArrayType(new MixedType(), new ObjectType('Symfony\Component\Messenger\Stamp\StampInterface')));
+			return new ArrayType(
+				new GenericClassStringType(new ObjectType('Symfony\Component\Messenger\Stamp\StampInterface')),
+				AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), new ObjectType('Symfony\Component\Messenger\Stamp\StampInterface')))
+			);
 		}
 
 		$argType = $scope->getType($methodCall->getArgs()[0]->value);
 		if (!$argType instanceof ConstantStringType) {
-			return new ArrayType(new MixedType(), new ObjectType('Symfony\Component\Messenger\Stamp\StampInterface'));
+			return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), new ObjectType('Symfony\Component\Messenger\Stamp\StampInterface')));
 		}
 
-		return new ArrayType(new MixedType(), new ObjectType($argType->getValue()));
+		return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), new ObjectType($argType->getValue())));
 	}
 
 }
diff --git a/stubs/Symfony/Component/Messenger/Envelope.stub b/stubs/Symfony/Component/Messenger/Envelope.stub
@@ -14,11 +14,4 @@ final class Envelope
     public function last(string $stampFqcn): ?StampInterface
     {
     }
-
-    /**
-     * @return ($stampFqcn is null ? array<string, list<StampInterface>> : list<StampInterface>)
-     */
-    public function all(?string $stampFqcn = null): array
-    {
-    }
 }
diff --git a/tests/Type/Symfony/ExtensionTest.php b/tests/Type/Symfony/ExtensionTest.php
@@ -76,6 +76,7 @@ public static function getAdditionalConfigFiles(): array
 		return [
 			__DIR__ . '/../../../extension.neon',
 			__DIR__ . '/extension-test.neon',
+			'phar://' . __DIR__ . '/../../../vendor/phpstan/phpstan/phpstan.phar/conf/bleedingEdge.neon',
 		];
 	}
 

diff --git a/tests/Type/Symfony/data/envelope_all.php b/tests/Type/Symfony/data/envelope_all.php
@@ -4,6 +4,6 @@
 
 $envelope = new \Symfony\Component\Messenger\Envelope(new stdClass());
 
-assertType('array<Symfony\Component\Messenger\Stamp\ReceivedStamp>', $envelope->all(\Symfony\Component\Messenger\Stamp\ReceivedStamp::class));
-assertType('array<Symfony\Component\Messenger\Stamp\StampInterface>', $envelope->all(random_bytes(1)));
-assertType('array<array<Symfony\Component\Messenger\Stamp\StampInterface>>', $envelope->all());
+assertType('list<Symfony\Component\Messenger\Stamp\ReceivedStamp>', $envelope->all(\Symfony\Component\Messenger\Stamp\ReceivedStamp::class));
+assertType('list<Symfony\Component\Messenger\Stamp\StampInterface>', $envelope->all(random_bytes(1)));
+assertType('array<class-string<Symfony\Component\Messenger\Stamp\StampInterface>, list<Symfony\Component\Messenger\Stamp\StampInterface>>', $envelope->all());