diff options
| -rw-r--r-- | REFLECTION | 78 | ||||
| -rw-r--r-- | REFLECTION-PHP7 | 1476 | ||||
| -rw-r--r-- | php-pecl-redis-php7.spec | 412 | ||||
| -rw-r--r-- | php-pecl-redis.spec | 125 | ||||
| -rw-r--r-- | redis-pr840.patch | 22 |
5 files changed, 145 insertions, 1968 deletions
@@ -1,4 +1,4 @@ -Extension [ <persistent> extension #206 redis version 2.2.8 ] { +Extension [ <persistent> extension #161 redis version 3.1.0 ] { - INI { Entry [ redis.arrays.names <ALL> ] @@ -65,7 +65,7 @@ Extension [ <persistent> extension #206 redis version 2.2.8 ] { - Properties [0] { } - - Methods [206] { + - Methods [212] { Method [ <internal:redis, ctor> public method __construct ] { } @@ -591,6 +591,24 @@ Extension [ <persistent> extension #206 redis version 2.2.8 ] { Method [ <internal:redis> public method rawcommand ] { } + Method [ <internal:redis> public method geoadd ] { + } + + Method [ <internal:redis> public method geohash ] { + } + + Method [ <internal:redis> public method geopos ] { + } + + Method [ <internal:redis> public method geodist ] { + } + + Method [ <internal:redis> public method georadius ] { + } + + Method [ <internal:redis> public method georadiusbymember ] { + } + Method [ <internal:redis> public method getHost ] { } @@ -854,7 +872,7 @@ Extension [ <persistent> extension #206 redis version 2.2.8 ] { - Properties [0] { } - - Methods [158] { + - Methods [164] { Method [ <internal:redis, ctor> public method __construct ] { } @@ -1356,10 +1374,28 @@ Extension [ <persistent> extension #206 redis version 2.2.8 ] { Method [ <internal:redis> public method slowlog ] { } + + Method [ <internal:redis> public method geoadd ] { + } + + Method [ <internal:redis> public method geohash ] { + } + + Method [ <internal:redis> public method geopos ] { + } + + Method [ <internal:redis> public method geodist ] { + } + + Method [ <internal:redis> public method georadius ] { + } + + Method [ <internal:redis> public method georadiusbymember ] { + } } } - Class [ <internal:redis> class RedisException extends RuntimeException ] { + Class [ <internal:redis> class RedisException extends RuntimeException implements Throwable ] { - Constants [0] { } @@ -1390,33 +1426,33 @@ Extension [ <persistent> extension #206 redis version 2.2.8 ] { Method [ <internal:Core, inherits Exception> public method __wakeup ] { } - Method [ <internal:Core, inherits Exception> final public method getMessage ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { } - Method [ <internal:Core, inherits Exception> final public method getCode ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { } - Method [ <internal:Core, inherits Exception> final public method getFile ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { } - Method [ <internal:Core, inherits Exception> final public method getLine ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { } - Method [ <internal:Core, inherits Exception> final public method getTrace ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { } - Method [ <internal:Core, inherits Exception> final public method getPrevious ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { } - Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { } - Method [ <internal:Core, inherits Exception> public method __toString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { } } } - Class [ <internal:redis> class RedisClusterException extends RuntimeException ] { + Class [ <internal:redis> class RedisClusterException extends RuntimeException implements Throwable ] { - Constants [0] { } @@ -1447,28 +1483,28 @@ Extension [ <persistent> extension #206 redis version 2.2.8 ] { Method [ <internal:Core, inherits Exception> public method __wakeup ] { } - Method [ <internal:Core, inherits Exception> final public method getMessage ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { } - Method [ <internal:Core, inherits Exception> final public method getCode ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { } - Method [ <internal:Core, inherits Exception> final public method getFile ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { } - Method [ <internal:Core, inherits Exception> final public method getLine ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { } - Method [ <internal:Core, inherits Exception> final public method getTrace ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { } - Method [ <internal:Core, inherits Exception> final public method getPrevious ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { } - Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { } - Method [ <internal:Core, inherits Exception> public method __toString ] { + Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { } } } diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7 deleted file mode 100644 index 5e89d89..0000000 --- a/REFLECTION-PHP7 +++ /dev/null @@ -1,1476 +0,0 @@ -Extension [ <persistent> extension #91 redis version 3.0.0 ] { - - - INI { - Entry [ redis.arrays.names <ALL> ] - Current = '' - } - Entry [ redis.arrays.hosts <ALL> ] - Current = '' - } - Entry [ redis.arrays.previous <ALL> ] - Current = '' - } - Entry [ redis.arrays.functions <ALL> ] - Current = '' - } - Entry [ redis.arrays.index <ALL> ] - Current = '' - } - Entry [ redis.arrays.autorehash <ALL> ] - Current = '' - } - Entry [ redis.clusters.seeds <ALL> ] - Current = '' - } - Entry [ redis.clusters.timeout <ALL> ] - Current = '' - } - Entry [ redis.clusters.read_timeout <ALL> ] - Current = '' - } - } - - - Classes [5] { - Class [ <internal:redis> class Redis ] { - - - Constants [20] { - 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 PIPELINE ] { 2 } - 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 SERIALIZER_IGBINARY ] { 2 } - Constant [ string AFTER ] { after } - Constant [ string BEFORE ] { before } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [206] { - Method [ <internal:redis, ctor> public method __construct ] { - } - - Method [ <internal:redis, dtor> public method __destruct ] { - } - - Method [ <internal:redis> public method connect ] { - } - - Method [ <internal:redis> public method pconnect ] { - } - - Method [ <internal:redis> public method close ] { - } - - Method [ <internal:redis> public method ping ] { - } - - Method [ <internal:redis> public method echo ] { - } - - Method [ <internal:redis> public method get ] { - } - - Method [ <internal:redis> public method set ] { - } - - Method [ <internal:redis> public method setex ] { - } - - Method [ <internal:redis> public method psetex ] { - } - - Method [ <internal:redis> public method setnx ] { - } - - Method [ <internal:redis> public method getSet ] { - } - - Method [ <internal:redis> public method randomKey ] { - } - - Method [ <internal:redis> public method renameKey ] { - } - - Method [ <internal:redis> public method renameNx ] { - } - - Method [ <internal:redis> public method getMultiple ] { - } - - Method [ <internal:redis> public method exists ] { - } - - Method [ <internal:redis> public method delete ] { - } - - Method [ <internal:redis> public method incr ] { - } - - Method [ <internal:redis> public method incrBy ] { - } - - Method [ <internal:redis> public method incrByFloat ] { - } - - Method [ <internal:redis> public method decr ] { - } - - Method [ <internal:redis> public method decrBy ] { - } - - Method [ <internal:redis> public method type ] { - } - - Method [ <internal:redis> public method append ] { - } - - Method [ <internal:redis> public method getRange ] { - } - - Method [ <internal:redis> public method setRange ] { - } - - Method [ <internal:redis> public method getBit ] { - } - - Method [ <internal:redis> public method setBit ] { - } - - Method [ <internal:redis> public method strlen ] { - } - - Method [ <internal:redis> public method getKeys ] { - } - - Method [ <internal:redis> public method sort ] { - } - - Method [ <internal:redis> public method sortAsc ] { - } - - Method [ <internal:redis> public method sortAscAlpha ] { - } - - Method [ <internal:redis> public method sortDesc ] { - } - - Method [ <internal:redis> public method sortDescAlpha ] { - } - - Method [ <internal:redis> public method lPush ] { - } - - Method [ <internal:redis> public method rPush ] { - } - - Method [ <internal:redis> public method lPushx ] { - } - - Method [ <internal:redis> public method rPushx ] { - } - - Method [ <internal:redis> public method lPop ] { - } - - Method [ <internal:redis> public method rPop ] { - } - - Method [ <internal:redis> public method blPop ] { - } - - Method [ <internal:redis> public method brPop ] { - } - - Method [ <internal:redis> public method lSize ] { - } - - Method [ <internal:redis> public method lRemove ] { - } - - Method [ <internal:redis> public method listTrim ] { - } - - Method [ <internal:redis> public method lGet ] { - } - - Method [ <internal:redis> public method lGetRange ] { - } - - Method [ <internal:redis> public method lSet ] { - } - - Method [ <internal:redis> public method lInsert ] { - } - - Method [ <internal:redis> public method sAdd ] { - } - - Method [ <internal:redis> public method sAddArray ] { - } - - Method [ <internal:redis> public method sSize ] { - } - - Method [ <internal:redis> public method sRemove ] { - } - - Method [ <internal:redis> public method sMove ] { - } - - Method [ <internal:redis> public method sPop ] { - } - - Method [ <internal:redis> public method sRandMember ] { - } - - Method [ <internal:redis> public method sContains ] { - } - - Method [ <internal:redis> public method sMembers ] { - } - - Method [ <internal:redis> public method sInter ] { - } - - Method [ <internal:redis> public method sInterStore ] { - } - - Method [ <internal:redis> public method sUnion ] { - } - - Method [ <internal:redis> public method sUnionStore ] { - } - - Method [ <internal:redis> public method sDiff ] { - } - - Method [ <internal:redis> public method sDiffStore ] { - } - - Method [ <internal:redis> public method setTimeout ] { - } - - Method [ <internal:redis> public method save ] { - } - - Method [ <internal:redis> public method bgSave ] { - } - - Method [ <internal:redis> public method lastSave ] { - } - - Method [ <internal:redis> public method flushDB ] { - } - - Method [ <internal:redis> public method flushAll ] { - } - - Method [ <internal:redis> public method dbSize ] { - } - - Method [ <internal:redis> public method auth ] { - } - - Method [ <internal:redis> public method ttl ] { - } - - Method [ <internal:redis> public method pttl ] { - } - - Method [ <internal:redis> public method persist ] { - } - - Method [ <internal:redis> public method info ] { - } - - Method [ <internal:redis> public method select ] { - } - - Method [ <internal:redis> public method move ] { - } - - Method [ <internal:redis> public method bgrewriteaof ] { - } - - Method [ <internal:redis> public method slaveof ] { - } - - Method [ <internal:redis> public method object ] { - } - - Method [ <internal:redis> public method bitop ] { - } - - Method [ <internal:redis> public method bitcount ] { - } - - Method [ <internal:redis> public method bitpos ] { - } - - Method [ <internal:redis> public method mset ] { - } - - Method [ <internal:redis> public method msetnx ] { - } - - Method [ <internal:redis> public method rpoplpush ] { - } - - Method [ <internal:redis> public method brpoplpush ] { - } - - Method [ <internal:redis> public method zAdd ] { - } - - Method [ <internal:redis> public method zDelete ] { - } - - Method [ <internal:redis> public method zRange ] { - } - - Method [ <internal:redis> public method zRevRange ] { - } - - Method [ <internal:redis> public method zRangeByScore ] { - } - - Method [ <internal:redis> public method zRevRangeByScore ] { - } - - Method [ <internal:redis> public method zRangeByLex ] { - } - - Method [ <internal:redis> public method zRevRangeByLex ] { - } - - Method [ <internal:redis> public method zLexCount ] { - } - - Method [ <internal:redis> public method zRemRangeByLex ] { - } - - Method [ <internal:redis> public method zCount ] { - } - - Method [ <internal:redis> public method zDeleteRangeByScore ] { - } - - Method [ <internal:redis> public method zDeleteRangeByRank ] { - } - - Method [ <internal:redis> public method zCard ] { - } - - Method [ <internal:redis> public method zScore ] { - } - - Method [ <internal:redis> public method zRank ] { - } - - Method [ <internal:redis> public method zRevRank ] { - } - - Method [ <internal:redis> public method zInter ] { - } - - Method [ <internal:redis> public method zUnion ] { - } - - Method [ <internal:redis> public method zIncrBy ] { - } - - Method [ <internal:redis> public method expireAt ] { - } - - Method [ <internal:redis> public method pexpire ] { - } - - Method [ <internal:redis> public method pexpireAt ] { - } - - Method [ <internal:redis> public method hGet ] { - } - - Method [ <internal:redis> public method hSet ] { - } - - Method [ <internal:redis> public method hSetNx ] { - } - - Method [ <internal:redis> public method hDel ] { - } - - Method [ <internal:redis> public method hLen ] { - } - - Method [ <internal:redis> public method hKeys ] { - } - - Method [ <internal:redis> public method hVals ] { - } - - Method [ <internal:redis> public method hGetAll ] { - } - - Method [ <internal:redis> public method hExists ] { - } - - Method [ <internal:redis> public method hIncrBy ] { - } - - Method [ <internal:redis> public method hIncrByFloat ] { - } - - Method [ <internal:redis> public method hMset ] { - } - - Method [ <internal:redis> public method hMget ] { - } - - Method [ <internal:redis> public method multi ] { - } - - Method [ <internal:redis> public method discard ] { - } - - Method [ <internal:redis> public method exec ] { - } - - Method [ <internal:redis> public method pipeline ] { - } - - Method [ <internal:redis> public method watch ] { - } - - Method [ <internal:redis> public method unwatch ] { - } - - Method [ <internal:redis> public method publish ] { - } - - Method [ <internal:redis> public method subscribe ] { - } - - Method [ <internal:redis> public method psubscribe ] { - } - - Method [ <internal:redis> public method unsubscribe ] { - } - - Method [ <internal:redis> public method punsubscribe ] { - } - - Method [ <internal:redis> public method time ] { - } - - Method [ <internal:redis> public method role ] { - } - - Method [ <internal:redis> public method eval ] { - } - - Method [ <internal:redis> public method evalsha ] { - } - - Method [ <internal:redis> public method script ] { - } - - Method [ <internal:redis> public method debug ] { - } - - Method [ <internal:redis> public method dump ] { - } - - Method [ <internal:redis> public method restore ] { - } - - Method [ <internal:redis> public method migrate ] { - } - - Method [ <internal:redis> public method getLastError ] { - } - - Method [ <internal:redis> public method clearLastError ] { - } - - Method [ <internal:redis> public method _prefix ] { - } - - Method [ <internal:redis> public method _serialize ] { - } - - Method [ <internal:redis> public method _unserialize ] { - } - - Method [ <internal:redis> public method client ] { - } - - Method [ <internal:redis> public method command ] { - } - - Method [ <internal:redis> public method scan ] { - - - Parameters [3] { - Parameter #0 [ <required> &$i_iterator ] - Parameter #1 [ <optional> $str_pattern ] - Parameter #2 [ <optional> $i_count ] - } - } - - Method [ <internal:redis> public method hscan ] { - - - Parameters [4] { - Parameter #0 [ <required> $str_key ] - Parameter #1 [ <required> &$i_iterator ] - Parameter #2 [ <optional> $str_pattern ] - Parameter #3 [ <optional> $i_count ] - } - } - - Method [ <internal:redis> public method zscan ] { - - - Parameters [4] { - Parameter #0 [ <required> $str_key ] - Parameter #1 [ <required> &$i_iterator ] - Parameter #2 [ <optional> $str_pattern ] - Parameter #3 [ <optional> $i_count ] - } - } - - Method [ <internal:redis> public method sscan ] { - - - Parameters [4] { - Parameter #0 [ <required> $str_key ] - Parameter #1 [ <required> &$i_iterator ] - Parameter #2 [ <optional> $str_pattern ] - Parameter #3 [ <optional> $i_count ] - } - } - - Method [ <internal:redis> public method pfadd ] { - } - - Method [ <internal:redis> public method pfcount ] { - } - - Method [ <internal:redis> public method pfmerge ] { - } - - Method [ <internal:redis> public method getOption ] { - } - - Method [ <internal:redis> public method setOption ] { - } - - Method [ <internal:redis> public method config ] { - } - - Method [ <internal:redis> public method slowlog ] { - } - - Method [ <internal:redis> public method rawcommand ] { - } - - Method [ <internal:redis> public method getHost ] { - } - - Method [ <internal:redis> public method getPort ] { - } - - Method [ <internal:redis> public method getDBNum ] { - } - - Method [ <internal:redis> public method getTimeout ] { - } - - Method [ <internal:redis> public method getReadTimeout ] { - } - - Method [ <internal:redis> public method getPersistentID ] { - } - - Method [ <internal:redis> public method getAuth ] { - } - - Method [ <internal:redis> public method isConnected ] { - } - - Method [ <internal:redis> public method getMode ] { - } - - Method [ <internal:redis> public method wait ] { - } - - Method [ <internal:redis> public method pubsub ] { - } - - Method [ <internal:redis> public method open ] { - } - - Method [ <internal:redis> public method popen ] { - } - - Method [ <internal:redis> public method lLen ] { - } - - Method [ <internal:redis> public method sGetMembers ] { - } - - Method [ <internal:redis> public method mget ] { - } - - Method [ <internal:redis> public method expire ] { - } - - Method [ <internal:redis> public method zunionstore ] { - } - - Method [ <internal:redis> public method zinterstore ] { - } - - Method [ <internal:redis> public method zRemove ] { - } - - Method [ <internal:redis> public method zRem ] { - } - - Method [ <internal:redis> public method zRemoveRangeByScore ] { - } - - Method [ <internal:redis> public method zRemRangeByScore ] { - } - - Method [ <internal:redis> public method zRemRangeByRank ] { - } - - Method [ <internal:redis> public method zSize ] { - } - - Method [ <internal:redis> public method substr ] { - } - - Method [ <internal:redis> public method rename ] { - } - - Method [ <internal:redis> public method del ] { - } - - Method [ <internal:redis> public method keys ] { - } - - Method [ <internal:redis> public method lrem ] { - } - - Method [ <internal:redis> public method ltrim ] { - } - - Method [ <internal:redis> public method lindex ] { - } - - Method [ <internal:redis> public method lrange ] { - } - - Method [ <internal:redis> public method scard ] { - } - - Method [ <internal:redis> public method srem ] { - } - - Method [ <internal:redis> public method sismember ] { - } - - Method [ <internal:redis> public method zReverseRange ] { - } - - Method [ <internal:redis> public method sendEcho ] { - } - - Method [ <internal:redis> public method evaluate ] { - } - - Method [ <internal:redis> public method evaluateSha ] { - } - } - } - - Class [ <internal:redis> class RedisArray ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [27] { - Method [ <internal:redis, ctor> public method __construct ] { - } - - Method [ <internal:redis> public method __call ] { - - - Parameters [2] { - Parameter #0 [ <required> $function_name ] - Parameter #1 [ <required> $arguments ] - } - } - - Method [ <internal:redis> public method _hosts ] { - } - - Method [ <internal:redis> public method _target ] { - } - - Method [ <internal:redis> public method _instance ] { - } - - Method [ <internal:redis> public method _function ] { - } - - Method [ <internal:redis> public method _distributor ] { - } - - Method [ <internal:redis> public method _rehash ] { - } - - Method [ <internal:redis> public method select ] { - } - - Method [ <internal:redis> public method info ] { - } - - Method [ <internal:redis> public method ping ] { - } - - Method [ <internal:redis> public method flushdb ] { - } - - Method [ <internal:redis> public method flushall ] { - } - - Method [ <internal:redis> public method mget ] { - } - - Method [ <internal:redis> public method mset ] { - } - - Method [ <internal:redis> public method del ] { - } - - Method [ <internal:redis> public method getOption ] { - } - - Method [ <internal:redis> public method setOption ] { - } - - Method [ <internal:redis> public method keys ] { - } - - Method [ <internal:redis> public method save ] { - } - - Method [ <internal:redis> public method bgsave ] { - } - - Method [ <internal:redis> public method multi ] { - } - - Method [ <internal:redis> public method exec ] { - } - - Method [ <internal:redis> public method discard ] { - } - - Method [ <internal:redis> public method unwatch ] { - } - - Method [ <internal:redis> public method delete ] { - } - - Method [ <internal:redis> public method getMultiple ] { - } - } - } - - Class [ <internal:redis> class RedisCluster ] { - - - Constants [23] { - 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 SERIALIZER_IGBINARY ] { 2 } - Constant [ string AFTER ] { after } - Constant [ string BEFORE ] { before } - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [158] { - Method [ <internal:redis, ctor> public method __construct ] { - } - - Method [ <internal:redis> public method close ] { - } - - Method [ <internal:redis> public method get ] { - } - - Method [ <internal:redis> public method set ] { - } - - Method [ <internal:redis> public method mget ] { - } - - Method [ <internal:redis> public method mset ] { - } - - Method [ <internal:redis> public method msetnx ] { - } - - Method [ <internal:redis> public method del ] { - } - - Method [ <internal:redis> public method setex ] { - } - - Method [ <internal:redis> public method psetex ] { - } - - Method [ <internal:redis> public method setnx ] { - } - - Method [ <internal:redis> public method getset ] { - } - - Method [ <internal:redis> public method exists ] { - } - - Method [ <internal:redis> public method keys ] { - } - - Method [ <internal:redis> public method type ] { - } - - Method [ <internal:redis> public method lpop ] { - } - - Method [ <internal:redis> public method rpop ] { - } - - Method [ <internal:redis> public method lset ] { - } - - Method [ <internal:redis> public method spop ] { - } - - Method [ <internal:redis> public method lpush ] { - } - - Method [ <internal:redis> public method rpush ] { - } - - Method [ <internal:redis> public method blpop ] { - } - - Method [ <internal:redis> public method brpop ] { - } - - Method [ <internal:redis> public method rpushx ] { - } - - Method [ <internal:redis> public method lpushx ] { - } - - Method [ <internal:redis> public method linsert ] { - } - - Method [ <internal:redis> public method lindex ] { - } - - Method [ <internal:redis> public method lrem ] { - } - - Method [ <internal:redis> public method brpoplpush ] { - } - - Method [ <internal:redis> public method rpoplpush ] { - } - - Method [ <internal:redis> public method llen ] { - } - - Method [ <internal:redis> public method scard ] { - } - - Method [ <internal:redis> public method smembers ] { - } - - Method [ <internal:redis> public method sismember ] { - } - - Method [ <internal:redis> public method sadd ] { - } - - Method [ <internal:redis> public method saddarray ] { - } - - Method [ <internal:redis> public method srem ] { - } - - Method [ <internal:redis> public method sunion ] { - } - - Method [ <internal:redis> public method sunionstore ] { - } - - Method [ <internal:redis> public method sinter ] { - } - - Method [ <internal:redis> public method sinterstore ] { - } - - Method [ <internal:redis> public method sdiff ] { - } - - Method [ <internal:redis> public method sdiffstore ] { - } - - Method [ <internal:redis> public method srandmember ] { - } - - Method [ <internal:redis> public method strlen ] { - } - - Method [ <internal:redis> public method persist ] { - } - - Method [ <internal:redis> public method ttl ] { - } - - Method [ <internal:redis> public method pttl ] { - } - - Method [ <internal:redis> public method zcard ] { - } - - Method [ <internal:redis> public method zcount ] { - } - - Method [ <internal:redis> public method zremrangebyscore ] { - } - - Method [ <internal:redis> public method zscore ] { - } - - Method [ <internal:redis> public method zadd ] { - } - - Method [ <internal:redis> public method zincrby ] { - } - - Method [ <internal:redis> public method hlen ] { - } - - Method [ <internal:redis> public method hkeys ] { - } - - Method [ <internal:redis> public method hvals ] { - } - - Method [ <internal:redis> public method hget ] { - } - - Method [ <internal:redis> public method hgetall ] { - } - - Method [ <internal:redis> public method hexists ] { - } - - Method [ <internal:redis> public method hincrby ] { - } - - Method [ <internal:redis> public method hset ] { - } - - Method [ <internal:redis> public method hsetnx ] { - } - - Method [ <internal:redis> public method hmget ] { - } - - Method [ <internal:redis> public method hmset ] { - } - - Method [ <internal:redis> public method hdel ] { - } - - Method [ <internal:redis> public method hincrbyfloat ] { - } - - Method [ <internal:redis> public method dump ] { - } - - Method [ <internal:redis> public method zrank ] { - } - - Method [ <internal:redis> public method zrevrank ] { - } - - Method [ <internal:redis> public method incr ] { - } - - Method [ <internal:redis> public method decr ] { - } - - Method [ <internal:redis> public method incrby ] { - } - - Method [ <internal:redis> public method decrby ] { - } - - Method [ <internal:redis> public method incrbyfloat ] { - } - - Method [ <internal:redis> public method expire ] { - } - - Method [ <internal:redis> public method pexpire ] { - } - - Method [ <internal:redis> public method expireat ] { - } - - Method [ <internal:redis> public method pexpireat ] { - } - - Method [ <internal:redis> public method append ] { - } - - Method [ <internal:redis> public method getbit ] { - } - - Method [ <internal:redis> public method setbit ] { - } - - Method [ <internal:redis> public method bitop ] { - } - - Method [ <internal:redis> public method bitpos ] { - } - - Method [ <internal:redis> public method bitcount ] { - } - - Method [ <internal:redis> public method lget ] { - } - - Method [ <internal:redis> public method getrange ] { - } - - Method [ <internal:redis> public method ltrim ] { - } - - Method [ <internal:redis> public method lrange ] { - } - - Method [ <internal:redis> public method zremrangebyrank ] { - } - - Method [ <internal:redis> public method publish ] { - } - - Method [ <internal:redis> public method rename ] { - } - - Method [ <internal:redis> public method renamenx ] { - } - - Method [ <internal:redis> public method pfcount ] { - } - - Method [ <internal:redis> public method pfadd ] { - } - - Method [ <internal:redis> public method pfmerge ] { - } - - Method [ <internal:redis> public method setrange ] { - } - - Method [ <internal:redis> public method restore ] { - } - - Method [ <internal:redis> public method smove ] { - } - - Method [ <internal:redis> public method zrange ] { - } - - Method [ <internal:redis> public method zrevrange ] { - } - - Method [ <internal:redis> public method zrangebyscore ] { - } - - Method [ <internal:redis> public method zrevrangebyscore ] { - } - - Method [ <internal:redis> public method zrangebylex ] { - } - - Method [ <internal:redis> public method zrevrangebylex ] { - } - - Method [ <internal:redis> public method zlexcount ] { - } - - Method [ <internal:redis> public method zremrangebylex ] { - } - - Method [ <internal:redis> public method zunionstore ] { - } - - Method [ <internal:redis> public method zinterstore ] { - } - - Method [ <internal:redis> public method zrem ] { - } - - Method [ <internal:redis> public method sort ] { - } - - Method [ <internal:redis> public method object ] { - } - - Method [ <internal:redis> public method subscribe ] { - } - - Method [ <internal:redis> public method psubscribe ] { - } - - Method [ <internal:redis> public method unsubscribe ] { - } - - Method [ <internal:redis> public method punsubscribe ] { - } - - Method [ <internal:redis> public method eval ] { - } - - Method [ <internal:redis> public method evalsha ] { - } - - Method [ <internal:redis> public method scan ] { - - - Parameters [4] { - Parameter #0 [ <required> &$i_iterator ] - Parameter #1 [ <required> $str_node ] - Parameter #2 [ <optional> $str_pattern ] - Parameter #3 [ <optional> $i_count ] - } - } - - Method [ <internal:redis> public method sscan ] { - - - Parameters [4] { - Parameter #0 [ <required> $str_key ] - Parameter #1 [ <required> &$i_iterator ] - Parameter #2 [ <optional> $str_pattern ] - Parameter #3 [ <optional> $i_count ] - } - } - - Method [ <internal:redis> public method zscan ] { - - - Parameters [4] { - Parameter #0 [ <required> $str_key ] - Parameter #1 [ <required> &$i_iterator ] - Parameter #2 [ <optional> $str_pattern ] - Parameter #3 [ <optional> $i_count ] - } - } - - Method [ <internal:redis> public method hscan ] { - - - Parameters [4] { - Parameter #0 [ <required> $str_key ] - Parameter #1 [ <required> &$i_iterator ] - Parameter #2 [ <optional> $str_pattern ] - Parameter #3 [ <optional> $i_count ] - } - } - - Method [ <internal:redis> public method getmode ] { - } - - Method [ <internal:redis> public method getlasterror ] { - } - - Method [ <internal:redis> public method clearlasterror ] { - } - - Method [ <internal:redis> public method getoption ] { - } - - Method [ <internal:redis> public method setoption ] { - } - - Method [ <internal:redis> public method _prefix ] { - } - - Method [ <internal:redis> public method _serialize ] { - } - - Method [ <internal:redis> public method _unserialize ] { - } - - Method [ <internal:redis> public method _masters ] { - } - - Method [ <internal:redis> public method _redir ] { - } - - Method [ <internal:redis> public method multi ] { - } - - Method [ <internal:redis> public method exec ] { - } - - Method [ <internal:redis> public method discard ] { - } - - Method [ <internal:redis> public method watch ] { - } - - Method [ <internal:redis> public method unwatch ] { - } - - Method [ <internal:redis> public method save ] { - } - - Method [ <internal:redis> public method bgsave ] { - } - - Method [ <internal:redis> public method flushdb ] { - } - - Method [ <internal:redis> public method flushall ] { - } - - Method [ <internal:redis> public method dbsize ] { - } - - Method [ <internal:redis> public method bgrewriteaof ] { - } - - Method [ <internal:redis> public method lastsave ] { - } - - Method [ <internal:redis> public method info ] { - } - - Method [ <internal:redis> public method role ] { - } - - Method [ <internal:redis> public method time ] { - } - - Method [ <internal:redis> public method randomkey ] { - } - - Method [ <internal:redis> public method ping ] { - } - - Method [ <internal:redis> public method echo ] { - } - - Method [ <internal:redis> public method command ] { - } - - Method [ <internal:redis> public method rawcommand ] { - } - - Method [ <internal:redis> public method cluster ] { - } - - Method [ <internal:redis> public method client ] { - } - - Method [ <internal:redis> public method config ] { - } - - Method [ <internal:redis> public method pubsub ] { - } - - Method [ <internal:redis> public method script ] { - } - - Method [ <internal:redis> public method slowlog ] { - } - } - } - - Class [ <internal:redis> class RedisException extends RuntimeException implements Throwable ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [4] { - Property [ <default> protected $message ] - Property [ <default> protected $code ] - Property [ <default> protected $file ] - Property [ <default> protected $line ] - } - - - Methods [10] { - Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - - - Parameters [3] { - Parameter #0 [ <optional> $message ] - Parameter #1 [ <optional> $code ] - Parameter #2 [ <optional> $previous ] - } - } - - Method [ <internal:Core, inherits Exception> public method __wakeup ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { - } - } - } - - Class [ <internal:redis> class RedisClusterException extends RuntimeException implements Throwable ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [4] { - Property [ <default> protected $message ] - Property [ <default> protected $code ] - Property [ <default> protected $file ] - Property [ <default> protected $line ] - } - - - Methods [10] { - Method [ <internal:Core, inherits Exception, ctor> public method __construct ] { - - - Parameters [3] { - Parameter #0 [ <optional> $message ] - Parameter #1 [ <optional> $code ] - Parameter #2 [ <optional> $previous ] - } - } - - Method [ <internal:Core, inherits Exception> public method __wakeup ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] { - } - - Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] { - } - } - } - } -} - diff --git a/php-pecl-redis-php7.spec b/php-pecl-redis-php7.spec deleted file mode 100644 index 5542318..0000000 --- a/php-pecl-redis-php7.spec +++ /dev/null @@ -1,412 +0,0 @@ -# remirepo spec file for php-pecl-redis -# adapted for scl, from -# -# Fedora spec file for php-pecl-redis -# -# Copyright (c) 2012-2016 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ -# -# Please, preserve the changelog entries -# -%if 0%{?scl:1} -%global sub_prefix %{scl_prefix} -%scl_package php-pecl-redis -%else -%global _root_bindir %{_bindir} -%endif - -# See https://github.com/phpredis/phpredis/commits/php7 -%global gh_commit 64479400a0b3c7b8b006e5de905836e4d764a763 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner phpredis -%global gh_project phpredis -#global gh_date 20160603 -%global pecl_name redis -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global with_tests 0%{?_with_tests:1} -%global with_igbin 1 -# after 40-igbinary -%global ini_name 50-%{pecl_name}.ini - -Summary: Extension for communicating with the Redis key-value store -Name: %{?sub_prefix}php-pecl-redis -Version: 3.0.0 -%if 0%{?gh_date} -Release: 0.2.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz -%else -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -%endif -License: PHP -Group: Development/Languages -URL: http://pecl.php.net/package/redis - -BuildRequires: %{?scl_prefix}php-devel -BuildRequires: %{?scl_prefix}php-pear -%if %{with_igbin} -BuildRequires: %{?sub_prefix}php-pecl-igbinary-devel -%endif -# to run Test suite -%if %{with_tests} -BuildRequires: redis >= 3 -%endif - -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}php(api) = %{php_core_api} -%if %{with_igbin} -Requires: %{?sub_prefix}php-pecl(igbinary)%{?_isa} -%endif -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} - -Obsoletes: %{?scl_prefix}php-redis < %{version} -Provides: %{?scl_prefix}php-redis = %{version}-%{release} -Provides: %{?scl_prefix}php-redis%{?_isa} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif - -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared object -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - - -%description -The phpredis extension provides an API for communicating -with the Redis key-value store. - -This Redis client implements most of the latest Redis API. -As method only only works when also implemented on the server side, -some doesn't work with an old redis server version. - -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. - - -%prep -%if 0%{?gh_date} -%setup -qc -mv %{gh_project}-%{gh_commit} NTS -%{__php} -r ' - $pkg = simplexml_load_file("NTS/package.xml"); - $pkg->date = substr("%{gh_date}",0,4)."-".substr("%{gh_date}",4,2)."-".substr("%{gh_date}",6,2); - $pkg->version->release = "%{version}dev"; - $pkg->stability->release = "devel"; - $pkg->asXML("package.xml"); -' -sed -e '/PHP_REDIS_VERSION/s/3.0.0-rc1/%{version}-dev/' -i NTS/php_redis.h -%else -%setup -q -c -# rename source folder -mv %{pecl_name}-%{version} NTS -%endif - -%{?_licensedir:sed -e '/COPYING/s/role="doc"/role="src"/' -i package.xml} - -cd NTS - -# Sanity check, really often broken -extver=$(sed -n '/#define PHP_REDIS_VERSION/{s/.* "//;s/".*$//;p}' php_redis.h) -if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}%{?gh_date:-devphp7}. - exit 1 -fi -cd .. - -%if %{with_zts} -# duplicate for ZTS build -cp -pr NTS ZTS -%endif - -# Drop in the bit of configuration -cat > %{ini_name} << 'EOF' -; Enable %{pecl_name} extension module -extension = %{pecl_name}.so - -; phpredis can be used to store PHP sessions. -; To do this, uncomment and configure below - -; RPM note : save_handler and save_path are defined -; for mod_php, in /etc/httpd/conf.d/php.conf -; for php-fpm, in %{_sysconfdir}/php-fpm.d/*conf - -;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 - - -%build -cd NTS -%{_bindir}/phpize -%configure \ - --enable-redis \ - --enable-redis-session \ -%if %{with_igbin} - --enable-redis-igbinary \ -%endif - --with-php-config=%{_bindir}/php-config -make %{?_smp_mflags} - -%if %{with_zts} -cd ../ZTS -%{_bindir}/zts-phpize -%configure \ - --enable-redis \ - --enable-redis-session \ -%if %{with_igbin} - --enable-redis-igbinary \ -%endif - --with-php-config=%{_bindir}/zts-php-config -make %{?_smp_mflags} -%endif - - -%install -# Install the NTS stuff -make -C NTS install INSTALL_ROOT=%{buildroot} -install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} - -%if %{with_zts} -# Install the ZTS stuff -make -C ZTS install INSTALL_ROOT=%{buildroot} -install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} -%endif - -# Install the package XML file -install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml - -# Documentation -cd NTS -for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i -done - - -%check -# simple module load test -%{__php} --no-php-ini \ -%if %{with_igbin} - --define extension=igbinary.so \ -%endif - --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 - --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} -%endif - -%if %{with_tests} -cd NTS/tests - -# Launch redis server -mkdir -p {run,log,lib}/redis -sed -e "s:/^pidfile.*$:/pidfile $PWD/run/redis.pid:" \ - -e "s:/var:$PWD:" \ - -e "/daemonize/s/no/yes/" \ - /etc/redis.conf >redis.conf -# port number to allow 32/64 build at same time -# and avoid conflict with a possible running server -%if 0%{?__isa_bits} -port=$(expr %{__isa_bits} + 6350) -%else -%ifarch x86_64 -port=6414 -%else -port=6382 -%endif -%endif -sed -e "s/6379/$port/" -i redis.conf -sed -e "s/6379/$port/" -i RedisTest.php -%{_root_bindir}/redis-server ./redis.conf - -# Run the test Suite -ret=0 -%{__php} --no-php-ini \ -%if %{with_igbin} - --define extension=igbinary.so \ -%endif - --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - TestRedis.php || ret=1 - -# Cleanup -if [ -f run/redis.pid ]; then - %{_root_bindir}/redis-cli -p $port shutdown -fi - -exit $ret - -%else -: Upstream test suite disabled -%endif - - -%if 0%{?fedora} < 24 -# when pear installed alone, after us -%triggerin -- %{?scl_prefix}php-pear -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -# posttrans as pear can be installed after us -%posttrans -if [ -x %{__pecl} ] ; then - %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -fi - -%postun -if [ $1 -eq 0 -a -x %{__pecl} ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - -%files -%{?_licensedir:%license NTS/COPYING} -%doc %{pecl_docdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml - -%{php_extdir}/%{pecl_name}.so -%config(noreplace) %{php_inidir}/%{ini_name} - -%if %{with_zts} -%{php_ztsextdir}/%{pecl_name}.so -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%endif - - -%changelog -* Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-3 -- rebuild with PHP 7.1.0 GA - -* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-2 -- rebuild for PHP 7.1 new API version - -* Sat Jun 11 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-1 -- Update to 3.0.0 (stable) - -* Thu Jun 9 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.1.20160603git6447940 -- refresh and bump version - -* Thu May 5 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.6.20160504gitad3c116 -- refresh - -* Thu Mar 3 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.5.20160215git2887ad1 -- enable igbinary support - -* Fri Feb 19 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.4.20160215git2887ad1 -- refresh - -* Thu Feb 11 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.3.20160208git0d4b421 -- refresh - -* Tue Jan 26 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.2.20160125git7b36957 -- refresh - -* Sun Jan 10 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.2.20160106git4a37e47 -- improve package.xml, set stability=devel - -* Sun Jan 10 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.1.20160106git4a37e47 -- update to 2.2.8-dev for PHP 7 -- use git snapshot - -* Sat Jun 20 2015 Remi Collet <remi@fedoraproject.org> - 2.2.7-2 -- allow build against rh-php56 (as more-php56) - -* Tue Mar 03 2015 Remi Collet <remi@fedoraproject.org> - 2.2.7-1 -- Update to 2.2.7 (stable) -- drop runtime dependency on pear, new scriptlets - -* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 2.2.5-5.1 -- Fedora 21 SCL mass rebuild - -* Fri Oct 3 2014 Remi Collet <rcollet@redhat.com> - 2.2.5-5 -- fix segfault with igbinary serializer - https://github.com/nicolasff/phpredis/issues/341 - -* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 2.2.5-4 -- improve SCL build - -* Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 2.2.5-3 -- add numerical prefix to extension configuration file (php 5.6) -- add comment about session configuration - -* Thu Mar 20 2014 Remi Collet <rcollet@redhat.com> - 2.2.5-2 -- fix memory corruption with PHP 5.6 - https://github.com/nicolasff/phpredis/pull/447 - -* Wed Mar 19 2014 Remi Collet <remi@fedoraproject.org> - 2.2.5-1 -- Update to 2.2.5 - -* Wed Mar 19 2014 Remi Collet <rcollet@redhat.com> - 2.2.4-3 -- allow SCL build - -* Fri Feb 28 2014 Remi Collet <remi@fedoraproject.org> - 2.2.4-2 -- cleaups -- move doc in pecl_docdir - -* Mon Sep 09 2013 Remi Collet <remi@fedoraproject.org> - 2.2.4-1 -- Update to 2.2.4 - -* Tue Apr 30 2013 Remi Collet <remi@fedoraproject.org> - 2.2.3-1 -- update to 2.2.3 -- upstream moved to pecl, rename from php-redis to php-pecl-redis - -* Tue Sep 11 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-5.git6f7087f -- more docs and improved description - -* Sun Sep 2 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-4.git6f7087f -- latest snahot (without bundled igbinary) -- remove chmod (done upstream) - -* Sat Sep 1 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-3.git5df5153 -- run only test suite with redis > 2.4 - -* Fri Aug 31 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-2.git5df5153 -- latest master -- run test suite - -* Wed Aug 29 2012 Remi Collet <remi@fedoraproject.org> - 2.2.2-1 -- update to 2.2.2 -- enable ZTS build - -* Tue Aug 28 2012 Remi Collet <remi@fedoraproject.org> - 2.2.1-1 -- initial package diff --git a/php-pecl-redis.spec b/php-pecl-redis.spec index d503bd3..e90c50e 100644 --- a/php-pecl-redis.spec +++ b/php-pecl-redis.spec @@ -10,18 +10,16 @@ # Please, preserve the changelog entries # %if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -%else %global sub_prefix %{scl_prefix} -%endif %scl_package php-pecl-redis +%else +%global _root_bindir %{_bindir} %endif - %global pecl_name redis -%global with_zts 0%{?__ztsphp:1} -%global with_tests %{?_with_tests:1}%{!?_with_tests:0} +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global with_tests 0%{?_with_tests:1} +%global with_igbin 1 %if "%{php_version}" < "5.6" # after igbinary %global ini_name %{pecl_name}.ini @@ -32,28 +30,29 @@ Summary: Extension for communicating with the Redis key-value store Name: %{?sub_prefix}php-pecl-redis -Version: 2.2.8 -Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 3.1.0 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz License: PHP Group: Development/Languages URL: http://pecl.php.net/package/redis -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz - -Patch0: %{pecl_name}-pr840.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear +%if %{with_igbin} BuildRequires: %{?sub_prefix}php-pecl-igbinary-devel +%endif # to run Test suite %if %{with_tests} -BuildRequires: redis >= 2.6 +BuildRequires: redis >= 3 %endif Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -# php-pecl-igbinary missing php-pecl(igbinary)%{?_isa} -Requires: %{?sub_prefix}php-pecl-igbinary%{?_isa} +%if %{with_igbin} +Requires: %{?sub_prefix}php-pecl(igbinary)%{?_isa} +%endif %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Obsoletes: %{?scl_prefix}php-%{pecl_name} < %{version} @@ -80,6 +79,14 @@ Obsoletes: php55w-pecl-%{pecl_name} <= %{version} Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.0" +Obsoletes: php70u-pecl-%{pecl_name} <= %{version} +Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "7.1" +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -102,22 +109,20 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c +# rename source folder +mv %{pecl_name}-%{version} NTS # Don't install/register tests sed -e 's/role="test"/role="src"/' \ %{?_licensedir:-e '/COPYING/s/role="doc"/role="src"/' } \ -i package.xml -# rename source folder -mv %{pecl_name}-%{version} NTS - cd NTS -%patch0 -p1 -b .pr840 # Sanity check, really often broken extver=$(sed -n '/#define PHP_REDIS_VERSION/{s/.* "//;s/".*$//;p}' php_redis.h) -if test "x${extver}" != "x%{version}"; then - : Error: Upstream extension version is ${extver}, expecting %{version}. +if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then + : Error: Upstream extension version is ${extver}, expecting %{version}%{?gh_date:-devphp7}. exit 1 fi cd .. @@ -161,7 +166,9 @@ cd NTS %configure \ --enable-redis \ --enable-redis-session \ +%if %{with_igbin} --enable-redis-igbinary \ +%endif --with-php-config=%{_bindir}/php-config make %{?_smp_mflags} @@ -171,7 +178,9 @@ cd ../ZTS %configure \ --enable-redis \ --enable-redis-session \ +%if %{with_igbin} --enable-redis-igbinary \ +%endif --with-php-config=%{_bindir}/zts-php-config make %{?_smp_mflags} %endif @@ -203,13 +212,17 @@ done %check # simple module load test %{__php} --no-php-ini \ +%if %{with_igbin} --define extension=igbinary.so \ +%endif --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 --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} %endif @@ -218,11 +231,8 @@ done cd NTS/tests # Launch redis server -mkdir -p {run,log,lib}/redis -sed -e "s:/^pidfile.*$:/pidfile $PWD/run/redis.pid:" \ - -e "s:/var:$PWD:" \ - -e "/daemonize/s/no/yes/" \ - /etc/redis.conf >redis.conf +mkdir -p data +pidfile=$PWD/redis.pid # port number to allow 32/64 build at same time # and avoid conflict with a possible running server %if 0%{?__isa_bits} @@ -234,20 +244,28 @@ port=6414 port=6382 %endif %endif -sed -e "s/6379/$port/" -i redis.conf -sed -e "s/6379/$port/" -i *.php -%{_bindir}/redis-server ./redis.conf +%{_root_bindir}/redis-server \ + --bind 127.0.0.1 \ + --port $port \ + --daemonize yes \ + --logfile $PWD/redis.log \ + --dir $PWD/data \ + --pidfile $pidfile + +sed -e "s/6379/$port/" -i RedisTest.php # Run the test Suite ret=0 %{__php} --no-php-ini \ +%if %{with_igbin} --define extension=igbinary.so \ +%endif --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ TestRedis.php || ret=1 # Cleanup -if [ -f run/redis.pid ]; then - %{_bindir}/redis-cli -p $port shutdown +if [ -f $pidfile ]; then + %{_root_bindir}/redis-cli -p $port shutdown fi exit $ret @@ -297,14 +315,47 @@ rm -rf %{buildroot} %changelog -* Fri Jun 17 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-2 -- test build for https://github.com/phpredis/phpredis/issues/742 +* Thu Dec 15 2016 Remi Collet <remi@fedoraproject.org> - 3.1.0-1 +- update to 3.1.0 +- open https://github.com/phpredis/phpredis/issues/1052 max version +- open https://github.com/phpredis/phpredis/issues/1053 segfault +- open https://github.com/phpredis/phpredis/issues/1054 warnings +- open https://github.com/phpredis/phpredis/issues/1055 reflection +- open https://github.com/phpredis/phpredis/issues/1056 32bits tests + +* Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-3 +- rebuild with PHP 7.1.0 GA + +* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-2 +- rebuild for PHP 7.1 new API version + +* Sat Jun 11 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-1 +- Update to 3.0.0 (stable) + +* Thu Jun 9 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.1.20160603git6447940 +- refresh and bump version + +* Thu May 5 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.6.20160504gitad3c116 +- refresh + +* Thu Mar 3 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.5.20160215git2887ad1 +- enable igbinary support + +* Fri Feb 19 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.4.20160215git2887ad1 +- refresh + +* Thu Feb 11 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.3.20160208git0d4b421 +- refresh + +* Tue Jan 26 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.2.20160125git7b36957 +- refresh -* Thu Jun 9 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-1 -- Update to 2.2.8 (stable) +* Sun Jan 10 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.2.20160106git4a37e47 +- improve package.xml, set stability=devel -* Wed Mar 9 2016 Remi Collet <remi@fedoraproject.org> - 2.2.7-3 -- adapt for F24 +* Sun Jan 10 2016 Remi Collet <remi@fedoraproject.org> - 2.2.8-0.1.20160106git4a37e47 +- update to 2.2.8-dev for PHP 7 +- use git snapshot * Sat Jun 20 2015 Remi Collet <remi@fedoraproject.org> - 2.2.7-2 - allow build against rh-php56 (as more-php56) diff --git a/redis-pr840.patch b/redis-pr840.patch deleted file mode 100644 index aea8aae..0000000 --- a/redis-pr840.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 909f803f5a9d0af114ab86ce47dbcdcd3f387c8b Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Fri, 17 Jun 2016 12:34:11 +0200 -Subject: [PATCH] use str_efree to fix #742 - ---- - redis_commands.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/redis_commands.c b/redis_commands.c -index a84f760..2f84577 100644 ---- a/redis_commands.c -+++ b/redis_commands.c -@@ -1298,7 +1298,7 @@ int redis_set_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, - CMD_SET_SLOT(slot,key,key_len); - - if(key_free) efree(key); -- if(val_free) efree(val); -+ if(val_free) str_efree(val); - - return SUCCESS; - } |