Browse Source

Change the code layout of private/protected fields.

Daniele Alessandri 13 years ago
parent
commit
3f2814c254

+ 1 - 0
lib/Predis/ClientOptions.php

@@ -10,6 +10,7 @@ use Predis\Options\ClientConnectionFactory;
 
 class ClientOptions {
     private static $_sharedOptions;
+
     private $_options = array();
     private $_handlers;
     private $_defined;

+ 6 - 1
lib/Predis/Distribution/HashRing.php

@@ -5,7 +5,12 @@ namespace Predis\Distribution;
 class HashRing implements IDistributionStrategy {
     const DEFAULT_REPLICAS = 128;
     const DEFAULT_WEIGHT   = 100;
-    private $_nodes, $_ring, $_ringKeys, $_ringKeysCount, $_replicas;
+
+    private $_nodes;
+    private $_ring;
+    private $_ringKeys;
+    private $_ringKeysCount;
+    private $_replicas;
 
     public function __construct($replicas = self::DEFAULT_REPLICAS) {
         $this->_replicas = $replicas;

+ 3 - 1
lib/Predis/Iterators/MultiBulkResponse.php

@@ -3,7 +3,9 @@
 namespace Predis\Iterators;
 
 abstract class MultiBulkResponse implements \Iterator, \Countable {
-    protected $_position, $_current, $_replySize;
+    protected $_position;
+    protected $_current;
+    protected $_replySize;
 
     public function rewind() {
         // NOOP

+ 3 - 1
lib/Predis/MonitorContext.php

@@ -3,7 +3,9 @@
 namespace Predis;
 
 class MonitorContext implements \Iterator {
-    private $_client, $_isValid, $_position;
+    private $_client;
+    private $_isValid;
+    private $_position;
 
     public function __construct(Client $client) {
         $this->checkCapabilities($client);

+ 2 - 1
lib/Predis/Options/CustomOption.php

@@ -3,7 +3,8 @@
 namespace Predis\Options;
 
 class CustomOption implements IOption {
-    private $_validate, $_default;
+    private $_validate;
+    private $_default;
 
     public function __construct(Array $options) {
         $this->_validate = $this->filterCallable($options, 'validate');

+ 3 - 1
lib/Predis/PubSubContext.php

@@ -14,7 +14,9 @@ class PubSubContext implements \Iterator {
     const STATUS_SUBSCRIBED  = 0x0010;
     const STATUS_PSUBSCRIBED = 0x0100;
 
-    private $_client, $_position, $_options;
+    private $_client;
+    private $_position;
+    private $_options;
 
     public function __construct(Client $client, Array $options = null) {
         $this->checkCapabilities($client);

+ 9 - 2
lib/Predis/Transaction/MultiExecContext.php

@@ -11,8 +11,15 @@ use Predis\ProtocolException;
 use Predis\CommunicationException;
 
 class MultiExecContext {
-    private $_initialized, $_discarded, $_insideBlock, $_checkAndSet, $_watchedKeys;
-    private $_client, $_options, $_commands, $_supportsWatch;
+    private $_client;
+    private $_options;
+    private $_commands;
+    private $_supportsWatch;
+    private $_initialized;
+    private $_discarded;
+    private $_insideBlock;
+    private $_checkAndSet;
+    private $_watchedKeys;
 
     public function __construct(Client $client, Array $options = null) {
         $this->checkCapabilities($client);