Open 0.12-dev

Author: ondrejmirtes

composer.json

@@ -7,7 +7,7 @@
 	"prefer-stable": true,
 	"extra": {
 		"branch-alias": {
-			"dev-master": "0.11-dev"
+			"dev-master": "0.12-dev"
 		},
 		"phpstan": {
 			"includes": [
@@ -18,17 +18,17 @@
 	},
 	"require": {
 		"php": "~7.1",
-		"phpstan/phpstan": "^0.11.7",
-		"phpstan/phpdoc-parser": "^0.3",
+		"phpstan/phpstan": "^0.12",
+		"phpstan/phpdoc-parser": "^0.4",
 		"nikic/php-parser": "^4.0"
 	},
 	"require-dev": {
 		"consistence/coding-standard": "^3.8",
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
 		"jakub-onderka/php-parallel-lint": "^1.0",
 		"phing/phing": "^2.16.0",
-		"phpstan/phpstan-phpunit": "^0.11",
-		"phpstan/phpstan-strict-rules": "^0.11",
+		"phpstan/phpstan-phpunit": "^0.12",
+		"phpstan/phpstan-strict-rules": "^0.12",
 		"phpunit/phpunit": "^7.0",
 		"slevomat/coding-standard": "^5.0.4",
 		"doctrine/common": "^2.7",

phpstan.neon

@@ -8,16 +8,16 @@ includes:
 
 parameters:
 	excludes_analyse:
-		- */tests/*/data/*
+		- tests/*/data/*
 
 	ignoreErrors:
 		- '~^Parameter \#1 \$node \(.*\) of method .*Rule::processNode\(\) should be contravariant with parameter \$node \(PhpParser\\Node\) of method PHPStan\\Rules\\Rule::processNode\(\)$~'
 		-
 			message: '~^Variable method call on Doctrine\\ORM\\QueryBuilder~'
-			path: */src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php
+			path: src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php
 		-
 			message: '~^Variable method call on object\.$~'
-			path: */src/Type/Doctrine/QueryBuilder/Expr/ExpressionBuilderDynamicReturnTypeExtension.php
+			path: src/Type/Doctrine/QueryBuilder/Expr/ExpressionBuilderDynamicReturnTypeExtension.php
 		-
 			message: '~^Variable property access on PhpParser\\Node\\Stmt\\Declare_\|PhpParser\\Node\\Stmt\\Namespace_\.$~'
-			path: */src/Type/Doctrine/QueryBuilder/QueryBuilderMethodDynamicReturnTypeExtension.php
+			path: src/Type/Doctrine/QueryBuilder/QueryBuilderMethodDynamicReturnTypeExtension.php

src/Type/Doctrine/QueryBuilder/QueryBuilderMethodDynamicReturnTypeExtension.php

@@ -21,6 +21,7 @@
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Doctrine\DoctrineTypeUtils;
+use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
@@ -177,7 +178,7 @@ private function findQueryBuilderTypesInCalledMethod(Scope $scope, MethodCall $m
 			$scope->isDeclareStrictTypes(),
 			$methodReflection,
 			$scope->getNamespace()
-		)->enterClass($methodReflection->getDeclaringClass())->enterClassMethod($methodNode, [], null, null, null, false, false, false);
+		)->enterClass($methodReflection->getDeclaringClass())->enterClassMethod($methodNode, TemplateTypeMap::createEmpty(), [], null, null, null, false, false, false);
 
 		$queryBuilderTypes = [];
 

tests/DoctrineIntegration/ORM/data/customRepositoryUsage-7-missing.json renamed to tests/DoctrineIntegration/ORM/data/customRepositoryUsage-8-missing.json

@@ -7,7 +7,6 @@
 use Doctrine\ORM\Query\Expr\OrderBy;
 use PHPStan\DependencyInjection\Container;
 use PHPStan\DependencyInjection\ContainerFactory;
-use PHPStan\DependencyInjection\Nette\NetteContainer;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\Doctrine\ArgumentsProcessor;
@@ -135,26 +134,18 @@ public function testRuleBranches(bool $fasterVersion): void
 				45,
 			],
 			[
+				'QueryBuilder: [Semantical Error] line 0, col 58 near \'p.id = 1\': Error: \'p\' is not defined.',
+				59,
+			],
+			/*[
 				'QueryBuilder: [Semantical Error] line 0, col 93 near \'t.id = 1\': Error: \'t\' is not defined.',
 				90,
-			],
+			],*/
 			[
 				'QueryBuilder: [Semantical Error] line 0, col 95 near \'foo = 1\': Error: Class PHPStan\Rules\Doctrine\ORM\MyEntity has no field or association named foo',
 				107,
 			],
 		];
-		if (!$fasterVersion) {
-			array_splice($errors, 2, 0, [
-				[
-					'QueryBuilder: [Semantical Error] line 0, col 58 near \'p.id = 1\': Error: \'p\' is not defined.',
-					59,
-				],
-			]);
-			$errors[] = [
-				'QueryBuilder: [Semantical Error] line 0, col 93 near \'t.id = 1\': Error: \'t\' is not defined.',
-				107,
-			];
-		}
 		$this->analyse([__DIR__ . '/data/query-builder-branches-dql.php'], $errors);
 	}
 
@@ -190,10 +181,10 @@ private function getContainerWithDoctrineExtensions(): Container
 	{
 		$rootDir = __DIR__ . '/../../../../vendor/phpstan/phpstan';
 		$containerFactory = new ContainerFactory($rootDir);
-		return new NetteContainer($containerFactory->create($rootDir . '/tmp', [
+		return $containerFactory->create($rootDir . '/tmp', [
 			$containerFactory->getConfigDirectory() . '/config.level7.neon',
 			__DIR__ . '/../../../../extension.neon',
-		], []));
+		], []);
 	}
 
 	/**