Improve the way to retrieve the properties name

bmitch · Jun 17, 2022 · 25a9dae · 25a9dae
1 parent bf8a3b2
commit 25a9dae
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/src/Codor/Sniffs/Classes/PropertyDeclarationSniff.php b/src/Codor/Sniffs/Classes/PropertyDeclarationSniff.php
@@ -111,11 +111,25 @@ protected function isVisibilityToken($token): bool
      */
     protected function handleVisibilityToken($tokens, $index)
     {
-        $possibleVariable = $tokens[$index + 2];
-        if ($possibleVariable['type'] !== 'T_VARIABLE') {
+        $count = count($tokens);
+
+        for ($i = $index + 1; $i < $count; $i++) {
+            $possibleVariable = $tokens[$i];
+
+            if ($possibleVariable['type'] === 'T_CONST'
+                || $possibleVariable['type'] === 'T_FUNCTION'
+                || $possibleVariable['type'] === 'T_SEMICOLON'
+            ) {
+                return;
+            }
+
+            if ($possibleVariable['type'] !== 'T_VARIABLE') {
+                continue;
+            }
+
+            $this->memberVars[] = str_replace('$', '', $possibleVariable['content']);
             return;
         }
-        $this->memberVars[] = str_replace('$', '', $possibleVariable['content']);
     }
 
     /**

diff --git a/tests/Sniffs/Classes/Assets/PropertyDeclarationSniff/ClassWithOneDeclaredTypedProperty.inc b/tests/Sniffs/Classes/Assets/PropertyDeclarationSniff/ClassWithOneDeclaredTypedProperty.inc
@@ -0,0 +1,11 @@
+<?php
+
+class Foobar
+{
+    public array $baz;
+
+    public function __construct(array $baz)
+    {
+        $this->baz = $baz
+    }
+}
diff --git a/tests/Sniffs/Classes/PropertyDeclarationSniffTest.php b/tests/Sniffs/Classes/PropertyDeclarationSniffTest.php
@@ -82,4 +82,12 @@ public function it_produces_a_warning_when_a_class_has_one_undeclared_property_b
         $this->assertCount(1, $warningMessages);
         $this->assertAllEqual('Class contains undeclared property baz.', $warningMessages);
     }
+
+    /** @test */
+    public function it_produces_no_errors_when_a_class_has_one_typed_property()
+    {
+        $results = $this->runner->sniff('ClassWithOneDeclaredTypedProperty.inc');
+        $this->assertSame(0, $results->getErrorCount());
+        $this->assertSame(0, $results->getWarningCount());
+    }
 }