Merge remote-tracking branch 'origin/master'

swoole · Oct 31, 2019 · cacc9d2 · cacc9d2
2 parents 1fe7897 + 66cd4b7
commit cacc9d2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/swoole_async_client.cc b/swoole_async_client.cc
@@ -442,7 +442,7 @@ static PHP_METHOD(swoole_async_client, __construct)
     php_swoole_check_reactor();
 
     int client_type = php_swoole_socktype(type);
-    if (client_type < SW_SOCK_TCP || client_type > SW_SOCK_UNIX_STREAM)
+    if (client_type < SW_SOCK_TCP || client_type > SW_SOCK_UNIX_DGRAM)
     {
         const char *space, *class_name = get_active_class_name(&space);
         zend_type_error(

diff --git a/swoole_http_client.cc b/swoole_http_client.cc
@@ -518,6 +518,7 @@ static int http_client_execute(zval *zobject, char *uri, size_t uri_len, zval *c
 void swoole_http_client_init(int module_number)
 {
     SW_INIT_CLASS_ENTRY(swoole_http_client, "Swoole\\Http\\Client", "swoole_http_client", NULL, swoole_http_client_methods);
+    SW_CLASS_ALIAS("Swoole\\Async\\Http\\Client", swoole_http_client);
     SW_SET_CLASS_SERIALIZABLE(swoole_http_client, zend_class_serialize_deny, zend_class_unserialize_deny);
     SW_SET_CLASS_CLONEABLE(swoole_http_client, sw_zend_class_clone_deny);
     SW_SET_CLASS_UNSET_PROPERTY_HANDLER(swoole_http_client, sw_zend_class_unset_property_deny);

diff --git a/swoole_mysql.c b/swoole_mysql.c
@@ -416,6 +416,7 @@ static void swoole_mysql_onConnect(mysql_client *client);
 void swoole_mysql_init(int module_number)
 {
     SW_INIT_CLASS_ENTRY(swoole_mysql, "Swoole\\MySQL", "swoole_mysql", NULL, swoole_mysql_methods);
+    SW_CLASS_ALIAS("Swoole\\Async\\MySQL", swoole_mysql);
     SW_SET_CLASS_SERIALIZABLE(swoole_mysql, zend_class_serialize_deny, zend_class_unserialize_deny);
     SW_SET_CLASS_CLONEABLE(swoole_mysql, sw_zend_class_clone_deny);
     SW_SET_CLASS_UNSET_PROPERTY_HANDLER(swoole_mysql, sw_zend_class_unset_property_deny);

diff --git a/swoole_redis.c b/swoole_redis.c
@@ -172,6 +172,7 @@ static sw_inline void redis_execute_connect_callback(swRedisClient *redis, int s
 void swoole_redis_init(int module_number)
 {
     SW_INIT_CLASS_ENTRY(swoole_redis, "Swoole\\Redis", "swoole_redis", NULL, swoole_redis_methods);
+    SW_CLASS_ALIAS("Swoole\\Async\\Redis", swoole_redis);
     SW_SET_CLASS_SERIALIZABLE(swoole_redis, zend_class_serialize_deny, zend_class_unserialize_deny);
     SW_SET_CLASS_CLONEABLE(swoole_redis, sw_zend_class_clone_deny);
     SW_SET_CLASS_UNSET_PROPERTY_HANDLER(swoole_redis, sw_zend_class_unset_property_deny);