From 0e8d68045f93e61660d23c856adb9a488910ea74 Mon Sep 17 00:00:00 2001 From: Pavel Bychko Date: Sat, 23 Mar 2024 22:14:37 +0300 Subject: [PATCH 1/5] Update testing environment in workflow Expanded the testing environment matrix in GitHub workflow to include newer versions of PHP (8.3) and Laravel (11.*). Existing conditions were updated as well to exclude certain combinations of PHP and Laravel versions. --- .github/workflows/tests.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e592820..e6ab37d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,8 +11,8 @@ jobs: matrix: stability: [ prefer-stable ] os: [ ubuntu-latest ] - php: [7.4, 8.0, 8.1, 8.2] - laravel: [8.*, 9.*, 10.*] + php: [7.4, 8.0, 8.1, 8.2, 8.3] + laravel: [8.*, 9.*, 10.*, 11.*] include: - laravel: 8.* testbench: ^6.0 @@ -20,15 +20,25 @@ jobs: testbench: ^7.0 - laravel: 10.* testbench: ^8.0 + - laravel: 11.* + testbench: ^9.0 exclude: - php: 7.4 laravel: 9.* - php: 7.4 laravel: 10.* + - php: 7.4 + laravel: 11.* - php: 8.0 laravel: 10.* + - php: 8.0 + laravel: 11.* - php: 8.2 laravel: 8.* + - php: 8.3 + laravel: 8.* + - php: 8.3 + laravel: 9.* name: Laravel ${{ matrix.laravel }} on PHP ${{ matrix.php }} From 41f2705598cd5c9468003ff462a71ee12c5e0d31 Mon Sep 17 00:00:00 2001 From: Pavel Bychko Date: Sat, 23 Mar 2024 22:14:47 +0300 Subject: [PATCH 2/5] Update required packages in composer.json The current commit updates the required version ranges of several packages in composer.json file. Added support for newer versions of "illuminate/support", "nunomaduro/collision", and "orchestra/testbench", while eliminating certain unnecessary dev dependencies. --- composer.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index a10cf1f..6da4a92 100644 --- a/composer.json +++ b/composer.json @@ -20,15 +20,13 @@ "require": { "php": ">=7.4", "abordage/html-min": "^0.2.1", - "illuminate/support": "^8.0 || ^9.0 || ^10.0" + "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0" }, "require-dev": { - "ext-json": "*", "friendsofphp/php-cs-fixer": "^3.0", - "nunomaduro/collision": "^5.0 || ^6.0 || ^7.0", + "nunomaduro/collision": "^5.0 || ^6.0 || ^7.0 || ^8.0", "nunomaduro/larastan": "^1.0 || ^2.0", - "orchestra/testbench": "^6.0 || ^7.0 || ^8.0", - "phpstan/phpstan": "^1.0", + "orchestra/testbench": "^6.0 || ^7.0 || ^8.0 || ^9.0", "phpunit/phpunit": "^9.6 || ^10.0" }, "minimum-stability": "dev", From fa4b2e6d9abd4f051c9dab295eb5127ba8535fa6 Mon Sep 17 00:00:00 2001 From: Pavel Bychko Date: Sat, 23 Mar 2024 22:15:41 +0300 Subject: [PATCH 3/5] Update required PHP and Laravel versions in README The current commit updates the minimum and maximum required versions of PHP and Laravel listed in README.md. It now includes support for PHP 7.4 to 8.3 and Laravel 8.x to 11.x, reflecting the latest application dependencies. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5cbe934..3499e9f 100644 --- a/README.md +++ b/README.md @@ -50,8 +50,8 @@ Very simple (and very fast) html compression. - Very fast. See benchmark ## Requirements -- PHP 7.4 - 8.2 -- Laravel 8 - 10 +- PHP 7.4 - 8.3 +- Laravel 8.x - 11.x ## Installation From 49c32b3131caa29ab4cfd77f754ad05e70a86942 Mon Sep 17 00:00:00 2001 From: Pavel Bychko Date: Sat, 23 Mar 2024 22:17:08 +0300 Subject: [PATCH 4/5] Add ext-json to required dev dependencies in composer.json The commit includes "ext-json" in the "require-dev" section of composer.json. This ensures the JSON extension for PHP is installed during development, which is crucial in handling JSON data within the application. --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 6da4a92..afc9ee9 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "illuminate/support": "^8.0 || ^9.0 || ^10.0 || ^11.0" }, "require-dev": { + "ext-json": "*", "friendsofphp/php-cs-fixer": "^3.0", "nunomaduro/collision": "^5.0 || ^6.0 || ^7.0 || ^8.0", "nunomaduro/larastan": "^1.0 || ^2.0", From 1c08cb7b5cd37cb63077e725a003003147de0a15 Mon Sep 17 00:00:00 2001 From: Pavel Bychko Date: Sat, 23 Mar 2024 22:19:21 +0300 Subject: [PATCH 5/5] Update GitHub workflows --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e6ab37d..44f76e8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,6 +33,8 @@ jobs: laravel: 10.* - php: 8.0 laravel: 11.* + - php: 8.1 + laravel: 11.* - php: 8.2 laravel: 8.* - php: 8.3