From 3a79acb443950eee27ea4085a57c1649d661e4d7 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Wed, 13 Mar 2024 12:32:55 +0300 Subject: [PATCH] Added Laravel 11 support --- .github/workflows/tests.yml | 10 ++++++---- app/Commands/Cldr.php | 2 +- app/Commands/Collect.php | 2 +- app/Commands/Command.php | 2 +- app/Integrations/Cldr.php | 2 +- app/Integrations/Integration.php | 2 +- app/Processors/Cldr.php | 2 +- app/Processors/Collect.php | 2 +- app/Processors/Processor.php | 2 +- app/Services/Process.php | 2 +- composer.json | 4 ++-- phpunit.xml | 2 +- src/CountryNames.php | 2 +- src/Data/CountryData.php | 2 +- src/Enums/SortBy.php | 2 +- src/Helpers/Arr.php | 2 +- src/Helpers/Path.php | 2 +- src/Services/Filesystem.php | 2 +- tests/Datasets/Locales.php | 2 +- tests/Helpers/assets.php | 2 +- tests/Helpers/flatten.php | 2 +- tests/Helpers/native.php | 2 +- tests/Pest.php | 2 +- tests/TestCase.php | 2 +- tests/Unit/EmptyTest.php | 2 +- tests/Unit/EnumTest.php | 2 +- tests/Unit/IncorrectTest.php | 2 +- tests/Unit/NativeTest.php | 2 +- tests/Unit/SortTest.php | 2 +- tests/Unit/StringTest.php | 2 +- 30 files changed, 36 insertions(+), 34 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 05fd1e0..da9b089 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,10 +12,12 @@ jobs: fail-fast: true matrix: php: [ "8.1", "8.2", "8.3" ] - laravel: [ "10.0" ] - prefer: [ "stable", "lowest" ] + laravel: [ "10.0", "11.0" ] + exclude: + - laravel: "11.0" + php: "8.1" - name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }} ${{ matrix.prefer }} + name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -29,7 +31,7 @@ jobs: coverage: xdebug - name: Install dependencies - run: composer require laravel/framework:^${{ matrix.laravel }} --prefer-${{ matrix.prefer }} + run: composer require laravel/framework:^${{ matrix.laravel }} - name: Execute tests run: vendor/bin/pest --compact diff --git a/app/Commands/Cldr.php b/app/Commands/Cldr.php index 2b6b9b9..b6063f6 100644 --- a/app/Commands/Cldr.php +++ b/app/Commands/Cldr.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/app/Commands/Collect.php b/app/Commands/Collect.php index f72df5d..668b831 100644 --- a/app/Commands/Collect.php +++ b/app/Commands/Collect.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/app/Commands/Command.php b/app/Commands/Command.php index a4f3e91..e023934 100644 --- a/app/Commands/Command.php +++ b/app/Commands/Command.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/app/Integrations/Cldr.php b/app/Integrations/Cldr.php index 6382f8a..69834fe 100644 --- a/app/Integrations/Cldr.php +++ b/app/Integrations/Cldr.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/app/Integrations/Integration.php b/app/Integrations/Integration.php index 5a662e6..df14f27 100644 --- a/app/Integrations/Integration.php +++ b/app/Integrations/Integration.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/app/Processors/Cldr.php b/app/Processors/Cldr.php index e62325e..33814cb 100644 --- a/app/Processors/Cldr.php +++ b/app/Processors/Cldr.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/app/Processors/Collect.php b/app/Processors/Collect.php index 48820fa..5535564 100644 --- a/app/Processors/Collect.php +++ b/app/Processors/Collect.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/app/Processors/Processor.php b/app/Processors/Processor.php index bde3437..96ada65 100644 --- a/app/Processors/Processor.php +++ b/app/Processors/Processor.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/app/Services/Process.php b/app/Services/Process.php index 7cf4eeb..76303bd 100644 --- a/app/Services/Process.php +++ b/app/Services/Process.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/composer.json b/composer.json index c380a24..57e6423 100644 --- a/composer.json +++ b/composer.json @@ -36,10 +36,10 @@ "php": "^8.1", "ext-json": "*", "dragon-code/support": "^6.11", - "illuminate/collections": "^10.0" + "illuminate/collections": "^10.0 || ^11.0" }, "require-dev": { - "illuminate/support": "^10.0", + "illuminate/support": "^10.0 || ^11.0", "laravel-lang/locale-list": "^1.2", "pestphp/pest": "^2.24.3", "punic/punic": "^3.8", diff --git a/phpunit.xml b/phpunit.xml index f5ea0db..0ebdeb6 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,7 +7,7 @@ ~ file that was distributed with this source code. ~ ~ @author Andrey Helldar - ~ @copyright 2023 Laravel Lang Team + ~ @copyright 2024 Laravel Lang Team ~ @license MIT ~ ~ @see https://laravel-lang.com diff --git a/src/CountryNames.php b/src/CountryNames.php index 8475063..e4b1b8a 100644 --- a/src/CountryNames.php +++ b/src/CountryNames.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/src/Data/CountryData.php b/src/Data/CountryData.php index 2229658..1617167 100644 --- a/src/Data/CountryData.php +++ b/src/Data/CountryData.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/src/Enums/SortBy.php b/src/Enums/SortBy.php index 98a045b..fa6c631 100644 --- a/src/Enums/SortBy.php +++ b/src/Enums/SortBy.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/src/Helpers/Arr.php b/src/Helpers/Arr.php index aba0da2..aaaaa0c 100644 --- a/src/Helpers/Arr.php +++ b/src/Helpers/Arr.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/src/Helpers/Path.php b/src/Helpers/Path.php index 471ce2f..ad90837 100644 --- a/src/Helpers/Path.php +++ b/src/Helpers/Path.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/src/Services/Filesystem.php b/src/Services/Filesystem.php index 5ad566d..6fa11bd 100644 --- a/src/Services/Filesystem.php +++ b/src/Services/Filesystem.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Datasets/Locales.php b/tests/Datasets/Locales.php index bf3c137..9eab139 100644 --- a/tests/Datasets/Locales.php +++ b/tests/Datasets/Locales.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Helpers/assets.php b/tests/Helpers/assets.php index 3634211..f524434 100644 --- a/tests/Helpers/assets.php +++ b/tests/Helpers/assets.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Helpers/flatten.php b/tests/Helpers/flatten.php index 0d08988..1a86fd8 100644 --- a/tests/Helpers/flatten.php +++ b/tests/Helpers/flatten.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Helpers/native.php b/tests/Helpers/native.php index 0c2fab2..db270cf 100644 --- a/tests/Helpers/native.php +++ b/tests/Helpers/native.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Pest.php b/tests/Pest.php index 74272f2..f78cb84 100644 --- a/tests/Pest.php +++ b/tests/Pest.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/TestCase.php b/tests/TestCase.php index 739e55b..672718f 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Unit/EmptyTest.php b/tests/Unit/EmptyTest.php index f0ac11b..e95bfdf 100644 --- a/tests/Unit/EmptyTest.php +++ b/tests/Unit/EmptyTest.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Unit/EnumTest.php b/tests/Unit/EnumTest.php index 0656930..8a600b1 100644 --- a/tests/Unit/EnumTest.php +++ b/tests/Unit/EnumTest.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Unit/IncorrectTest.php b/tests/Unit/IncorrectTest.php index 7d3eec3..6175595 100644 --- a/tests/Unit/IncorrectTest.php +++ b/tests/Unit/IncorrectTest.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Unit/NativeTest.php b/tests/Unit/NativeTest.php index 0f06867..4e0aa8b 100644 --- a/tests/Unit/NativeTest.php +++ b/tests/Unit/NativeTest.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Unit/SortTest.php b/tests/Unit/SortTest.php index dae6610..cea1856 100644 --- a/tests/Unit/SortTest.php +++ b/tests/Unit/SortTest.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com diff --git a/tests/Unit/StringTest.php b/tests/Unit/StringTest.php index 1f124ad..ba2f483 100644 --- a/tests/Unit/StringTest.php +++ b/tests/Unit/StringTest.php @@ -7,7 +7,7 @@ * file that was distributed with this source code. * * @author Andrey Helldar - * @copyright 2023 Laravel Lang Team + * @copyright 2024 Laravel Lang Team * @license MIT * * @see https://laravel-lang.com