Laravel 10.x Compatibility (#120)

Co-authored-by: Pascal Baljet <[email protected]>
protonemedia · Feb 21, 2023 · 21086aa · 21086aa
1 parent 656479c
commit 21086aa
Show file tree

Hide file tree

Showing 22 changed files with 1,737 additions and 1,727 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
         node-version:
           - 16
 

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -8,11 +8,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.0]
-        laravel: [9.*]
+        php: [8.2, 8.1]
+        laravel: ["9", "10"]
         dependency-version: [prefer-lowest, prefer-stable]
 
-    name: P${{ matrix.php }} - ${{ matrix.dependency-version }}
+    name: L${{ matrix.laravel}} - P${{ matrix.php }} - ${{ matrix.dependency-version }}
 
     steps:
       - name: Checkout code
@@ -53,6 +53,13 @@ jobs:
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, mysql, mysqli, pdo_mysql
           coverage: none
 
+      - name: Downgrade to Laravel 9
+        run: |
+          cd app
+          rm composer.json
+          mv composer-l9.json composer.json
+        if: "matrix.laravel == '9'"
+
       - name: Prepare demo app
         run: |
           cd app

diff --git a/app/composer-l9.json b/app/composer-l9.json
@@ -0,0 +1,76 @@
+{
+    "name": "laravel/laravel",
+    "type": "project",
+    "description": "The Laravel Framework.",
+    "keywords": [
+        "framework",
+        "laravel"
+    ],
+    "license": "MIT",
+    "require": {
+        "php": "^8.1|^8.2",
+        "guzzlehttp/guzzle": "^7.2",
+        "inertiajs/inertia-laravel": "^0.6.9",
+        "laravel/breeze": "^1.9",
+        "laravel/dusk": "^6.24",
+        "laravel/framework": "^9.37",
+        "laravel/sanctum": "^2.8",
+        "laravel/tinker": "^2.7",
+        "protonemedia/inertiajs-tables-laravel-query-builder": "@dev",
+        "spatie/laravel-query-builder": "^5.0",
+        "tightenco/ziggy": "^1.0"
+    },
+    "require-dev": {
+        "fakerphp/faker": "^1.9.1",
+        "friendsofphp/php-cs-fixer": "^3.8",
+        "mockery/mockery": "^1.4.4",
+        "nunomaduro/collision": "^6.1",
+        "phpunit/phpunit": "^9.5.10",
+        "spatie/laravel-ignition": "^1.0"
+    },
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "App\\": "app/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover --ansi"
+        ],
+        "post-update-cmd": [
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
+        ],
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate --ansi"
+        ]
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": []
+        }
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}
diff --git a/app/composer.json b/app/composer.json
@@ -8,13 +8,13 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1|^8.2",
         "guzzlehttp/guzzle": "^7.2",
-        "inertiajs/inertia-laravel": "^0.6.3",
+        "inertiajs/inertia-laravel": "^0.6.9",
         "laravel/breeze": "^1.9",
-        "laravel/dusk": "^6.24",
-        "laravel/framework": "^9.19.0",
-        "laravel/sanctum": "^2.8",
+        "laravel/dusk": "^7.0",
+        "laravel/framework": "^10.0",
+        "laravel/sanctum": "^2.8|^3.0",
         "laravel/tinker": "^2.7",
         "protonemedia/inertiajs-tables-laravel-query-builder": "@dev",
         "spatie/laravel-query-builder": "^5.0",
@@ -26,7 +26,7 @@
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^6.1",
         "phpunit/phpunit": "^9.5.10",
-        "spatie/laravel-ignition": "^1.0"
+        "spatie/laravel-ignition": "^1.0|^2.0"
     },
     "repositories": [
         {
@@ -73,4 +73,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}