Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 23:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Code Style: Replace "AS" with "as"

Browse source
This commit is contained in:
Michael 2021-10-03 10:34:41 +00:00
parent 96b41fdb67
commit 9961943b73
10 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Database/DBA.php
View file

@ -733,7 +733,7 @@ class DBA
$order_string = '';
if (isset($params['order'])) {
$order_string = " ORDER BY ";
foreach ($params['order'] AS $fields => $order) {
foreach ($params['order'] as $fields => $order) {
if ($order === 'RAND()') {
$order_string .= "RAND(), ";
} elseif (!is_int($fields)) {

30
src/Database/DBStructure.php
View file

@ -135,7 +135,7 @@ class DBStructure
return;
}
foreach ($tables AS $table) {
foreach ($tables as $table) {
$sql = "ALTER TABLE " . DBA::quoteIdentifier($table['table_name']) . " ENGINE=InnoDB ROW_FORMAT=DYNAMIC;";
echo $sql . "\n";
@ -271,7 +271,7 @@ class DBStructure
echo "-- " . FRIENDICA_PLATFORM . " " . FRIENDICA_VERSION . " (" . FRIENDICA_CODENAME, ")\n";
echo "-- DB_UPDATE_VERSION " . DB_UPDATE_VERSION . "\n";
echo "-- ------------------------------------------\n\n\n";
foreach ($database AS $name => $structure) {
foreach ($database as $name => $structure) {
echo "--\n";
echo "-- TABLE $name\n";
echo "--\n";
@ -368,7 +368,7 @@ class DBStructure
$primary_keys = [];
$foreign_keys = [];
foreach ($structure["fields"] AS $fieldname => $field) {
foreach ($structure["fields"] as $fieldname => $field) {
$sql_rows[] = "`" . DBA::escape($fieldname) . "` " . self::FieldCommand($field);
if (!empty($field['primary'])) {
$primary_keys[] = $fieldname;
@ -379,7 +379,7 @@ class DBStructure
}
if (!empty($structure["indexes"])) {
foreach ($structure["indexes"] AS $indexname => $fieldnames) {
foreach ($structure["indexes"] as $indexname => $fieldnames) {
$sql_index = self::createIndex($indexname, $fieldnames, "");
if (!is_null($sql_index)) {
$sql_rows[] = $sql_index;
@ -387,7 +387,7 @@ class DBStructure
}
}
foreach ($foreign_keys AS $fieldname => $parameters) {
foreach ($foreign_keys as $fieldname => $parameters) {
$sql_rows[] = self::foreignCommand($name, $fieldname, $parameters);
}
@ -460,7 +460,7 @@ class DBStructure
}
$names = "";
foreach ($fieldnames AS $fieldname) {
foreach ($fieldnames as $fieldname) {
if ($names != "") {
$names .= ",";
}
@ -569,7 +569,7 @@ class DBStructure
}
if (DBA::isResult($tables)) {
foreach ($tables AS $table) {
foreach ($tables as $table) {
$table = current($table);
Logger::info('updating structure', ['table' => $table]);
@ -591,7 +591,7 @@ class DBStructure
}
// Compare it
foreach ($definition AS $name => $structure) {
foreach ($definition as $name => $structure) {
$is_new_table = false;
$sql3 = "";
if (!isset($database[$name])) {
@ -623,7 +623,7 @@ class DBStructure
}
}
// Compare the field structure field by field
foreach ($structure["fields"] AS $fieldname => $parameters) {
foreach ($structure["fields"] as $fieldname => $parameters) {
if (!isset($database[$name]["fields"][$fieldname])) {
$sql2 = self::addTableField($fieldname, $parameters);
if ($sql3 == "") {
@ -670,7 +670,7 @@ class DBStructure
* Don't create keys if table is new
*/
if (!$is_new_table) {
foreach ($structure["indexes"] AS $indexname => $fieldnames) {
foreach ($structure["indexes"] as $indexname => $fieldnames) {
if (isset($database[$name]["indexes"][$indexname])) {
$current_index_definition = implode(",", $database[$name]["indexes"][$indexname]);
} else {
@ -694,7 +694,7 @@ class DBStructure
// Foreign keys
// Compare the field structure field by field
foreach ($structure["fields"] AS $fieldname => $parameters) {
foreach ($structure["fields"] as $fieldname => $parameters) {
if (empty($parameters['foreign'])) {
continue;
}
@ -767,7 +767,7 @@ class DBStructure
// Now have a look at the field collations
// Compare the field structure field by field
foreach ($structure["fields"] AS $fieldname => $parameters) {
foreach ($structure["fields"] as $fieldname => $parameters) {
// Compare the field definition
$field_definition = ($database[$name]["fields"][$fieldname] ?? '') ?: ['Collation' => ''];
@ -860,7 +860,7 @@ class DBStructure
}
if (DBA::isResult($indexes)) {
foreach ($indexes AS $index) {
foreach ($indexes as $index) {
if ($index["Key_name"] != "PRIMARY" && $index["Non_unique"] == "0" && !isset($indexdata[$index["Key_name"]])) {
$indexdata[$index["Key_name"]] = ["UNIQUE"];
}
@ -881,7 +881,7 @@ class DBStructure
$fielddata = [];
if (DBA::isResult($fields)) {
foreach ($fields AS $field) {
foreach ($fields as $field) {
$search = ['tinyint(1)', 'tinyint(3) unsigned', 'tinyint(4)', 'smallint(5) unsigned', 'smallint(6)', 'mediumint(8) unsigned', 'mediumint(9)', 'bigint(20)', 'int(10) unsigned', 'int(11)'];
$replace = ['boolean', 'tinyint unsigned', 'tinyint', 'smallint unsigned', 'smallint', 'mediumint unsigned', 'mediumint', 'bigint', 'int unsigned', 'int'];
$field['COLUMN_TYPE'] = str_replace($search, $replace, $field['COLUMN_TYPE']);
@ -1055,7 +1055,7 @@ class DBStructure
$table = DBA::escape($table);
foreach ($columns AS $column) {
foreach ($columns as $column) {
$sql = "SHOW COLUMNS FROM `" . $table . "` LIKE '" . $column . "';";
$stmt = DBA::p($sql);

12
src/Database/Database.php
View file

@ -434,7 +434,7 @@ class Database
private function replaceParameters($sql, $args)
{
$offset = 0;
foreach ($args AS $param => $value) {
foreach ($args as $param => $value) {
if (is_int($args[$param]) || is_float($args[$param]) || is_bool($args[$param])) {
$replace = intval($args[$param]);
} elseif (is_null($args[$param])) {
@ -476,7 +476,7 @@ class Database
// Renumber the array keys to be sure that they fit
$i = 0;
$args = [];
foreach ($params AS $param) {
foreach ($params as $param) {
// Avoid problems with some MySQL servers and boolean values. See issue #3645
if (is_bool($param)) {
$param = (int)$param;
@ -549,7 +549,7 @@ class Database
break;
}
foreach ($args AS $param => $value) {
foreach ($args as $param => $value) {
if (is_int($args[$param])) {
$data_type = PDO::PARAM_INT;
} else {
@ -605,7 +605,7 @@ class Database
$param_types = '';
$values = [];
foreach ($args AS $param => $value) {
foreach ($args as $param => $value) {
if (is_int($args[$param])) {
$param_types .= 'i';
} elseif (is_float($args[$param])) {
@ -958,7 +958,7 @@ class Database
$result = $stmt->result_metadata();
$fields = $result->fetch_fields();
foreach ($cols_num AS $param => $col) {
foreach ($cols_num as $param => $col) {
$columns[$fields[$param]->name] = $col;
}
}
@ -1293,7 +1293,7 @@ class Database
}
}
foreach ($old_fields AS $fieldname => $content) {
foreach ($old_fields as $fieldname => $content) {
if (isset($fields[$fieldname]) && !is_null($content) && ($fields[$fieldname] == $content)) {
unset($fields[$fieldname]);
}

4
src/Database/View.php
View file

@ -102,7 +102,7 @@ class View
{
$database = self::definition($basePath, false);
foreach ($database AS $name => $structure) {
foreach ($database as $name => $structure) {
echo "--\n";
echo "-- VIEW $name\n";
echo "--\n";
@ -117,7 +117,7 @@ class View
$r = true;
$sql_rows = [];
foreach ($structure["fields"] AS $fieldname => $origin) {
foreach ($structure["fields"] as $fieldname => $origin) {
if (is_string($origin)) {
$sql_rows[] = $origin . " AS `" . DBA::escape($fieldname) . "`";
} elseif (is_array($origin) && (sizeof($origin) == 2)) {