Make mixin method static if there's __callStatic() in the class

Author: ondrejmirtes

src/Reflection/Mixin/MixinMethodsClassReflectionExtension.php

@@ -54,7 +54,6 @@ private function findMethod(ClassReflection $classReflection, string $methodName
 			if (
 				!$static
 				&& $classReflection->hasNativeMethod('__callStatic')
-				&& !$classReflection->hasNativeMethod('__call')
 			) {
 				$static = true;
 			}

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -2029,6 +2029,14 @@ public function testNonEmptyStringVerbosity(): void
 		]);
 	}
 
+	public function testBug5536(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->analyse([__DIR__ . '/data/bug-5536.php'], []);
+	}
+
 	public function testBug5372(): void
 	{
 		if (!self::$useStaticReflectionProvider && PHP_VERSION_ID < 70400) {

tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php

@@ -445,4 +445,10 @@ public function testBug5259(): void
 		$this->analyse([__DIR__ . '/data/bug-5259.php'], []);
 	}
 
+	public function testBug5536(): void
+	{
+		$this->checkThisOnly = false;
+		$this->analyse([__DIR__ . '/data/bug-5536.php'], []);
+	}
+
 }

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

@@ -0,0 +1,47 @@
+<?php
+
+namespace Bug5536;
+
+/**
+ * @mixin Builder<static>
+ */
+class Model
+{
+	/**
+	 * @param array<int, mixed>  $args
+	 */
+	public function __call(string $method, array $args)
+	{
+		return $this->$method;
+	}
+
+	/**
+	 * @param array<int, mixed>  $args
+	 */
+	public static function __callStatic(string $method, array $args)
+	{
+		return (new static)->$method(...$args);
+	}
+}
+
+/**
+ * @template TModel of Model
+ */
+class Builder
+{
+	/**
+	 * @return array<int, TModel>
+	 */
+	public function all(): array
+	{
+		return [];
+	}
+}
+
+class User extends Model {}
+
+function (): void {
+	User::all();
+	$user = new User();
+	$user->all();
+};