o2system / database

src/Sql/Drivers/Sqlite/Connection.php

Spacing +14 added lines, -14 removed lines

@@ -123,9 +123,9 @@ 
      */

     public function getDatabases()

     {

-        $this->queriesResultCache[ 'databaseNames' ][] = pathinfo($this->database, PATHINFO_FILENAME);

+        $this->queriesResultCache['databaseNames'][] = pathinfo($this->database, PATHINFO_FILENAME);

 

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

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

     }

 

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

@@ -143,12 +143,12 @@ 
      */

     public function getTables($prefixLimit = false)

     {

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

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

 

             $sqlStatement = 'SELECT "NAME" FROM "SQLITE_MASTER" WHERE "TYPE" = \'table\'';

 

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

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

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

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

             }

 

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

@@ -157,9 +157,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.

@@ -172,12 +172,12 @@ 
                         }

                     }

 

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

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

                 }

             }

         }

 

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

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

     }

 

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

@@ -195,24 +195,24 @@ 
     {

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

 

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

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

             $result = $this->query('PRAGMA TABLE_INFO(' . $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[ 'name' ])) {

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

                             $key = 'name';

                         }

                     }

 

-                    $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];

     }

 

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

@@ -331,7 +331,7 @@ 
         if (false !== ($result = $this->handle->query($statement->getSqlFinalStatement()))) {

             $i = 0;

             while ($row = $result->fetchArray(SQLITE3_ASSOC)) {

-                $rows[ $i ] = $row;

+                $rows[$i] = $row;

                 $i++;

             }

         } else {

src/Sql/Drivers/MySql/Forge.php

Spacing +80 added lines, -80 removed lines

@@ -86,84 +86,84 @@ 
         // 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' ],
+                if (isset($columnAttributes['unsigned'])) {
+                    if ($columnAttributes['unsigned'] === true) {
+                        if (in_array($columnAttributes['type'],
                             ['INT', 'BIGINT', 'SMALLINT', 'TINYINT', 'FLOAT', 'DECIMAL', 'REAL'])) {
                             $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);
@@ -193,16 +193,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';
@@ -215,20 +215,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;
@@ -240,10 +240,10 @@ 
             array_merge($columnStatements, $keyStatements, $constraintStatements));
 
         if (empty($attributes)) {
-            $attributes[ 'engine' ] = 'InnoDB';
-            $attributes[ 'default' ] = 'DEFAULT';
-            $attributes[ 'charset' ] = $this->conn->getConfig('charset');
-            $attributes[ 'collate' ] = $this->conn->getConfig('collate');
+            $attributes['engine'] = 'InnoDB';
+            $attributes['default'] = 'DEFAULT';
+            $attributes['charset'] = $this->conn->getConfig('charset');
+            $attributes['collate'] = $this->conn->getConfig('collate');
         }
 
         $attributeStatements = [];
@@ -309,63 +309,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) . ';';
@@ -406,7 +406,7 @@ 
     {
         $statementLines[] = 'ALTER TABLE ' . $this->conn->escapeIdentifiers($table);
 
-        $keys = array_map(function ($column) {
+        $keys = array_map(function($column) {
             return $this->conn->escapeIdentifiers($column);
         }, $columns);
 
@@ -479,7 +479,7 @@ 
     {
         $statementLines[] = 'ALTER TABLE ' . $this->conn->escapeIdentifiers($table);
 
-        $keys = array_map(function ($column) {
+        $keys = array_map(function($column) {
             return $this->conn->escapeIdentifiers($column);
         }, $columns);
 
@@ -507,7 +507,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);
 
@@ -590,13 +590,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);