voku / simple-mysqli

src/voku/db/Result.php

Doc Comments +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
    * fetchObject
    *
    * @param string     $class
-   * @param null|array $params
+   * @param string $params
    * @param bool       $reset
    *
    * @return object|false false on error

src/voku/db/DB.php

Doc Comments +2 added lines, -2 removed lines

@@ -810,7 +810,7 @@ 
    * @param bool  $html_entity_decode
    * @param bool  $array_to_string
    *
-   * @return array|bool|float|int|string
+   * @return string
    */
   public function escape($var = '', $stripe_non_utf8 = true, $html_entity_decode = true, $array_to_string = false)
   {
@@ -930,7 +930,7 @@ 
   /**
    * Returns the auto generated id used in the last query.
    *
-   * @return int|string
+   * @return integer
    */
   public function insert_id()
   {

Spacing +37 added lines, -37 removed lines

@@ -298,12 +298,12 @@ 
           $this->socket
       );
     } catch (\Exception $e) {
-      $this->_displayError('Error connecting to mysql server: ' . $e->getMessage(), true);
+      $this->_displayError('Error connecting to mysql server: '.$e->getMessage(), true);
     }
     mysqli_report(MYSQLI_REPORT_OFF);
 
     if (!$this->connected) {
-      $this->_displayError('Error connecting to mysql server: ' . mysqli_connect_error(), true);
+      $this->_displayError('Error connecting to mysql server: '.mysqli_connect_error(), true);
     } else {
       $this->set_charset($this->charset);
     }
@@ -336,9 +336,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>',
         )
     );
 
@@ -351,11 +351,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>
         ';
@@ -572,7 +572,7 @@ 
     static $firstInstance = null;
 
     if (
-        $hostname . $username . $password . $database . $port . $charset == ''
+        $hostname.$username.$password.$database.$port.$charset == ''
         &&
         null !== $firstInstance
     ) {
@@ -580,7 +580,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])) {
@@ -759,7 +759,7 @@ 
       // "string"
 
       if (!in_array($var, $this->mysqlDefaultTimeFunctions, true)) {
-        $var = "'" . trim($this->escape(trim(trim((string)$var), "'")), "'") . "'";
+        $var = "'".trim($this->escape(trim(trim((string)$var), "'")), "'")."'";
       }
 
     } elseif (is_float($var)) {
@@ -779,7 +779,7 @@ 
       // "DateTime"-object
 
       try {
-        $var = "'" . $this->escape($var->format('Y-m-d H:i:s'), false, false) . "'";
+        $var = "'".$this->escape($var->format('Y-m-d H:i:s'), false, false)."'";
       } catch (\Exception $e) {
         $var = null;
       }
@@ -788,7 +788,7 @@ 
 
       // fallback ...
 
-      $var = "'" . trim($this->escape(trim(trim((string)$var), "'")), "'") . "'";
+      $var = "'".trim($this->escape(trim(trim((string)$var), "'")), "'")."'";
 
     }
 
@@ -912,16 +912,16 @@ 
 
     $infoExtra = mysqli_info($this->link);
     if ($infoExtra) {
-      $infoExtra = ' | info => ' . $infoExtra;
+      $infoExtra = ' | info => '.$infoExtra;
     }
 
-    $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();
 
     $this->logger(
         array(
             'debug',
-            '<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',
         )
     );
@@ -965,10 +965,10 @@ 
 
       // exit if we have more then 3 "DB server has gone away"-errors
       if ($reconnectCounter > 3) {
-        $this->mailToAdmin('SQL-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
+        $this->mailToAdmin('SQL-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
         throw new \Exception($errorMsg);
       } else {
-        $this->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
+        $this->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
 
         // reconnect
         $reconnectCounter++;
@@ -978,10 +978,10 @@ 
         $this->query($sql, $sqlParams);
       }
     } else {
-      $this->mailToAdmin('SQL-Warning', $errorMsg . ":\n<br />" . $sql);
+      $this->mailToAdmin('SQL-Warning', $errorMsg.":\n<br />".$sql);
 
       // this query returned an error, we must display it (only for dev) !!!
-      $this->_displayError($errorMsg . ' | ' . $sql);
+      $this->_displayError($errorMsg.' | '.$sql);
     }
   }
 
@@ -1002,21 +1002,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,
             )
         );
       }
@@ -1087,7 +1087,7 @@ 
 
     if ($useCache === true) {
       $cache = new Cache(null, null, false, $useCache);
-      $cacheKey = 'sql-' . md5($query);
+      $cacheKey = 'sql-'.md5($query);
 
       if (
           $cache->getCacheIsReady() === true
@@ -1149,9 +1149,9 @@ 
 
     $return = mysqli_set_charset($this->link, $charset);
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
-    @mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
+    @mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
-    @mysqli_query($this->link, "SET NAMES '" . ($charset === 'utf8' ? 'utf8mb4' : $charset) . "'");
+    @mysqli_query($this->link, "SET NAMES '".($charset === 'utf8' ? 'utf8mb4' : $charset)."'");
 
     return $return;
   }
@@ -1238,10 +1238,10 @@ 
 
       if ($this->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->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql);
+      $this->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql);
     }
 
     // return the result only if there was a "SELECT"-query
