o2system / database

src/NoSql/Datastructures/QueryStatement.php

Spacing +2 added lines, -2 removed lines

@@ -182,7 +182,7 @@ 
      */

     public function addFilter($field, $value)

     {

-        $this->filter[ $field ] = $value;

+        $this->filter[$field] = $value;

 

         return $this;

     }

@@ -233,7 +233,7 @@ 
      */

     public function addOption($option, $value)

     {

-        $this->options[ $option ] = $value;

+        $this->options[$option] = $value;

 

         return $this;

     }

src/NoSql/Datastructures/QueryBuilderCache.php

Spacing +8 added lines, -8 removed lines

@@ -80,7 +80,7 @@ 
      */

     public function &__get($property)

     {

-        return $this->vars[ $property ];

+        return $this->vars[$property];

     }

 

     // ------------------------------------------------------------------------

@@ -96,16 +96,16 @@ 
     public function store($index, $value)

     {

         if (array_key_exists($index, $this->vars)) {

-            if (is_array($this->vars[ $index ])) {

+            if (is_array($this->vars[$index])) {

                 if (is_array($value)) {

-                    $this->vars[ $index ] = array_merge($this->vars[ $index ], $value);

+                    $this->vars[$index] = array_merge($this->vars[$index], $value);

                 } else {

-                    array_push($this->vars[ $index ], $value);

+                    array_push($this->vars[$index], $value);

                 }

-            } elseif (is_bool($this->vars[ $index ])) {

-                $this->vars[ $index ] = (bool)$value;

+            } elseif (is_bool($this->vars[$index])) {

+                $this->vars[$index] = (bool)$value;

             } else {

-                $this->vars[ $index ] = $value;

+                $this->vars[$index] = $value;

             }

         }

 

@@ -213,7 +213,7 @@ 
     protected function resetRun(array $cacheKeys)

     {

         foreach ($cacheKeys as $cacheKey => $cacheDefaultValue) {

-            $this->vars[ $cacheKey ] = $cacheDefaultValue;

+            $this->vars[$cacheKey] = $cacheDefaultValue;

         }

     }

 

src/Connections.php

Spacing +3 added lines, -3 removed lines

@@ -48,14 +48,14 @@ 
 

     public function &loadConnection($connectionOffset)

     {

-        $loadConnection[ $connectionOffset ] = false;

+        $loadConnection[$connectionOffset] = false;

 

         if ( ! $this->exists($connectionOffset) and $this->config->offsetExists($connectionOffset)) {

 

             $connectionConfig = $this->config->offsetGet($connectionOffset);

 

             if (is_array($connectionConfig)) {

-                new DataStructures\Config($this->config[ $connectionOffset ]);

+                new DataStructures\Config($this->config[$connectionOffset]);

             }

 

             $this->createConnection($connectionOffset, $connectionConfig);

@@ -90,7 +90,7 @@ 
         ];

 

         if (array_key_exists($connectionConfig->driver, $driverMaps)) {

-            if (class_exists($driverClassName = $driverMaps[ $connectionConfig->driver ])) {

+            if (class_exists($driverClassName = $driverMaps[$connectionConfig->driver])) {

                 $driverInstance = new $driverClassName($connectionConfig);

                 $this->register($driverInstance, $connectionOffset);

             }

src/DataObjects/Result/Info.php

Spacing +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
             'pages'  => 0,

         ], $total));

 

-        if (isset($total[ 'limit' ])) {

-            $this->limit = $total[ 'limit' ];

+        if (isset($total['limit'])) {

+            $this->limit = $total['limit'];

         }

 

         $this->setLimit($this->limit);

src/DataObjects/Result.php

Spacing +12 added lines, -12 removed lines

@@ -85,7 +85,7 @@ 
         $this->rows = new \SplFixedArray($this->numRows);

 

         foreach ($rows as $key => $row) {

-            $this->rows[ $key ] = new Result\Row($row);

+            $this->rows[$key] = new Result\Row($row);

         }

     }

 

@@ -110,7 +110,7 @@ 
         $this->seek(0);

 

         if ($this->count()) {

-            return $this->rows[ $this->position ];

+            return $this->rows[$this->position];

         }

 

         return new Row();

@@ -140,7 +140,7 @@ 
             $position = $this->count();

         }

 

-        if (isset($this->rows[ $position ])) {

+        if (isset($this->rows[$position])) {

             $this->position = $position;

         }

     }

@@ -178,7 +178,7 @@ 
         $this->seek($this->count() - 1);

 

         if ($this->count()) {

-            return $this->rows[ $this->position ];

+            return $this->rows[$this->position];

         }

 

         return new Row();

@@ -200,7 +200,7 @@ 
         $this->seek($this->position);

 

         if ($this->count()) {

-            return $this->rows[ $this->position ];

+            return $this->rows[$this->position];

         }

 

         return new Row();

@@ -270,7 +270,7 @@ 
     public function valid()

     {

         if ($this->count()) {

-            return isset($this->rows[ $this->position ]);

+            return isset($this->rows[$this->position]);

         }

 

         return false;

@@ -341,7 +341,7 @@ 
      */

     public function offsetExists($offset)

     {

-        return (bool)isset($this->rows[ $offset ]);

+        return (bool)isset($this->rows[$offset]);

     }

 

     // ------------------------------------------------------------------------

@@ -362,8 +362,8 @@ 
      */

     public function offsetGet($offset)

     {

-        if (isset($this->rows[ $offset ])) {

-            return $this->rows[ $offset ];

+        if (isset($this->rows[$offset])) {

+            return $this->rows[$offset];

         }

 

         return false;

@@ -391,7 +391,7 @@ 
     public function offsetSet($offset, $value)

     {

         if ($value instanceof Row) {

-            $this->rows[ $offset ] = $value;

+            $this->rows[$offset] = $value;

         }

     }

 

@@ -413,8 +413,8 @@ 
      */

     public function offsetUnset($offset)

     {

-        if (isset($this->rows[ $offset ])) {

-            unset($this->rows[ $offset ]);

+        if (isset($this->rows[$offset])) {

+            unset($this->rows[$offset]);

         }

     }

 

src/Sql/Abstracts/AbstractConnection.php

Spacing +64 added lines, -64 removed lines

@@ -265,9 +265,9 @@ 
         // No connection resource? Check if there is a failover else throw an error

         if ( ! $this->handle) {

             // Check if there is a failover set

-            if ( ! empty($this->config[ 'failover' ]) && is_array($this->config[ 'failover' ])) {

+            if ( ! empty($this->config['failover']) && is_array($this->config['failover'])) {

                 // Go over all the failovers

-                foreach ($this->config[ 'failover' ] as $failover) {

+                foreach ($this->config['failover'] as $failover) {

 

                     // Try to connect

                     $this->platformConnectHandler($failover = new Config($failover));

@@ -338,11 +338,11 @@ 
      */

     public function getPlatformInfo()

     {

-        if (isset($this->queriesResultCache[ 'platformInfo' ])) {

-            return $this->queriesResultCache[ 'platformInfo' ];

+        if (isset($this->queriesResultCache['platformInfo'])) {

+            return $this->queriesResultCache['platformInfo'];

         }

 

-        return $this->queriesResultCache[ 'platformInfo' ] = $this->platformGetPlatformInfoHandler();

+        return $this->queriesResultCache['platformInfo'] = $this->platformGetPlatformInfoHandler();

     }

 

     //--------------------------------------------------------------------

@@ -528,11 +528,11 @@ 
      */

     final public function hasDatabase($databaseName)

     {

-        if (empty($this->queriesResultCache[ 'databaseNames' ])) {

+        if (empty($this->queriesResultCache['databaseNames'])) {

             $this->getDatabases();

         }

 

-        return (bool)in_array($databaseName, $this->queriesResultCache[ 'databaseNames' ]);

+        return (bool)in_array($databaseName, $this->queriesResultCache['databaseNames']);

     }

 

     //--------------------------------------------------------------------

@@ -558,7 +558,7 @@ 
      */

     final public function setTablePrefix($tablePrefix)

     {

-        return $this->config[ 'tablePrefix' ] = $tablePrefix;

+        return $this->config['tablePrefix'] = $tablePrefix;

     }

 

     // ------------------------------------------------------------------------

@@ -577,11 +577,11 @@ 
     {

         $table = $this->prefixTable($table);

 

-        if (empty($this->queriesResultCache[ 'tableNames' ])) {

+        if (empty($this->queriesResultCache['tableNames'])) {

             $this->getTables();

         }

 

-        return (bool)in_array($table, $this->queriesResultCache[ 'tableNames' ]);

+        return (bool)in_array($table, $this->queriesResultCache['tableNames']);

     }

 

     // ------------------------------------------------------------------------

@@ -595,7 +595,7 @@ 
      */

     final public function prefixTable($tableName)

     {

-        $tablePrefix = $this->config[ 'tablePrefix' ];

+        $tablePrefix = $this->config['tablePrefix'];

 

         if (empty($tablePrefix)) {

             return $tableName;

@@ -635,11 +635,11 @@ 
     {

         $table = $this->prefixTable($table);

 

-        if (empty($this->queriesResultCache[ 'tableColumns' ][ $table ])) {

+        if (empty($this->queriesResultCache['tableColumns'][$table])) {

             $this->getColumns($table);

         }

 

-        return (bool)isset($this->queriesResultCache[ 'tableColumns' ][ $table ][ $column ]);

+        return (bool)isset($this->queriesResultCache['tableColumns'][$table][$column]);

     }

 

     // ------------------------------------------------------------------------

@@ -684,7 +684,7 @@ 
         $queryStatement->setLastInsertId($this->getLastInsertId());

 

         if ( ! array_key_exists($queryStatement->getKey(), $this->queriesCache)) {

-            $this->queriesCache[ $queryStatement->getKey() ] = $queryStatement;

+            $this->queriesCache[$queryStatement->getKey()] = $queryStatement;

         }

 

         if ($queryStatement->hasErrors()) {

@@ -851,7 +851,7 @@ 
         $queryStatement->addHit(1);

 

         if ( ! array_key_exists($queryStatement->getKey(), $this->queriesCache)) {

-            $this->queriesCache[ $queryStatement->getKey() ] = $queryStatement;

+            $this->queriesCache[$queryStatement->getKey()] = $queryStatement;

         }

 

         if ($queryStatement->hasErrors()) {

@@ -891,8 +891,8 @@ 
     {

         $hasSqlBinders = strpos($sqlStatement, ':') !== false;

 

-        if (empty($binds) || empty($this->config[ 'bindMarker' ]) ||

-            (strpos($sqlStatement, $this->config[ 'bindMarker' ]) === false &&

+        if (empty($binds) || empty($this->config['bindMarker']) ||

+            (strpos($sqlStatement, $this->config['bindMarker']) === false &&

                 $hasSqlBinders === false)

         ) {

             return $sqlStatement;

@@ -913,7 +913,7 @@ 
         }

 

         // We'll need marker length later

-        $markerLength = strlen($this->config[ 'bindMarker' ]);

+        $markerLength = strlen($this->config['bindMarker']);

 

         if ($hasSqlBinders) {

             $sqlStatement = $this->replaceNamedBinds($sqlStatement, $sqlBinds);

@@ -953,7 +953,7 @@ 
             } elseif (strpos($bindReplace, ' AND ') !== false) {

                 $escapedValue = $bindReplace;

             } else {

-                $escapedValue = preg_quote(trim($escapedValue, $this->config[ 'escapeCharacter' ]));

+                $escapedValue = preg_quote(trim($escapedValue, $this->config['escapeCharacter']));

             }

 

             if (preg_match("/\(.+?\)/", $bindSearch)) {

@@ -1018,7 +1018,7 @@ 
     {

         if (is_array($string)) {

             foreach ($string as $key => $value) {

-                $string[ $key ] = $this->escapeString($value, $like);

+                $string[$key] = $this->escapeString($value, $like);

             }

 

             return $string;

@@ -1029,11 +1029,11 @@ 
         // escape LIKE condition wildcards

         if ($like === true) {

             $string = str_replace(

-                [$this->config[ 'likeEscapeCharacter' ], '%', '_'],

+                [$this->config['likeEscapeCharacter'], '%', '_'],

                 [

-                    $this->config[ 'likeEscapeCharacter' ] . $this->config[ 'likeEscapeCharacter' ],

-                    $this->config[ 'likeEscapeCharacter' ] . '%',

-                    $this->config[ 'likeEscapeCharacter' ] . '_',

+                    $this->config['likeEscapeCharacter'] . $this->config['likeEscapeCharacter'],

+                    $this->config['likeEscapeCharacter'] . '%',

+                    $this->config['likeEscapeCharacter'] . '_',

                 ],

                 $string

             );

@@ -1080,10 +1080,10 @@ 
         // Make sure not to replace a chunk inside a string that happens to match the bind marker

         if ($chunk = preg_match_all("/'[^']*'/i", $sqlStatement, $matches)) {

             $chunk = preg_match_all(

-                '/' . preg_quote($this->config[ 'bindMarker' ], '/') . '/i',

+                '/' . preg_quote($this->config['bindMarker'], '/') . '/i',

                 str_replace(

-                    $matches[ 0 ],

-                    str_replace($this->config[ 'bindMarker' ], str_repeat(' ', $markerLength), $matches[ 0 ]),

+                    $matches[0],

+                    str_replace($this->config['bindMarker'], str_repeat(' ', $markerLength), $matches[0]),

                     $sqlStatement,

                     $chunk

                 ),

@@ -1098,7 +1098,7 @@ 
         } // Number of binds must match bindMarkers in the string.

         else {

             if (($chunk = preg_match_all(

-                    '/' . preg_quote($this->config[ 'bindMarker' ], '/') . '/i',

+                    '/' . preg_quote($this->config['bindMarker'], '/') . '/i',

                     $sqlStatement,

                     $matches,

                     PREG_OFFSET_CAPTURE

@@ -1110,11 +1110,11 @@ 
 

         do {

             $chunk--;

-            $escapedValue = $this->escape($sqlBinds[ $chunk ]);

+            $escapedValue = $this->escape($sqlBinds[$chunk]);

             if (is_array($escapedValue)) {

                 $escapedValue = '(' . implode(',', $escapedValue) . ')';

             }

-            $sqlStatement = substr_replace($sqlStatement, $escapedValue, $matches[ 0 ][ $chunk ][ 1 ], $markerLength);

+            $sqlStatement = substr_replace($sqlStatement, $escapedValue, $matches[0][$chunk][1], $markerLength);

         } while ($chunk !== 0);

 

         return $sqlStatement;

@@ -1298,7 +1298,7 @@ 
         if (is_array($item)) {

             $escapedArray = [];

             foreach ($item as $key => $value) {

-                $escapedArray[ $this->protectIdentifiers($key) ] = $this->protectIdentifiers(

+                $escapedArray[$this->protectIdentifiers($key)] = $this->protectIdentifiers(

                     $value,

                     $prefixSingle,

                     $protectIdentifiers,

@@ -1356,11 +1356,11 @@ 
             //

             // NOTE: The ! empty() condition prevents this method

             //       from breaking when Query Builder isn't enabled.

-            if ( ! empty($aliasedTables) AND in_array($parts[ 0 ], $aliasedTables)) {

+            if ( ! empty($aliasedTables) AND in_array($parts[0], $aliasedTables)) {

                 if ($protectIdentifiers === true) {

                     foreach ($parts as $key => $val) {

-                        if ( ! in_array($val, $this->config[ 'reservedIdentifiers' ])) {

-                            $parts[ $key ] = $this->escapeIdentifiers($val);

+                        if ( ! in_array($val, $this->config['reservedIdentifiers'])) {

+                            $parts[$key] = $this->escapeIdentifiers($val);

                         }

                     }

 

@@ -1375,12 +1375,12 @@ 
                 // We now add the table prefix based on some logic.

                 // Do we have 4 segments (hostname.database.table.column)?

                 // If so, we add the table prefix to the column name in the 3rd segment.

-                if (isset($parts[ 3 ])) {

+                if (isset($parts[3])) {

                     $i = 2;

                 }

                 // Do we have 3 segments (database.table.column)?

                 // If so, we add the table prefix to the column name in 2nd position

-                elseif (isset($parts[ 2 ])) {

+                elseif (isset($parts[2])) {

                     $i = 1;

                 }

                 // Do we have 2 segments (table.column)?

@@ -1396,15 +1396,15 @@ 
                 }

 

                 // Verify table prefix and replace if necessary

-                if ($this->swapTablePrefix !== '' && strpos($parts[ $i ], $this->swapTablePrefix) === 0) {

-                    $parts[ $i ] = preg_replace(

+                if ($this->swapTablePrefix !== '' && strpos($parts[$i], $this->swapTablePrefix) === 0) {

+                    $parts[$i] = preg_replace(

                         '/^' . $this->swapTablePrefix . '(\S+?)/',

                         $this->config->tablePrefix . '\\1',

-                        $parts[ $i ]

+                        $parts[$i]

                     );

                 } // We only add the table prefix if it does not already exist

-                elseif (strpos($parts[ $i ], $this->config->tablePrefix) !== 0) {

-                    $parts[ $i ] = $this->config->tablePrefix . $parts[ $i ];

+                elseif (strpos($parts[$i], $this->config->tablePrefix) !== 0) {

+                    $parts[$i] = $this->config->tablePrefix . $parts[$i];

                 }

 

                 // Put the parts back together

@@ -1421,7 +1421,7 @@ 
         // In some cases, especially 'from', we end up running through

         // protect_identifiers twice. This algorithm won't work when

         // it contains the escapeChar so strip it out.

-        $item = trim($item, $this->config[ 'escapeCharacter' ]);

+        $item = trim($item, $this->config['escapeCharacter']);

 

         // Is there a table prefix? If not, no need to insert it

         if ($this->config->tablePrefix !== '') {

@@ -1438,7 +1438,7 @@ 
             }

         }

 

-        if ($protectIdentifiers === true && ! in_array($item, $this->config[ 'reservedIdentifiers' ])) {

+        if ($protectIdentifiers === true && ! in_array($item, $this->config['reservedIdentifiers'])) {

             $item = $this->escapeIdentifiers($item);

         }

 

@@ -1460,22 +1460,22 @@ 
      */

     final public function escapeIdentifiers($item)

     {

-        if ($this->config[ 'escapeCharacter' ] === '' OR empty($item) OR in_array(

+        if ($this->config['escapeCharacter'] === '' OR empty($item) OR in_array(

                 $item,

-                $this->config[ 'reservedIdentifiers' ]

+                $this->config['reservedIdentifiers']

             )

         ) {

             return $item;

         } elseif (is_array($item)) {

             foreach ($item as $key => $value) {

-                $item[ $key ] = $this->escapeIdentifiers($value);

+                $item[$key] = $this->escapeIdentifiers($value);

             }

 

             return $item;

         } // Avoid breaking functions and literal values inside queries

         elseif (ctype_digit(

                 $item

-            ) OR $item[ 0 ] === "'" OR ($this->config[ 'escapeCharacter' ] !== '"' && $item[ 0 ] === '"') OR

+            ) OR $item[0] === "'" OR ($this->config['escapeCharacter'] !== '"' && $item[0] === '"') OR

             strpos($item, '(') !== false

         ) {

             return $item;

@@ -1484,31 +1484,31 @@ 
         static $pregEscapeCharacters = [];

 

         if (empty($pregEscapeCharacters)) {

-            if (is_array($this->config[ 'escapeCharacter' ])) {

+            if (is_array($this->config['escapeCharacter'])) {

                 $pregEscapeCharacters = [

-                    preg_quote($this->config[ 'escapeCharacter' ][ 0 ], '/'),

-                    preg_quote($this->config[ 'escapeCharacter' ][ 1 ], '/'),

-                    $this->config[ 'escapeCharacter' ][ 0 ],

-                    $this->config[ 'escapeCharacter' ][ 1 ],

+                    preg_quote($this->config['escapeCharacter'][0], '/'),

+                    preg_quote($this->config['escapeCharacter'][1], '/'),

+                    $this->config['escapeCharacter'][0],

+                    $this->config['escapeCharacter'][1],

                 ];

             } else {

-                $pregEscapeCharacters[ 0 ]

-                    = $pregEscapeCharacters[ 1 ] = preg_quote($this->config[ 'escapeCharacter' ], '/');

-                $pregEscapeCharacters[ 2 ] = $pregEscapeCharacters[ 3 ] = $this->config[ 'escapeCharacter' ];

+                $pregEscapeCharacters[0]

+                    = $pregEscapeCharacters[1] = preg_quote($this->config['escapeCharacter'], '/');

+                $pregEscapeCharacters[2] = $pregEscapeCharacters[3] = $this->config['escapeCharacter'];

             }

         }

 

-        foreach ($this->config[ 'reservedIdentifiers' ] as $id) {

+        foreach ($this->config['reservedIdentifiers'] as $id) {

             if (strpos($item, '.' . $id) !== false) {

                 return preg_replace(

                     '/'

-                    . $pregEscapeCharacters[ 0 ]

+                    . $pregEscapeCharacters[0]

                     . '?([^'

-                    . $pregEscapeCharacters[ 1 ]

+                    . $pregEscapeCharacters[1]

                     . '\.]+)'

-                    . $pregEscapeCharacters[ 1 ]

+                    . $pregEscapeCharacters[1]

                     . '?\./i',

-                    $pregEscapeCharacters[ 2 ] . '$1' . $pregEscapeCharacters[ 3 ] . '.',

+                    $pregEscapeCharacters[2] . '$1' . $pregEscapeCharacters[3] . '.',

                     $item

                 );

             }

@@ -1516,13 +1516,13 @@ 
 

         return preg_replace(

             '/'

-            . $pregEscapeCharacters[ 0 ]

+            . $pregEscapeCharacters[0]

             . '?([^'

-            . $pregEscapeCharacters[ 1 ]

+            . $pregEscapeCharacters[1]

             . '\.]+)'

-            . $pregEscapeCharacters[ 1 ]

+            . $pregEscapeCharacters[1]

             . '?(\.)?/i',

-            $pregEscapeCharacters[ 2 ] . '$1' . $pregEscapeCharacters[ 3 ] . '$2',

+            $pregEscapeCharacters[2] . '$1' . $pregEscapeCharacters[3] . '$2',

             $item

         );

     }

src/Sql/Abstracts/AbstractQueryBuilder.php

Spacing +83 added lines, -83 removed lines

@@ -101,7 +101,7 @@ 
      */

     public function __construct(AbstractConnection &$conn)

     {

-        $this->conn =& $conn;

+        $this->conn = & $conn;

         $this->builderCache = new QueryBuilderCache();

         $this->cacheMode = $this->conn->getConfig('cacheEnable');

     }

@@ -282,7 +282,7 @@ 
         $alias = empty($alias)

             ? strtolower($type) . '_' . $field

             : $alias;

-        $sqlStatement = sprintf($SqlAggregateFunctions[ $type ], $field)

+        $sqlStatement = sprintf($SqlAggregateFunctions[$type], $field)

             . ' AS '

             . $this->conn->escapeIdentifiers($alias);

 

@@ -337,11 +337,11 @@ 
 

                         for ($i = 0; $i < $countFieldAlias; $i++) {

                             if ($i == 0) {

-                                $fieldAlias[ $i ] = $fieldAlias[ $i ] . "'+";

+                                $fieldAlias[$i] = $fieldAlias[$i] . "'+";

                             } elseif ($i == ($countFieldAlias - 1)) {

-                                $fieldAlias[ $i ] = "'+" . $fieldAlias[ $i ];

+                                $fieldAlias[$i] = "'+" . $fieldAlias[$i];

                             } else {

-                                $fieldAlias[ $i ] = "'+" . $fieldAlias[ $i ] . "'+";

+                                $fieldAlias[$i] = "'+" . $fieldAlias[$i] . "'+";

                             }

                         }

 

@@ -493,7 +493,7 @@ 
 

         $this->select(

             sprintf(

-                $SqlScalarFunctions[ $type ],

+                $SqlScalarFunctions[$type],

                 $field,

                 $this->conn->escapeIdentifiers($alias)

             )

@@ -698,7 +698,7 @@ 
 

             if (is_array($field)) {

                 $fieldName = key($field);

-                $fieldAlias = $field[ $fieldName ];

+                $fieldAlias = $field[$fieldName];

             } elseif (strpos($field, ' AS ') !== false) {

                 $xField = explode(' AS ', $field);

                 $xField = array_map('trim', $xField);

@@ -905,7 +905,7 @@ 
     public function dateDiff(array $fields, $alias)

     {

         $dateTimeStart = key($fields);

-        $dateTimeEnd = $fields[ $dateTimeStart ];

+        $dateTimeEnd = $fields[$dateTimeStart];

 

         if (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $dateTimeStart)) {

             $dateTimeStart = $this->conn->escape($dateTimeStart);

@@ -1088,14 +1088,14 @@ 
             // Split multiple conditions

             if (preg_match_all('/\sAND\s|\sOR\s/i', $condition, $joints, PREG_OFFSET_CAPTURE)) {

                 $conditions = [];

-                $joints = $joints[ 0 ];

+                $joints = $joints[0];

                 array_unshift($joints, ['', 0]);

 

                 for ($i = count($joints) - 1, $pos = strlen($condition); $i >= 0; $i--) {

-                    $joints[ $i ][ 1 ] += strlen($joints[ $i ][ 0 ]); // offset

-                    $conditions[ $i ] = substr($condition, $joints[ $i ][ 1 ], $pos - $joints[ $i ][ 1 ]);

-                    $pos = $joints[ $i ][ 1 ] - strlen($joints[ $i ][ 0 ]);

-                    $joints[ $i ] = $joints[ $i ][ 0 ];

+                    $joints[$i][1] += strlen($joints[$i][0]); // offset

+                    $conditions[$i] = substr($condition, $joints[$i][1], $pos - $joints[$i][1]);

+                    $pos = $joints[$i][1] - strlen($joints[$i][0]);

+                    $joints[$i] = $joints[$i][0];

                 }

             } else {

                 $conditions = [$condition];

@@ -1104,17 +1104,17 @@ 
 

             $condition = ' ON ';

             for ($i = 0, $c = count($conditions); $i < $c; $i++) {

-                $operator = $this->getOperator($conditions[ $i ]);

-                $condition .= $joints[ $i ];

+                $operator = $this->getOperator($conditions[$i]);

+                $condition .= $joints[$i];

                 $condition .= preg_match(

                     "/(\(*)?([\[\]\w\.'-]+)" . preg_quote($operator) . "(.*)/i",

-                    $conditions[ $i ],

+                    $conditions[$i],

                     $match

                 )

-                    ? $match[ 1 ] . $this->conn->protectIdentifiers(

-                        $match[ 2 ]

-                    ) . $operator . $this->conn->protectIdentifiers($match[ 3 ])

-                    : $conditions[ $i ];

+                    ? $match[1] . $this->conn->protectIdentifiers(

+                        $match[2]

+                    ) . $operator . $this->conn->protectIdentifiers($match[3])

+                    : $conditions[$i];

             }

         }

 

@@ -1178,23 +1178,23 @@ 
                 : '';

 

             $operator = [

-                '\s*(?:<|>|!)?=\s*',             // =, <=, >=, !=

-                '\s*<>?\s*',                     // <, <>

-                '\s*>\s*',                       // >

-                '\s+IS NULL',                    // IS NULL

-                '\s+IS NOT NULL',                // IS NOT NULL

-                '\s+EXISTS\s*\(.*\)',        // EXISTS(Sql)

-                '\s+NOT EXISTS\s*\(.*\)',    // NOT EXISTS(Sql)

-                '\s+BETWEEN\s+',                 // BETWEEN value AND value

-                '\s+IN\s*\(.*\)',            // IN(list)

-                '\s+NOT IN\s*\(.*\)',        // NOT IN (list)

-                '\s+LIKE\s+\S.*(' . $likeEscapeString . ')?',    // LIKE 'expr'[ ESCAPE '%s']

+                '\s*(?:<|>|!)?=\s*', // =, <=, >=, !=

+                '\s*<>?\s*', // <, <>

+                '\s*>\s*', // >

+                '\s+IS NULL', // IS NULL

+                '\s+IS NOT NULL', // IS NOT NULL

+                '\s+EXISTS\s*\(.*\)', // EXISTS(Sql)

+                '\s+NOT EXISTS\s*\(.*\)', // NOT EXISTS(Sql)

+                '\s+BETWEEN\s+', // BETWEEN value AND value

+                '\s+IN\s*\(.*\)', // IN(list)

+                '\s+NOT IN\s*\(.*\)', // NOT IN (list)

+                '\s+LIKE\s+\S.*(' . $likeEscapeString . ')?', // LIKE 'expr'[ ESCAPE '%s']

                 '\s+NOT LIKE\s+\S.*(' . $likeEscapeString . ')?' // NOT LIKE 'expr'[ ESCAPE '%s']

             ];

         }

 

         return preg_match('/' . implode('|', $operator) . '/i', $string, $match)

-            ? $match[ 0 ]

+            ? $match[0]

             : false;

     }

 

@@ -1264,8 +1264,8 @@ 
                 $fieldName = substr(

                         $fieldName,

                         0,

-                        $match[ 0 ][ 1 ]

-                    ) . ($match[ 1 ][ 0 ] === '='

+                        $match[0][1]

+                    ) . ($match[1][0] === '='

                         ? ' IS NULL'

                         : ' IS NOT NULL');

             } elseif ($fieldValue instanceof AbstractQueryBuilder) {

@@ -1321,7 +1321,7 @@ 
     public function bind($field, $value)

     {

         if ( ! array_key_exists($field, $this->builderCache->binds)) {

-            $this->builderCache->binds[ $field ] = $value;

+            $this->builderCache->binds[$field] = $value;

 

             return $field;

         }

@@ -1332,7 +1332,7 @@ 
             ++$count;

         }

 

-        $this->builderCache->binds[ $field . '_' . $count ] = $value;

+        $this->builderCache->binds[$field . '_' . $count] = $value;

 

         return $field . '_' . $count;

     }

@@ -1865,8 +1865,8 @@ 
 

             // Do we have a seed value?

             $fields = ctype_digit((string)$fields)

-                ? sprintf($this->SqlOrderByRandomKeywords[ 1 ], $fields)

-                : $this->SqlOrderByRandomKeywords[ 0 ];

+                ? sprintf($this->SqlOrderByRandomKeywords[1], $fields)

+                : $this->SqlOrderByRandomKeywords[0];

         } elseif (empty($fields)) {

             return $this;

         } elseif ($direction !== '') {

@@ -1894,8 +1894,8 @@ 
                         PREG_OFFSET_CAPTURE

                     ))

                     ? [

-                        'field'     => ltrim(substr($fields, 0, $match[ 0 ][ 1 ])),

-                        'direction' => ' ' . $match[ 1 ][ 0 ],

+                        'field'     => ltrim(substr($fields, 0, $match[0][1])),

+                        'direction' => ' ' . $match[1][0],

                         'escape'    => true,

                     ]

                     : ['field' => trim($fields), 'direction' => $direction, 'escape' => true];

@@ -2314,7 +2314,7 @@ 
         if (count($this->builderCache->sets)) {

             $sqlStatement = $this->platformInsertStatement(

                 $this->conn->protectIdentifiers(

-                    $this->builderCache->from[ 0 ],

+                    $this->builderCache->from[0],

                     true,

                     $escape,

                     false

@@ -2363,7 +2363,7 @@ 
         foreach ($field as $key => $value) {

             if ($key === 'birthday' || $key === 'date') {

                 if (is_array($value)) {

-                    $value = $value[ 'year' ] . '-' . $value[ 'month' ] . '-' . $value[ 'date' ];

+                    $value = $value['year'] . '-' . $value['month'] . '-' . $value['date'];

                 } elseif (is_object($value)) {

                     $value = $value->year . '-' . $value->month . '-' . $value->date;

                 }

@@ -2371,9 +2371,9 @@ 
                 $value = call_user_func_array($this->arrayObjectConversionMethod, [$value]);

             }

 

-            $this->builderCache->binds[ $key ] = $value;

-            $this->builderCache->sets[ $this->conn->protectIdentifiers($key, false,

-                $escape) ] = ':' . $key;

+            $this->builderCache->binds[$key] = $value;

+            $this->builderCache->sets[$this->conn->protectIdentifiers($key, false,

+                $escape)] = ':' . $key;

         }

 

         return $this;

@@ -2400,7 +2400,7 @@ 
         foreach (get_object_vars($object) as $key => $value) {

             // There are some built in keys we need to ignore for this conversion

             if ( ! is_object($value) && ! is_array($value) && $key !== '_parent_name') {

-                $array[ $key ] = $value;

+                $array[$key] = $value;

             }

         }

 

@@ -2448,7 +2448,7 @@ 
         $affectedRows = 0;

         for ($i = 0, $total = count($sets); $i < $total; $i += $batchSize) {

             $Sql = $this->platformInsertBatchStatement(

-                $this->conn->protectIdentifiers($this->builderCache->from[ 0 ], true, $escape, false),

+                $this->conn->protectIdentifiers($this->builderCache->from[0], true, $escape, false),

                 $this->builderCache->keys,

                 array_slice($this->builderCache->sets, $i, $batchSize)

             );

@@ -2549,8 +2549,8 @@ 
             // There are some built in keys we need to ignore for this conversion

             if ($field !== '_parent_name') {

                 $i = 0;

-                foreach ($out[ $field ] as $data) {

-                    $array[ $i++ ][ $field ] = $data;

+                foreach ($out[$field] as $data) {

+                    $array[$i++][$field] = $data;

                 }

             }

         }

@@ -2601,7 +2601,7 @@ 
         if (count($this->builderCache->sets)) {

             $sqlStatement = $this->platformReplaceStatement(

                 $this->conn->protectIdentifiers(

-                    $this->builderCache->from[ 0 ],

+                    $this->builderCache->from[0],

                     true,

                     $escape,

                     false

@@ -2664,7 +2664,7 @@ 
         $affectedRows = 0;

         for ($i = 0, $total = count($sets); $i < $total; $i += $batchSize) {

             $Sql = $this->platformReplaceStatement(

-                $this->conn->protectIdentifiers($this->builderCache->from[ 0 ], true, $escape, false),

+                $this->conn->protectIdentifiers($this->builderCache->from[0], true, $escape, false),

                 $this->builderCache->keys,

                 array_slice($this->builderCache->sets, $i, $batchSize)

             );

@@ -2716,7 +2716,7 @@ 
         if (count($this->builderCache->sets) && count($this->builderCache->from)) {

             $sqlStatement = $this->platformUpdateStatement(

                 $this->conn->protectIdentifiers(

-                    $this->builderCache->from[ 0 ],

+                    $this->builderCache->from[0],

                     true,

                     $escape,

                     false

@@ -2777,7 +2777,7 @@ 
         $affectedRows = 0;

         for ($i = 0, $total = count($this->builderCache->sets); $i < $total; $i += $batchSize) {

             $Sql = $this->platformUpdateBatchStatement(

-                $this->builderCache->from[ 0 ],

+                $this->builderCache->from[0],

                 array_slice($this->builderCache->sets, $i, $batchSize),

                 $this->conn->protectIdentifiers($index, false, $escape, false)

             );

@@ -2789,7 +2789,7 @@ 
                 $affectedRows += $this->conn->getAffectedRows();

             }

 

-            $this->builderCache[ 'where' ] = [];

+            $this->builderCache['where'] = [];

         }

 

         if ( ! $this->testMode) {

@@ -2833,7 +2833,7 @@ 
 

                 $bind = $this->bind($key, $value);

 

-                $cleanSets[ $this->conn->protectIdentifiers($key, false, $escape) ] = ':' . $bind;

+                $cleanSets[$this->conn->protectIdentifiers($key, false, $escape)] = ':' . $bind;

             }

 

             if ($indexSet === false) {

@@ -2884,7 +2884,7 @@ 
 

         $sqlStatement = $this->platformDeleteStatement(

             $this->conn->protectIdentifiers(

-                $this->builderCache->from[ 0 ],

+                $this->builderCache->from[0],

                 true,

                 $this->conn->isProtectIdentifiers,

                 false

@@ -3063,10 +3063,10 @@ 
                 // The reason we protect identifiers here rather than in the select() function

                 // is because until the user calls the from() function we don't know if there are aliases

                 foreach ($this->builderCache->select as $selectKey => $selectField) {

-                    $noEscape = isset($this->builderCache->noEscape [ $selectKey ])

-                        ? $this->builderCache->noEscape [ $selectKey ]

+                    $noEscape = isset($this->builderCache->noEscape [$selectKey])

+                        ? $this->builderCache->noEscape [$selectKey]

                         : null;

-                    $this->builderCache->select [ $selectKey ] = $this->conn->protectIdentifiers(

+                    $this->builderCache->select [$selectKey] = $this->conn->protectIdentifiers(

                         $selectField,

                         false,

                         $noEscape

@@ -3185,28 +3185,28 @@ 
         if (count($this->builderCache->{$cacheKey}) > 0) {

             for ($i = 0, $c = count($this->builderCache->{$cacheKey}); $i < $c; $i++) {

                 // Is this condition already compiled?

-                if (is_string($this->builderCache->{$cacheKey}[ $i ])) {

+                if (is_string($this->builderCache->{$cacheKey}[$i])) {

                     continue;

-                } elseif ($this->builderCache->{$cacheKey}[ $i ][ 'escape' ] === false) {

-                    $this->builderCache->{$cacheKey}[ $i ]

-                        = $this->builderCache->{$cacheKey}[ $i ][ 'condition' ];

+                } elseif ($this->builderCache->{$cacheKey}[$i]['escape'] === false) {

+                    $this->builderCache->{$cacheKey}[$i]

+                        = $this->builderCache->{$cacheKey}[$i]['condition'];

                     continue;

                 }

 

                 // Split multiple conditions

                 $conditions = preg_split(

                     '/((?:^|\s+)AND\s+|(?:^|\s+)OR\s+)/i',

-                    $this->builderCache->{$cacheKey}[ $i ][ 'condition' ],

+                    $this->builderCache->{$cacheKey}[$i]['condition'],

                     -1,

                     PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY

                 );

 

                 for ($ci = 0, $cc = count($conditions); $ci < $cc; $ci++) {

-                    if (($op = $this->getOperator($conditions[ $ci ])) === false

+                    if (($op = $this->getOperator($conditions[$ci])) === false

                         OR

                         ! preg_match(

                             '/^(\(?)(.*)(' . preg_quote($op, '/') . ')\s*(.*(?<!\)))?(\)?)$/i',

-                            $conditions[ $ci ],

+                            $conditions[$ci],

                             $matches

                         )

                     ) {

@@ -3222,16 +3222,16 @@ 
                     //  5 => ')'        /* optional */

                     // );

 

-                    if ( ! empty($matches[ 4 ])) {

+                    if ( ! empty($matches[4])) {

                         //$this->isLiteral($matches[4]) OR $matches[4] = $this->protectIdentifiers(trim($matches[4]));

-                        $matches[ 4 ] = ' ' . $matches[ 4 ];

+                        $matches[4] = ' ' . $matches[4];

                     }

 

-                    $conditions[ $ci ] = $matches[ 1 ] . $this->conn->protectIdentifiers(trim($matches[ 2 ]))

-                        . ' ' . trim($matches[ 3 ]) . $matches[ 4 ] . $matches[ 5 ];

+                    $conditions[$ci] = $matches[1] . $this->conn->protectIdentifiers(trim($matches[2]))

+                        . ' ' . trim($matches[3]) . $matches[4] . $matches[5];

                 }

 

-                $this->builderCache->{$cacheKey}[ $i ] = implode('', $conditions);

+                $this->builderCache->{$cacheKey}[$i] = implode('', $conditions);

             }

 

             if ($cacheKey === 'having') {

@@ -3270,17 +3270,17 @@ 
         if (count($this->builderCache->groupBy) > 0) {

             for ($i = 0, $c = count($this->builderCache->groupBy); $i < $c; $i++) {

                 // Is it already compiled?

-                if (is_string($this->builderCache->groupBy[ $i ])) {

+                if (is_string($this->builderCache->groupBy[$i])) {

                     continue;

                 }

 

-                $this->builderCache->groupBy[ $i ] = ($this->builderCache->groupBy[ $i ][ 'escape' ]

+                $this->builderCache->groupBy[$i] = ($this->builderCache->groupBy[$i]['escape']

                     === false OR

                     $this->isLiteral(

-                        $this->builderCache->groupBy[ $i ][ 'field' ]

+                        $this->builderCache->groupBy[$i]['field']

                     ))

-                    ? $this->builderCache->groupBy[ $i ][ 'field' ]

-                    : $this->conn->protectIdentifiers($this->builderCache->groupBy[ $i ][ 'field' ]);

+                    ? $this->builderCache->groupBy[$i]['field']

+                    : $this->conn->protectIdentifiers($this->builderCache->groupBy[$i]['field']);

             }

 

             return "\n" . sprintf(

@@ -3325,7 +3325,7 @@ 
                 : ["'"];

         }

 

-        return in_array($string[ 0 ], $stringArray, true);

+        return in_array($string[0], $stringArray, true);

     }

 

     //--------------------------------------------------------------------

@@ -3383,18 +3383,18 @@ 
     {

         if (is_array($this->builderCache->orderBy) && count($this->builderCache->orderBy) > 0) {

             for ($i = 0, $c = count($this->builderCache->orderBy); $i < $c; $i++) {

-                if ($this->builderCache->orderBy[ $i ][ 'escape' ] !== false

+                if ($this->builderCache->orderBy[$i]['escape'] !== false

                     && ! $this->isLiteral(

-                        $this->builderCache->orderBy[ $i ][ 'field' ]

+                        $this->builderCache->orderBy[$i]['field']

                     )

                 ) {

-                    $this->builderCache->orderBy[ $i ][ 'field' ] = $this->conn->protectIdentifiers(

-                        $this->builderCache->orderBy[ $i ][ 'field' ]

+                    $this->builderCache->orderBy[$i]['field'] = $this->conn->protectIdentifiers(

+                        $this->builderCache->orderBy[$i]['field']

                     );

                 }

 

-                $this->builderCache->orderBy[ $i ] = $this->builderCache->orderBy[ $i ][ 'field' ]

-                    . $this->builderCache->orderBy[ $i ][ 'direction' ];

+                $this->builderCache->orderBy[$i] = $this->builderCache->orderBy[$i]['field']

+                    . $this->builderCache->orderBy[$i]['direction'];

             }

 

             return $this->builderCache->orderBy = "\n" . sprintf(

src/Sql/Drivers/MySql/Connection.php

Spacing +43 added lines, -43 removed lines

@@ -125,18 +125,18 @@ 
      */

     public function getDatabases()

     {

-        if (empty($this->queriesResultCache[ 'databaseNames' ])) {

+        if (empty($this->queriesResultCache['databaseNames'])) {

             $result = $this->query('SHOW DATABASES');

 

             if ($result->count()) {

                 foreach ($result as $row) {

 

                     if ( ! isset($key)) {

-                        if (isset($row[ 'database' ])) {

+                        if (isset($row['database'])) {

                             $key = 'database';

-                        } elseif (isset($row[ 'Database' ])) {

+                        } elseif (isset($row['Database'])) {

                             $key = 'Database';

-                        } elseif (isset($row[ 'DATABASE' ])) {

+                        } elseif (isset($row['DATABASE'])) {

                             $key = 'DATABASE';

                         } else {

                             /* We have no other choice but to just get the first element's key.

@@ -149,12 +149,12 @@ 
                         }

                     }

 

-                    $this->queriesResultCache[ 'databaseNames' ][] = $row->offsetGet($key);

+                    $this->queriesResultCache['databaseNames'][] = $row->offsetGet($key);

                 }

             }

         }

 

-        return $this->queriesResultCache[ 'databaseNames' ];

+        return $this->queriesResultCache['databaseNames'];

     }

 

     // ------------------------------------------------------------------------

@@ -172,12 +172,12 @@ 
      */

     public function getTables($prefixLimit = false)

     {

-        if (empty($this->queriesResultCache[ 'tableNames' ])) {

+        if (empty($this->queriesResultCache['tableNames'])) {

 

-            $sqlStatement = 'SHOW TABLES FROM ' . $this->escapeIdentifiers($this->config[ 'database' ]);

+            $sqlStatement = 'SHOW TABLES FROM ' . $this->escapeIdentifiers($this->config['database']);

 

-            if ($prefixLimit !== false && $this->config[ 'tablePrefix' ] !== '') {

-                $sqlStatement .= " LIKE '" . $this->escapeLikeString($this->config[ 'tablePrefix' ]) . "%'";

+            if ($prefixLimit !== false && $this->config['tablePrefix'] !== '') {

+                $sqlStatement .= " LIKE '" . $this->escapeLikeString($this->config['tablePrefix']) . "%'";

             }

 

             $result = $this->query($sqlStatement);

@@ -186,9 +186,9 @@ 
                 foreach ($result as $row) {

                     // Do we know from which column to get the table name?

                     if ( ! isset($key)) {

-                        if (isset($row[ 'table_name' ])) {

+                        if (isset($row['table_name'])) {

                             $key = 'table_name';

-                        } elseif (isset($row[ 'TABLE_NAME' ])) {

+                        } elseif (isset($row['TABLE_NAME'])) {

                             $key = 'TABLE_NAME';

                         } else {

                             /* We have no other choice but to just get the first element's key.

@@ -201,12 +201,12 @@ 
                         }

                     }

 

-                    $this->queriesResultCache[ 'tableNames' ][] = $row->offsetGet($key);

+                    $this->queriesResultCache['tableNames'][] = $row->offsetGet($key);

                 }

             }

         }

 

-        return $this->queriesResultCache[ 'tableNames' ];

+        return $this->queriesResultCache['tableNames'];

     }

 

     // ------------------------------------------------------------------------

@@ -224,16 +224,16 @@ 
     {

         $table = $this->prefixTable($table);

 

-        if (empty($this->queriesResultCache[ 'tableColumns' ][ $table ])) {

+        if (empty($this->queriesResultCache['tableColumns'][$table])) {

             $result = $this->query('SHOW COLUMNS FROM ' . $this->protectIdentifiers($table, true, null, false));

 

             if ($result->count()) {

                 foreach ($result as $row) {

                     // Do we know from where to get the column's name?

                     if ( ! isset($key)) {

-                        if (isset($row[ 'column_name' ])) {

+                        if (isset($row['column_name'])) {

                             $key = 'column_name';

-                        } elseif (isset($row[ 'COLUMN_NAME' ])) {

+                        } elseif (isset($row['COLUMN_NAME'])) {

                             $key = 'COLUMN_NAME';

                         } else {

                             /* We have no other choice but to just get the first element's key.

@@ -246,12 +246,12 @@ 
                         }

                     }

 

-                    $this->queriesResultCache[ 'tableColumns' ][ $table ][ $row->offsetGet($key) ] = $row;

+                    $this->queriesResultCache['tableColumns'][$table][$row->offsetGet($key)] = $row;

                 }

             }

         }

 

-        return $this->queriesResultCache[ 'tableColumns' ][ $table ];

+        return $this->queriesResultCache['tableColumns'][$table];

     }

 

     // ------------------------------------------------------------------------

@@ -330,13 +330,13 @@ 
      */

     protected function platformGetPlatformInfoHandler()

     {

-        $server[ 'version' ][ 'string' ] = $this->handle->server_info;

-        $server[ 'version' ][ 'number' ] = $this->handle->server_version;

-        $server[ 'stats' ] = $this->handle->get_connection_stats();

+        $server['version']['string'] = $this->handle->server_info;

+        $server['version']['number'] = $this->handle->server_version;

+        $server['stats'] = $this->handle->get_connection_stats();

 

-        $client[ 'version' ][ 'string' ] = $this->handle->client_info;

-        $client[ 'version' ][ 'number' ] = $this->handle->client_version;

-        $client[ 'stats' ] = mysqli_get_client_stats();

+        $client['version']['string'] = $this->handle->client_info;

+        $client['version']['number'] = $this->handle->client_version;

+        $client['stats'] = mysqli_get_client_stats();

 

         return new SplArrayObject([

             'name'     => $this->getPlatform(),

@@ -363,7 +363,7 @@ 
     protected function platformConnectHandler(Config $config)

     {

         // Do we have a socket path?

-        if ($config->hostname[ 0 ] === '/') {

+        if ($config->hostname[0] === '/') {

             $hostname = null;

             $port = null;

             $socket = $config->hostname;

@@ -409,15 +409,15 @@ 
 

         if (is_array($config->encrypt)) {

             $ssl = [];

-            empty($config->encrypt[ 'ssl_key' ]) OR $ssl[ 'key' ] = $config->encrypt[ 'ssl_key' ];

-            empty($config->encrypt[ 'ssl_cert' ]) OR $ssl[ 'cert' ] = $config->encrypt[ 'ssl_cert' ];

-            empty($config->encrypt[ 'ssl_ca' ]) OR $ssl[ 'ca' ] = $config->encrypt[ 'ssl_ca' ];

-            empty($config->encrypt[ 'ssl_capath' ]) OR $ssl[ 'capath' ] = $config->encrypt[ 'ssl_capath' ];

-            empty($config->encrypt[ 'ssl_cipher' ]) OR $ssl[ 'cipher' ] = $config->encrypt[ 'ssl_cipher' ];

+            empty($config->encrypt['ssl_key']) OR $ssl['key'] = $config->encrypt['ssl_key'];

+            empty($config->encrypt['ssl_cert']) OR $ssl['cert'] = $config->encrypt['ssl_cert'];

+            empty($config->encrypt['ssl_ca']) OR $ssl['ca'] = $config->encrypt['ssl_ca'];

+            empty($config->encrypt['ssl_capath']) OR $ssl['capath'] = $config->encrypt['ssl_capath'];

+            empty($config->encrypt['ssl_cipher']) OR $ssl['cipher'] = $config->encrypt['ssl_cipher'];

 

             if ( ! empty($ssl)) {

-                if (isset($config->encrypt[ 'ssl_verify' ])) {

-                    if ($config->encrypt[ 'ssl_verify' ]) {

+                if (isset($config->encrypt['ssl_verify'])) {

+                    if ($config->encrypt['ssl_verify']) {

                         defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT')

                         && $this->handle->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, true);

                     }

@@ -434,20 +434,20 @@ 
 

                 $flags |= MYSQLI_CLIENT_SSL;

                 $this->handle->ssl_set(

-                    isset($ssl[ 'key' ])

-                        ? $ssl[ 'key' ]

+                    isset($ssl['key'])

+                        ? $ssl['key']

                         : null,

-                    isset($ssl[ 'cert' ])

-                        ? $ssl[ 'cert' ]

+                    isset($ssl['cert'])

+                        ? $ssl['cert']

                         : null,

-                    isset($ssl[ 'ca' ])

-                        ? $ssl[ 'ca' ]

+                    isset($ssl['ca'])

+                        ? $ssl['ca']

                         : null,

-                    isset($ssl[ 'capath' ])

-                        ? $ssl[ 'capath' ]

+                    isset($ssl['capath'])

+                        ? $ssl['capath']

                         : null,

-                    isset($ssl[ 'cipher' ])

-                        ? $ssl[ 'cipher' ]

+                    isset($ssl['cipher'])

+                        ? $ssl['cipher']

                         : null

                 );

             }