Refactoring

andrey-tech · Nov 5, 2023 · f209d16 · f209d16
1 parent 33fe782
commit f209d16
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 19 deletions.
diff --git a/...Tech/Pdepend/Summary/Formatter/Parser.php → ...Tech/Pdepend/Summary/Extractor/Parser.php b/...Tech/Pdepend/Summary/Formatter/Parser.php → ...Tech/Pdepend/Summary/Extractor/Parser.php
@@ -9,14 +9,14 @@
 
 declare(strict_types=1);
 
-namespace AndreyTech\Pdepend\Summary\Formatter;
-
-use AndreyTech\Pdepend\Summary\Formatter\Parser\ClassMetrics;
-use AndreyTech\Pdepend\Summary\Formatter\Parser\MethodMetrics;
-use AndreyTech\Pdepend\Summary\Formatter\Parser\PackageMetrics;
-use AndreyTech\Pdepend\Summary\Formatter\Parser\ProjectMetrics;
-use AndreyTech\Pdepend\Summary\Formatter\Parser\ProjectMiMetrics;
-use AndreyTech\Pdepend\Summary\Formatter\Parser\TraitMetrics;
+namespace AndreyTech\Pdepend\Summary\Extractor;
+
+use AndreyTech\Pdepend\Summary\Extractor\Parser\ClassMetrics;
+use AndreyTech\Pdepend\Summary\Extractor\Parser\MethodMetrics;
+use AndreyTech\Pdepend\Summary\Extractor\Parser\PackageMetrics;
+use AndreyTech\Pdepend\Summary\Extractor\Parser\ProjectMetrics;
+use AndreyTech\Pdepend\Summary\Extractor\Parser\ProjectMiMetrics;
+use AndreyTech\Pdepend\Summary\Extractor\Parser\TraitMetrics;
 use Exception;
 use SimpleXMLElement;
 
@@ -55,7 +55,9 @@ private function parseProject(SimpleXMLElement $xml): ProjectMetrics
 
     private function parsePackages(SimpleXMLElement $xml, ProjectMetrics $projectMetrics): void
     {
+        /** @var SimpleXMLElement|null $packages */
         $packages = $xml->package;
+
         if (null === $packages) {
             return;
         }
@@ -71,7 +73,9 @@ private function parsePackages(SimpleXMLElement $xml, ProjectMetrics $projectMet
 
     private function parseClasses(SimpleXMLElement $package, PackageMetrics $packageMetrics): void
     {
+        /** @var SimpleXMLElement|null $classes */
         $classes = $package->class;
+
         if (null === $classes) {
             return;
         }
@@ -80,7 +84,9 @@ private function parseClasses(SimpleXMLElement $package, PackageMetrics $package
             $classMetrics = $this->buildClassMetrics($class);
             $packageMetrics->addClassMetrics($classMetrics);
 
+            /** @var SimpleXMLElement|null $methods */
             $methods = $class->method;
+
             if (null === $methods) {
                 continue;
             }
@@ -93,7 +99,9 @@ private function parseClasses(SimpleXMLElement $package, PackageMetrics $package
 
     private function parseTraits(SimpleXMLElement $package, PackageMetrics $packageMetrics): void
     {
+        /** @var SimpleXMLElement|null $traits */
         $traits = $package->trait;
+
         if (null === $traits) {
             return;
         }
@@ -102,7 +110,9 @@ private function parseTraits(SimpleXMLElement $package, PackageMetrics $packageM
             $traitMetrics = $this->buildTraitMetrics($trait);
             $packageMetrics->addTraitMetrics($traitMetrics);
 
+            /** @var SimpleXMLElement|null $methods */
             $methods = $trait->method;
+
             if (null === $methods) {
                 continue;
             }

diff --git a/...Summary/Formatter/Parser/ClassMetrics.php → ...Summary/Extractor/Parser/ClassMetrics.php b/...Summary/Formatter/Parser/ClassMetrics.php → ...Summary/Extractor/Parser/ClassMetrics.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
+namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
 
 final class ClassMetrics
 {

diff --git a/...ummary/Formatter/Parser/MethodMetrics.php → ...ummary/Extractor/Parser/MethodMetrics.php b/...ummary/Formatter/Parser/MethodMetrics.php → ...ummary/Extractor/Parser/MethodMetrics.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
+namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
 
 final class MethodMetrics
 {

diff --git a/...mmary/Formatter/Parser/PackageMetrics.php → ...mmary/Extractor/Parser/PackageMetrics.php b/...mmary/Formatter/Parser/PackageMetrics.php → ...mmary/Extractor/Parser/PackageMetrics.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
+namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
 
 final class PackageMetrics
 {

diff --git a/...mmary/Formatter/Parser/ProjectMetrics.php → ...mmary/Extractor/Parser/ProjectMetrics.php b/...mmary/Formatter/Parser/ProjectMetrics.php → ...mmary/Extractor/Parser/ProjectMetrics.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
+namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
 
 final class ProjectMetrics
 {

diff --git a/...ary/Formatter/Parser/ProjectMiMetrics.php → ...ary/Extractor/Parser/ProjectMiMetrics.php b/...ary/Formatter/Parser/ProjectMiMetrics.php → ...ary/Extractor/Parser/ProjectMiMetrics.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
+namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
 
 final class ProjectMiMetrics
 {

diff --git a/...Summary/Formatter/Parser/TraitMetrics.php → ...Summary/Extractor/Parser/TraitMetrics.php b/...Summary/Formatter/Parser/TraitMetrics.php → ...Summary/Extractor/Parser/TraitMetrics.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
+namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
 
 final class TraitMetrics
 {

diff --git a/src/AndreyTech/Pdepend/Summary/Formatter/Application.php b/src/AndreyTech/Pdepend/Summary/Formatter/Application.php
@@ -11,7 +11,8 @@
 
 namespace AndreyTech\Pdepend\Summary\Formatter;
 
-use AndreyTech\Pdepend\Summary\Formatter\Parser\ProjectMetrics;
+use AndreyTech\Pdepend\Summary\Extractor\Parser;
+use AndreyTech\Pdepend\Summary\Extractor\Parser\ProjectMetrics;
 use Exception;
 use RuntimeException;
 use Symfony\Component\Console\Output\ConsoleOutput;

diff --git a/src/AndreyTech/Pdepend/Summary/Formatter/Renderer.php b/src/AndreyTech/Pdepend/Summary/Formatter/Renderer.php
@@ -11,10 +11,10 @@
 
 namespace AndreyTech\Pdepend\Summary\Formatter;
 
-use AndreyTech\Pdepend\Summary\Formatter\Parser\ClassMetrics;
-use AndreyTech\Pdepend\Summary\Formatter\Parser\MethodMetrics;
-use AndreyTech\Pdepend\Summary\Formatter\Parser\ProjectMetrics;
-use AndreyTech\Pdepend\Summary\Formatter\Parser\TraitMetrics;
+use AndreyTech\Pdepend\Summary\Extractor\Parser\ClassMetrics;
+use AndreyTech\Pdepend\Summary\Extractor\Parser\MethodMetrics;
+use AndreyTech\Pdepend\Summary\Extractor\Parser\ProjectMetrics;
+use AndreyTech\Pdepend\Summary\Extractor\Parser\TraitMetrics;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Helper\TableStyle;
 use Symfony\Component\Console\Output\OutputInterface;