o2system / database

src/Sql/Drivers/MySql/QueryBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -139,11 +139,11 @@
         $columns = [];

 

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

-            $ids[] = $value[ $index ];

+            $ids[] = $value[$index];

 

             foreach (array_keys($value) as $field) {

                 if ($field !== $index) {

-                    $columns[ $field ][] = 'WHEN ' . $index . ' = ' . $value[ $index ] . ' THEN ' . $value[ $field ];

+                    $columns[$field][] = 'WHEN ' . $index . ' = ' . $value[$index] . ' THEN ' . $value[$field];

                 }

             }

         }

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/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/Sql/DataStructures/QueryStatement.php

Spacing +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
      */

     public function setError($errorCode, $errorMessage)

     {

-        $this->error[ $errorCode ] = $errorMessage;

+        $this->error[$errorCode] = $errorMessage;

 

         return $this;

     }

src/NoSql/Drivers/MongoDb/QueryBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -118,7 +118,7 @@ 
 

             if ($field === '_id') {

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

-                    $values[ $key ] = new \MongoDb\BSON\ObjectID($value);

+                    $values[$key] = new \MongoDb\BSON\ObjectID($value);

                 }

             }

 

@@ -188,7 +188,7 @@ 
             $builderCache->store('from', $collection);

             $builderCache->store('where', ['_id' => $document->_id]);

             $document = $document->getArrayCopy();

-            unset($document[ '_id' ]);

+            unset($document['_id']);

 

             $builderCache->store('sets', array_merge($document, $sets));

 

@@ -229,7 +229,7 @@ 
                 $document = $this->get()->first();

                 $documentIds[] = $document->_id;

                 $document = $document->getArrayCopy();

-                unset($document[ '_id' ]);

+                unset($document['_id']);

 

                 $documents[] = array_merge($document, $sets);

             }

src/NoSql/Drivers/MongoDb/Connection.php

Spacing +37 added lines, -37 removed lines

@@ -100,17 +100,17 @@ 
         $cursor->setTypeMap(['root' => 'array', 'document' => 'array']);

         $result = current($cursor->toArray());

 

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

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

 

-        if ( ! empty($result[ 'databases' ])) {

-            foreach ($result[ 'databases' ] as $database) {

-                if ( ! in_array($database[ 'name' ], ['admin', 'local'])) {

-                    $this->queriesResultCache[ 'databaseNames' ][] = $database[ 'name' ];

+        if ( ! empty($result['databases'])) {

+            foreach ($result['databases'] as $database) {

+                if ( ! in_array($database['name'], ['admin', 'local'])) {

+                    $this->queriesResultCache['databaseNames'][] = $database['name'];

                 }

             }

         }

 

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

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

     }

 

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

@@ -130,15 +130,15 @@ 
 

         $result = new \IteratorIterator($cursor);

 

-        $this->queriesResultCache[ 'collectionNames' ] = [];

+        $this->queriesResultCache['collectionNames'] = [];

 

         foreach ($result as $collection) {

-            if ($collection[ 'type' ] === 'collection') {

-                $this->queriesResultCache[ 'collectionNames' ][] = $collection[ 'name' ];

+            if ($collection['type'] === 'collection') {

+                $this->queriesResultCache['collectionNames'][] = $collection['name'];

             }

         }

 

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

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

     }

 

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

@@ -158,13 +158,13 @@ 
 

         $result = current($cursor->toArray());

 

-        $this->queriesResultCache[ 'collectionKeys' ][ $collection ] = [];

+        $this->queriesResultCache['collectionKeys'][$collection] = [];

 

         foreach (get_object_vars($result) as $key => $value) {

-            $this->queriesResultCache[ 'collectionKeys' ][ $collection ][] = $key;

+            $this->queriesResultCache['collectionKeys'][$collection][] = $key;

         }

 

-        return $this->queriesResultCache[ 'collectionKeys' ][ $collection ];

+        return $this->queriesResultCache['collectionKeys'][$collection];

     }

 

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

@@ -185,13 +185,13 @@ 
 

         $result = new \IteratorIterator($cursor);

 

-        $this->queriesResultCache[ 'collectionIndexes' ][ $collection ] = [];

+        $this->queriesResultCache['collectionIndexes'][$collection] = [];

 

         foreach ($result as $index) {

-            $this->queriesResultCache[ 'collectionIndexes' ][ $collection ][] = $index[ 'name' ];

+            $this->queriesResultCache['collectionIndexes'][$collection][] = $index['name'];

         }

 

-        return $this->queriesResultCache[ 'collectionIndexes' ][ $collection ];

+        return $this->queriesResultCache['collectionIndexes'][$collection];

     }

 

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

