Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit cae1406

Browse files
doubaokundoubaokun
committedFeb 2, 2025·
v25.2.0 for PHP 8.4
1 parent c913639 commit cae1406

File tree

5 files changed

+16
-39
lines changed

5 files changed

+16
-39
lines changed
 

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PROJECT(libopenswoole)
22

33
ENABLE_LANGUAGE(ASM)
4-
set(SWOOLE_VERSION 22.1.2)
4+
set(SWOOLE_VERSION 25.2.0)
55

66
set(CMAKE_CXX_STANDARD 11)
77
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ Please check [Open Swoole Installation Guide](https://openswoole.com/docs/get-st
3131
#### Compiling requirements
3232

3333
+ Linux, OS X or Cygwin, WSL
34-
+ PHP 8.1.0 or later (The higher the version, the better the performance.)
34+
+ PHP 8.2.0 or later (The higher the version, the better the performance.)
3535
+ GCC 4.8 or later
3636

3737
Download the source packages from [Releases](https://github.com/openswoole/ext-openswoole/releases) or:
3838

3939
```shell
4040
git clone https://github.com/openswoole/ext-openswoole.git && \
4141
cd ext-openswoole
42-
git checkout v22.1.1
42+
git checkout v25.2.0
4343
phpize && \
4444
./configure && \
4545
make && make install

‎include/swoole_version.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
#ifndef SWOOLE_VERSION_H_
1313
#define SWOOLE_VERSION_H_
1414

15-
#define SWOOLE_MAJOR_VERSION 22
16-
#define SWOOLE_MINOR_VERSION 1
17-
#define SWOOLE_RELEASE_VERSION 2
15+
#define SWOOLE_MAJOR_VERSION 25
16+
#define SWOOLE_MINOR_VERSION 2
17+
#define SWOOLE_RELEASE_VERSION 0
1818
#define SWOOLE_EXTRA_VERSION ""
19-
#define SWOOLE_VERSION "22.1.2"
20-
#define SWOOLE_VERSION_ID 220102
19+
#define SWOOLE_VERSION "25.2.0"
20+
#define SWOOLE_VERSION_ID 250200
2121
#define SWOOLE_API_VERSION_ID 0x202012a
2222

2323
#define SWOOLE_BUG_REPORT \

‎package.xml

+7-30
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,19 @@
1212
<email>doubaokun@php.net</email>
1313
<active>yes</active>
1414
</lead>
15-
<date>2023-12-10</date>
15+
<date>2025-02-02</date>
1616
<time>22:00:00</time>
1717
<version>
18-
<release>22.1.2</release>
19-
<api>22.0</api>
18+
<release>25.2.0</release>
19+
<api>25.0</api>
2020
</version>
2121
<stability>
2222
<release>stable</release>
2323
<api>stable</api>
2424
</stability>
2525
<license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0</license>
2626
<notes>
27-
. Add missing c-ares configure opt (@nberlee)
28-
. Fix php_url_encode_hash_ex call for 8.3 (alpine builds) (@thecaliskan)
29-
. Fix cygwin build
27+
. PHP 8.4 support
3028
</notes>
3129
<contents>
3230
<dir name="/">
@@ -132,40 +130,31 @@
132130
<file role="src" name="ext-src/swoole_atomic.cc" />
133131
<file role="src" name="ext-src/swoole_atomic.stub.php" />
134132
<file role="src" name="ext-src/swoole_atomic_arginfo.h" />
135-
<file role="src" name="ext-src/swoole_atomic_arginfo_legacy.h" />
136133
<file role="src" name="ext-src/swoole_channel_coro.cc" />
137134
<file role="src" name="ext-src/swoole_channel_coro.stub.php" />
138135
<file role="src" name="ext-src/swoole_channel_coro_arginfo.h" />
139-
<file role="src" name="ext-src/swoole_channel_coro_arginfo_legacy.h" />
140136
<file role="src" name="ext-src/swoole_client.cc" />
141137
<file role="src" name="ext-src/swoole_client.stub.php" />
142138
<file role="src" name="ext-src/swoole_client_arginfo.h" />
143-
<file role="src" name="ext-src/swoole_client_arginfo_legacy.h" />
144139
<file role="src" name="ext-src/swoole_client_coro.cc" />
145140
<file role="src" name="ext-src/swoole_client_coro.stub.php" />
146141
<file role="src" name="ext-src/swoole_client_coro_arginfo.h" />
147-
<file role="src" name="ext-src/swoole_client_coro_arginfo_legacy.h" />
148142
<file role="src" name="ext-src/swoole_coroutine.cc" />
149143
<file role="src" name="ext-src/swoole_coroutine.stub.php" />
150144
<file role="src" name="ext-src/swoole_coroutine_arginfo.h" />
151-
<file role="src" name="ext-src/swoole_coroutine_arginfo_legacy.h" />
152145
<file role="src" name="ext-src/swoole_coroutine_scheduler.cc" />
153146
<file role="src" name="ext-src/swoole_coroutine_scheduler.stub.php" />
154147
<file role="src" name="ext-src/swoole_coroutine_scheduler_arginfo.h" />
155-
<file role="src" name="ext-src/swoole_coroutine_scheduler_arginfo_legacy.h" />
156148
<file role="src" name="ext-src/swoole_coroutine_system.cc" />
157149
<file role="src" name="ext-src/swoole_coroutine_system.stub.php" />
158150
<file role="src" name="ext-src/swoole_coroutine_system_arginfo.h" />
159-
<file role="src" name="ext-src/swoole_coroutine_system_arginfo_legacy.h" />
160151
<file role="src" name="ext-src/swoole_curl.cc" />
161152
<file role="src" name="ext-src/swoole_event.cc" />
162153
<file role="src" name="ext-src/swoole_event.stub.php" />
163154
<file role="src" name="ext-src/swoole_event_arginfo.h" />
164-
<file role="src" name="ext-src/swoole_event_arginfo_legacy.h" />
165155
<file role="src" name="ext-src/swoole_http2_client_coro.cc" />
166156
<file role="src" name="ext-src/swoole_http2_client_coro.stub.php" />
167157
<file role="src" name="ext-src/swoole_http2_client_coro_arginfo.h" />
168-
<file role="src" name="ext-src/swoole_http2_client_coro_arginfo_legacy.h" />
169158
<file role="src" name="ext-src/swoole_http2_server.cc" />
170159
<file role="src" name="ext-src/swoole_http_client_coro.cc" />
171160
<file role="src" name="ext-src/swoole_http_client_coro.stub.php" />
@@ -174,60 +163,46 @@
174163
<file role="src" name="ext-src/swoole_http_request.cc" />
175164
<file role="src" name="ext-src/swoole_http_request.stub.php" />
176165
<file role="src" name="ext-src/swoole_http_request_arginfo.h" />
177-
<file role="src" name="ext-src/swoole_http_request_arginfo_legacy.h" />
178166
<file role="src" name="ext-src/swoole_http_response.cc" />
179167
<file role="src" name="ext-src/swoole_http_response.stub.php" />
180168
<file role="src" name="ext-src/swoole_http_response_arginfo.h" />
181-
<file role="src" name="ext-src/swoole_http_response_arginfo_legacy.h" />
182169
<file role="src" name="ext-src/swoole_http_server.cc" />
183170
<file role="src" name="ext-src/swoole_lock.cc" />
184171
<file role="src" name="ext-src/swoole_lock.stub.php" />
185172
<file role="src" name="ext-src/swoole_lock_arginfo.h" />
186-
<file role="src" name="ext-src/swoole_lock_arginfo_legacy.h" />
187173
<file role="src" name="ext-src/swoole_postgres_coro.cc" />
188174
<file role="src" name="ext-src/swoole_postgresql_coro.stub.php" />
189175
<file role="src" name="ext-src/swoole_postgresql_coro_arginfo.h" />
190-
<file role="src" name="ext-src/swoole_postgresql_coro_legacy_arginfo.h" />
191176
<file role="src" name="ext-src/swoole_process.cc" />
192177
<file role="src" name="ext-src/swoole_process.stub.php" />
193178
<file role="src" name="ext-src/swoole_process_arginfo.h" />
194-
<file role="src" name="ext-src/swoole_process_arginfo_legacy.h" />
195179
<file role="src" name="ext-src/swoole_process_pool.cc" />
196180
<file role="src" name="ext-src/swoole_process_pool.stub.php" />
197181
<file role="src" name="ext-src/swoole_process_pool_arginfo.h" />
198-
<file role="src" name="ext-src/swoole_process_pool_arginfo_legacy.h" />
199182
<file role="src" name="ext-src/swoole_runtime.cc" />
200183
<file role="src" name="ext-src/swoole_runtime.stub.php" />
201184
<file role="src" name="ext-src/swoole_runtime_arginfo.h" />
202-
<file role="src" name="ext-src/swoole_runtime_arginfo_legacy.h" />
203185
<file role="src" name="ext-src/swoole_server.cc" />
204186
<file role="src" name="ext-src/swoole_server.stub.php" />
205187
<file role="src" name="ext-src/swoole_server_arginfo.h" />
206-
<file role="src" name="ext-src/swoole_server_arginfo_legacy.h" />
207188
<file role="src" name="ext-src/swoole_server_port.cc" />
208189
<file role="src" name="ext-src/swoole_server_port.stub.php" />
209190
<file role="src" name="ext-src/swoole_server_port_arginfo.h" />
210-
<file role="src" name="ext-src/swoole_server_port_arginfo_legacy.h" />
211191
<file role="src" name="ext-src/swoole_socket_coro.cc" />
212192
<file role="src" name="ext-src/swoole_socket_coro.stub.php" />
213193
<file role="src" name="ext-src/swoole_socket_coro_arginfo.h" />
214-
<file role="src" name="ext-src/swoole_socket_coro_arginfo_legacy.h" />
215194
<file role="src" name="ext-src/swoole_table.cc" />
216195
<file role="src" name="ext-src/swoole_table.stub.php" />
217196
<file role="src" name="ext-src/swoole_table_arginfo.h" />
218-
<file role="src" name="ext-src/swoole_table_arginfo_legacy.h" />
219197
<file role="src" name="ext-src/swoole_timer.cc" />
220198
<file role="src" name="ext-src/swoole_timer.stub.php" />
221199
<file role="src" name="ext-src/swoole_timer_arginfo.h" />
222-
<file role="src" name="ext-src/swoole_timer_arginfo_legacy.h" />
223200
<file role="src" name="ext-src/swoole_util.cc" />
224201
<file role="src" name="ext-src/swoole_util.stub.php" />
225202
<file role="src" name="ext-src/swoole_util_arginfo.h" />
226-
<file role="src" name="ext-src/swoole_util_arginfo_legacy.h" />
227203
<file role="src" name="ext-src/swoole_websocket_server.cc" />
228204
<file role="src" name="ext-src/swoole_websocket_server.stub.php" />
229205
<file role="src" name="ext-src/swoole_websocket_server_arginfo.h" />
230-
<file role="src" name="ext-src/swoole_websocket_server_arginfo_legacy.h" />
231206
<file role="doc" name="gdbinit" />
232207
<file role="src" name="google-style.xml" />
233208
<file role="src" name="include/helper/kqueue.h" />
@@ -620,6 +595,7 @@
620595
<file role="test" name="tests/swoole_coroutine/bailout/error_internal2.phpt" />
621596
<file role="test" name="tests/swoole_coroutine/bailout/error_out.phpt" />
622597
<file role="test" name="tests/swoole_coroutine/bailout/exit.phpt" />
598+
<file role="test" name="tests/swoole_coroutine/bailout/exit_php84.phpt" />
623599
<file role="test" name="tests/swoole_coroutine/before_create_server_1.phpt" />
624600
<file role="test" name="tests/swoole_coroutine/before_create_server_2.phpt" />
625601
<file role="test" name="tests/swoole_coroutine/before_create_server_3.phpt" />
@@ -681,6 +657,7 @@
681657
<file role="test" name="tests/swoole_coroutine/kernel_coroutine.phpt" />
682658
<file role="test" name="tests/swoole_coroutine/list_and_backtrace.phpt" />
683659
<file role="test" name="tests/swoole_coroutine/list_and_backtrace_81.phpt" />
660+
<file role="test" name="tests/swoole_coroutine/list_and_backtrace_84.phpt" />
684661
<file role="test" name="tests/swoole_coroutine/max_num.phpt" />
685662
<file role="test" name="tests/swoole_coroutine/max_num_limit.phpt" />
686663
<file role="test" name="tests/swoole_coroutine/nested1.phpt" />
@@ -1716,7 +1693,7 @@
17161693
<dependencies>
17171694
<required>
17181695
<php>
1719-
<min>8.1.0</min>
1696+
<min>8.2.0</min>
17201697
</php>
17211698
<pearinstaller>
17221699
<min>1.4.0</min>

‎tests/swoole_coroutine/list_and_backtrace_84.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,4 @@ array(2) {
320320
array(0) {
321321
}
322322
}
323-
}
323+
}

0 commit comments

Comments
 (0)
Please sign in to comment.