Merge branch 'phpstan:2.2.x' into fix-sealed-class-match-exhaustiveness

Author: mhert

conf/config.stubValidator.neon

@@ -4,6 +4,11 @@ parameters:
 	checkMissingTypehints: true
 	checkMissingCallableSignature: false
 	__validate: false
+	reportMaybes: true
+	reportStatic: true
+
+extensions:
+	stubValidatorRules: PHPStan\DependencyInjection\StubValidatorRuleServicesExtension
 
 services:
 	-
@@ -19,6 +24,10 @@ services:
 	nodeScopeResolverReflector:
 		factory: @stubReflector
 
+	# overrides service from services.neon so that Reflector autowires to stubReflector
+	originalBetterReflectionReflector!:
+		factory: @stubReflector
+
 	# overrides service from services.neon
 	reflectionProvider:
 		factory: @stubBetterReflectionProvider

src/Analyser/ExprHandler/AssignHandler.php

@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\AssignRef;
 use PhpParser\Node\Expr\ConstFetch;
+use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\List_;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\PropertyFetch;
@@ -863,6 +864,7 @@ private function processSureTypesForConditionalExpressionsAfterAssign(Scope $sco
 			} elseif (
 				!$expr instanceof PropertyFetch
 				&& !$expr instanceof ArrayDimFetch
+				&& !$expr instanceof FuncCall
 			) {
 				continue;
 			}
@@ -901,6 +903,7 @@ private function processSureNotTypesForConditionalExpressionsAfterAssign(Scope $
 			} elseif (
 				!$expr instanceof PropertyFetch
 				&& !$expr instanceof ArrayDimFetch
+				&& !$expr instanceof FuncCall
 			) {
 				continue;
 			}

src/DependencyInjection/AutowiredAttributeServicesExtension.php

@@ -3,6 +3,7 @@
 namespace PHPStan\DependencyInjection;
 
 use Nette\DI\CompilerExtension;
+use Nette\DI\ContainerBuilder;
 use Nette\DI\Definitions\Reference;
 use Nette\DI\Definitions\ServiceDefinition;
 use Nette\DI\Definitions\Statement;
@@ -63,7 +64,7 @@ public function loadConfiguration(): void
 				$definition->setFactory(new Statement([new Reference(substr($ref, 1)), $method]));
 			}
 
-			$this->processConstructorParameters($class->name, $definition, $constructorParameters);
+			self::processConstructorParameters($builder, $class->name, $definition, $constructorParameters);
 
 			foreach (ValidateServiceTagsExtension::INTERFACE_TAG_MAPPING as $interface => $tag) {
 				if (!$reflection->implementsInterface($interface)) {
@@ -86,7 +87,7 @@ public function loadConfiguration(): void
 				$definition->setFactory(new Statement([new Reference(substr($ref, 1)), $method]));
 			}
 
-			$this->processConstructorParameters($class->name, $definition, $constructorParameters);
+			self::processConstructorParameters($builder, $class->name, $definition, $constructorParameters);
 		}
 
 		foreach (Attributes::findTargetClasses(GenerateFactory::class) as $class) {
@@ -99,7 +100,7 @@ public function loadConfiguration(): void
 			}
 
 			$resultDefinition = $definition->getResultDefinition();
-			$this->processConstructorParameters($class->name, $resultDefinition, $constructorParameters);
+			self::processConstructorParameters($builder, $class->name, $resultDefinition, $constructorParameters);
 		}
 
 		/** @var stdClass&object{level: int|null} $config */
@@ -119,7 +120,7 @@ public function loadConfiguration(): void
 				->setAutowired($class->name)
 				->addTag(LazyRegistry::RULE_TAG);
 
-			$this->processConstructorParameters($class->name, $definition, $constructorParameters);
+			self::processConstructorParameters($builder, $class->name, $definition, $constructorParameters);
 		}
 
 		foreach (Attributes::findTargetClasses(RegisteredCollector::class) as $class) {
@@ -133,17 +134,16 @@ public function loadConfiguration(): void
 				->setAutowired($class->name)
 				->addTag(RegistryFactory::COLLECTOR_TAG);
 
-			$this->processConstructorParameters($class->name, $definition, $constructorParameters);
+			self::processConstructorParameters($builder, $class->name, $definition, $constructorParameters);
 		}
 	}
 
 	/**
 	 * @param class-string $className
 	 * @param array<lowercase-string, non-empty-list<TargetMethodParameter<AutowiredParameter>>> $constructorParameters
 	 */
-	private function processConstructorParameters(string $className, ServiceDefinition $definition, array $constructorParameters): void
+	public static function processConstructorParameters(ContainerBuilder $builder, string $className, ServiceDefinition $definition, array $constructorParameters): void
 	{
-		$builder = $this->getContainerBuilder();
 		foreach ($constructorParameters[strtolower($className)] ?? [] as $autowiredParameter) {
 			$ref = $autowiredParameter->attribute->ref;
 			if ($ref === null) {

src/DependencyInjection/StubValidatorRuleServicesExtension.php

@@ -0,0 +1,42 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+use Nette\DI\CompilerExtension;
+use olvlvl\ComposerAttributeCollector\Attributes;
+use Override;
+use PHPStan\PhpDoc\StubValidator;
+use function strcasecmp;
+use function strtolower;
+
+final class StubValidatorRuleServicesExtension extends CompilerExtension
+{
+
+	#[Override]
+	public function loadConfiguration(): void
+	{
+		require_once __DIR__ . '/../../vendor/attributes.php';
+		$builder = $this->getContainerBuilder();
+
+		$autowiredParameters = Attributes::findTargetMethodParameters(AutowiredParameter::class);
+		$constructorParameters = [];
+		foreach ($autowiredParameters as $parameter) {
+			if (strcasecmp($parameter->method, '__construct') !== 0) {
+				continue;
+			}
+			$lowerClass = strtolower($parameter->class);
+			$constructorParameters[$lowerClass] ??= [];
+			$constructorParameters[$lowerClass][] = $parameter;
+		}
+
+		foreach (Attributes::findTargetClasses(ValidatesStubFiles::class) as $class) {
+			$definition = $builder->addDefinition(null)
+				->setFactory($class->name)
+				->setAutowired(false)
+				->addTag(StubValidator::SERVICE_RULE_TAG);
+
+			AutowiredAttributeServicesExtension::processConstructorParameters($builder, $class->name, $definition, $constructorParameters);
+		}
+	}
+
+}

src/DependencyInjection/ValidatesStubFiles.php

@@ -0,0 +1,19 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+use Attribute;
+
+/**
+ * Registers a rule in the PHPStan\PhpDoc\StubValidator
+ *
+ * See https://phpstan.org/user-guide/stub-files
+ *
+ * Works thanks to https://github.com/ondrejmirtes/composer-attribute-collector
+ * and StubValidatorRuleServicesExtension (similar to AutowiredAttributeServicesExtension).
+ */
+#[Attribute(flags: Attribute::TARGET_CLASS)]
+final class ValidatesStubFiles
+{
+
+}