From c64825bf0b9b939adbad22f45570fdcec5337d1d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Jun 2016 08:13:59 +0200 Subject: php-pecl-redis: 2.2.8 (php 5) --- REFLECTION | 675 ++++++++++++++++++++++++++++++++++++++++++++++++++-- php-pecl-redis.spec | 33 +-- 2 files changed, 670 insertions(+), 38 deletions(-) diff --git a/REFLECTION b/REFLECTION index 09661f8..ee05efa 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #178 redis version 2.2.7 ] { +Extension [ extension #206 redis version 2.2.8 ] { - INI { Entry [ redis.arrays.names ] @@ -19,9 +19,18 @@ Extension [ extension #178 redis version 2.2.7 ] { Entry [ redis.arrays.autorehash ] Current = '' } + Entry [ redis.clusters.seeds ] + Current = '' + } + Entry [ redis.clusters.timeout ] + Current = '' + } + Entry [ redis.clusters.read_timeout ] + Current = '' + } } - - Classes [3] { + - Classes [5] { Class [ class Redis ] { - Constants [20] { @@ -31,9 +40,9 @@ Extension [ extension #178 redis version 2.2.7 ] { Constant [ integer REDIS_LIST ] { 3 } Constant [ integer REDIS_ZSET ] { 4 } Constant [ integer REDIS_HASH ] { 5 } + Constant [ integer PIPELINE ] { 2 } Constant [ integer ATOMIC ] { 0 } Constant [ integer MULTI ] { 1 } - Constant [ integer PIPELINE ] { 2 } Constant [ integer OPT_SERIALIZER ] { 1 } Constant [ integer OPT_PREFIX ] { 2 } Constant [ integer OPT_READ_TIMEOUT ] { 3 } @@ -56,7 +65,7 @@ Extension [ extension #178 redis version 2.2.7 ] { - Properties [0] { } - - Methods [201] { + - Methods [206] { Method [ public method __construct ] { } @@ -216,6 +225,9 @@ Extension [ extension #178 redis version 2.2.7 ] { Method [ public method sAdd ] { } + Method [ public method sAddArray ] { + } + Method [ public method sSize ] { } @@ -291,9 +303,6 @@ Extension [ extension #178 redis version 2.2.7 ] { Method [ public method info ] { } - Method [ public method resetStat ] { - } - Method [ public method select ] { } @@ -339,7 +348,7 @@ Extension [ extension #178 redis version 2.2.7 ] { Method [ public method zRange ] { } - Method [ public method zReverseRange ] { + Method [ public method zRevRange ] { } Method [ public method zRangeByScore ] { @@ -351,6 +360,15 @@ Extension [ extension #178 redis version 2.2.7 ] { Method [ public method zRangeByLex ] { } + Method [ public method zRevRangeByLex ] { + } + + Method [ public method zLexCount ] { + } + + Method [ public method zRemRangeByLex ] { + } + Method [ public method zCount ] { } @@ -465,6 +483,9 @@ Extension [ extension #178 redis version 2.2.7 ] { Method [ public method time ] { } + Method [ public method role ] { + } + Method [ public method eval ] { } @@ -504,6 +525,9 @@ Extension [ extension #178 redis version 2.2.7 ] { Method [ public method client ] { } + Method [ public method command ] { + } + Method [ public method scan ] { - Parameters [3] { @@ -564,7 +588,7 @@ Extension [ extension #178 redis version 2.2.7 ] { Method [ public method slowlog ] { } - Method [ public method rawCommand ] { + Method [ public method rawcommand ] { } Method [ public method getHost ] { @@ -675,7 +699,7 @@ Extension [ extension #178 redis version 2.2.7 ] { Method [ public method sismember ] { } - Method [ public method zrevrange ] { + Method [ public method zReverseRange ] { } Method [ public method sendEcho ] { @@ -792,9 +816,33 @@ Extension [ extension #178 redis version 2.2.7 ] { } } - Class [ class RedisException extends RuntimeException ] { + Class [ class RedisCluster ] { - - Constants [0] { + - Constants [24] { + Constant [ integer REDIS_NOT_FOUND ] { 0 } + Constant [ integer REDIS_STRING ] { 1 } + Constant [ integer REDIS_SET ] { 2 } + Constant [ integer REDIS_LIST ] { 3 } + Constant [ integer REDIS_ZSET ] { 4 } + Constant [ integer REDIS_HASH ] { 5 } + Constant [ integer ATOMIC ] { 0 } + Constant [ integer MULTI ] { 1 } + Constant [ integer OPT_SERIALIZER ] { 1 } + Constant [ integer OPT_PREFIX ] { 2 } + Constant [ integer OPT_READ_TIMEOUT ] { 3 } + Constant [ integer SERIALIZER_NONE ] { 0 } + Constant [ integer SERIALIZER_PHP ] { 1 } + Constant [ integer OPT_SCAN ] { 4 } + Constant [ integer SCAN_RETRY ] { 1 } + Constant [ integer SCAN_NORETRY ] { 0 } + Constant [ integer OPT_SLAVE_FAILOVER ] { 5 } + Constant [ integer FAILOVER_NONE ] { 0 } + Constant [ integer FAILOVER_ERROR ] { 1 } + Constant [ integer FAILOVER_DISTRIBUTE ] { 2 } + Constant [ integer FAILOVER_DISTRIBUTE_SLAVES ] { 3 } + Constant [ integer SERIALIZER_IGBINARY ] { 2 } + Constant [ string AFTER ] { after } + Constant [ string BEFORE ] { before } } - Static properties [0] { @@ -803,21 +851,600 @@ Extension [ extension #178 redis version 2.2.7 ] { - Static methods [0] { } - - Properties [4] { - Property [ protected $message ] - Property [ protected $code ] - Property [ protected $file ] - Property [ protected $line ] + - Properties [0] { } - - Methods [9] { - Method [ public method __construct ] { + - Methods [158] { + Method [ public method __construct ] { + } - - Parameters [3] { - Parameter #0 [ $message ] - Parameter #1 [ $code ] - Parameter #2 [ $previous ] - } + Method [ public method close ] { + } + + Method [ public method get ] { + } + + Method [ public method set ] { + } + + Method [ public method mget ] { + } + + Method [ public method mset ] { + } + + Method [ public method msetnx ] { + } + + Method [ public method del ] { + } + + Method [ public method setex ] { + } + + Method [ public method psetex ] { + } + + Method [ public method setnx ] { + } + + Method [ public method getset ] { + } + + Method [ public method exists ] { + } + + Method [ public method keys ] { + } + + Method [ public method type ] { + } + + Method [ public method lpop ] { + } + + Method [ public method rpop ] { + } + + Method [ public method lset ] { + } + + Method [ public method spop ] { + } + + Method [ public method lpush ] { + } + + Method [ public method rpush ] { + } + + Method [ public method blpop ] { + } + + Method [ public method brpop ] { + } + + Method [ public method rpushx ] { + } + + Method [ public method lpushx ] { + } + + Method [ public method linsert ] { + } + + Method [ public method lindex ] { + } + + Method [ public method lrem ] { + } + + Method [ public method brpoplpush ] { + } + + Method [ public method rpoplpush ] { + } + + Method [ public method llen ] { + } + + Method [ public method scard ] { + } + + Method [ public method smembers ] { + } + + Method [ public method sismember ] { + } + + Method [ public method sadd ] { + } + + Method [ public method saddarray ] { + } + + Method [ public method srem ] { + } + + Method [ public method sunion ] { + } + + Method [ public method sunionstore ] { + } + + Method [ public method sinter ] { + } + + Method [ public method sinterstore ] { + } + + Method [ public method sdiff ] { + } + + Method [ public method sdiffstore ] { + } + + Method [ public method srandmember ] { + } + + Method [ public method strlen ] { + } + + Method [ public method persist ] { + } + + Method [ public method ttl ] { + } + + Method [ public method pttl ] { + } + + Method [ public method zcard ] { + } + + Method [ public method zcount ] { + } + + Method [ public method zremrangebyscore ] { + } + + Method [ public method zscore ] { + } + + Method [ public method zadd ] { + } + + Method [ public method zincrby ] { + } + + Method [ public method hlen ] { + } + + Method [ public method hkeys ] { + } + + Method [ public method hvals ] { + } + + Method [ public method hget ] { + } + + Method [ public method hgetall ] { + } + + Method [ public method hexists ] { + } + + Method [ public method hincrby ] { + } + + Method [ public method hset ] { + } + + Method [ public method hsetnx ] { + } + + Method [ public method hmget ] { + } + + Method [ public method hmset ] { + } + + Method [ public method hdel ] { + } + + Method [ public method hincrbyfloat ] { + } + + Method [ public method dump ] { + } + + Method [ public method zrank ] { + } + + Method [ public method zrevrank ] { + } + + Method [ public method incr ] { + } + + Method [ public method decr ] { + } + + Method [ public method incrby ] { + } + + Method [ public method decrby ] { + } + + Method [ public method incrbyfloat ] { + } + + Method [ public method expire ] { + } + + Method [ public method pexpire ] { + } + + Method [ public method expireat ] { + } + + Method [ public method pexpireat ] { + } + + Method [ public method append ] { + } + + Method [ public method getbit ] { + } + + Method [ public method setbit ] { + } + + Method [ public method bitop ] { + } + + Method [ public method bitpos ] { + } + + Method [ public method bitcount ] { + } + + Method [ public method lget ] { + } + + Method [ public method getrange ] { + } + + Method [ public method ltrim ] { + } + + Method [ public method lrange ] { + } + + Method [ public method zremrangebyrank ] { + } + + Method [ public method publish ] { + } + + Method [ public method rename ] { + } + + Method [ public method renamenx ] { + } + + Method [ public method pfcount ] { + } + + Method [ public method pfadd ] { + } + + Method [ public method pfmerge ] { + } + + Method [ public method setrange ] { + } + + Method [ public method restore ] { + } + + Method [ public method smove ] { + } + + Method [ public method zrange ] { + } + + Method [ public method zrevrange ] { + } + + Method [ public method zrangebyscore ] { + } + + Method [ public method zrevrangebyscore ] { + } + + Method [ public method zrangebylex ] { + } + + Method [ public method zrevrangebylex ] { + } + + Method [ public method zlexcount ] { + } + + Method [ public method zremrangebylex ] { + } + + Method [ public method zunionstore ] { + } + + Method [ public method zinterstore ] { + } + + Method [ public method zrem ] { + } + + Method [ public method sort ] { + } + + Method [ public method object ] { + } + + Method [ public method subscribe ] { + } + + Method [ public method psubscribe ] { + } + + Method [ public method unsubscribe ] { + } + + Method [ public method punsubscribe ] { + } + + Method [ public method eval ] { + } + + Method [ public method evalsha ] { + } + + Method [ public method scan ] { + + - Parameters [4] { + Parameter #0 [ &$i_iterator ] + Parameter #1 [ $str_node ] + Parameter #2 [ $str_pattern ] + Parameter #3 [ $i_count ] + } + } + + Method [ public method sscan ] { + + - Parameters [4] { + Parameter #0 [ $str_key ] + Parameter #1 [ &$i_iterator ] + Parameter #2 [ $str_pattern ] + Parameter #3 [ $i_count ] + } + } + + Method [ public method zscan ] { + + - Parameters [4] { + Parameter #0 [ $str_key ] + Parameter #1 [ &$i_iterator ] + Parameter #2 [ $str_pattern ] + Parameter #3 [ $i_count ] + } + } + + Method [ public method hscan ] { + + - Parameters [4] { + Parameter #0 [ $str_key ] + Parameter #1 [ &$i_iterator ] + Parameter #2 [ $str_pattern ] + Parameter #3 [ $i_count ] + } + } + + Method [ public method getmode ] { + } + + Method [ public method getlasterror ] { + } + + Method [ public method clearlasterror ] { + } + + Method [ public method getoption ] { + } + + Method [ public method setoption ] { + } + + Method [ public method _prefix ] { + } + + Method [ public method _serialize ] { + } + + Method [ public method _unserialize ] { + } + + Method [ public method _masters ] { + } + + Method [ public method _redir ] { + } + + Method [ public method multi ] { + } + + Method [ public method exec ] { + } + + Method [ public method discard ] { + } + + Method [ public method watch ] { + } + + Method [ public method unwatch ] { + } + + Method [ public method save ] { + } + + Method [ public method bgsave ] { + } + + Method [ public method flushdb ] { + } + + Method [ public method flushall ] { + } + + Method [ public method dbsize ] { + } + + Method [ public method bgrewriteaof ] { + } + + Method [ public method lastsave ] { + } + + Method [ public method info ] { + } + + Method [ public method role ] { + } + + Method [ public method time ] { + } + + Method [ public method randomkey ] { + } + + Method [ public method ping ] { + } + + Method [ public method echo ] { + } + + Method [ public method command ] { + } + + Method [ public method rawcommand ] { + } + + Method [ public method cluster ] { + } + + Method [ public method client ] { + } + + Method [ public method config ] { + } + + Method [ public method pubsub ] { + } + + Method [ public method script ] { + } + + Method [ public method slowlog ] { + } + } + } + + Class [ class RedisException extends RuntimeException ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - 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 RedisClusterException extends RuntimeException ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - 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 ] { diff --git a/php-pecl-redis.spec b/php-pecl-redis.spec index f1f8069..93fe0f6 100644 --- a/php-pecl-redis.spec +++ b/php-pecl-redis.spec @@ -15,9 +15,9 @@ %else %global sub_prefix %{scl_prefix} %endif +%scl_package php-pecl-redis %endif -%{?scl: %scl_package php-pecl-redis} %global pecl_name redis %global with_zts 0%{?__ztsphp:1} @@ -32,14 +32,12 @@ Summary: Extension for communicating with the Redis key-value store Name: %{?sub_prefix}php-pecl-redis -Version: 2.2.7 -Release: 3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 2.2.8 +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/redis Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# https://github.com/nicolasff/phpredis/issues/332 - missing tests -Source1: https://github.com/phpredis/phpredis/archive/%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: %{?scl_prefix}php-devel @@ -101,7 +99,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep -%setup -q -c -a 1 +%setup -q -c # Don't install/register tests sed -e 's/role="test"/role="src"/' \ @@ -110,8 +108,6 @@ sed -e 's/role="test"/role="src"/' \ # rename source folder mv %{pecl_name}-%{version} NTS -# tests folder from github archive -mv phpredis-%{version}/tests NTS/tests cd NTS @@ -142,6 +138,17 @@ extension = %{pecl_name}.so ;session.save_handler = %{pecl_name} ;session.save_path = "tcp://host1:6379?weight=1, tcp://host2:6379?weight=2&timeout=2.5, tcp://host3:6379?weight=2" + +; Configuration +;redis.arrays.names = '' +;redis.arrays.hosts = '' +;redis.arrays.previous = '' +;redis.arrays.functions = '' +;redis.arrays.index = '' +;redis.arrays.autorehash = '' +;redis.clusters.seeds = '' +;redis.clusters.timeout = '' +;redis.clusters.read_timeout = '' EOF @@ -207,11 +214,6 @@ done %if %{with_tests} cd NTS/tests -# this test requires redis >= 2.6.9 -# https://github.com/nicolasff/phpredis/pull/333 -sed -e s/testClient/SKIP_testClient/ \ - -i TestRedis.php - # Launch redis server mkdir -p {run,log,lib}/redis sed -e "s:/^pidfile.*$:/pidfile $PWD/run/redis.pid:" \ @@ -230,7 +232,7 @@ port=6382 %endif %endif sed -e "s/6379/$port/" -i redis.conf -sed -e "s/6379/$port/" -i TestRedis.php +sed -e "s/6379/$port/" -i *.php %{_bindir}/redis-server ./redis.conf # Run the test Suite @@ -292,6 +294,9 @@ rm -rf %{buildroot} %changelog +* Thu Jun 9 2016 Remi Collet - 2.2.8-1 +- Update to 2.2.8 (stable) + * Wed Mar 9 2016 Remi Collet - 2.2.7-3 - adapt for F24 -- cgit