From 9a65f5b1950270f79a2864ed67dcf8bd211b71b2 Mon Sep 17 00:00:00 2001
From: Arthur LORENT <arthur.lorent@gmail.com>
Date: Sun, 22 Jan 2023 23:54:51 +0100
Subject: [PATCH 1/2] Laravel 10 support

---
 .github/workflows/ci.yml | 29 +++++++++++++++++++++++------
 composer.json            | 12 +++++++++---
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c33c590..4531b1e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,17 +14,18 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
+<<<<<<< Updated upstream
         php: ['8.1', '8.0']
         laravel: ['9.*', '8.*']
+=======
+        php: ['8.1', '8.2']
+        laravel: ['9.*', '10.*']
+>>>>>>> Stashed changes
         include:
           - laravel: '9.*'
             testbench: '7.*'
-            eloquent-sortable: '4.*'
-            larastan: '2.*'
-          - laravel: '8.*'
-            eloquent-sortable: '3.*'
-            testbench: '6.*'
-            larastan: '1.*'
+          - laravel: '10.*'
+            testbench: '8.*'
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }}
 
@@ -53,13 +54,21 @@ jobs:
       # Lower PHP and laravel versions.
 
       - name: PHPUnit without code coverage
+<<<<<<< Updated upstream
         if: matrix.php != '8.1' || matrix.laravel != '9.*'
+=======
+        if: matrix.php != '8.2' || matrix.laravel != '10.*'
+>>>>>>> Stashed changes
         run: vendor/bin/testbench package:test --parallel --no-coverage
 
       # Last PHP and laravel versions.
 
       - name: Code analysis
+<<<<<<< Updated upstream
         if: matrix.php == '8.1' && matrix.laravel == '9.*'
+=======
+        if: matrix.php == '8.2' && matrix.laravel == '10.*'
+>>>>>>> Stashed changes
         run: |
           # Remove this line once Larastan and Livewire are working well together
           sed -i -e 's#.*protected \$enablesPackageDiscoveries.*#&\nprotected function overrideApplicationBindings($app){return["brickables"=>"Okipa\\\\LaravelBrickables\\\\Brickables"];}#' vendor/nunomaduro/larastan/src/ApplicationResolver.php
@@ -68,13 +77,21 @@ jobs:
           vendor/bin/phpstan analyse
 
       - name: PHPUnit with code coverage
+<<<<<<< Updated upstream
         if: matrix.php == '8.1' && matrix.laravel == '9.*'
+=======
+        if: matrix.php == '8.2' && matrix.laravel == '10.*'
+>>>>>>> Stashed changes
         run: |
           mkdir -p build/logs
           vendor/bin/testbench package:test --parallel --coverage-text --coverage-clover build/logs/clover.xml
 
       - name: Code coverage upload to Coveralls
+<<<<<<< Updated upstream
         if: env.COVERALLS_REPO_TOKEN && matrix.php == '8.1' && matrix.laravel == '9.*'
+=======
+        if: env.COVERALLS_REPO_TOKEN && matrix.php == '8.2' && matrix.laravel == '10.*'
+>>>>>>> Stashed changes
         env:
           COVERALLS_RUN_LOCALLY: 1
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
diff --git a/composer.json b/composer.json
index 1672e59..ee94302 100755
--- a/composer.json
+++ b/composer.json
@@ -25,15 +25,21 @@
         }
     ],
     "require": {
+<<<<<<< Updated upstream
         "php": "^8.0|^8.1",
         "illuminate/contracts": "^8.0|^9.0",
         "spatie/eloquent-sortable": "^3.10.0|^4.0.1"
+=======
+        "php": "8.1.*|8.2.*",
+        "illuminate/contracts": "^9.0|^10.0",
+        "spatie/eloquent-sortable": "4.0.1"
+>>>>>>> Stashed changes
     },
     "require-dev": {
         "brianium/paratest": "^6.4",
-        "nunomaduro/collision": "^5.10|^6.0",
-        "nunomaduro/larastan": "^1.0|^2.0",
-        "orchestra/testbench": "^6.0|^7.0",
+        "nunomaduro/collision": "^6.0",
+        "nunomaduro/larastan": "^2.0",
+        "orchestra/testbench": "^7.0|^8.0",
         "phpmd/phpmd": "^2.11",
         "laravel/pint": "^1.1"
     },

From 0ad6a8890155c08f84db5b1cbf7f33f33963d0eb Mon Sep 17 00:00:00 2001
From: Arthur LORENT <arthur@acid.fr>
Date: Mon, 23 Jan 2023 09:39:44 +0100
Subject: [PATCH 2/2] Laravel 10 support

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d646cce..8e0f658 100755
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     "require": {
         "php": "8.1.*|8.2.*",
         "illuminate/contracts": "^9.0|^10.0",
-        "spatie/eloquent-sortable": "4.0.1"
+        "spatie/eloquent-sortable": "4.0.2"
     },
     "require-dev": {
         "brianium/paratest": "^6.4",