From 9cd0d51045910936a42566ac428dd0f23fefba02 Mon Sep 17 00:00:00 2001
From: Alexandre <ar.community@devnco.fr>
Date: Fri, 19 Apr 2024 15:20:52 +0200
Subject: [PATCH] Laravel 11 compatibility

Co-authored-by: Alexandre R <russo@novius.fr>
---
 .github/workflows/master.yml     | 8 +++++++-
 composer.json                    | 6 +++---
 src/TranslationLoaderManager.php | 2 +-
 tests/DummyLoader.php            | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 2263be9..a2567ae 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -39,9 +39,11 @@ jobs:
       matrix:
         os: [ ubuntu-latest ]
         php: [ 8.2, 8.1 ]
-        laravel: [ 9.*, 10.* ]
+        laravel: [ 9.*, 10.*, 11.* ]
         dependency-version: [ prefer-stable ]
         include:
+          - laravel: 11.*
+            testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
           - laravel: 9.*
@@ -49,6 +51,10 @@ jobs:
         exclude:
           - laravel: 10.*
             php: 8.0
+          - laravel: 11.*
+            php: 8.1
+          - laravel: 11.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
diff --git a/composer.json b/composer.json
index 1477243..966801b 100644
--- a/composer.json
+++ b/composer.json
@@ -13,12 +13,12 @@
   "license": "MIT",
   "require": {
     "php": "^8.1",
-    "illuminate/translation": "^9.0|^10.0"
+    "illuminate/translation": "^9.0|^10.0|^11.0"
   },
   "require-dev": {
     "laravel/pint": "^1.10",
-    "phpunit/phpunit": "^9.3.3",
-    "orchestra/testbench":  "^7.0|^8.0"
+    "phpunit/phpunit": "^9.3.3|^10.5",
+    "orchestra/testbench":  "^7.0|^8.0|^9.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/TranslationLoaderManager.php b/src/TranslationLoaderManager.php
index 5b3a9e7..0b249ce 100644
--- a/src/TranslationLoaderManager.php
+++ b/src/TranslationLoaderManager.php
@@ -50,7 +50,7 @@ public function load($locale, $group, $namespace = null): array
     protected function getTranslationsForTranslationLoaders(
         string $locale,
         string $group,
-        string $namespace = null
+        ?string $namespace = null
     ): array {
         return collect(config('translation-loader.translation_loaders'))
             ->map(function (string $className) {
diff --git a/tests/DummyLoader.php b/tests/DummyLoader.php
index 27e0405..69480b7 100644
--- a/tests/DummyLoader.php
+++ b/tests/DummyLoader.php
@@ -6,7 +6,7 @@
 
 class DummyLoader implements TranslationLoader
 {
-    public function loadTranslations(string $locale, string $group, string $namespace = null): array
+    public function loadTranslations(string $locale, string $group, ?string $namespace = null): array
     {
         return ['dummy' => 'this is dummy'];
     }