Introduce PhpVersion object for checking if current PHP version supports hooks in interfaces

Author: jakubtobiasz

src/Analyser/NodeScopeResolver.php

@@ -899,6 +899,7 @@ private function processStmtNode(
 				}
 				$propStmt = clone $stmt;
 				$propStmt->setAttributes($prop->getAttributes());
+				rd($propStmt);
 				$nodeCallback(
 					new ClassPropertyNode(
 						$propertyName,

src/Php/PhpVersion.php

@@ -347,6 +347,11 @@ public function supportsPregCaptureOnlyNamedGroups(): bool
 		return $this->versionId >= 80200;
 	}
 
+	public function supportsPublicPropertiesInInterfaces(): bool
+	{
+		return $this->versionId >= 80400;
+	}
+
 	public function hasDateTimeExceptions(): bool
 	{
 		return $this->versionId >= 80300;
@@ -374,5 +379,4 @@ public function substrReturnFalseInsteadOfEmptyString(): bool
 	{
 		return $this->versionId < 80000;
 	}
-
 }

src/Rules/Properties/PropertiesInInterfaceRule.php

@@ -5,17 +5,19 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\ClassPropertyNode;
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use const PHP_VERSION_ID;
 
 /**
  * @implements Rule<ClassPropertyNode>
  */
 final class PropertiesInInterfaceRule implements Rule
 {
 
-	private const PHP_8_4_VERSION_ID = 80400;
+	public function __construct (private PhpVersion $phpVersion)
+	{
+	}
 
 	public function getNodeType(): string
 	{
@@ -28,7 +30,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (PHP_VERSION_ID >= self::PHP_8_4_VERSION_ID) {
+		if ($node->isPublic() && $this->phpVersion->supportsPublicPropertiesInInterfaces()) {
 			return [];
 		}
 

tests/PHPStan/Rules/Properties/PropertiesInInterfaceRuleTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Properties;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use const PHP_VERSION_ID;
@@ -12,16 +13,21 @@
 class PropertiesInInterfaceRuleTest extends RuleTestCase
 {
 
-	private const PHP_8_4_VERSION_ID = 80400;
+	private PhpVersion $phpVersion;
+
+	protected function setUp(): void
+	{
+		$this->phpVersion = new PhpVersion(PHP_VERSION_ID);
+	}
 
 	protected function getRule(): Rule
 	{
-		return new PropertiesInInterfaceRule();
+		return new PropertiesInInterfaceRule(new PhpVersion(PHP_VERSION_ID));
 	}
 
 	public function testRule(): void
 	{
-		if (PHP_VERSION_ID >= self::PHP_8_4_VERSION_ID) {
+		if ($this->phpVersion->supportsPublicPropertiesInInterfaces()) {
 			$this->analyse([__DIR__ . '/data/properties-in-interface.php'], []);
 
 			return;