From 8c181b9cbe9980778f0aa7e88f8ebf1506f28122 Mon Sep 17 00:00:00 2001
From: Demin Yin <deminy@deminy.net>
Date: Fri, 16 Jul 2021 11:20:17 -0700
Subject: [PATCH] updates for Swoole 4.7.0

Signed-off-by: Demin Yin <deminy@deminy.net>
---
 output/swoole/aliases.php                     |  1 -
 output/swoole/constants.php                   | 31 ++++++----
 output/swoole/functions.php                   |  3 +-
 output/swoole/namespace/Coroutine.php         | 16 +++++-
 output/swoole/namespace/Coroutine/System.php  |  2 +-
 output/swoole/namespace/Process/Pool.php      | 14 +++++
 output/swoole/namespace/Server/Port.php       |  2 +
 output/swoole/namespace/Table.php             | 32 +----------
 output/swoole/namespace/Table/Row.php         | 45 ---------------
 .../swoole_library/src/core/ArrayObject.php   | 13 +++++
 .../src/core/ConnectionPool.php               |  4 +-
 output/swoole_library/src/core/Constant.php   | 57 ++++++++++++-------
 .../src/core/Coroutine/functions.php          |  2 +-
 .../swoole_library/src/core/Curl/Handler.php  | 41 ++++++++++++-
 .../src/core/Database/PDOStatementProxy.php   |  9 +--
 .../swoole_library/src/core/Http/Status.php   |  2 +-
 .../swoole_library/src/core/StringObject.php  | 23 ++++----
 17 files changed, 162 insertions(+), 135 deletions(-)
 delete mode 100644 output/swoole/namespace/Table/Row.php

diff --git a/output/swoole/aliases.php b/output/swoole/aliases.php
index 13c2397e..c83e9b46 100644
--- 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
index 2c9a0de6..ec58b999 100644
--- 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
index cc7fcf0c..780c634d 100644
--- 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
index afb2c41d..6150dec3 100644
--- 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
index 764791a7..4f0dc08e 100644
--- 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
index 285e9f2f..0f44dec7 100644
--- a/output/swoole/namespace/Process/Pool.php
+++ b/output/swoole/namespace/Process/Pool.php
@@ -52,6 +52,13 @@ public function write($data)
     {
     }
 
+    /**
+     * @return mixed
+     */
+    public function detach()
+    {
+    }
+
     /**
      * @return mixed
      */
