Update dependency friendsofphp/php-cs-fixer to v3.71.0

.drone.yml

@@ -1,37 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-steps:
-- name: install
-  image: composer
-  commands:
-  - composer install
-
-- name: phpstan
-  image: php:8.3
-  depends_on:
-  - install
-  commands:
-  - vendor/bin/phpstan analyse
-
-- name: rector
-  image: php:8.3
-  depends_on:
-    - install
-  commands:
-    - vendor/bin/rector process --dry-run
-
-- name: pest
-  image: php:8.3
-  depends_on:
-  - install
-  commands:
-  - vendor/bin/pest
-
-- name: style check
-  image: php:8.3
-  depends_on:
-  - install
-  commands:
-  - vendor/bin/php-cs-fixer fix

.github/workflows/ci.yml

@@ -0,0 +1,69 @@
+name: CI Pipeline
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  install:
+    runs-on: ubuntu-latest
+    container:
+      image: composer:latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Install Dependencies
+        run: composer install
+
+  phpstan:
+    runs-on: ubuntu-latest
+    needs: install
+    container:
+      image: php:8.4
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: PHPStan Analysis
+        run: vendor/bin/phpstan analyse
+
+  rector:
+    runs-on: ubuntu-latest
+    needs: install
+    container:
+      image: php:8.4
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Rector Dry Run
+        run: vendor/bin/rector process --dry-run
+
+  pest:
+    runs-on: ubuntu-latest
+    needs: install
+    container:
+      image: php:8.4
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Run Pest Tests
+        run: vendor/bin/pest
+
+  style-check:
+    runs-on: ubuntu-latest
+    needs: install
+    container:
+      image: php:8.4
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: PHP CS Fixer
+        run: vendor/bin/php-cs-fixer fix

Taskfile.yaml

@@ -1,6 +1,6 @@
 # https://taskfile.dev
 
-version: '3'
+version: "3"
 
 tasks:
   default:
@@ -11,21 +11,21 @@ tasks:
   check:
     cmds:
       - task: echo_title
-        vars: {TITLE: Running php-cs-fixer...}
+        vars: { TITLE: Running php-cs-fixer... }
       - task: style
       - task: echo_title
-        vars: {TITLE: Running phpstan...}
+        vars: { TITLE: Running phpstan... }
       - task: phpstan
       - task: echo_title
         vars: { TITLE: Running rector... }
       - task: rector
       - task: echo_title
-        vars: {TITLE: Running phpunit}
-      - task: phpunit
+        vars: { TITLE: Running pest }
+      - task: pest
 
   style:
     cmds:
-      - php vendor/bin/php-cs-fixer fix
+      - PHP_CS_FIXER_IGNORE_ENV=1 php vendor/bin/php-cs-fixer fix
     silent: true
 
   phpstan:
@@ -38,7 +38,7 @@ tasks:
       - php vendor/bin/rector process
     silent: true
 
-  phpunit:
+  pest:
     cmds:
       - php vendor/bin/pest
     silent: true

composer.json

@@ -1,48 +1,49 @@
 {
-    "name": "trizz/adventofcode",
-    "description": "My Advent of Code solutions",
-    "type": "project",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Tristan",
-            "email": "me@trizz.io"
-        }
-    ],
-    "require": {
-        "php": "^8.3",
-        "ext-mbstring": "*",
-        "cebe/markdown": "^1.2",
-        "laravel/prompts": "^0.1.13",
-        "nette/php-generator": "^4.1",
-        "phppkg/cli-markdown": "^2.0",
-        "symfony/console": "^7"
-    },
-    "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.3",
-        "jetbrains/phpstorm-attributes": "^1.0",
-        "nunomaduro/collision": "^8",
-        "pestphp/pest": "^2.26",
-        "phpstan/phpstan": "^1.2",
-        "rector/rector": "^1.0",
-        "robiningelbrecht/phpunit-pretty-print": "^1.2",
-        "symfony/var-dumper": "^7"
-    },
-    "autoload": {
-        "psr-4": {
-            "trizz\\AdventOfCode\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    },
-    "config": {
-        "sort-packages": true,
-        "optimize-autoloader": true,
-        "allow-plugins": {
-            "pestphp/pest-plugin": true
-        }
+  "name": "trizz/adventofcode",
+  "description": "My Advent of Code solutions",
+  "type": "project",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Tristan",
+      "email": "me@trizz.io"
     }
+  ],
+  "require": {
+    "php": "^8.3",
+    "ext-mbstring": "*",
+    "cebe/markdown": "^1.2",
+    "laravel/prompts": "^0.3",
+    "nette/php-generator": "^4.1",
+    "phppkg/cli-markdown": "^2.0",
+    "symfony/console": "^7"
+  },
+  "require-dev": {
+    "friendsofphp/php-cs-fixer": "^3.3",
+    "jetbrains/phpstorm-attributes": "^1.0",
+    "nunomaduro/collision": "^8",
+    "pestphp/pest": "^3.5",
+    "phpstan/phpstan": "^2.0",
+    "rector/rector": "^2.0",
+    "robiningelbrecht/phpunit-pretty-print": "^1.2",
+    "symfony/var-dumper": "^7"
+  },
+  "minimum-stability": "dev",
+  "autoload": {
+    "psr-4": {
+      "trizz\\AdventOfCode\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests/"
+    }
+  },
+  "config": {
+    "sort-packages": true,
+    "optimize-autoloader": true,
+    "allow-plugins": {
+      "pestphp/pest-plugin": true
+    }
+  }
 }

