voku / simple-mysqli

src/voku/db/Prepare.php

Doc Comments +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
    * @param mixed  $v34
    * @param mixed  $v35
    *
-   * @return mixed
+   * @return boolean
    */
   public function bind_param_debug($types, &$v1 = null, &$v2 = null, &$v3 = null, &$v4 = null, &$v5 = null, &$v6 = null, &$v7 = null, &$v8 = null, &$v9 = null, &$v10 = null, &$v11 = null, &$v12 = null, &$v13 = null, &$v14 = null, &$v15 = null, &$v16 = null, &$v17 = null, &$v18 = null, &$v19 = null, &$v20 = null, &$v21 = null, &$v22 = null, &$v23 = null, &$v24 = null, &$v25 = null, &$v26 = null, &$v27 = null, &$v28 = null, &$v29 = null, &$v30 = null, &$v31 = null, &$v32 = null, &$v33 = null, &$v34 = null, &$v35 = null)
   {

Spacing +9 added lines, -9 removed lines

@@ -81,7 +81,7 @@ 
 
     foreach ($this->_boundParams as $param) {
       $arguments[0] .= $param['type'];
-      $arguments[] =& $param['value'];
+      $arguments[] = & $param['value'];
     }
 
     return $arguments;
@@ -104,7 +104,7 @@ 
     $value = $this->_db->escape($value);
 
     if ($type === 's') {
-      $valueForSqlWithBoundParameters = "'" . $value . "'";
+      $valueForSqlWithBoundParameters = "'".$value."'";
     } elseif ($type === 'i') {
       $valueForSqlWithBoundParameters = (int)$value;
     } elseif ($type === 'd') {
@@ -185,7 +185,7 @@ 
       $trace = debug_backtrace();
     }
 
-    $args =& $trace[0]['args'];
+    $args = & $trace[0]['args'];
     $types = str_split($types);
 
     $args_count = count($args) - 1;
@@ -199,7 +199,7 @@ 
 
     $arg = 1;
     foreach ($types as $typeInner) {
-      $val =& $args[$arg];
+      $val = & $args[$arg];
       $this->_boundParams[] = array(
           'type'  => $typeInner,
           'value' => &$val,
@@ -335,7 +335,7 @@ 
     $bool = parent::prepare($query);
 
     if ($bool === false) {
-      $this->_debug->displayError('Can not prepare query: ' . $query . ' | ' . $this->error, false);
+      $this->_debug->displayError('Can not prepare query: '.$query.' | '.$this->error, false);
     }
 
     return $bool;
@@ -423,11 +423,11 @@ 
 
       // exit if we have more then 3 "DB server has gone away"-errors
       if ($RECONNECT_COUNTER > 3) {
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
         throw new DBGoneAwayException($errorMsg);
       }
 
-      $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql);
+      $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql);
 
       // reconnect
       $RECONNECT_COUNTER++;
@@ -437,10 +437,10 @@ 
       return $this->execute();
     }
 
-    $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
+    $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
 
     // this query returned an error, we must display it (only for dev) !!!
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
+    $this->_debug->displayError($errorMsg.' | '.$sql);
 
     return false;
   }

src/voku/db/Debug.php

Spacing +11 added lines, -11 removed lines

@@ -133,9 +133,9 @@ 
     $this->logger(
         array(
             'error',
-            '<strong>' . date(
+            '<strong>'.date(
                 'd. m. Y G:i:s'
-            ) . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . ') (sql-error):</strong> ' . $error . '<br>',
+            ).' ('.$fileInfo['file'].' line: '.$fileInfo['line'].') (sql-error):</strong> '.$error.'<br>',
         )
     );
 
@@ -148,11 +148,11 @@ 
         $box_bg = $this->css_mysql_box_bg;
 
         echo '
-        <div class="OBJ-mysql-box" style="border:' . $box_border . '; background:' . $box_bg . '; padding:10px; margin:10px;">
+        <div class="OBJ-mysql-box" style="border:' . $box_border.'; background:'.$box_bg.'; padding:10px; margin:10px;">
           <b style="font-size:14px;">MYSQL Error:</b>
           <code style="display:block;">
-            file / line: ' . $fileInfo['file'] . ' / ' . $fileInfo['line'] . '
-            ' . $error . '
+            file / line: ' . $fileInfo['file'].' / '.$fileInfo['line'].'
+            ' . $error.'
           </code>
         </div>
         ';
@@ -293,21 +293,21 @@ 
     // get extra info
     $infoExtra = \mysqli_info($this->_db->getLink());
     if ($infoExtra) {
-      $infoExtra = ' | info => ' . $infoExtra;
+      $infoExtra = ' | info => '.$infoExtra;
     }
 
     //
     // logging
     //
 
