Refactored IbmDb2\Connection to not use array, also not use dynamic f…

…unc. call
bnkr · Nov 21, 2013 · 51ee47f · 51ee47f
1 parent 31b59fc
commit 51ee47f
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php b/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
@@ -162,21 +162,17 @@ public function connect()
             return null;
         };
 
-        $connection               = array();
-        $connection['database']   = $findParameterValue(array('database', 'db'));
-        $connection['username']   = $findParameterValue(array('username', 'uid', 'UID'));
-        $connection['password']   = $findParameterValue(array('password', 'pwd', 'PWD'));
-        $connection['persistent'] = $findParameterValue(array('persistent', 'PERSISTENT', 'Persistent'));
-        $connection['options']    = (isset($p['driver_options']) ? $p['driver_options'] : array());
-
-        $db2_connect = ($connection['persistent'] ? 'db2_pconnect' : 'db2_connect');
-
-        $this->resource = $db2_connect(
-            $connection['database'],
-            $connection['username'],
-            $connection['password'],
-            $connection['options']
-        );
+        $database     = $findParameterValue(array('database', 'db'));
+        $username     = $findParameterValue(array('username', 'uid', 'UID'));
+        $password     = $findParameterValue(array('password', 'pwd', 'PWD'));
+        $isPersistent = $findParameterValue(array('persistent', 'PERSISTENT', 'Persistent'));
+        $options      = (isset($p['driver_options']) ? $p['driver_options'] : array());
+
+        if ($isPersistent) {
+            $this->resource = db2_pconnect($database, $username, $password, $options);
+        } else {
+            $this->resource = db2_connect($database, $username, $password, $options);
+        }
 
         if ($this->resource === false) {
             throw new Exception\RuntimeException(sprintf(