Merge branch 'feature/denormalizer-interface' of git://github.com/tyx/phpstan-symfony into tyx-feature/denormalizer-interface

Author: lookyman

Diff for: extension.neon

@@ -66,7 +66,12 @@ services:
 
 	# SerializerInterface::deserialize() return type
 	-
-		factory: PHPStan\Type\Symfony\SerializerInterfaceDynamicReturnTypeExtension
+		factory: PHPStan\Type\Symfony\SerializerDynamicReturnTypeExtension(Symfony\Component\Serializer\SerializerInterface, deserialize)
+		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
+
+	# DenormalizerInterface::denormalize() return type
+	-
+		factory: PHPStan\Type\Symfony\SerializerDynamicReturnTypeExtension(Symfony\Component\Serializer\Normalizer\DenormalizerInterface, denormalize)
 		tags: [phpstan.broker.dynamicMethodReturnTypeExtension]
 
 	# Envelope::all() return type

Diff for: src/Type/Symfony/SerializerInterfaceDynamicReturnTypeExtension.php renamed to src/Type/Symfony/SerializerDynamicReturnTypeExtension.php

@@ -12,17 +12,29 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
-class SerializerInterfaceDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
+class SerializerDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
+	/** @var string */
+	private $class;
+
+	/** @var string */
+	private $method;
+
+	public function __construct(string $class, string $method)
+	{
+		$this->class = $class;
+		$this->method = $method;
+	}
+
 	public function getClass(): string
 	{
-		return 'Symfony\Component\Serializer\SerializerInterface';
+		return $this->class;
 	}
 
 	public function isMethodSupported(MethodReflection $methodReflection): bool
 	{
-		return $methodReflection->getName() === 'deserialize';
+		return $methodReflection->getName() === $this->method;
 	}
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type

Diff for: tests/Symfony/NeonTest.php

@@ -46,7 +46,7 @@ public function testExtensionNeon(): void
 		], $parameters);
 
 		self::assertCount(6, $container->findByTag('phpstan.rules.rule'));
-		self::assertCount(11, $container->findByTag('phpstan.broker.dynamicMethodReturnTypeExtension'));
+		self::assertCount(12, $container->findByTag('phpstan.broker.dynamicMethodReturnTypeExtension'));
 		self::assertCount(5, $container->findByTag('phpstan.typeSpecifier.methodTypeSpecifyingExtension'));
 		self::assertInstanceOf(ServiceMap::class, $container->getByType(ServiceMap::class));
 	}

Diff for: tests/Type/Symfony/ExtensionTestCase.php

@@ -52,7 +52,8 @@ protected function processFile(
 			true,
 			true,
 			true,
-			[]
+			[],
+			true
 		);
 		$resolver->setAnalysedFiles([$fileHelper->normalizePath($file)]);
 

Diff for: tests/Type/Symfony/SerializerDynamicReturnTypeExtensionTest.php

@@ -0,0 +1,49 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Symfony;
+
+use Iterator;
+
+final class SerializerDynamicReturnTypeExtensionTest extends ExtensionTestCase
+{
+
+	/**
+	 * @dataProvider getContentProvider
+	 */
+	public function testSerializerInterface(string $expression, string $type): void
+	{
+		$this->processFile(
+			__DIR__ . '/serializer.php',
+			$expression,
+			$type,
+			new SerializerDynamicReturnTypeExtension(
+				'Symfony\Component\Serializer\SerializerInterface',
+				'deserialize'
+			)
+		);
+	}
+
+	/**
+	 * @dataProvider getContentProvider
+	 */
+	public function testDenormalizerInterface(string $expression, string $type): void
+	{
+		$this->processFile(
+			__DIR__ . '/denormalizer.php',
+			$expression,
+			$type,
+			new SerializerDynamicReturnTypeExtension(
+				'Symfony\Component\Serializer\Normalizer\DenormalizerInterface',
+				'denormalize'
+			)
+		);
+	}
+
+	public function getContentProvider(): Iterator
+	{
+		yield ['$first', 'Bar'];
+		yield ['$second', 'array<Bar>'];
+		yield ['$third', 'array<array<Bar>>'];
+	}
+
+}

Diff for: tests/Type/Symfony/SerializerInterfaceDynamicReturnTypeExtensionTest.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types = 1);
+
+$serializer = new \Symfony\Component\Serializer\Serializer();
+
+$first = $serializer->denormalize('bar', 'Bar', 'format');
+$second = $serializer->denormalize('bar', 'Bar[]', 'format');
+$third = $serializer->denormalize('bar', 'Bar[][]', 'format');
+
+die;