Clean up code before fast-forwarding the master branch.

lib/Predis/ClientOptions.php

@@ -2,6 +2,11 @@
 
 namespace Predis;
 
+use Predis\Options\IOption;
+use Predis\Options\CustomOption;
+use Predis\Options\ClientProfile;
+use Predis\Options\ClientKeyDistribution;
+
 class ClientOptions {
     private $_handlers, $_options;
     private static $_sharedOptions;
@@ -15,9 +20,9 @@ class ClientOptions {
             return self::$_sharedOptions;
         }
         self::$_sharedOptions = array(
-            'profile' => new Options\ClientProfile(),
-            'key_distribution' => new Options\ClientKeyDistribution(),
-            'on_connection_initialized' => new Options\CustomOption(array(
+            'profile' => new ClientProfile(),
+            'key_distribution' => new ClientKeyDistribution(),
+            'on_connection_initialized' => new CustomOption(array(
                 'validate' => function($value) {
                     if (is_callable($value)) {
                         return $value;
@@ -28,7 +33,7 @@ class ClientOptions {
         return self::$_sharedOptions;
     }
 
-    public static function define($option, Options\IOption $handler) {
+    public static function define($option, IOption $handler) {
         self::getSharedOptions();
         self::$_sharedOptions[$option] = $handler;
     }

lib/Predis/CommunicationException.php

@@ -2,7 +2,6 @@
 
 namespace Predis;
 
-use Predis\Network\IConnection;
 use Predis\Network\IConnectionSingle;
 
 class CommunicationException extends PredisException {

lib/Predis/Options/ClientKeyDistribution.php

@@ -2,9 +2,12 @@
 
 namespace Predis\Options;
 
+use Predis\Distribution\IDistributionStrategy;
+use Predis\Distribution\HashRing;
+
 class ClientKeyDistribution extends Option {
     public function validate($value) {
-        if ($value instanceof \Predis\Distribution\IDistributionStrategy) {
+        if ($value instanceof IDistributionStrategy) {
             return $value;
         }
         if (is_string($value)) {
@@ -13,10 +16,10 @@ class ClientKeyDistribution extends Option {
                 return new $value;
             }
         }
-        throw new \InvalidArgumentException("Invalid value for key distribution");
+        throw new \InvalidArgumentException('Invalid value for key distribution');
     }
 
     public function getDefault() {
-        return new \Predis\Distribution\HashRing();
+        return new HashRing();
     }
 }

lib/Predis/ResponseQueued.php

@@ -10,9 +10,7 @@ class ResponseQueued {
     }
 
     public function __get($property) {
-        if ($property === 'queued') {
-            return true;
-        }
+        return $property === 'queued';
     }
 
     public function __isset($property) {