Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

src/Rules/Classes/ClassAttributesRule.php

@@ -5,11 +5,12 @@
 use Attribute;
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\InClassNode;
 use PHPStan\Rules\AttributesCheck;
 use PHPStan\Rules\Rule;
 
 /**
- * @implements Rule<Node\Stmt\ClassLike>
+ * @implements Rule<InClassNode>
  */
 final class ClassAttributesRule implements Rule
 {
@@ -20,14 +21,16 @@ public function __construct(private AttributesCheck $attributesCheck)
 
 	public function getNodeType(): string
 	{
-		return Node\Stmt\ClassLike::class;
+		return InClassNode::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
+		$classLikeNode = $node->getOriginalNode();
+
 		return $this->attributesCheck->check(
 			$scope,
-			$node->attrGroups,
+			$classLikeNode->attrGroups,
 			Attribute::TARGET_CLASS,
 			'class',
 		);

src/Rules/FunctionCallParametersCheck.php

@@ -325,7 +325,10 @@ public function check(
 			if ($this->checkArgumentTypes) {
 				$parameterType = TypeUtils::resolveLateResolvableTypes($parameter->getType());
 
-				if (!$parameter->passedByReference()->createsNewVariable() || !$isBuiltin) {
+				if (
+					!$parameter->passedByReference()->createsNewVariable()
+					|| (!$isBuiltin && !$argumentValueType instanceof ErrorType)
+				) {
 					$accepts = $this->ruleLevelHelper->accepts($parameterType, $argumentValueType, $scope->isDeclareStrictTypes());
 
 					if (!$accepts->result) {

tests/PHPStan/Rules/Classes/ClassAttributesRuleTest.php

@@ -22,14 +22,18 @@
 class ClassAttributesRuleTest extends RuleTestCase
 {
 
+	private bool $checkExplicitMixed = false;
+
+	private bool $checkImplicitMixed = false;
+
 	protected function getRule(): Rule
 	{
 		$reflectionProvider = $this->createReflectionProvider();
 		return new ClassAttributesRule(
 			new AttributesCheck(
 				$reflectionProvider,
 				new FunctionCallParametersCheck(
-					new RuleLevelHelper($reflectionProvider, true, false, true, false, false, false),
+					new RuleLevelHelper($reflectionProvider, true, false, true, $this->checkExplicitMixed, $this->checkImplicitMixed, false),
 					new NullsafeCheck(),
 					new PhpVersion(80000),
 					new UnresolvableTypeHelper(),
@@ -147,4 +151,20 @@ public function testAllowDynamicPropertiesAttribute(): void
 		$this->analyse([__DIR__ . '/data/allow-dynamic-properties-attribute.php'], []);
 	}
 
+	public function testBug12011(): void
+	{
+		if (PHP_VERSION_ID < 80300) {
+			$this->markTestSkipped('Test requires PHP 8.3.');
+		}
+
+		$this->checkExplicitMixed = true;
+		$this->checkImplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-12011.php'], [
+			[
+				'Parameter #1 $name of attribute class Bug12011\Table constructor expects string|null, int given.',
+				23,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Classes/data/bug-12011.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Bug12011;
+
+use Attribute;
+
+#[Table(self::TABLE_NAME)]
+class HelloWorld
+{
+	private const string TABLE_NAME = 'table';
+}
+
+#[Attribute(Attribute::TARGET_CLASS)]
+final class Table
+{
+	public function __construct(
+		public readonly string|null $name = null,
+		public readonly string|null $schema = null,
+	) {
+	}
+}
+
+#[Table(self::TABLE_NAME)]
+class HelloWorld2
+{
+	private const int TABLE_NAME = 1;
+}

tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php

@@ -852,4 +852,12 @@ public function testBug10872(): void
 		$this->analyse([__DIR__ . '/data/bug-10872.php'], []);
 	}
 
+	public function testBug12015(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkExplicitMixed = true;
+		$this->checkImplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-12015.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-12015.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Bug12015;
+
+class HelloWorld
+{
+
+	/**
+	 * @param-out int $ref
+	 */
+	public static function passRef(?int &$ref): void
+	{
+		$ref = 1;
+	}
+}
+
+function test(): void
+{
+	HelloWorld::passRef($storeHere);
+	echo $storeHere;
+}