Add InAnyClassScope scope

src/Analyser/InAnyClassScope.php

@@ -0,0 +1,44 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser;
+
+use PHPStan\Reflection\ClassMemberAccessAnswerer;
+use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\ConstantReflection;
+use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\PropertyReflection;
+
+class InAnyClassScope implements ClassMemberAccessAnswerer
+{
+
+	/** @api */
+	public function __construct()
+	{
+	}
+
+	public function isInClass(): bool
+	{
+		return true;
+	}
+
+	public function getClassReflection(): ?ClassReflection
+	{
+		return null;
+	}
+
+	public function canAccessProperty(PropertyReflection $propertyReflection): bool
+	{
+		return $propertyReflection->isPublic();
+	}
+
+	public function canCallMethod(MethodReflection $methodReflection): bool
+	{
+		return $methodReflection->isPublic();
+	}
+
+	public function canAccessConstant(ConstantReflection $constantReflection): bool
+	{
+		return $constantReflection->isPublic();
+	}
+
+}

src/Type/Constant/ConstantArrayType.php

@@ -2,7 +2,7 @@
 
 namespace PHPStan\Type\Constant;
 
-use PHPStan\Analyser\OutOfClassScope;
+use PHPStan\Analyser\InAnyClassScope;
 use PHPStan\Reflection\ClassMemberAccessAnswerer;
 use PHPStan\Reflection\InaccessibleMethod;
 use PHPStan\Reflection\ParametersAcceptor;
@@ -316,13 +316,7 @@ public function equals(Type $type): bool
 
 	public function isCallable(): TrinaryLogic
 	{
-		// @todo is there a way to fetch the full scope here.
-		// An OutOfClassScope causes frivolous errors when checking if a
-		// non-static method was invoked statically in its own class, which
-		// is allowed per: https://3v4l.org/mTa9S.
-		// Should add an optional scope parameter to isCallable and if null,
-		// create a new OutOfClassScope instance.
-		$typeAndMethod = $this->findTypeAndMethodName(new OutOfClassScope());
+		$typeAndMethod = $this->findTypeAndMethodName(new InAnyClassScope());
 		if ($typeAndMethod === null) {
 			return TrinaryLogic::createNo();
 		}
@@ -397,7 +391,7 @@ public function findTypeAndMethodName(?ClassMemberAccessAnswerer $scope = null):
 				$has = $has->and(TrinaryLogic::createMaybe());
 			}
 			if ($scope === null) {
-				$scope = new OutOfClassScope();
+				$scope = new InAnyClassScope();
 			}
 			if (
 				$isClassString