Fix PHPStan issues for /src/Utils/Utils.php

After those fixes PHPStan should have more information so it can detect
more issues.

Co-authored-by: Nicky Gerritsen <[email protected]>

Author: vmcj

phpstan-baseline.neon

@@ -1179,38 +1179,3 @@ parameters:
 			message: "#^Method App\\\\Utils\\\\Scoreboard\\\\Summary\\:\\:__construct\\(\\) has parameter \\$problems with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: webapp/src/Utils/Scoreboard/Summary.php
-
-		-
-			message: "#^Method App\\\\Utils\\\\Utils\\:\\:computeLcsDiff\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: webapp/src/Utils/Utils.php
-
-		-
-			message: "#^Method App\\\\Utils\\\\Utils\\:\\:getImageSize\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: webapp/src/Utils/Utils.php
-
-		-
-			message: "#^Method App\\\\Utils\\\\Utils\\:\\:parseHexColor\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: webapp/src/Utils/Utils.php
-
-		-
-			message: "#^Method App\\\\Utils\\\\Utils\\:\\:parseTsvLine\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: webapp/src/Utils/Utils.php
-
-		-
-			message: "#^Method App\\\\Utils\\\\Utils\\:\\:reindex\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: webapp/src/Utils/Utils.php
-
-		-
-			message: "#^Method App\\\\Utils\\\\Utils\\:\\:reindex\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: webapp/src/Utils/Utils.php
-
-		-
-			message: "#^Method App\\\\Utils\\\\Utils\\:\\:rgbToHex\\(\\) has parameter \\$color with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: webapp/src/Utils/Utils.php

webapp/src/Controller/Jury/ContestController.php

@@ -199,7 +199,7 @@ public function indexAction(Request $request): Response
                 ->groupBy('i.contest')
                 ->getQuery()
                 ->getResult();
-            $removedIntervals = Utils::reindex($removedIntervals, static fn($data) => $data['cid']);
+            $removedIntervals = Utils::reindex($removedIntervals, static fn(array $data): int => $data['cid']);
         } else {
             $removedIntervals = [];
         }

webapp/src/Utils/Utils.php

@@ -321,6 +321,8 @@ public static function convertToColor(string $hex): ?string
 
     /**
      * Parse a hex color into it's three RGB values.
+     *
+     * @return array{int, int, int}
      */
     public static function parseHexColor(string $hex): array
     {
@@ -345,6 +347,8 @@ public static function componentToHex(int $component): string
 
     /**
      * Convert an RGB triple into a CSS hex color.
+     *
+     * @param array{int, int, int} $color
      */
     public static function rgbToHex(array $color): string
     {
@@ -506,6 +510,8 @@ public static function cutString(string $str, int $size): string
 
     /**
      * Compute the LCS diff of two lines.
+     *
+     * @return array{bool, string}
      */
     public static function computeLcsDiff(string $line1, string $line2): array
     {
@@ -686,6 +692,8 @@ public static function getImageThumb(string $image, int $thumbMaxSize, string $t
      * This method supports PNG, JPG, BMP, GIF and SVG files.
      *
      * Returns an array with three items: the width, height and ratio between width and height.
+     *
+     * @return array{int, int, float}
      */
     public static function getImageSize(string $filename): array
     {
@@ -857,6 +865,8 @@ public static function toTsvField(string $field) : string
 
     /**
      * Split a line from a Tab Separated Values file into fields.
+     *
+     * @return string[]
      */
     public static function parseTsvLine(string $line): array
     {
@@ -865,6 +875,13 @@ public static function parseTsvLine(string $line): array
 
     /**
      * Reindex the given array by applying the callback to each item.
+     *
+     * @template TKey of array-key
+     * @template UKey of array-key
+     * @template V
+     * @param array<TKey, V> $array
+     * @param callable(V, TKey): UKey $callback
+     * @return array<UKey, V>
      */
     public static function reindex(array $array, callable $callback): array
     {

webapp/tests/Unit/Utils/UtilsTest.php

@@ -940,7 +940,7 @@ public function testReindex(): void
     {
         $input = [1, 2, 3];
         $expectedOutput = [2 => 1, 4 => 2, 6 => 3];
-        $doubled = static fn($item) => $item * 2;
+        $doubled = static fn(int $item): int => $item * 2;
         self::assertEquals($expectedOutput, Utils::reindex($input, $doubled));
     }