From af68e30742df6cb0cee7006674ba1cd7298057ee Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Wed, 5 Mar 2025 14:37:25 +0100 Subject: [PATCH] Code style: Remove newline before } --- adminer/drivers/mongo.inc.php | 1 - adminer/drivers/mssql.inc.php | 1 - adminer/drivers/mysql.inc.php | 1 - adminer/drivers/oracle.inc.php | 1 - adminer/drivers/pgsql.inc.php | 1 - adminer/drivers/sqlite.inc.php | 1 - adminer/include/adminer.inc.php | 1 - adminer/include/driver.inc.php | 1 - adminer/include/tmpfile.inc.php | 1 - editor/example.php | 1 - editor/include/adminer.inc.php | 1 - phpcs.xml | 1 - plugins/database-hide.php | 1 - plugins/designs.php | 1 - plugins/drivers/simpledb.php | 3 --- plugins/dump-bz2.php | 1 - plugins/dump-date.php | 1 - plugins/dump-json.php | 1 - plugins/dump-xml.php | 1 - plugins/dump-zip.php | 1 - plugins/edit-calendar.php | 1 - plugins/edit-foreign.php | 1 - plugins/edit-textarea.php | 1 - plugins/email-table.php | 1 - plugins/enum-option.php | 1 - plugins/enum-types.php | 1 - plugins/file-upload.php | 1 - plugins/foreign-system.php | 1 - plugins/frames.php | 1 - plugins/login-ip.php | 1 - plugins/login-password-less.php | 1 - plugins/login-servers.php | 1 - plugins/login-ssl.php | 1 - plugins/login-table.php | 1 - plugins/master-slave.php | 1 - plugins/plugin.php | 1 - plugins/slugify.php | 1 - plugins/sql-log.php | 1 - plugins/tinymce.php | 1 - plugins/translation.php | 1 - plugins/version-noverify.php | 1 - plugins/wymeditor.php | 1 - 42 files changed, 44 deletions(-) diff --git a/adminer/drivers/mongo.inc.php b/adminer/drivers/mongo.inc.php index 0b10c6e3..370dbc15 100644 --- a/adminer/drivers/mongo.inc.php +++ b/adminer/drivers/mongo.inc.php @@ -110,7 +110,6 @@ if (isset($_GET["mongo"])) { 'charsetnr' => $this->_charset[$name], ); } - } diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php index 6c828020..922caee4 100644 --- a/adminer/drivers/mssql.inc.php +++ b/adminer/drivers/mssql.inc.php @@ -240,7 +240,6 @@ if (isset($_GET["mssql"])) { return "relational-databases/system-$link" . preg_replace('~_~', '-', strtolower($name)) . "-transact-sql"; } } - } diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index 60f75209..5ab9a928 100644 --- a/adminer/drivers/mysql.inc.php +++ b/adminer/drivers/mysql.inc.php @@ -355,7 +355,6 @@ if (!defined("DRIVER")) { } return $c_style; } - } diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php index 2db3d485..5350beac 100644 --- a/adminer/drivers/oracle.inc.php +++ b/adminer/drivers/oracle.inc.php @@ -171,7 +171,6 @@ if (isset($_GET["oracle"])) { function hasCStyleEscapes() { return true; } - } diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index 71e102a0..29f1afa4 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -258,7 +258,6 @@ if (isset($_GET["pgsql"])) { } return $c_style; } - } diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php index 8369878d..b03a069a 100644 --- a/adminer/drivers/sqlite.inc.php +++ b/adminer/drivers/sqlite.inc.php @@ -149,7 +149,6 @@ if (isset($_GET["sqlite"])) { preg_match_all('~ CHECK *(\( *(((?>[^()]*[^() ])|(?1))*) *\))~', $this->_conn->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table)), $matches); //! could be inside a comment return array_combine($matches[2], $matches[2]); } - } diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 80bcf6ce..8af053cb 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -1106,5 +1106,4 @@ bodyLoad('\n"; } - } diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php index 79c477ce..9249f6b7 100644 --- a/adminer/include/driver.inc.php +++ b/adminer/include/driver.inc.php @@ -216,5 +216,4 @@ WHERE c.CONSTRAINT_SCHEMA = " . q($_GET["ns"] != "" ? $_GET["ns"] : DB) . " AND t.TABLE_NAME = " . q($table) . " AND CHECK_CLAUSE NOT LIKE '% IS NOT NULL'"); // ignore default IS NOT NULL checks in PostrgreSQL } - } diff --git a/adminer/include/tmpfile.inc.php b/adminer/include/tmpfile.inc.php index e9cd8bc7..76fb3617 100644 --- a/adminer/include/tmpfile.inc.php +++ b/adminer/include/tmpfile.inc.php @@ -19,5 +19,4 @@ class TmpFile { fpassthru($this->handler); fclose($this->handler); } - } diff --git a/editor/example.php b/editor/example.php index 1be6ad30..37dfd450 100644 --- a/editor/example.php +++ b/editor/example.php @@ -43,7 +43,6 @@ function adminer_object() { } return ""; } - } return new AdminerCds; diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php index 2deab4a8..52c536aa 100644 --- a/editor/include/adminer.inc.php +++ b/editor/include/adminer.inc.php @@ -662,5 +662,4 @@ qsl('div').onclick = whisperClick;", "") return $return; } } - } diff --git a/phpcs.xml b/phpcs.xml index fd2ec12c..75bb43d8 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -17,7 +17,6 @@ - diff --git a/plugins/database-hide.php b/plugins/database-hide.php index 622b67b5..4c3883ad 100644 --- a/plugins/database-hide.php +++ b/plugins/database-hide.php @@ -25,5 +25,4 @@ class AdminerDatabaseHide { } return $return; } - } diff --git a/plugins/designs.php b/plugins/designs.php index c4e66faa..4300dd40 100644 --- a/plugins/designs.php +++ b/plugins/designs.php @@ -39,5 +39,4 @@ class AdminerDesigns { echo ''; echo "\n"; } - } diff --git a/plugins/drivers/simpledb.php b/plugins/drivers/simpledb.php index a1b29f07..8938bd46 100644 --- a/plugins/drivers/simpledb.php +++ b/plugins/drivers/simpledb.php @@ -52,7 +52,6 @@ if (isset($_GET["simpledb"])) { function quote($string) { return "'" . str_replace("'", "''", $string) . "'"; } - } class Result { @@ -113,7 +112,6 @@ if (isset($_GET["simpledb"])) { $keys = array_keys($this->_rows[0]); return (object) array('name' => $keys[$this->_offset++]); } - } } @@ -243,7 +241,6 @@ if (isset($_GET["simpledb"])) { $this->_conn->timeout = $timeout; return $query; } - } diff --git a/plugins/dump-bz2.php b/plugins/dump-bz2.php index 8d42302c..19d20855 100644 --- a/plugins/dump-bz2.php +++ b/plugins/dump-bz2.php @@ -37,5 +37,4 @@ class AdminerDumpBz2 { ob_start(array($this, '_bz2'), 1e6); } } - } diff --git a/plugins/dump-date.php b/plugins/dump-date.php index 4c540af1..1dd2bf92 100644 --- a/plugins/dump-date.php +++ b/plugins/dump-date.php @@ -12,5 +12,4 @@ class AdminerDumpDate { $connection = Adminer\connection(); return Adminer\friendly_url(($identifier != "" ? $identifier : (SERVER != "" ? SERVER : "localhost")) . "-" . $connection->result("SELECT NOW()")); } - } diff --git a/plugins/dump-json.php b/plugins/dump-json.php index 127a1c2e..59230385 100644 --- a/plugins/dump-json.php +++ b/plugins/dump-json.php @@ -58,5 +58,4 @@ class AdminerDumpJson { return "json"; } } - } diff --git a/plugins/dump-xml.php b/plugins/dump-xml.php index da2d6939..b9bc6205 100644 --- a/plugins/dump-xml.php +++ b/plugins/dump-xml.php @@ -52,5 +52,4 @@ class AdminerDumpXml { return "xml"; } } - } diff --git a/plugins/dump-zip.php b/plugins/dump-zip.php index 09791837..0c573364 100644 --- a/plugins/dump-zip.php +++ b/plugins/dump-zip.php @@ -41,5 +41,4 @@ class AdminerDumpZip { ob_start(array($this, '_zip')); } } - } diff --git a/plugins/edit-calendar.php b/plugins/edit-calendar.php index 78901438..be53c576 100644 --- a/plugins/edit-calendar.php +++ b/plugins/edit-calendar.php @@ -53,5 +53,4 @@ class AdminerEditCalendar { ); } } - } diff --git a/plugins/edit-foreign.php b/plugins/edit-foreign.php index 90655bac..975fe9d4 100644 --- a/plugins/edit-foreign.php +++ b/plugins/edit-foreign.php @@ -39,5 +39,4 @@ class AdminerEditForeign { } } } - } diff --git a/plugins/edit-textarea.php b/plugins/edit-textarea.php index 45aa11f9..e3abcb09 100644 --- a/plugins/edit-textarea.php +++ b/plugins/edit-textarea.php @@ -13,5 +13,4 @@ class AdminerEditTextarea { return "'; } } - } diff --git a/plugins/email-table.php b/plugins/email-table.php index f6f25906..c7e9c912 100644 --- a/plugins/email-table.php +++ b/plugins/email-table.php @@ -56,5 +56,4 @@ class AdminerEmailTable { $_POST["email_message"] = $row[1]; } } - } diff --git a/plugins/enum-option.php b/plugins/enum-option.php index 65917ff1..7ad0d213 100644 --- a/plugins/enum-option.php +++ b/plugins/enum-option.php @@ -36,5 +36,4 @@ class AdminerEnumOption { return "" . Adminer\optionlist($options, (string) $selected, 1) . ""; // 1 - use keys } } - } diff --git a/plugins/enum-types.php b/plugins/enum-types.php index 0a72ef8d..dd36d6d1 100644 --- a/plugins/enum-types.php +++ b/plugins/enum-types.php @@ -46,5 +46,4 @@ class AdminerEnumTypes { return "" . Adminer\optionlist($options, (string) $selected, 1) . ""; } } - } diff --git a/plugins/file-upload.php b/plugins/file-upload.php index e1a2b17b..d611ec89 100644 --- a/plugins/file-upload.php +++ b/plugins/file-upload.php @@ -49,5 +49,4 @@ class AdminerFileUpload { $link = "$this->displayPath$_GET[select]/$regs[1]-$val"; } } - } diff --git a/plugins/foreign-system.php b/plugins/foreign-system.php index 757ae852..53af6ff2 100644 --- a/plugins/foreign-system.php +++ b/plugins/foreign-system.php @@ -54,5 +54,4 @@ class AdminerForeignSystem { return $return[$table]; } } - } diff --git a/plugins/frames.php b/plugins/frames.php index 4fd71a66..e4130370 100644 --- a/plugins/frames.php +++ b/plugins/frames.php @@ -24,5 +24,4 @@ class AdminerFrames { header_remove("X-Frame-Options"); } } - } diff --git a/plugins/login-ip.php b/plugins/login-ip.php index 09829aa4..0b367da2 100644 --- a/plugins/login-ip.php +++ b/plugins/login-ip.php @@ -38,5 +38,4 @@ class AdminerLoginIp { } return false; } - } diff --git a/plugins/login-password-less.php b/plugins/login-password-less.php index ee67d9e1..709c1d3c 100644 --- a/plugins/login-password-less.php +++ b/plugins/login-password-less.php @@ -27,5 +27,4 @@ class AdminerLoginPasswordLess { return true; } } - } diff --git a/plugins/login-servers.php b/plugins/login-servers.php index d2650a46..cda09de2 100644 --- a/plugins/login-servers.php +++ b/plugins/login-servers.php @@ -38,5 +38,4 @@ class AdminerLoginServers { return $heading . "\n"; } } - } diff --git a/plugins/login-ssl.php b/plugins/login-ssl.php index 38324d64..ca8c9323 100644 --- a/plugins/login-ssl.php +++ b/plugins/login-ssl.php @@ -23,5 +23,4 @@ class AdminerLoginSsl { function connectSsl() { return $this->ssl; } - } diff --git a/plugins/login-table.php b/plugins/login-table.php index e46f7144..15141064 100644 --- a/plugins/login-table.php +++ b/plugins/login-table.php @@ -30,5 +30,4 @@ class AdminerLoginTable { $connection = Adminer\connection(); return (bool) $connection->result("SELECT COUNT(*) FROM " . idf_escape($this->database) . ".login WHERE login = " . Adminer\q($login) . " AND password_sha1 = " . Adminer\q(sha1($password))); } - } diff --git a/plugins/master-slave.php b/plugins/master-slave.php index 90524da8..dcf8e320 100644 --- a/plugins/master-slave.php +++ b/plugins/master-slave.php @@ -39,5 +39,4 @@ class AdminerMasterSlave { $_SESSION["master"] = $result->fetch_assoc(); } } - } diff --git a/plugins/plugin.php b/plugins/plugin.php index 8f71a030..aa63798d 100644 --- a/plugins/plugin.php +++ b/plugins/plugin.php @@ -420,5 +420,4 @@ class AdminerPlugin extends Adminer\Adminer { $args = func_get_args(); return $this->_applyPlugin(__FUNCTION__, $args); } - } diff --git a/plugins/slugify.php b/plugins/slugify.php index 13ad7a8c..e9071ebc 100644 --- a/plugins/slugify.php +++ b/plugins/slugify.php @@ -47,5 +47,4 @@ class AdminerSlugify { } } } - } diff --git a/plugins/sql-log.php b/plugins/sql-log.php index 1babed22..9a746896 100644 --- a/plugins/sql-log.php +++ b/plugins/sql-log.php @@ -37,5 +37,4 @@ class AdminerSqlLog { flock($fp, LOCK_UN); fclose($fp); } - } diff --git a/plugins/tinymce.php b/plugins/tinymce.php index 6b6f7477..64bc017f 100644 --- a/plugins/tinymce.php +++ b/plugins/tinymce.php @@ -70,5 +70,4 @@ qs('#form').onsubmit = function () { "); } } - } diff --git a/plugins/translation.php b/plugins/translation.php index b25f9e26..6d2561fb 100644 --- a/plugins/translation.php +++ b/plugins/translation.php @@ -51,5 +51,4 @@ class AdminerTranslation { $val = $this->_translate($val); } } - } diff --git a/plugins/version-noverify.php b/plugins/version-noverify.php index 154ec6db..36d13dd9 100644 --- a/plugins/version-noverify.php +++ b/plugins/version-noverify.php @@ -11,5 +11,4 @@ class AdminerVersionNoverify { function head() { echo Adminer\script("verifyVersion = function () {};"); } - } diff --git a/plugins/wymeditor.php b/plugins/wymeditor.php index 5a3b3d3a..0502aee9 100644 --- a/plugins/wymeditor.php +++ b/plugins/wymeditor.php @@ -59,5 +59,4 @@ jQuery('#fields-" . Adminer\js_escape($field["field"]) . "').wymeditor({ updateS "); } } - }