Fixed compatibility with prefixed PHPStan PHAR in NeonTest

Author: ondrejmirtes

composer.json

@@ -33,7 +33,6 @@
     "consistence/coding-standard": "^3.0.1",
     "jakub-onderka/php-parallel-lint": "^1.0",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
-    "nette/di": "^3.0-stable",
     "phpunit/phpunit": "^7.0",
     "phing/phing": "^2.16.0",
     "phpstan/phpstan-strict-rules": "^0.12",

tests/Symfony/NeonTest.php

@@ -2,53 +2,36 @@
 
 namespace PHPStan\Symfony;
 
-use Nette\DI\Compiler;
-use Nette\DI\ContainerLoader;
-use PHPStan\DependencyInjection\ParametersSchemaExtension;
-use PHPStan\DependencyInjection\RulesExtension;
+use PHPStan\DependencyInjection\ContainerFactory;
 use PHPUnit\Framework\TestCase;
-use function sprintf;
-use function unlink;
 
 final class NeonTest extends TestCase
 {
 
 	public function testExtensionNeon(): void
 	{
-		$key = '';
 		$tmpDir = __DIR__ . '/../tmp';
-		$loader = new ContainerLoader($tmpDir, true);
-		$generatedContainer = sprintf('%s/%s.php', $tmpDir, $loader->getClassName($key));
-
-		@unlink($generatedContainer);
-		self::assertFileNotExists($generatedContainer);
-
-		$class = $loader->load(function (Compiler $compiler): void {
-			$compiler->addExtension('rules', new RulesExtension());
-			$compiler->addExtension('parametersSchema', new ParametersSchemaExtension());
-			$compiler->addConfig(['parameters' => ['rootDir' => __DIR__]]);
-			$compiler->loadConfig(__DIR__ . '/../../extension.neon');
-			$compiler->loadConfig(__DIR__ . '/../../rules.neon');
-			$compiler->loadConfig(__DIR__ . '/config.neon');
-		}, $key);
-		/** @var \Nette\DI\Container $container */
-		$container = new $class();
+		$containerFactory = new ContainerFactory(__DIR__);
+		$container = $containerFactory->create($tmpDir, [
+			__DIR__ . '/../../extension.neon',
+			__DIR__ . '/../../rules.neon',
+			__DIR__ . '/config.neon',
 
+		], []);
 		$parameters = $container->getParameters();
-		unset($parameters['__parametersSchema']);
-
-		self::assertSame([
-			'rootDir' => __DIR__,
-			'symfony' => [
-				'container_xml_path' => __DIR__ . '/container.xml',
-				'constant_hassers' => true,
-				'console_application_loader' => null,
-			],
-		], $parameters);
-
-		self::assertCount(6, $container->findByTag('phpstan.rules.rule'));
-		self::assertCount(12, $container->findByTag('phpstan.broker.dynamicMethodReturnTypeExtension'));
-		self::assertCount(6, $container->findByTag('phpstan.typeSpecifier.methodTypeSpecifyingExtension'));
+		$this->assertArrayHasKey('rootDir', $parameters);
+		$this->assertSame(realpath(__DIR__  . '/../../vendor/phpstan/phpstan'), $parameters['rootDir']);
+
+		$this->assertArrayHasKey('symfony', $parameters);
+		$this->assertSame([
+			'container_xml_path' => __DIR__ . '/container.xml',
+			'constant_hassers' => true,
+			'console_application_loader' => null,
+		] , $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::assertInstanceOf(ServiceMap::class, $container->getByType(ServiceMap::class));
 	}
 

tests/Symfony/config.neon

@@ -1,17 +1,3 @@
 parameters:
 	symfony:
-		container_xml_path: %rootDir%/container.xml
-
-services:
-	- PhpParser\PrettyPrinter\Standard
-
-	-
-		class: PHPStan\DependencyInjection\Container
-		factory: PHPStan\DependencyInjection\Nette\NetteContainer
-
-	broker:
-		class: PHPStan\Broker\Broker
-		factory: @brokerFactory::create
-
-	brokerFactory:
-		class: PHPStan\Broker\BrokerFactory
+		container_xml_path: container.xml

tests/Type/Symfony/ExtensionTestCase.php

@@ -11,6 +11,7 @@
 use PHPStan\Cache\Cache;
 use PHPStan\File\FileHelper;
 use PHPStan\Node\VirtualNode;
+use PHPStan\PhpDoc\PhpDocNodeResolver;
 use PHPStan\PhpDoc\PhpDocStringResolver;
 use PHPStan\PhpDoc\TypeNodeResolver;
 use PHPStan\Testing\TestCase;
@@ -43,6 +44,7 @@ protected function processFile(
 			new FileTypeMapper(
 				$parser,
 				$phpDocStringResolver,
+				self::getContainer()->getByType(PhpDocNodeResolver::class),
 				$this->createMock(Cache::class),
 				$this->createMock(AnonymousClassNameHelper::class),
 				$typeNodeResolver