From 1c2ec079e93acf1ca375a92615850c8270c1b851 Mon Sep 17 00:00:00 2001
From: Aaron Stone <aaron@serendipity.cx>
Date: Sun, 12 Oct 2025 11:50:48 -0700
Subject: [PATCH] Release 3.4.0 with tests for PHP 8.5

---
 .github/workflows/build-and-test.yml |  6 +++---
 .github/workflows/build-windows.yml  |  7 ++++---
 package.xml                          | 24 ++++++++++++++++++++----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 2e10b05b..50a0c2fd 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -9,14 +9,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
         experimental: [false]
         include:
-          - php: '8.4'
+          - php: '8.6'
             experimental: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: true
       - name: Install PHP ${{ matrix.php }}
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 15dba3f2..b12a3557 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -7,9 +7,10 @@ jobs:
         shell: cmd
     strategy:
       matrix:
-          version: ['8.3', '8.4']
           arch: [x64, x86]
+          os: [windows-2022]
           ts: [nts, zts]
+          version: ['8.3', '8.4', '8.5']
           exclude:
             - { version: '8.4', arch: x64, ts: zts }
             - { version: '8.4', arch: x86, ts: nts }
@@ -17,10 +18,10 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout memcached
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup PHP
         id: setup-php
-        uses: php/setup-php-sdk@v0.10
+        uses: php/setup-php-sdk@v0.11
         with:
           version: ${{matrix.version}}
           arch: ${{matrix.arch}}
diff --git a/package.xml b/package.xml
index 5565863e..384e7ea1 100644
--- a/package.xml
+++ b/package.xml
@@ -39,13 +39,13 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2024-10-17</date>
+ <date>2025-10-12</date>
  <version>
-  <release>3.3.1dev</release>
-  <api>3.3.0</api>
+  <release>3.4.0</release>
+  <api>3.4.0</api>
  </version>
  <stability>
-  <release>beta</release>
+  <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.php.net/license">PHP</license>
@@ -221,6 +221,22 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <configureoption name="enable-memcached-session"  prompt="enable sessions"            default="yes"/>
  </extsrcrelease>
  <changelog>
+  <release>
+   <date>2025-10-12</date>
+   <version>
+    <release>3.4.0</release>
+    <api>3.4.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://www.php.net/license">PHP</license>
+   <notes>
+- Use Zend/zend_smart_string.h for PHP 8.5 compatibility (#574)
+- Use zen_ce_exception for PHP 8.5 compatibility (#573)
+   </notes>
+  </release>
   <release>
    <date>2024-10-17</date>
    <version>