Completed
Push — master ( 7b7bbd...3260db )
by Lars
02:21
created
src/voku/db/Debug.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
133 133
     $this->logger(
134 134
         array(
135 135
             'error',
136
-            '<strong>' . date(
136
+            '<strong>'.date(
137 137
                 'd. m. Y G:i:s'
138
-            ) . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . ') (sql-error):</strong> ' . $error . '<br>',
138
+            ).' ('.$fileInfo['file'].' line: '.$fileInfo['line'].') (sql-error):</strong> '.$error.'<br>',
139 139
         )
140 140
     );
141 141
 
@@ -148,11 +148,11 @@  discard block
 block discarded – undo
148 148
         $box_bg = $this->css_mysql_box_bg;
149 149
 
150 150
         echo '
151
-        <div class="OBJ-mysql-box" style="border:' . $box_border . '; background:' . $box_bg . '; padding:10px; margin:10px;">
151
+        <div class="OBJ-mysql-box" style="border:' . $box_border.'; background:'.$box_bg.'; padding:10px; margin:10px;">
152 152
           <b style="font-size:14px;">MYSQL Error:</b>
153 153
           <code style="display:block;">
154
-            file / line: ' . $fileInfo['file'] . ' / ' . $fileInfo['line'] . '
155
-            ' . $error . '
154
+            file / line: ' . $fileInfo['file'].' / '.$fileInfo['line'].'
155
+            ' . $error.'
156 156
           </code>
157 157
         </div>
158 158
         ';
@@ -293,21 +293,21 @@  discard block
 block discarded – undo
293 293
     // get extra info
294 294
     $infoExtra = \mysqli_info($this->_db->getLink());
295 295
     if ($infoExtra) {
296
-      $infoExtra = ' | info => ' . $infoExtra;
296
+      $infoExtra = ' | info => '.$infoExtra;
297 297
     }
298 298
 
299 299
     //
300 300
     // logging
301 301
     //
302 302
 
303
-    $info = 'time => ' . round($duration, 5) . ' | results => ' . (int)$results . $infoExtra . ' | SQL => ' . UTF8::htmlentities($sql);
303
+    $info = 'time => '.round($duration, 5).' | results => '.(int)$results.$infoExtra.' | SQL => '.UTF8::htmlentities($sql);
304 304
 
305 305
     $fileInfo = $this->getFileAndLineFromSql();
306 306
 
307 307
     return $this->logger(
308 308
         array(
309 309
             $logLevel,
310
-            '<strong>' . date('d. m. Y G:i:s') . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . '):</strong> ' . $info . '<br>',
310
+            '<strong>'.date('d. m. Y G:i:s').' ('.$fileInfo['file'].' line: '.$fileInfo['line'].'):</strong> '.$info.'<br>',
311 311
             'sql',
312 312
         )
313 313
     );
@@ -373,21 +373,21 @@  discard block
 block discarded – undo
373 373
         $this->logger(
374 374
             array(
375 375
                 'debug',
376
-                $subject . ' | ' . $htmlBody,
376
+                $subject.' | '.$htmlBody,
377 377
             )
378 378
         );
379 379
       } elseif ($priority > 3) {
380 380
         $this->logger(
381 381
             array(
382 382
                 'error',
383
-                $subject . ' | ' . $htmlBody,
383
+                $subject.' | '.$htmlBody,
384 384
             )
385 385
         );
386 386
       } elseif ($priority < 3) {
387 387
         $this->logger(
388 388
             array(
389 389
                 'info',
390
-                $subject . ' | ' . $htmlBody,
390
+                $subject.' | '.$htmlBody,
391 391
             )
392 392
         );
393 393
       }
Please login to merge, or discard this patch.
src/voku/db/Prepare.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 
80 80
     foreach ($this->_boundParams as $param) {
81 81
       $arguments[0] .= $param['type'];
82
-      $arguments[] =& $param['value'];
82
+      $arguments[] = & $param['value'];
83 83
     }
84 84
 
85 85
     return $arguments;
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
     $value = $this->_db->escape($value);
103 103
 
104 104
     if ($type === 's') {
105
-      $valueForSqlWithBoundParameters = "'" . $value . "'";
105
+      $valueForSqlWithBoundParameters = "'".$value."'";
106 106
     } elseif ($type === 'i') {
107 107
       $valueForSqlWithBoundParameters = (int)$value;
108 108
     } elseif ($type === 'd') {
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
       $trace = debug_backtrace();
184 184
     }
185 185
 
186
-    $args =& $trace[0]['args'];
186
+    $args = & $trace[0]['args'];
187 187
     $types = str_split($types);
188 188
 
189 189
     $args_count = count($args) - 1;
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 
198 198
     $arg = 1;
