geckon01/predis
1
0
Fork 0
mirror of https://github.com/predis/predis.git synced 2026-09-12 03:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the internals of Predis\Client when initializing a connection.

Browse Source 
Note that the options set for a Predis\Network\IConnectionSingle instance
passed to the client are not automatically overridden anymore.
This commit is contained in:
Daniele Alessandri
2011-01-09 11:49:40 +01:00
parent f1223c1a90
commit d1282261b8
1 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis.php
+17 -27
View File
@@ -40,48 +40,38 @@ class Client {
throw new \InvalidArgumentException("Invalid type for client options");
}
private function initializeConnection($parameters) {
private function initializeConnection($parameters = array()) {
if ($parameters === null) {
return $this->createConnection(null);
return $this->createConnection(array());
}
if (!(is_array($parameters) || is_string($parameters)
|| $parameters instanceof IConnection
|| $parameters instanceof ConnectionParameters)) {
throw new \InvalidArgumentException(
'Array, String, Predis\ConnectionParameters or Predis\Network\IConnection expected'
);
if ($parameters instanceof IConnection) {
return $parameters;
}
if (is_array($parameters) && isset($parameters[0])) {
$cluster = new ConnectionCluster($this->_options->key_distribution);
foreach ($parameters as $shardParams) {
$cluster->add($this->createConnection($shardParams));
foreach ($parameters as $single) {
$cluster->add($single instanceof IConnectionSingle
? $single : $this->createConnection($single)
);
}
return $cluster;
}
else if ($parameters instanceof IConnectionCluster) {
return $parameters;
}
else {
return $this->createConnection($parameters);
}
return $this->createConnection($parameters);
}
private function createConnection($parameters) {
$params = null;
$connection = null;
if ($parameters instanceof IConnectionSingle) {
$connection = $parameters;
$params = $connection->getParameters();
if (is_array($parameters) || is_string($parameters)) {
$parameters = new ConnectionParameters($parameters);
}
else {
$params = $parameters instanceof ConnectionsParameters
? $parameters
: new ConnectionParameters($parameters);
$connection = ConnectionFactory::create($params);
else if (!$parameters instanceof ConnectionParameters) {
$type = is_object($parameters) ? get_class($parameters) : gettype($parameters);
throw new \InvalidArgumentException(
"Cannot create a connection using an argument of type $type"
);
}
$options = $this->_options;
$connection = ConnectionFactory::create($parameters);
$protocol = $connection->getProtocol();
$protocol->setOption('iterable_multibulk', $options->iterable_multibulk);
$protocol->setOption('throw_on_error', $options->throw_on_error);