Sort output files data

Author: jdecool

composer.json

@@ -6,6 +6,7 @@
         "ext-ctype": "*",
         "ext-iconv": "*",
         "ext-pdo": "*",
+        "bentools/iterable-functions": "^2.1",
         "illuminate/collections": "^9.13",
         "symfony/console": "6.2.*",
         "symfony/css-selector": "6.2.*",

composer.lock

@@ -76,7 +76,7 @@ public function eol(): iterable
 
             $version = $cols->eq(0)->text();
             $endOfLife = $this->extractDate($cols->eq(1)->text());
-            $lastRelease = $cols->eq(3)->text();
+            $lastRelease = $cols->eq(2)->text();
 
             $initialVersion = "3.0" !== $version ? "$version.0" : "$version.x";
 

src/PhpVersionFetcher.php

@@ -5,11 +5,13 @@
 namespace App\Storage;
 
 use App\Clock;
+use App\Model\PhpRelease;
 use App\Model\PhpVersion;
 use App\Storage;
 use Illuminate\Support\Collection;
 use RuntimeException;
 use Symfony\Component\Serializer\SerializerInterface;
+use function BenTools\IterableFunctions\iterable_to_array;
 
 final class FilesystemStorage implements Storage
 {
@@ -49,43 +51,56 @@ public function write(iterable $versions, iterable $releases): void
 HTML);
     }
 
+    /**
+     * @param iterable<PhpVersion> $versions
+     */
     private function writeAllVersionsFile(iterable $versions): void
     {
-        $this->writeJson('all.json', $versions);
+        $data = (new Collection($versions))
+            ->sort(static fn (PhpVersion $item1, PhpVersion $item2): int => -1 * version_compare($item1->getVersion(), $item2->getVersion()))
+            ->values();
+
+        $this->writeJson('all.json', $data);
     }
 
     /**
      * @param iterable<PhpVersion> $versions
      */
     private function writeMaintenedVersions(iterable $versions): void
     {
-        $data = (new Collection($versions))->filter(
-            fn (PhpVersion $version): bool => $version->getEndOfLife() > $this->clock->now(),
-        );
+        $data = (new Collection($versions))
+            ->filter(fn (PhpVersion $version): bool => $version->getEndOfLife() > $this->clock->now())
+            ->sort(static fn (PhpVersion $item1, PhpVersion $item2): int => -1 * version_compare($item1->getVersion(), $item2->getVersion()))
+            ->values();
 
         $this->writeJson('maintened.json', $data);
     }
 
     private function writeUnmaintenedVersions(iterable $versions): void
     {
-        $data = (new Collection($versions))->filter(
-            fn (PhpVersion $version): bool => $version->getEndOfLife() <= $this->clock->now(),
-        );
+        $data = (new Collection($versions))
+            ->filter(fn (PhpVersion $version): bool => $version->getEndOfLife() <= $this->clock->now())
+            ->sort(static fn (PhpVersion $a, PhpVersion $b): int => -1 * version_compare($a->getVersion(), $b->getVersion()))
+            ->values();
 
         $this->writeJson('unmaintened.json', $data);
     }
 
     private function writeReleaseVersions(iterable $releases): void
     {
-        $this->writeJson('releases.json', $releases);
+        $data = (new Collection($releases))
+            ->sort(static fn (PhpRelease $a, PhpRelease $b): int => -1 * ($a->getReleaseDate() <=> $b->getReleaseDate()))
+            ->values();
+
+        $this->writeJson('releases.json', $data);
     }
 
     private function writeJson(string $file, iterable $data): void
     {
-        $this->writeContent($file, ['items' => $this->serializer->serialize($data, 'json')]);
+        $this->writeContent($file, $this->serializer->serialize(['items' => $data], 'json'));
     }
 
-    private function writeContent(string $file, iterable|string $data): void
+    private function writeContent(string $file, string $data): void
     {
         $fullpath = rtrim($this->outputFolder, DIRECTORY_SEPARATOR).'/'.ltrim($file, DIRECTORY_SEPARATOR);