From aee1856c9faeacd7199549d718ca09aa540f2957 Mon Sep 17 00:00:00 2001
From: Benedikt Franke <benedikt.franke@mll.com>
Date: Thu, 20 Apr 2023 11:37:29 +0200
Subject: [PATCH] Support Laravel 10 (#5)

---
 .github/workflows/validate.yml | 31 ++++++++++++++++++++++---------
 CHANGELOG.md                   |  6 ++++++
 composer.json                  | 14 +++++++-------
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 93c1c38..ce2db1f 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -13,23 +13,36 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 7.4
-          - 8.0
+          - "7.4"
+          - "8.0"
+          - "8.1"
+          - "8.2"
         laravel-version:
-          - ^8
-          - ^9
+          - "^8"
+          - "^9"
+          - "^10"
         exclude:
-          - php-version: 7.4
-            laravel-version: ^9
-
+          - php-version: "7.4"
+            laravel-version: "^9"
+          - php-version: "7.4"
+            laravel-version: "^10"
+          - php-version: "8.0"
+            laravel-version: "^10"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: shivammathur/setup-php@v2
         with:
           coverage: none
           php-version: ${{ matrix.php-version }}
 
-      - run: composer require illuminate/contracts:${{ matrix.laravel-version }} --no-interaction --prefer-dist --no-interaction
+      - run: >
+          composer require
+          illuminate/contracts:${{ matrix.laravel-version }}
+          --no-interaction
+          --prefer-dist
+          --no-progress
+          --update-with-all-dependencies
+          ${{ matrix.composer.arg }}
 
       - run: vendor/bin/phpstan
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad5d398..9748c78 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## v2.1.0
+
+### Added
+
+- Support Laravel 10
+
 ## v2.0.1
 
 ### Fixed
diff --git a/composer.json b/composer.json
index 2b75c12..2115362 100644
--- a/composer.json
+++ b/composer.json
@@ -15,17 +15,17 @@
   ],
   "require": {
     "php": "^7.4 || ^8",
-    "illuminate/console": "^8 || ^9",
-    "illuminate/contracts": "^8 || ^9",
-    "illuminate/support": "^8 || ^9",
+    "illuminate/console": "^8 || ^9 || ^10",
+    "illuminate/contracts": "^8 || ^9 || ^10",
+    "illuminate/support": "^8 || ^9 || ^10",
     "thecodingmachine/safe": "^1 || ^2"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2",
-    "laravel/lumen-framework": "^8 || ^9",
-    "mll-lab/php-cs-fixer-config": "^4.4.1",
-    "nunomaduro/larastan": "^0.7 || ^1",
-    "orchestra/testbench": "^6 || ^7",
+    "laravel/lumen-framework": "^8 || ^9 || ^10",
+    "mll-lab/php-cs-fixer-config": "^5",
+    "nunomaduro/larastan": "^0.7 || ^1 || ^2",
+    "orchestra/testbench": "^6 || ^7 || ^8",
     "thecodingmachine/phpstan-safe-rule": "^1"
   },
   "minimum-stability": "dev",