From 3324a559082094edfe8ac7ab21975a3b326b7880 Mon Sep 17 00:00:00 2001 From: IanM Date: Sat, 9 Nov 2024 11:09:54 +0000 Subject: [PATCH 1/3] chore: php8.4 testing --- .github/workflows/REUSABLE_backend.yml | 2 +- framework/core/composer.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/REUSABLE_backend.yml b/.github/workflows/REUSABLE_backend.yml index 7996591ab8..9973a73e3d 100644 --- a/.github/workflows/REUSABLE_backend.yml +++ b/.github/workflows/REUSABLE_backend.yml @@ -25,7 +25,7 @@ on: description: Versions of PHP to test with. Should be array of strings encoded as JSON array type: string required: false - default: '["7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]' + default: '["7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]' php_extensions: description: PHP extensions to install. diff --git a/framework/core/composer.json b/framework/core/composer.json index d4426f4d7f..4e8bd46615 100644 --- a/framework/core/composer.json +++ b/framework/core/composer.json @@ -61,9 +61,9 @@ "illuminate/view": "^8.0", "intervention/image": "2.5.* || ^2.6.1", "jenssegers/agent": "^2.6", - "laminas/laminas-diactoros": "^2.4.1", - "laminas/laminas-httphandlerrunner": "^1.2.0 || ^2.3.0", - "laminas/laminas-stratigility": "^3.2.2", + "laminas/laminas-diactoros": "^2.4.1 || ^3.0.0", + "laminas/laminas-httphandlerrunner": "^1.2.0 || ^2.3.0 || ^3.0.0", + "laminas/laminas-stratigility": "^3.2.2 || ^4.0.0", "league/flysystem": "^1.0.11", "matthiasmullie/minify": "^1.3", "middlewares/base-path": "^2.0.1", From ebb220916c0eb6389073e5af8626a59c467d73a8 Mon Sep 17 00:00:00 2001 From: IanM Date: Sat, 9 Nov 2024 11:22:07 +0000 Subject: [PATCH 2/3] update laminas --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index a93ceeb2a6..339b842ca1 100644 --- a/composer.json +++ b/composer.json @@ -112,9 +112,9 @@ "illuminate/view": "^8.0", "intervention/image": "2.5.* || ^2.6.1", "jenssegers/agent": "^2.6", - "laminas/laminas-diactoros": "^2.4.1", - "laminas/laminas-httphandlerrunner": "^1.2.0 || ^2.3.0", - "laminas/laminas-stratigility": "^3.2.2", + "laminas/laminas-diactoros": "^2.4.1 || ^3.0.0", + "laminas/laminas-httphandlerrunner": "^1.2.0 || ^2.3.0 || ^3.0.0", + "laminas/laminas-stratigility": "^3.2.2 || ^4.0.0", "league/flysystem": "^1.0.11", "matthiasmullie/minify": "^1.3", "middlewares/base-path": "^2.0.1", From c40b1908de7e3aa35deabffb8308a11b232eefbf Mon Sep 17 00:00:00 2001 From: IanM Date: Sat, 9 Nov 2024 19:40:03 +0000 Subject: [PATCH 3/3] chore: exclude phpstan on php8.4 --- .github/workflows/REUSABLE_backend.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/REUSABLE_backend.yml b/.github/workflows/REUSABLE_backend.yml index 9973a73e3d..bd0b92d0be 100644 --- a/.github/workflows/REUSABLE_backend.yml +++ b/.github/workflows/REUSABLE_backend.yml @@ -105,6 +105,8 @@ jobs: php_ini_values: error_reporting=E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED - php: 8.3 php_ini_values: error_reporting=E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED + - php: 8.4 + php_ini_values: error_reporting=E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED # To reduce number of actions, we exclude some PHP versions from running with some DB versions. exclude: @@ -177,6 +179,8 @@ jobs: strategy: matrix: php: ${{ fromJSON(inputs.php_versions) }} + exclude: + - php: 8.4 name: 'PHPStan PHP ${{ matrix.php }}'