Merge branch 'phpstan:2.1.x' into mb_convert_encoding-can-return-false

Author: jack-worman

Makefile

@@ -95,6 +95,7 @@ lint:
 		--exclude tests/PHPStan/Parser/data/cleaning-property-hooks-after.php \
 		--exclude tests/PHPStan/Rules/Properties/data/existing-classes-property-hooks.php \
 		--exclude tests/PHPStan/Rules/Properties/data/set-property-hook-parameter.php \
+		--exclude tests/PHPStan/Rules/Properties/data/overriding-final-property.php \
 		src tests
 
 cs:

conf/config.level0.neon

@@ -97,6 +97,7 @@ rules:
 	- PHPStan\Rules\Properties\MissingReadOnlyPropertyAssignRule
 	- PHPStan\Rules\Properties\MissingReadOnlyByPhpDocPropertyAssignRule
 	- PHPStan\Rules\Properties\PropertiesInInterfaceRule
+	- PHPStan\Rules\Properties\PropertyAssignRefRule
 	- PHPStan\Rules\Properties\PropertyAttributesRule
 	- PHPStan\Rules\Properties\PropertyHookAttributesRule
 	- PHPStan\Rules\Properties\PropertyInClassRule
@@ -179,9 +180,6 @@ services:
 		class: PHPStan\Rules\Properties\AccessPropertiesRule
 		tags:
 			- phpstan.rules.rule
-		arguments:
-			reportMagicProperties: %reportMagicProperties%
-			checkDynamicProperties: %checkDynamicProperties%
 
 	-
 		class: PHPStan\Rules\Properties\AccessStaticPropertiesRule

conf/config.neon

@@ -1033,6 +1033,12 @@ services:
 	-
 		class: PHPStan\Rules\Playground\NeverRuleHelper
 
+	-
+		class: PHPStan\Rules\Properties\AccessPropertiesCheck
+		arguments:
+			reportMagicProperties: %reportMagicProperties%
+			checkDynamicProperties: %checkDynamicProperties%
+
 	-
 		class: PHPStan\Rules\Properties\LazyReadWritePropertiesExtensionProvider
 

src/Analyser/MutatingScope.php

@@ -5381,12 +5381,67 @@ private function getBooleanExpressionDepth(Expr $expr, int $depth = 0): int
 		return $depth;
 	}
 
-	/** @api */
+	/**
+	 * @api
+	 * @deprecated Use canReadProperty() or canWriteProperty()
+	 */
 	public function canAccessProperty(PropertyReflection $propertyReflection): bool
 	{
 		return $this->canAccessClassMember($propertyReflection);
 	}
 
