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

Fix parameter validation and use a slightly optimized approach.

Browse Source
This commit is contained in:
Daniele Alessandri
2011-04-03 13:42:42 +02:00
parent 62b4e52eef
commit 8300b1d63c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Predis/ConnectionParameters.php
+4 -6
View File
@@ -18,7 +18,7 @@ class ConnectionParameters implements IConnectionParameters {
$parameters = $this->parseURI($parameters);
}
$this->_userDefined = array_keys($parameters);
$this->_parameters = array_merge(self::$_defaultParameters, $parameters);
$this->_parameters = $this->filter($parameters) + self::$_defaultParameters;
}
private static function ensureDefaults() {
@@ -101,11 +101,9 @@ class ConnectionParameters implements IConnectionParameters {
private function filter(Array $parameters) {
if (count($parameters) > 0) {
$validators = self::$_validators;
foreach ($parameters as $parameter => $value) {
if (isset($validators[$parameter])) {
$parameters[$parameter] = $validators[$parameter]($value);
}
$validators = array_intersect_key(self::$_validators, $parameters);
foreach ($validators as $parameter => $validator) {
$parameters[$parameter] = $validator($parameters[$parameter]);
}
}
return $parameters;