Skip to content

Commit 95ca34b

Browse files
Rename "command" command to "rawcommand".
Redis has actually introduced the "command" command, so it would be confusing for phpredis to implement arbitrary command processing as the same function name of an actual Redis command. Conflicts: php_redis.h
1 parent 81383b2 commit 95ca34b

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

php_redis.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ PHP_METHOD(Redis, getReadTimeout);
205205
PHP_METHOD(Redis, isConnected);
206206
PHP_METHOD(Redis, getPersistentID);
207207
PHP_METHOD(Redis, getAuth);
208-
209-
PHP_METHOD(Redis, command);
208+
PHP_METHOD(Redis, rawCommand);
210209

211210
#ifdef PHP_WIN32
212211
#define PHP_REDIS_API __declspec(dllexport)

redis.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ static zend_function_entry redis_functions[] = {
271271
PHP_ME(Redis, slowlog, NULL, ZEND_ACC_PUBLIC)
272272

273273
/* Send a raw command and read raw results */
274-
PHP_ME(Redis, command, NULL, ZEND_ACC_PUBLIC)
274+
PHP_ME(Redis, rawCommand, NULL, ZEND_ACC_PUBLIC)
275275

276276
/* introspection */
277277
PHP_ME(Redis, getHost, NULL, ZEND_ACC_PUBLIC)
@@ -6103,8 +6103,8 @@ PHP_METHOD(Redis, slowlog) {
61036103
REDIS_PROCESS_RESPONSE(redis_read_variant_reply);
61046104
}
61056105

6106-
/* {{{ proto Redis::command(string cmd, arg, arg, arg, ...) }}} */
6107-
PHP_METHOD(Redis, command) {
6106+
/* {{{ proto Redis::rawCommand(string cmd, arg, arg, arg, ...) }}} */
6107+
PHP_METHOD(Redis, rawCommand) {
61086108
zval **z_args;
61096109
RedisSock *redis_sock;
61106110
int argc = ZEND_NUM_ARGS(), i;

0 commit comments

Comments
 (0)