Fix package dependencies duplication (#472)

repman-io · May 31, 2021 · 0b8c242 · 0b8c242
1 parent c15d282
commit 0b8c242
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 19 deletions.
diff --git a/src/Entity/Organization/Package.php b/src/Entity/Organization/Package.php
@@ -170,24 +170,35 @@ public function repositoryUrl(): string
     }
 
     /**
-     * @param string[] $encounteredVersions
-     * @param string[] $encounteredLinks
+     * @param array<string,bool> $encounteredVersions
+     * @param array<string,bool> $encounteredLinks
      */
     public function syncSuccess(string $name, string $description, string $latestReleasedVersion, array $encounteredVersions, array $encounteredLinks, \DateTimeImmutable $latestReleaseDate): void
     {
         $this->setName($name);
         $this->description = $description;
         $this->latestReleasedVersion = $latestReleasedVersion;
         $this->latestReleaseDate = $latestReleaseDate;
-        foreach ($this->versions as $version) {
-            if (!in_array($version->version(), $encounteredVersions, true)) {
-                $this->versions->removeElement($version);
+        foreach ($this->versions as $key => $version) {
+            if (!isset($encounteredVersions[$version->version()])) {
+                $this->versions->remove($key);
             }
         }
-        foreach ($this->links as $link) {
-            if (!in_array($link->type().'-'.$link->target(), $encounteredLinks, true)) {
-                $this->links->removeElement($link);
+
+        $uniqueLinks = [];
+        foreach ($this->links as $key => $link) {
+            $uniqueKey = $link->type().'-'.$link->target();
+            if (!isset($encounteredLinks[$uniqueKey])) {
+                $this->links->remove($key);
+                continue;
+            }
+
+            if (!isset($uniqueLinks[$uniqueKey])) {
+                $uniqueLinks[$uniqueKey] = true;
+                continue;
             }
+
+            $this->links->remove($key);
         }
         $this->lastSyncAt = new \DateTimeImmutable();
         $this->lastSyncError = null;

diff --git a/src/Service/PackageSynchronizer/ComposerPackageSynchronizer.php b/src/Service/PackageSynchronizer/ComposerPackageSynchronizer.php
@@ -175,7 +175,7 @@ public function synchronize(Package $package): void
                                         $link->getPrettyConstraint(),
                                     )
                                 );
-                                $encounteredLinks[] = $type.'-'.$link->getTarget();
+                                $encounteredLinks[$type.'-'.$link->getTarget()] = true;
                             }
                         }
                     }
@@ -190,7 +190,7 @@ public function synchronize(Package $package): void
                                 $linkDescription,
                             )
                         );
-                        $encounteredLinks[] = 'suggests-'.$linkName;
+                        $encounteredLinks['suggests-'.$linkName] = true;
                     }
                 }
 
@@ -205,7 +205,7 @@ public function synchronize(Package $package): void
                     )
                 );
 
-                $encounteredVersions[] = $version['prettyVersion'];
+                $encounteredVersions[$version['prettyVersion']] = true;
             }
 
             $package->syncSuccess(

diff --git a/templates/component/user.html.twig b/templates/component/user.html.twig
@@ -13,7 +13,7 @@
         <div class="dropdown">
             <a href="#" data-toggle="dropdown"
                class="align-items-center ml-2 btn btn-secondary">
-                <span class="ml-2 d-none d-sm-block lh-1">
+                <span class="d-none d-sm-block lh-1">
                     {% if organization is defined %}
                         {{ icons.anonymousIcon(organization) }} {{ organization.name }}
                     {% else %}

diff --git a/tests/Doubles/FakePackageSynchronizer.php b/tests/Doubles/FakePackageSynchronizer.php
@@ -83,8 +83,8 @@ public function synchronize(Package $package): void
             $this->name,
             $this->description,
             $this->latestReleasedVersion,
-            $encounteredVersions,
-            $encounteredLinks,
+            array_flip($encounteredVersions),
+            array_flip($encounteredLinks),
             $this->latestReleaseDate
         );
     }

diff --git a/tests/MotherObject/PackageMother.php b/tests/MotherObject/PackageMother.php
@@ -54,8 +54,8 @@ public static function withOrganizationAndToken(string $type, string $url, strin
     }
 
     /**
-     * @param string[] $unencounteredVersions
-     * @param string[] $unencounteredLinks
+     * @param array<string,bool> $unencounteredVersions
+     * @param array<string,bool> $unencounteredLinks
      */
     public static function synchronized(string $name, string $latestVersion, string $url = '', array $unencounteredVersions = [], array $unencounteredLinks = []): Package
     {

diff --git a/tests/Unit/Entity/PackageTest.php → .../Unit/Entity/Organization/PackageTest.php b/tests/Unit/Entity/PackageTest.php → .../Unit/Entity/Organization/PackageTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Buddy\Repman\Tests\Unit\Entity;
+namespace Buddy\Repman\Tests\Unit\Entity\Organization;
 
 use Buddy\Repman\Entity\Organization\Package;
 use Buddy\Repman\Entity\Organization\Package\Link;
@@ -33,7 +33,7 @@ public function testSyncSuccessRemovesUnencounteredVersions(): void
         $this->package->addOrUpdateVersion($version2 = new Version(Uuid::uuid4(), '1.0.1', 'anotherref', 5678, new \DateTimeImmutable(), Version::STABILITY_STABLE));
         $this->package->addOrUpdateVersion($version3 = new Version(Uuid::uuid4(), '1.1.0', 'lastref', 6543, new \DateTimeImmutable(), Version::STABILITY_STABLE));
 
-        $this->package->syncSuccess('some/package', 'desc', '1.1.0', ['1.0.0', '1.1.0'], [], new \DateTimeImmutable());
+        $this->package->syncSuccess('some/package', 'desc', '1.1.0', array_flip(['1.0.0', '1.1.0']), [], new \DateTimeImmutable());
 
         self::assertCount(2, $this->package->versions());
         self::assertContains($version1, $this->package->versions());
@@ -52,7 +52,7 @@ public function testSyncSuccessRemovesUnencounteredLinks(): void
             'desc',
             '1.1.0',
             [],
-            ['replaces-buddy-works/testone', 'replaces-buddy-works/testthree'],
+            array_flip(['replaces-buddy-works/testone', 'replaces-buddy-works/testthree']),
             new \DateTimeImmutable()
         );
 
@@ -62,6 +62,15 @@ public function testSyncSuccessRemovesUnencounteredLinks(): void
         self::assertContains($link3, $this->package->links());
     }
 
+    public function testSyncSuccessRemovesDuplicatedLinks(): void
+    {
+        $this->package->addLink(new Link(Uuid::uuid4(), 'requires', 'phpunit/phpunit', '^1.0'));
+        $this->package->addLink(new Link(Uuid::uuid4(), 'requires', 'phpunit/phpunit', '^1.0'));
+        $this->package->syncSuccess('some/package', 'desc', '1.1.0', [], array_flip(['requires-phpunit/phpunit']), new \DateTimeImmutable());
+
+        self::assertCount(1, $this->package->links());
+    }
+
     public function testOuathTokenNotFound(): void
     {
         $this->expectException(\RuntimeException::class);