Added support for self, static, parent

Author: lookyman

src/Rules/ContainerInterfacePrivateServiceRule.php

@@ -41,7 +41,7 @@ public function processNode(Node $node, Scope $scope): array
 				&& isset($node->args[0])
 				&& $node->args[0] instanceof Arg
 			) {
-				$service = $this->serviceMap->getServiceFromNode($node->args[0]->value);
+				$service = $this->serviceMap->getServiceFromNode($node->args[0]->value, $scope);
 				if ($service !== \null && !$service['public']) {
 					return [\sprintf('Service "%s" is private.', $service['id'])];
 				}

src/Rules/ContainerInterfaceUnknownServiceRule.php

@@ -41,9 +41,9 @@ public function processNode(Node $node, Scope $scope): array
 				&& isset($node->args[0])
 				&& $node->args[0] instanceof Arg
 			) {
-				$service = $this->serviceMap->getServiceFromNode($node->args[0]->value);
+				$service = $this->serviceMap->getServiceFromNode($node->args[0]->value, $scope);
 				if ($service === \null) {
-					$serviceId = ServiceMap::getServiceIdFromNode($node->args[0]->value);
+					$serviceId = ServiceMap::getServiceIdFromNode($node->args[0]->value, $scope);
 					if ($serviceId !== null) {
 						return [\sprintf('Service "%s" is not registered in the container.', $serviceId)];
 					}

src/ServiceMap.php

@@ -4,6 +4,7 @@
 namespace Lookyman\PHPStan\Symfony;
 
 use Lookyman\PHPStan\Symfony\Exception\XmlContainerNotExistsException;
+use PHPStan\Analyser\Scope;
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\Concat;
 use PhpParser\Node\Expr\ClassConstFetch;
@@ -55,26 +56,23 @@ public function __construct(string $containerXml)
 		}
 	}
 
-	public function getServiceFromNode(Node $node): ?array
+	public function getServiceFromNode(Node $node, Scope $scope): ?array
 	{
-		$serviceId = self::getServiceIdFromNode($node);
+		$serviceId = self::getServiceIdFromNode($node, $scope);
 		return $serviceId !== \null && \array_key_exists($serviceId, $this->services) ? $this->services[$serviceId] : \null;
 	}
 
-	public static function getServiceIdFromNode(Node $node): ?string
+	public static function getServiceIdFromNode(Node $node, Scope $scope): ?string
 	{
 		if ($node instanceof String_) {
 			return $node->value;
 		}
 		if ($node instanceof ClassConstFetch && $node->class instanceof Name) {
-			$serviceId = $node->class->toString();
-			if (!\in_array($serviceId, ['self', 'static', 'parent'], true)) {
-				return $serviceId;
-			}
+			return $scope->resolveName($node->class);
 		}
 		if ($node instanceof Concat) {
-			$left = self::getServiceIdFromNode($node->left);
-			$right = self::getServiceIdFromNode($node->right);
+			$left = self::getServiceIdFromNode($node->left, $scope);
+			$right = self::getServiceIdFromNode($node->right, $scope);
 			if ($left !== null && $right !== null) {
 				return \sprintf('%s%s', $left, $right);
 			}

src/Type/ContainerInterfaceDynamicReturnTypeExtension.php

@@ -43,7 +43,7 @@ public function getTypeFromMethodCall(
 		if (isset($methodCall->args[0])
 			&& $methodCall->args[0] instanceof Arg
 		) {
-			$service = $this->serviceMap->getServiceFromNode($methodCall->args[0]->value);
+			$service = $this->serviceMap->getServiceFromNode($methodCall->args[0]->value, $scope);
 			if ($service !== \null && !$service['synthetic']) {
 				return new ObjectType($service['class'] ?? $service['id']);
 			}

src/Type/ControllerDynamicReturnTypeExtension.php

@@ -43,7 +43,7 @@ public function getTypeFromMethodCall(
 		if (isset($methodCall->args[0])
 			&& $methodCall->args[0] instanceof Arg
 		) {
-			$service = $this->serviceMap->getServiceFromNode($methodCall->args[0]->value);
+			$service = $this->serviceMap->getServiceFromNode($methodCall->args[0]->value, $scope);
 			if ($service !== \null && !$service['synthetic']) {
 				return new ObjectType($service['class'] ?? $service['id']);
 			}

tests/Rules/ContainerInterfaceUnknownServiceRuleTest.php

@@ -31,6 +31,10 @@ public function testGetUnknownService(): void
 				'Service "service.Lookyman\PHPStan\Symfony\ServiceMap" is not registered in the container.',
 				38,
 			],
+			[
+				'Service "Lookyman\PHPStan\Symfony\Rules\data\ExampleController" is not registered in the container.',
+				44,
+			],
 		]);
 	}
 

tests/ServiceMapTest.php

@@ -3,10 +3,15 @@
 
 namespace Lookyman\PHPStan\Symfony;
 
-use PHPUnit\Framework\TestCase;
+use Lookyman\PHPStan\Symfony\Rules\data\ExampleController;
+use PHPStan\Analyser\Scope;
+use PHPStan\Analyser\TypeSpecifier;
+use PHPStan\Testing\TestCase;
+use PhpParser\Node\Expr\BinaryOp\Concat;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Name;
 use PhpParser\Node\Scalar\String_;
+use PhpParser\PrettyPrinter\Standard;
 
 /**
  * @covers \Lookyman\PHPStan\Symfony\ServiceMap
@@ -19,8 +24,13 @@ final class ServiceMapTest extends TestCase
 	 */
 	public function testGetServiceFromNode(array $service): void
 	{
+		$printer = new Standard();
+
 		$serviceMap = new ServiceMap(__DIR__ . '/container.xml');
-		self::assertEquals($service, $serviceMap->getServiceFromNode(new String_($service['id'])));
+		self::assertSame($service, $serviceMap->getServiceFromNode(
+			new String_($service['id']),
+			new Scope($this->createBroker(), $printer, new TypeSpecifier($printer), '')
+		));
 	}
 
 	/**
@@ -46,8 +56,16 @@ public function getServiceFromNodeProvider(): array
 
 	public function testGetServiceIdFromNode(): void
 	{
-		self::assertEquals('foo', ServiceMap::getServiceIdFromNode(new String_('foo')));
-		self::assertEquals('bar', ServiceMap::getServiceIdFromNode(new ClassConstFetch(new Name('bar'), '')));
+		$broker = $this->createBroker();
+		$printer = new Standard();
+		$scope = new Scope($broker, $printer, new TypeSpecifier($printer), '');
+
+		self::assertSame('foo', ServiceMap::getServiceIdFromNode(new String_('foo'), $scope));
+		self::assertSame('bar', ServiceMap::getServiceIdFromNode(new ClassConstFetch(new Name('bar'), ''), $scope));
+		self::assertSame('foobar', ServiceMap::getServiceIdFromNode(new Concat(new String_('foo'), new ClassConstFetch(new Name('bar'), '')), $scope));
+
+		$scope = $scope->enterClass($broker->getClass(ExampleController::class));
+		self::assertEquals(ExampleController::class, ServiceMap::getServiceIdFromNode(new ClassConstFetch(new Name('static'), ExampleController::class), $scope));
 	}
 
 }