From 346986099dfcfae7c6fc02eac7d7fb47d59bac35 Mon Sep 17 00:00:00 2001 From: Daniele Alessandri Date: Mon, 21 Jul 2014 14:38:20 +0200 Subject: [PATCH] Rename method "enableAutoSlotsMap()" to "useClusterSlots()". --- src/Connection/Aggregate/RedisCluster.php | 8 ++++---- .../Predis/Connection/Aggregate/RedisClusterTest.php | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Connection/Aggregate/RedisCluster.php b/src/Connection/Aggregate/RedisCluster.php index 1c43edf1..a24ff4e9 100644 --- a/src/Connection/Aggregate/RedisCluster.php +++ b/src/Connection/Aggregate/RedisCluster.php @@ -49,7 +49,7 @@ use Predis\Response\ErrorInterface as ErrorResponseInterface; */ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable { - private $askSlotsMap = true; + private $useClusterSlots = true; private $defaultParameters = array(); private $pool = array(); private $slots = array(); @@ -409,7 +409,7 @@ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable $connection = $this->createConnection($connectionID); } - if ($this->askSlotsMap) { + if ($this->useClusterSlots) { $this->askSlotsMap($connection); } @@ -523,9 +523,9 @@ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable * * @param bool $value Enable or disable the use of CLUSTER SLOTS. */ - public function enableAutoSlotsMap($value) + public function useClusterSlots($value) { - $this->askSlotsMap = (bool) $value; + $this->useClusterSlots = (bool) $value; } /** diff --git a/tests/Predis/Connection/Aggregate/RedisClusterTest.php b/tests/Predis/Connection/Aggregate/RedisClusterTest.php index 7178ae06..13e6b5df 100644 --- a/tests/Predis/Connection/Aggregate/RedisClusterTest.php +++ b/tests/Predis/Connection/Aggregate/RedisClusterTest.php @@ -422,7 +422,7 @@ class RedisClusterTest extends PredisTestCase $connection2->expects($this->never())->method('writeRequest'); $cluster = new RedisCluster(); - $cluster->enableAutoSlotsMap(false); + $cluster->useClusterSlots(false); $cluster->add($connection1); $cluster->add($connection2); @@ -443,7 +443,7 @@ class RedisClusterTest extends PredisTestCase $connection2->expects($this->once())->method('readResponse')->with($command); $cluster = new RedisCluster(); - $cluster->enableAutoSlotsMap(false); + $cluster->useClusterSlots(false); $cluster->add($connection1); $cluster->add($connection2); @@ -503,7 +503,7 @@ class RedisClusterTest extends PredisTestCase $factory->expects($this->never())->method('create'); $cluster = new RedisCluster($factory); - $cluster->enableAutoSlotsMap(false); + $cluster->useClusterSlots(false); $cluster->add($connection1); $cluster->add($connection2); @@ -547,7 +547,7 @@ class RedisClusterTest extends PredisTestCase ->will($this->returnValue($connection3)); $cluster = new RedisCluster($factory); - $cluster->enableAutoSlotsMap(false); + $cluster->useClusterSlots(false); $cluster->add($connection1); $cluster->add($connection2); @@ -581,7 +581,7 @@ class RedisClusterTest extends PredisTestCase $factory->expects($this->never())->method('create'); $cluster = new RedisCluster($factory); - $cluster->enableAutoSlotsMap(false); + $cluster->useClusterSlots(false); $cluster->add($connection1); $cluster->add($connection2); @@ -622,7 +622,7 @@ class RedisClusterTest extends PredisTestCase ->will($this->returnValue($connection3)); $cluster = new RedisCluster($factory); - $cluster->enableAutoSlotsMap(false); + $cluster->useClusterSlots(false); $cluster->add($connection1); $cluster->add($connection2);