Resolve PHP7 getters / setters (#405)

Author: Halleck45

src/Hal/Metric/Helper/RoleOfMethodDetector.php

@@ -4,6 +4,8 @@
 use PhpParser\Node\Expr\Cast;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
+use PhpParser\Node\NullableType;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Return_;
 
@@ -30,6 +32,12 @@ class RoleOfMethodDetector
                 'PhpParser\\Node\\Expr\\Variable',
                 'PhpParser\\Node\\Name',
             ],
+            [
+                'PhpParser\\Node\\Stmt\\ClassMethod',
+                'PhpParser\\Node\\Stmt\\Return_',
+                'PhpParser\\Node\\Expr\\PropertyFetch',
+                'PhpParser\\Node\\Expr\\Variable',
+            ],
         ],
         'setter' => [
             [
@@ -70,6 +78,16 @@ class RoleOfMethodDetector
                 'PhpParser\\Node\\Param',
                 'PhpParser\\Node\\Expr\\Variable',
                 'PhpParser\\Node\\Name',
+            ],[
+                // function setOk(?bool $ok): self { $this->isOk = $ok; return $this; }
+                'PhpParser\\Node\\Stmt\\ClassMethod',
+                'PhpParser\\Node\\Stmt\\Expression',
+                'PhpParser\\Node\\Expr\\Assign',
+                'PhpParser\\Node\\Expr\\Variable',
+                'PhpParser\\Node\\Expr\\PropertyFetch',
+                'PhpParser\\Node\\Expr\\Variable',
+                'PhpParser\\Node\\Param',
+                'PhpParser\\Node\\Expr\\Variable',
             ],
         ]
     ];
@@ -103,6 +121,16 @@ public function detects($node)
                 return;
             }
 
+            // avoid type hint
+            if ($node instanceof Name) {
+                return;
+            }
+
+            // avoid nullable type
+            if ($node instanceof NullableType) {
+                return;
+            }
+
             $fingerprintOfMethod[] = get_class($node);
         });
         $fingerprintOfMethod = array_reverse($fingerprintOfMethod);

tests/Metric/Helper/RoleOfMethodDetectorTest.php

@@ -51,6 +51,10 @@ public function provideExamples()
             $examples['setter with scalar hint and return void'] = ['setter', '<?php class A { function setName(string $name): void { $this->name = $name; } }'];
             $examples['getter with return object'] = ['getter', '<?php class A { function getName(): Name { return $this->name; } }'];
             $examples['setter with object hint and return void'] = ['setter', '<?php class A { function setName(Name $name): void { $this->name = $name; } }'];
+            $examples['getter with return optional'] = ['getter', '<?php class A { function isOk(): ?bool { return $this->isOk; } }'];
+            $examples['setter fluent with param optional'] = ['setter', '<?php class A { function setOk(?bool $ok): self { $this->isOk = $ok; return $this; } }'];
+            $examples['setter fluent non typed with param optional'] = ['setter', '<?php class A { function setOk(?bool $ok) { $this->isOk = $ok; return $this; } }'];
+            $examples['setter with param optional'] = ['setter', '<?php class A { function setOk(?bool $ok) { $this->isOk = $ok; } }'];
         }
         return $examples;
     }