@@ -59,6 +66,13 @@ 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
index 891b3709..f683b7a3 100644
--- 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
index fcf46552..02ad5356 100644
--- 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
deleted file mode 100644
index 66159b19..00000000
--- a/output/swoole/namespace/Table/Row.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Swoole\Table;
-
-class Row implements \ArrayAccess
-{
-
-    public $key;
-
-    public $value;
-
-    /**
-     * @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 __destruct()
-    {
-    }
-
-
-}
diff --git a/output/swoole_library/src/core/ArrayObject.php b/output/swoole_library/src/core/ArrayObject.php
index 19680f11..60a2af78 100644
--- 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
index c37be02b..3773294e 100644
--- a/output/swoole_library/src/core/ConnectionPool.php
+++ b/output/swoole_library/src/core/ConnectionPool.php
@@ -49,7 +49,7 @@ public function fill(): void
         }
     }
 
-    public function get()
+    public function get(float $timeout = -1)
     {
         if ($this->pool === null) {
             throw new RuntimeException('Pool has been closed');
@@ -57,7 +57,7 @@ public function get()
         if ($this->pool->isEmpty() && $this->num < $this->size) {
             $this->make();
         }
-        return $this->pool->pop();
+        return $this->pool->pop($timeout);
     }
 
     public function put($connection): void
diff --git a/output/swoole_library/src/core/Constant.php b/output/swoole_library/src/core/Constant.php
index ea8c0d77..a8bda4ff 100644
--- a/output/swoole_library/src/core/Constant.php
+++ b/output/swoole_library/src/core/Constant.php
@@ -13,43 +13,56 @@
 
 class Constant
 {
-    public const EVENT_RECEIVE = 'receive';
-
-    public const EVENT_CONNECT = 'connect';
+    /* {{{ EVENT */
+    public const EVENT_START = 'start';
 
-    public const EVENT_CLOSE = 'close';
+    public const EVENT_SHUTDOWN = 'shutdown';
 
-    public const EVENT_PACKET = 'packet';
+    public const EVENT_WORKER_START = 'workerStart';
 
-    public const EVENT_REQUEST = 'request';
+    public const EVENT_WORKER_STOP = 'workerStop';
 
-    public const EVENT_MESSAGE = 'message';
+    public const EVENT_BEFORE_RELOAD = 'beforeReload';
 
-    public const EVENT_OPEN = 'open';
-
-    public const EVENT_HANDSHAKE = 'handshake';
+    public const EVENT_AFTER_RELOAD = 'afterReload';
 
     public const EVENT_TASK = 'task';
 
     public const EVENT_FINISH = 'finish';
 
-    public const EVENT_START = 'start';
-
-    public const EVENT_SHUTDOWN = 'shutdown';
-
-    public const EVENT_WORKER_START = 'workerStart';
-
     public const EVENT_WORKER_EXIT = 'workerExit';
 
     public const EVENT_WORKER_ERROR = 'workerError';
 
-    public const EVENT_WORKER_STOP = 'workerStop';
+    public const EVENT_MANAGER_START = 'managerStart';
+
+    public const EVENT_MANAGER_STOP = 'managerStop';
 
     public const EVENT_PIPE_MESSAGE = 'pipeMessage';
 
-    public const EVENT_MANAGER_START = 'managerStart';
+    public const EVENT_CONNECT = 'connect';
 
-    public const EVENT_MANAGER_STOP = 'managerStop';
+    public const EVENT_RECEIVE = 'receive';
+
+    public const EVENT_CLOSE = 'close';
+
+    public const EVENT_PACKET = 'packet';
+
+    public const EVENT_BUFFER_FULL = 'bufferFull';
+
+    public const EVENT_BUFFER_EMPTY = 'bufferEmpty';
+
+    public const EVENT_REQUEST = 'request';
+
+    public const EVENT_HANDSHAKE = 'handshake';
+
+    public const EVENT_OPEN = 'open';
+
+    public const EVENT_MESSAGE = 'message';
+
+    public const EVENT_DISCONNECT = 'disconnect';
+
+    /* }}} EVENT */
 
     public const EVENT_ERROR = 'error';
 
@@ -224,6 +237,10 @@ class Constant
 
     public const OPTION_WEBSOCKET_MASK = 'websocket_mask';
 
+    public const OPTION_HTTP_COMPRESSION = 'http_compression';
+
+    public const OPTION_BODY_DECOMPRESSION = 'body_decompression';
+
     public const OPTION_WEBSOCKET_COMPRESSION = 'websocket_compression';
 
     public const OPTION_HTTP_PARSE_COOKIE = 'http_parse_cookie';
@@ -232,8 +249,6 @@ class Constant
 
     public const OPTION_HTTP_PARSE_FILES = 'http_parse_files';
 
-    public const OPTION_HTTP_COMPRESSION = 'http_compression';
-
     public const OPTION_HTTP_COMPRESSION_LEVEL = 'http_compression_level';
 
     public const OPTION_HTTP_GZIP_LEVEL = 'http_gzip_level';
diff --git a/output/swoole_library/src/core/Coroutine/functions.php b/output/swoole_library/src/core/Coroutine/functions.php
index 70cdfdfd..4fc47696 100644
--- a/output/swoole_library/src/core/Coroutine/functions.php
+++ b/output/swoole_library/src/core/Coroutine/functions.php
@@ -26,7 +26,7 @@ function run(callable $fn, ...$args)
 
 function go(callable $fn, ...$args)
 {
-    Coroutine::create($fn, ...$args);
+    return Coroutine::create($fn, ...$args);
 }
 
 function defer(callable $fn)
diff --git a/output/swoole_library/src/core/Curl/Handler.php b/output/swoole_library/src/core/Curl/Handler.php
index 7e1e1642..92168641 100644
--- a/output/swoole_library/src/core/Curl/Handler.php
+++ b/output/swoole_library/src/core/Curl/Handler.php
@@ -59,6 +59,7 @@ final class Handler
         'protocol' => 0,
         'ssl_verifyresult' => 0,
         'scheme' => '',
+        'private' => '',
     ];
 
     private $withHeaderOut = false;