data/Y21/day2/Day2.php

@@ -21,11 +21,9 @@ final class Day2 extends Solution
         $horizontal = 0;
 
         foreach ($data as $current) {
-            /**
-             * @var string $direction
-             * @var int    $distance
-             */
             [$direction, $distance] = explode(' ', $current);
+            $direction = (string) $direction;
+            $distance = (int) $distance;
 
             match ($direction) {
                 'forward' => $horizontal += $distance,
@@ -46,11 +44,9 @@ final class Day2 extends Solution
         $horizontal = 0;
 
         foreach ($data as $current) {
-            /**
-             * @var string $direction
-             * @var int    $distance
-             */
             [$direction, $distance] = explode(' ', $current);
+            $direction = (string) $direction;
+            $distance = (int) $distance;
 
             // Can't use 'match' here because of the multiple expressions for 'forward'.
             switch ($direction) {

data/Y21/day7/Day7.php

@@ -52,6 +52,10 @@ final class Day7 extends Solution
             }
         }
 
+        if (empty($fuelPerPosition)) {
+            return -1;
+        }
+
         return (int) min($fuelPerPosition);
     }
 }

data/Y21/day8/Day8.php

@@ -40,7 +40,7 @@ final class Day8 extends Solution
     }
 
     #[\Override]
-    public function part2(array $data): int|string
+    public function part2(array $data): int
     {
         $sequences = [];
 

data/Y23/day2/Day2.php

@@ -69,7 +69,7 @@ final class Day2 extends Solution
     }
 
     /**
-     * @return array<int, array<int, string>>
+     * @return array{string, non-empty-list<string>}
      */
     private function getHand(string $line): array
     {

data/Y23/day3/Day3.php

@@ -30,6 +30,17 @@ final class Day3 extends Solution
                 $numbers = $this->checkLocation($row, $col);
                 $top = (int) $this->processNumbers($numbers['top'], sum: true);
                 $bottom = (int) $this->processNumbers($numbers['bottom'], sum: true);
+                if ($numbers === []) {
+                    continue;
+                }
+
+                if (empty($numbers['left'])) {
+                    continue;
+                }
+
+                if (empty($numbers['right'])) {
+                    continue;
+                }
 
                 $score += $top + $bottom + max($numbers['left']) + max($numbers['right']);
             }
@@ -54,6 +65,18 @@ final class Day3 extends Solution
 
                 $top = (array) $this->processNumbers($numbers['top']);
                 $bottom = (array) $this->processNumbers($numbers['bottom']);
+                if ($numbers === []) {
+                    continue;
+                }
+
+                if (empty($numbers['left'])) {
+                    continue;
+                }
+
+                if (empty($numbers['right'])) {
+                    continue;
+                }
+
                 $left = max($numbers['left']);
                 $right = max($numbers['right']);
 
@@ -81,7 +104,7 @@ final class Day3 extends Solution
         if ($numbers[0] !== 0 && $numbers[1] === 0 && $numbers[2] !== 0) {
             $result[] = $numbers[0];
             $result[] = $numbers[2];
-        } else {
+        } elseif ($numbers !== []) {
             $result[] = max($numbers);
         }
 
@@ -127,7 +150,7 @@ final class Day3 extends Solution
         return $numbers;
     }
 
