From 0b8c242e1faab8b23b7ef6422717473fcfce26ef Mon Sep 17 00:00:00 2001 From: Arkadiusz Kondas Date: Mon, 31 May 2021 10:51:27 +0200 Subject: [PATCH] Fix package dependencies duplication (#472) --- src/Entity/Organization/Package.php | 27 +++++++++++++------ .../ComposerPackageSynchronizer.php | 6 ++--- templates/component/user.html.twig | 2 +- tests/Doubles/FakePackageSynchronizer.php | 4 +-- tests/MotherObject/PackageMother.php | 4 +-- .../Entity/{ => Organization}/PackageTest.php | 15 ++++++++--- 6 files changed, 39 insertions(+), 19 deletions(-) rename tests/Unit/Entity/{ => Organization}/PackageTest.php (88%) diff --git a/src/Entity/Organization/Package.php b/src/Entity/Organization/Package.php index f3280f9f..b8e320c7 100644 --- a/src/Entity/Organization/Package.php +++ b/src/Entity/Organization/Package.php @@ -170,8 +170,8 @@ public function repositoryUrl(): string } /** - * @param string[] $encounteredVersions - * @param string[] $encounteredLinks + * @param array $encounteredVersions + * @param array $encounteredLinks */ public function syncSuccess(string $name, string $description, string $latestReleasedVersion, array $encounteredVersions, array $encounteredLinks, \DateTimeImmutable $latestReleaseDate): void { @@ -179,15 +179,26 @@ public function syncSuccess(string $name, string $description, string $latestRel $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 index 9c835a7f..c3229eb5 100644 --- 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 index 2c516d03..11ab70a0 100644 --- a/templates/component/user.html.twig +++ b/templates/component/user.html.twig @@ -13,7 +13,7 @@
- + {% if organization is defined %} {{ icons.anonymousIcon(organization) }} {{ organization.name }} {% else %} diff --git a/tests/Doubles/FakePackageSynchronizer.php b/tests/Doubles/FakePackageSynchronizer.php index 02718f65..1dbd2163 100644 --- 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 index 6d4547c4..809fb6ea 100644 --- 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 $unencounteredVersions + * @param array $unencounteredLinks */ public static function synchronized(string $name, string $latestVersion, string $url = '', array $unencounteredVersions = [], array $unencounteredLinks = []): Package { diff --git a/tests/Unit/Entity/PackageTest.php b/tests/Unit/Entity/Organization/PackageTest.php similarity index 88% rename from tests/Unit/Entity/PackageTest.php rename to tests/Unit/Entity/Organization/PackageTest.php index 808291a9..361ed84d 100644 --- a/tests/Unit/Entity/PackageTest.php +++ b/tests/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);