Privatize Dependency properties

madewithlove · May 10, 2022 · a0bac15 · a0bac15
1 parent ea9f785
commit a0bac15
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/src/Commands/CheckLicenses.php b/src/Commands/CheckLicenses.php
@@ -71,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             foreach ($notAllowedLicenses as $notAllowedLicense) {
                 $packagesUsingThisLicense = $this->usedLicensesParser->getPackagesWithLicense($notAllowedLicense, (bool)$input->getOption('no-dev'));
                 foreach ($packagesUsingThisLicense as $packageUsingThisLicense) {
-                    if ($dependency->hasDependency($packageUsingThisLicense) || $dependency->name === $packageUsingThisLicense) {
+                    if ($dependency->hasDependency($packageUsingThisLicense) || $dependency->is($packageUsingThisLicense)) {
                         $dependencyCheck = $dependencyCheck->addFailedDependency($packageUsingThisLicense, $notAllowedLicense);
                     }
                 }

diff --git a/src/Commands/Output/DependencyCheck.php b/src/Commands/Output/DependencyCheck.php
@@ -31,11 +31,7 @@ public function addFailedDependency(string $dependency, string $license): self
 
     public function renderNameWithLicense(): string
     {
-        if (empty($this->dependency->license)) {
-            return $this->dependency->name;
-        }
-
-        return $this->dependency->name . ' [' . $this->dependency->license . ']';
+        return $this->dependency->renderNameWithLicense();
     }
 
     public function isAllowed(): bool

diff --git a/src/Commands/Output/TableRenderer.php b/src/Commands/Output/TableRenderer.php
@@ -125,7 +125,7 @@ private function renderFailedLineWithCauseOfFailure(
         return [
             $this->renderBoolean($dependencyCheck->isAllowed()),
             $dependencyCheck->renderNameWithLicense(),
-            $causeOfFailure->name . ' [' . $causeOfFailure->license . ']',
+            $causeOfFailure->renderNameWithLicense(),
         ];
     }
 
@@ -137,7 +137,7 @@ private function renderAdditionalCauseOfFailure(Dependency $causeOfFailure): arr
         return [
             '',
             '',
-            $causeOfFailure->name . ' [' . $causeOfFailure->license . ']',
+            $causeOfFailure->renderNameWithLicense(),
         ];
     }
 }
diff --git a/src/Dependency.php b/src/Dependency.php
@@ -12,11 +12,25 @@ final class Dependency
     private array $subDependencies = [];
 
     public function __construct(
-        public readonly string $name,
-        public readonly string $license,
+        private readonly string $name,
+        private readonly string $license,
     ) {
     }
 
+    public function is(string $name): bool
+    {
+        return $this->name === $name;
+    }
+
+    public function renderNameWithLicense(): string
+    {
+        if (empty($this->license)) {
+            return $this->name;
+        }
+
+        return $this->name . ' [' . $this->license . ']';
+    }
+
     public function addDependency(string $dependency): self
     {
         if (!$this->hasDependency($dependency)) {

diff --git a/tests/DependencyTest.php b/tests/DependencyTest.php
@@ -12,19 +12,10 @@ class DependencyTest extends TestCase
     /**
      * @test
      */
-    public function itKnowsItsName(): void
+    public function itCanRenderNameWithLicense(): void
     {
         $dependency = new Dependency('foo', 'license');
-        $this->assertEquals('foo', $dependency->name);
-    }
-
-    /**
-     * @test
-     */
-    public function itKnowsItsLicense(): void
-    {
-        $dependency = new Dependency('foo', 'license');
-        $this->assertEquals('license', $dependency->license);
+        $this->assertEquals('foo [license]', $dependency->renderNameWithLicense());
     }
 
     /**