+	/** @api */
+	public function canReadProperty(ExtendedPropertyReflection $propertyReflection): bool
+	{
+		return $this->canAccessClassMember($propertyReflection);
+	}
+
+	/** @api */
+	public function canWriteProperty(ExtendedPropertyReflection $propertyReflection): bool
+	{
+		if (!$propertyReflection->isPrivateSet() && !$propertyReflection->isProtectedSet()) {
+			return $this->canAccessClassMember($propertyReflection);
+		}
+
+		if (!$this->phpVersion->supportsAsymmetricVisibility()) {
+			return $this->canAccessClassMember($propertyReflection);
+		}
+
+		$classReflectionName = $propertyReflection->getDeclaringClass()->getName();
+		$canAccessClassMember = static function (ClassReflection $classReflection) use ($propertyReflection, $classReflectionName) {
+			if ($propertyReflection->isPrivateSet()) {
+				return $classReflection->getName() === $classReflectionName;
+			}
+
+			// protected set
+
+			if (
+				$classReflection->getName() === $classReflectionName
+				|| $classReflection->isSubclassOf($classReflectionName)
+			) {
+				return true;
+			}
+
+			return $propertyReflection->getDeclaringClass()->isSubclassOf($classReflection->getName());
+		};
+
+		foreach ($this->inClosureBindScopeClasses as $inClosureBindScopeClass) {
+			if (!$this->reflectionProvider->hasClass($inClosureBindScopeClass)) {
+				continue;
+			}
+
+			if ($canAccessClassMember($this->reflectionProvider->getClass($inClosureBindScopeClass))) {
+				return true;
+			}
+		}
+
+		if ($this->isInClass()) {
+			return $canAccessClassMember($this->getClassReflection());
+		}
+
+		return false;
+	}
+
 	/** @api */
 	public function canCallMethod(MethodReflection $methodReflection): bool
 	{

src/Analyser/NodeScopeResolver.php

@@ -2993,7 +2993,7 @@ static function (): void {
 				$propertyName = $expr->name->toString();
 				$propertyHolderType = $scopeBeforeVar->getType($expr->var);
 				$propertyReflection = $scopeBeforeVar->getPropertyReflection($propertyHolderType, $propertyName);
-				if ($propertyReflection !== null) {
+				if ($propertyReflection !== null && $this->phpVersion->supportsPropertyHooks()) {
 					$propertyDeclaringClass = $propertyReflection->getDeclaringClass();
 					if ($propertyDeclaringClass->hasNativeProperty($propertyName)) {
 						$nativeProperty = $propertyDeclaringClass->getNativeProperty($propertyName);

src/Analyser/OutOfClassScope.php

@@ -5,6 +5,7 @@
 use PHPStan\Reflection\ClassConstantReflection;
 use PHPStan\Reflection\ClassMemberAccessAnswerer;
 use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\ExtendedPropertyReflection;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\PropertyReflection;
 
@@ -31,6 +32,18 @@ public function canAccessProperty(PropertyReflection $propertyReflection): bool
 		return $propertyReflection->isPublic();
 	}
 
+	public function canReadProperty(ExtendedPropertyReflection $propertyReflection): bool
+	{
+		return $propertyReflection->isPublic();
+	}
+
+	public function canWriteProperty(ExtendedPropertyReflection $propertyReflection): bool
+	{
+		return $propertyReflection->isPublic()
+			&& !$propertyReflection->isProtectedSet()
+			&& !$propertyReflection->isPrivateSet();
+	}
+
 	public function canCallMethod(MethodReflection $methodReflection): bool
 	{
 		return $methodReflection->isPublic();

src/Php/PhpVersion.php

@@ -357,6 +357,11 @@ public function supportsPropertyHooks(): bool
 		return $this->versionId >= 80400;
 	}
 
+	public function supportsAsymmetricVisibility(): bool
+	{
+		return $this->versionId >= 80400;
+	}
+
 	public function hasDateTimeExceptions(): bool
 	{
 		return $this->versionId >= 80300;

src/Reflection/Annotations/AnnotationPropertyReflection.php

@@ -112,4 +112,14 @@ public function getHook(string $hookType): ExtendedMethodReflection
 		throw new ShouldNotHappenException();
 	}
 
+	public function isProtectedSet(): bool
+	{
+		return false;
+	}
+
+	public function isPrivateSet(): bool
+	{
+		return false;
+	}
+
 }

src/Reflection/ClassMemberAccessAnswerer.php

@@ -13,8 +13,15 @@ public function isInClass(): bool;
 
 	public function getClassReflection(): ?ClassReflection;
 
+	/**
+	 * @deprecated Use canReadProperty() or canWriteProperty()
+	 */
 	public function canAccessProperty(PropertyReflection $propertyReflection): bool;
 
+	public function canReadProperty(ExtendedPropertyReflection $propertyReflection): bool;
+
+	public function canWriteProperty(ExtendedPropertyReflection $propertyReflection): bool;
+
 	public function canCallMethod(MethodReflection $methodReflection): bool;
 
 	public function canAccessConstant(ClassConstantReflection $constantReflection): bool;

src/Reflection/ClassReflection.php

@@ -642,7 +642,7 @@ public function getProperty(string $propertyName, ClassMemberAccessAnswerer $sco
 				}
 
 				$property = $this->wrapExtendedProperty($extension->getProperty($this, $propertyName));
-				if ($scope->canAccessProperty($property)) {
+				if ($scope->canReadProperty($property)) {
 					return $this->properties[$key] = $property;
 				}
 				$this->properties[$key] = $property;