Fix no stable release sorting bug (#617)

* Fix no stable release sorting bug * Try with Composer 1 * Fix assertion * Fix buddy yaml --------- Co-authored-by: Marick <[email protected]> Co-authored-by: Arkadiusz Kondas <[email protected]>
repman-io · Apr 30, 2023 · de1f2c3 · de1f2c3
1 parent b463a21
commit de1f2c3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/Service/PackageSynchronizer/ComposerPackageSynchronizer.php b/src/Service/PackageSynchronizer/ComposerPackageSynchronizer.php
@@ -70,6 +70,14 @@ public function synchronize(Package $package): void
                     return $a->getReleaseDate() <=> $b->getReleaseDate();
                 }
 
+                if ($a->getStability() === Version::STABILITY_STABLE && $b->getStability() !== Version::STABILITY_STABLE) {
+                    return -1;
+                }
+
+                if ($a->getStability() !== Version::STABILITY_STABLE && $b->getStability() === Version::STABILITY_STABLE) {
+                    return 1;
+                }
+
                 return Comparator::greaterThan($a->getVersion(), $b->getVersion()) ? 1 : -1;
             });
 

diff --git a/tests/Resources/artifacts-mixed-sorting/a-dev-development.zip b/tests/Resources/artifacts-mixed-sorting/a-dev-development.zip
diff --git a/tests/Resources/artifacts-mixed-sorting/b-1.0.0.zip b/tests/Resources/artifacts-mixed-sorting/b-1.0.0.zip
diff --git a/tests/Unit/Service/PackageSynchronizer/ComposerPackageSynchronizerTest.php b/tests/Unit/Service/PackageSynchronizer/ComposerPackageSynchronizerTest.php
@@ -111,6 +111,15 @@ public function testSynchronizePackageFromArtifacts(): void
         self::assertContains('suggests-buddy-works/suggests-You really should', $linkStrings);
     }
 
+    public function testWithMostRecentUnstable(): void
+    {
+        $this->downloader->addContent($this->resourcesDir.'artifacts-mixed-sorting', 'foobar');
+        $package = PackageMother::withOrganization('artifact', $this->resourcesDir.'artifacts-mixed-sorting', 'buddy');
+        $this->synchronizer->synchronize($package);
+
+        self::assertEquals('v1.0.0', $this->getProperty($package, 'latestReleasedVersion'));
+    }
+
     public function testSynchronizePackageThatAlreadyExists(): void
     {
         $path = $this->baseDir.'/buddy/p/buddy-works/alpha.json';