From 288c05fb1564c0e434bfa1ad9ed4a98404b51bde Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Tue, 5 Nov 2024 17:00:15 +0700 Subject: [PATCH 1/5] refactor: review github CI on PHP8.4 --- .github/workflows/reusable-phpunit-test.yml | 1 - .github/workflows/test-coding-standards.yml | 2 +- .github/workflows/test-phpunit.yml | 15 ++++----------- .github/workflows/test-rector.yml | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml index 950babb7bd9c..9758d6eb5410 100644 --- a/.github/workflows/reusable-phpunit-test.yml +++ b/.github/workflows/reusable-phpunit-test.yml @@ -203,7 +203,6 @@ jobs: DB: ${{ inputs.db-platform }} TACHYCARDIA_MONITOR_GA: ${{ inputs.enable-profiling && 'enabled' || '' }} TERM: xterm-256color - continue-on-error: ${{ inputs.php-version == '8.4' }} - name: Upload coverage results as artifact if: ${{ inputs.enable-artifact-upload }} diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml index f30475a76dba..49842daa053f 100644 --- a/.github/workflows/test-coding-standards.yml +++ b/.github/workflows/test-coding-standards.yml @@ -29,7 +29,7 @@ jobs: matrix: php-version: - '8.1' - - '8.3' + - '8.4' steps: - name: Checkout diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml index 349a4b658ec2..62a8ab0e4338 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -59,9 +59,7 @@ jobs: - '8.1' - '8.2' - '8.3' - include: - - php-version: '8.4' - composer-option: '--ignore-platform-req=php' + - '8.4' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -88,6 +86,7 @@ jobs: - '8.1' - '8.2' - '8.3' + - '8.4' db-platform: - MySQLi - OCI8 @@ -100,8 +99,6 @@ jobs: - php-version: '8.1' db-platform: MySQLi mysql-version: '5.7' - - php-version: '8.4' - composer-option: '--ignore-platform-req=php' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -129,9 +126,7 @@ jobs: - '8.1' - '8.2' - '8.3' - include: - - php-version: '8.4' - composer-option: '--ignore-platform-req=php' + - '8.4' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: @@ -157,9 +152,7 @@ jobs: - '8.1' - '8.2' - '8.3' - include: - - php-version: '8.4' - composer-option: '--ignore-platform-req=php' + - '8.4' uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo with: diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml index 286ca76cab42..00b599589098 100644 --- a/.github/workflows/test-rector.yml +++ b/.github/workflows/test-rector.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.1', '8.3'] + php-versions: ['8.1', '8.4'] steps: - name: Checkout uses: actions/checkout@v4 From 02867a791198f673315a831c1554ec172bdd418c Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Wed, 6 Nov 2024 11:06:23 +0700 Subject: [PATCH 2/5] refactor: revert back to maximum PHP8.3 on php-cs-fixer --- .github/workflows/test-coding-standards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml index 49842daa053f..f30475a76dba 100644 --- a/.github/workflows/test-coding-standards.yml +++ b/.github/workflows/test-coding-standards.yml @@ -29,7 +29,7 @@ jobs: matrix: php-version: - '8.1' - - '8.4' + - '8.3' steps: - name: Checkout From 727cc5dadffb817f3c6406e37a9d019fb6b93f57 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Wed, 6 Nov 2024 11:14:43 +0700 Subject: [PATCH 3/5] temporary using latest-dev on predis/predis --- admin/framework/composer.json | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/framework/composer.json b/admin/framework/composer.json index b507710c04b0..66de0a5b4a9b 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -24,7 +24,7 @@ "mikey179/vfsstream": "^1.6", "nexusphp/cs-config": "^3.6", "phpunit/phpunit": "^10.5.16 || ^11.2", - "predis/predis": "^1.1 || ^2.0" + "predis/predis": "^1.1 || 2.x-dev" }, "suggest": { "ext-curl": "If you use CURLRequest class", diff --git a/composer.json b/composer.json index 2410b37e84e2..d31cea03665e 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "phpstan/phpstan-strict-rules": "^1.6", "phpunit/phpcov": "^9.0.2 || ^10.0", "phpunit/phpunit": "^10.5.16 || ^11.2", - "predis/predis": "^1.1 || ^2.0", + "predis/predis": "^1.1 || 2.x-dev", "rector/rector": "1.2.8" }, "replace": { From cd67f7283c55e54b5c1467c5465ef057bf7ef48e Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Mon, 11 Nov 2024 09:04:16 +0700 Subject: [PATCH 4/5] refactor: bump fakerphp/faker to v1.24 as minimum required --- admin/framework/composer.json | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/framework/composer.json b/admin/framework/composer.json index 66de0a5b4a9b..a61d72c67bd5 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -18,7 +18,7 @@ }, "require-dev": { "codeigniter/coding-standard": "^1.7", - "fakerphp/faker": "^1.9", + "fakerphp/faker": "^1.24", "friendsofphp/php-cs-fixer": "^3.47.1", "kint-php/kint": "^5.0.4", "mikey179/vfsstream": "^1.6", diff --git a/composer.json b/composer.json index d31cea03665e..7bdeceecc3aa 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ }, "require-dev": { "codeigniter/phpstan-codeigniter": "^1.4", - "fakerphp/faker": "^1.9", + "fakerphp/faker": "^1.24", "kint-php/kint": "^5.0.4", "mikey179/vfsstream": "^1.6", "nexusphp/tachycardia": "^2.0", From 1f5cae40959be20e5db1e8aae9aca513143bcb6d Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Tue, 12 Nov 2024 10:06:23 +0700 Subject: [PATCH 5/5] refactor: bump mikey179/vfsstream to v1.6.12 as minimum required --- admin/framework/composer.json | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/framework/composer.json b/admin/framework/composer.json index a61d72c67bd5..b397d35d4a11 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -21,7 +21,7 @@ "fakerphp/faker": "^1.24", "friendsofphp/php-cs-fixer": "^3.47.1", "kint-php/kint": "^5.0.4", - "mikey179/vfsstream": "^1.6", + "mikey179/vfsstream": "^1.6.12", "nexusphp/cs-config": "^3.6", "phpunit/phpunit": "^10.5.16 || ^11.2", "predis/predis": "^1.1 || 2.x-dev" diff --git a/composer.json b/composer.json index 7bdeceecc3aa..3dd0f42f7cd4 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "codeigniter/phpstan-codeigniter": "^1.4", "fakerphp/faker": "^1.24", "kint-php/kint": "^5.0.4", - "mikey179/vfsstream": "^1.6", + "mikey179/vfsstream": "^1.6.12", "nexusphp/tachycardia": "^2.0", "phpstan/extension-installer": "^1.4", "phpstan/phpstan": "^1.11",