voku / simple-mysqli

src/voku/db/Helper.php

Spacing +23 added lines, -23 removed lines

@@ -25,7 +25,7 @@ 
         $configOrig = $dbConnection->getConfig();
         \array_walk_recursive(
             $configOrig,
-            static function ($k, $v) use (&$configTmp) {
+            static function($k, $v) use (&$configTmp) {
                 $configTmp[] = $v;
                 $configTmp[] = $k;
             }
@@ -51,7 +51,7 @@ 
         $optimized = 0;
         if (!empty($tables)) {
             foreach ($tables as $table) {
-                $optimize = 'OPTIMIZE TABLE ' . $dbConnection->quote_string($table);
+                $optimize = 'OPTIMIZE TABLE '.$dbConnection->quote_string($table);
                 $result = $dbConnection->query($optimize);
                 if ($result) {
                     $optimized++;
@@ -79,7 +79,7 @@ 
         $optimized = 0;
         if (!empty($tables)) {
             foreach ($tables as $table) {
-                $optimize = 'REPAIR TABLE ' . $dbConnection->quote_string($table);
+                $optimize = 'REPAIR TABLE '.$dbConnection->quote_string($table);
                 $result = $dbConnection->query($optimize);
                 if ($result) {
                     $optimized++;
@@ -199,23 +199,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) {
             $cache = new Cache(null, null, false, $useCache);
-            $cacheKey = 'sql-phonetic-search-' . \md5($query);
+            $cacheKey = 'sql-phonetic-search-'.\md5($query);
 
             if (
                 $cache->getCacheIsReady()
@@ -290,7 +290,7 @@ 
             }
         }
 
-        return $MYSQL_CLIENT_VERSION_CACHE[$cacheKey] = (string) \mysqli_get_client_version($dbConnection->getLink());
+        return $MYSQL_CLIENT_VERSION_CACHE[$cacheKey] = (string)\mysqli_get_client_version($dbConnection->getLink());
     }
 
     /**
@@ -318,11 +318,11 @@ 
         if ($doctrineConnection) {
             $doctrineWrappedConnection = $doctrineConnection->getWrappedConnection();
             if ($doctrineWrappedConnection instanceof \Doctrine\DBAL\Driver\PDOConnection) {
-                return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string) $doctrineWrappedConnection->getServerVersion();
+                return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string)$doctrineWrappedConnection->getServerVersion();
             }
         }
 
-        return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string) \mysqli_get_server_version($dbConnection->getLink());
+        return $MYSQL_SERVER_VERSION_CACHE[$cacheKey] = (string)\mysqli_get_server_version($dbConnection->getLink());
     }
 
     /**
@@ -363,10 +363,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) {
@@ -412,17 +412,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);
 
@@ -441,11 +441,11 @@ 
                 foreach ($tmpArray as $fieldName => $value) {
                     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
                         }
@@ -456,10 +456,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 +50 added lines, -50 removed lines

@@ -297,10 +297,10 @@ 
         }
 
         if ($port) {
-            $this->port = (int) $port;
+            $this->port = (int)$port;
         } else {
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
-            $this->port = (int) @\ini_get('mysqli.default_port');
+            $this->port = (int)@\ini_get('mysqli.default_port');
         }
 
         // fallback
@@ -429,18 +429,18 @@ 
                 }
 
                 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).')';
                 } elseif ($firstKey && $firstValue) {
                     if (\strpos($firstKey, ' +') !== false) {
                         $firstKey = \str_replace(' +', '', $firstKey);
-                        $_value = $firstKey . ' + ' . $firstValue;
+                        $_value = $firstKey.' + '.$firstValue;
                     }
 
                     if (\strpos($firstKey, ' -') !== false) {
                         $firstKey = \str_replace(' -', '', $firstKey);
-                        $_value = $firstKey . ' - ' . $firstValue;
+                        $_value = $firstKey.' - '.$firstValue;
                     }
                 }
             } else {
@@ -460,7 +460,7 @@ 
                 )
             );
 
-            $_value = (array) $_value;
+            $_value = (array)$_value;
 
             if (!$_glueHelper) {
                 $_glueHelper = $glue;
@@ -484,7 +484,7 @@ 
                     $valueInner = "''";
                 }
 
-                $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n";
+                $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n";
                 $tmpCounter++;
             }
 
@@ -535,7 +535,7 @@ 
             unset($params[$key]);
 
             $sql = \substr_replace($sql, $replacement, $offset, 1);
-            $offset = \strpos($sql, '?', $offset + \strlen((string) $replacement));
+            $offset = \strpos($sql, '?', $offset + \strlen((string)$replacement));
         }
 
         return ['sql' => $sql, 'params' => $params];
@@ -571,7 +571,7 @@ 
 
             // add ":" if needed
             if (\strpos($name, ':') !== 0) {
-                $nameTmp = ':' . $name;
+                $nameTmp = ':'.$name;
             } else {
                 $nameTmp = $name;
             }
@@ -579,7 +579,7 @@ 
             if ($offset === null) {
                 $offset = \strpos($sql, $nameTmp);
             } else {
-                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string) $replacement));
+                $offset = \strpos($sql, $nameTmp, $offset + \strlen((string)$replacement));
             }
 
             if ($offset === false) {
@@ -611,7 +611,7 @@ 
             return \mysqli_affected_rows($this->mysqli_link);
         }
 
-        return (int) $this->affected_rows;
+        return (int)$this->affected_rows;
     }
 
     /**
@@ -763,7 +763,7 @@ 
                 $this->connected = $this->doctrine_connection->isConnected();
 
                 if (!$this->connected) {
-                    $error = 'Error connecting to mysql server: ' . $this->doctrine_connection->errorInfo();
+                    $error = 'Error connecting to mysql server: '.$this->doctrine_connection->errorInfo();
                     $this->debug->displayError($error, false);
 
                     throw new DBConnectException($error, 101);
@@ -780,7 +780,7 @@ 
                 $this->connected = $this->doctrine_connection->isConnected();
 
                 if (!$this->connected) {
-                    $error = 'Error connecting to mysql server: ' . $this->doctrine_connection->errorInfo();
+                    $error = 'Error connecting to mysql server: '.$this->doctrine_connection->errorInfo();
                     $this->debug->displayError($error, false);
 
                     throw new DBConnectException($error, 101);
@@ -840,10 +840,10 @@ 
                 $this->database,
                 $this->port,
                 $this->socket,
-                (int) $flags
+                (int)$flags
             );
         } 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);
@@ -852,7 +852,7 @@ 
 
         $errno = \mysqli_connect_errno();
         if (!$this->connected || $errno) {
-            $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')';
+            $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')';
             $this->debug->displayError($error, false);
 
             throw new DBConnectException($error, 101);
@@ -894,10 +894,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);
     }
@@ -988,14 +988,14 @@ 
                 $var = $var->format('Y-m-d H:i:s');
                 $type = 'string';
             } elseif (\method_exists($var, '__toString')) {
-                $var = (string) $var;
+                $var = (string)$var;
                 $type = 'string';
             }
         }
 
         switch ($type) {
             case 'boolean':
-                $var = (int) $var;
+                $var = (int)$var;
 
                 break;
 
@@ -1036,7 +1036,7 @@ 
                     }
                 } else {
                     $varCleaned = [];
-                    foreach ((array) $var as $key => $value) {
+                    foreach ((array)$var as $key => $value) {
                         $key = $this->escape($key, $stripe_non_utf8, $html_entity_decode);
                         $value = $this->escape($value, $stripe_non_utf8, $html_entity_decode);
 
@@ -1099,7 +1099,7 @@ 
 
         if ($useCache) {
             $cache = new Cache(null, null, false, $useCache);
-            $cacheKey = 'sql-' . \md5($query);
+            $cacheKey = 'sql-'.\md5($query);
 
             if (
                 $cache->getCacheIsReady()
@@ -1270,7 +1270,7 @@ 
         }
 
         if (
-            '' . $hostname . $username . $password . $database . $port . $charset === '' . $port . $charset
+            ''.$hostname.$username.$password.$database.$port.$charset === ''.$port.$charset
             &&
             $firstInstance instanceof self
         ) {
@@ -1286,13 +1286,13 @@ 
             if (\is_object($extra_config_value)) {
                 $extra_config_value_tmp = \spl_object_hash($extra_config_value);
             } else {
-                $extra_config_value_tmp = (string) $extra_config_value;
+                $extra_config_value_tmp = (string)$extra_config_value;
             }
-            $extra_config_string .= $extra_config_key . $extra_config_value_tmp;
+            $extra_config_string .= $extra_config_key.$extra_config_value_tmp;
         }
 
         $connection = \md5(
-            $hostname . $username . $password . $database . $port . $charset . (int) $exit_on_error . (int) $echo_on_error . $logger_class_name . $logger_level . $extra_config_string
+            $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string
         );
 
         if (!isset($instance[$connection])) {
@@ -1431,10 +1431,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);
     }
@@ -1939,12 +1939,12 @@ 
 
             // exit if we have more then 3 "DB server has gone away"-errors
             if ($RECONNECT_COUNTER > 3) {
-                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5);
+                $this->debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5);
 
                 throw new DBGoneAwayException($errorMessage);
             }
 
-            $this->debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
+            $this->debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
 
             // reconnect
             $RECONNECT_COUNTER++;
@@ -1958,7 +1958,7 @@ 
             return false;
         }
 
-        $this->debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql);
+        $this->debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql);
 
         $force_exception_after_error = null; // auto
         if ($this->in_transaction) {
@@ -1966,7 +1966,7 @@ 
         }
         // this query returned an error, we must display it (only for dev) !!!
 
-        $this->debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error);
+        $this->debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error);
 
         return false;
     }
@@ -1984,12 +1984,12 @@ 
             '`',
             '``',
             \trim(
-                (string) $this->escape($str, false),
+                (string)$this->escape($str, false),
                 '`'
             )
         );
 
-        return '`' . $str . '`';
+        return '`'.$str.'`';
     }
 
     /**
@@ -2059,10 +2059,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);
     }
@@ -2157,7 +2157,7 @@ 
                 }
             } else {
                 $varCleaned = [];
-                foreach ((array) $var as $key => $value) {
+                foreach ((array)$var as $key => $value) {
                     $key = $this->escape($key, false, false, $convert_array);
                     $value = $this->secure($value);
 
@@ -2204,7 +2204,7 @@ 
         $var = $this->escape($var, false, false, null);
 
         if (\is_string($var)) {
-            $var = "'" . \trim($var, "'") . "'";
+            $var = "'".\trim($var, "'")."'";
         }
 
         return $var;
@@ -2241,10 +2241,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);
     }
@@ -2286,7 +2286,7 @@ 
     public function setConfigExtra(array $extra_config)
     {
         if (isset($extra_config['session_to_db'])) {
-            $this->session_to_db = (bool) $extra_config['session_to_db'];
+            $this->session_to_db = (bool)$extra_config['session_to_db'];
         }
 
         if (isset($extra_config['doctrine'])) {
@@ -2345,14 +2345,14 @@ 
             $return = \mysqli_set_charset($this->mysqli_link, $charset);
 
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
-            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET ' . $charset);
+            @\mysqli_query($this->mysqli_link, 'SET CHARACTER SET '.$charset);
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
-            @\mysqli_query($this->mysqli_link, "SET NAMES '" . $charset . "'");
+            @\mysqli_query($this->mysqli_link, "SET NAMES '".$charset."'");
         } elseif ($this->isDoctrinePDOConnection()) {
             $doctrineWrappedConnection = $this->getDoctrinePDOConnection();
 
-            $doctrineWrappedConnection->exec('SET CHARACTER SET ' . $charset);
-            $doctrineWrappedConnection->exec("SET NAMES '" . $charset . "'");
+            $doctrineWrappedConnection->exec('SET CHARACTER SET '.$charset);
+            $doctrineWrappedConnection->exec("SET NAMES '".$charset."'");
 
             $return = true;
         } else {
@@ -2493,7 +2493,7 @@ 
      */
     public function table_exists(string $table): bool
     {
-        $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table));
+        $check = $this->query('SELECT 1 FROM '.$this->quote_string($table));
 
         return $check !== false
                &&
@@ -2523,7 +2523,7 @@ 
             $result = $callback($this);
             if ($result === false) {
                 /** @noinspection ThrowRawExceptionInspection */
-                throw new \Exception('call_user_func [' . $callback . '] === false');
+                throw new \Exception('call_user_func ['.$callback.'] === false');
             }
 
             return $this->commit();
@@ -2580,10 +2580,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);
     }

src/voku/db/Result.php

Spacing +9 added lines, -9 removed lines

@@ -148,7 +148,7 @@ 
             &&
             !$result instanceof \Doctrine\DBAL\Statement
         ) {
-            throw new \InvalidArgumentException('$result must be ' . \mysqli_result::class . ' or ' . \Doctrine\DBAL\Statement::class . ' !');
+            throw new \InvalidArgumentException('$result must be '.\mysqli_result::class.' or '.\Doctrine\DBAL\Statement::class.' !');
         }
 
         $this->_result = $result;
@@ -178,7 +178,7 @@ 
 
             $this->num_rows = $this->_result->rowCount();
         } else {
-            $this->num_rows = (int) $this->_result->num_rows;
+            $this->num_rows = (int)$this->_result->num_rows;
         }
 
         $this->current_row = 0;
@@ -219,7 +219,7 @@ 
      */
     public function __toString()
     {
-        return (string) $this->num_rows;
+        return (string)$this->num_rows;
     }
 
     /**
@@ -832,8 +832,8 @@ 
     {
         if ($as_array) {
             return \array_map(
-                static function ($object) {
-                    return (array) $object;
+                static function($object) {
+                    return (array)$object;
                 },
                 $this->fetch_fields()
             );
@@ -997,7 +997,7 @@ 
         }
 
         return \array_map(
-            static function ($values) use ($keys) {
+            static function($values) use ($keys) {
                 return \array_combine($keys, $values);
             },
             $rows
@@ -1133,7 +1133,7 @@ 
                     $fieldTmp->{$metadataTmpKey} = $metadataTmpValue;
                 }
 
-                $typeNativeTmp = 'MYSQL_TYPE_' . $metadataTmp['native_type'];
+                $typeNativeTmp = 'MYSQL_TYPE_'.$metadataTmp['native_type'];
                 $typeTmp = $THIS_CLASS_TMP->getConstant($typeNativeTmp);
                 if ($typeTmp) {
                     $fieldTmp->type = $typeTmp;
@@ -1492,11 +1492,11 @@ 
             if (\abs($offset) > $this->num_rows) {
                 $offset = 0;
             } else {
-                $offset = $this->num_rows - (int) \abs($offset);
+                $offset = $this->num_rows - (int)\abs($offset);
             }
         }
 
-        $length = $length !== null ? (int) $length : $this->num_rows;
+        $length = $length !== null ? (int)$length : $this->num_rows;
         $n = 0;
         for ($i = $offset; $i < $this->num_rows && $n < $length; $i++) {
             if ($preserve_keys) {