From 15d2c382629cb7f1c2fa009c2106c11cd584c367 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Wed, 9 Aug 2023 12:20:43 +0300 Subject: [PATCH 1/4] Removed support for old version of Laravel --- .github/workflows/phpunit.yml | 2 +- composer.json | 10 +++--- docs/installation/compatibility/attributes.md | 8 ++--- docs/installation/compatibility/common.md | 3 +- .../compatibility/http-statuses.md | 10 +++--- docs/installation/compatibility/lang.md | 16 +++++++++ docs/installation/compatibility/publisher.md | 2 +- .../compatibility/support-policy.md | 35 ++++++++++--------- phpunit.xml | 16 +++------ 9 files changed, 57 insertions(+), 45 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index f2a3cac57..5d4d8b171 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -12,7 +12,7 @@ jobs: fail-fast: true matrix: php: [ "8.1", "8.2" ] - laravel: [ "8.0", "9.0", "10.0" ] + laravel: [ "10.0" ] name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }} diff --git a/composer.json b/composer.json index f99906746..741f999fd 100644 --- a/composer.json +++ b/composer.json @@ -45,16 +45,16 @@ "source": "https://github.com/Laravel-Lang/common" }, "require": { - "php": "^8.0", + "php": "^8.1", "laravel-lang/attributes": "^2.3.3", "laravel-lang/http-statuses": "^3.3.1", - "laravel-lang/lang": "^12.21.9", + "laravel-lang/lang": "^13.0", "laravel-lang/publisher": "^14.6.4" }, "require-dev": { - "orchestra/testbench": "^6.0 || ^7.0 || ^8.5.5", - "phpunit/phpunit": "^9.6.8", - "symfony/var-dumper": "^5.4 || ^6.3" + "orchestra/testbench": "^8.5 || ^9.0", + "phpunit/phpunit": "^10.0", + "symfony/var-dumper": "^6.3" }, "minimum-stability": "stable", "prefer-stable": true, diff --git a/docs/installation/compatibility/attributes.md b/docs/installation/compatibility/attributes.md index 4aef9c421..e7264d35a 100644 --- a/docs/installation/compatibility/attributes.md +++ b/docs/installation/compatibility/attributes.md @@ -4,10 +4,10 @@ title: Attributes # Compatibility: Attributes -| Laravel, Lumen | PHP | Publisher | Package Version | Status | -|----------------|--------------------|-------------|-----------------|---------------------------------------| -| 8.x, 9.x, 10.x | 8.1, 8.2 | 14.x | `^2.0` | ![Supported][badge_supported] | -| 7.x, 8.x, 9.x | 7.3, 7.4, 8.0, 8.1 | 12.1+, 13.x | `^1.0` | ![Not Supported][badge_not_supported] | +| Laravel, Lumen | PHP | Publisher | Package Version | Status | +|----------------------|--------------------|-------------|-----------------|---------------------------------------| +| 8.x, 9.x, 10.x, 11.x | 8.1, 8.2 | 14.x | `^2.0` | ![Supported][badge_supported] | +| 7.x, 8.x, 9.x | 7.3, 7.4, 8.0, 8.1 | 12.1+, 13.x | `^1.0` | ![Not Supported][badge_not_supported] | [badge_not_supported]: https://img.shields.io/badge/not%20supported-lightgrey?style=flat-square diff --git a/docs/installation/compatibility/common.md b/docs/installation/compatibility/common.md index 1dc0b5735..a85f60292 100644 --- a/docs/installation/compatibility/common.md +++ b/docs/installation/compatibility/common.md @@ -6,7 +6,8 @@ title: Common | Laravel, Lumen | PHP | Package Version | What packages will be installed | Status | |----------------|--------------------|-----------------|--------------------------------------------------------------|---------------------------------------| -| 8.x, 9.x, 10.x | 8.1, 8.2 | `^3.0` | Publisher 14.x, Lang 12.x, Attributes 2.x, HTTP Statuses 3.x | ![Supported][badge_supported] | +| 10.x, 11.x | 8.1, 8.2 | `^4.0` | Publisher 14.x, Lang 13.x, Attributes 2.x, HTTP Statuses 3.x | ![Supported][badge_supported] | +| 8.x, 9.x, 10.x | 8.1, 8.2 | `^3.0` | Publisher 14.x, Lang 12.x, Attributes 2.x, HTTP Statuses 3.x | ![Not Supported][badge_not_supported] | | 7.x, 8.x, 9.x | 8.0, 8.1 | `^2.0` | Publisher 13.x, Lang 10.x, Attributes 1.x, HTTP Statuses 2.x | ![Not Supported][badge_not_supported] | | 7.x, 8.x, 9.x | 7.3, 7.4, 8.0, 8.1 | `^1.0` | Publisher 12.x, Lang 10.x, Attributes 1.x, HTTP Statuses 2.x | ![Not Supported][badge_not_supported] | diff --git a/docs/installation/compatibility/http-statuses.md b/docs/installation/compatibility/http-statuses.md index 3b9e18e9c..70618fd27 100644 --- a/docs/installation/compatibility/http-statuses.md +++ b/docs/installation/compatibility/http-statuses.md @@ -4,11 +4,11 @@ title: HTTP Statuses # Compatibility: HTTP Statuses -| Laravel, Lumen | PHP | Publisher | Package Version | Status | -|----------------|--------------------|-----------|-----------------|---------------------------------------| -| 8.x, 9.x, 10.x | 8.1, 8.2 | 14.x | `^3.0` | ![Supported][badge_supported] | -| 7.x, 8.x, 9.x | 8.0, 8.1 | 13.x | `^2.0` | ![Not Supported][badge_not_supported] | -| 7.x, 8.x | 7.3, 7.4, 8.0, 8.1 | 10.x | `^1.0` | ![Not Supported][badge_not_supported] | +| Laravel, Lumen | PHP | Publisher | Package Version | Status | +|----------------------|--------------------|-----------|-----------------|---------------------------------------| +| 8.x, 9.x, 10.x, 11.x | 8.1, 8.2 | 14.x | `^3.0` | ![Supported][badge_supported] | +| 7.x, 8.x, 9.x | 8.0, 8.1 | 13.x | `^2.0` | ![Not Supported][badge_not_supported] | +| 7.x, 8.x | 7.3, 7.4, 8.0, 8.1 | 10.x | `^1.0` | ![Not Supported][badge_not_supported] | [badge_not_supported]: https://img.shields.io/badge/not%20supported-lightgrey?style=flat-square diff --git a/docs/installation/compatibility/lang.md b/docs/installation/compatibility/lang.md index 0c0d7854e..a98ca6c7e 100644 --- a/docs/installation/compatibility/lang.md +++ b/docs/installation/compatibility/lang.md @@ -4,6 +4,22 @@ title: Lang # Compatibility: Lang +### 13.0 + +| Package | Version | +|-----------------------|---------| +| Laravel, Lumen | 10, 11 | +| Breeze | 1 | +| Cashier Stripe | 13, 14 | +| Fortify | 1 | +| Jetstream | 2, 3 | +| Nova | 4 | +| Spark Aurelius | 11, 12 | +| Spark Aurelius Mollie | 2 | +| Spark Paddle | * | +| Spark Stripe | * | +| UI | 4 | + ### 12.0 | Package | Version | diff --git a/docs/installation/compatibility/publisher.md b/docs/installation/compatibility/publisher.md index 2975b18c4..2bff8b84b 100644 --- a/docs/installation/compatibility/publisher.md +++ b/docs/installation/compatibility/publisher.md @@ -6,7 +6,7 @@ title: Publisher | Laravel, Lumen | PHP | Package Version | Comment | |------------------------------|-------------------------|-----------------|---------------------------------------| -| 8.x, 9.x, 10.x | 8.1, 8.2 | `^14.0` | ![Supported][badge_supported] | +| 8.x, 9.x, 10.x, 11.x | 8.1, 8.2 | `^14.0` | ![Supported][badge_supported] | | 7.x, 8.x, 9.x | 8.0, 8.1 | `^13.0` | ![Not Supported][badge_not_supported] | | 7.x, 8.x, 9.x | 7.3, 7.4, 8.0, 8.1 | `^12.0` | ![Not Supported][badge_not_supported] | | 7.x, 8.x, 9.x | 7.3, 7.4, 8.0, 8.1 | `^11.2` | ![Not Supported][badge_not_supported] | diff --git a/docs/installation/compatibility/support-policy.md b/docs/installation/compatibility/support-policy.md index 64569bb75..5e727d3a1 100644 --- a/docs/installation/compatibility/support-policy.md +++ b/docs/installation/compatibility/support-policy.md @@ -1,19 +1,20 @@ # Support Policy -| Package Version | Framework Version | Laravel Lang Version | Support Until | -|-------------------------|:------------------------------:|:--------------------:|------------------| -| Laravel / Lumen `^10.0` | `^10.0` | `^12.0` | August 6th, 2024 | -| Laravel / Lumen `^9.0` | `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | -| Breeze `^1.11` | `^9.0`, `^10.0` | `^11.0`, `^12.0` | August 6th, 2024 | -| Breeze `1.10.*` | `^8.42`, `^9.0` | `^11.0` | August 8th, 2023 | -| Cashier Stripe `^14.0` | `^9.21`, `^10.0` | `^11.0`, `^12.0` | August 6th, 2024 | -| Cashier Stripe `^13.0` | `^8.37`, `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | -| Cashier Stripe `^12.0` | `^6.0`, `^7.0`, `^8.0`, `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | -| Fortify `^1.0` | `^8.0`, `^9.0`, `^10.0` | `^11.0`, `^12.0` | August 6th, 2024 | -| Jetstream `^3.0` | `^9.0`, `^10.0` | `^12.0` | August 6th, 2024 | -| Jetstream `^2.0` | `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | -| Jetstream `^1.0` | `^8.0`, `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | -| Nova `^4.0` | `^8.0`, `^9.0`, `^10.0` | `^11.0`, `^12.0` | August 6th, 2024 | -| Nova `^3.0` | `^8.0`, `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | -| UI `^4.0` | `^9.0` | `^11.0`, `^12.0` | August 6th, 2024 | -| UI `^3.0` | `^8.0`, `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | +| Package Version | Framework Version | Laravel Lang Version | Support Until | +|-------------------------|:------------------------------:|:-------------------------:|------------------| +| Laravel / Lumen `^11.0` | `^11.0` | `^13.0` | August 5th, 2025 | +| Laravel / Lumen `^10.0` | `^10.0` | `^12.0`, `^13.0` | August 6th, 2024 | +| Laravel / Lumen `^9.0` | `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | +| Breeze `^1.11` | `^9.0`, `^10.0` | `^11.0`, `^12.0`, `^13.0` | August 6th, 2024 | +| Breeze `1.10.*` | `^8.42`, `^9.0` | `^11.0` | August 8th, 2023 | +| Cashier Stripe `^14.0` | `^9.21`, `^10.0` | `^11.0`, `^12.0`, `^13.0` | August 6th, 2024 | +| Cashier Stripe `^13.0` | `^8.37`, `^9.0` | `^11.0`, `^12.0`, `^13.0` | August 8th, 2023 | +| Cashier Stripe `^12.0` | `^6.0`, `^7.0`, `^8.0`, `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | +| Fortify `^1.0` | `^8.0`, `^9.0`, `^10.0` | `^11.0`, `^12.0`, `^13.0` | August 6th, 2024 | +| Jetstream `^3.0` | `^9.0`, `^10.0` | `^12.0`, `^13.0` | August 6th, 2024 | +| Jetstream `^2.0` | `^9.0` | `^11.0`, `^12.0`, `^13.0` | August 8th, 2023 | +| Jetstream `^1.0` | `^8.0`, `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | +| Nova `^4.0` | `^8.0`, `^9.0`, `^10.0` | `^11.0`, `^12.0`, `^13.0` | August 6th, 2024 | +| Nova `^3.0` | `^8.0`, `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | +| UI `^4.0` | `^9.0` | `^11.0`, `^12.0`, `^13.0` | August 6th, 2024 | +| UI `^3.0` | `^8.0`, `^9.0` | `^11.0`, `^12.0` | August 8th, 2023 | diff --git a/phpunit.xml b/phpunit.xml index 5f2ba4022..3932a94e4 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -2,27 +2,21 @@ - + - - - + + + - + From 6eb6cbef1f44d25aefc4fda0a3b42e66d06681d9 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Wed, 9 Aug 2023 12:21:34 +0300 Subject: [PATCH 2/4] Fixed coverage driver --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 5d4d8b171..a01a94406 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -25,7 +25,7 @@ jobs: with: php-version: ${{ matrix.php }} extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv - coverage: none + coverage: xdebug env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 1d0ec6fcd13aaee2489a07efa22d074581ed7618 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Wed, 9 Aug 2023 12:23:21 +0300 Subject: [PATCH 3/4] Upgrade phpunit configuration file --- phpunit.xml | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index 3932a94e4..18027d721 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,26 +1,23 @@ - - - - - - - - - - + xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" + bootstrap="y" + cacheDirectory=".phpunit.cache" + executionOrder="depends,defects" + requireCoverageMetadata="true" + beStrictAboutCoverageMetadata="true" + beStrictAboutOutputDuringTests="true" + failOnRisky="true" + failOnWarning="true"> - - ./tests + + tests + + + + src + + From 31ab540c275842d2f5d8f03fa60fb08b970f1d5c Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Wed, 9 Aug 2023 12:24:43 +0300 Subject: [PATCH 4/4] Revert phpunit configuration file --- phpunit.xml | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index 18027d721..3932a94e4 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,23 +1,26 @@ + xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" + cacheResult="false" + bootstrap="vendor/autoload.php" + colors="true" + processIsolation="false" + stopOnError="false" + stopOnFailure="false" +> + + + + + + + + + + - - tests + + ./tests - - - - src - -