From a884a94c72b57d600ac468a66368ef9f3474f2ae Mon Sep 17 00:00:00 2001
From: Denny Septian Panggabean <xamidimura@gmail.com>
Date: Fri, 8 Aug 2025 09:20:15 +0700
Subject: [PATCH 1/3] chore: added PHP 8.5 to Github Action

---
 .github/workflows/reusable-phpunit-test.yml |  1 +
 .github/workflows/test-coding-standards.yml |  9 +++++++--
 .github/workflows/test-phpunit.yml          | 12 ++++++++++++
 .github/workflows/test-rector.yml           |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml
index cf23be58f2bc..d9770814d601 100644
--- a/.github/workflows/reusable-phpunit-test.yml
+++ b/.github/workflows/reusable-phpunit-test.yml
@@ -209,6 +209,7 @@ jobs:
           DB: ${{ inputs.db-platform }}
           TACHYCARDIA_MONITOR_GA: ${{ inputs.enable-profiling && 'enabled' || '' }}
           TERM: xterm-256color
+        continue-on-error: ${{ inputs.php-version == '8.5' }}
 
       - 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 c49fd416ea8e..6f5c2590d31c 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.5'
 
     steps:
       - name: Checkout base branch for PR
@@ -64,4 +64,9 @@ jobs:
         run: composer update --ansi --no-interaction
 
       - name: Run lint
-        run: composer cs
+        run: |
+          if [ "${{ matrix.php-version }}" = "8.5" ]; then
+            composer cs -- --allow-unsupported-php-version=yes
+          else
+            composer cs
+          fi
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 62a8ab0e4338..045570cb27ad 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -60,6 +60,9 @@ jobs:
           - '8.2'
           - '8.3'
           - '8.4'
+        include:
+          - php-version: '8.5'
+            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -87,6 +90,7 @@ jobs:
           - '8.2'
           - '8.3'
           - '8.4'
+          - '8.5'
         db-platform:
           - MySQLi
           - OCI8
@@ -99,6 +103,8 @@ jobs:
           - php-version: '8.1'
             db-platform: MySQLi
             mysql-version: '5.7'
+          - php-version: '8.5'
+            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -127,6 +133,9 @@ jobs:
           - '8.2'
           - '8.3'
           - '8.4'
+        include:
+          - php-version: '8.5'
+            composer-option: '--ignore-platform-req=php'
 
     uses: ./.github/workflows/reusable-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo
     with:
@@ -153,6 +162,9 @@ jobs:
           - '8.2'
           - '8.3'
           - '8.4'
+        include:
+          - php-version: '8.5'
+            composer-option: '--ignore-platform-req=php'
 
     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 f1a81bd170bf..37a9cd183b70 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.4']
+        php-versions: ['8.1', '8.5']
     steps:
       - name: Checkout base branch for PR
         if: github.event_name == 'pull_request'

From 909aff3e69495ed6d23103287a15a4e0a1661993 Mon Sep 17 00:00:00 2001
From: Denny Septian Panggabean <xamidimura@gmail.com>
Date: Fri, 8 Aug 2025 10:42:43 +0700
Subject: [PATCH 2/3] ignore platform on utils

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 64253d857046..3b6164a0c8d2 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
             "CodeIgniter\\ComposerScripts::postUpdate"
         ],
         "post-autoload-dump": [
-            "@composer update --ansi --working-dir=utils"
+            "@composer update --ansi --working-dir=utils --ignore-platform-req=php"
         ],
         "analyze": [
             "Composer\\Config::disableProcessTimeout",

From 275b77915bf10252efee0f7200c6d525f87146e9 Mon Sep 17 00:00:00 2001
From: Denny Septian Panggabean <xamidimura@gmail.com>
Date: Fri, 8 Aug 2025 11:17:14 +0700
Subject: [PATCH 3/3] remove conditional php-cs-fixer

---
 .github/workflows/test-coding-standards.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
index 6f5c2590d31c..bf2414c67053 100644
--- a/.github/workflows/test-coding-standards.yml
+++ b/.github/workflows/test-coding-standards.yml
@@ -64,9 +64,4 @@ jobs:
         run: composer update --ansi --no-interaction
 
       - name: Run lint
-        run: |
-          if [ "${{ matrix.php-version }}" = "8.5" ]; then
-            composer cs -- --allow-unsupported-php-version=yes
-          else
-            composer cs
-          fi
+        run: composer cs