From 93e97fc4807a7d717b0cea642cc73bae7b1a773c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Mar 2019 10:29:58 +0100 Subject: update to 4.3.0 drop dependencies on libnghttp2 and c-ares open https://github.com/swoole/swoole-src/issues/2411 32-bit broken remove the --enable-trace-log build option on 32-bit --- PHPINFO | 9 +- REFLECTION | 1262 +++++++++++++------------------------------------ php-pecl-swoole4.spec | 20 +- 3 files changed, 337 insertions(+), 954 deletions(-) diff --git a/PHPINFO b/PHPINFO index 43ef7f4..77fb439 100644 --- a/PHPINFO +++ b/PHPINFO @@ -3,8 +3,8 @@ swoole Swoole => enabled Author => Swoole Team -Version => 4.2.13 -Built => Feb 4 2019 06:46:52 +Version => 4.3.0 +Built => Mar 7 2019 10:01:54 coroutine => enabled trace_log => enabled epoll => enabled @@ -14,8 +14,8 @@ cpu_affinity => enabled spinlock => enabled rwlock => enabled sockets => enabled -openssl => OpenSSL 1.1.1a FIPS 20 Nov 2018 -http2 => 1.34.0 +openssl => OpenSSL 1.1.1b FIPS 26 Feb 2019 +http2 => enabled pcre => enabled zlib => enabled brotli => enabled @@ -30,5 +30,4 @@ Directive => Local Value => Master Value swoole.enable_coroutine => On => On swoole.display_errors => On => On swoole.use_shortname => On => On -swoole.fast_serialize => Off => Off swoole.unixsock_buffer_size => 8388608 => 8388608 diff --git a/REFLECTION b/REFLECTION index 2188ff3..278d8e1 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #152 swoole version 4.2.13 ] { +Extension [ extension #153 swoole version 4.3.0 ] { - INI { Entry [ swoole.enable_coroutine ] @@ -10,20 +10,17 @@ Extension [ extension #152 swoole version 4.2.13 ] { Entry [ swoole.use_shortname ] Current = 'On' } - Entry [ swoole.fast_serialize ] - Current = 'Off' - } Entry [ swoole.unixsock_buffer_size ] Current = '8388608' } } - - Constants [257] { - Constant [ string SWOOLE_VERSION ] { 4.2.13 } - Constant [ integer SWOOLE_VERSION_ID ] { 40213 } + - Constants [256] { + Constant [ string SWOOLE_VERSION ] { 4.3.0 } + Constant [ integer SWOOLE_VERSION_ID ] { 40300 } Constant [ integer SWOOLE_MAJOR_VERSION ] { 4 } - Constant [ integer SWOOLE_MINOR_VERSION ] { 2 } - Constant [ integer SWOOLE_RELEASE_VERSION ] { 13 } + Constant [ integer SWOOLE_MINOR_VERSION ] { 3 } + Constant [ integer SWOOLE_RELEASE_VERSION ] { 0 } Constant [ string SWOOLE_EXTRA_VERSION ] { } Constant [ boolean SWOOLE_DEBUG ] { } Constant [ integer SWOOLE_BASE ] { 1 } @@ -159,7 +156,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Constant [ integer SWOOLE_TRACE_LENGTH_PROTOCOL ] { 4096 } Constant [ integer SWOOLE_TRACE_CLOSE ] { 8192 } Constant [ integer SWOOLE_TRACE_HTTP_CLIENT ] { 16384 } - Constant [ integer SWOOLE_TRACE_COROUTINE ] { 32768 } + Constant [ integer SWOOLE_TRACE_COROUTINE ] { 16777216 } Constant [ integer SWOOLE_TRACE_REDIS_CLIENT ] { 65536 } Constant [ integer SWOOLE_TRACE_MYSQL_CLIENT ] { 131072 } Constant [ integer SWOOLE_TRACE_AIO ] { 262144 } @@ -202,7 +199,6 @@ Extension [ extension #152 swoole version 4.2.13 ] { Constant [ integer SWOOLE_HTTP_CLIENT_ESTATUS_SERVER_RESET ] { -3 } Constant [ integer SWOOLE_DEFAULT_MAX_CORO_NUM ] { 3000 } Constant [ integer SWOOLE_MAX_CORO_NUM_LIMIT ] { 9223372036854775807 } - Constant [ integer SWOOLE_MAX_CORO_NESTING_LEVEL ] { 128 } Constant [ integer SWOOLE_CORO_INIT ] { 0 } Constant [ integer SWOOLE_CORO_WAITING ] { 1 } Constant [ integer SWOOLE_CORO_RUNNING ] { 2 } @@ -298,8 +294,8 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [4] { Parameter #0 [ $fd ] - Parameter #1 [ $read_callback ] - Parameter #2 [ $write_callback ] + Parameter #1 [ callable or NULL $read_callback ] + Parameter #2 [ callable or NULL $write_callback ] Parameter #3 [ $events ] } } @@ -307,8 +303,8 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [4] { Parameter #0 [ $fd ] - Parameter #1 [ $read_callback ] - Parameter #2 [ $write_callback ] + Parameter #1 [ callable or NULL $read_callback ] + Parameter #2 [ callable or NULL $write_callback ] Parameter #3 [ $events ] } } @@ -338,13 +334,13 @@ Extension [ extension #152 swoole version 4.2.13 ] { Function [ function swoole_event_defer ] { - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ callable $callback ] } } Function [ function swoole_event_cycle ] { - Parameters [2] { - Parameter #0 [ $callback ] + Parameter #0 [ callable or NULL $callback ] Parameter #1 [ $before ] } } @@ -364,7 +360,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] Parameter #2 [ ...$params ] } } @@ -372,7 +368,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] Parameter #2 [ ...$params ] } } @@ -388,53 +384,6 @@ Extension [ extension #152 swoole version 4.2.13 ] { Parameter #0 [ $timer_id ] } } - Function [ function swoole_async_set ] { - - - Parameters [1] { - Parameter #0 [ array $settings ] - } - } - Function [ function swoole_async_read ] { - - - Parameters [4] { - Parameter #0 [ $filename ] - Parameter #1 [ $callback ] - Parameter #2 [ $chunk_size ] - Parameter #3 [ $offset ] - } - } - Function [ function swoole_async_write ] { - - - Parameters [4] { - Parameter #0 [ $filename ] - Parameter #1 [ $content ] - Parameter #2 [ $offset ] - Parameter #3 [ $callback ] - } - } - Function [ function swoole_async_readfile ] { - - - Parameters [2] { - Parameter #0 [ $filename ] - Parameter #1 [ $callback ] - } - } - Function [ function swoole_async_writefile ] { - - - Parameters [4] { - Parameter #0 [ $filename ] - Parameter #1 [ $content ] - Parameter #2 [ $callback ] - Parameter #3 [ $flags ] - } - } - Function [ function swoole_async_dns_lookup ] { - - - Parameters [2] { - Parameter #0 [ $hostname ] - Parameter #1 [ $callback ] - } - } Function [ function swoole_async_dns_lookup_coro ] { - Parameters [2] { @@ -442,10 +391,17 @@ Extension [ extension #152 swoole version 4.2.13 ] { Parameter #1 [ $timeout ] } } - Function [ function swoole_coroutine_create ] { + Function [ function swoole_async_set ] { - Parameters [1] { - Parameter #0 [ $func ] + Parameter #0 [ array $settings ] + } + } + Function [ function swoole_coroutine_create ] { + + - Parameters [2] { + Parameter #0 [ callable $func ] + Parameter #1 [ ...$params ] } } Function [ function swoole_coroutine_exec ] { @@ -457,19 +413,20 @@ Extension [ extension #152 swoole version 4.2.13 ] { Function [ function swoole_coroutine_defer ] { - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ callable $callback ] } } Function [ function go ] { - - Parameters [1] { - Parameter #0 [ $func ] + - Parameters [2] { + Parameter #0 [ callable $func ] + Parameter #1 [ ...$params ] } } Function [ function defer ] { - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ callable $callback ] } } Function [ function swoole_client_select ] { @@ -531,19 +488,19 @@ Extension [ extension #152 swoole version 4.2.13 ] { Parameter #0 [ $filename ] } } - Function [ function swoole_call_user_shutdown_begin ] { + Function [ function swoole_clear_dns_cache ] { - Parameters [0] { } } - Function [ function swoole_clear_dns_cache ] { + Function [ function swoole_internal_call_user_shutdown_begin ] { - Parameters [0] { } } } - - Classes [52] { + - Classes [42] { Class [ class Swoole\Timer ] { - Constants [0] { @@ -557,7 +514,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] Parameter #2 [ ...$params ] } } @@ -566,7 +523,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] Parameter #2 [ ...$params ] } } @@ -606,8 +563,8 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [4] { Parameter #0 [ $fd ] - Parameter #1 [ $read_callback ] - Parameter #2 [ $write_callback ] + Parameter #1 [ callable or NULL $read_callback ] + Parameter #2 [ callable or NULL $write_callback ] Parameter #3 [ $events ] } } @@ -623,8 +580,8 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [4] { Parameter #0 [ $fd ] - Parameter #1 [ $read_callback ] - Parameter #2 [ $write_callback ] + Parameter #1 [ callable or NULL $read_callback ] + Parameter #2 [ callable or NULL $write_callback ] Parameter #3 [ $events ] } } @@ -652,14 +609,14 @@ Extension [ extension #152 swoole version 4.2.13 ] { Method [ static public method defer ] { - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ callable $callback ] } } Method [ static public method cycle ] { - Parameters [2] { - Parameter #0 [ $callback ] + Parameter #0 [ callable or NULL $callback ] Parameter #1 [ $before ] } } @@ -672,92 +629,6 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } - Class [ class Swoole\Async ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [8] { - Method [ static public method read ] { - - - Parameters [4] { - Parameter #0 [ $filename ] - Parameter #1 [ $callback ] - Parameter #2 [ $chunk_size ] - Parameter #3 [ $offset ] - } - } - - Method [ static public method write ] { - - - Parameters [4] { - Parameter #0 [ $filename ] - Parameter #1 [ $content ] - Parameter #2 [ $offset ] - Parameter #3 [ $callback ] - } - } - - Method [ static public method readFile ] { - - - Parameters [2] { - Parameter #0 [ $filename ] - Parameter #1 [ $callback ] - } - } - - Method [ static public method writeFile ] { - - - Parameters [4] { - Parameter #0 [ $filename ] - Parameter #1 [ $content ] - Parameter #2 [ $callback ] - Parameter #3 [ $flags ] - } - } - - Method [ static public method dnsLookup ] { - - - Parameters [2] { - Parameter #0 [ $hostname ] - Parameter #1 [ $callback ] - } - } - - Method [ static public method dnsLookupCoro ] { - - - Parameters [2] { - Parameter #0 [ $domain_name ] - Parameter #1 [ $timeout ] - } - } - - Method [ static public method set ] { - - - Parameters [1] { - Parameter #0 [ array $settings ] - } - } - - Method [ static public method exec ] { - - - Parameters [2] { - Parameter #0 [ $command ] - Parameter #1 [ $callback ] - } - } - } - - - Properties [0] { - } - - - Methods [0] { - } - } - Class [ class Swoole\Exception extends Exception implements Throwable ] { - Constants [0] { @@ -827,17 +698,17 @@ Extension [ extension #152 swoole version 4.2.13 ] { } - Properties [23] { - Property [ private $onStart ] - Property [ private $onShutdown ] - Property [ private $onWorkerStart ] - Property [ private $onWorkerStop ] - Property [ private $onWorkerExit ] - Property [ private $onWorkerError ] - Property [ private $onTask ] - Property [ private $onFinish ] - Property [ private $onManagerStart ] - Property [ private $onManagerStop ] - Property [ private $onPipeMessage ] + Property [ private $on_start ] + Property [ private $on_shutdown ] + Property [ private $on_workerstart ] + Property [ private $on_workerstop ] + Property [ private $on_workerexit ] + Property [ private $on_workererror ] + Property [ private $on_task ] + Property [ private $on_finish ] + Property [ private $on_managerstart ] + Property [ private $on_managerstop ] + Property [ private $on_pipemessage ] Property [ public $setting ] Property [ public $connections ] Property [ public $host ] @@ -852,7 +723,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Property [ public $worker_pid ] } - - Methods [41] { + - Methods [42] { Method [ public method __construct ] { - Parameters [4] { @@ -891,7 +762,14 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $event_name ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] + } + } + + Method [ public method getCallback ] { + + - Parameters [1] { + Parameter #0 [ $event_name ] } } @@ -1001,7 +879,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $data ] Parameter #1 [ $worker_id ] - Parameter #2 [ $finish_callback ] + Parameter #2 [ callable or NULL $finish_callback ] } } @@ -1105,7 +983,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] Parameter #2 [ $param ] } } @@ -1114,7 +992,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] } } @@ -1128,7 +1006,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Method [ public method defer ] { - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ callable $callback ] } } @@ -1340,7 +1218,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $event_name ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] } } @@ -1494,7 +1372,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Method [ public method enableSSL ] { - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ callable $callback ] } } @@ -1539,7 +1417,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $event_name ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] } } @@ -1562,11 +1440,12 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Static methods [0] { } - - Properties [1] { + - Properties [2] { + Property [ public $fd ] Property [ public $errCode ] } - - Methods [14] { + - Methods [16] { Method [ public method __construct ] { - Parameters [3] { @@ -1623,6 +1502,22 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } + Method [ public method recvAll ] { + + - Parameters [2] { + Parameter #0 [ $length ] + Parameter #1 [ $timeout ] + } + } + + Method [ public method sendAll ] { + + - Parameters [2] { + Parameter #0 [ $data ] + Parameter #1 [ $timeout ] + } + } + Method [ public method recvfrom ] { - Parameters [2] { @@ -1745,8 +1640,9 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Static methods [0] { } - - Properties [5] { + - Properties [6] { Property [ public $errCode ] + Property [ public $errMsg ] Property [ public $sock ] Property [ public $type ] Property [ public $setting ] @@ -3398,7 +3294,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Method [ public method prepare ] { - Parameters [2] { - Parameter #0 [ $query ] + Parameter #0 [ $statement ] Parameter #1 [ $timeout ] } } @@ -3722,11 +3618,11 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Static properties [0] { } - - Static methods [24] { + - Static methods [25] { Method [ static public method create ] { - Parameters [2] { - Parameter #0 [ $func ] + Parameter #0 [ callable $func ] Parameter #1 [ ...$params ] } } @@ -3811,6 +3707,13 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } + Method [ static public method getContext ] { + + - Parameters [1] { + Parameter #0 [ $cid ] + } + } + Method [ static public method sleep ] { - Parameters [1] { @@ -3964,9 +3867,11 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } - Class [ class Swoole\ExitException extends Swoole\Exception implements Throwable ] { + Class [ class Swoole\Coroutine\Context extends ArrayObject implements Countable, Serializable, ArrayAccess, Traversable, IteratorAggregate ] { - - Constants [0] { + - Constants [2] { + Constant [ public integer STD_PROP_LIST ] { 1 } + Constant [ public integer ARRAY_AS_PROPS ] { 2 } } - Static properties [0] { @@ -3975,232 +3880,225 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Static methods [0] { } - - Properties [4] { - Property [ protected $message ] - Property [ protected $code ] - Property [ protected $file ] - Property [ protected $line ] + - Properties [0] { } - - Methods [12] { - Method [ public method getFlags ] { + - Methods [22] { + Method [ public method __construct ] { - - Parameters [0] { + - Parameters [3] { + Parameter #0 [ $input ] + Parameter #1 [ $flags ] + Parameter #2 [ $iterator_class ] } } - Method [ public method getStatus ] { + Method [ public method offsetExists ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $index ] } } - Method [ public method __construct ] { + Method [ public method offsetGet ] { - - Parameters [3] { - Parameter #0 [ $message ] - Parameter #1 [ $code ] - Parameter #2 [ $previous ] + - Parameters [1] { + Parameter #0 [ $index ] } } - Method [ public method __wakeup ] { - } + Method [ public method offsetSet ] { - Method [ final public method getMessage ] { + - Parameters [2] { + Parameter #0 [ $index ] + Parameter #1 [ $newval ] + } } - Method [ final public method getCode ] { - } + Method [ public method offsetUnset ] { - Method [ final public method getFile ] { + - Parameters [1] { + Parameter #0 [ $index ] + } } - Method [ final public method getLine ] { - } + Method [ public method append ] { - Method [ final public method getTrace ] { + - Parameters [1] { + Parameter #0 [ $value ] + } } - Method [ final public method getPrevious ] { - } + Method [ public method getArrayCopy ] { - Method [ final public method getTraceAsString ] { + - Parameters [0] { + } } - Method [ public method __toString ] { - } - } - } + Method [ public method count ] { - Class [ class Swoole\Http\Client ] { + - Parameters [0] { + } + } - - Constants [0] { - } + Method [ public method getFlags ] { - - Static properties [0] { - } + - Parameters [0] { + } + } - - Static methods [0] { - } + Method [ public method setFlags ] { - - Properties [20] { - Property [ public $type ] - Property [ public $errCode ] - Property [ public $errMsg ] - Property [ public $statusCode ] - Property [ public $host ] - Property [ public $port ] - Property [ public $ssl ] - Property [ public $requestMethod ] - Property [ public $requestHeaders ] - Property [ public $requestBody ] - Property [ public $uploadFiles ] - Property [ public $set_cookie_headers ] - Property [ public $downloadFile ] - Property [ public $headers ] - Property [ public $cookies ] - Property [ public $body ] - Property [ public $onConnect ] - Property [ public $onError ] - Property [ public $onMessage ] - Property [ public $onClose ] - } + - Parameters [1] { + Parameter #0 [ $flags ] + } + } - - Methods [17] { - Method [ public method __construct ] { + Method [ public method asort ] { - - Parameters [3] { - Parameter #0 [ $host ] - Parameter #1 [ $port ] - Parameter #2 [ $ssl ] + - Parameters [0] { } } - Method [ public method __destruct ] { + Method [ public method ksort ] { - Parameters [0] { } } - Method [ public method set ] { + Method [ public method uasort ] { - Parameters [1] { - Parameter #0 [ array $settings ] + Parameter #0 [ $cmp_function ] } } - Method [ public method setMethod ] { + Method [ public method uksort ] { - Parameters [1] { - Parameter #0 [ $method ] + Parameter #0 [ $cmp_function ] } } - Method [ public method setHeaders ] { + Method [ public method natsort ] { - - Parameters [1] { - Parameter #0 [ array $headers ] + - Parameters [0] { } } - Method [ public method setCookies ] { + Method [ public method natcasesort ] { - - Parameters [1] { - Parameter #0 [ array $cookies ] + - Parameters [0] { } } - Method [ public method setData ] { + Method [ public method unserialize ] { - Parameters [1] { - Parameter #0 [ $data ] + Parameter #0 [ $serialized ] } } - Method [ public method addFile ] { + Method [ public method serialize ] { - - Parameters [6] { - Parameter #0 [ $path ] - Parameter #1 [ $name ] - Parameter #2 [ $type ] - Parameter #3 [ $filename ] - Parameter #4 [ $offset ] - Parameter #5 [ $length ] + - Parameters [0] { } } - Method [ public method execute ] { + Method [ public method getIterator ] { - - Parameters [2] { - Parameter #0 [ $path ] - Parameter #1 [ $callback ] + - Parameters [0] { } } - Method [ public method push ] { + Method [ public method exchangeArray ] { - - Parameters [3] { - Parameter #0 [ $data ] - Parameter #1 [ $opcode ] - Parameter #2 [ $finish ] + - Parameters [1] { + Parameter #0 [ $array ] } } - Method [ public method get ] { + Method [ public method setIteratorClass ] { - - Parameters [2] { - Parameter #0 [ $path ] - Parameter #1 [ $callback ] + - Parameters [1] { + Parameter #0 [ $iteratorClass ] } } - Method [ public method post ] { + Method [ public method getIteratorClass ] { - - Parameters [3] { - Parameter #0 [ $path ] - Parameter #1 [ $data ] - Parameter #2 [ $callback ] + - Parameters [0] { } } + } + } - Method [ public method upgrade ] { + Class [ class Swoole\ExitException extends Swoole\Exception implements Throwable ] { - - Parameters [2] { - Parameter #0 [ $path ] - Parameter #1 [ $callback ] - } - } + - Constants [0] { + } - Method [ public method download ] { + - Static properties [0] { + } - - Parameters [4] { - Parameter #0 [ $path ] - Parameter #1 [ $file ] - Parameter #2 [ $callback ] - Parameter #3 [ $offset ] - } - } + - Static methods [0] { + } - Method [ public method isConnected ] { + - Properties [4] { + Property [ protected $message ] + Property [ protected $code ] + Property [ protected $file ] + Property [ protected $line ] + } + + - Methods [12] { + Method [ public method getFlags ] { - Parameters [0] { } } - Method [ public method close ] { + Method [ public method getStatus ] { - Parameters [0] { } } - Method [ public method on ] { + Method [ public method __construct ] { - - Parameters [2] { - Parameter #0 [ $event_name ] - Parameter #1 [ $callback ] + - Parameters [3] { + Parameter #0 [ $message ] + Parameter #1 [ $code ] + Parameter #2 [ $previous ] } } + + Method [ public method __wakeup ] { + } + + Method [ final public method getMessage ] { + } + + Method [ final public method getCode ] { + } + + Method [ final public method getFile ] { + } + + Method [ final public method getLine ] { + } + + Method [ final public method getTrace ] { + } + + Method [ final public method getPrevious ] { + } + + Method [ final public method getTraceAsString ] { + } + + Method [ public method __toString ] { + } } } @@ -4274,11 +4172,11 @@ Extension [ extension #152 swoole version 4.2.13 ] { Property [ public $id ] } - - Methods [16] { + - Methods [17] { Method [ public method __construct ] { - Parameters [3] { - Parameter #0 [ $callback ] + Parameter #0 [ callable $callback ] Parameter #1 [ $redirect_stdin_and_stdout ] Parameter #2 [ $pipe_type ] } @@ -4380,6 +4278,12 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } + Method [ public method exportSocket ] { + + - Parameters [0] { + } + } + Method [ public method name ] { - Parameters [1] { @@ -4423,7 +4327,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $event_name ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] } } @@ -4957,7 +4861,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Property [ public $setting ] } - - Methods [41] { + - Methods [42] { Method [ public method __construct ] { - Parameters [4] { @@ -4996,7 +4900,14 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $event_name ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] + } + } + + Method [ public method getCallback ] { + + - Parameters [1] { + Parameter #0 [ $event_name ] } } @@ -5106,7 +5017,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $data ] Parameter #1 [ $worker_id ] - Parameter #2 [ $finish_callback ] + Parameter #2 [ callable or NULL $finish_callback ] } } @@ -5210,7 +5121,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] Parameter #2 [ $param ] } } @@ -5219,7 +5130,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] } } @@ -5233,7 +5144,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Method [ public method defer ] { - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ callable $callback ] } } @@ -5300,7 +5211,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { } - Methods [3] { - Method [ public method rawcontent ] { + Method [ public method rawContent ] { - Parameters [0] { } @@ -5344,7 +5255,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Property [ public $trailer ] } - - Methods [13] { + - Methods [12] { Method [ public method initHeader ] { - Parameters [0] { @@ -5385,13 +5296,6 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } - Method [ public method gzip ] { - - - Parameters [1] { - Parameter #0 [ $compress_level ] - } - } - Method [ public method header ] { - Parameters [3] { @@ -5586,7 +5490,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Property [ public $setting ] } - - Methods [44] { + - Methods [45] { Method [ public method push ] { - Parameters [4] { @@ -5606,20 +5510,6 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } - Method [ public method exists ] { - - - Parameters [1] { - Parameter #0 [ $fd ] - } - } - - Method [ public method exist ] { - - - Parameters [1] { - Parameter #0 [ $fd ] - } - } - Method [ public method isEstablished ] { - Parameters [1] { @@ -5665,7 +5555,14 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $event_name ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] + } + } + + Method [ public method getCallback ] { + + - Parameters [1] { + Parameter #0 [ $event_name ] } } @@ -5709,6 +5606,20 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } + Method [ public method exists ] { + + - Parameters [1] { + Parameter #0 [ $fd ] + } + } + + Method [ public method exist ] { + + - Parameters [1] { + Parameter #0 [ $fd ] + } + } + Method [ public method protect ] { - Parameters [2] { @@ -5761,7 +5672,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $data ] Parameter #1 [ $worker_id ] - Parameter #2 [ $finish_callback ] + Parameter #2 [ callable or NULL $finish_callback ] } } @@ -5865,7 +5776,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] Parameter #2 [ $param ] } } @@ -5874,7 +5785,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] } } @@ -5888,7 +5799,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Method [ public method defer ] { - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ callable $callback ] } } @@ -6015,15 +5926,9 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } - Class [ class Swoole\MySQL ] { + Class [ class Swoole\Coroutine\Channel ] { - - Constants [6] { - Constant [ public integer STATE_QUERY ] { 0 } - Constant [ public integer STATE_READ_START ] { 1 } - Constant [ public integer STATE_READ_FIELD ] { 2 } - Constant [ public integer STATE_READ_ROW ] { 3 } - Constant [ public integer STATE_READ_END ] { 5 } - Constant [ public integer STATE_CLOSED ] { 6 } + - Constants [0] { } - Static properties [0] { @@ -6032,75 +5937,43 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Static methods [0] { } - - Properties [11] { - Property [ public $serverInfo ] - Property [ public $sock ] - Property [ public $connected ] - Property [ public $errno ] - Property [ public $connect_errno ] - Property [ public $error ] - Property [ public $connect_error ] - Property [ public $insert_id ] - Property [ public $affected_rows ] - Property [ public $onConnect ] - Property [ public $onClose ] + - Properties [2] { + Property [ public $capacity ] + Property [ public $errCode ] } - - Methods [11] { + - Methods [8] { Method [ public method __construct ] { - - Parameters [0] { - } - } - - Method [ public method __destruct ] { - - - Parameters [0] { - } - } - - Method [ public method connect ] { - - - Parameters [2] { - Parameter #0 [ array $server_config ] - Parameter #1 [ $callback ] - } - } - - Method [ public method begin ] { - - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ $size ] } } - Method [ public method commit ] { + Method [ public method push ] { - - Parameters [1] { - Parameter #0 [ $callback ] + - Parameters [2] { + Parameter #0 [ $data ] + Parameter #1 [ $timeout ] } } - Method [ public method rollback ] { + Method [ public method pop ] { - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ $timeout ] } } - Method [ public method escape ] { + Method [ public method isEmpty ] { - - Parameters [2] { - Parameter #0 [ $string ] - Parameter #1 [ $flags ] + - Parameters [0] { } } - Method [ public method query ] { + Method [ public method isFull ] { - - Parameters [2] { - Parameter #0 [ $sql ] - Parameter #1 [ $callback ] + - Parameters [0] { } } @@ -6110,23 +5983,21 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } - Method [ public method getState ] { + Method [ public method stats ] { - Parameters [0] { } } - Method [ public method on ] { + Method [ public method length ] { - - Parameters [2] { - Parameter #0 [ $event_name ] - Parameter #1 [ $callback ] + - Parameters [0] { } } } } - Class [ class Swoole\MySQL\Exception extends Swoole\Exception implements Throwable ] { + Class [ class Swoole\Coroutine\Http2\Client ] { - Constants [0] { } @@ -6137,349 +6008,15 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Static methods [0] { } - - Properties [4] { - Property [ protected $message ] - Property [ protected $code ] - Property [ protected $file ] - Property [ protected $line ] - } - - - Methods [10] { - Method [ public method __construct ] { - - - Parameters [3] { - Parameter #0 [ $message ] - Parameter #1 [ $code ] - Parameter #2 [ $previous ] - } - } - - Method [ public method __wakeup ] { - } - - Method [ final public method getMessage ] { - } - - Method [ final public method getCode ] { - } - - Method [ final public method getFile ] { - } - - Method [ final public method getLine ] { - } - - Method [ final public method getTrace ] { - } - - Method [ final public method getPrevious ] { - } - - Method [ final public method getTraceAsString ] { - } - - Method [ public method __toString ] { - } - } - } - - Class [ class Swoole\Mmap ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [1] { - Method [ static public method open ] { - - - Parameters [3] { - Parameter #0 [ $filename ] - Parameter #1 [ $size ] - Parameter #2 [ $offset ] - } - } - } - - - Properties [0] { - } - - - Methods [0] { - } - } - - Class [ class Swoole\Channel ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [6] { - Method [ public method __construct ] { - - - Parameters [1] { - Parameter #0 [ $size ] - } - } - - Method [ public method __destruct ] { - - - Parameters [0] { - } - } - - Method [ public method push ] { - - - Parameters [1] { - Parameter #0 [ $data ] - } - } - - Method [ public method pop ] { - - - Parameters [0] { - } - } - - Method [ public method peek ] { - - - Parameters [0] { - } - } - - Method [ public method stats ] { - - - Parameters [0] { - } - } - } - } - - Class [ class Swoole\Coroutine\Channel ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [2] { - Property [ public $capacity ] - Property [ public $errCode ] - } - - - Methods [8] { - Method [ public method __construct ] { - - - Parameters [1] { - Parameter #0 [ $size ] - } - } - - Method [ public method push ] { - - - Parameters [2] { - Parameter #0 [ $data ] - Parameter #1 [ $timeout ] - } - } - - Method [ public method pop ] { - - - Parameters [1] { - Parameter #0 [ $timeout ] - } - } - - Method [ public method isEmpty ] { - - - Parameters [0] { - } - } - - Method [ public method isFull ] { - - - Parameters [0] { - } - } - - Method [ public method close ] { - - - Parameters [0] { - } - } - - Method [ public method stats ] { - - - Parameters [0] { - } - } - - Method [ public method length ] { - - - Parameters [0] { - } - } - } - } - - Class [ class Swoole\RingQueue ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [7] { - Method [ public method __construct ] { - - - Parameters [1] { - Parameter #0 [ $len ] - } - } - - Method [ public method __destruct ] { - - - Parameters [0] { - } - } - - Method [ public method push ] { - - - Parameters [1] { - Parameter #0 [ $data ] - } - } - - Method [ public method pop ] { - - - Parameters [0] { - } - } - - Method [ public method count ] { - - - Parameters [0] { - } - } - - Method [ public method isFull ] { - - - Parameters [0] { - } - } - - Method [ public method isEmpty ] { - - - Parameters [0] { - } - } - } - } - - Class [ class Swoole\MsgQueue ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [7] { - Method [ public method __construct ] { - - - Parameters [1] { - Parameter #0 [ $len ] - } - } - - Method [ public method __destruct ] { - - - Parameters [0] { - } - } - - Method [ public method push ] { - - - Parameters [2] { - Parameter #0 [ $data ] - Parameter #1 [ $type ] - } - } - - Method [ public method pop ] { - - - Parameters [1] { - Parameter #0 [ $type ] - } - } - - Method [ public method setBlocking ] { - - - Parameters [1] { - Parameter #0 [ $blocking ] - } - } - - Method [ public method stats ] { - - - Parameters [0] { - } - } - - Method [ public method destroy ] { - - - Parameters [0] { - } - } - } - } - - Class [ class Swoole\Coroutine\Http2\Client ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [8] { - Property [ public $errCode ] - Property [ public $errMsg ] - Property [ public $sock ] - Property [ public $type ] - Property [ public $setting ] - Property [ public $connected ] - Property [ public $host ] - Property [ public $port ] + - Properties [8] { + Property [ public $errCode ] + Property [ public $errMsg ] + Property [ public $sock ] + Property [ public $type ] + Property [ public $setting ] + Property [ public $connected ] + Property [ public $host ] + Property [ public $port ] } - Methods [11] { @@ -6648,171 +6185,6 @@ Extension [ extension #152 swoole version 4.2.13 ] { } } - Class [ class Swoole\Memory\Pool ] { - - - Constants [5] { - Constant [ public integer TYPE_RING ] { 1 } - Constant [ public integer TYPE_GLOBAL ] { 2 } - Constant [ public integer TYPE_FIXED ] { 0 } - Constant [ public integer TYPE_MALLOC ] { 3 } - Constant [ public integer TYPE_EMALLOC ] { 4 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [3] { - Method [ public method __construct ] { - - - Parameters [4] { - Parameter #0 [ $size ] - Parameter #1 [ $type ] - Parameter #2 [ $slice_size ] - Parameter #3 [ $shared ] - } - } - - Method [ public method __destruct ] { - - - Parameters [0] { - } - } - - Method [ public method alloc ] { - - - Parameters [1] { - Parameter #0 [ $size ] - } - } - } - } - - Class [ class Swoole\Memory\Pool\Slice ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [3] { - Method [ public method read ] { - - - Parameters [2] { - Parameter #0 [ $size ] - Parameter #1 [ $offset ] - } - } - - Method [ public method write ] { - - - Parameters [2] { - Parameter #0 [ $data ] - Parameter #1 [ $offset ] - } - } - - Method [ public method __destruct ] { - - - Parameters [0] { - } - } - } - } - - Class [ class Swoole\Redis ] { - - - Constants [5] { - Constant [ public integer STATE_CONNECT ] { 0 } - Constant [ public integer STATE_READY ] { 1 } - Constant [ public integer STATE_WAIT_RESULT ] { 2 } - Constant [ public integer STATE_SUBSCRIBE ] { 3 } - Constant [ public integer STATE_CLOSED ] { 4 } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [9] { - Property [ public $onConnect ] - Property [ public $onClose ] - Property [ public $onMessage ] - Property [ public $setting ] - Property [ public $host ] - Property [ public $port ] - Property [ public $sock ] - Property [ public $errCode ] - Property [ public $errMsg ] - } - - - Methods [7] { - Method [ public method __construct ] { - - - Parameters [1] { - Parameter #0 [ array or NULL $setting ] - } - } - - Method [ public method __destruct ] { - - - Parameters [0] { - } - } - - Method [ public method on ] { - - - Parameters [2] { - Parameter #0 [ $event_name ] - Parameter #1 [ $callback ] - } - } - - Method [ public method connect ] { - - - Parameters [3] { - Parameter #0 [ $host ] - Parameter #1 [ $port ] - Parameter #2 [ $callback ] - } - } - - Method [ public method close ] { - - - Parameters [0] { - } - } - - Method [ public method getState ] { - - - Parameters [0] { - } - } - - Method [ public method __call ] { - - - Parameters [2] { - Parameter #0 [ $command ] - Parameter #1 [ $params ] - } - } - } - } - Class [ class Swoole\Redis\Server extends Swoole\Server ] { - Constants [7] { @@ -6853,7 +6225,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Property [ public $worker_pid ] } - - Methods [42] { + - Methods [44] { Method [ public method start ] { - Parameters [0] { @@ -6862,11 +6234,16 @@ Extension [ extension #152 swoole version 4.2.13 ] { Method [ public method setHandler ] { - - Parameters [4] { + - Parameters [2] { + Parameter #0 [ $command ] + Parameter #1 [ callable $callback ] + } + } + + Method [ public method getHandler ] { + + - Parameters [1] { Parameter #0 [ $command ] - Parameter #1 [ $callback ] - Parameter #2 [ $number_of_string_param ] - Parameter #3 [ $type_of_array_param ] } } @@ -6908,7 +6285,14 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $event_name ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] + } + } + + Method [ public method getCallback ] { + + - Parameters [1] { + Parameter #0 [ $event_name ] } } @@ -7012,7 +6396,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $data ] Parameter #1 [ $worker_id ] - Parameter #2 [ $finish_callback ] + Parameter #2 [ callable or NULL $finish_callback ] } } @@ -7116,7 +6500,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [3] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] Parameter #2 [ $param ] } } @@ -7125,7 +6509,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { - Parameters [2] { Parameter #0 [ $ms ] - Parameter #1 [ $callback ] + Parameter #1 [ callable $callback ] } } @@ -7139,7 +6523,7 @@ Extension [ extension #152 swoole version 4.2.13 ] { Method [ public method defer ] { - Parameters [1] { - Parameter #0 [ $callback ] + Parameter #0 [ callable $callback ] } } diff --git a/php-pecl-swoole4.spec b/php-pecl-swoole4.spec index c8a7fbd..9e60ea1 100644 --- a/php-pecl-swoole4.spec +++ b/php-pecl-swoole4.spec @@ -35,7 +35,7 @@ Summary: PHP's asynchronous concurrent distributed networking framework Name: %{?sub_prefix}php-pecl-%{pecl_name}4 -Version: 4.2.13 +Version: 4.3.0 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} # Extension is ASL 2.0 # Hiredis is BSD @@ -55,9 +55,6 @@ BuildRequires: %{?scl_prefix}php-sockets BuildRequires: %{?scl_prefix}php-mysqlnd BuildRequires: pcre-devel BuildRequires: openssl-devel -%if %{with_nghttpd2} -BuildRequires: libnghttp2-devel -%endif %if %{with_pgsql} %if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 BuildRequires: libpq-devel > 9.5 @@ -68,7 +65,6 @@ BuildRequires: postgresql-devel > 9.5 %if %{with_brotli} BuildRequires: brotli-devel %endif -BuildRequires: c-ares-devel Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} @@ -207,18 +203,16 @@ g++ --version peclbuild() { %configure \ - --with-swoole \ + --enable-swoole \ --enable-sockets \ +%if %{__isa_bits} == 64 --enable-trace-log \ +%endif --enable-openssl \ -%if %{with_nghttpd2} --enable-http2 \ -%endif %if %{with_pgsql} --enable-coroutine-postgresql \ %endif - --enable-cares \ - --enable-thread \ --enable-mysqlnd \ --with-libdir=%{_lib} \ --with-php-config=$1 @@ -343,6 +337,12 @@ cd ../ZTS %changelog +* Thu Mar 7 2019 Remi Collet - 4.3.0-1 +- update to 4.3.0 +- drop dependencies on libnghttp2 and c-ares +- open https://github.com/swoole/swoole-src/issues/2411 32-bit broken +- remove the --enable-trace-log build option on 32-bit + * Mon Feb 4 2019 Remi Collet - 4.2.13-1 - update to 4.2.13 -- cgit