From a0b3ca6170aaca986efadc12ab0432f62f47b457 Mon Sep 17 00:00:00 2001
From: Dejan Levec <dejan@celtra.com>
Date: Wed, 15 Jul 2026 13:18:33 +0200
Subject: [PATCH] Add PHP 8.5 support

---
 .github/workflows/build.yml |  1 +
 composer.json               | 10 +++++-----
 docker-compose.yml          |  9 ++++++++-
 php-8.5.Dockerfile          | 27 +++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 php-8.5.Dockerfile

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5ae56bc..9563185 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         dependencies:
           - lowest
           - highest
diff --git a/composer.json b/composer.json
index a9511f8..993ed4a 100644
--- a/composer.json
+++ b/composer.json
@@ -18,23 +18,23 @@
   "repositories": [
     {
       "type": "vcs",
-      "url": "https://github.com/Oryss/php-unilex"
+      "url": "https://github.com/celtra/php-unilex"
     },
     {
       "type": "vcs",
-      "url": "https://github.com/Oryss/php-json-data"
+      "url": "https://github.com/celtra/php-json-data"
     },
     {
       "type": "vcs",
-      "url": "https://github.com/Oryss/php-int-rangesets"
+      "url": "https://github.com/celtra/php-int-rangesets"
     },
     {
       "type": "vcs",
-      "url": "https://github.com/Oryss/php-ucd"
+      "url": "https://github.com/celtra/php-ucd"
     }
   ],
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
     "ext-intl": "*",
     "ext-json": "*",
     "remorhaz/php-unilex": "dev-master",
diff --git a/docker-compose.yml b/docker-compose.yml
index ac4b423..9cfbe64 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,4 +26,11 @@ services:
       dockerfile: php-8.4.Dockerfile
     volumes:
       - .:/app
-    working_dir: /app
\ No newline at end of file
+    working_dir: /app
+  php8.5:
+    build:
+      context: .
+      dockerfile: php-8.5.Dockerfile
+    volumes:
+      - .:/app
+    working_dir: /app
diff --git a/php-8.5.Dockerfile b/php-8.5.Dockerfile
new file mode 100644
index 0000000..a206617
--- /dev/null
+++ b/php-8.5.Dockerfile
@@ -0,0 +1,27 @@
+FROM php:8.5-cli
+
+RUN apt-get update &&  apt-get install -y \
+      zip \
+      git \
+      wget \
+      gpg \
+      libicu-dev && \
+    pecl install xdebug && \
+    docker-php-ext-enable xdebug && \
+    docker-php-ext-configure intl --enable-intl && \
+    docker-php-ext-install intl pcntl && \
+    echo "xdebug.mode = develop,coverage,debug" >> "$PHP_INI_DIR/conf.d/docker-php-ext-xdebug.ini"
+
+ENV COMPOSER_ALLOW_SUPERUSER=1 \
+    COMPOSER_PROCESS_TIMEOUT=1200
+
+RUN curl --silent --show-error https://getcomposer.org/installer | php -- \
+      --install-dir=/usr/bin --filename=composer && \
+    git config --global --add safe.directory "*"
+
+RUN wget -O phive.phar https://phar.io/releases/phive.phar && \
+    wget -O phive.phar.asc https://phar.io/releases/phive.phar.asc && \
+    gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x9D8A98B29B2D5D79 && \
+    gpg --verify phive.phar.asc phive.phar && \
+    chmod +x phive.phar && \
+    mv phive.phar /usr/local/bin/phive \