From acbdc49149c10f5132d11c59e64121bb81c346ae Mon Sep 17 00:00:00 2001
From: Ivan Vermeyen <ivan@vermeyen.org>
Date: Fri, 3 Feb 2023 14:48:44 +0100
Subject: [PATCH 1/3] Add support for Laravel 10

---
 .github/workflows/run-tests.yml | 7 ++++++-
 README.md                       | 4 ++--
 composer.json                   | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index f5a0c41..06f9ee9 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -9,8 +9,11 @@ jobs:
       fail-fast: true
       matrix:
         php: [ 8.0, 8.1 ]
-        laravel: [ 8.*, 9.* ]
+        laravel: [ 8.*, 9.*, 10.* ]
         dependency-version: [ prefer-stable ]
+        exclude:
+          - laravel: 10.*
+            php: 8.0
         include:
           - laravel: 5.6.*
             php: 7.1
@@ -40,6 +43,8 @@ jobs:
             testbench: 6.*
           - laravel: 9.*
             testbench: 7.*
+          - laravel: 10.*
+            testbench: 8.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
diff --git a/README.md b/README.md
index 2809567..a8ccf6f 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,9 @@ I know you can get punished for this, but you are one of the hopes of those inno
 ---
 
 [![GitHub release](https://img.shields.io/github/release/codezero-be/laravel-localizer.svg?style=flat-square)](https://github.com/codezero-be/laravel-localizer/releases)
-[![Laravel](https://img.shields.io/badge/laravel-9-red?style=flat-square&logo=laravel&logoColor=white)](https://laravel.com)
+[![Laravel](https://img.shields.io/badge/laravel-10-red?style=flat-square&logo=laravel&logoColor=white)](https://laravel.com)
 [![License](https://img.shields.io/packagist/l/codezero/laravel-localizer.svg?style=flat-square)](LICENSE.md)
-[![Build Status](https://img.shields.io/github/workflow/status/codezero-be/laravel-localizer/Tests/master?style=flat-square&logo=github&logoColor=white&label=tests)](https://github.com/codezero-be/laravel-localizer/actions)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/codezero-be/laravel-localizer/run-tests.yml?style=flat-square&logo=github&logoColor=white&label=tests)](https://github.com/codezero-be/laravel-localized-routes/actions)
 [![Code Coverage](https://img.shields.io/codacy/coverage/ad6fcea152b449d380a187a375d0f7d7/master?style=flat-square)](https://app.codacy.com/gh/codezero-be/laravel-localizer)
 [![Code Quality](https://img.shields.io/codacy/grade/ad6fcea152b449d380a187a375d0f7d7/master?style=flat-square)](https://app.codacy.com/gh/codezero-be/laravel-localizer)
 [![Total Downloads](https://img.shields.io/packagist/dt/codezero/laravel-localizer.svg?style=flat-square)](https://packagist.org/packages/codezero/laravel-localizer)
diff --git a/composer.json b/composer.json
index 88cc6b6..171a708 100644
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,11 @@
     "require": {
         "php": "^7.1|^8.0",
         "codezero/browser-locale": "^3.0",
-        "illuminate/support": "^5.6|^6.0|^7.0|^8.0|^9.0"
+        "illuminate/support": "^5.6|^6.0|^7.0|^8.0|^9.0|^10.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.3",
-        "orchestra/testbench": "^3.6|^4.0|^5.0|^6.0|^7.0",
+        "orchestra/testbench": "^3.6|^4.0|^5.0|^6.0|^7.0|^8.0",
         "phpunit/phpunit": "^7.0|^8.0|^9.0"
     },
     "scripts": {

From 82433c0ca3b8e317e2302a4bc1c98d374af46a25 Mon Sep 17 00:00:00 2001
From: Ivan Vermeyen <ivan@vermeyen.org>
Date: Fri, 3 Feb 2023 15:09:16 +0100
Subject: [PATCH 2/3] Allow composer plugin

---
 composer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 171a708..ce3d5f2 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,10 @@
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
-        "optimize-autoloader": true
+        "optimize-autoloader": true,
+        "allow-plugins": {
+            "kylekatarnls/update-helper": true
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true

From cba79dc954835c6ea56bae8baaae418d185f11c0 Mon Sep 17 00:00:00 2001
From: Ivan Vermeyen <ivan@vermeyen.org>
Date: Fri, 3 Feb 2023 19:03:49 +0100
Subject: [PATCH 3/3] Fix version comparison

---
 tests/Feature/SetLocaleTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Feature/SetLocaleTest.php b/tests/Feature/SetLocaleTest.php
index f30266f..962b944 100644
--- a/tests/Feature/SetLocaleTest.php
+++ b/tests/Feature/SetLocaleTest.php
@@ -236,7 +236,7 @@ protected function setBrowserLocales($locales)
      */
     protected function getWithCookie($url, $cookie)
     {
-        return App::version() < 6
+        return version_compare(App::version(), '6.0.0') === -1
             ? $this->call('GET', $url, [], [$this->cookieName => Crypt::encrypt($cookie, false)])
             : $this->withCookie($this->cookieName, $cookie)->get($url);
     }