Merge pull request #13 from Laravel-Lang/2.x

Added Laravel 11 support
Laravel-Lang · Mar 13, 2024 · 597865f · 597865f
2 parents 9b702b7 + 2cf8c89
commit 597865f
Show file tree

Hide file tree

Showing 11 changed files with 112 additions and 51 deletions.
diff --git a/composer.json b/composer.json
@@ -16,11 +16,11 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^10.0",
-        "illuminate/translation": "^10.0"
+        "illuminate/support": "^10.0 || ^11.0",
+        "illuminate/translation": "^10.0 || ^11.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^8.0",
+        "orchestra/testbench": "^8.0 || ^9.0",
         "phpunit/phpunit": "^10.0"
     },
     "minimum-stability": "stable",

diff --git a/phpunit.php b/phpunit.php
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--~
-  ~ This file is part of the "Laravel-Lang/publisher" project.
+  ~ This file is part of the "dragon-code/json-fallback" project.
   ~
   ~ For the full copyright and license information, please view the LICENSE
   ~ file that was distributed with this source code.
   ~
   ~ @author Andrey Helldar <helldar@dragon-code.pro>
-  ~
-  ~ @copyright 2022 Andrey Helldar
-  ~
+  ~ @copyright 2024 Andrey Helldar
   ~ @license MIT
   ~
-  ~ @see https://github.com/Laravel-Lang/publisher
+  ~ @see https://github.com/TheDragonCode/json-fallback
   -->
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
          cacheResult="false"
          backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="phpunit.php"
+         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

diff --git a/src/TranslationServiceProvider.php b/src/TranslationServiceProvider.php
@@ -1,5 +1,18 @@
 <?php
 
+/**
+ * This file is part of the "dragon-code/json-fallback" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/json-fallback
+ */
+
 declare(strict_types=1);
 
 namespace LaravelLang\JsonFallback;

diff --git a/src/Translator.php b/src/Translator.php
@@ -1,5 +1,18 @@
 <?php
 
+/**
+ * This file is part of the "dragon-code/json-fallback" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/json-fallback
+ */
+
 declare(strict_types=1);
 
 namespace LaravelLang\JsonFallback;

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,5 +1,18 @@
 <?php
 
+/**
+ * This file is part of the "dragon-code/json-fallback" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/json-fallback
+ */
+
 declare(strict_types=1);
 
 namespace Tests;

diff --git a/tests/Unit/DefaultTest.php b/tests/Unit/DefaultTest.php
@@ -1,5 +1,18 @@
 <?php
 
+/**
+ * This file is part of the "dragon-code/json-fallback" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/json-fallback
+ */
+
 declare(strict_types=1);
 
 namespace Tests\Unit;

diff --git a/tests/Unit/FallbackTest.php b/tests/Unit/FallbackTest.php
@@ -1,5 +1,18 @@
 <?php
 
+/**
+ * This file is part of the "dragon-code/json-fallback" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/json-fallback
+ */
+
 declare(strict_types=1);
 
 namespace Tests\Unit;

diff --git a/tests/fixtures/default/en/custom.php b/tests/fixtures/default/en/custom.php
@@ -1,5 +1,18 @@
 <?php
 
+/**
+ * This file is part of the "dragon-code/json-fallback" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/json-fallback
+ */
+
 declare(strict_types=1);
 
 return [

diff --git a/tests/fixtures/default/fr/custom.php b/tests/fixtures/default/fr/custom.php
@@ -1,5 +1,18 @@
 <?php
 
+/**
+ * This file is part of the "dragon-code/json-fallback" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/json-fallback
+ */
+
 declare(strict_types=1);
 
 return [

diff --git a/tests/fixtures/fallback/fr/custom.php b/tests/fixtures/fallback/fr/custom.php
@@ -1,5 +1,18 @@
 <?php
 
+/**
+ * This file is part of the "dragon-code/json-fallback" project.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @author Andrey Helldar <helldar@dragon-code.pro>
+ * @copyright 2024 Andrey Helldar
+ * @license MIT
+ *
+ * @see https://github.com/TheDragonCode/json-fallback
+ */
+
 declare(strict_types=1);
 
 return [