Merge pull request #286 from openswoole/22.0.0

v22.0.0
openswoole · Dec 21, 2022 · 9483cbd · 9483cbd
2 parents b8213c2 + c399e7e
commit 9483cbd
Show file tree

Hide file tree

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

diff --git a/config.m4 b/config.m4
@@ -596,7 +596,6 @@ if test "$PHP_SWOOLE" != "no"; then
     swoole_source_file=" \
         ext-src/php_swoole.cc \
         ext-src/php_swoole_cxx.cc \
-        ext-src/swoole_util.cc \
         ext-src/swoole_atomic.cc \
         ext-src/swoole_channel_coro.cc \
         ext-src/swoole_client.cc \
@@ -622,6 +621,7 @@ if test "$PHP_SWOOLE" != "no"; then
         ext-src/swoole_socket_coro.cc \
         ext-src/swoole_table.cc \
         ext-src/swoole_timer.cc \
+        ext-src/swoole_util.cc \
         ext-src/swoole_websocket_server.cc \
         src/core/base.cc \
         src/core/channel.cc \

diff --git a/ext-src/php_swoole.cc b/ext-src/php_swoole.cc
@@ -1284,7 +1284,7 @@ PHP_MINFO_FUNCTION(openswoole) {
     php_info_print_table_row(2, "http2", "enabled");
 #endif
 #ifdef SW_USE_CURL
-    php_info_print_table_row(2, "curl-native", "enabled");
+    php_info_print_table_row(2, "hook-curl", "enabled");
 #endif
 #ifdef HAVE_PCRE
     php_info_print_table_row(2, "pcre", "enabled");

diff --git a/include/swoole_version.h b/include/swoole_version.h
@@ -15,8 +15,8 @@
 #define SWOOLE_MAJOR_VERSION 22
 #define SWOOLE_MINOR_VERSION 0
 #define SWOOLE_RELEASE_VERSION 0
-#define SWOOLE_EXTRA_VERSION "dev"
-#define SWOOLE_VERSION "22.0.0-dev"
+#define SWOOLE_EXTRA_VERSION ""
+#define SWOOLE_VERSION "22.0.0"
 #define SWOOLE_VERSION_ID 220000
 #define SWOOLE_API_VERSION_ID 0x202012a
 

diff --git a/package.xml b/package.xml
diff --git a/tests/swoole_coroutine/exception/yield.phpt b/tests/swoole_coroutine/exception/yield.phpt
@@ -26,4 +26,4 @@ start
 after sleep
 Caught exception: coro Exception
 finally.
-end
+end
diff --git a/tests/swoole_event/rshutdown.phpt b/tests/swoole_event/rshutdown.phpt
@@ -20,4 +20,3 @@ swoole_timer_after(100, function () {
 
 ?>
 --EXPECTF--
-
diff --git a/tests/swoole_postgres_coro/issue227.phpt b/tests/swoole_postgres_coro/issue227.phpt
@@ -73,4 +73,4 @@ array(6) {
   float(0.5)
   ["date"]=>
   string(10) "1994-11-27"
-}
+}
diff --git a/tests/swoole_server/force_reload.phpt b/tests/swoole_server/force_reload.phpt
@@ -69,4 +69,3 @@ $pm->run();
 [%s]	INFO	Server is reloading all workers
 [%s]	INFO	Server has done all workers reloading
 [%s]	INFO	Server is shutdown now
-
diff --git a/tools/pecl-package.php b/tools/pecl-package.php
@@ -89,13 +89,7 @@ function check_source_ver(string $expect_ver, $source_file)
 // all check
 swoole_execute_and_check(['php', __DIR__ . '/config-generator.php']);
 swoole_execute_and_check(['php', __DIR__ . '/arginfo-check.php']);
-swoole_execute_and_check(['php', __DIR__ . '/code-generator.php']);
-if (file_exists(LIBRARY_DIR)) {
-    swoole_execute_and_check(['php', __DIR__ . '/constant-generator.php']);
-    swoole_execute_and_check(['php', __DIR__ . '/build-library.php']);
-} else {
-    swoole_warn('Unable to find source of library, this step will be skipped');
-}
+// swoole_execute_and_check(['php', __DIR__ . '/code-generator.php']);
 swoole_execute_and_check(['php', __DIR__ . '/phpt-fixer.php']);
 
 // prepare
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,3 @@ swoole_timer_after(100, function () {

		?>
		--EXPECTF--
Original file line number	Diff line number	Diff line change
Expand Up		@@ -69,4 +69,3 @@ $pm->run();
		[%s] INFO Server is reloading all workers
		[%s] INFO Server has done all workers reloading
		[%s] INFO Server is shutdown now