-    private function getNumber(int $row, int $col, string $direction = null): ?string
+    private function getNumber(int $row, int $col, ?string $direction = null): ?string
     {
         $number = $this->matrix[$row][$col] ?? null;
 

data/Y23/day5/Day5.php

@@ -2,7 +2,9 @@
 
 namespace trizz\AdventOfCode\Y23;
 
-final class Day5 extends \trizz\AdventOfCode\Solution
+use trizz\AdventOfCode\Solution;
+
+final class Day5 extends Solution
 {
     public static null|int|string $part1ExampleResult = 35;
 
@@ -47,6 +49,10 @@ final class Day5 extends \trizz\AdventOfCode\Solution
             $locations[$seed] = $location;
         }
 
+        if ($locations === []) {
+            return -1;
+        }
+
         return min($locations);
     }
 
@@ -97,7 +103,7 @@ final class Day5 extends \trizz\AdventOfCode\Solution
             }
 
             if (!empty($line) && !str_contains($line, ':')) {
-                [$destinationRange, $sourceRangeStart, $rangeLength] = array_values(array_map('intval', explode(' ', $line)));
+                [$destinationRange, $sourceRangeStart, $rangeLength] = array_map('intval', explode(' ', $line));
                 $this->maps[$currentMap][] = [
                     'destinationRange' => $destinationRange,
                     'sourceRangeStart' => $sourceRangeStart,

data/Y24/day1/Day1.php

@@ -7,10 +7,14 @@ use trizz\AdventOfCode\Solution;
 final class Day1 extends Solution
 {
     public static null|int|string $part1ExampleResult = 11;
-    public static null|int|string $part1Result = 1882714;
-    public static null|int|string $part2ExampleResult = 31;
-    public static null|int|string $part2Result = null;
 
+    public static null|int|string $part1Result = 1882714;
+
+    public static null|int|string $part2ExampleResult = 31;
+
+    public static null|int|string $part2Result = 19437052;
+
+    #[\Override]
     public function part1(array $data): int
     {
         [$listLeft, $listRight] = $this->getList($data);
@@ -23,13 +27,14 @@ final class Day1 extends Solution
         return $score;
     }
 
+    #[\Override]
     public function part2(array $data): int
     {
         $score = 0;
         [$listLeft, $listRight] = $this->getList($data);
 
         foreach ($listLeft as $index => $left) {
-            $right = count(array_filter($listRight, fn ($x) => $x === $left));
+            $right = count(array_filter($listRight, fn ($x): bool => $x === $left));
             if ($right > 0) {
                 $score += $left * $right;
             }

phpstan-baseline.neon

@@ -39,8 +39,3 @@ parameters:
 			message: "#^Property trizz\\\\AdventOfCode\\\\Y21\\\\Day8\\:\\:\\$patternDigits type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: data/Y21/day8/Day8.php
-
-		-
-			message: "#^Method trizz\\\\AdventOfCode\\\\Y23\\\\Day2\\:\\:getHand\\(\\) should return array\\<int, array\\<int, string\\>\\> but returns array\\<int, array\\<int, string\\>\\|string\\>\\.$#"
-			count: 1
-			path: data/Y23/day2/Day2.php

rector.php

@@ -17,7 +17,7 @@ return static function (RectorConfig $rectorConfig): void {
     // define sets of rules
     $rectorConfig->sets(
         [
-            LevelSetList::UP_TO_PHP_83,
+            LevelSetList::UP_TO_PHP_84,
             SetList::CODE_QUALITY,
             SetList::CODING_STYLE,
             SetList::TYPE_DECLARATION,

src/Commands/AbstractDayCommand.php

@@ -78,7 +78,7 @@ abstract class AbstractDayCommand extends Command
     protected function loadClass(): Solution
     {
         require_once sprintf('%s/Y%d/day%d/Day%d.php', DATA_DIR, $this->year, $this->day, $this->day);
-        $className = sprintf('%s\\Y%d\\Day%d', substr(__NAMESPACE__, 0, -9), $this->year, $this->day);
+        $className = sprintf('%s\Y%d\Day%d', substr(__NAMESPACE__, 0, -9), $this->year, $this->day);
 
         /** @var Solution $class */
         $class = new $className();

tests/AoC_2024Test.php

@@ -0,0 +1,3 @@
+<?php
+
+testYear(24);