From 44266536304111ebe7736557cc1ca0fe2658de43 Mon Sep 17 00:00:00 2001
From: Christopher Gammie <contact@gammie.co.uk>
Date: Thu, 8 Feb 2024 19:12:49 +0000
Subject: [PATCH 1/2] feat!: upgrade to Laravel 11 and drop PHP 8.1

---
 .github/workflows/tests.yml |  4 ++--
 CHANGELOG.md                |  7 ++++++-
 composer.json               | 19 ++++++++++---------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2eb4493..3ed0cb5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.1, 8.2]
-        laravel: [10]
+        php: [8.2, 8.3]
+        laravel: [11]
 
     steps:
     - name: Checkout Code
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2ff5f8..d9769aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,12 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
-## Unreleased
+## Unreleased (Laravel 11)
+
+### Changed
+
+- **BREAKING** Package now requires Laravel 11.
+- Minimum PHP version is now `8.2`.
 
 ## [2.1.0] - 2023-11-08
 
diff --git a/composer.json b/composer.json
index 6ae1ff6..4cf6083 100644
--- a/composer.json
+++ b/composer.json
@@ -23,16 +23,16 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-json": "*",
-        "illuminate/contracts": "^10.0",
-        "illuminate/pipeline": "^10.0",
-        "laravel-json-api/core": "^3.0",
-        "laravel-json-api/validation": "^3.0"
+        "illuminate/contracts": "^11.0",
+        "illuminate/pipeline": "^11.0",
+        "laravel-json-api/core": "^4.0",
+        "laravel-json-api/validation": "^4.0"
     },
     "require-dev": {
-        "laravel-json-api/testing": "^2.0",
-        "orchestra/testbench": "^8.0",
+        "laravel-json-api/testing": "^3.0",
+        "orchestra/testbench": "^9.0",
         "phpunit/phpunit": "^10.5"
     },
     "autoload": {
@@ -47,10 +47,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "2.x-dev"
+            "dev-develop": "2.x-dev",
+            "dev-laravel11": "3.x-dev"
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "sort-packages": true

From 78553a4217ba6143aea6ebf7482e72dbd52e019d Mon Sep 17 00:00:00 2001
From: Christopher Gammie <contact@gammie.co.uk>
Date: Tue, 12 Mar 2024 20:34:35 +0000
Subject: [PATCH 2/2] build: update branch alias and github actions

---
 .github/workflows/tests.yml | 4 ++--
 composer.json               | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3ed0cb5..46deb7d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -34,7 +34,7 @@ jobs:
       run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
 
     - name: Install dependencies
-      uses: nick-fields/retry@v2
+      uses: nick-fields/retry@v3
       with:
         timeout_minutes: 5
         max_attempts: 5
diff --git a/composer.json b/composer.json
index 4cf6083..02e8583 100644
--- a/composer.json
+++ b/composer.json
@@ -47,8 +47,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "2.x-dev",
-            "dev-laravel11": "3.x-dev"
+            "dev-develop": "3.x-dev"
         }
     },
     "minimum-stability": "dev",