o2system / database

src/Sql/Drivers/MySql/Forge.php

Spacing +84 added lines, -84 removed lines

@@ -136,83 +136,83 @@ 
         // Columns Statement
         $columnStatements = [];
         foreach ($columns as $columnName => $columnAttributes) {
-            if (isset($columnAttributes[ 'type' ])) {
-                if (isset($columnAttributes[ 'foreign_key' ])) {
-                    $foreignKeys[ $columnName ] = $columnAttributes[ 'foreign_key' ];
+            if (isset($columnAttributes['type'])) {
+                if (isset($columnAttributes['foreign_key'])) {
+                    $foreignKeys[$columnName] = $columnAttributes['foreign_key'];
                 }
 
                 $columnStatementLine = [];
                 $columnName = $this->conn->escapeIdentifiers($columnName);
-                $columnAttributes[ 'type' ] = strtoupper($columnAttributes[ 'type' ]);
+                $columnAttributes['type'] = strtoupper($columnAttributes['type']);
 
-                if (isset($columnAttributes[ 'primary_key' ])) {
-                    if ($columnAttributes[ 'primary_key' ] === true) {
+                if (isset($columnAttributes['primary_key'])) {
+                    if ($columnAttributes['primary_key'] === true) {
                         $primaryKeys[] = $columnName;
                     }
                 }
 
-                if (isset($columnAttributes[ 'unique' ])) {
-                    if ($columnAttributes[ 'unique' ] === true) {
+                if (isset($columnAttributes['unique'])) {
+                    if ($columnAttributes['unique'] === true) {
                         $uniqueKeys[] = $columnName;
                     }
                 }
 
-                if ($columnAttributes[ 'type' ] === 'ENUM') {
-                    if (empty($columnAttributes[ 'value' ])) {
+                if ($columnAttributes['type'] === 'ENUM') {
+                    if (empty($columnAttributes['value'])) {
                         continue;
                     } else {
-                        if (is_string($columnAttributes[ 'value' ])) {
-                            $columnAttributes[ 'value' ] = explode(',', $columnAttributes[ 'value' ]);
+                        if (is_string($columnAttributes['value'])) {
+                            $columnAttributes['value'] = explode(',', $columnAttributes['value']);
                         }
 
-                        $columnAttributes[ 'value' ] = array_map(function ($value) {
+                        $columnAttributes['value'] = array_map(function($value) {
                             return $this->conn->escape(str_replace('\'', '', trim($value)));
-                        }, $columnAttributes[ 'value' ]);
+                        }, $columnAttributes['value']);
 
                         $columnStatementLine[] = $columnName .
-                            ' ' . $columnAttributes[ 'type' ] . '(' .
-                            implode(',', $columnAttributes[ 'value' ])
+                            ' ' . $columnAttributes['type'] . '(' .
+                            implode(',', $columnAttributes['value'])
                             . ')';
                     }
-                } elseif (isset($columnAttributes[ 'length' ])) {
-                    $columnStatementLine[] = $columnName . ' ' . $columnAttributes[ 'type' ] . '(' . $columnAttributes[ 'length' ] . ')';
+                } elseif (isset($columnAttributes['length'])) {
+                    $columnStatementLine[] = $columnName . ' ' . $columnAttributes['type'] . '(' . $columnAttributes['length'] . ')';
                 } else {
-                    $columnStatementLine[] = $columnName . ' ' . $columnAttributes[ 'type' ];
+                    $columnStatementLine[] = $columnName . ' ' . $columnAttributes['type'];
                 }
 
-                if (isset($columnAttributes[ 'unsigned' ])) {
-                    if ($columnAttributes[ 'unsigned' ] === true) {
-                        if (in_array($columnAttributes[ 'type' ], $this->unsignedSupportColumnTypes)) {
+                if (isset($columnAttributes['unsigned'])) {
+                    if ($columnAttributes['unsigned'] === true) {
+                        if (in_array($columnAttributes['type'], $this->unsignedSupportColumnTypes)) {
                             $columnStatementLine[] = 'UNSIGNED';
                         }
                     }
                 }
 
-                if (isset($columnAttributes[ 'collate' ])) {
-                    $columnStatementLine[] = 'COLLATE ' . $columnAttributes[ 'collate' ];
-                } elseif (in_array($columnAttributes[ 'type' ],
+                if (isset($columnAttributes['collate'])) {
+                    $columnStatementLine[] = 'COLLATE ' . $columnAttributes['collate'];
+                } elseif (in_array($columnAttributes['type'],
                     ['CHAR', 'VARCHAR', 'TEXT', 'LONGTEXT', 'TINYTEXT', 'ENUM'])) {
                     $columnStatementLine[] = 'COLLATE ' . $this->conn->getConfig('collate');
                 }
 
-                if (isset($columnAttributes[ 'not_null' ])) {
-                    if ($columnAttributes[ 'not_null' ] === true) {
+                if (isset($columnAttributes['not_null'])) {
+                    if ($columnAttributes['not_null'] === true) {
                         $columnStatementLine[] = 'NOT NULL';
                     }
                 }
 
-                if (isset($columnAttributes[ 'default' ])) {
-                    $columnStatementLine[] = 'DEFAULT ' . $this->conn->escape($columnAttributes[ 'default' ]);
+                if (isset($columnAttributes['default'])) {
+                    $columnStatementLine[] = 'DEFAULT ' . $this->conn->escape($columnAttributes['default']);
                 }
 
-                if (isset($columnAttributes[ 'auto_increment' ])) {
-                    if ($columnAttributes[ 'auto_increment' ] === true) {
+                if (isset($columnAttributes['auto_increment'])) {
+                    if ($columnAttributes['auto_increment'] === true) {
                         $columnStatementLine[] = 'AUTO_INCREMENT ';
                     }
                 }
 
-                if (isset($columnAttributes[ 'comment' ])) {
-                    $columnStatementLine[] = 'COMMENT ' . $columnAttributes[ 'comment' ];
+                if (isset($columnAttributes['comment'])) {
+                    $columnStatementLine[] = 'COMMENT ' . $columnAttributes['comment'];
                 }
 
                 $columnStatements[] = "\t" . implode(' ', $columnStatementLine);
@@ -242,16 +242,16 @@ 
         // Foreign Keys Statement
         if (count($foreignKeys)) {
             foreach ($foreignKeys as $foreignKeyColumnName => $foreignKeyAttributes) {
-                if (empty($foreignKeyAttributes[ 'name' ])) {
-                    $foreignKeyAttributes[ 'name' ] = 'fk_' . $foreignKeyColumnName;
+                if (empty($foreignKeyAttributes['name'])) {
+                    $foreignKeyAttributes['name'] = 'fk_' . $foreignKeyColumnName;
                 }
 
-                if (isset($foreignKeyAttributes[ 'references' ])) {
+                if (isset($foreignKeyAttributes['references'])) {
                     $keyStatements[] = 'KEY ' .
-                        $this->conn->escapeIdentifiers($foreignKeyAttributes[ 'name' ]) .
+                        $this->conn->escapeIdentifiers($foreignKeyAttributes['name']) .
                         ' (' . $this->conn->escapeIdentifiers($foreignKeyColumnName) . ')';
 
-                    $referenceParts = array_map('trim', explode('.', $foreignKeyAttributes[ 'references' ]));
+                    $referenceParts = array_map('trim', explode('.', $foreignKeyAttributes['references']));
                     list($referenceTable, $referenceColumn) = $referenceParts;
 
                     $referenceOnDelete = 'NO ACTION';
@@ -264,20 +264,20 @@ 
                         'SET NULL',
                     ];
 
-                    if (isset($foreignKeyAttributes[ 'on_delete' ])) {
-                        if (in_array($foreignKeyAttributes[ 'on_delete' ], $validReferenceActions)) {
-                            $referenceOnDelete = $foreignKeyAttributes[ 'on_delete' ];
+                    if (isset($foreignKeyAttributes['on_delete'])) {
+                        if (in_array($foreignKeyAttributes['on_delete'], $validReferenceActions)) {
+                            $referenceOnDelete = $foreignKeyAttributes['on_delete'];
                         }
                     }
 
-                    if (isset($foreignKeyAttributes[ 'on_update' ])) {
-                        if (in_array($foreignKeyAttributes[ 'on_update' ], $validReferenceActions)) {
-                            $referenceOnUpdate = $foreignKeyAttributes[ 'on_update' ];
+                    if (isset($foreignKeyAttributes['on_update'])) {
+                        if (in_array($foreignKeyAttributes['on_update'], $validReferenceActions)) {
+                            $referenceOnUpdate = $foreignKeyAttributes['on_update'];
                         }
                     }
 
                     $constraintStatements[] = 'CONSTRAINT ' .
-                        $this->conn->escapeIdentifiers($foreignKeyAttributes[ 'name' ]) .
+                        $this->conn->escapeIdentifiers($foreignKeyAttributes['name']) .
                         ' FOREIGN KEY (' . $this->conn->escapeIdentifiers($foreignKeyColumnName) . ') REFERENCES ' .
                         $this->conn->escapeIdentifiers($referenceTable) . ' (' . $this->conn->escapeIdentifiers($referenceColumn) .
                         ') ON DELETE ' . $referenceOnDelete . ' ON UPDATE ' . $referenceOnUpdate;
@@ -289,25 +289,25 @@ 
             array_merge($columnStatements, $keyStatements, $constraintStatements));
 
         if (empty($attributes)) {
-            $attributes[ 'engine' ] = 'InnoDB';
+            $attributes['engine'] = 'InnoDB';
         }
 
-        if( ! array_key_exists('charset', $attributes) ) {
-            $attributes[ 'charset' ] = $this->conn->getConfig('charset');
+        if ( ! array_key_exists('charset', $attributes)) {
+            $attributes['charset'] = $this->conn->getConfig('charset');
         }
 
-        if( ! array_key_exists('collate', $attributes) ) {
-            $attributes[ 'collate' ] = $this->conn->getConfig('collate');
+        if ( ! array_key_exists('collate', $attributes)) {
+            $attributes['collate'] = $this->conn->getConfig('collate');
         }
 
         $attributeStatements = [];
         foreach ($attributes as $key => $value) {
-            if(is_string($key)) {
+            if (is_string($key)) {
                 $key = strtoupper(dash($key));
 
                 if ($key === 'CHARSET') {
-                    $attributeStatements[] =  'DEFAULT CHARACTER SET = ' . $value;
-                } elseif(in_array($key, $this->quotedTableOptions)) {
+                    $attributeStatements[] = 'DEFAULT CHARACTER SET = ' . $value;
+                } elseif (in_array($key, $this->quotedTableOptions)) {
                     $attributeStatements[] = $this->conn->escape($key) . ' = ' . $value;
                 } else {
                     $attributeStatements[] = $this->conn->escapeString($key) . ' = ' . $value;
@@ -367,63 +367,63 @@ 
         $alterTableStatementStrings[] = strtoupper($action);
         $alterTableStatementStrings[] = $this->conn->escapeIdentifiers($column);
 
-        if (isset($attributes[ 'type' ])) {
-            if ($attributes[ 'type' ] === 'ENUM') {
-                if (empty($attributes[ 'value' ])) {
+        if (isset($attributes['type'])) {
+            if ($attributes['type'] === 'ENUM') {
+                if (empty($attributes['value'])) {
                     return false;
                 } else {
-                    if (is_string($attributes[ 'value' ])) {
-                        $attributes[ 'value' ] = explode(',', $attributes[ 'value' ]);
+                    if (is_string($attributes['value'])) {
+                        $attributes['value'] = explode(',', $attributes['value']);
                     }
 
-                    $attributes[ 'value' ] = array_map(function ($value) {
+                    $attributes['value'] = array_map(function($value) {
                         return $this->conn->escape(str_replace('\'', '', trim($value)));
-                    }, $attributes[ 'value' ]);
+                    }, $attributes['value']);
 
-                    $alterTableStatementStrings[] = $attributes[ 'type' ] . '(' .
-                        implode(',', $attributes[ 'value' ])
+                    $alterTableStatementStrings[] = $attributes['type'] . '(' .
+                        implode(',', $attributes['value'])
                         . ')';
                 }
-            } elseif (isset($attributes[ 'length' ])) {
-                $alterTableStatementStrings[] = $attributes[ 'type' ] . '(' . $attributes[ 'length' ] . ')';
+            } elseif (isset($attributes['length'])) {
+                $alterTableStatementStrings[] = $attributes['type'] . '(' . $attributes['length'] . ')';
             } else {
-                $alterTableStatementStrings[] = $attributes[ 'type' ];
+                $alterTableStatementStrings[] = $attributes['type'];
             }
 
-            if (isset($attributes[ 'unsigned' ])) {
-                if ($attributes[ 'unsigned' ] === true) {
-                    if (in_array($attributes[ 'type' ],
+            if (isset($attributes['unsigned'])) {
+                if ($attributes['unsigned'] === true) {
+                    if (in_array($attributes['type'],
                         ['INT', 'BIGINT', 'SMALLINT', 'TINYINT', 'FLOAT', 'DECIMAL', 'REAL'])) {
                         $alterTableStatementStrings[] = 'UNSIGNED';
                     }
                 }
             }
 
-            if (isset($attributes[ 'collate' ])) {
-                $alterTableStatementStrings[] = 'COLLATE ' . $attributes[ 'collate' ];
-            } elseif (in_array($attributes[ 'type' ],
+            if (isset($attributes['collate'])) {
+                $alterTableStatementStrings[] = 'COLLATE ' . $attributes['collate'];
+            } elseif (in_array($attributes['type'],
                 ['CHAR', 'VARCHAR', 'TEXT', 'LONGTEXT', 'TINYTEXT', 'ENUM'])) {
                 $alterTableStatementStrings[] = 'COLLATE ' . $this->conn->getConfig('collate');
             }
 
-            if (isset($attributes[ 'not_null' ])) {
-                if ($attributes[ 'not_null' ] === true) {
+            if (isset($attributes['not_null'])) {
+                if ($attributes['not_null'] === true) {
                     $alterTableStatementStrings[] = 'NOT NULL';
                 }
             }
 
-            if (isset($attributes[ 'default' ])) {
-                $alterTableStatementStrings[] = 'DEFAULT ' . $this->conn->escape($attributes[ 'default' ]);
+            if (isset($attributes['default'])) {
+                $alterTableStatementStrings[] = 'DEFAULT ' . $this->conn->escape($attributes['default']);
             }
 
-            if (isset($attributes[ 'auto_increment' ])) {
-                if ($attributes[ 'auto_increment' ] === true) {
+            if (isset($attributes['auto_increment'])) {
+                if ($attributes['auto_increment'] === true) {
                     $alterTableStatementStrings[] = 'AUTO_INCREMENT ';
                 }
             }
 
-            if (isset($attributes[ 'comment' ])) {
-                $alterTableStatementStrings[] = 'COMMENT ' . $attributes[ 'comment' ];
+            if (isset($attributes['comment'])) {
+                $alterTableStatementStrings[] = 'COMMENT ' . $attributes['comment'];
             }
 
             $statementLines[] = implode(' ', $alterTableStatementStrings) . ';';
@@ -464,7 +464,7 @@ 
     {
         $statementLines[] = 'ALTER TABLE ' . $this->conn->escapeIdentifiers($table);
 
-        $keys = array_map(function ($column) {
+        $keys = array_map(function($column) {
             return $this->conn->escapeIdentifiers($column);
         }, $columns);
 
@@ -537,7 +537,7 @@ 
     {
         $statementLines[] = 'ALTER TABLE ' . $this->conn->escapeIdentifiers($table);
 
-        $keys = array_map(function ($column) {
+        $keys = array_map(function($column) {
             return $this->conn->escapeIdentifiers($column);
         }, $columns);
 
@@ -565,7 +565,7 @@ 
      */
     protected function platformCreateTableIndexesStatement($table, array $columns, $unique = false)
     {
-        $keys = array_map(function ($column) {
+        $keys = array_map(function($column) {
             return $this->conn->escapeIdentifiers($column);
         }, $columns);
 
@@ -648,13 +648,13 @@ 
         $columns = array_keys($conditions);
 
         if (count($conditions) == 1) {
-            $statementLines[] = 'ADD CHECK (' . $this->conn->escapeIdentifiers($columns[ 0 ]) . ')';
+            $statementLines[] = 'ADD CHECK (' . $this->conn->escapeIdentifiers($columns[0]) . ')';
         } else {
             $conditionStatementStrings = [];
 
             foreach ($conditions as $column => $condition) {
                 if (preg_match('/\s*(?:<|>|!)?=\s*|\s*<>?\s*|\s*>\s*/i', $column, $match, PREG_OFFSET_CAPTURE)) {
-                    $operator = trim($match[ 0 ]);
+                    $operator = trim($match[0]);
                     $column = trim(str_replace($operator, '', $column));
 
                     $conditionStatementStrings[] = $this->conn->escapeIdentifiers($column) . $operator . $this->conn->escape($condition);

src/Sql/Abstracts/AbstractQueryBuilder.php

Spacing +89 added lines, -89 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];

@@ -2076,13 +2076,13 @@ 
         }

 

         $numrows = 0;

-        if($result = $this->conn->query($sqlStatement, $this->builderCache->binds)) {

-            if($result->count()) {

+        if ($result = $this->conn->query($sqlStatement, $this->builderCache->binds)) {

+            if ($result->count()) {

                 $numrows = $result->first()->numrows;

             }

         }

 

-        if($reset) {

+        if ($reset) {

             $this->builderCache->reset();

         }

 

@@ -2196,13 +2196,13 @@ 
         }

 

         $numrows = 0;

-        if($result = $this->conn->query($sqlStatement, $this->builderCache->binds)) {

-            if($result->count()) {

+        if ($result = $this->conn->query($sqlStatement, $this->builderCache->binds)) {

+            if ($result->count()) {

                 $numrows = $result->first()->numrows;

             }

         }

 

-        if($reset) {

+        if ($reset) {

             $this->builderCache->reset();

         }

 

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

             $sqlStatement = $this->platformInsertStatement(

                 $this->conn->protectIdentifiers(

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

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

                     true,

                     $escape,

                     false

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

                 }

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

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

             }

         }

 

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

             );

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

                 }

             }

         }

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

             $sqlStatement = $this->platformReplaceStatement(

                 $this->conn->protectIdentifiers(

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

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

                     true,

                     $escape,

                     false

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

             );

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

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

             );

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

             }

 

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

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

         }

 

         if ( ! $this->testMode) {

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

@@ -2905,7 +2905,7 @@ 
 

         $sqlStatement = $this->platformDeleteStatement(

             $this->conn->protectIdentifiers(

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

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

                 true,

                 $this->conn->protectIdentifiers,

                 false

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

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

                         )

                     ) {

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

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

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

         }

 

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

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

     }

 

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

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