Call ScopeFactory with just one argument

Author: ondrejmirtes

phpstan-baseline.neon

@@ -25,6 +25,11 @@ parameters:
 			count: 1
 			path: src/Rules/Doctrine/ORM/EntityRelationRule.php
 
+		-
+			message: "#^Calling PHPStan\\\\Analyser\\\\MutatingScope\\:\\:enterNamespace\\(\\) is not covered by backward compatibility promise\\. The method might change in a minor PHPStan version\\.$#"
+			count: 1
+			path: src/Type/Doctrine/QueryBuilder/OtherMethodQueryBuilderParser.php
+
 		-
 			message: "#^Call to method getProperty\\(\\) on an unknown class PHPStan\\\\BetterReflection\\\\Reflection\\\\Adapter\\\\ReflectionEnum\\.$#"
 			count: 1

src/Type/Doctrine/QueryBuilder/OtherMethodQueryBuilderParser.php

@@ -103,13 +103,13 @@ private function findQueryBuilderTypesInCalledMethod(Scope $scope, MethodCall $m
 		/** @var ScopeFactory $scopeFactory */
 		$scopeFactory = $this->container->getByType(ScopeFactory::class);
 
-		$methodScope = $scopeFactory->create(
-			ScopeContext::create($fileName),
-			$scope->isDeclareStrictTypes(),
-			[],
-			$methodReflection,
-			$scope->getNamespace()
-		)->enterClass($methodReflection->getDeclaringClass())->enterClassMethod($methodNode, TemplateTypeMap::createEmpty(), [], null, null, null, false, false, false);
+		$methodScope = $scopeFactory->create(ScopeContext::create($fileName));
+		if ($scope->getNamespace() !== null) {
+			$methodScope = $methodScope->enterNamespace($scope->getNamespace());
+		}
+
+		$methodScope = $methodScope->enterClass($methodReflection->getDeclaringClass())
+			->enterClassMethod($methodNode, TemplateTypeMap::createEmpty(), [], null, null, null, false, false, false);
 
 		$queryBuilderTypes = [];