Trailing commas

Author: Mark Randall

src/Releases/Branches.php

@@ -32,16 +32,6 @@
  */
 class Branches
 {
-    private static function versionToBranch(string $version): string
-    {
-        $parts = explode('.', $version);
-        if (count($parts) > 1) {
-            return "$parts[0].$parts[1]";
-        }
-
-        throw new ValueError("Unexpected version '$version'");
-    }
-
     /**
      * @return array<int, array<string, NormalizedReleaseStruct>>
      */
@@ -60,7 +50,7 @@ public static function getOldReleaseData(): array
     {
         static $cache = null;
 
-        return $cache ??= (function() {
+        return $cache ??= (function () {
             $original = require __DIR__ . '/../../include/releases.inc';
 
             foreach ($original as &$releases) {
@@ -105,7 +95,7 @@ public static function getBranchOverrides(): array
     public static function all(): array
     {
         static $cache = null;
-        return $cache ??= (function() {
+        return $cache ??= (function () {
             $results = [];
             foreach (self::getReleaseData() as $majorVersion => $releases) {
                 foreach ($releases as $releaseId => $release) {
@@ -141,7 +131,6 @@ public static function get_all_branches(): array
             foreach ($releases as $version => $release) {
                 $branch = self::versionToBranch($version);
 
-
                 if (!isset($branches[$major][$branch])
                     || version_compare($version, $branches[$major][$branch]['version'], 'gt')
                 ) {
@@ -154,7 +143,6 @@ public static function get_all_branches(): array
             foreach ($releases as $version => $release) {
                 $branch = self::versionToBranch($version);
 
-
                 if (!isset($branches[$major][$branch])
                     || version_compare($version, $branches[$major][$branch]['version'], 'gt')
                 ) {
@@ -280,7 +268,7 @@ public static function getInitialReleaseForBranch(string $branch): ?array
 
         /* it seems that 8.4.0 is completely missing from the data */
         for ($patch = 0; $patch < 5; $patch++) {
-            $release = $all[$major][$branch . '.'. $patch] ?? null;
+            $release = $all[$major][$branch . '.' . $patch] ?? null;
             if ($release) {
                 return $release;
             }
@@ -434,4 +422,13 @@ public static function getCurrentReleaseForBranch(int $major, ?int $minor): ?str
         return null;
     }
 
+    private static function versionToBranch(string $version): string
+    {
+        $parts = explode('.', $version);
+        if (count($parts) > 1) {
+            return "$parts[0].$parts[1]";
+        }
+
+        throw new ValueError("Unexpected version '$version'");
+    }
 }

tests/Unit/Releases/LegacyReleaseHelpersTest.php

@@ -37,7 +37,7 @@ public function testAllReleasesContainsRecent(): void
             foreach (array_keys($releases) as $releaseId) {
                 self::assertTrue(
                     isset($all[$majorId][$releaseId]),
-                    "Missing recent release data for '$releaseId' in all()"
+                    "Missing recent release data for '$releaseId' in all()",
                 );
             }
         }
@@ -51,7 +51,7 @@ public function testAllReleasesContainsOld(): void
             foreach (array_keys($releases) as $releaseId) {
                 self::assertTrue(
                     isset($all[$majorId][$releaseId]),
-                    "Missing old release data for '$releaseId' in all()"
+                    "Missing old release data for '$releaseId' in all()",
                 );
             }
         }
@@ -94,14 +94,14 @@ public function testNormalizationForAllData(): void
                     self::assertTrue(
                         /* @phpstan-ignore-next-line */
                         isset($source['filename']),
-                        "Release '$releaseId' source $idx does not have a filename"
+                        "Release '$releaseId' source $idx does not have a filename",
                     );
 
                     /* @phpstan-ignore-next-line */
                     self::assertTrue(
                         /* @phpstan-ignore-next-line */
                         isset($source['name']),
-                        "Release '$releaseId' source $idx does not have a name"
+                        "Release '$releaseId' source $idx does not have a name",
                     );
                 }
             }
@@ -117,12 +117,12 @@ public function testInitialReleases(): void
     {
         self::assertNotEmpty(
             Branches::getInitialReleaseForBranch('8.5'),
-            'Unable to find initial branch for 8.5'
+            'Unable to find initial branch for 8.5',
         );
 
         self::assertNotEmpty(
             Branches::getInitialReleaseForBranch('8.4'),
-            'Unable to find initial branch for 8.4 (aborted release)'
+            'Unable to find initial branch for 8.4 (aborted release)',
         );
     }