one thing per line, avoid redundant attribute access

mll-lab · Dec 10, 2024 · 144e541 · 144e541
1 parent fb7490c
commit 144e541
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/src/PHPStan/NodeNameExtractor/ClassNameExtractor.php b/src/PHPStan/NodeNameExtractor/ClassNameExtractor.php
@@ -10,8 +10,11 @@ class ClassNameExtractor implements NodeNameExtractor
 {
     public function extract(Node $node): ?string
     {
-        if ($node instanceof Class_ && $node->name instanceof Identifier) {
-            return $node->name->toString();
+        if ($node instanceof Class_) {
+            $name = $node->name;
+            if ($name instanceof Identifier) {
+                return $name->toString();
+            }
         }
 
         return null;

diff --git a/src/PHPStan/NodeNameExtractor/StringNameExtractor.php b/src/PHPStan/NodeNameExtractor/StringNameExtractor.php
@@ -13,6 +13,7 @@ public function extract(Node $node): ?string
         if ($node instanceof String_) {
             return $node->value;
         }
+
         if ($node instanceof EncapsedStringPart) {
             return $node->value;
         }

diff --git a/src/PHPStan/NodeNameExtractor/VariableNameExtractor.php b/src/PHPStan/NodeNameExtractor/VariableNameExtractor.php
@@ -10,14 +10,21 @@ class VariableNameExtractor implements NodeNameExtractor
 {
     public function extract(Node $node): ?string
     {
-        if ($node instanceof Variable && is_string($node->name)) {
-            return $node->name;
+        if ($node instanceof Variable) {
+            $name = $node->name;
+            if (is_string($name)) {
+                return $name;
+            }
         }
-        if ($node instanceof Param
-            && $node->var instanceof Variable
-            && is_string($node->var->name)
-        ) {
-            return $node->var->name;
+
+        if ($node instanceof Param) {
+            $var = $node->var;
+            if ($var instanceof Variable) {
+                $name = $var->name;
+                if (is_string($name)) {
+                    return $name;
+                }
+            }
         }
 
         return null;