updates for Swoole 4.7.0

Signed-off-by: Demin Yin <deminy@deminy.net>
swoole · Jul 16, 2021 · 8c181b9 · 8c181b9
1 parent 23bbaaf
commit 8c181b9
Show file tree

Hide file tree

Showing 17 changed files with 162 additions and 135 deletions.
diff --git a/output/swoole/aliases.php b/output/swoole/aliases.php
@@ -42,7 +42,6 @@ class_alias(Swoole\Server::class, swoole_server::class);
 class_alias(Swoole\Server\Port::class, swoole_server_port::class);
 class_alias(Swoole\Server\Task::class, swoole_server_task::class);
 class_alias(Swoole\Table::class, swoole_table::class);
-class_alias(Swoole\Table\Row::class, swoole_table_row::class);
 class_alias(Swoole\Timer::class, swoole_timer::class);
 class_alias(Swoole\Timer\Iterator::class, swoole_timer_iterator::class);
 class_alias(Swoole\Websocket\Closeframe::class, swoole_websocket_closeframe::class);

diff --git a/output/swoole/constants.php b/output/swoole/constants.php
@@ -1,14 +1,15 @@
 <?php
 
-define('SWOOLE_VERSION', '4.6.7');
-define('SWOOLE_VERSION_ID', 40607);
+define('SWOOLE_VERSION', '4.7.0');
+define('SWOOLE_VERSION_ID', 40700);
 define('SWOOLE_MAJOR_VERSION', 4);
-define('SWOOLE_MINOR_VERSION', 6);
-define('SWOOLE_RELEASE_VERSION', 7);
+define('SWOOLE_MINOR_VERSION', 7);
+define('SWOOLE_RELEASE_VERSION', 0);
 define('SWOOLE_EXTRA_VERSION', '');
 define('SWOOLE_DEBUG', '');
 define('SWOOLE_HAVE_COMPRESSION', '1');
 define('SWOOLE_HAVE_ZLIB', '1');
+define('SWOOLE_HAVE_BROTLI', '1');
 define('SWOOLE_USE_HTTP2', '1');
 define('SWOOLE_USE_SHORTNAME', '1');
 define('SWOOLE_BASE', 1);
@@ -78,11 +79,13 @@
 define('SWOOLE_ERROR_FILE_NOT_EXIST', 700);
 define('SWOOLE_ERROR_FILE_TOO_LARGE', 701);
 define('SWOOLE_ERROR_FILE_EMPTY', 702);
-define('SWOOLE_ERROR_DNSLOOKUP_DUPLICATE_REQUEST', 703);
-define('SWOOLE_ERROR_DNSLOOKUP_RESOLVE_FAILED', 704);
-define('SWOOLE_ERROR_DNSLOOKUP_RESOLVE_TIMEOUT', 705);
-define('SWOOLE_ERROR_BAD_IPV6_ADDRESS', 706);
-define('SWOOLE_ERROR_UNREGISTERED_SIGNAL', 707);
+define('SWOOLE_ERROR_DNSLOOKUP_DUPLICATE_REQUEST', 710);
+define('SWOOLE_ERROR_DNSLOOKUP_RESOLVE_FAILED', 711);
+define('SWOOLE_ERROR_DNSLOOKUP_RESOLVE_TIMEOUT', 712);
+define('SWOOLE_ERROR_DNSLOOKUP_UNSUPPORTED', 713);
+define('SWOOLE_ERROR_DNSLOOKUP_NO_SERVER', 714);
+define('SWOOLE_ERROR_BAD_IPV6_ADDRESS', 720);
+define('SWOOLE_ERROR_UNREGISTERED_SIGNAL', 721);
 define('SWOOLE_ERROR_EVENT_SOCKET_REMOVED', 800);
 define('SWOOLE_ERROR_SESSION_CLOSED_BY_SERVER', 1001);
 define('SWOOLE_ERROR_SESSION_CLOSED_BY_CLIENT', 1002);
@@ -159,6 +162,10 @@
 define('SWOOLE_ERROR_CO_PROTECT_STACK_FAILED', 10012);
 define('SWOOLE_ERROR_CO_STD_THREAD_LINK_ERROR', 10013);
 define('SWOOLE_ERROR_CO_DISABLED_MULTI_THREAD', 10014);
+define('SWOOLE_ERROR_CO_CANNOT_CANCEL', 10015);
+define('SWOOLE_ERROR_CO_NOT_EXISTS', 10016);
+define('SWOOLE_ERROR_CO_CANCELED', 10017);
+define('SWOOLE_ERROR_CO_TIMEDOUT', 10018);
 define('SWOOLE_TRACE_SERVER', 2);
 define('SWOOLE_TRACE_CLIENT', 4);
 define('SWOOLE_TRACE_BUFFER', 8);
@@ -173,7 +180,7 @@
 define('SWOOLE_TRACE_EOF_PROTOCOL', 4096);
 define('SWOOLE_TRACE_LENGTH_PROTOCOL', 8192);
 define('SWOOLE_TRACE_CLOSE', 16384);
-define('SWOOLE_TRACE_WEBSOCEKT', 32768);
+define('SWOOLE_TRACE_WEBSOCKET', 32768);
 define('SWOOLE_TRACE_REDIS_CLIENT', 65536);
 define('SWOOLE_TRACE_MYSQL_CLIENT', 131072);
 define('SWOOLE_TRACE_HTTP_CLIENT', 262144);