@@ -1278,7 +1278,7 @@ 
 
       return false;
     } elseif (mysqli_connect_errno()) {
-      $this->_displayError('Error connecting to mysql server: ' . mysqli_connect_error(), true);
+      $this->_displayError('Error connecting to mysql server: '.mysqli_connect_error(), true);
 
       return false;
     } else {
@@ -1387,7 +1387,7 @@ 
 
     $SET = $this->_parseArrayPair($data);
 
-    $sql = 'INSERT INTO ' . $this->quote_string($table) . " SET $SET;";
+    $sql = 'INSERT INTO '.$this->quote_string($table)." SET $SET;";
 
     return $this->query($sql);
   }
@@ -1474,9 +1474,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 {
@@ -1484,7 +1484,7 @@ 
         }
 
         $quoteString = $this->quote_string(trim(str_ireplace($_connector, '', $_key)));
-        $pairs[] = ' ' . $quoteString . ' ' . $_connector . ' ' . $_value . " \n";
+        $pairs[] = ' '.$quoteString.' '.$_connector.' '.$_value." \n";
       }
 
       $sql = implode($glue, $pairs);
@@ -1502,7 +1502,7 @@ 
    */
   public function quote_string($str)
   {
-    return '`' . $this->escape($str, false, false) . '`';
+    return '`'.$this->escape($str, false, false).'`';
   }
 
   /**
@@ -1556,7 +1556,7 @@ 
     }
     $values = implode(',', $data);
 
-    $sql = 'REPLACE INTO ' . $this->quote_string($table) . " ($columns) VALUES ($values);";
+    $sql = 'REPLACE INTO '.$this->quote_string($table)." ($columns) VALUES ($values);";
 
     return $this->query($sql);
   }
@@ -1596,7 +1596,7 @@ 
       $WHERE = '';
     }
 
-    $sql = 'UPDATE ' . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
+    $sql = 'UPDATE '.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
 
     return $this->query($sql);
   }
@@ -1628,7 +1628,7 @@ 
       $WHERE = '';
     }
 
-    $sql = 'DELETE FROM ' . $this->quote_string($table) . " WHERE ($WHERE);";
+    $sql = 'DELETE FROM '.$this->quote_string($table)." WHERE ($WHERE);";
 
     return $this->query($sql);
   }
@@ -1658,7 +1658,7 @@ 
       $WHERE = '';
     }
 
-    $sql = 'SELECT * FROM ' . $this->quote_string($table) . " WHERE ($WHERE);";
+    $sql = 'SELECT * FROM '.$this->quote_string($table)." WHERE ($WHERE);";
 
     return $this->query($sql);
   }

src/voku/db/Helper.php

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
     $dbFields = array();
     $db = DB::getInstance();
 
-    $sql = 'SHOW COLUMNS FROM `' . $db->escape($table) . '`';
+    $sql = 'SHOW COLUMNS FROM `'.$db->escape($table).'`';
     $result = $db->query($sql);
 
     if ($result && $result->num_rows > 0) {
@@ -71,13 +71,13 @@ 
     $table = $db->escape($table);
 
     foreach ($whereArray as $key => $value) {
-      $whereSQL = ' AND ' . $db->escape($key) . ' = ' . $db->escape($value);
+      $whereSQL = ' AND '.$db->escape($key).' = '.$db->escape($value);
     }
 
     // get the row
-    $query = 'SELECT * FROM ' . $table . '
+    $query = 'SELECT * FROM '.$table.'
       WHERE 1 = 1
-      ' . $whereSQL . '
+      ' . $whereSQL.'
     ';
     $result = $db->query($query);
 
@@ -97,13 +97,13 @@ 
             if (array_key_exists($fieldName, $updateArray)) {
 
               if ($updateArray[$fieldName] || $updateArray[$fieldName] == 0) {
-                $insert_keys .= ',' . $fieldName;
+                $insert_keys .= ','.$fieldName;
                 $insert_values .= ',?';
                 $bindings[] = $updateArray[$fieldName];
               }
 
             } else {
-              $insert_keys .= ',' . $fieldName;
+              $insert_keys .= ','.$fieldName;
               $insert_values .= ',?';
               $bindings[] = $value;
             }
@@ -111,8 +111,8 @@ 
         }
 
         // insert the "copied" row
-        $new_query = 'INSERT INTO `' . $table . '` (' . ltrim($insert_keys, ',') . ')
-          VALUES (' . ltrim($insert_values, ',') . ')
+        $new_query = 'INSERT INTO `'.$table.'` ('.ltrim($insert_keys, ',').')
+          VALUES (' . ltrim($insert_values, ',').')
         ';
         $return = $db->query($new_query, $bindings);
       }