Fix tests

Author: lookyman

composer.json

@@ -38,12 +38,12 @@
     "phpstan/phpstan-strict-rules": "^0.12",
     "slevomat/coding-standard": "^4.5.2",
     "phpstan/phpstan-phpunit": "^0.12",
-    "symfony/framework-bundle": "^3.0 || ^4.0",
+    "symfony/framework-bundle": "^4.0",
     "squizlabs/php_codesniffer": "^3.3.2",
-    "symfony/serializer": "^3.0 || ^4.0",
+    "symfony/serializer": "^4.0",
     "symfony/messenger": "^4.2",
-    "symfony/console": "^3.0 || ^4.0",
-    "symfony/http-foundation": "^3.0 || ^4.0"
+    "symfony/console": "^4.0",
+    "symfony/http-foundation": "^4.0"
   },
   "conflict": {
     "symfony/framework-bundle": "<3.0"

tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleTest.php

@@ -32,21 +32,6 @@ public function testGetPrivateService(): void
 		);
 	}
 
-	public function testGetPrivateServiceInAbstractController(): void
-	{
-		$this->analyse(
-			[
-				__DIR__ . '/ExampleAbstractController.php',
-			],
-			[
-				[
-					'Service "private" is private.',
-					12,
-				],
-			]
-		);
-	}
-
 	public function testGetPrivateServiceInLegacyServiceSubscriber(): void
 	{
 		if (!interface_exists('Symfony\\Component\\DependencyInjection\\ServiceSubscriberInterface')) {

tests/Rules/Symfony/ContainerInterfaceUnknownServiceRuleTest.php

@@ -7,6 +7,7 @@
 use PHPStan\Symfony\XmlServiceMapFactory;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\Symfony\ServiceTypeSpecifyingExtension;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 /**
@@ -27,6 +28,7 @@ protected function getMethodTypeSpecifyingExtensions(): array
 	{
 		return [
 			new ServiceTypeSpecifyingExtension(Controller::class, new Standard()),
+			new ServiceTypeSpecifyingExtension(AbstractController::class, new Standard()),
 		];
 	}
 

tests/Symfony/NeonTest.php

@@ -30,8 +30,8 @@ public function testExtensionNeon(): void
 		], $parameters['symfony']);
 
 		self::assertCount(6, $container->getServicesByTag('phpstan.rules.rule'));
-		self::assertCount(15, $container->getServicesByTag('phpstan.broker.dynamicMethodReturnTypeExtension'));
-		self::assertCount(6, $container->getServicesByTag('phpstan.typeSpecifier.methodTypeSpecifyingExtension'));
+		self::assertCount(16, $container->getServicesByTag('phpstan.broker.dynamicMethodReturnTypeExtension'));
+		self::assertCount(7, $container->getServicesByTag('phpstan.typeSpecifier.methodTypeSpecifyingExtension'));
 		self::assertInstanceOf(ServiceMap::class, $container->getByType(ServiceMap::class));
 	}
 

tests/Type/Symfony/RequestTypeSpecifyingExtensionTest.php

@@ -5,7 +5,10 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\MethodTypeSpecifyingExtension;
+use ReflectionMethod;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use function strpos;
 
 /**
  * @extends RuleTestCase<VariableTypeReportingRule>
@@ -28,9 +31,17 @@ protected function getMethodTypeSpecifyingExtensions(): array
 
 	public function testGetSession(): void
 	{
+		$ref = new ReflectionMethod(Request::class, 'getSession');
+		$doc = (string) $ref->getDocComment();
+
+		$checkedTypeString = SessionInterface::class;
+		if (strpos($doc, '@return SessionInterface|null') !== false) {
+			$checkedTypeString .= '|null';
+		}
+
 		$this->analyse([__DIR__ . '/request_get_session.php'], [
 			[
-				'Variable $session1 is: ' . SessionInterface::class . '|null',
+				'Variable $session1 is: ' . $checkedTypeString,
 				7,
 			],
 			[