diff options
author | Remi Collet <remi@remirepo.net> | 2019-06-20 15:35:54 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2019-06-20 15:35:54 +0200 |
commit | 22d845386efed534eba8fa540fc0256dd77b06db (patch) | |
tree | 8da5cd153c3b4cd096efceac325d91c741ae8b9b | |
parent | 171088918fababe2171d68d65ebdd518f9f68b40 (diff) |
- update to 5.0.0RC1
- rename to php-pecl-redis5
- raise dependency on PHP 7
- enable msgpack support
- enable json support
- update configuration for new options
- open https://github.com/phpredis/phpredis/pull/1578
fix extension dependencies and report about json serializer
-rw-r--r-- | PHPINFO | 7 | ||||
-rw-r--r-- | REFLECTION | 371 | ||||
-rw-r--r-- | php-pecl-redis5.spec | 90 |
3 files changed, 251 insertions, 217 deletions
@@ -2,8 +2,8 @@ redis Redis Support => enabled -Redis Version => 4.3.0 -Available serializers => php, igbinary +Redis Version => 5.0.0RC1 +Available serializers => php, igbinary, msgpack Available compression => lzf Directive => Local Value => Master Value @@ -22,12 +22,13 @@ redis.arrays.previous => no value => no value redis.arrays.readtimeout => 0 => 0 redis.arrays.retryinterval => 0 => 0 redis.arrays.consistent => 0 => 0 +redis.clusters.cache_slots => 0 => 0 redis.clusters.auth => no value => no value redis.clusters.persistent => 0 => 0 redis.clusters.read_timeout => 0 => 0 redis.clusters.seeds => no value => no value redis.clusters.timeout => 0 => 0 -redis.pconnect.pooling_enabled => 0 => 0 +redis.pconnect.pooling_enabled => 1 => 1 redis.pconnect.connection_limit => 0 => 0 redis.session.locking_enabled => 0 => 0 redis.session.lock_expire => 0 => 0 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #197 redis version 4.3.0 ] { +Extension [ <persistent> extension #198 redis version 5.0.0RC1 ] { - Dependencies { Dependency [ igbinary (Required) ] @@ -51,6 +51,9 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { Entry [ redis.arrays.consistent <ALL> ] Current = '0' } + Entry [ redis.clusters.cache_slots <ALL> ] + Current = '0' + } Entry [ redis.clusters.auth <ALL> ] Current = '' } @@ -67,7 +70,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { Current = '0' } Entry [ redis.pconnect.pooling_enabled <ALL> ] - Current = '0' + Current = '1' } Entry [ redis.pconnect.connection_limit <ALL> ] Current = '0' @@ -89,13 +92,14 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { - Classes [5] { Class [ <internal:redis> class Redis ] { - - Constants [24] { + - Constants [28] { Constant [ public integer REDIS_NOT_FOUND ] { 0 } Constant [ public integer REDIS_STRING ] { 1 } Constant [ public integer REDIS_SET ] { 2 } Constant [ public integer REDIS_LIST ] { 3 } Constant [ public integer REDIS_ZSET ] { 4 } Constant [ public integer REDIS_HASH ] { 5 } + Constant [ public integer REDIS_STREAM ] { 6 } Constant [ public integer PIPELINE ] { 2 } Constant [ public integer ATOMIC ] { 0 } Constant [ public integer MULTI ] { 1 } @@ -104,9 +108,12 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { Constant [ public integer OPT_READ_TIMEOUT ] { 3 } Constant [ public integer OPT_TCP_KEEPALIVE ] { 6 } Constant [ public integer OPT_COMPRESSION ] { 7 } + Constant [ public integer OPT_REPLY_LITERAL ] { 8 } Constant [ public integer SERIALIZER_NONE ] { 0 } Constant [ public integer SERIALIZER_PHP ] { 1 } Constant [ public integer SERIALIZER_IGBINARY ] { 2 } + Constant [ public integer SERIALIZER_MSGPACK ] { 3 } + Constant [ public integer SERIALIZER_JSON ] { 4 } Constant [ public integer COMPRESSION_NONE ] { 0 } Constant [ public integer COMPRESSION_LZF ] { 1 } Constant [ public integer OPT_SCAN ] { 4 } @@ -332,7 +339,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method delete ] { + Method [ <internal:redis> public method del ] { - Parameters [2] { Parameter #0 [ <required> $key ] @@ -392,6 +399,14 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } + Method [ <internal:redis> public method expire ] { + + - Parameters [2] { + Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $timeout ] + } + } + Method [ <internal:redis> public method expireAt ] { - Parameters [2] { @@ -532,13 +547,6 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method getKeys ] { - - - Parameters [1] { - Parameter #0 [ <required> $pattern ] - } - } - Method [ <internal:redis> public method getLastError ] { - Parameters [0] { @@ -551,13 +559,6 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method getMultiple ] { - - - Parameters [1] { - Parameter #0 [ <required> array $keys ] - } - } - Method [ <internal:redis> public method getOption ] { - Parameters [1] { @@ -765,20 +766,10 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method lGet ] { - - - Parameters [2] { - Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $index ] - } - } - - Method [ <internal:redis> public method lGetRange ] { + Method [ <internal:redis> public method keys ] { - - Parameters [3] { - Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $start ] - Parameter #2 [ <required> $end ] + - Parameters [1] { + Parameter #0 [ <required> $pattern ] } } @@ -792,6 +783,13 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } + Method [ <internal:redis> public method lLen ] { + + - Parameters [1] { + Parameter #0 [ <required> $key ] + } + } + Method [ <internal:redis> public method lPop ] { - Parameters [1] { @@ -815,38 +813,48 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method lRemove ] { + Method [ <internal:redis> public method lSet ] { - Parameters [3] { Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $value ] - Parameter #2 [ <required> $count ] + Parameter #1 [ <required> $index ] + Parameter #2 [ <required> $value ] } } - Method [ <internal:redis> public method lSet ] { + Method [ <internal:redis> public method lastSave ] { - - Parameters [3] { + - Parameters [0] { + } + } + + Method [ <internal:redis> public method lindex ] { + + - Parameters [2] { Parameter #0 [ <required> $key ] Parameter #1 [ <required> $index ] - Parameter #2 [ <required> $value ] } } - Method [ <internal:redis> public method lSize ] { + Method [ <internal:redis> public method lrange ] { - - Parameters [1] { + - Parameters [3] { Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $start ] + Parameter #2 [ <required> $end ] } } - Method [ <internal:redis> public method lastSave ] { + Method [ <internal:redis> public method lrem ] { - - Parameters [0] { + - Parameters [3] { + Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $value ] + Parameter #2 [ <required> $count ] } } - Method [ <internal:redis> public method listTrim ] { + Method [ <internal:redis> public method ltrim ] { - Parameters [3] { Parameter #0 [ <required> $key ] @@ -855,6 +863,13 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } + Method [ <internal:redis> public method mget ] { + + - Parameters [1] { + Parameter #0 [ <required> array $keys ] + } + } + Method [ <internal:redis> public method migrate ] { - Parameters [7] { @@ -1057,7 +1072,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method renameKey ] { + Method [ <internal:redis> public method rename ] { - Parameters [2] { Parameter #0 [ <required> $key ] @@ -1112,14 +1127,6 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method sContains ] { - - - Parameters [2] { - Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $value ] - } - } - Method [ <internal:redis> public method sDiff ] { - Parameters [2] { @@ -1185,22 +1192,6 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method sRemove ] { - - - Parameters [3] { - Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $member ] - Parameter #2 [ <optional> ...$other_members ] - } - } - - Method [ <internal:redis> public method sSize ] { - - - Parameters [1] { - Parameter #0 [ <required> $key ] - } - } - Method [ <internal:redis> public method sUnion ] { - Parameters [2] { @@ -1233,6 +1224,13 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } + Method [ <internal:redis> public method scard ] { + + - Parameters [1] { + Parameter #0 [ <required> $key ] + } + } + Method [ <internal:redis> public method script ] { - Parameters [2] { @@ -1283,14 +1281,6 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method setTimeout ] { - - - Parameters [2] { - Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $timeout ] - } - } - Method [ <internal:redis> public method setex ] { - Parameters [3] { @@ -1308,6 +1298,14 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } + Method [ <internal:redis> public method sismember ] { + + - Parameters [2] { + Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $value ] + } + } + Method [ <internal:redis> public method slaveof ] { - Parameters [2] { @@ -1332,7 +1330,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method sortAsc ] { + Method [ <internal, deprecated:redis> public method sortAsc ] { - Parameters [6] { Parameter #0 [ <required> $key ] @@ -1344,7 +1342,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method sortAscAlpha ] { + Method [ <internal, deprecated:redis> public method sortAscAlpha ] { - Parameters [6] { Parameter #0 [ <required> $key ] @@ -1356,7 +1354,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method sortDesc ] { + Method [ <internal, deprecated:redis> public method sortDesc ] { - Parameters [6] { Parameter #0 [ <required> $key ] @@ -1368,7 +1366,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method sortDescAlpha ] { + Method [ <internal, deprecated:redis> public method sortDescAlpha ] { - Parameters [6] { Parameter #0 [ <required> $key ] @@ -1380,6 +1378,15 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } + Method [ <internal:redis> public method srem ] { + + - Parameters [3] { + Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $member ] + Parameter #2 [ <optional> ...$other_members ] + } + } + Method [ <internal:redis> public method sscan ] { - Parameters [4] { @@ -1624,25 +1631,16 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zDelete ] { - - - Parameters [3] { - Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $member ] - Parameter #2 [ <optional> ...$other_members ] - } - } - - Method [ <internal:redis> public method zDeleteRangeByRank ] { + Method [ <internal:redis> public method zIncrBy ] { - Parameters [3] { Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $start ] - Parameter #2 [ <required> $end ] + Parameter #1 [ <required> $value ] + Parameter #2 [ <required> $member ] } } - Method [ <internal:redis> public method zDeleteRangeByScore ] { + Method [ <internal:redis> public method zLexCount ] { - Parameters [3] { Parameter #0 [ <required> $key ] @@ -1651,31 +1649,17 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zIncrBy ] { - - - Parameters [3] { - Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $value ] - Parameter #2 [ <required> $member ] - } - } - - Method [ <internal:redis> public method zInter ] { + Method [ <internal:redis> public method zPopMax ] { - - Parameters [4] { + - Parameters [1] { Parameter #0 [ <required> $key ] - Parameter #1 [ <required> array $keys ] - Parameter #2 [ <optional> array or NULL $weights ] - Parameter #3 [ <optional> $aggregate ] } } - Method [ <internal:redis> public method zLexCount ] { + Method [ <internal:redis> public method zPopMin ] { - - Parameters [3] { + - Parameters [1] { Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $min ] - Parameter #2 [ <required> $max ] } } @@ -1718,6 +1702,15 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } + Method [ <internal:redis> public method zRem ] { + + - Parameters [3] { + Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $member ] + Parameter #2 [ <optional> ...$other_members ] + } + } + Method [ <internal:redis> public method zRemRangeByLex ] { - Parameters [3] { @@ -1727,6 +1720,24 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } + Method [ <internal:redis> public method zRemRangeByRank ] { + + - Parameters [3] { + Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $start ] + Parameter #2 [ <required> $end ] + } + } + + Method [ <internal:redis> public method zRemRangeByScore ] { + + - Parameters [3] { + Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $min ] + Parameter #2 [ <required> $max ] + } + } + Method [ <internal:redis> public method zRevRange ] { - Parameters [4] { @@ -1774,7 +1785,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zUnion ] { + Method [ <internal:redis> public method zinterstore ] { - Parameters [4] { Parameter #0 [ <required> $key ] @@ -1794,21 +1805,17 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zPopMax ] { - - - Parameters [1] { - Parameter #0 [ <required> $key ] - } - } - - Method [ <internal:redis> public method zPopMin ] { + Method [ <internal:redis> public method zunionstore ] { - - Parameters [1] { + - Parameters [4] { Parameter #0 [ <required> $key ] + Parameter #1 [ <required> array $keys ] + Parameter #2 [ <optional> array or NULL $weights ] + Parameter #3 [ <optional> $aggregate ] } } - Method [ <internal:redis> public method del ] { + Method [ <internal, deprecated:redis> public method delete ] { - Parameters [2] { Parameter #0 [ <required> $key ] @@ -1816,7 +1823,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method evaluate ] { + Method [ <internal, deprecated:redis> public method evaluate ] { - Parameters [3] { Parameter #0 [ <required> $script ] @@ -1825,7 +1832,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method evaluateSha ] { + Method [ <internal, deprecated:redis> public method evaluateSha ] { - Parameters [3] { Parameter #0 [ <required> $script_sha ] @@ -1834,29 +1841,21 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method expire ] { - - - Parameters [2] { - Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $timeout ] - } - } - - Method [ <internal:redis> public method keys ] { + Method [ <internal, deprecated:redis> public method getKeys ] { - Parameters [1] { Parameter #0 [ <required> $pattern ] } } - Method [ <internal:redis> public method lLen ] { + Method [ <internal, deprecated:redis> public method getMultiple ] { - Parameters [1] { - Parameter #0 [ <required> $key ] + Parameter #0 [ <required> array $keys ] } } - Method [ <internal:redis> public method lindex ] { + Method [ <internal, deprecated:redis> public method lGet ] { - Parameters [2] { Parameter #0 [ <required> $key ] @@ -1864,7 +1863,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method lrange ] { + Method [ <internal, deprecated:redis> public method lGetRange ] { - Parameters [3] { Parameter #0 [ <required> $key ] @@ -1873,7 +1872,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method lrem ] { + Method [ <internal, deprecated:redis> public method lRemove ] { - Parameters [3] { Parameter #0 [ <required> $key ] @@ -1882,23 +1881,23 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method ltrim ] { + Method [ <internal, deprecated:redis> public method lSize ] { - - Parameters [3] { + - Parameters [1] { Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $start ] - Parameter #2 [ <required> $stop ] } } - Method [ <internal:redis> public method mget ] { + Method [ <internal, deprecated:redis> public method listTrim ] { - - Parameters [1] { - Parameter #0 [ <required> array $keys ] + - Parameters [3] { + Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $start ] + Parameter #2 [ <required> $stop ] } } - Method [ <internal:redis> public method open ] { + Method [ <internal, deprecated:redis> public method open ] { - Parameters [4] { Parameter #0 [ <required> $host ] @@ -1908,7 +1907,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method popen ] { + Method [ <internal, deprecated:redis> public method popen ] { - Parameters [3] { Parameter #0 [ <required> $host ] @@ -1917,7 +1916,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method rename ] { + Method [ <internal, deprecated:redis> public method renameKey ] { - Parameters [2] { Parameter #0 [ <required> $key ] @@ -1925,45 +1924,53 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method sGetMembers ] { + Method [ <internal, deprecated:redis> public method sContains ] { - - Parameters [1] { + - Parameters [2] { Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $value ] } } - Method [ <internal:redis> public method scard ] { + Method [ <internal, deprecated:redis> public method sGetMembers ] { - Parameters [1] { Parameter #0 [ <required> $key ] } } - Method [ <internal:redis> public method sendEcho ] { + Method [ <internal, deprecated:redis> public method sRemove ] { - - Parameters [1] { - Parameter #0 [ <required> $msg ] + - Parameters [3] { + Parameter #0 [ <required> $key ] + Parameter #1 [ <required> $member ] + Parameter #2 [ <optional> ...$other_members ] } } - Method [ <internal:redis> public method sismember ] { + Method [ <internal, deprecated:redis> public method sSize ] { - - Parameters [2] { + - Parameters [1] { Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $value ] } } - Method [ <internal:redis> public method srem ] { + Method [ <internal, deprecated:redis> public method sendEcho ] { - - Parameters [3] { + - Parameters [1] { + Parameter #0 [ <required> $msg ] + } + } + + Method [ <internal, deprecated:redis> public method setTimeout ] { + + - Parameters [2] { Parameter #0 [ <required> $key ] - Parameter #1 [ <required> $member ] - Parameter #2 [ <optional> ...$other_members ] + Parameter #1 [ <required> $timeout ] } } - Method [ <internal:redis> public method substr ] { + Method [ <internal, deprecated:redis> public method substr ] { - Parameters [3] { Parameter #0 [ <required> $key ] @@ -1972,7 +1979,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zRem ] { + Method [ <internal, deprecated:redis> public method zDelete ] { - Parameters [3] { Parameter #0 [ <required> $key ] @@ -1981,7 +1988,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zRemRangeByRank ] { + Method [ <internal, deprecated:redis> public method zDeleteRangeByRank ] { - Parameters [3] { Parameter #0 [ <required> $key ] @@ -1990,7 +1997,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zRemRangeByScore ] { + Method [ <internal, deprecated:redis> public method zDeleteRangeByScore ] { - Parameters [3] { Parameter #0 [ <required> $key ] @@ -1999,7 +2006,17 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zRemove ] { + Method [ <internal, deprecated:redis> public method zInter ] { + + - Parameters [4] { + Parameter #0 [ <required> $key ] + Parameter #1 [ <required> array $keys ] + Parameter #2 [ <optional> array or NULL $weights ] + Parameter #3 [ <optional> $aggregate ] + } + } + + Method [ <internal, deprecated:redis> public method zRemove ] { - Parameters [3] { Parameter #0 [ <required> $key ] @@ -2008,7 +2025,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zRemoveRangeByScore ] { + Method [ <internal, deprecated:redis> public method zRemoveRangeByScore ] { - Parameters [3] { Parameter #0 [ <required> $key ] @@ -2017,7 +2034,7 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zReverseRange ] { + Method [ <internal, deprecated:redis> public method zReverseRange ] { - Parameters [4] { Parameter #0 [ <required> $key ] @@ -2027,24 +2044,14 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { } } - Method [ <internal:redis> public method zSize ] { + Method [ <internal, deprecated:redis> public method zSize ] { - Parameters [1] { Parameter #0 [ <required> $key ] } } - Method [ <internal:redis> public method zinterstore ] { - - - Parameters [4] { - Parameter #0 [ <required> $key ] - Parameter #1 [ <required> array $keys ] - Parameter #2 [ <optional> array or NULL $weights ] - Parameter #3 [ <optional> $aggregate ] - } - } - - Method [ <internal:redis> public method zunionstore ] { + Method [ <internal, deprecated:redis> public method zUnion ] { - Parameters [4] { Parameter #0 [ <required> $key ] @@ -2270,13 +2277,14 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { Class [ <internal:redis> class RedisCluster ] { - - Constants [28] { + - Constants [32] { Constant [ public integer REDIS_NOT_FOUND ] { 0 } Constant [ public integer REDIS_STRING ] { 1 } Constant [ public integer REDIS_SET ] { 2 } Constant [ public integer REDIS_LIST ] { 3 } Constant [ public integer REDIS_ZSET ] { 4 } Constant [ public integer REDIS_HASH ] { 5 } + Constant [ public integer REDIS_STREAM ] { 6 } Constant [ public integer ATOMIC ] { 0 } Constant [ public integer MULTI ] { 1 } Constant [ public integer OPT_SERIALIZER ] { 1 } @@ -2284,9 +2292,12 @@ Extension [ <persistent> extension #197 redis version 4.3.0 ] { Constant [ public integer OPT_READ_TIMEOUT ] { 3 } Constant [ public integer OPT_TCP_KEEPALIVE ] { 6 } Constant [ public integer OPT_COMPRESSION ] { 7 } + Constant [ public integer OPT_REPLY_LITERAL ] { 8 } Constant [ public integer SERIALIZER_NONE ] { 0 } Constant [ public integer SERIALIZER_PHP ] { 1 } Constant [ public integer SERIALIZER_IGBINARY ] { 2 } + Constant [ public integer SERIALIZER_MSGPACK ] { 3 } + Constant [ public integer SERIALIZER_JSON ] { 4 } Constant [ public integer COMPRESSION_NONE ] { 0 } Constant [ public integer COMPRESSION_LZF ] { 1 } Constant [ public integer OPT_SCAN ] { 4 } diff --git a/php-pecl-redis5.spec b/php-pecl-redis5.spec index b6308fa..32271e2 100644 --- a/php-pecl-redis5.spec +++ b/php-pecl-redis5.spec @@ -1,4 +1,4 @@ -# remirepo spec file for php-pecl-redis4 +# remirepo spec file for php-pecl-redis5 # # Copyright (c) 2012-2019 Remi Collet # License: CC-BY-SA @@ -21,30 +21,30 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global with_tests 0%{!?_without_tests:1} %global with_igbin 1 -%if "%{php_version}" < "5.6" -# after igbinary -%global ini_name %{pecl_name}.ini -%else -# after 40-igbinary +# after 20-json, 40-igbinary and 40-msgpack %global ini_name 50-%{pecl_name}.ini -%endif -%global upstream_version 4.3.0 -#global upstream_prever RC2 + +%global upstream_version 5.0.0 +%global upstream_prever RC1 Summary: Extension for communicating with the Redis key-value store -Name: %{?sub_prefix}php-pecl-redis4 +Name: %{?sub_prefix}php-pecl-redis5 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz License: PHP URL: http://pecl.php.net/package/redis BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear +BuildRequires: %{?scl_prefix}php-json %if %{with_igbin} BuildRequires: %{?sub_prefix}php-pecl-igbinary-devel %endif +%ifnarch ppc64 +BuildRequires: %{?sub_prefix}php-pecl-msgpack-devel >= 2.0.3 +%endif BuildRequires: liblzf-devel # to run Test suite %if %{with_tests} @@ -53,9 +53,13 @@ BuildRequires: redis >= 3 Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} +Requires: %{?sub_prefix}php-json%{?_isa} %if %{with_igbin} Requires: %{?sub_prefix}php-pecl(igbinary)%{?_isa} %endif +%ifnarch ppc64 +Requires: %{?sub_prefix}php-pecl-msgpack%{?_isa} +%endif %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Obsoletes: %{?scl_prefix}php-%{pecl_name} < 3 @@ -64,32 +68,34 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 || "%{php_version}" > "7.3" -Obsoletes: %{?scl_prefix}php-pecl-%{pecl_name} < 4 +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 || "%{php_version}" > "7.4" +Obsoletes: %{?scl_prefix}php-pecl-%{pecl_name} < 5 +Obsoletes: %{?scl_prefix}php-pecl-%{pecl_name}4 < 5 Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} %else # A single version can be installed -Conflicts: %{?scl_prefix}php-pecl-%{pecl_name} < 4 +Conflicts: %{?scl_prefix}php-pecl-%{pecl_name} < 5 +Conflicts: %{?scl_prefix}php-pecl-%{pecl_name}4 < 5 %endif %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff %if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name}4 <= %{version} -Obsoletes: php71w-pecl-%{pecl_name}4 <= %{version} +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name}4 <= %{version} -Obsoletes: php72w-pecl-%{pecl_name}4 <= %{version} +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name}4 <= %{version} +Obsoletes: php73-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name}4 <= %{version} +Obsoletes: php74-pecl-%{pecl_name} <= %{version} +Obsoletes: php74w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -171,12 +177,13 @@ extension = %{pecl_name}.so ;redis.arrays.readtimeout = 0 ;redis.arrays.retryinterval = 0 ;redis.arrays.consistent = 0 +;redis.clusters.cache_slots = 0 ;redis.clusters.auth = 0 ;redis.clusters.persistent = 0 ;redis.clusters.read_timeout = 0 ;redis.clusters.seeds = '' ;redis.clusters.timeout = 0 -;redis.pconnect.pooling_enabled = 0 +;redis.pconnect.pooling_enabled = 1 ;redis.pconnect.connection_limit = 0 ;redis.session.locking_enabled = 0 ;redis.session.lock_expire = 0 @@ -196,6 +203,9 @@ cd NTS %if %{with_igbin} --enable-redis-igbinary \ %endif +%ifnarch ppc64 + --enable-redis-msgpack \ +%endif --enable-redis-lzf \ --with-liblzf \ --with-php-config=%{_bindir}/php-config @@ -210,6 +220,9 @@ cd ../ZTS %if %{with_igbin} --enable-redis-igbinary \ %endif +%ifnarch ppc64 + --enable-redis-msgpack \ +%endif --enable-redis-lzf \ --with-liblzf \ --with-php-config=%{_bindir}/zts-php-config @@ -242,18 +255,20 @@ done %check # simple module load test -%{__php} --no-php-ini \ +DEPS="--no-php-ini --define extension=json.so" %if %{with_igbin} - --define extension=igbinary.so \ + DEPS="$DEPS --define extension=igbinary.so" +%endif +%ifnarch ppc64 + DEPS="$DEPS --define extension=msgpack.so" %endif + +%{__php} $DEPS \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} %if %{with_zts} -%{__ztsphp} --no-php-ini \ -%if %{with_igbin} - --define extension=igbinary.so \ -%endif +%{__ztsphp} $DEPS \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} %endif @@ -282,10 +297,7 @@ sed -e "s/6379/$port/" -i *.php ret=0 export TEST_PHP_EXECUTABLE=%{__php} -export TEST_PHP_ARGS="--no-php-ini \ -%if %{with_igbin} - --define extension=igbinary.so \ -%endif +export TEST_PHP_ARGS="$DEPS \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" $TEST_PHP_EXECUTABLE $TEST_PHP_ARGS TestRedis.php || ret=1 @@ -336,6 +348,16 @@ fi %changelog +* Thu Jun 20 2019 Remi Collet <remi@remirepo.net> - 5.0.0~RC1-1 +- update to 5.0.0RC1 +- rename to php-pecl-redis5 +- raise dependency on PHP 7 +- enable msgpack support +- enable json support +- update configuration for new options +- open https://github.com/phpredis/phpredis/pull/1578 + fix extension dependencies and report about json serializer + * Wed May 29 2019 Remi Collet <remi@remirepo.net> - 4.3.0-3 - rebuild |