Merge pull request #3 from smeghead/fix/remove-scope-interface

remove Scope interface.

Author: smeghead

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+### Bug fix
+
+ * Refactor remove interface Scope
+
 ## v0.0.1 (2025-03-18)
 
 ### Features

src/Analyze/AnalysisResult.php

@@ -31,8 +31,8 @@ public function format(): string
             'avarageVariableHardUsage' => $this->avarageVariableHardUsage,
         ];
         $output['scopes'] = array_map(fn(Scope $scope) => [
-            'namespace' => $scope->getNamespace(),
-            'name' => $scope->getName(),
+            'namespace' => $scope->namespace,
+            'name' => $scope->name,
             'variableHardUsage' => $scope->getVariableHardUsage()
         ], $this->scopes);
         return json_encode($output, JSON_PRETTY_PRINT) . PHP_EOL;

src/Analyze/FunctionScope.php

@@ -4,15 +4,33 @@
 
 namespace Smeghead\PhpVariableHardUsage\Analyze;
 
-interface Scope
+final class Scope
 {
-    public function getNamespace(): ?string;
-    public function getName(): string;
+    /** @var list<AnalyzedVariable> */
+    private array $analyzedVariables;
+
+    /**
+     * @param list<AnalyzedVariable> $analyzedVariables
+     */
+    public function __construct(
+        public readonly ?string $namespace,
+        public readonly string $name,
+        array $analyzedVariables
+    )
+    {
+        $this->analyzedVariables = $analyzedVariables;
+    }
 
     /**
      * @return list<AnalyzedVariable>
      */
-    public function getAnalyzedVariables(): array;
+    public function getAnalyzedVariables(): array
+    {
+        return $this->analyzedVariables;
+    }
 
-    public function getVariableHardUsage(): int;
+    public function getVariableHardUsage(): int
+    {
+        return array_sum(array_map(fn(AnalyzedVariable $variable) => $variable->variableHardUsage, $this->analyzedVariables));
+    }
 }

src/Analyze/Scope.php

@@ -40,7 +40,7 @@ private function analyzeFunction(Func $function): Scope
             $analyzedVars[] = new AnalyzedVariable($variableName, $variableHardUsage);
         }
 
-        return new FunctionScope($function->namespace, $function->name, $analyzedVars);
+        return new Scope($function->namespace, $function->name, $analyzedVars);
     }
 
     /**

src/Analyze/VariableAnalyzer.php

@@ -21,7 +21,7 @@ public function testAnalyzeFunctionSimple(): void
         $scopes = $result->scopes;
 
         $this->assertCount(1, $scopes);
-        $this->assertSame('testFunction', $scopes[0]->getName());
+        $this->assertSame('testFunction', $scopes[0]->name);
         $this->assertSame(2, $scopes[0]->getAnalyzedVariables()[0]->variableHardUsage);
     }
 
@@ -37,7 +37,7 @@ public function testAnalyzeFunctionLong(): void
         $scopes = $result->scopes;
 
         $this->assertCount(1, $scopes);
-        $this->assertSame('testFunction', $scopes[0]->getName());
+        $this->assertSame('testFunction', $scopes[0]->name);
         // (1 + 2 + 100) / 3 = 34
         // abs(34 - 1) + abs(34 - 2) + abs(34 - 100) = 33 + 32 + 66 = 131
         $this->assertSame(131, $scopes[0]->getAnalyzedVariables()[0]->variableHardUsage);