SlevomatCodingStandard.Classes.PropertyDeclaration: Fixed false positives where there's function with "static" return type hint before property

Author: kukulich

SlevomatCodingStandard/Sniffs/Classes/PropertyDeclarationSniff.php

@@ -25,11 +25,16 @@
 use const T_DOUBLE_COLON;
 use const T_FUNCTION;
 use const T_NULLABLE;
+use const T_OPEN_CURLY_BRACKET;
+use const T_OPEN_PARENTHESIS;
 use const T_PRIVATE;
 use const T_PROTECTED;
 use const T_PUBLIC;
 use const T_READONLY;
+use const T_SEMICOLON;
 use const T_STATIC;
+use const T_TYPE_INTERSECTION;
+use const T_TYPE_UNION;
 use const T_VAR;
 use const T_VARIABLE;
 use const T_WHITESPACE;
@@ -97,6 +102,16 @@ public function process(File $phpcsFile, $modifierPointer): void
 			return;
 		}
 
+		if ($tokens[$nextPointer]['code'] === T_OPEN_PARENTHESIS) {
+			// Ignore static()
+			return;
+		}
+
+		if (in_array($tokens[$nextPointer]['code'], [T_OPEN_CURLY_BRACKET, T_SEMICOLON, T_TYPE_UNION, T_TYPE_INTERSECTION], true)) {
+			// Ignore "static" as return type hint of method
+			return;
+		}
+
 		$propertyPointer = TokenHelper::findNext($phpcsFile, [T_FUNCTION, T_CONST, T_VARIABLE], $modifierPointer + 1);
 
 		if ($propertyPointer === null || $tokens[$propertyPointer]['code'] !== T_VARIABLE) {

tests/Sniffs/Classes/data/propertyDeclarationNoErrors.php

@@ -47,3 +47,63 @@ public static function detailsUpdated(): self
 
     public User $user;
 }
+
+abstract class Test
+{
+    abstract public function begin(): static;
+
+    protected array $field = [];
+}
+
+class Test2
+{
+    public function begin(): static
+    {}
+
+    protected array $field = [];
+}
+
+abstract class Test3
+{
+    abstract public function begin(): static|null;
+
+    protected array $field = [];
+}
+
+class Test4
+{
+    public function begin(): static|null
+    {}
+
+    protected array $field = [];
+}
+
+class Test5
+{
+    public function begin(): false|static|null
+    {}
+
+    protected array $field = [];
+}
+
+class Test6
+{
+    public function begin(): static&null
+    {}
+
+    protected array $field = [];
+}
+
+class Tes7
+{
+    public static function begin(): static
+    {
+        return new static();
+    }
+
+    protected array $field = [];
+
+    final private function __construct()
+    {
+    }
+}