From 77379fe23028f9a33c154e4e653b8f3babbd477f Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 23 Oct 2025 16:41:50 +0900
Subject: [PATCH] Add PHP 8.5 to test matrix

---
 .github/workflows/ci.yml       |  2 +-
 .github/workflows/setup-php.sh | 64 +++++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ddf5e163..668f1e4c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
 
     name: PHP ${{ matrix.php }}
     steps:
diff --git a/.github/workflows/setup-php.sh b/.github/workflows/setup-php.sh
index 3852c4089..e978e92a0 100644
--- a/.github/workflows/setup-php.sh
+++ b/.github/workflows/setup-php.sh
@@ -4,30 +4,52 @@
 sudo add-apt-repository -y ppa:ondrej/php
 
 # Install all required packages
-sudo apt -y install \
-	php$1-apcu \
-	php$1-bcmath \
-	php$1-cli \
-	php$1-common \
-	php$1-curl \
-	php$1-gd \
-	php$1-intl \
-	php$1-mbstring \
-	php$1-mysql \
-	php$1-opcache \
-	php$1-readline \
-	php$1-sqlite3 \
-	php$1-xml \
-	php$1-zip
+if [[ "$1" == "8.5" ]]; then
+  sudo apt -y install \
+    php$1-bcmath \
+    php$1-cli \
+    php$1-common \
+    php$1-curl \
+    php$1-gd \
+    php$1-intl \
+    php$1-mbstring \
+    php$1-mysql \
+    php$1-readline \
+    php$1-sqlite3 \
+    php$1-xml \
+    php$1-zip
+else
+  sudo apt -y install \
+    php$1-apcu \
+    php$1-bcmath \
+    php$1-cli \
+    php$1-common \
+    php$1-curl \
+    php$1-gd \
+    php$1-intl \
+    php$1-mbstring \
+    php$1-mysql \
+    php$1-opcache \
+    php$1-readline \
+    php$1-sqlite3 \
+    php$1-xml \
+    php$1-zip
+fi
 
-# Enable and tune opcache
-sudo bash -c 'echo "opcache.enable = 1" >> /etc/php/$1/cli/conf.d/10-opcache.ini'
-sudo bash -c 'echo "opcache.enable_cli = 1" >> /etc/php/$1/cli/conf.d/10-opcache.ini'
-sudo bash -c 'echo "opcache.jit = tracing" >> /etc/php/$1/cli/conf.d/10-opcache.ini'
-sudo bash -c 'echo "opcache.jit_buffer_size = 128M" >> /etc/php/$1/cli/conf.d/10-opcache.ini'
+# Adjust php.ini settings
+if [[ "$1" == "8.5" ]]; then
+  sudo bash -c "echo 'register_argc_argv = On' >> /etc/php/$1/cli/php.ini"
+else
+  sudo bash -c "echo 'opcache.enable = 1' >> /etc/php/$1/cli/conf.d/10-opcache.ini"
+  sudo bash -c "echo 'opcache.enable_cli = 1' >> /etc/php/$1/cli/conf.d/10-opcache.ini"
+  sudo bash -c "echo 'opcache.jit = tracing' >> /etc/php/$1/cli/conf.d/10-opcache.ini"
+  sudo bash -c "echo 'opcache.jit_buffer_size = 128M' >> /etc/php/$1/cli/conf.d/10-opcache.ini"
+fi
 
 # Enable APCu
-sudo bash -c 'echo "apc.enable_cli = 1" >> /etc/php/$1/cli/conf.d/20-apcu.ini'
+if [ -f "/etc/php/$1/cli/conf.d/20-apcu.ini" ]; then
+  sudo bash -c "echo 'apc.enable_cli = 1' >> /etc/php/$1/cli/conf.d/20-apcu.ini"
+fi
 
 # Disable xdebug
 sudo phpdismod -v ALL -s ALL xdebug