-    $info = 'time => ' . round($duration, 5) . ' | results => ' . (int)$results . $infoExtra . ' | SQL => ' . UTF8::htmlentities($sql);
+    $info = 'time => '.round($duration, 5).' | results => '.(int)$results.$infoExtra.' | SQL => '.UTF8::htmlentities($sql);
 
     $fileInfo = $this->getFileAndLineFromSql();
 
     return $this->logger(
         array(
             $logLevel,
-            '<strong>' . date('d. m. Y G:i:s') . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . '):</strong> ' . $info . '<br>',
+            '<strong>'.date('d. m. Y G:i:s').' ('.$fileInfo['file'].' line: '.$fileInfo['line'].'):</strong> '.$info.'<br>',
             'sql',
         )
     );
@@ -373,21 +373,21 @@ 
         $this->logger(
             array(
                 'debug',
-                $subject . ' | ' . $htmlBody,
+                $subject.' | '.$htmlBody,
             )
         );
       } elseif ($priority > 3) {
         $this->logger(
             array(
                 'error',
-                $subject . ' | ' . $htmlBody,
+                $subject.' | '.$htmlBody,
             )
         );
       } elseif ($priority < 3) {
         $this->logger(
             array(
                 'info',
-                $subject . ' | ' . $htmlBody,
+                $subject.' | '.$htmlBody,
             )
         );
       }

src/voku/db/Result.php

Doc Comments +1 added lines, -1 removed lines

@@ -340,7 +340,7 @@
    * Fetch as object.
    *
    * @param string     $class
-   * @param null|array $params
+   * @param string $params
    * @param bool       $reset
    *
    * @return object|false <p><strong>false</strong> on error</p>

src/voku/db/Helper.php

Doc Comments +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
   /**
    * Check if "mysqlnd"-driver is used.
    *
-   * @return bool
+   * @return boolean|null
    */
   public static function isMysqlndIsUsed()
   {
@@ -150,7 +150,7 @@ 
    *
    * @param DB $dbConnection
    *
-   * @return string
+   * @return integer|null
    */
   public static function get_mysql_client_version(DB $dbConnection = null)
   {
@@ -173,7 +173,7 @@ 
    *
    * @param DB $dbConnection
    *
-   * @return string
+   * @return integer|null
    */
   public static function get_mysql_server_version(DB $dbConnection = null)
   {

Spacing +17 added lines, -17 removed lines

@@ -120,23 +120,23 @@ 
 
     $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
     if ($whereSQL) {
-      $whereSQL = 'AND ' . $whereSQL;
+      $whereSQL = 'AND '.$whereSQL;
     }
 
     if ($databaseName) {
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
     }
 
     // get the row
-    $query = 'SELECT ' . $dbConnection->quote_string($searchFieldName) . ', ' . $dbConnection->quote_string($idFieldName) . ' 
-      FROM ' . $databaseName . $dbConnection->quote_string($table) . '
+    $query = 'SELECT '.$dbConnection->quote_string($searchFieldName).', '.$dbConnection->quote_string($idFieldName).' 
+      FROM ' . $databaseName.$dbConnection->quote_string($table).'
       WHERE 1 = 1
-      ' . $whereSQL . '
+      ' . $whereSQL.'
     ';
 
     if ($useCache === true) {
       $cache = new Cache(null, null, false, $useCache);
-      $cacheKey = 'sql-phonetic-search-' . md5($query);
+      $cacheKey = 'sql-phonetic-search-'.md5($query);
 
       if (
           $cache->getCacheIsReady() === true
@@ -266,10 +266,10 @@ 
     }
 
     if ($databaseName) {
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
     }
 
-    $sql = 'SHOW COLUMNS FROM ' . $databaseName . $dbConnection->escape($table);
+    $sql = 'SHOW COLUMNS FROM '.$databaseName.$dbConnection->escape($table);
     $result = $dbConnection->query($sql);
 
     if ($result && $result->num_rows > 0) {
@@ -315,17 +315,17 @@ 
 
     $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
     if ($whereSQL) {
-      $whereSQL = 'AND ' . $whereSQL;
+      $whereSQL = 'AND '.$whereSQL;
     }
 
     if ($databaseName) {
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
     }
 
     // get the row
-    $query = 'SELECT * FROM ' . $databaseName . $dbConnection->quote_string($table) . '
+    $query = 'SELECT * FROM '.$databaseName.$dbConnection->quote_string($table).'
       WHERE 1 = 1
-      ' . $whereSQL . '
+      ' . $whereSQL.'
     ';
     $result = $dbConnection->query($query);
 
@@ -345,11 +345,11 @@ 
 
           if (!in_array($fieldName, $ignoreArray, true)) {
             if (array_key_exists($fieldName, $updateArray)) {
-              $insert_keys .= ',' . $fieldName;
+              $insert_keys .= ','.$fieldName;
               $insert_values .= ',?';
               $bindings[] = $updateArray[$fieldName]; // INFO: do not escape non selected data
             } else {
-              $insert_keys .= ',' . $fieldName;
+              $insert_keys .= ','.$fieldName;
               $insert_values .= ',?';
               $bindings[] = $value; // INFO: do not escape non selected data
             }
@@ -360,10 +360,10 @@ 
         $insert_values = ltrim($insert_values, ',');
 
         // insert the "copied" row
-        $new_query = 'INSERT INTO ' . $databaseName . $dbConnection->quote_string($table) . ' 
-          (' . $insert_keys . ')
+        $new_query = 'INSERT INTO '.$databaseName.$dbConnection->quote_string($table).' 
+          (' . $insert_keys.')
           VALUES 
-          (' . $insert_values . ')
+          (' . $insert_values.')
         ';
         return $dbConnection->query($new_query, $bindings);
       }

src/voku/db/DB.php

Spacing +29 added lines, -29 removed lines

@@ -347,9 +347,9 @@ 
         }
 
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
-          $_value = '(' . implode(',', $_value) . ')';
+          $_value = '('.implode(',', $_value).')';
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
-          $_value = '(' . implode(' AND ', $_value) . ')';
+          $_value = '('.implode(' AND ', $_value).')';
         }
 
       } else {
@@ -394,7 +394,7 @@ 
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
         }
 
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
         $tmpCounter++;
       }
 
@@ -464,7 +464,7 @@ 
     }
 
     if (\mysqli_connect_errno()) {
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), false);
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), false);
 
       return false;
     }
