From ba08ebde62d68b52d3bb1535cd567951ffedbb48 Mon Sep 17 00:00:00 2001 From: megasteve19 Date: Mon, 6 Apr 2026 23:21:58 +0300 Subject: [PATCH 1/3] Add Laravel 13 support and PHP 8.5 coverage --- .github/workflows/tests.yml | 60 ++++++++++++++++++++++++++++++++----- README.md | 5 ++-- composer.json | 8 ++--- 3 files changed, 59 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c8a99f0..d2a5581 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,15 +13,59 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: [ 8.1, 8.2, 8.3, 8.4 ] - laravel: [ 10, 11, 12 ] - exclude: + include: - php: '8.1' - laravel: 11 - - php: '8.1' - laravel: 12 + laravel: '10' + pest: '^2.0' + testbench: '^8.0' + - php: '8.2' + laravel: '10' + pest: '^2.0' + testbench: '^8.0' + - php: '8.2' + laravel: '11' + pest: '^3.0' + testbench: '^9.0' + - php: '8.3' + laravel: '11' + pest: '^3.0' + testbench: '^9.0' + - php: '8.2' + laravel: '12' + pest: '^3.0' + testbench: '^10.0' + - php: '8.3' + laravel: '12' + pest: '^3.0' + testbench: '^10.0' + - php: '8.3' + laravel: '13' + pest: '^4.0' + testbench: '^11.0' + - php: '8.4' + laravel: '11' + pest: '^3.0' + testbench: '^9.0' + - php: '8.5' + laravel: '11' + pest: '^3.0' + testbench: '^9.0' + - php: '8.4' + laravel: '12' + pest: '^3.0' + testbench: '^10.0' + - php: '8.5' + laravel: '12' + pest: '^3.0' + testbench: '^10.0' - php: '8.4' - laravel: 10 + laravel: '13' + pest: '^4.0' + testbench: '^11.0' + - php: '8.5' + laravel: '13' + pest: '^4.0' + testbench: '^11.0' name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} @@ -36,7 +80,7 @@ jobs: - name: Install dependencies run: | - composer require "illuminate/support=^${{ matrix.laravel }}" --no-update + composer require "illuminate/support=^${{ matrix.laravel }}" "illuminate/validation=^${{ matrix.laravel }}" "orchestra/testbench=${{ matrix.testbench }}" "pestphp/pest=${{ matrix.pest }}" --dev --no-update composer update --prefer-dist --no-interaction --no-progress - name: Execute tests diff --git a/README.md b/README.md index a6c0c71..ad1b091 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,9 @@ Editor.php is a package designed to assist in parsing and manipulating the outpu | Editor.php | Laravel | PHP | | --- | --- | --- | | 1.x | 10.x | 8.1 ~ 8.3 | -| 1.x | 11.x | 8.2 ~ 8.4 | -| 1.x | 12.x | 8.2 ~ 8.4 | +| 1.x | 11.x | 8.2 ~ 8.5 | +| 1.x | 12.x | 8.2 ~ 8.5 | +| 1.x | 13.x | 8.3 ~ 8.5 | # Quick Start diff --git a/composer.json b/composer.json index 8f66dba..bcbc9c7 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,8 @@ ], "require": { "php": "^8.1", - "illuminate/support": "^10.0|^11.0|^12.0", - "illuminate/validation": "^10.0|^11.0|^12.0", + "illuminate/support": "^10.0|^11.0|^12.0|^13.0", + "illuminate/validation": "^10.0|^11.0|^12.0|^13.0", "fakerphp/faker": "^1.21" }, "extra": { @@ -34,8 +34,8 @@ } }, "require-dev": { - "pestphp/pest": "^1.22.4|^2.0|^3.0", - "orchestra/testbench": "^8.0|^9.0|^10.0", + "pestphp/pest": "^1.22.4|^2.0|^3.0|^4.0", + "orchestra/testbench": "^8.0|^9.0|^10.0|^11.0", "friendsofphp/php-cs-fixer": "^3.14.4", "phpstan/phpstan": "^1.10" }, From e8b053fd019dd734b365d5b77f4999722e3b864e Mon Sep 17 00:00:00 2001 From: megasteve19 Date: Mon, 6 Apr 2026 23:25:55 +0300 Subject: [PATCH 2/3] Fix Laravel 10 PHP 8.1 CI resolution --- .github/workflows/tests.yml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d2a5581..245db9f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,60 +12,74 @@ jobs: run: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: include: - php: '8.1' laravel: '10' - pest: '^2.0' + pest: '2.35.1' testbench: '^8.0' + phpunit: '10.5.17' - php: '8.2' laravel: '10' pest: '^2.0' testbench: '^8.0' + phpunit: '' - php: '8.2' laravel: '11' pest: '^3.0' testbench: '^9.0' + phpunit: '' - php: '8.3' laravel: '11' pest: '^3.0' testbench: '^9.0' + phpunit: '' - php: '8.2' laravel: '12' pest: '^3.0' testbench: '^10.0' + phpunit: '' - php: '8.3' laravel: '12' pest: '^3.0' testbench: '^10.0' + phpunit: '' - php: '8.3' laravel: '13' pest: '^4.0' testbench: '^11.0' + phpunit: '' - php: '8.4' laravel: '11' pest: '^3.0' testbench: '^9.0' + phpunit: '' - php: '8.5' laravel: '11' pest: '^3.0' testbench: '^9.0' + phpunit: '' - php: '8.4' laravel: '12' pest: '^3.0' testbench: '^10.0' + phpunit: '' - php: '8.5' laravel: '12' pest: '^3.0' testbench: '^10.0' + phpunit: '' - php: '8.4' laravel: '13' pest: '^4.0' testbench: '^11.0' + phpunit: '' - php: '8.5' laravel: '13' pest: '^4.0' testbench: '^11.0' + phpunit: '' name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} @@ -80,7 +94,17 @@ jobs: - name: Install dependencies run: | - composer require "illuminate/support=^${{ matrix.laravel }}" "illuminate/validation=^${{ matrix.laravel }}" "orchestra/testbench=${{ matrix.testbench }}" "pestphp/pest=${{ matrix.pest }}" --dev --no-update + composer require "illuminate/support=^${{ matrix.laravel }}" "illuminate/validation=^${{ matrix.laravel }}" --no-update + dev_requirements=( + "orchestra/testbench=${{ matrix.testbench }}" + "pestphp/pest=${{ matrix.pest }}" + ) + + if [ -n "${{ matrix.phpunit }}" ]; then + dev_requirements+=("phpunit/phpunit=${{ matrix.phpunit }}") + fi + + composer require --dev "${dev_requirements[@]}" --no-update composer update --prefer-dist --no-interaction --no-progress - name: Execute tests From 39d4d91ebbe03e0d916b3f45bbd8473aefc8904e Mon Sep 17 00:00:00 2001 From: megasteve19 Date: Mon, 6 Apr 2026 23:29:05 +0300 Subject: [PATCH 3/3] Allow legacy Laravel 10 CI dependencies --- .github/workflows/tests.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 245db9f..35272dc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,66 +20,79 @@ jobs: pest: '2.35.1' testbench: '^8.0' phpunit: '10.5.17' + block_insecure: 'false' - php: '8.2' laravel: '10' pest: '^2.0' testbench: '^8.0' phpunit: '' + block_insecure: 'true' - php: '8.2' laravel: '11' pest: '^3.0' testbench: '^9.0' phpunit: '' + block_insecure: 'true' - php: '8.3' laravel: '11' pest: '^3.0' testbench: '^9.0' phpunit: '' + block_insecure: 'true' - php: '8.2' laravel: '12' pest: '^3.0' testbench: '^10.0' phpunit: '' + block_insecure: 'true' - php: '8.3' laravel: '12' pest: '^3.0' testbench: '^10.0' phpunit: '' + block_insecure: 'true' - php: '8.3' laravel: '13' pest: '^4.0' testbench: '^11.0' phpunit: '' + block_insecure: 'true' - php: '8.4' laravel: '11' pest: '^3.0' testbench: '^9.0' phpunit: '' + block_insecure: 'true' - php: '8.5' laravel: '11' pest: '^3.0' testbench: '^9.0' phpunit: '' + block_insecure: 'true' - php: '8.4' laravel: '12' pest: '^3.0' testbench: '^10.0' phpunit: '' + block_insecure: 'true' - php: '8.5' laravel: '12' pest: '^3.0' testbench: '^10.0' phpunit: '' + block_insecure: 'true' - php: '8.4' laravel: '13' pest: '^4.0' testbench: '^11.0' phpunit: '' + block_insecure: 'true' - php: '8.5' laravel: '13' pest: '^4.0' testbench: '^11.0' phpunit: '' + block_insecure: 'true' name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} @@ -94,6 +107,7 @@ jobs: - name: Install dependencies run: | + composer config audit.block-insecure "${{ matrix.block_insecure }}" composer require "illuminate/support=^${{ matrix.laravel }}" "illuminate/validation=^${{ matrix.laravel }}" --no-update dev_requirements=( "orchestra/testbench=${{ matrix.testbench }}"