@@ -129,6 +130,8 @@ final class Handler
 
     private $cookieJar = '';
 
+    private $resolve = [];
+
     public function __construct(string $url = '')
     {
         if ($url) {
@@ -215,7 +218,15 @@ private function create(?array $urlInfo = null): void
         if ($urlInfo === null) {
             $urlInfo = $this->urlInfo;
         }
-        $this->client = new Client($urlInfo['host'], $urlInfo['port'], $urlInfo['scheme'] === 'https');
+        $host = $urlInfo['host'];
+        $port = $urlInfo['port'];
+        if (isset($this->resolve[$host])) {
+            if (!$this->hasHeader('Host')) {
+                $this->setHeader('Host', $host);
+            }
+            $this->urlInfo['host'] = $host = $this->resolve[$host][$port] ?? null ?: $host;
+        }
+        $this->client = new Client($host, $port, $urlInfo['scheme'] === 'https');
     }
 
     private function getUrl(): string
@@ -303,7 +314,7 @@ private function setPort(int $port): void
     private function setError($code, $msg = ''): void
     {
         $this->errCode = $code;
-        $this->errMsg = $msg ? $msg : curl_strerror($code);
+        $this->errMsg = $msg ?: curl_strerror($code);
     }
 
     private function hasHeader(string $headerName): bool
@@ -412,6 +423,25 @@ private function setOption(int $opt, $value): bool
                 $this->nobody = boolval($value);
                 $this->method = 'HEAD';
                 break;
+            case CURLOPT_RESOLVE:
+                foreach ((array) $value as $resolve) {
+                    $flag = substr($resolve, 0, 1);
+                    if ($flag === '+' || $flag === '-') {
+                        // TODO: [+]HOST:PORT:ADDRESS
+                        $resolve = substr($resolve, 1);
+                    }
+                    $tmpResolve = explode(':', $resolve, 3);
+                    $host = $tmpResolve[0] ?? '';
+                    $port = $tmpResolve[1] ?? 0;
+                    $ip = $tmpResolve[2] ?? '';
+                    if ($flag === '-') {
+                        unset($this->resolve[$host][$port]);
+                    } else {
+                        // TODO: HOST:PORT:ADDRESS[,ADDRESS]...
+                        $this->resolve[$host][$port] = explode(',', $ip)[0];
+                    }
+                }
+                break;
             case CURLOPT_IPRESOLVE:
                 if ($value !== CURL_IPRESOLVE_WHATEVER and $value !== CURL_IPRESOLVE_V4) {
                     throw new Swoole\Curl\Exception(
@@ -422,6 +452,9 @@ private function setOption(int $opt, $value): bool
             case CURLOPT_TCP_NODELAY:
                 $this->clientOptions[Constant::OPTION_OPEN_TCP_NODELAY] = boolval($value);
                 break;
+            case CURLOPT_PRIVATE:
+                $this->info['private'] = $value;
+                break;
             /*
              * Ignore options
              */
@@ -799,6 +832,10 @@ private function execute()
             $this->info['redirect_time'] = microtime(true) - $redirectBeginTime;
         }
 
+        if (filter_var($this->urlInfo['host'], FILTER_VALIDATE_IP)) {
+            $this->info['primary_ip'] = $this->urlInfo['host'];
+        }
+
         $headerContent = '';
         if ($client->headers) {
             $cb = $this->headerFunction;
diff --git a/output/swoole_library/src/core/Database/PDOStatementProxy.php b/output/swoole_library/src/core/Database/PDOStatementProxy.php
index 0b2972b4..532cf65e 100644
--- a/output/swoole_library/src/core/Database/PDOStatementProxy.php
+++ b/output/swoole_library/src/core/Database/PDOStatementProxy.php
@@ -123,13 +123,10 @@ public function setAttribute(int $attribute, $value): bool
         return $this->__object->setAttribute($attribute, $value);
     }
 
-    public function setFetchMode(int $mode, $classNameObject = null, array $ctorarfg = []): bool
+    public function setFetchMode(int $mode, ...$args): bool
     {
-        $this->setFetchModeContext = [$mode, $classNameObject, $ctorarfg];
-        if (!isset($classNameObject)) {
-            return $this->__object->setFetchMode($mode);
-        }
-        return $this->__object->setFetchMode($mode, $classNameObject, $ctorarfg);
+        $this->setFetchModeContext = func_get_args();
+        return $this->__object->setFetchMode(...$this->setFetchModeContext);
     }
 
     public function bindParam($parameter, &$variable, $data_type = PDO::PARAM_STR, $length = null, $driver_options = null): bool
diff --git a/output/swoole_library/src/core/Http/Status.php b/output/swoole_library/src/core/Http/Status.php
index 6ba568e1..3c5dc52d 100644
--- a/output/swoole_library/src/core/Http/Status.php
+++ b/output/swoole_library/src/core/Http/Status.php
@@ -176,7 +176,7 @@ abstract class Status
         self::UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
         self::REQUESTED_RANGE_NOT_SATISFIABLE => 'Requested range not satisfiable',
         self::EXPECTATION_FAILED => 'Expectation Failed',
-        self::MISDIRECTED_REQUEST => 'Unprocessable Entity',
+        self::MISDIRECTED_REQUEST => 'Misdirected Request',
         self::UNPROCESSABLE_ENTITY => 'Unprocessable Entity',
         self::LOCKED => 'Locked',
         self::FAILED_DEPENDENCY => 'Failed Dependency',
diff --git a/output/swoole_library/src/core/StringObject.php b/output/swoole_library/src/core/StringObject.php
index 11f31174..c7b03ab1 100644
--- a/output/swoole_library/src/core/StringObject.php
+++ b/output/swoole_library/src/core/StringObject.php
@@ -124,29 +124,28 @@ public function substr(int $offset, ?int $length = null)
         return new static(substr($this->string, ...func_get_args()));
     }
 
-    public function repeat(int $n): StringObject
+    /**
+     * @return static
+     */
+    public function repeat(int $times): self
     {
-        return new static(str_repeat($this->string, $n));
+        return new static(str_repeat($this->string, $times));
     }
 
     /**
-     * @param $str
+     * @param mixed $str
+     * @return static
      */
-    public function append($str): StringObject
+    public function append($str): self
     {
-        if (is_string($str)) {
-            $this->string .= $str;
-        } else {
-            $this->string .= strval($str);
-        }
-        return $this;
+        return new static($this->string .= $str);
     }
 
     /**
      * @param null|int $count
      * @return static
      */
-    public function replace(string $search, string $replace, &$count = null)
+    public function replace(string $search, string $replace, &$count = null): self
     {
         return new static(str_replace($search, $replace, $this->string, $count));
     }
@@ -193,7 +192,7 @@ public function char(int $index): string
     /**
      * @return static
      */
-    public function chunkSplit(int $chunkLength = 76, string $chunkEnd = '')
+    public function chunkSplit(int $chunkLength = 76, string $chunkEnd = ''): self
     {
         return new static(chunk_split($this->string, ...func_get_args()));
     }