PHP7 fixes

pear · Mar 19, 2019 · ee0563d · ee0563d
1 parent 792af65
commit ee0563d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/MDB2.php b/MDB2.php
@@ -575,7 +575,7 @@ public static function &raiseError($code = null,
                          $dummy3 = false)
     {
         $pear = new PEAR;
-        $err =& $pear->raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
+        $err = $pear->raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
         return $err;
     }
 
@@ -823,7 +823,8 @@ static function parseDSN($dsn)
             $parsed['dbsyntax'] = $str;
         }
 
-        if (!count($dsn)) {
+        $dsn = trim($dsn);
+        if (!strlen($dsn)) {
             return $parsed;
         }
 

diff --git a/MDB2/Driver/mysql.php b/MDB2/Driver/mysql.php
@@ -1132,7 +1132,8 @@ function prepare($query, $types = null, $result_types = null, $lobs = array())
         }
 
         static $prep_statement_counter = 1;
-        $statement_name = sprintf($this->options['statement_format'], $this->phptype, $prep_statement_counter++ . sha1(microtime() + mt_rand()));
+        $randomStr = sprintf('%d', $prep_statement_counter++) . sha1(microtime() . sprintf('%d', mt_rand()));
+        $statement_name = sprintf($this->options['statement_format'], $this->phptype, $randomStr);
         $statement_name = substr(strtolower($statement_name), 0, $this->options['max_identifiers_length']);
         $query = "PREPARE $statement_name FROM ".$this->quote($query, 'text');
         $statement = $this->_doQuery($query, true, $connection);

diff --git a/MDB2/Driver/mysqli.php b/MDB2/Driver/mysqli.php
@@ -1151,7 +1151,8 @@ function prepare($query, $types = null, $result_types = null, $lobs = array())
 
         if (!$is_manip) {
             static $prep_statement_counter = 1;
-            $statement_name = sprintf($this->options['statement_format'], $this->phptype, $prep_statement_counter++ . sha1(microtime() + mt_rand()));
+            $randomStr = sprintf('%d', $prep_statement_counter++) . sha1(microtime() . sprintf('%d', mt_rand()));
+            $statement_name = sprintf($this->options['statement_format'], $this->phptype, $randomStr);
             $statement_name = substr(strtolower($statement_name), 0, $this->options['max_identifiers_length']);
             $query = "PREPARE $statement_name FROM ".$this->quote($query, 'text');
 

diff --git a/MDB2/Driver/pgsql.php b/MDB2/Driver/pgsql.php
@@ -984,7 +984,8 @@ function prepare($query, $types = null, $result_types = null, $lobs = array())
             return $connection;
         }
         static $prep_statement_counter = 1;
-        $statement_name = sprintf($this->options['statement_format'], $this->phptype, $prep_statement_counter++ . sha1(microtime() + mt_rand()));
+        $randomStr = sprintf('%d', $prep_statement_counter++) . sha1(microtime() . sprintf('%d', mt_rand()));
+        $statement_name = sprintf($this->options['statement_format'], $this->phptype, $randomStr);
         $statement_name = substr(strtolower($statement_name), 0, $this->options['max_identifiers_length']);
         if (false === $pgtypes) {
             $result = @pg_prepare($connection, $statement_name, $query);