@@ -822,7 +822,7 @@ |
||
| 822 | 822 | /** |
| 823 | 823 | * Helper function to build SQL with sql parts. |
| 824 | 824 | * |
| 825 | - * @param array $sqls <p>The SQL part will be build.</p> |
|
| 825 | + * @param string[] $sqls <p>The SQL part will be build.</p> |
|
| 826 | 826 | * |
| 827 | 827 | * @return string |
| 828 | 828 | */ |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace voku\db; |
| 6 | 6 | |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | $value = $this->_filterParam($this->dirty); |
| 584 | 584 | $this->insert = new ActiveRecordExpressions( |
| 585 | 585 | array( |
| 586 | - 'operator' => 'INSERT INTO ' . $this->table, |
|
| 586 | + 'operator' => 'INSERT INTO '.$this->table, |
|
| 587 | 587 | 'target' => new ActiveRecordExpressionsWrap(array('target' => array_keys($this->dirty))), |
| 588 | 588 | ) |
| 589 | 589 | ); |
@@ -786,7 +786,7 @@ discard block |
||
| 786 | 786 | * @param int $i <p>The index of $n in $sql array.</p> |
| 787 | 787 | * @param ActiveRecord $o <p>The reference to $this.</p> |
| 788 | 788 | */ |
| 789 | - private function _buildSqlCallback(string &$n, $i, ActiveRecord $o) |
|
| 789 | + private function _buildSqlCallback(string & $n, $i, ActiveRecord $o) |
|
| 790 | 790 | { |
| 791 | 791 | if ( |
| 792 | 792 | 'select' === $n |
@@ -794,7 +794,7 @@ discard block |
||
| 794 | 794 | null === $o->{$n} |
| 795 | 795 | ) { |
| 796 | 796 | |
| 797 | - $n = strtoupper($n) . ' ' . $o->table . '.*'; |
|
| 797 | + $n = strtoupper($n).' '.$o->table.'.*'; |
|
| 798 | 798 | |
| 799 | 799 | } elseif ( |
| 800 | 800 | ( |
@@ -806,15 +806,15 @@ discard block |
||
| 806 | 806 | null === $o->{$n} |
| 807 | 807 | ) { |
| 808 | 808 | |
| 809 | - $n = strtoupper($n) . ' ' . $o->table; |
|
| 809 | + $n = strtoupper($n).' '.$o->table; |
|
| 810 | 810 | |
| 811 | 811 | } elseif ('delete' === $n) { |
| 812 | 812 | |
| 813 | - $n = strtoupper($n) . ' '; |
|
| 813 | + $n = strtoupper($n).' '; |
|
| 814 | 814 | |
| 815 | 815 | } else { |
| 816 | 816 | |
| 817 | - $n = (null !== $o->{$n}) ? $o->{$n} . ' ' : ''; |
|
| 817 | + $n = (null !== $o->{$n}) ? $o->{$n}.' ' : ''; |
|
| 818 | 818 | |
| 819 | 819 | } |
| 820 | 820 | } |
@@ -927,10 +927,10 @@ discard block |
||
| 927 | 927 | { |
| 928 | 928 | if (\is_array($value)) { |
| 929 | 929 | foreach ($value as $key => $val) { |
| 930 | - $this->params[$value[$key] = self::PREFIX . ++self::$count] = $val; |
|
| 930 | + $this->params[$value[$key] = self::PREFIX.++self::$count] = $val; |
|
| 931 | 931 | } |
| 932 | 932 | } elseif (\is_string($value)) { |
| 933 | - $this->params[$ph = self::PREFIX . ++self::$count] = $value; |
|
| 933 | + $this->params[$ph = self::PREFIX.++self::$count] = $value; |
|
| 934 | 934 | $value = $ph; |
| 935 | 935 | } |
| 936 | 936 | |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | $value = $this->_filterParam($value); |
| 952 | 952 | $exp = new ActiveRecordExpressions( |
| 953 | 953 | array( |
| 954 | - 'source' => ('where' == $name ? $this->table . '.' : '') . $field, |
|
| 954 | + 'source' => ('where' == $name ? $this->table.'.' : '').$field, |
|
| 955 | 955 | 'operator' => $operator, |
| 956 | 956 | 'target' => \is_array($value) |
| 957 | 957 | ? new ActiveRecordExpressionsWrap( |
@@ -984,7 +984,7 @@ discard block |
||
| 984 | 984 | $this->join = new ActiveRecordExpressions( |
| 985 | 985 | array( |
| 986 | 986 | 'source' => $this->join ?: '', |
| 987 | - 'operator' => $type . ' JOIN', |
|
| 987 | + 'operator' => $type.' JOIN', |
|
| 988 | 988 | 'target' => new ActiveRecordExpressions( |
| 989 | 989 | array('source' => $table, 'operator' => 'ON', 'target' => $on) |
| 990 | 990 | ), |
@@ -173,7 +173,7 @@ |
||
| 173 | 173 | * @param mixed $v34 |
| 174 | 174 | * @param mixed $v35 |
| 175 | 175 | * |
| 176 | - * @return mixed |
|
| 176 | + * @return boolean |
|
| 177 | 177 | */ |
| 178 | 178 | public function bind_param_debug(string $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) |
| 179 | 179 | { |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace voku\db; |
| 6 | 6 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | foreach ($this->_boundParams as $param) { |
| 84 | 84 | $arguments[0] .= $param['type']; |
| 85 | - $arguments[] =& $param['value']; |
|
| 85 | + $arguments[] = & $param['value']; |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | return $arguments; |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | $value = $this->_db->escape($value); |
| 106 | 106 | |
| 107 | 107 | if ($type === 's') { |
| 108 | - $valueForSqlWithBoundParameters = "'" . $value . "'"; |
|
| 108 | + $valueForSqlWithBoundParameters = "'".$value."'"; |
|
| 109 | 109 | } elseif ($type === 'i') { |
| 110 | 110 | $valueForSqlWithBoundParameters = (int)$value; |
| 111 | 111 | } elseif ($type === 'd') { |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | // debug_backtrace returns arguments by reference, see comments at http://php.net/manual/de/function.func-get-args.php |
| 183 | 183 | $trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 1); |
| 184 | 184 | |
| 185 | - $args =& $trace[0]['args']; |
|
| 185 | + $args = & $trace[0]['args']; |
|
| 186 | 186 | $types = \str_split($types); |
| 187 | 187 | |
| 188 | 188 | $args_count = \count($args) - 1; |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | |
| 197 | 197 | $arg = 1; |
| 198 | 198 | foreach ($types as $typeInner) { |
| 199 | - $val =& $args[$arg]; |
|
| 199 | + $val = & $args[$arg]; |
|
| 200 | 200 | $this->_boundParams[] = array( |
| 201 | 201 | 'type' => $typeInner, |
| 202 | 202 | 'value' => &$val, |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | $bool = parent::prepare($query); |
| 333 | 333 | |
| 334 | 334 | if ($bool === false) { |
| 335 | - $this->_debug->displayError('Can not prepare query: ' . $query . ' | ' . $this->error, false); |
|
| 335 | + $this->_debug->displayError('Can not prepare query: '.$query.' | '.$this->error, false); |
|
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | return $bool; |
@@ -420,11 +420,11 @@ discard block |
||
| 420 | 420 | |
| 421 | 421 | // exit if we have more then 3 "DB server has gone away"-errors |
| 422 | 422 | if ($RECONNECT_COUNTER > 3) { |
| 423 | - $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5); |
|
| 423 | + $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMsg.":\n<br />".$sql, 5); |
|
| 424 | 424 | throw new DBGoneAwayException($errorMsg); |
| 425 | 425 | } |
| 426 | 426 | |
| 427 | - $this->_debug->mailToAdmin('DB-Error', $errorMsg . ":\n<br />" . $sql); |
|
| 427 | + $this->_debug->mailToAdmin('DB-Error', $errorMsg.":\n<br />".$sql); |
|
| 428 | 428 | |
| 429 | 429 | // reconnect |
| 430 | 430 | $RECONNECT_COUNTER++; |
@@ -434,10 +434,10 @@ discard block |
||
| 434 | 434 | return $this->execute(); |
| 435 | 435 | } |
| 436 | 436 | |
| 437 | - $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql); |
|
| 437 | + $this->_debug->mailToAdmin('SQL-Error', $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 | } |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace voku\db\exceptions; |
| 6 | 6 | |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace voku\db\exceptions; |
| 6 | 6 | |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace voku\db\exceptions; |
| 6 | 6 | |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace voku\db\exceptions; |
| 6 | 6 | |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace voku\db\exceptions; |
| 6 | 6 | |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace voku\db; |
| 6 | 6 | |
@@ -139,9 +139,9 @@ discard block |
||
| 139 | 139 | $this->logger( |
| 140 | 140 | array( |
| 141 | 141 | 'error', |
| 142 | - '<strong>' . date( |
|
| 142 | + '<strong>'.date( |
|
| 143 | 143 | 'd. m. Y G:i:s' |
| 144 | - ) . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . ') (sql-error):</strong> ' . $error . '<br>', |
|
| 144 | + ).' ('.$fileInfo['file'].' line: '.$fileInfo['line'].') (sql-error):</strong> '.$error.'<br>', |
|
| 145 | 145 | ) |
| 146 | 146 | ); |
| 147 | 147 | |
@@ -153,11 +153,11 @@ discard block |
||
| 153 | 153 | $box_bg = $this->css_mysql_box_bg; |
| 154 | 154 | |
| 155 | 155 | echo ' |
| 156 | - <div class="OBJ-mysql-box" style="border:' . $box_border . '; background:' . $box_bg . '; padding:10px; margin:10px;"> |
|
| 156 | + <div class="OBJ-mysql-box" style="border:' . $box_border.'; background:'.$box_bg.'; padding:10px; margin:10px;"> |
|
| 157 | 157 | <b style="font-size:14px;">MYSQL Error:</b> |
| 158 | 158 | <code style="display:block;"> |
| 159 | - file / line: ' . $fileInfo['file'] . ' / ' . $fileInfo['line'] . ' |
|
| 160 | - ' . $error . ' |
|
| 159 | + file / line: ' . $fileInfo['file'].' / '.$fileInfo['line'].' |
|
| 160 | + ' . $error.' |
|
| 161 | 161 | </code> |
| 162 | 162 | </div> |
| 163 | 163 | '; |
@@ -295,21 +295,21 @@ discard block |
||
| 295 | 295 | // get extra info |
| 296 | 296 | $infoExtra = \mysqli_info($this->_db->getLink()); |
| 297 | 297 | if ($infoExtra) { |
| 298 | - $infoExtra = ' | info => ' . $infoExtra; |
|
| 298 | + $infoExtra = ' | info => '.$infoExtra; |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | // |
| 302 | 302 | // logging |
| 303 | 303 | // |
| 304 | 304 | |
| 305 | - $info = 'time => ' . round($duration, 5) . ' | results => ' . (int)$results . $infoExtra . ' | SQL => ' . UTF8::htmlentities($sql); |
|
| 305 | + $info = 'time => '.round($duration, 5).' | results => '.(int)$results.$infoExtra.' | SQL => '.UTF8::htmlentities($sql); |
|
| 306 | 306 | |
| 307 | 307 | $fileInfo = $this->getFileAndLineFromSql(); |
| 308 | 308 | |
| 309 | 309 | return $this->logger( |
| 310 | 310 | array( |
| 311 | 311 | $logLevel, |
| 312 | - '<strong>' . date('d. m. Y G:i:s') . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . '):</strong> ' . $info . '<br>', |
|
| 312 | + '<strong>'.date('d. m. Y G:i:s').' ('.$fileInfo['file'].' line: '.$fileInfo['line'].'):</strong> '.$info.'<br>', |
|
| 313 | 313 | 'sql', |
| 314 | 314 | ) |
| 315 | 315 | ); |
@@ -375,21 +375,21 @@ discard block |
||
| 375 | 375 | $this->logger( |
| 376 | 376 | array( |
| 377 | 377 | 'debug', |
| 378 | - $subject . ' | ' . $htmlBody, |
|
| 378 | + $subject.' | '.$htmlBody, |
|
| 379 | 379 | ) |
| 380 | 380 | ); |
| 381 | 381 | } elseif ($priority > 3) { |
| 382 | 382 | $this->logger( |
| 383 | 383 | array( |
| 384 | 384 | 'error', |
| 385 | - $subject . ' | ' . $htmlBody, |
|
| 385 | + $subject.' | '.$htmlBody, |
|
| 386 | 386 | ) |
| 387 | 387 | ); |
| 388 | 388 | } elseif ($priority < 3) { |
| 389 | 389 | $this->logger( |
| 390 | 390 | array( |
| 391 | 391 | 'info', |
| 392 | - $subject . ' | ' . $htmlBody, |
|
| 392 | + $subject.' | '.$htmlBody, |
|
| 393 | 393 | ) |
| 394 | 394 | ); |
| 395 | 395 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -declare(strict_types=1); |
|
| 3 | +declare(strict_types = 1); |
|
| 4 | 4 | |
| 5 | 5 | namespace voku\db; |
| 6 | 6 | |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | { |
| 680 | 680 | if ($as_array) { |
| 681 | 681 | return array_map( |
| 682 | - function ($object) { |
|
| 682 | + function($object) { |
|
| 683 | 683 | return (array)$object; |
| 684 | 684 | }, |
| 685 | 685 | \mysqli_fetch_fields($this->_result) |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | } |
| 792 | 792 | |
| 793 | 793 | return array_map( |
| 794 | - function ($values) use ($keys) { |
|
| 794 | + function($values) use ($keys) { |
|
| 795 | 795 | return array_combine($keys, $values); |
| 796 | 796 | }, $rows |
| 797 | 797 | ); |