Fix Access to an undefined static property in Closure::bind

src/Analyser/MutatingScope.php

@@ -318,21 +318,29 @@ public function enterDeclareStrictTypes(): self
 
 	public function isInClass(): bool
 	{
-		return $this->context->getClassReflection() !== null;
+		return $this->getClassReflection() !== null;
 	}
 
 	public function isInTrait(): bool
 	{
-		return $this->context->getTraitReflection() !== null;
+		return $this->getTraitReflection() !== null;
 	}
 
 	public function getClassReflection(): ?ClassReflection
 	{
+		if ($this->inClosureBindScopeClass !== null && $this->inClosureBindScopeClass !== 'static') {
+			return $this->reflectionProvider->getClass($this->inClosureBindScopeClass);
+		}
+
 		return $this->context->getClassReflection();
 	}
 
 	public function getTraitReflection(): ?ClassReflection
 	{
+		if ($this->inClosureBindScopeClass !== null && $this->inClosureBindScopeClass !== 'static') {
+			return null;
+		}
+
 		return $this->context->getTraitReflection();
 	}
 
@@ -2407,10 +2415,9 @@ public function resolveName(Name $name): string
 	public function resolveTypeByName(Name $name): TypeWithClassName
 	{
 		if ($name->toLowerString() === 'static' && $this->isInClass()) {
-			$classReflection = $this->getClassReflection();
-
-			return new StaticType($classReflection);
+			return new StaticType($this->getClassReflection());
 		}
+
 		$originalClass = $this->resolveName($name);
 		if ($this->isInClass()) {
 			$thisType = new ThisType($this->getClassReflection());

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -401,6 +401,15 @@ public function testBug4715(): void
 		$this->assertCount(0, $errors);
 	}
 
+	public function testBug4734(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-4734.php');
+		$this->assertCount(2, $errors);
+
+		$this->assertSame('Access to an undefined static property Bug4734\Foo::$httpMethodParameterOverride3.', $errors[0]->getMessage());
+		$this->assertSame('Access to an undefined property Bug4734\Foo::$httpMethodParameterOverride4.', $errors[1]->getMessage());
+	}
+
 	/**
 	 * @param string $file
 	 * @return \PHPStan\Analyser\Error[]

tests/PHPStan/Analyser/data/bug-4734.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Bug4734;
+
+use function PHPStan\Analyser\assertType;
+
+class Foo
+{
+	/**
+	 * @var bool
+	 */
+	private static $httpMethodParameterOverride = true;
+
+	/**
+	 * @var bool
+	 */
+	private $httpMethodParameterOverride2 = true;
+}
+
+class Bar
+{
+	public function test(): void
+	{
+		$disableHttpMethodParameterOverride = \Closure::bind(static function (): void {
+			static::$httpMethodParameterOverride = false;
+		}, new Foo(), Foo::class);
+		$disableHttpMethodParameterOverride();
+
+		$disableHttpMethodParameterOverride2 = \Closure::bind(function (): void {
+			$this->httpMethodParameterOverride2 = false;
+		}, new Foo(), Foo::class);
+		$disableHttpMethodParameterOverride2();
+
+		$disableHttpMethodParameterOverride3 = \Closure::bind(function (): void {
+			static::$httpMethodParameterOverride3 = false;
+		}, new Foo(), Foo::class);
+		$disableHttpMethodParameterOverride3();
+
+		$disableHttpMethodParameterOverride4 = \Closure::bind(function (): void {
+			$this->httpMethodParameterOverride4 = false;
+		}, new Foo(), Foo::class);
+		$disableHttpMethodParameterOverride4();
+	}
+}