From c1d34f022fece87ea3216734469c9ccd3267f469 Mon Sep 17 00:00:00 2001 From: Daniele Alessandri Date: Sat, 4 Jun 2016 15:57:12 +0200 Subject: [PATCH] Drop useless method from base command class. --- src/Command/Command.php | 14 +------------- src/Command/Redis/GeospatialGeoAdd.php | 4 ++-- src/Command/Redis/GeospatialGeoHash.php | 4 ++-- src/Command/Redis/GeospatialGeoPos.php | 4 ++-- src/Command/Redis/GeospatialGeoRadius.php | 4 ++-- src/Command/Redis/HashDelete.php | 6 ++++-- src/Command/Redis/HashGetMultiple.php | 6 ++++-- src/Command/Redis/HashScan.php | 4 ++-- src/Command/Redis/HashSetMultiple.php | 6 +++--- src/Command/Redis/HyperLogLogAdd.php | 6 ++++-- src/Command/Redis/HyperLogLogCount.php | 6 ++++-- src/Command/Redis/HyperLogLogMerge.php | 6 ++++-- src/Command/Redis/KeyDelete.php | 6 ++++-- src/Command/Redis/KeyMigrate.php | 4 ++-- src/Command/Redis/KeyScan.php | 4 ++-- src/Command/Redis/KeySort.php | 8 +++++--- src/Command/Redis/ListPopFirstBlocking.php | 4 ++-- src/Command/Redis/ListPushTail.php | 6 ++++-- src/Command/Redis/PubSubSubscribe.php | 6 ++++-- src/Command/Redis/PubSubUnsubscribe.php | 6 ++++-- src/Command/Redis/ServerSlaveOf.php | 6 +++--- src/Command/Redis/SetAdd.php | 6 ++++-- src/Command/Redis/SetIntersection.php | 6 ++++-- src/Command/Redis/SetIntersectionStore.php | 6 +++--- src/Command/Redis/SetRemove.php | 6 ++++-- src/Command/Redis/SetScan.php | 4 ++-- src/Command/Redis/StringBitOp.php | 4 ++-- src/Command/Redis/StringGetMultiple.php | 6 ++++-- src/Command/Redis/StringSetMultiple.php | 6 +++--- src/Command/Redis/TransactionWatch.php | 6 +++--- src/Command/Redis/ZSetAdd.php | 4 ++-- src/Command/Redis/ZSetRange.php | 7 +++---- src/Command/Redis/ZSetRemove.php | 6 ++++-- src/Command/Redis/ZSetScan.php | 4 ++-- src/Command/Redis/ZSetUnionStore.php | 4 ++-- src/Command/ScriptCommand.php | 6 ++++-- 36 files changed, 110 insertions(+), 91 deletions(-) diff --git a/src/Command/Command.php b/src/Command/Command.php index bb538e7c..62dc02db 100644 --- a/src/Command/Command.php +++ b/src/Command/Command.php @@ -21,24 +21,12 @@ abstract class Command implements CommandInterface private $slot; private $arguments = array(); - /** - * Returns a filtered array of the arguments. - * - * @param array $arguments List of arguments. - * - * @return array - */ - protected function filterArguments(array $arguments) - { - return $arguments; - } - /** * {@inheritdoc} */ public function setArguments(array $arguments) { - $this->arguments = $this->filterArguments($arguments); + $this->arguments = $arguments; unset($this->slot); } diff --git a/src/Command/Redis/GeospatialGeoAdd.php b/src/Command/Redis/GeospatialGeoAdd.php index 3d6b740b..a33672a0 100644 --- a/src/Command/Redis/GeospatialGeoAdd.php +++ b/src/Command/Redis/GeospatialGeoAdd.php @@ -31,7 +31,7 @@ class GeospatialGeoAdd extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 2 && is_array($arguments[1])) { foreach (array_pop($arguments) as $item) { @@ -39,6 +39,6 @@ class GeospatialGeoAdd extends Command } } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/GeospatialGeoHash.php b/src/Command/Redis/GeospatialGeoHash.php index d27f7ba6..c5db08a6 100644 --- a/src/Command/Redis/GeospatialGeoHash.php +++ b/src/Command/Redis/GeospatialGeoHash.php @@ -31,13 +31,13 @@ class GeospatialGeoHash extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 2 && is_array($arguments[1])) { $members = array_pop($arguments); $arguments = array_merge($arguments, $members); } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/GeospatialGeoPos.php b/src/Command/Redis/GeospatialGeoPos.php index ee64f4be..e9e38f1d 100644 --- a/src/Command/Redis/GeospatialGeoPos.php +++ b/src/Command/Redis/GeospatialGeoPos.php @@ -31,13 +31,13 @@ class GeospatialGeoPos extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 2 && is_array($arguments[1])) { $members = array_pop($arguments); $arguments = array_merge($arguments, $members); } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/GeospatialGeoRadius.php b/src/Command/Redis/GeospatialGeoRadius.php index b7209a0b..063c1eaa 100644 --- a/src/Command/Redis/GeospatialGeoRadius.php +++ b/src/Command/Redis/GeospatialGeoRadius.php @@ -31,7 +31,7 @@ class GeospatialGeoRadius extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if ($arguments && is_array(end($arguments))) { $options = array_change_key_case(array_pop($arguments), CASE_UPPER); @@ -68,6 +68,6 @@ class GeospatialGeoRadius extends Command } } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/HashDelete.php b/src/Command/Redis/HashDelete.php index d6db4159..a116229d 100644 --- a/src/Command/Redis/HashDelete.php +++ b/src/Command/Redis/HashDelete.php @@ -31,8 +31,10 @@ class HashDelete extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeVariadic($arguments); + $arguments = self::normalizeVariadic($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/HashGetMultiple.php b/src/Command/Redis/HashGetMultiple.php index 0419d267..57b8bb11 100644 --- a/src/Command/Redis/HashGetMultiple.php +++ b/src/Command/Redis/HashGetMultiple.php @@ -31,8 +31,10 @@ class HashGetMultiple extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeVariadic($arguments); + $arguments = self::normalizeVariadic($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/HashScan.php b/src/Command/Redis/HashScan.php index 2304e9ee..065028cc 100644 --- a/src/Command/Redis/HashScan.php +++ b/src/Command/Redis/HashScan.php @@ -31,14 +31,14 @@ class HashScan extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 3 && is_array($arguments[2])) { $options = $this->prepareOptions(array_pop($arguments)); $arguments = array_merge($arguments, $options); } - return $arguments; + parent::setArguments($arguments); } /** diff --git a/src/Command/Redis/HashSetMultiple.php b/src/Command/Redis/HashSetMultiple.php index debc7427..c50c5bfe 100644 --- a/src/Command/Redis/HashSetMultiple.php +++ b/src/Command/Redis/HashSetMultiple.php @@ -31,7 +31,7 @@ class HashSetMultiple extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 2 && is_array($arguments[1])) { $flattenedKVs = array($arguments[0]); @@ -42,9 +42,9 @@ class HashSetMultiple extends Command $flattenedKVs[] = $v; } - return $flattenedKVs; + $arguments = $flattenedKVs; } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/HyperLogLogAdd.php b/src/Command/Redis/HyperLogLogAdd.php index a736c01e..f76546e5 100644 --- a/src/Command/Redis/HyperLogLogAdd.php +++ b/src/Command/Redis/HyperLogLogAdd.php @@ -31,8 +31,10 @@ class HyperLogLogAdd extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeVariadic($arguments); + $arguments = self::normalizeVariadic($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/HyperLogLogCount.php b/src/Command/Redis/HyperLogLogCount.php index d4661d60..99717597 100644 --- a/src/Command/Redis/HyperLogLogCount.php +++ b/src/Command/Redis/HyperLogLogCount.php @@ -31,8 +31,10 @@ class HyperLogLogCount extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeArguments($arguments); + $arguments = self::normalizeArguments($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/HyperLogLogMerge.php b/src/Command/Redis/HyperLogLogMerge.php index 2121098a..91fca097 100644 --- a/src/Command/Redis/HyperLogLogMerge.php +++ b/src/Command/Redis/HyperLogLogMerge.php @@ -31,8 +31,10 @@ class HyperLogLogMerge extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeArguments($arguments); + $arguments = self::normalizeArguments($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/KeyDelete.php b/src/Command/Redis/KeyDelete.php index 390105ae..5cb54d72 100644 --- a/src/Command/Redis/KeyDelete.php +++ b/src/Command/Redis/KeyDelete.php @@ -31,8 +31,10 @@ class KeyDelete extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeArguments($arguments); + $arguments = self::normalizeArguments($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/KeyMigrate.php b/src/Command/Redis/KeyMigrate.php index 877f8730..060c269c 100644 --- a/src/Command/Redis/KeyMigrate.php +++ b/src/Command/Redis/KeyMigrate.php @@ -31,7 +31,7 @@ class KeyMigrate extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (is_array(end($arguments))) { foreach (array_pop($arguments) as $modifier => $value) { @@ -47,6 +47,6 @@ class KeyMigrate extends Command } } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/KeyScan.php b/src/Command/Redis/KeyScan.php index e4985144..c5aaf824 100644 --- a/src/Command/Redis/KeyScan.php +++ b/src/Command/Redis/KeyScan.php @@ -31,14 +31,14 @@ class KeyScan extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 2 && is_array($arguments[1])) { $options = $this->prepareOptions(array_pop($arguments)); $arguments = array_merge($arguments, $options); } - return $arguments; + parent::setArguments($arguments); } /** diff --git a/src/Command/Redis/KeySort.php b/src/Command/Redis/KeySort.php index 42ae60b7..02f3d2ef 100644 --- a/src/Command/Redis/KeySort.php +++ b/src/Command/Redis/KeySort.php @@ -31,10 +31,12 @@ class KeySort extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 1) { - return $arguments; + parent::setArguments($arguments); + + return; } $query = array($arguments[0]); @@ -80,6 +82,6 @@ class KeySort extends Command $query[] = $sortParams['STORE']; } - return $query; + parent::setArguments($query); } } diff --git a/src/Command/Redis/ListPopFirstBlocking.php b/src/Command/Redis/ListPopFirstBlocking.php index 90dd9340..a862db09 100644 --- a/src/Command/Redis/ListPopFirstBlocking.php +++ b/src/Command/Redis/ListPopFirstBlocking.php @@ -31,13 +31,13 @@ class ListPopFirstBlocking extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 2 && is_array($arguments[0])) { list($arguments, $timeout) = $arguments; array_push($arguments, $timeout); } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/ListPushTail.php b/src/Command/Redis/ListPushTail.php index 85b9307b..57e9568e 100644 --- a/src/Command/Redis/ListPushTail.php +++ b/src/Command/Redis/ListPushTail.php @@ -31,8 +31,10 @@ class ListPushTail extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeVariadic($arguments); + $arguments = self::normalizeVariadic($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/PubSubSubscribe.php b/src/Command/Redis/PubSubSubscribe.php index cfaa2f37..1fe818d0 100644 --- a/src/Command/Redis/PubSubSubscribe.php +++ b/src/Command/Redis/PubSubSubscribe.php @@ -31,8 +31,10 @@ class PubSubSubscribe extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeArguments($arguments); + $arguments = self::normalizeArguments($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/PubSubUnsubscribe.php b/src/Command/Redis/PubSubUnsubscribe.php index 4ce4e393..c39f0291 100644 --- a/src/Command/Redis/PubSubUnsubscribe.php +++ b/src/Command/Redis/PubSubUnsubscribe.php @@ -31,8 +31,10 @@ class PubSubUnsubscribe extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeArguments($arguments); + $arguments = self::normalizeArguments($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/ServerSlaveOf.php b/src/Command/Redis/ServerSlaveOf.php index f07b0d97..21fa2904 100644 --- a/src/Command/Redis/ServerSlaveOf.php +++ b/src/Command/Redis/ServerSlaveOf.php @@ -31,12 +31,12 @@ class ServerSlaveOf extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 0 || $arguments[0] === 'NO ONE') { - return array('NO', 'ONE'); + $arguments = array('NO', 'ONE'); } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/SetAdd.php b/src/Command/Redis/SetAdd.php index 0cd453e5..c53b18c8 100644 --- a/src/Command/Redis/SetAdd.php +++ b/src/Command/Redis/SetAdd.php @@ -31,8 +31,10 @@ class SetAdd extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeVariadic($arguments); + $arguments = self::normalizeVariadic($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/SetIntersection.php b/src/Command/Redis/SetIntersection.php index f29f472f..4d76b51c 100644 --- a/src/Command/Redis/SetIntersection.php +++ b/src/Command/Redis/SetIntersection.php @@ -31,8 +31,10 @@ class SetIntersection extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeArguments($arguments); + $arguments = self::normalizeArguments($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/SetIntersectionStore.php b/src/Command/Redis/SetIntersectionStore.php index dfa5c07e..0ad4666e 100644 --- a/src/Command/Redis/SetIntersectionStore.php +++ b/src/Command/Redis/SetIntersectionStore.php @@ -31,12 +31,12 @@ class SetIntersectionStore extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 2 && is_array($arguments[1])) { - return array_merge(array($arguments[0]), $arguments[1]); + $arguments = array_merge(array($arguments[0]), $arguments[1]); } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/SetRemove.php b/src/Command/Redis/SetRemove.php index 5c7cf29e..f08ea2d4 100644 --- a/src/Command/Redis/SetRemove.php +++ b/src/Command/Redis/SetRemove.php @@ -31,8 +31,10 @@ class SetRemove extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeVariadic($arguments); + $arguments = self::normalizeVariadic($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/SetScan.php b/src/Command/Redis/SetScan.php index c9b7f742..2bdd4040 100644 --- a/src/Command/Redis/SetScan.php +++ b/src/Command/Redis/SetScan.php @@ -31,14 +31,14 @@ class SetScan extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 3 && is_array($arguments[2])) { $options = $this->prepareOptions(array_pop($arguments)); $arguments = array_merge($arguments, $options); } - return $arguments; + parent::setArguments($arguments); } /** diff --git a/src/Command/Redis/StringBitOp.php b/src/Command/Redis/StringBitOp.php index daeab32f..e54831c1 100644 --- a/src/Command/Redis/StringBitOp.php +++ b/src/Command/Redis/StringBitOp.php @@ -31,7 +31,7 @@ class StringBitOp extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 3 && is_array($arguments[2])) { list($operation, $destination) = $arguments; @@ -39,6 +39,6 @@ class StringBitOp extends Command array_unshift($arguments, $operation, $destination); } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/StringGetMultiple.php b/src/Command/Redis/StringGetMultiple.php index f04d4385..28be430e 100644 --- a/src/Command/Redis/StringGetMultiple.php +++ b/src/Command/Redis/StringGetMultiple.php @@ -31,8 +31,10 @@ class StringGetMultiple extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeArguments($arguments); + $arguments = self::normalizeArguments($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/StringSetMultiple.php b/src/Command/Redis/StringSetMultiple.php index 89251e61..7447c169 100644 --- a/src/Command/Redis/StringSetMultiple.php +++ b/src/Command/Redis/StringSetMultiple.php @@ -31,7 +31,7 @@ class StringSetMultiple extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 1 && is_array($arguments[0])) { $flattenedKVs = array(); @@ -42,9 +42,9 @@ class StringSetMultiple extends Command $flattenedKVs[] = $v; } - return $flattenedKVs; + $arguments = $flattenedKVs; } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/TransactionWatch.php b/src/Command/Redis/TransactionWatch.php index 63e0bfae..e3e34daf 100644 --- a/src/Command/Redis/TransactionWatch.php +++ b/src/Command/Redis/TransactionWatch.php @@ -31,12 +31,12 @@ class TransactionWatch extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (isset($arguments[0]) && is_array($arguments[0])) { - return $arguments[0]; + $arguments = $arguments[0]; } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/ZSetAdd.php b/src/Command/Redis/ZSetAdd.php index be46e9b3..61332404 100644 --- a/src/Command/Redis/ZSetAdd.php +++ b/src/Command/Redis/ZSetAdd.php @@ -31,7 +31,7 @@ class ZSetAdd extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (is_array(end($arguments))) { foreach (array_pop($arguments) as $member => $score) { @@ -40,6 +40,6 @@ class ZSetAdd extends Command } } - return $arguments; + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/ZSetRange.php b/src/Command/Redis/ZSetRange.php index bf289b04..5708c8e6 100644 --- a/src/Command/Redis/ZSetRange.php +++ b/src/Command/Redis/ZSetRange.php @@ -31,7 +31,7 @@ class ZSetRange extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 4) { $lastType = gettype($arguments[3]); @@ -44,12 +44,11 @@ class ZSetRange extends Command if ($lastType === 'array') { $options = $this->prepareOptions(array_pop($arguments)); - - return array_merge($arguments, $options); + $arguments = array_merge($arguments, $options); } } - return $arguments; + parent::setArguments($arguments); } /** diff --git a/src/Command/Redis/ZSetRemove.php b/src/Command/Redis/ZSetRemove.php index 313aa685..c006b9c0 100644 --- a/src/Command/Redis/ZSetRemove.php +++ b/src/Command/Redis/ZSetRemove.php @@ -31,8 +31,10 @@ class ZSetRemove extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { - return self::normalizeVariadic($arguments); + $arguments = self::normalizeVariadic($arguments); + + parent::setArguments($arguments); } } diff --git a/src/Command/Redis/ZSetScan.php b/src/Command/Redis/ZSetScan.php index 21730304..a82da0c8 100644 --- a/src/Command/Redis/ZSetScan.php +++ b/src/Command/Redis/ZSetScan.php @@ -31,14 +31,14 @@ class ZSetScan extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (count($arguments) === 3 && is_array($arguments[2])) { $options = $this->prepareOptions(array_pop($arguments)); $arguments = array_merge($arguments, $options); } - return $arguments; + parent::setArguments($arguments); } /** diff --git a/src/Command/Redis/ZSetUnionStore.php b/src/Command/Redis/ZSetUnionStore.php index f951a70a..7961df41 100644 --- a/src/Command/Redis/ZSetUnionStore.php +++ b/src/Command/Redis/ZSetUnionStore.php @@ -31,7 +31,7 @@ class ZSetUnionStore extends Command /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { $options = array(); $argc = count($arguments); @@ -47,7 +47,7 @@ class ZSetUnionStore extends Command ); } - return array_merge($arguments, $options); + parent::setArguments(array_merge($arguments, $options)); } /** diff --git a/src/Command/ScriptCommand.php b/src/Command/ScriptCommand.php index 49402ae6..0b313bbb 100644 --- a/src/Command/ScriptCommand.php +++ b/src/Command/ScriptCommand.php @@ -57,13 +57,15 @@ abstract class ScriptCommand extends ServerEvalSHA /** * {@inheritdoc} */ - protected function filterArguments(array $arguments) + public function setArguments(array $arguments) { if (($numkeys = $this->getKeysCount()) && $numkeys < 0) { $numkeys = count($arguments) + $numkeys; } - return array_merge(array(sha1($this->getScript()), (int) $numkeys), $arguments); + $arguments = array_merge(array(sha1($this->getScript()), (int) $numkeys), $arguments); + + parent::setArguments($arguments); } /**