@@ -234,9 +234,9 @@ 
     protected function platformGetPlatformInfoHandler()

     {

         $metadata = $this->server->getInfo();

-        $metadata[ 'latency' ] = $this->server->getLatency();

-        $metadata[ 'type' ] = $this->server->getType();

-        $metadata[ 'tags' ] = $this->server->getTags();

+        $metadata['latency'] = $this->server->getLatency();

+        $metadata['type'] = $this->server->getType();

+        $metadata['tags'] = $this->server->getTags();

 

         return new SplArrayObject([

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

@@ -297,10 +297,10 @@ 
     {

         $this->parseQueryStatement($statement);

 

-        if (isset($options[ 'method' ])) {

+        if (isset($options['method'])) {

 

-            $method = $options[ 'method' ];

-            unset($options[ 'method' ]);

+            $method = $options['method'];

+            unset($options['method']);

 

             $options = array_merge(['safe' => true, 'ordered' => true], $options);

             $bulk = new \MongoDb\Driver\BulkWrite($options);

@@ -384,7 +384,7 @@ 
             $projection = [];

 

             foreach ($builderCache->select as $field) {

-                $projection[ $field ] = 1;

+                $projection[$field] = 1;

             }

 

             $statement->addOption('projection', $projection);

@@ -394,9 +394,9 @@ 
         if (count($builderCache->whereIn)) {

             foreach ($builderCache->whereIn as $field => $clause) {

                 if (count($builderCache->orWhereIn)) {

-                    $builderCache->orWhere[ $field ] = ['$in' => $clause];

+                    $builderCache->orWhere[$field] = ['$in' => $clause];

                 } else {

-                    $builderCache->where[ $field ] = ['$in' => $clause];

+                    $builderCache->where[$field] = ['$in' => $clause];

                 }

             }

         }

@@ -404,44 +404,44 @@ 
         // Filter Where Not In

         if (count($builderCache->whereNotIn)) {

             foreach ($builderCache->whereNotIn as $field => $clause) {

-                $builderCache->where[ $field ] = ['$nin' => $clause];

+                $builderCache->where[$field] = ['$nin' => $clause];

             }

         }

 

         // Filter Or Where In

         if (count($builderCache->orWhereIn)) {

             foreach ($builderCache->orWhereIn as $field => $clause) {

-                $builderCache->orWhere[ $field ] = ['$in' => $clause];

+                $builderCache->orWhere[$field] = ['$in' => $clause];

             }

         }

 

         // Filter Or Where Not In

         if (count($builderCache->orWhereNotIn)) {

             foreach ($builderCache->orWhereNotIn as $field => $clause) {

-                $builderCache->orWhere[ $field ] = ['$nin' => $clause];

+                $builderCache->orWhere[$field] = ['$nin' => $clause];

             }

         }

 

         // Filter Where Between

         if (count($builderCache->between)) {

             foreach ($builderCache->between as $field => $clause) {

-                $builderCache->where[ $field ] = ['$gte' => $clause[ 'start' ], '$lte' => $clause[ 'end' ]];

+                $builderCache->where[$field] = ['$gte' => $clause['start'], '$lte' => $clause['end']];

             }

         }

 

         // Filter Or Where Between

         if (count($builderCache->orBetween)) {

             foreach ($builderCache->orBetween as $field => $clause) {

-                $builderCache->orWhere[ $field ] = ['$gte' => $clause[ 'start' ], '$lte' => $clause[ 'end' ]];

+                $builderCache->orWhere[$field] = ['$gte' => $clause['start'], '$lte' => $clause['end']];

             }

         }

 

         // Filter Where Not Between

         if (count($builderCache->notBetween)) {

             foreach ($builderCache->notBetween as $field => $clause) {

-                $builderCache->where[ $field ][ '$not' ] = [

-                    '$gte' => $clause[ 'start' ],

-                    '$lte' => $clause[ 'end' ],

+                $builderCache->where[$field]['$not'] = [

+                    '$gte' => $clause['start'],

+                    '$lte' => $clause['end'],

                 ];

             }

         }

@@ -449,9 +449,9 @@ 
         // Filter Or Where Not Between

         if (count($builderCache->orNotBetween)) {

             foreach ($builderCache->orNotBetween as $field => $clause) {

-                $builderCache->orWhere[ $field ][ '$not' ] = [

-                    '$gte' => $clause[ 'start' ],

-                    '$lte' => $clause[ 'end' ],

+                $builderCache->orWhere[$field]['$not'] = [

+                    '$gte' => $clause['start'],

+                    '$lte' => $clause['end'],

                 ];

             }

         }

@@ -489,7 +489,7 @@ 
             $sort = [];

             foreach ($builderCache->orderBy as $field => $direction) {

                 $direction = $direction === 'ASC' ? 1 : -1;

-                $sort[ $field ] = $direction;

+                $sort[$field] = $direction;

             }

 

             $statement->addOption('sort', $sort);

src/NoSql/DataStructures/Query/BuilderCache.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/NoSql/DataStructures/Query/Statement.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/Sql/Abstracts/AbstractQueryBuilder.php

Spacing +83 added lines, -83 removed lines

@@ -100,7 +100,7 @@ 
      */

     public function __construct(AbstractConnection &$conn)

     {

-        $this->conn =& $conn;

+        $this->conn = & $conn;

         $this->builderCache = new Query\BuilderCache();

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

     }

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

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

             : $alias;

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

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

             . ' AS '

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

 

@@ -336,11 +336,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] . "'+";

                             }

                         }

 

@@ -492,7 +492,7 @@ 
 

         $this->select(

             sprintf(

-                $SqlScalarFunctions[ $type ],

+                $SqlScalarFunctions[$type],

                 $field,

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

             )

@@ -697,7 +697,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);

@@ -904,7 +904,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);

@@ -1098,14 +1098,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];

@@ -1114,17 +1114,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];

             }

         }

 

