Skip to content

Commit f209d16

Browse files
andrey-techandrey-tech
committed
Refactoring
1 parent 33fe782 commit f209d16

File tree

9 files changed

+30
-19
lines changed

9 files changed

+30
-19
lines changed

src/AndreyTech/Pdepend/Summary/Formatter/Parser.php renamed to src/AndreyTech/Pdepend/Summary/Extractor/Parser.php

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99

1010
declare(strict_types=1);
1111

12-
namespace AndreyTech\Pdepend\Summary\Formatter;
13-
14-
use AndreyTech\Pdepend\Summary\Formatter\Parser\ClassMetrics;
15-
use AndreyTech\Pdepend\Summary\Formatter\Parser\MethodMetrics;
16-
use AndreyTech\Pdepend\Summary\Formatter\Parser\PackageMetrics;
17-
use AndreyTech\Pdepend\Summary\Formatter\Parser\ProjectMetrics;
18-
use AndreyTech\Pdepend\Summary\Formatter\Parser\ProjectMiMetrics;
19-
use AndreyTech\Pdepend\Summary\Formatter\Parser\TraitMetrics;
12+
namespace AndreyTech\Pdepend\Summary\Extractor;
13+
14+
use AndreyTech\Pdepend\Summary\Extractor\Parser\ClassMetrics;
15+
use AndreyTech\Pdepend\Summary\Extractor\Parser\MethodMetrics;
16+
use AndreyTech\Pdepend\Summary\Extractor\Parser\PackageMetrics;
17+
use AndreyTech\Pdepend\Summary\Extractor\Parser\ProjectMetrics;
18+
use AndreyTech\Pdepend\Summary\Extractor\Parser\ProjectMiMetrics;
19+
use AndreyTech\Pdepend\Summary\Extractor\Parser\TraitMetrics;
2020
use Exception;
2121
use SimpleXMLElement;
2222

@@ -55,7 +55,9 @@ private function parseProject(SimpleXMLElement $xml): ProjectMetrics
5555

5656
private function parsePackages(SimpleXMLElement $xml, ProjectMetrics $projectMetrics): void
5757
{
58+
/** @var SimpleXMLElement|null $packages */
5859
$packages = $xml->package;
60+
5961
if (null === $packages) {
6062
return;
6163
}
@@ -71,7 +73,9 @@ private function parsePackages(SimpleXMLElement $xml, ProjectMetrics $projectMet
7173

7274
private function parseClasses(SimpleXMLElement $package, PackageMetrics $packageMetrics): void
7375
{
76+
/** @var SimpleXMLElement|null $classes */
7477
$classes = $package->class;
78+
7579
if (null === $classes) {
7680
return;
7781
}
@@ -80,7 +84,9 @@ private function parseClasses(SimpleXMLElement $package, PackageMetrics $package
8084
$classMetrics = $this->buildClassMetrics($class);
8185
$packageMetrics->addClassMetrics($classMetrics);
8286

87+
/** @var SimpleXMLElement|null $methods */
8388
$methods = $class->method;
89+
8490
if (null === $methods) {
8591
continue;
8692
}
@@ -93,7 +99,9 @@ private function parseClasses(SimpleXMLElement $package, PackageMetrics $package
9399

94100
private function parseTraits(SimpleXMLElement $package, PackageMetrics $packageMetrics): void
95101
{
102+
/** @var SimpleXMLElement|null $traits */
96103
$traits = $package->trait;
104+
97105
if (null === $traits) {
98106
return;
99107
}
@@ -102,7 +110,9 @@ private function parseTraits(SimpleXMLElement $package, PackageMetrics $packageM
102110
$traitMetrics = $this->buildTraitMetrics($trait);
103111
$packageMetrics->addTraitMetrics($traitMetrics);
104112

113+
/** @var SimpleXMLElement|null $methods */
105114
$methods = $trait->method;
115+
106116
if (null === $methods) {
107117
continue;
108118
}

src/AndreyTech/Pdepend/Summary/Formatter/Parser/ClassMetrics.php renamed to src/AndreyTech/Pdepend/Summary/Extractor/Parser/ClassMetrics.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
declare(strict_types=1);
1111

12-
namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
12+
namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
1313

1414
final class ClassMetrics
1515
{

src/AndreyTech/Pdepend/Summary/Formatter/Parser/MethodMetrics.php renamed to src/AndreyTech/Pdepend/Summary/Extractor/Parser/MethodMetrics.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
declare(strict_types=1);
1111

12-
namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
12+
namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
1313

1414
final class MethodMetrics
1515
{

src/AndreyTech/Pdepend/Summary/Formatter/Parser/PackageMetrics.php renamed to src/AndreyTech/Pdepend/Summary/Extractor/Parser/PackageMetrics.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
declare(strict_types=1);
1111

12-
namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
12+
namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
1313

1414
final class PackageMetrics
1515
{

src/AndreyTech/Pdepend/Summary/Formatter/Parser/ProjectMetrics.php renamed to src/AndreyTech/Pdepend/Summary/Extractor/Parser/ProjectMetrics.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
declare(strict_types=1);
1111

12-
namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
12+
namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
1313

1414
final class ProjectMetrics
1515
{

src/AndreyTech/Pdepend/Summary/Formatter/Parser/ProjectMiMetrics.php renamed to src/AndreyTech/Pdepend/Summary/Extractor/Parser/ProjectMiMetrics.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
declare(strict_types=1);
1111

12-
namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
12+
namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
1313

1414
final class ProjectMiMetrics
1515
{

src/AndreyTech/Pdepend/Summary/Formatter/Parser/TraitMetrics.php renamed to src/AndreyTech/Pdepend/Summary/Extractor/Parser/TraitMetrics.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
declare(strict_types=1);
1111

12-
namespace AndreyTech\Pdepend\Summary\Formatter\Parser;
12+
namespace AndreyTech\Pdepend\Summary\Extractor\Parser;
1313

1414
final class TraitMetrics
1515
{

‎src/AndreyTech/Pdepend/Summary/Formatter/Application.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
namespace AndreyTech\Pdepend\Summary\Formatter;
1313

14-
use AndreyTech\Pdepend\Summary\Formatter\Parser\ProjectMetrics;
14+
use AndreyTech\Pdepend\Summary\Extractor\Parser;
15+
use AndreyTech\Pdepend\Summary\Extractor\Parser\ProjectMetrics;
1516
use Exception;
1617
use RuntimeException;
1718
use Symfony\Component\Console\Output\ConsoleOutput;

‎src/AndreyTech/Pdepend/Summary/Formatter/Renderer.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
namespace AndreyTech\Pdepend\Summary\Formatter;
1313

14-
use AndreyTech\Pdepend\Summary\Formatter\Parser\ClassMetrics;
15-
use AndreyTech\Pdepend\Summary\Formatter\Parser\MethodMetrics;
16-
use AndreyTech\Pdepend\Summary\Formatter\Parser\ProjectMetrics;
17-
use AndreyTech\Pdepend\Summary\Formatter\Parser\TraitMetrics;
14+
use AndreyTech\Pdepend\Summary\Extractor\Parser\ClassMetrics;
15+
use AndreyTech\Pdepend\Summary\Extractor\Parser\MethodMetrics;
16+
use AndreyTech\Pdepend\Summary\Extractor\Parser\ProjectMetrics;
17+
use AndreyTech\Pdepend\Summary\Extractor\Parser\TraitMetrics;
1818
use Symfony\Component\Console\Helper\Table;
1919
use Symfony\Component\Console\Helper\TableStyle;
2020
use Symfony\Component\Console\Output\OutputInterface;

0 commit comments

Comments
 (0)