Laravel 12.x Compatibility (#5)

* Bump dependencies for Laravel 12 * Update GitHub Actions for Laravel 12 * Fix PR + remove support Laravel 9/10 --------- Co-authored-by: Tjardo <info@tjardo.com>
Label84 · Feb 19, 2025 · d8eed40 · d8eed40
1 parent 6baf69b
commit d8eed40
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 81 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           coverage: none
 
       - name: Install composer dependencies

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -2,54 +2,52 @@ name: Run tests
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
 
 jobs:
-    test:
-        runs-on: ${{ matrix.os }}
-        strategy:
-            fail-fast: false
-            matrix:
-                os: [ubuntu-latest]
-                php: [8.1, 8.2]
-                laravel: [9.*, 10.*, 11.*]
-                dependency-version: [prefer-stable]
-                include:
-                    -   laravel: 9.*
-                        testbench: 7.*
-                    -   laravel: 10.*
-                        testbench: 8.*
-                    -   laravel: 11.*
-                        testbench: 9.*
-                exclude:
-                    -   laravel: 11.*
-                        php: 8.1
-
-        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v4
-
-            -   name: Cache dependencies
-                uses: actions/cache@v4
-                with:
-                    path: ~/.composer/cache/files
-                    key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
-                    coverage: none
-
-            -   name: Install dependencies
-                run: |
-                    composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-                    composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
-
-            -   name: Execute tests
-                run: vendor/bin/phpunit
+  test:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        php: [8.2]
+        laravel: ['11.*', '12.*']
+        dependency-version: [prefer-stable]
+        include:
+          - laravel: 11.*
+            testbench: 9.*
+          - laravel: 12.*
+            testbench: 10.*
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+
+      - name: Execute tests
+        run: vendor/bin/phpunit
diff --git a/README.md b/README.md
@@ -17,9 +17,8 @@ With ``laravel-hours-helper`` you can create an ``Illuminate\Support\Collection`
 
 | Version | Release |
 |---------|---------|
-| 11.x    | ^1.3    |
-| 10.x    | ^1.3    |
-| 9.x     | ^1.3    |
+| 12.x    | ^1.4    |
+| 11.x    | ^1.4    |
 
 ## Installation
 

diff --git a/composer.json b/composer.json
@@ -4,40 +4,40 @@
     "type": "library",
     "license": "MIT",
     "authors": [
-      {
-        "name": "Label84",
-        "email": "info@label84.com"
-      }
+        {
+            "name": "Label84",
+            "email": "info@label84.com"
+        }
     ],
     "require": {
-      "php": "^8.0",
-      "illuminate/support": "^9.0|^10.0|^11.0"
+        "php": "^8.1",
+        "illuminate/support": "^11.0|^12.0"
     },
     "autoload": {
-      "psr-4": {
-          "Label84\\HoursHelper\\": "src"
-      }
+        "psr-4": {
+            "Label84\\HoursHelper\\": "src"
+        }
     },
     "autoload-dev": {
-      "psr-4": {
-          "Label84\\HoursHelper\\Tests\\": "tests"
-      }
+        "psr-4": {
+            "Label84\\HoursHelper\\Tests\\": "tests"
+        }
     },
     "extra": {
-      "laravel": {
-          "providers": [
-              "Label84\\HoursHelper\\HoursHelperServiceProvider"
-          ],
-          "aliases": {
-            "HoursHelper": "Label84\\HoursHelper\\Facades\\HoursHelper"
-          }
-      }
+        "laravel": {
+            "providers": [
+                "Label84\\HoursHelper\\HoursHelperServiceProvider"
+            ],
+            "aliases": {
+                "HoursHelper": "Label84\\HoursHelper\\Facades\\HoursHelper"
+            }
+        }
     },
     "require-dev": {
-        "orchestra/testbench": "^7.0|^8.0|^9.0",
-        "larastan/larastan": "^2.0",
-        "phpunit/phpunit": "^9.5|^10.5",
-        "laravel/pint": "^1.14"
+        "orchestra/testbench": "^9.0|^10.0",
+        "larastan/larastan": "^3.0",
+        "phpunit/phpunit": "^11.5",
+        "laravel/pint": "^1.21"
     },
     "minimum-stability": "dev",
     "prefer-stable": true

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -9,8 +9,5 @@ parameters:
     level: 8
 
     ignoreErrors:
-
-    excludes_analyse:
-
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
+        - identifier: missingType.iterableValue
+        - identifier: missingType.generics