From 1287e3883632e0d82074b81ffd5615e9461d3e88 Mon Sep 17 00:00:00 2001
From: Shift <shift@laravelshift.com>
Date: Sat, 2 Mar 2024 13:18:44 +0000
Subject: [PATCH 1/2] Bump dependencies for Laravel 11

---
 composer.json | 138 +++++++++++++++++++++++++-------------------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/composer.json b/composer.json
index 127adaf..961ad74 100644
--- a/composer.json
+++ b/composer.json
@@ -1,72 +1,72 @@
 {
-  "name": "konnco/filament-import",
-  "description": "",
-  "keywords": [
-    "import",
-    "laravel",
-    "filament-import"
-  ],
-  "autoload": {
-    "psr-4": {
-      "Konnco\\FilamentImport\\": "src/"
+    "name": "konnco/filament-import",
+    "description": "",
+    "keywords": [
+        "import",
+        "laravel",
+        "filament-import"
+    ],
+    "autoload": {
+        "psr-4": {
+            "Konnco\\FilamentImport\\": "src/"
+        }
+    },
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Franky So",
+            "email": "frankyso.mail@gmail.com"
+        }
+    ],
+    "require": {
+        "php": "^8.0",
+        "filament/filament": "^3",
+        "filament/notifications": "^3.0",
+        "illuminate/contracts": "^10|^11.0",
+        "illuminate/support": "^10.0|^11.0",
+        "livewire/livewire": "^3",
+        "maatwebsite/excel": "^3.1.48",
+        "psr/simple-cache": "^2.0|^3.0",
+        "spatie/laravel-package-tools": "^1.16"
+    },
+    "require-dev": {
+        "laravel/pint": "^1.11",
+        "nunomaduro/collision": "^6.4|^7.0|^8.0",
+        "nunomaduro/larastan": "^2.6.4",
+        "orchestra/testbench": "^8.8|^9.0",
+        "pestphp/pest": "^2",
+        "pestphp/pest-plugin-laravel": "^2",
+        "pestphp/pest-plugin-livewire": "^2.1",
+        "phpstan/extension-installer": "^1.3.1",
+        "phpstan/phpstan-deprecation-rules": "^1.1.4",
+        "phpstan/phpstan-phpunit": "^1.3.13",
+        "phpunit/phpunit": "^9.6.10|^10.0"
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Konnco\\FilamentImport\\Tests\\": "tests"
+        }
+    },
+    "scripts": {
+        "analyse": "vendor/bin/phpstan analyse",
+        "test": "vendor/bin/pest",
+        "test-coverage": "vendor/bin/pest --coverage",
+        "format": "vendor/bin/pint"
+    },
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true,
+            "phpstan/extension-installer": true
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Konnco\\FilamentImport\\FilamentImportServiceProvider"
+            ]
+        }
     }
-  },
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Franky So",
-      "email": "frankyso.mail@gmail.com"
-    }
-  ],
-  "require": {
-    "php": "^8.0",
-    "filament/filament": "^3",
-    "filament/notifications": "^3.0",
-    "illuminate/contracts": "^10",
-    "illuminate/support": "^10.0",
-    "livewire/livewire": "^3",
-    "maatwebsite/excel": "^3.1.48",
-    "psr/simple-cache": "^2.0|^3.0",
-    "spatie/laravel-package-tools": "^1.16"
-  },
-  "require-dev": {
-    "laravel/pint": "^1.11",
-    "nunomaduro/collision": "^6.4|^7.0",
-    "nunomaduro/larastan": "^2.6.4",
-    "orchestra/testbench": "^8.8",
-    "pestphp/pest": "^2",
-    "pestphp/pest-plugin-laravel": "^2",
-    "pestphp/pest-plugin-livewire": "^2.1",
-    "phpstan/extension-installer": "^1.3.1",
-    "phpstan/phpstan-deprecation-rules": "^1.1.4",
-    "phpstan/phpstan-phpunit": "^1.3.13",
-    "phpunit/phpunit": "^9.6.10|^10.0"
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Konnco\\FilamentImport\\Tests\\": "tests"
-    }
-  },
-  "scripts": {
-    "analyse": "vendor/bin/phpstan analyse",
-    "test": "vendor/bin/pest",
-    "test-coverage": "vendor/bin/pest --coverage",
-    "format": "vendor/bin/pint"
-  },
-  "config": {
-    "sort-packages": true,
-    "allow-plugins": {
-      "pestphp/pest-plugin": true,
-      "phpstan/extension-installer": true
-    }
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true,
-  "extra": {
-    "laravel": {
-      "providers": [
-        "Konnco\\FilamentImport\\FilamentImportServiceProvider"
-      ]
-    }
-  }
 }

From 0afa9f902e4c884df7c4bcee690c83d6683be8c2 Mon Sep 17 00:00:00 2001
From: Shift <shift@laravelshift.com>
Date: Sat, 2 Mar 2024 13:18:44 +0000
Subject: [PATCH 2/2] Update GitHub Actions for Laravel 11

---
 .github/workflows/run-tests.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 5ff0b7e..dd3a0c7 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -2,23 +2,31 @@ name: run-tests
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
   pull_request:
-    branches: [main]
+    branches:
+      - main
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.1]
-        laravel: [9.*]
+        php: [8.1, '8.2']
+        laravel: ['9.*', '11.*']
         stability: [prefer-stable]
         include:
           - laravel: 9.*
             testbench: 7.*
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -37,9 +45,11 @@ jobs:
         run: |
           echo "::add-matcher::${{ runner.tool_cache }}/php.json"
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
       - name: Install dependencies
         run: |
           composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
       - name: Execute tests
         run: vendor/bin/pest