199 199
     foreach ($types as $typeInner) {
200
-      $val =& $args[$arg];
200
+      $val = & $args[$arg];
201 201
       $this->_boundParams[] = array(
202 202
           'type'  => $typeInner,
203 203
           'value' => &$val,
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
     $bool = parent::prepare($query);
334 334
 
335 335
     if ($bool === false) {
336
-      $this->_debug->displayError('Can\'t prepare Query: ' . $query . ' | ' . $this->error, false);
336
+      $this->_debug->displayError('Can\'t prepare Query: '.$query.' | '.$this->error, false);
337 337
     }
338 338
 
339 339
     return true;
@@ -420,11 +420,11 @@  discard block
 block discarded – undo
420 420
 
421 421
       // exit if we have more then 3 "DB server has gone away"-errors
422 422
       if ($reconnectCounter > 3) {
423
-        $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
423
+        $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
424 424
         throw new \Exception($errorMsg);
425 425
       }
426 426
 
427
-      $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
427
+      $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
428 428
 
429 429
       // reconnect
430 430
       $reconnectCounter++;
@@ -434,10 +434,10 @@  discard block
 block discarded – undo
434 434
       return $this->execute();
435 435
     }
436 436
 
437
-    $this->_debug->mailToAdmin('SQL-Warning', $errorMsg . ":\n<br />" . $sql);
437
+    $this->_debug->mailToAdmin('SQL-Warning', $errorMsg.":\n<br />".$sql);
438 438
 
439 439
     // this query returned an error, we must display it (only for dev) !!!
440
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
440
+    $this->_debug->displayError($errorMsg.' | '.$sql);
441 441
 
442 442
     return false;
443 443
   }
Please login to merge, or discard this patch.
src/voku/db/Helper.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -120,23 +120,23 @@  discard block
 block discarded – undo
120 120
 
121 121
     $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
122 122
     if ($whereSQL) {
123
-      $whereSQL = 'AND ' . $whereSQL;
123
+      $whereSQL = 'AND '.$whereSQL;
124 124
     }
125 125
 
126 126
     if ($databaseName) {
127
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
127
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
128 128
     }
129 129
 
130 130
     // get the row
131
-    $query = 'SELECT ' . $dbConnection->quote_string($searchFieldName) . ', ' . $dbConnection->quote_string($idFieldName) . ' 
132
-      FROM ' . $databaseName . $dbConnection->quote_string($table) . '
131
+    $query = 'SELECT '.$dbConnection->quote_string($searchFieldName).', '.$dbConnection->quote_string($idFieldName).' 
132
+      FROM ' . $databaseName.$dbConnection->quote_string($table).'
133 133
       WHERE 1 = 1
134
-      ' . $whereSQL . '
134
+      ' . $whereSQL.'
135 135
     ';
136 136
 
137 137
     if ($useCache === true) {
138 138
       $cache = new Cache(null, null, false, $useCache);
139
-      $cacheKey = 'sql-phonetic-search-' . md5($query);
139
+      $cacheKey = 'sql-phonetic-search-'.md5($query);
140 140
 
141 141
       if (
142 142
           $cache->getCacheIsReady() === true
@@ -266,10 +266,10 @@  discard block
 block discarded – undo
266 266
     }
267 267
 
268 268
     if ($databaseName) {
269
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
269
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
270 270
     }
271 271
 
272
-    $sql = 'SHOW COLUMNS FROM ' . $databaseName . $dbConnection->escape($table);
272
+    $sql = 'SHOW COLUMNS FROM '.$databaseName.$dbConnection->escape($table);
273 273
     $result = $dbConnection->query($sql);
274 274
 
275 275
     if ($result && $result->num_rows > 0) {
@@ -315,17 +315,17 @@  discard block
 block discarded – undo
315 315
 
316 316
     $whereSQL = $dbConnection->_parseArrayPair($whereArray, 'AND');
317 317
     if ($whereSQL) {
318
-      $whereSQL = 'AND ' . $whereSQL;
318
+      $whereSQL = 'AND '.$whereSQL;
319 319
     }
320 320
 
321 321
     if ($databaseName) {
322
-      $databaseName = $dbConnection->quote_string(trim($databaseName)) . '.';
322
+      $databaseName = $dbConnection->quote_string(trim($databaseName)).'.';
323 323
     }
324 324
 
325 325
     // get the row
326
-    $query = 'SELECT * FROM ' . $databaseName . $dbConnection->quote_string($table) . '
326
+    $query = 'SELECT * FROM '.$databaseName.$dbConnection->quote_string($table).'
327 327
       WHERE 1 = 1
328
-      ' . $whereSQL . '
328
+      ' . $whereSQL.'
329 329
     ';
330 330
     $result = $dbConnection->query($query);
331 331
 
@@ -345,11 +345,11 @@  discard block
 block discarded – undo
345 345
 
346 346
           if (!in_array($fieldName, $ignoreArray, true)) {
347 347
             if (array_key_exists($fieldName, $updateArray)) {
348
-              $insert_keys .= ',' . $fieldName;
348
+              $insert_keys .= ','.$fieldName;
349 349
               $insert_values .= ',?';
350 350
               $bindings[] = $updateArray[$fieldName]; // INFO: do not escape non selected data
351 351
             } else {
352
-              $insert_keys .= ',' . $fieldName;
352
+              $insert_keys .= ','.$fieldName;
353 353
               $insert_values .= ',?';
354 354
               $bindings[] = $value; // INFO: do not escape non selected data
355 355
             }
@@ -360,10 +360,10 @@  discard block
 block discarded – undo
360 360
         $insert_values = ltrim($insert_values, ',');
361 361
 
362 362
         // insert the "copied" row
363
-        $new_query = 'INSERT INTO ' . $databaseName . $dbConnection->quote_string($table) . ' 
364
-          (' . $insert_keys . ')
363
+        $new_query = 'INSERT INTO '.$databaseName.$dbConnection->quote_string($table).' 
364
+          (' . $insert_keys.')
365 365
           VALUES 
366
-          (' . $insert_values . ')
366
+          (' . $insert_values.')
367 367
         ';
368 368
         return $dbConnection->query($new_query, $bindings);
369 369
       }
Please login to merge, or discard this patch.
src/voku/db/DB.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -283,12 +283,12 @@  discard block
 block discarded – undo
283 283
           $this->socket
284 284
       );
285 285
     } catch (\Exception $e) {
286
-      $this->_debug->displayError('Error connecting to mysql server: ' . $e->getMessage(), true);
286
+      $this->_debug->displayError('Error connecting to mysql server: '.$e->getMessage(), true);
287 287
     }
