parse Classes.

Author: smeghead

…/Core/Exception/ParseFailedException.php …Parse/Exception/ParseFailedException.phpsrc/Core/Exception/ParseFailedException.php renamed to src/Parse/Exception/ParseFailedException.php src/Core/Exception/ParseFailedException.php renamed to src/Parse/Exception/ParseFailedException.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Smeghead\PhpVariableHardUsage\Core\Exception;
+namespace Smeghead\PhpVariableHardUsage\Parse\Exception;
 
 use Exception;
 

src/Core/Func.php src/Parse/Func.phpsrc/Core/Func.php renamed to src/Parse/Func.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Smeghead\PhpVariableHardUsage\Core;
+namespace Smeghead\PhpVariableHardUsage\Parse;
 
 final class Func
 {

src/Core/ParseResult.php src/Parse/ParseResult.phpsrc/Core/ParseResult.php renamed to src/Parse/ParseResult.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Smeghead\PhpVariableHardUsage\Core;
+namespace Smeghead\PhpVariableHardUsage\Parse;
 
 final class ParseResult
 {

src/Core/VarReference.php src/Parse/VarReference.phpsrc/Core/VarReference.php renamed to src/Parse/VarReference.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Smeghead\PhpVariableHardUsage\Core;
+namespace Smeghead\PhpVariableHardUsage\Parse;
 
 final class VarReference
 {

src/Core/VariableParser.php src/Parse/VariableParser.phpsrc/Core/VariableParser.php renamed to src/Parse/VariableParser.php

@@ -2,15 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Smeghead\PhpVariableHardUsage\Core;
+namespace Smeghead\PhpVariableHardUsage\Parse;
 
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt;
+use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\NodeDumper;
 use PhpParser\NodeVisitor\FindingVisitor;
 use PhpParser\Parser;
-use Smeghead\PhpVariableHardUsage\Core\Exception\ParseFailedException;
+use Smeghead\PhpVariableHardUsage\Parse\Exception\ParseFailedException;
 
 final class VariableParser
 {
@@ -37,7 +38,7 @@ private function getFunctions(array $stmt): array
         return $functionVisitor->getFoundNodes();
     }
 
-    private function getVariables(Function_ $function): array
+    private function getVariables(Function_|ClassMethod $function): array
     {
         $variableVisitor = new FindingVisitor(function ($node) {
             return $node instanceof Variable;
@@ -49,13 +50,8 @@ private function getVariables(Function_ $function): array
         return $variableVisitor->getFoundNodes();
     }
 
-    public function parse(string $content): ParseResult
+    private function parseFunctions(array $stmts): array
     {
-        $stmts = $this->parser->parse($content);
-        if ($stmts === null) {
-            throw new ParseFailedException();
-        }
-
         $foundFunctions = $this->getFunctions($stmts);
 
         $functions = [];
@@ -67,6 +63,50 @@ public function parse(string $content): ParseResult
             }
             $functions[] = $func;
         }
+        return $functions;
+    }
+
+    private function getClasses(array $stmt): array
+    {
+        $classVisitor = new FindingVisitor(function ($node) {
+            return $node instanceof \PhpParser\Node\Stmt\Class_;
+        });
+        $traverser = new \PhpParser\NodeTraverser();
+        $traverser->addVisitor($classVisitor);
+        $traverser->traverse($stmt);
+
+        return $classVisitor->getFoundNodes();
+    }
+
+    private function parseClasses(array $stmts): array
+    {
+        $foundClasses = $this->getClasses($stmts);
+
+        $methods = [];
+        foreach ($foundClasses as $foundClass) {
+            foreach ($foundClass->getMethods() as $method) {
+                $variables = $this->getVariables($method);
+                $func = new Func(sprintf('%s::%s', $foundClass->name, $method->name->name));
+                foreach ($variables as $variable) {
+                    $func->addVariable(new VarReference($variable->name, $variable->getLine()));
+                }
+                $methods[] = $func;
+            }
+        }
+        return $methods;
+    }
+
+    public function parse(string $content): ParseResult
+    {
+        $stmts = $this->parser->parse($content);
+        if ($stmts === null) {
+            throw new ParseFailedException();
+        }
+        $dumper = new NodeDumper();
+        // echo $dumper->dump($stmts) . PHP_EOL;
+
+        $functions = $this->parseFunctions($stmts) + $this->parseClasses($stmts);
+
         return new ParseResult($functions);
     }
 }

test/VariableParserTest.php

@@ -3,14 +3,14 @@
 declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
-use Smeghead\PhpVariableHardUsage\Core\ParseResult;
-use Smeghead\PhpVariableHardUsage\Core\VariableParser;
+use Smeghead\PhpVariableHardUsage\Parse\ParseResult;
+use Smeghead\PhpVariableHardUsage\Parse\VariableParser;
 
 class VariableParserTest extends TestCase
 {
     private string $fixtureDir = __DIR__ . '/fixtures';
 
-    public function testParse(): void
+    public function testParseFunction(): void
     {
         $parser = new VariableParser();
         $content = file_get_contents($this->fixtureDir . '/function.php');
@@ -28,4 +28,27 @@ public function testParse(): void
         $this->assertSame('num', $vars[1]->getName());
         $this->assertSame(10, $vars[1]->getLineNumber(), 'second $num (10)');
     }
+
+    public function testParseClass(): void
+    {
+        $parser = new VariableParser();
+        $content = file_get_contents($this->fixtureDir . '/Clazz.php');
+        $result = $parser->parse($content);
+
+        $this->assertInstanceOf(ParseResult::class, $result);
+        $fuctions = $result->getfunctions();
+        $this->assertCount(1, $fuctions);
+        $this->assertEquals('Clazz::bigFunction', $fuctions[0]->getName());
+        $this->assertCount(4, $fuctions[0]->getVariables());
+
+        $vars = $fuctions[0]->getVariables();
+        $this->assertSame('num', $vars[0]->getName());
+        $this->assertSame(9, $vars[0]->getLineNumber(), 'first $num (9)');
+        $this->assertSame('num', $vars[1]->getName());
+        $this->assertSame(11, $vars[1]->getLineNumber(), 'second $num (11)');
+        $this->assertSame('num', $vars[2]->getName());
+        $this->assertSame(12, $vars[2]->getLineNumber(), 'second $num (12)');
+        $this->assertSame('num', $vars[3]->getName());
+        $this->assertSame(15, $vars[3]->getLineNumber(), 'second $num (15)');
+    }
 }

test/fixtures/Clazz.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+class Clazz
+{
+    public function bigFunction(): void
+    {
+        $num = 1; // 5行目
+
+        if ($num === 1) {
+            $num = 2; // 9行目
+        }
+
+        echo $num; // 12行目
+    }
+}