@@ -188,7 +195,8 @@
 define('SWOOLE_TRACE_CO_HTTP_SERVER', 134217728);
 define('SWOOLE_TRACE_TABLE', 268435456);
 define('SWOOLE_TRACE_CO_CURL', 536870912);
-define('SWOOLE_TRACE_ALL', 4294967295);
+define('SWOOLE_TRACE_CARES', 1073741824);
+define('SWOOLE_TRACE_ALL', 9223372036854775807);
 define('SWOOLE_LOG_DEBUG', 0);
 define('SWOOLE_LOG_TRACE', 1);
 define('SWOOLE_LOG_INFO', 2);
@@ -260,6 +268,7 @@
 define('SWOOLE_CHANNEL_OK', 0);
 define('SWOOLE_CHANNEL_TIMEOUT', -1);
 define('SWOOLE_CHANNEL_CLOSED', -2);
+define('SWOOLE_CHANNEL_CANCELED', -3);
 define('SWOOLE_HOOK_TCP', 2);
 define('SWOOLE_HOOK_UDP', 4);
 define('SWOOLE_HOOK_UNIX', 8);

diff --git a/output/swoole/functions.php b/output/swoole/functions.php
@@ -18,9 +18,10 @@ function swoole_last_error(){}
 /**
  * @param $domain_name[required]
  * @param $timeout[optional]
+ * @param $type[optional]
  * @return mixed
  */
-function swoole_async_dns_lookup_coro($domain_name, $timeout = null){}
+function swoole_async_dns_lookup_coro($domain_name, $timeout = null, $type = null){}
 
 /**
  * @param $settings[required]

diff --git a/output/swoole/namespace/Coroutine.php b/output/swoole/namespace/Coroutine.php
@@ -47,6 +47,20 @@ public static function yield()
     {
     }
 
+    /**
+     * @return mixed
+     */
+    public static function cancel($cid)
+    {
+    }
+
+    /**
+     * @return mixed
+     */
+    public static function isCanceled()
+    {
+    }
+
     /**
      * @return mixed
      */
@@ -155,7 +169,7 @@ public static function gethostbyname($domain_name, $family = null, $timeout = nu
     /**
      * @return mixed
      */
-    public static function dnsLookup($domain_name, $timeout = null)
+    public static function dnsLookup($domain_name, $timeout = null, $type = null)
     {
     }
 

diff --git a/output/swoole/namespace/Coroutine/System.php b/output/swoole/namespace/Coroutine/System.php
@@ -15,7 +15,7 @@ public static function gethostbyname($domain_name, $family = null, $timeout = nu
     /**
      * @return mixed
      */
-    public static function dnsLookup($domain_name, $timeout = null)
+    public static function dnsLookup($domain_name, $timeout = null, $type = null)
     {
     }
 

diff --git a/output/swoole/namespace/Process/Pool.php b/output/swoole/namespace/Process/Pool.php
@@ -52,13 +52,27 @@ public function write($data)
     {
     }
 
+    /**
+     * @return mixed
+     */
+    public function detach()
+    {
+    }
+
     /**
      * @return mixed
      */
     public function start()
     {
     }
 
+    /**
+     * @return mixed
+     */
+    public function stop()
+    {
+    }
+
     /**
      * @return mixed
      */

diff --git a/output/swoole/namespace/Server/Port.php b/output/swoole/namespace/Server/Port.php
@@ -25,6 +25,8 @@ class Port
 
     private $onMessage;
 
+    private $onDisconnect;
+
     public $host;
 
     public $port = 0;

diff --git a/output/swoole/namespace/Table.php b/output/swoole/namespace/Table.php
@@ -120,35 +120,14 @@ public function getMemorySize()
     /**
      * @return mixed
      */
-    public function offsetExists($offset)
-    {
-    }
-
-    /**
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-    }
-
-    /**
-     * @return mixed
-     */
-    public function offsetSet($offset, $value)
-    {
-    }
-
-    /**
-     * @return mixed
-     */
-    public function offsetUnset($offset)
+    public function rewind()
     {
     }
 
     /**
      * @return mixed
      */
-    public function rewind()
+    public function valid()
     {
     }
 
@@ -173,12 +152,5 @@ public function key()
     {
     }
 
-    /**
-     * @return mixed
-     */
-    public function valid()
-    {
-    }
-
 
 }
diff --git a/output/swoole/namespace/Table/Row.php b/output/swoole/namespace/Table/Row.php
diff --git a/output/swoole_library/src/core/ArrayObject.php b/output/swoole_library/src/core/ArrayObject.php
@@ -102,6 +102,19 @@ public function get($key)
         return static::detectType($this->array[$key]);
     }
 
+    /**
+     * @param mixed $key
+     * @param mixed $default
+     * @return ArrayObject|StringObject
+     */
+    public function getOr($key, $default = null)
+    {
+        if (!$this->exists($key)) {
+            return $default;
+        }
+        return static::detectType($this->array[$key]);
+    }
+
     /**
      * @return mixed
      */

diff --git a/output/swoole_library/src/core/ConnectionPool.php b/output/swoole_library/src/core/ConnectionPool.php
@@ -49,15 +49,15 @@ public function fill(): void
         }
     }
 
-    public function get()
+    public function get(float $timeout = -1)
     {
         if ($this->pool === null) {
             throw new RuntimeException('Pool has been closed');
         }
         if ($this->pool->isEmpty() && $this->num < $this->size) {
             $this->make();
         }
-        return $this->pool->pop();
+        return $this->pool->pop($timeout);
     }
 
     public function put($connection): void