@@ -529,14 +529,14 @@ 
           $this->socket
       );
     } catch (\Exception $e) {
-      $error = 'Error connecting to mysql server: ' . $e->getMessage();
+      $error = 'Error connecting to mysql server: '.$e->getMessage();
       $this->_debug->displayError($error, false);
       throw new DBConnectException($error, 100, $e);
     }
     \mysqli_report(MYSQLI_REPORT_OFF);
 
     if (!$this->connected) {
-      $error = 'Error connecting to mysql server: ' . \mysqli_connect_error();
+      $error = 'Error connecting to mysql server: '.\mysqli_connect_error();
       $this->_debug->displayError($error, false);
       /** @noinspection ThrowRawExceptionInspection */
       throw new DBConnectException($error, 101);
@@ -578,10 +578,10 @@ 
     }
 
     if ($databaseName) {
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
     }
 
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
 
     return $this->query($sql);
   }
@@ -775,7 +775,7 @@ 
 
     if ($useCache === true) {
       $cache = new Cache(null, null, false, $useCache);
-      $cacheKey = 'sql-' . md5($query);
+      $cacheKey = 'sql-'.md5($query);
 
       if (
           $cache->getCacheIsReady() === true
@@ -876,7 +876,7 @@ 
     static $firstInstance = null;
 
     if (
-        $hostname . $username . $password . $database . $port . $charset == ''
+        $hostname.$username.$password.$database.$port.$charset == ''
         &&
         null !== $firstInstance
     ) {
@@ -884,7 +884,7 @@ 
     }
 
     $connection = md5(
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db
     );
 
     if (!isset($instance[$connection])) {
@@ -971,10 +971,10 @@ 
     $SET = $this->_parseArrayPair($data);
 
     if ($databaseName) {
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
     }
 
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
 
     return $this->query($sql);
   }
@@ -1068,10 +1068,10 @@ 
 
       if ($this->_debug->checkForDev() === true) {
         echo "Info: maybe you have to increase your 'max_allowed_packet = 30M' in the config: 'my.conf' \n<br />";
-        echo 'Error:' . $errorMsg;
+        echo 'Error:'.$errorMsg;
       }
 
-      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql);
+      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql);
     }
 
     // return the result only if there was a "SELECT"-query
@@ -1268,11 +1268,11 @@ 
 
       // exit if we have more then 3 "DB server has gone away"-errors
       if ($RECONNECT_COUNTER > 3) {
-        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
+        $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
         throw new DBGoneAwayException($errorMsg);
       }
 
-      $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql);
+      $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql);
 
       // reconnect
       $RECONNECT_COUNTER++;
@@ -1282,10 +1282,10 @@ 
       return $this->query($sql, $sqlParams);
     }
 
-    $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
+    $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
 
     // this query returned an error, we must display it (only for dev) !!!
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
+    $this->_debug->displayError($errorMsg.' | '.$sql);
 
     return false;
   }
@@ -1308,7 +1308,7 @@ 
         )
     );
 
-    return '`' . $str . '`';
+    return '`'.$str.'`';
   }
 
   /**
@@ -1379,10 +1379,10 @@ 
     $values = implode(',', $data);
 
     if ($databaseName) {
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
     }
 
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
 
     return $this->query($sql);
   }
@@ -1467,7 +1467,7 @@ 
     $var = $this->escape($var, false, false, null);
 
     if (is_string($var)) {
-      $var = "'" . trim($var, "'") . "'";
+      $var = "'".trim($var, "'")."'";
     }
 
     return $var;
@@ -1504,10 +1504,10 @@ 
     }
 
     if ($databaseName) {
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
     }
 
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
 
     return $this->query($sql);
   }
@@ -1534,10 +1534,10 @@ 
     $return = mysqli_set_charset($this->link, $charset);
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
     /** @noinspection UsageOfSilenceOperatorInspection */
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
     /** @noinspection UsageOfSilenceOperatorInspection */
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
 
     return $return;
   }
@@ -1683,10 +1683,10 @@ 
     }
 
     if ($databaseName) {
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
     }
 
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
 
     return $this->query($sql);
   }