@@ -1188,23 +1188,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;

     }

 

@@ -1274,8 +1274,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) {

@@ -1331,7 +1331,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;

         }

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

         }

 

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

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

 

         return $field . '_' . $count;

     }

@@ -1875,8 +1875,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 !== '') {

@@ -1904,8 +1904,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];

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

             $sqlStatement = $this->platformInsertStatement(

                 $this->conn->protectIdentifiers(

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

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

                     true,

                     $escape,

                     false

@@ -2373,7 +2373,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;

                 }

@@ -2381,9 +2381,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;

@@ -2410,7 +2410,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;

             }

         }

 

@@ -2458,7 +2458,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)

             );

@@ -2559,8 +2559,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;

                 }

             }

         }

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

             $sqlStatement = $this->platformReplaceStatement(

                 $this->conn->protectIdentifiers(

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

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

                     true,

                     $escape,

                     false

@@ -2674,7 +2674,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)

             );

@@ -2726,7 +2726,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

@@ -2787,7 +2787,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)

             );

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

             }

 

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

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

         }

 

         if ( ! $this->testMode) {

@@ -2843,7 +2843,7 @@ 
 

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

 

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

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

             }

 

             if ($indexSet === false) {

@@ -2894,7 +2894,7 @@ 
 

         $sqlStatement = $this->platformDeleteStatement(

             $this->conn->protectIdentifiers(

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

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

                 true,

                 $this->conn->protectIdentifiers,

                 false

@@ -3073,10 +3073,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

@@ -3195,28 +3195,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

                         )

                     ) {

@@ -3232,16 +3232,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') {

@@ -3280,17 +3280,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(

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

         }

 

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

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

     }

 

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

@@ -3393,18 +3393,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(