Inspection of "forge bugs fixes" - o2system/database - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 8b9576...7fa102 )

by Steeven

created 2019-09-20 04:53 UTC

Status

Spacing +88 added lines, -88 removed lines patch added patch discarded remove patch

@@ -136,93 +136,93 @@  discard block
 block discarded – undo
         // 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';
                     }
-                } elseif (isset($columnAttributes[ 'null' ])) {
-                    if ($columnAttributes[ 'null' ] === false) {
+                } elseif (isset($columnAttributes['null'])) {
+                    if ($columnAttributes['null'] === false) {
                         $columnStatementLine[] = 'NOT NULL';
                     }
                 }
 
-                if (isset($columnAttributes[ 'timestamp' ])) {
-                    if ($columnAttributes[ 'timestamp' ] === true) {
+                if (isset($columnAttributes['timestamp'])) {
+                    if ($columnAttributes['timestamp'] === true) {
                         $columnStatementLine[] = 'ON UPDATE CURRENT_TIMESTAMP';
                     }
                 }
 
-                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);
@@ -252,16 +252,16 @@  discard block
 block discarded – undo
         // 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';
@@ -274,20 +274,20 @@  discard block
 block discarded – undo
                         '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;
@@ -299,25 +299,25 @@  discard block
 block discarded – undo
             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 CHARSET=' . $value;
-                } elseif(in_array($key, $this->quotedTableOptions)) {
+                    $attributeStatements[] = 'DEFAULT CHARSET=' . $value;
+                } elseif (in_array($key, $this->quotedTableOptions)) {
                     $attributeStatements[] = $this->conn->escape($key) . '=' . $value;
                 } else {
                     $attributeStatements[] = $this->conn->escapeString($key) . '=' . $value;
@@ -377,63 +377,63 @@  discard block
 block discarded – undo
         $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) . ';';
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
     {
         $statementLines[] = 'ALTER TABLE ' . $this->conn->escapeIdentifiers($table);
 
-        $keys = array_map(function ($column) {
+        $keys = array_map(function($column) {
             return $this->conn->escapeIdentifiers($column);
         }, $columns);
 
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
     {
         $statementLines[] = 'ALTER TABLE ' . $this->conn->escapeIdentifiers($table);
 
-        $keys = array_map(function ($column) {
+        $keys = array_map(function($column) {
             return $this->conn->escapeIdentifiers($column);
         }, $columns);
 
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
      */
     protected function platformCreateTableIndexesStatement($table, array $columns, $unique = false)
     {
-        $keys = array_map(function ($column) {
+        $keys = array_map(function($column) {
             return $this->conn->escapeIdentifiers($column);
         }, $columns);
 
@@ -658,13 +658,13 @@  discard block
 block discarded – undo
         $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);

Please login to merge, or discard this patch.

GitHub Access Token became invalid

Push — master ( 8b9576...7fa102 )

Status

Category

Spacing +88 added lines, -88 removed lines patch added patch discarded remove patch

		@@ -136,93 +136,93 @@ discard block
		block discarded – undo
136	136	// Columns Statement
137	137	$columnStatements = [];
138	138	foreach ($columns as $columnName => $columnAttributes) {
139		- if (isset($columnAttributes[ 'type' ])) {
140		- if (isset($columnAttributes[ 'foreign_key' ])) {
141		- $foreignKeys[ $columnName ] = $columnAttributes[ 'foreign_key' ];
	139	+ if (isset($columnAttributes['type'])) {
	140	+ if (isset($columnAttributes['foreign_key'])) {
	141	+ $foreignKeys[$columnName] = $columnAttributes['foreign_key'];
142	142	}
143	143
144	144	$columnStatementLine = [];
145	145	$columnName = $this->conn->escapeIdentifiers($columnName);
146		- $columnAttributes[ 'type' ] = strtoupper($columnAttributes[ 'type' ]);
	146	+ $columnAttributes['type'] = strtoupper($columnAttributes['type']);
147	147
148		- if (isset($columnAttributes[ 'primary_key' ])) {
149		- if ($columnAttributes[ 'primary_key' ] === true) {
	148	+ if (isset($columnAttributes['primary_key'])) {
	149	+ if ($columnAttributes['primary_key'] === true) {
150	150	$primaryKeys[] = $columnName;
151	151	}
152	152	}
153	153
154		- if (isset($columnAttributes[ 'unique' ])) {
155		- if ($columnAttributes[ 'unique' ] === true) {
	154	+ if (isset($columnAttributes['unique'])) {
	155	+ if ($columnAttributes['unique'] === true) {
156	156	$uniqueKeys[] = $columnName;
157	157	}
158	158	}
159	159
160		- if ($columnAttributes[ 'type' ] === 'ENUM') {
161		- if (empty($columnAttributes[ 'value' ])) {
	160	+ if ($columnAttributes['type'] === 'ENUM') {
	161	+ if (empty($columnAttributes['value'])) {
162	162	continue;
163	163	} else {
164		- if (is_string($columnAttributes[ 'value' ])) {
165		- $columnAttributes[ 'value' ] = explode(',', $columnAttributes[ 'value' ]);
	164	+ if (is_string($columnAttributes['value'])) {
	165	+ $columnAttributes['value'] = explode(',', $columnAttributes['value']);
166	166	}
167	167
168		- $columnAttributes[ 'value' ] = array_map(function ($value) {
	168	+ $columnAttributes['value'] = array_map(function($value) {
169	169	return $this->conn->escape(str_replace('\'', '', trim($value)));
170		- }, $columnAttributes[ 'value' ]);
	170	+ }, $columnAttributes['value']);
171	171
172	172	$columnStatementLine[] = $columnName .
173		- ' ' . $columnAttributes[ 'type' ] . '(' .
174		- implode(',', $columnAttributes[ 'value' ])
	173	+ ' ' . $columnAttributes['type'] . '(' .
	174	+ implode(',', $columnAttributes['value'])
175	175	. ')';
176	176	}
177		- } elseif (isset($columnAttributes[ 'length' ])) {
178		- $columnStatementLine[] = $columnName . ' ' . $columnAttributes[ 'type' ] . '(' . $columnAttributes[ 'length' ] . ')';
	177	+ } elseif (isset($columnAttributes['length'])) {
	178	+ $columnStatementLine[] = $columnName . ' ' . $columnAttributes['type'] . '(' . $columnAttributes['length'] . ')';
179	179	} else {
180		- $columnStatementLine[] = $columnName . ' ' . $columnAttributes[ 'type' ];
	180	+ $columnStatementLine[] = $columnName . ' ' . $columnAttributes['type'];
181	181	}
182	182
183		- if (isset($columnAttributes[ 'unsigned' ])) {
184		- if ($columnAttributes[ 'unsigned' ] === true) {
185		- if (in_array($columnAttributes[ 'type' ], $this->unsignedSupportColumnTypes)) {
	183	+ if (isset($columnAttributes['unsigned'])) {
	184	+ if ($columnAttributes['unsigned'] === true) {
	185	+ if (in_array($columnAttributes['type'], $this->unsignedSupportColumnTypes)) {
186	186	$columnStatementLine[] = 'UNSIGNED';
187	187	}
188	188	}
189	189	}
190	190
191		- if (isset($columnAttributes[ 'collate' ])) {
192		- $columnStatementLine[] = 'COLLATE ' . $columnAttributes[ 'collate' ];
193		- } elseif (in_array($columnAttributes[ 'type' ],
	191	+ if (isset($columnAttributes['collate'])) {
	192	+ $columnStatementLine[] = 'COLLATE ' . $columnAttributes['collate'];
	193	+ } elseif (in_array($columnAttributes['type'],
194	194	['CHAR', 'VARCHAR', 'TEXT', 'LONGTEXT', 'TINYTEXT', 'ENUM'])) {
195	195	$columnStatementLine[] = 'COLLATE ' . $this->conn->getConfig('collate');
196	196	}
197	197
198		- if (isset($columnAttributes[ 'not_null' ])) {
199		- if ($columnAttributes[ 'not_null' ] === true) {
	198	+ if (isset($columnAttributes['not_null'])) {
	199	+ if ($columnAttributes['not_null'] === true) {
200	200	$columnStatementLine[] = 'NOT NULL';
201	201	}
202		- } elseif (isset($columnAttributes[ 'null' ])) {
203		- if ($columnAttributes[ 'null' ] === false) {
	202	+ } elseif (isset($columnAttributes['null'])) {
	203	+ if ($columnAttributes['null'] === false) {
204	204	$columnStatementLine[] = 'NOT NULL';
205	205	}
206	206	}
207	207
208		- if (isset($columnAttributes[ 'timestamp' ])) {
209		- if ($columnAttributes[ 'timestamp' ] === true) {
	208	+ if (isset($columnAttributes['timestamp'])) {
	209	+ if ($columnAttributes['timestamp'] === true) {
210	210	$columnStatementLine[] = 'ON UPDATE CURRENT_TIMESTAMP';
211	211	}
212	212	}
213	213
214		- if (isset($columnAttributes[ 'default' ])) {
215		- $columnStatementLine[] = 'DEFAULT ' . $this->conn->escape($columnAttributes[ 'default' ]);
	214	+ if (isset($columnAttributes['default'])) {
	215	+ $columnStatementLine[] = 'DEFAULT ' . $this->conn->escape($columnAttributes['default']);
216	216	}
217	217
218		- if (isset($columnAttributes[ 'auto_increment' ])) {
219		- if ($columnAttributes[ 'auto_increment' ] === true) {
	218	+ if (isset($columnAttributes['auto_increment'])) {
	219	+ if ($columnAttributes['auto_increment'] === true) {
220	220	$columnStatementLine[] = 'AUTO_INCREMENT';
221	221	}
222	222	}
223	223
224		- if (isset($columnAttributes[ 'comment' ])) {
225		- $columnStatementLine[] = 'COMMENT ' . $columnAttributes[ 'comment' ];
	224	+ if (isset($columnAttributes['comment'])) {
	225	+ $columnStatementLine[] = 'COMMENT ' . $columnAttributes['comment'];
226	226	}
227	227
228	228	$columnStatements[] = "\t" . implode(' ', $columnStatementLine);
		@@ -252,16 +252,16 @@ discard block
		block discarded – undo
252	252	// Foreign Keys Statement
253	253	if (count($foreignKeys)) {
254	254	foreach ($foreignKeys as $foreignKeyColumnName => $foreignKeyAttributes) {
255		- if (empty($foreignKeyAttributes[ 'name' ])) {
256		- $foreignKeyAttributes[ 'name' ] = 'fk_' . $foreignKeyColumnName;
	255	+ if (empty($foreignKeyAttributes['name'])) {
	256	+ $foreignKeyAttributes['name'] = 'fk_' . $foreignKeyColumnName;
257	257	}
258	258
259		- if (isset($foreignKeyAttributes[ 'references' ])) {
	259	+ if (isset($foreignKeyAttributes['references'])) {
260	260	$keyStatements[] = 'KEY ' .
261		- $this->conn->escapeIdentifiers($foreignKeyAttributes[ 'name' ]) .
	261	+ $this->conn->escapeIdentifiers($foreignKeyAttributes['name']) .
262	262	' (' . $this->conn->escapeIdentifiers($foreignKeyColumnName) . ')';
263	263
264		- $referenceParts = array_map('trim', explode('.', $foreignKeyAttributes[ 'references' ]));
	264	+ $referenceParts = array_map('trim', explode('.', $foreignKeyAttributes['references']));
265	265	list($referenceTable, $referenceColumn) = $referenceParts;
266	266
267	267	$referenceOnDelete = 'NO ACTION';
		@@ -274,20 +274,20 @@ discard block
		block discarded – undo
274	274	'SET NULL',
275	275	];
276	276
277		- if (isset($foreignKeyAttributes[ 'on_delete' ])) {
278		- if (in_array($foreignKeyAttributes[ 'on_delete' ], $validReferenceActions)) {
279		- $referenceOnDelete = $foreignKeyAttributes[ 'on_delete' ];
	277	+ if (isset($foreignKeyAttributes['on_delete'])) {
	278	+ if (in_array($foreignKeyAttributes['on_delete'], $validReferenceActions)) {
	279	+ $referenceOnDelete = $foreignKeyAttributes['on_delete'];
280	280	}
281	281	}
282	282
283		- if (isset($foreignKeyAttributes[ 'on_update' ])) {
284		- if (in_array($foreignKeyAttributes[ 'on_update' ], $validReferenceActions)) {
285		- $referenceOnUpdate = $foreignKeyAttributes[ 'on_update' ];
	283	+ if (isset($foreignKeyAttributes['on_update'])) {
	284	+ if (in_array($foreignKeyAttributes['on_update'], $validReferenceActions)) {
	285	+ $referenceOnUpdate = $foreignKeyAttributes['on_update'];
286	286	}
287	287	}
288	288
289	289	$constraintStatements[] = 'CONSTRAINT ' .
290		- $this->conn->escapeIdentifiers($foreignKeyAttributes[ 'name' ]) .
	290	+ $this->conn->escapeIdentifiers($foreignKeyAttributes['name']) .
291	291	' FOREIGN KEY (' . $this->conn->escapeIdentifiers($foreignKeyColumnName) . ') REFERENCES ' .
292	292	$this->conn->escapeIdentifiers($referenceTable) . ' (' . $this->conn->escapeIdentifiers($referenceColumn) .
293	293	') ON DELETE ' . $referenceOnDelete . ' ON UPDATE ' . $referenceOnUpdate;
		@@ -299,25 +299,25 @@ discard block
		block discarded – undo
299	299	array_merge($columnStatements, $keyStatements, $constraintStatements));
300	300
301	301	if (empty($attributes)) {
302		- $attributes[ 'engine' ] = 'InnoDB';
	302	+ $attributes['engine'] = 'InnoDB';
303	303	}
304	304
305		- if( ! array_key_exists('charset', $attributes) ) {
306		- $attributes[ 'charset' ] = $this->conn->getConfig('charset');
	305	+ if ( ! array_key_exists('charset', $attributes)) {
	306	+ $attributes['charset'] = $this->conn->getConfig('charset');
307	307	}
308	308
309		- if( ! array_key_exists('collate', $attributes) ) {
310		- $attributes[ 'collate' ] = $this->conn->getConfig('collate');
	309	+ if ( ! array_key_exists('collate', $attributes)) {
	310	+ $attributes['collate'] = $this->conn->getConfig('collate');
311	311	}
312	312
313	313	$attributeStatements = [];
314	314	foreach ($attributes as $key => $value) {
315		- if(is_string($key)) {
	315	+ if (is_string($key)) {
316	316	$key = strtoupper(dash($key));
317	317
318	318	if ($key === 'CHARSET') {
319		- $attributeStatements[] = 'DEFAULT CHARSET=' . $value;
320		- } elseif(in_array($key, $this->quotedTableOptions)) {
	319	+ $attributeStatements[] = 'DEFAULT CHARSET=' . $value;
	320	+ } elseif (in_array($key, $this->quotedTableOptions)) {
321	321	$attributeStatements[] = $this->conn->escape($key) . '=' . $value;
322	322	} else {
323	323	$attributeStatements[] = $this->conn->escapeString($key) . '=' . $value;
		@@ -377,63 +377,63 @@ discard block
		block discarded – undo
377	377	$alterTableStatementStrings[] = strtoupper($action);
378	378	$alterTableStatementStrings[] = $this->conn->escapeIdentifiers($column);
379	379
380		- if (isset($attributes[ 'type' ])) {
381		- if ($attributes[ 'type' ] === 'ENUM') {
382		- if (empty($attributes[ 'value' ])) {
	380	+ if (isset($attributes['type'])) {
	381	+ if ($attributes['type'] === 'ENUM') {
	382	+ if (empty($attributes['value'])) {
383	383	return false;
384	384	} else {
385		- if (is_string($attributes[ 'value' ])) {
386		- $attributes[ 'value' ] = explode(',', $attributes[ 'value' ]);
	385	+ if (is_string($attributes['value'])) {
	386	+ $attributes['value'] = explode(',', $attributes['value']);
387	387	}
388	388
389		- $attributes[ 'value' ] = array_map(function ($value) {
	389	+ $attributes['value'] = array_map(function($value) {
390	390	return $this->conn->escape(str_replace('\'', '', trim($value)));
391		- }, $attributes[ 'value' ]);
	391	+ }, $attributes['value']);
392	392
393		- $alterTableStatementStrings[] = $attributes[ 'type' ] . '(' .
394		- implode(',', $attributes[ 'value' ])
	393	+ $alterTableStatementStrings[] = $attributes['type'] . '(' .
	394	+ implode(',', $attributes['value'])
395	395	. ')';
396	396	}
397		- } elseif (isset($attributes[ 'length' ])) {
398		- $alterTableStatementStrings[] = $attributes[ 'type' ] . '(' . $attributes[ 'length' ] . ')';
	397	+ } elseif (isset($attributes['length'])) {
	398	+ $alterTableStatementStrings[] = $attributes['type'] . '(' . $attributes['length'] . ')';
399	399	} else {
400		- $alterTableStatementStrings[] = $attributes[ 'type' ];
	400	+ $alterTableStatementStrings[] = $attributes['type'];
401	401	}
402	402
403		- if (isset($attributes[ 'unsigned' ])) {
404		- if ($attributes[ 'unsigned' ] === true) {
405		- if (in_array($attributes[ 'type' ],
	403	+ if (isset($attributes['unsigned'])) {
	404	+ if ($attributes['unsigned'] === true) {
	405	+ if (in_array($attributes['type'],
406	406	['INT', 'BIGINT', 'SMALLINT', 'TINYINT', 'FLOAT', 'DECIMAL', 'REAL'])) {
407	407	$alterTableStatementStrings[] = 'UNSIGNED';
408	408	}
409	409	}
410	410	}
411	411
412		- if (isset($attributes[ 'collate' ])) {
413		- $alterTableStatementStrings[] = 'COLLATE ' . $attributes[ 'collate' ];
414		- } elseif (in_array($attributes[ 'type' ],
	412	+ if (isset($attributes['collate'])) {
	413	+ $alterTableStatementStrings[] = 'COLLATE ' . $attributes['collate'];
	414	+ } elseif (in_array($attributes['type'],
415	415	['CHAR', 'VARCHAR', 'TEXT', 'LONGTEXT', 'TINYTEXT', 'ENUM'])) {
416	416	$alterTableStatementStrings[] = 'COLLATE ' . $this->conn->getConfig('collate');
417	417	}
418	418
419		- if (isset($attributes[ 'not_null' ])) {
420		- if ($attributes[ 'not_null' ] === true) {
	419	+ if (isset($attributes['not_null'])) {
	420	+ if ($attributes['not_null'] === true) {
421	421	$alterTableStatementStrings[] = 'NOT NULL';
422	422	}
423	423	}
424	424
425		- if (isset($attributes[ 'default' ])) {
426		- $alterTableStatementStrings[] = 'DEFAULT ' . $this->conn->escape($attributes[ 'default' ]);
	425	+ if (isset($attributes['default'])) {
	426	+ $alterTableStatementStrings[] = 'DEFAULT ' . $this->conn->escape($attributes['default']);
427	427	}
428	428
429		- if (isset($attributes[ 'auto_increment' ])) {
430		- if ($attributes[ 'auto_increment' ] === true) {
	429	+ if (isset($attributes['auto_increment'])) {
	430	+ if ($attributes['auto_increment'] === true) {
431	431	$alterTableStatementStrings[] = 'AUTO_INCREMENT ';
432	432	}
433	433	}
434	434
435		- if (isset($attributes[ 'comment' ])) {
436		- $alterTableStatementStrings[] = 'COMMENT ' . $attributes[ 'comment' ];
	435	+ if (isset($attributes['comment'])) {
	436	+ $alterTableStatementStrings[] = 'COMMENT ' . $attributes['comment'];
437	437	}
438	438
439	439	$statementLines[] = implode(' ', $alterTableStatementStrings) . ';';
		@@ -474,7 +474,7 @@ discard block
		block discarded – undo
474	474	{
475	475	$statementLines[] = 'ALTER TABLE ' . $this->conn->escapeIdentifiers($table);
476	476
477		- $keys = array_map(function ($column) {
	477	+ $keys = array_map(function($column) {
478	478	return $this->conn->escapeIdentifiers($column);
479	479	}, $columns);
480	480
		@@ -547,7 +547,7 @@ discard block
		block discarded – undo
547	547	{
548	548	$statementLines[] = 'ALTER TABLE ' . $this->conn->escapeIdentifiers($table);
549	549
550		- $keys = array_map(function ($column) {
	550	+ $keys = array_map(function($column) {
551	551	return $this->conn->escapeIdentifiers($column);
552	552	}, $columns);
553	553
		@@ -575,7 +575,7 @@ discard block
		block discarded – undo
575	575	*/
576	576	protected function platformCreateTableIndexesStatement($table, array $columns, $unique = false)
577	577	{
578		- $keys = array_map(function ($column) {
	578	+ $keys = array_map(function($column) {
579	579	return $this->conn->escapeIdentifiers($column);
580	580	}, $columns);
581	581
		@@ -658,13 +658,13 @@ discard block
		block discarded – undo
658	658	$columns = array_keys($conditions);
659	659
660	660	if (count($conditions) == 1) {
661		- $statementLines[] = 'ADD CHECK (' . $this->conn->escapeIdentifiers($columns[ 0 ]) . ')';
	661	+ $statementLines[] = 'ADD CHECK (' . $this->conn->escapeIdentifiers($columns[0]) . ')';
662	662	} else {
663	663	$conditionStatementStrings = [];
664	664
665	665	foreach ($conditions as $column => $condition) {
666	666	if (preg_match('/\s(?:<\|>\|!)?=\s\|\s<>?\s\|\s>\s/i', $column, $match, PREG_OFFSET_CAPTURE)) {
667		- $operator = trim($match[ 0 ]);
	667	+ $operator = trim($match[0]);
668	668	$column = trim(str_replace($operator, '', $column));
669	669
670	670	$conditionStatementStrings[] = $this->conn->escapeIdentifiers($column) . $operator . $this->conn->escape($condition);

o2system / database

GitHub Access Token became invalid

Push — master ( 8b9576...7fa102 )

Status

Category

Spacing +88 added lines, -88 removed lines patch added patch discarded remove patch