v25.2.0 for PHP 8.4

openswoole · Feb 2, 2025 · cae1406 · cae1406
1 parent c913639
commit cae1406
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 39 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(libopenswoole)
 
 ENABLE_LANGUAGE(ASM)
-set(SWOOLE_VERSION 22.1.2)
+set(SWOOLE_VERSION 25.2.0)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")

diff --git a/README.md b/README.md
@@ -31,15 +31,15 @@ Please check [Open Swoole Installation Guide](https://openswoole.com/docs/get-st
 #### Compiling requirements
 
 + Linux, OS X or Cygwin, WSL
-+ PHP 8.1.0 or later (The higher the version, the better the performance.)
++ PHP 8.2.0 or later (The higher the version, the better the performance.)
 + GCC 4.8 or later
 
 Download the source packages from [Releases](https://github.com/openswoole/ext-openswoole/releases) or:
 
 ```shell
 git clone https://github.com/openswoole/ext-openswoole.git && \
 cd ext-openswoole
-git checkout v22.1.1
+git checkout v25.2.0
 phpize && \
 ./configure && \
 make && make install

diff --git a/include/swoole_version.h b/include/swoole_version.h
@@ -12,12 +12,12 @@
 #ifndef SWOOLE_VERSION_H_
 #define SWOOLE_VERSION_H_
 
-#define SWOOLE_MAJOR_VERSION 22
-#define SWOOLE_MINOR_VERSION 1
-#define SWOOLE_RELEASE_VERSION 2
+#define SWOOLE_MAJOR_VERSION 25
+#define SWOOLE_MINOR_VERSION 2
+#define SWOOLE_RELEASE_VERSION 0
 #define SWOOLE_EXTRA_VERSION ""
-#define SWOOLE_VERSION "22.1.2"
-#define SWOOLE_VERSION_ID 220102
+#define SWOOLE_VERSION "25.2.0"
+#define SWOOLE_VERSION_ID 250200
 #define SWOOLE_API_VERSION_ID 0x202012a
 
 #define SWOOLE_BUG_REPORT                                                                                              \

diff --git a/package.xml b/package.xml
@@ -12,21 +12,19 @@
         <email>[email protected]</email>
         <active>yes</active>
     </lead>
-    <date>2023-12-10</date>
+    <date>2025-02-02</date>
     <time>22:00:00</time>
     <version>
-        <release>22.1.2</release>
-        <api>22.0</api>
+        <release>25.2.0</release>
+        <api>25.0</api>
     </version>
     <stability>
         <release>stable</release>
         <api>stable</api>
     </stability>
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0</license>
     <notes>
-         . Add missing c-ares configure opt (@nberlee)
-         . Fix php_url_encode_hash_ex call for 8.3 (alpine builds) (@thecaliskan)
-         . Fix cygwin build
+         . PHP 8.4 support
     </notes>
     <contents>
         <dir name="/">
@@ -132,40 +130,31 @@
             <file role="src" name="ext-src/swoole_atomic.cc" />
             <file role="src" name="ext-src/swoole_atomic.stub.php" />
             <file role="src" name="ext-src/swoole_atomic_arginfo.h" />
-            <file role="src" name="ext-src/swoole_atomic_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_channel_coro.cc" />
             <file role="src" name="ext-src/swoole_channel_coro.stub.php" />
             <file role="src" name="ext-src/swoole_channel_coro_arginfo.h" />
-            <file role="src" name="ext-src/swoole_channel_coro_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_client.cc" />
             <file role="src" name="ext-src/swoole_client.stub.php" />
             <file role="src" name="ext-src/swoole_client_arginfo.h" />
-            <file role="src" name="ext-src/swoole_client_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_client_coro.cc" />
             <file role="src" name="ext-src/swoole_client_coro.stub.php" />
             <file role="src" name="ext-src/swoole_client_coro_arginfo.h" />
-            <file role="src" name="ext-src/swoole_client_coro_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_coroutine.cc" />
             <file role="src" name="ext-src/swoole_coroutine.stub.php" />
             <file role="src" name="ext-src/swoole_coroutine_arginfo.h" />
-            <file role="src" name="ext-src/swoole_coroutine_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_coroutine_scheduler.cc" />
             <file role="src" name="ext-src/swoole_coroutine_scheduler.stub.php" />
             <file role="src" name="ext-src/swoole_coroutine_scheduler_arginfo.h" />
-            <file role="src" name="ext-src/swoole_coroutine_scheduler_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_coroutine_system.cc" />
             <file role="src" name="ext-src/swoole_coroutine_system.stub.php" />
             <file role="src" name="ext-src/swoole_coroutine_system_arginfo.h" />
-            <file role="src" name="ext-src/swoole_coroutine_system_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_curl.cc" />
             <file role="src" name="ext-src/swoole_event.cc" />
             <file role="src" name="ext-src/swoole_event.stub.php" />
             <file role="src" name="ext-src/swoole_event_arginfo.h" />
-            <file role="src" name="ext-src/swoole_event_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_http2_client_coro.cc" />
             <file role="src" name="ext-src/swoole_http2_client_coro.stub.php" />
             <file role="src" name="ext-src/swoole_http2_client_coro_arginfo.h" />
-            <file role="src" name="ext-src/swoole_http2_client_coro_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_http2_server.cc" />
             <file role="src" name="ext-src/swoole_http_client_coro.cc" />
             <file role="src" name="ext-src/swoole_http_client_coro.stub.php" />
@@ -174,60 +163,46 @@
             <file role="src" name="ext-src/swoole_http_request.cc" />
             <file role="src" name="ext-src/swoole_http_request.stub.php" />
             <file role="src" name="ext-src/swoole_http_request_arginfo.h" />
-            <file role="src" name="ext-src/swoole_http_request_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_http_response.cc" />
             <file role="src" name="ext-src/swoole_http_response.stub.php" />
             <file role="src" name="ext-src/swoole_http_response_arginfo.h" />
-            <file role="src" name="ext-src/swoole_http_response_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_http_server.cc" />
             <file role="src" name="ext-src/swoole_lock.cc" />
             <file role="src" name="ext-src/swoole_lock.stub.php" />
             <file role="src" name="ext-src/swoole_lock_arginfo.h" />
-            <file role="src" name="ext-src/swoole_lock_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_postgres_coro.cc" />
             <file role="src" name="ext-src/swoole_postgresql_coro.stub.php" />
             <file role="src" name="ext-src/swoole_postgresql_coro_arginfo.h" />
-            <file role="src" name="ext-src/swoole_postgresql_coro_legacy_arginfo.h" />
             <file role="src" name="ext-src/swoole_process.cc" />
             <file role="src" name="ext-src/swoole_process.stub.php" />
             <file role="src" name="ext-src/swoole_process_arginfo.h" />
-            <file role="src" name="ext-src/swoole_process_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_process_pool.cc" />
             <file role="src" name="ext-src/swoole_process_pool.stub.php" />
             <file role="src" name="ext-src/swoole_process_pool_arginfo.h" />
-            <file role="src" name="ext-src/swoole_process_pool_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_runtime.cc" />
             <file role="src" name="ext-src/swoole_runtime.stub.php" />
             <file role="src" name="ext-src/swoole_runtime_arginfo.h" />
-            <file role="src" name="ext-src/swoole_runtime_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_server.cc" />
             <file role="src" name="ext-src/swoole_server.stub.php" />
             <file role="src" name="ext-src/swoole_server_arginfo.h" />
-            <file role="src" name="ext-src/swoole_server_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_server_port.cc" />
             <file role="src" name="ext-src/swoole_server_port.stub.php" />
             <file role="src" name="ext-src/swoole_server_port_arginfo.h" />
-            <file role="src" name="ext-src/swoole_server_port_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_socket_coro.cc" />
             <file role="src" name="ext-src/swoole_socket_coro.stub.php" />
             <file role="src" name="ext-src/swoole_socket_coro_arginfo.h" />
-            <file role="src" name="ext-src/swoole_socket_coro_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_table.cc" />
             <file role="src" name="ext-src/swoole_table.stub.php" />
             <file role="src" name="ext-src/swoole_table_arginfo.h" />
-            <file role="src" name="ext-src/swoole_table_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_timer.cc" />
             <file role="src" name="ext-src/swoole_timer.stub.php" />
             <file role="src" name="ext-src/swoole_timer_arginfo.h" />
-            <file role="src" name="ext-src/swoole_timer_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_util.cc" />
             <file role="src" name="ext-src/swoole_util.stub.php" />
             <file role="src" name="ext-src/swoole_util_arginfo.h" />
-            <file role="src" name="ext-src/swoole_util_arginfo_legacy.h" />
             <file role="src" name="ext-src/swoole_websocket_server.cc" />
             <file role="src" name="ext-src/swoole_websocket_server.stub.php" />
             <file role="src" name="ext-src/swoole_websocket_server_arginfo.h" />
-            <file role="src" name="ext-src/swoole_websocket_server_arginfo_legacy.h" />
             <file role="doc" name="gdbinit" />
             <file role="src" name="google-style.xml" />
             <file role="src" name="include/helper/kqueue.h" />
@@ -620,6 +595,7 @@
             <file role="test" name="tests/swoole_coroutine/bailout/error_internal2.phpt" />
             <file role="test" name="tests/swoole_coroutine/bailout/error_out.phpt" />
             <file role="test" name="tests/swoole_coroutine/bailout/exit.phpt" />
+            <file role="test" name="tests/swoole_coroutine/bailout/exit_php84.phpt" />
             <file role="test" name="tests/swoole_coroutine/before_create_server_1.phpt" />
             <file role="test" name="tests/swoole_coroutine/before_create_server_2.phpt" />
             <file role="test" name="tests/swoole_coroutine/before_create_server_3.phpt" />
@@ -681,6 +657,7 @@
             <file role="test" name="tests/swoole_coroutine/kernel_coroutine.phpt" />
             <file role="test" name="tests/swoole_coroutine/list_and_backtrace.phpt" />
             <file role="test" name="tests/swoole_coroutine/list_and_backtrace_81.phpt" />
+            <file role="test" name="tests/swoole_coroutine/list_and_backtrace_84.phpt" />
             <file role="test" name="tests/swoole_coroutine/max_num.phpt" />
             <file role="test" name="tests/swoole_coroutine/max_num_limit.phpt" />
             <file role="test" name="tests/swoole_coroutine/nested1.phpt" />
@@ -1716,7 +1693,7 @@
     <dependencies>
         <required>
             <php>
-                <min>8.1.0</min>
+                <min>8.2.0</min>
             </php>
             <pearinstaller>
                 <min>1.4.0</min>

diff --git a/tests/swoole_coroutine/list_and_backtrace_84.phpt b/tests/swoole_coroutine/list_and_backtrace_84.phpt
@@ -320,4 +320,4 @@ array(2) {
     array(0) {
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -320,4 +320,4 @@ array(2) { @@
         array(0) {
         }
       }
-    }
+    }