Honor new contracts namespace as-of Symfony 4.2 for ServiceSubscriberInterface

phpstan.neon

@@ -6,7 +6,7 @@ includes:
 parameters:
 	excludes_analyse:
 		- */tests/tmp/*
-		- */tests/*/ExampleContainer.php
-		- */tests/*/ExampleController.php
-		- */tests/*/ExampleServiceSubscriber.php
+		- */tests/*/Example*.php
+		- */tests/*/header_bag_get.php
 		- */tests/*/request_get_content.php
+		- */tests/*/serializer.php

src/Rules/Symfony/ContainerInterfacePrivateServiceRule.php

@@ -49,8 +49,9 @@ public function processNode(Node $node, Scope $scope): array
 		$argType = $scope->getType($node->var);
 
 		$isTestContainerType = (new ObjectType('Symfony\Bundle\FrameworkBundle\Test\TestContainer'))->isSuperTypeOf($argType);
-		$isServiceSubscriber = (new ObjectType('Symfony\Component\DependencyInjection\ServiceSubscriberInterface'))->isSuperTypeOf($argType);
-		if ($isTestContainerType->yes() || $isServiceSubscriber->yes()) {
+		$isOldServiceSubscriber = (new ObjectType('Symfony\Component\DependencyInjection\ServiceSubscriberInterface'))->isSuperTypeOf($argType);
+		$isServiceSubscriber = (new ObjectType('Symfony\Contracts\Service\ServiceSubscriberInterface'))->isSuperTypeOf($argType);
+		if ($isTestContainerType->yes() || $isOldServiceSubscriber->yes() || $isServiceSubscriber->yes()) {
 			return [];
 		}
 

tests/Rules/Symfony/ContainerInterfacePrivateServiceRuleTest.php

@@ -29,15 +29,33 @@ public function testGetPrivateService(): void
 		);
 	}
 
-	public function testGetPrivateServiceInServiceSubscriber(): void
+	public function testGetPrivateServiceInLegacyServiceSubscriber(): void
 	{
 		if (!interface_exists('Symfony\\Component\\DependencyInjection\\ServiceSubscriberInterface')) {
 			self::markTestSkipped('The test needs Symfony\Component\DependencyInjection\ServiceSubscriberInterface class.');
 		}
 
+		$this->analyse(
+			[
+				__DIR__ . '/ExampleLegacyServiceSubscriber.php',
+				__DIR__ . '/ExampleLegacyServiceSubscriberFromAbstractController.php',
+				__DIR__ . '/ExampleLegacyServiceSubscriberFromLegacyController.php',
+			],
+			[]
+		);
+	}
+
+	public function testGetPrivateServiceInServiceSubscriber(): void
+	{
+		if (!interface_exists('Symfony\Contracts\Service\ServiceSubscriberInterface')) {
+			self::markTestSkipped('The test needs Symfony\Contracts\Service\ServiceSubscriberInterface class.');
+		}
+
 		$this->analyse(
 			[
 				__DIR__ . '/ExampleServiceSubscriber.php',
+				__DIR__ . '/ExampleServiceSubscriberFromAbstractController.php',
+				__DIR__ . '/ExampleServiceSubscriberFromLegacyController.php',
 			],
 			[]
 		);

tests/Rules/Symfony/ExampleLegacyServiceSubscriber.php

@@ -0,0 +1,23 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Symfony;
+
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+
+final class ExampleLegacyServiceSubscriber implements ServiceSubscriberInterface
+{
+
+	public function privateService(): void
+	{
+		$this->get('private');
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public static function getSubscribedServices(): array
+	{
+		return [];
+	}
+
+}

tests/Rules/Symfony/ExampleLegacyServiceSubscriberFromAbstractController.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Symfony;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+
+final class ExampleLegacyServiceSubscriberFromAbstractController extends AbstractController implements ServiceSubscriberInterface
+{
+
+	public function privateService(): void
+	{
+		$this->get('private');
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public static function getSubscribedServices(): array
+	{
+		return [];
+	}
+
+}

tests/Rules/Symfony/ExampleLegacyServiceSubscriberFromLegacyController.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Symfony;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+
+final class ExampleLegacyServiceSubscriberFromLegacyController extends Controller implements ServiceSubscriberInterface
+{
+
+	public function privateService(): void
+	{
+		$this->get('private');
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public static function getSubscribedServices(): array
+	{
+		return [];
+	}
+
+}

tests/Rules/Symfony/ExampleServiceSubscriber.php

@@ -2,10 +2,9 @@
 
 namespace PHPStan\Rules\Symfony;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
 
-final class ExampleServiceSubscriber extends Controller implements ServiceSubscriberInterface
+final class ExampleServiceSubscriber implements ServiceSubscriberInterface
 {
 
 	public function privateService(): void

tests/Rules/Symfony/ExampleServiceSubscriberFromAbstractController.php

@@ -0,0 +1,23 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Symfony;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+final class ExampleServiceSubscriberFromAbstractController extends AbstractController
+{
+
+	public function privateService(): void
+	{
+		$this->get('private');
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public static function getSubscribedServices(): array
+	{
+		return [];
+	}
+
+}

tests/Rules/Symfony/ExampleServiceSubscriberFromLegacyController.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Symfony;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
+
+final class ExampleServiceSubscriberFromLegacyController extends Controller implements ServiceSubscriberInterface
+{
+
+	public function privateService(): void
+	{
+		$this->get('private');
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public static function getSubscribedServices(): array
+	{
+		return [];
+	}
+
+}