288 288
     \mysqli_report(MYSQLI_REPORT_OFF);
289 289
 
290 290
     if (!$this->connected) {
291
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), true);
291
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), true);
292 292
     } else {
293 293
       $this->set_charset($this->charset);
294 294
     }
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
     static $firstInstance = null;
384 384
 
385 385
     if (
386
-        $hostname . $username . $password . $database . $port . $charset == ''
386
+        $hostname.$username.$password.$database.$port.$charset == ''
387 387
         &&
388 388
         null !== $firstInstance
389 389
     ) {
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
     }
392 392
 
393 393
     $connection = md5(
394
-        $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db
394
+        $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db
395 395
     );
396 396
 
397 397
     if (!isset($instance[$connection])) {
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
     $var = $this->escape($var, false, false, null);
602 602
 
603 603
     if (is_string($var)) {
604
-      $var = "'" . trim($var, "'") . "'";
604
+      $var = "'".trim($var, "'")."'";
605 605
     }
606 606
 
607 607
     return $var;
@@ -787,11 +787,11 @@  discard block
 block discarded – undo
787 787
 
788 788
       // exit if we have more then 3 "DB server has gone away"-errors
789 789
       if ($RECONNECT_COUNTER > 3) {
790
-        $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5);
790
+        $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg.":\n<br />".$sql, 5);
791 791
         throw new \Exception($errorMsg);
792 792
       }
793 793
 
794
-      $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql);
794
+      $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql);
795 795
 
796 796
       // reconnect
797 797
       $RECONNECT_COUNTER++;
@@ -801,10 +801,10 @@  discard block
 block discarded – undo
801 801
       return $this->query($sql, $sqlParams);
802 802
     }
803 803
 
804
-    $this->_debug->mailToAdmin('SQL-Warning', $errorMsg . ":\n<br />" . $sql);
804
+    $this->_debug->mailToAdmin('SQL-Warning', $errorMsg.":\n<br />".$sql);
805 805
 
806 806
     // this query returned an error, we must display it (only for dev) !!!
807
-    $this->_debug->displayError($errorMsg . ' | ' . $sql);
807
+    $this->_debug->displayError($errorMsg.' | '.$sql);
808 808
 
809 809
     return false;
810 810
   }
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
874 874
 
875 875
     if ($useCache === true) {
876 876
       $cache = new Cache(null, null, false, $useCache);
877
-      $cacheKey = 'sql-' . md5($query);
877
+      $cacheKey = 'sql-'.md5($query);
878 878
 
879 879
       if (
880 880
           $cache->getCacheIsReady() === true
@@ -991,10 +991,10 @@  discard block
 block discarded – undo
991 991
     $return = mysqli_set_charset($this->link, $charset);
992 992
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
993 993
     /** @noinspection UsageOfSilenceOperatorInspection */
994
-    @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset);
994
+    @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset);
995 995
     /** @noinspection PhpUsageOfSilenceOperatorInspection */
