Fixed build

phpstan · Oct 30, 2018 · eb4b487 · eb4b487
1 parent 929440a
commit eb4b487
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 164 deletions.
diff --git a/tests/Symfony/ExampleContainer.php b/tests/Symfony/ExampleContainer.php
diff --git a/tests/Symfony/NeonTest.php b/tests/Symfony/NeonTest.php
@@ -22,13 +22,24 @@ public function testExtensionNeon(): void
 		@unlink($generatedContainer);
 		self::assertFileNotExists($generatedContainer);
 
-		$loader->load(function (Compiler $compiler): void {
+		$class = $loader->load(function (Compiler $compiler): void {
 			$compiler->addExtension('rules', new RulesExtension());
 			$compiler->loadConfig(__DIR__ . '/config.neon');
 			$compiler->loadConfig(__DIR__ . '/../../extension.neon');
 		}, $key);
-
-		self::assertFileEquals(__DIR__ . '/ExampleContainer.php', $generatedContainer);
+		/** @var \Nette\DI\Container $container */
+		$container = new $class();
+
+		self::assertSame([
+			'symfony' => [
+				'container_xml_path' => '',
+				'constant_hassers' => true,
+			],
+		], $container->getParameters());
+
+		self::assertCount(2, $container->findByTag('phpstan.rules.rule'));
+		self::assertCount(4, $container->findByTag('phpstan.broker.dynamicMethodReturnTypeExtension'));
+		self::assertCount(3, $container->findByTag('phpstan.typeSpecifier.methodTypeSpecifyingExtension'));
 	}
 
 }
diff --git a/tests/Type/Symfony/ExtensionTestCase.php b/tests/Type/Symfony/ExtensionTestCase.php
@@ -10,14 +10,12 @@
 use PHPStan\Broker\AnonymousClassNameHelper;
 use PHPStan\Cache\Cache;
 use PHPStan\File\FileHelper;
-use PHPStan\File\RelativePathHelper;
 use PHPStan\PhpDoc\PhpDocStringResolver;
 use PHPStan\PhpDoc\TypeNodeResolver;
 use PHPStan\Testing\TestCase;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\FileTypeMapper;
 use PHPStan\Type\VerbosityLevel;
-use const DIRECTORY_SEPARATOR;
 
 abstract class ExtensionTestCase extends TestCase
 {
@@ -41,13 +39,13 @@ protected function processFile(
 		$resolver = new NodeScopeResolver(
 			$broker,
 			$parser,
-			new FileTypeMapper(
+			new FileTypeMapper(...[ // PHPStan commit 7b23c31 broke the constructor so we have to use splat here
 				$parser,
 				$phpDocStringResolver,
 				$this->createMock(Cache::class),
-				new AnonymousClassNameHelper($fileHelper, new RelativePathHelper($currentWorkingDirectory, DIRECTORY_SEPARATOR, [])),
-				$typeNodeResolver
-			),
+				$this->createMock(AnonymousClassNameHelper::class), // PHPStan commit 4fcdccc broke the helper so we have to use a mock here
+				$typeNodeResolver,
+			]),
 			$fileHelper,
 			$typeSpecifier,
 			true,
@@ -66,7 +64,7 @@ function (Node $node, Scope $scope) use ($expression, $type, &$run): void {
 				}
 				/** @var \PhpParser\Node\Stmt\Expression $expNode */
 				$expNode = $this->getParser()->parseString(sprintf('<?php %s;', $expression))[0];
-				self::assertSame($type, $scope->getType($expNode->expr)->describe(VerbosityLevel::precise()));
+				self::assertSame($type, $scope->getType($expNode->expr)->describe(VerbosityLevel::typeOnly()));
 				$run = true;
 			}
 		);