996 996
     /** @noinspection UsageOfSilenceOperatorInspection */
997
-    @\mysqli_query($this->link, "SET NAMES '" . $charset . "'");
997
+    @\mysqli_query($this->link, "SET NAMES '".$charset."'");
998 998
 
999 999
     return $return;
1000 1000
   }
@@ -1081,10 +1081,10 @@  discard block
 block discarded – undo
1081 1081
 
1082 1082
       if ($this->_debug->checkForDev() === true) {
1083 1083
         echo "Info: maybe you have to increase your 'max_allowed_packet = 30M' in the config: 'my.conf' \n<br />";
1084
-        echo 'Error:' . $errorMsg;
1084
+        echo 'Error:'.$errorMsg;
1085 1085
       }
1086 1086
 
1087
-      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql);
1087
+      $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql);
1088 1088
     }
1089 1089
 
1090 1090
     // return the result only if there was a "SELECT"-query
@@ -1123,7 +1123,7 @@  discard block
 block discarded – undo
1123 1123
     }
1124 1124
 
1125 1125
     if (\mysqli_connect_errno()) {
1126
-      $this->_debug->displayError('Error connecting to mysql server: ' . \mysqli_connect_error(), true);
1126
+      $this->_debug->displayError('Error connecting to mysql server: '.\mysqli_connect_error(), true);
1127 1127
 
1128 1128
       return false;
1129 1129
     }
@@ -1234,10 +1234,10 @@  discard block
 block discarded – undo
1234 1234
     $SET = $this->_parseArrayPair($data);
1235 1235
 
1236 1236
     if ($databaseName) {
1237
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1237
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1238 1238
     }
1239 1239
 
1240
-    $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;";
1240
+    $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;";
1241 1241
 
1242 1242
     return $this->query($sql);
1243 1243
   }
@@ -1338,9 +1338,9 @@  discard block
 block discarded – undo
1338 1338
         }
1339 1339
 
1340 1340
         if ($_connector === 'NOT IN' || $_connector === 'IN') {
1341
-          $_value = '(' . implode(',', $_value) . ')';
1341
+          $_value = '('.implode(',', $_value).')';
1342 1342
         } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') {
1343
-          $_value = '(' . implode(' AND ', $_value) . ')';
1343
+          $_value = '('.implode(' AND ', $_value).')';
1344 1344
         }
1345 1345
 
1346 1346
       } else {
@@ -1385,7 +1385,7 @@  discard block
 block discarded – undo
1385 1385
           $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue
1386 1386
         }
1387 1387
 
1388
-        $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
1388
+        $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
1389 1389
         $tmpCounter++;
1390 1390
       }
1391 1391
 
@@ -1417,7 +1417,7 @@  discard block
 block discarded – undo
1417 1417
         )
1418 1418
     );
1419 1419
 
1420
-    return '`' . $str . '`';
1420
+    return '`'.$str.'`';
1421 1421
   }
1422 1422
 
1423 1423
   /**
@@ -1473,10 +1473,10 @@  discard block
 block discarded – undo
1473 1473
     $values = implode(',', $data);
1474 1474
 
1475 1475
     if ($databaseName) {
1476
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1476
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1477 1477
     }
1478 1478
 
1479
-    $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);";
1479
+    $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);";
1480 1480
 
1481 1481
     return $this->query($sql);
1482 1482
   }
@@ -1519,10 +1519,10 @@  discard block
 block discarded – undo
1519 1519
     }
1520 1520
 
1521 1521
     if ($databaseName) {
1522
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1522
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1523 1523
     }
1524 1524
 
1525
-    $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);";
1525
+    $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);";
1526 1526
 
1527 1527
     return $this->query($sql);
1528 1528
   }
@@ -1556,10 +1556,10 @@  discard block
 block discarded – undo
1556 1556
     }
1557 1557
 
1558 1558
     if ($databaseName) {
1559
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1559
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1560 1560
     }
1561 1561
 
1562
-    $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1562
+    $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1563 1563
 
1564 1564
     return $this->query($sql);
1565 1565
   }
@@ -1593,10 +1593,10 @@  discard block
 block discarded – undo
1593 1593
     }
1594 1594
 
1595 1595
     if ($databaseName) {
1596
-      $databaseName = $this->quote_string(trim($databaseName)) . '.';
1596
+      $databaseName = $this->quote_string(trim($databaseName)).'.';
1597 1597
     }
1598 1598
 
1599
-    $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);";
1599
+    $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);";
1600 1600
 
1601 1601
     return $this->query($sql);
1602 1602
   }
Please login to merge, or discard this patch.