From 88099b7dd744b7bf6658f61d44a27434e417f039 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 8 Apr 2025 21:16:09 +0200 Subject: [PATCH] Code style: Fix --- adminer/drivers/mssql.inc.php | 1 + adminer/drivers/mysql.inc.php | 1 + adminer/drivers/oracle.inc.php | 1 + adminer/drivers/pgsql.inc.php | 4 +++- adminer/drivers/sqlite.inc.php | 2 +- adminer/file.inc.php | 2 +- adminer/include/driver.inc.php | 6 ++++-- adminer/include/functions.inc.php | 4 ++-- compile.php | 14 ++++++++++---- phpcs.xml | 2 ++ tests/screenshots.php | 28 +++++++++++++++------------- 11 files changed, 41 insertions(+), 24 deletions(-) diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php index 46279062..ddb80ea5 100644 --- a/adminer/drivers/mssql.inc.php +++ b/adminer/drivers/mssql.inc.php @@ -11,6 +11,7 @@ add_driver("mssql", "MS SQL"); if (isset($_GET["mssql"])) { define('Adminer\DRIVER', "mssql"); + if (extension_loaded("sqlsrv") && $_GET["ext"] != "pdo") { class Db extends SqlDb { public $extension = "sqlsrv"; diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index 0daed0dc..33f5ef4b 100644 --- a/adminer/drivers/mysql.inc.php +++ b/adminer/drivers/mysql.inc.php @@ -5,6 +5,7 @@ SqlDriver::$drivers = array("server" => "MySQL / MariaDB") + SqlDriver::$drivers if (!defined('Adminer\DRIVER')) { define('Adminer\DRIVER', "server"); // server - backwards compatibility + // MySQLi supports everything, MySQL doesn't support multiple result sets, PDO_MySQL doesn't support orgtable if (extension_loaded("mysqli") && $_GET["ext"] != "pdo") { class Db extends \MySQLi { diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php index b173949e..59a445b0 100644 --- a/adminer/drivers/oracle.inc.php +++ b/adminer/drivers/oracle.inc.php @@ -5,6 +5,7 @@ add_driver("oracle", "Oracle (beta)"); if (isset($_GET["oracle"])) { define('Adminer\DRIVER', "oracle"); + if (extension_loaded("oci8") && $_GET["ext"] != "pdo") { class Db extends SqlDb { public $extension = "oci8"; diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index a9a423f3..003622f6 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -5,6 +5,7 @@ add_driver("pgsql", "PostgreSQL"); if (isset($_GET["pgsql"])) { define('Adminer\DRIVER', "pgsql"); + if (extension_loaded("pgsql") && $_GET["ext"] != "pdo") { class PgsqlDb extends SqlDb { public $extension = "PgSQL"; @@ -94,8 +95,9 @@ if (isset($_GET["pgsql"])) { */ function copyFrom(string $table, array $rows): bool { $this->error = ''; - set_error_handler(function ($errno, $error) { + set_error_handler(function (int $errno, string $error): bool { $this->error = (ini_bool('html_errors') ? html_entity_decode($error) : $error); + return true; }); $return = pg_copy_from($this->link, $table, $rows); restore_error_handler(); diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php index 9daaedef..dd7c06ad 100644 --- a/adminer/drivers/sqlite.inc.php +++ b/adminer/drivers/sqlite.inc.php @@ -5,8 +5,8 @@ add_driver("sqlite", "SQLite"); if (isset($_GET["sqlite"])) { define('Adminer\DRIVER', "sqlite"); - if (class_exists("SQLite3") && $_GET["ext"] != "pdo") { + if (class_exists("SQLite3") && $_GET["ext"] != "pdo") { abstract class SqliteDb extends SqlDb { public $extension = "SQLite3"; private $link; diff --git a/adminer/file.inc.php b/adminer/file.inc.php index c46e279c..e33abe9d 100644 --- a/adminer/file.inc.php +++ b/adminer/file.inc.php @@ -11,7 +11,7 @@ if (substr(VERSION, -4) != '-dev') { header("Cache-Control: immutable"); } -@ini_set("zlib.output_compression", 1); // @ - may be disabled +@ini_set("zlib.output_compression", '1'); // @ - may be disabled if ($_GET["file"] == "default.css") { header("Content-Type: text/css; charset=utf-8"); diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php index 41fb7582..dd87c80d 100644 --- a/adminer/include/driver.inc.php +++ b/adminer/include/driver.inc.php @@ -257,10 +257,12 @@ AND CHECK_CLAUSE NOT LIKE '% IS NOT NULL'", $this->conn); // ignore default IS N */ function allFields(): array { $return = array(); - foreach (get_rows("SELECT TABLE_NAME AS tab, COLUMN_NAME AS field, IS_NULLABLE AS nullable, DATA_TYPE AS type, CHARACTER_MAXIMUM_LENGTH AS length" . (JUSH == 'sql' ? ", COLUMN_KEY = 'PRI' AS `primary`" : "") . " + foreach ( + get_rows("SELECT TABLE_NAME AS tab, COLUMN_NAME AS field, IS_NULLABLE AS nullable, DATA_TYPE AS type, CHARACTER_MAXIMUM_LENGTH AS length" . (JUSH == 'sql' ? ", COLUMN_KEY = 'PRI' AS `primary`" : "") . " FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = " . q($_GET["ns"] != "" ? $_GET["ns"] : DB) . " -ORDER BY TABLE_NAME, ORDINAL_POSITION", $this->conn) as $row) { +ORDER BY TABLE_NAME, ORDINAL_POSITION", $this->conn) as $row + ) { $row["null"] = ($row["nullable"] == "YES"); $return[$row["tab"]][] = $row; } diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php index 52999519..b4aeb6a9 100644 --- a/adminer/include/functions.inc.php +++ b/adminer/include/functions.inc.php @@ -595,10 +595,10 @@ function column_foreign_keys(string $table): array { return $return; } -/** Compute fields() from $_POST edit data +/** Compute fields() from $_POST edit data; used by Mongo and SimpleDB * @return Field[] same as fields() */ -function fields_from_edit(): array { // used by Mongo and SimpleDB +function fields_from_edit(): array { $return = array(); foreach ((array) $_POST["field_keys"] as $key => $val) { if ($val != "") { diff --git a/compile.php b/compile.php index 969dcffd..561005fb 100755 --- a/compile.php +++ b/compile.php @@ -199,10 +199,10 @@ function minify_css($file) { } function minify_js($file) { - $file = preg_replace_callback("~'use strict';~", function ($match) { // keep only the first one + $file = preg_replace_callback("~'use strict';~", function ($match) { static $count = 0; $count++; - return ($count == 1 ? $match[0] : ''); + return ($count == 1 ? $match[0] : ''); // keep only the first one }, $file); if (function_exists('jsShrink')) { $file = jsShrink($file); @@ -210,7 +210,8 @@ function minify_js($file) { return lzw_compress($file); } -function compile_file($match, $callback = '') { // $callback only to match signature +// $callback only to match signature +function compile_file($match, $callback = '') { global $project; $file = ""; list(, $filenames, $callback) = $match; @@ -303,7 +304,12 @@ if ($vendor) { } } if ($project != "editor" && count(Adminer\SqlDriver::$drivers) == 1) { - $file = str_replace('html_select("auth[driver]", SqlDriver::$drivers, DRIVER, "loginDriver(this);")', 'input_hidden("auth[driver]", "' . ($vendor == "mysql" ? "server" : $vendor) . '") . "' . reset(Adminer\SqlDriver::$drivers) . '"', $file, $count); + $file = str_replace( + 'html_select("auth[driver]", SqlDriver::$drivers, DRIVER, "loginDriver(this);")', + 'input_hidden("auth[driver]", "' . ($vendor == "mysql" ? "server" : $vendor) . '") . "' . reset(Adminer\SqlDriver::$drivers) . '"', + $file, + $count + ); if (!$count) { echo "auth[driver] form field not found\n"; } diff --git a/phpcs.xml b/phpcs.xml index 76288eee..0ec493c0 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -47,7 +47,9 @@ adminer/drivers/ + adminer/include/db.inc.php adminer/include/pdo.inc.php + adminer/plugins/foreign-system.php adminer/plugins/drivers/ diff --git a/tests/screenshots.php b/tests/screenshots.php index 00b90b01..cf56eb4b 100755 --- a/tests/screenshots.php +++ b/tests/screenshots.php @@ -1,18 +1,20 @@ #!/usr/bin/env php array(1106, 412), - 'dark' => array(816, 750), - 'database' => array(896, 666), - 'db' => array(1258, 752), - 'dump' => array(784, 450), - 'edit' => array(1006, 336), - 'login' => array(628, 326), - 'select' => array(924, 810), - 'schema' => array(690, 406), - 'sql' => array(870, 788), - 'table' => array(816, 750), -) as $filename => list($w, $h)) { +foreach ( + array( + 'create' => array(1106, 412), + 'dark' => array(816, 750), + 'database' => array(896, 666), + 'db' => array(1258, 752), + 'dump' => array(784, 450), + 'edit' => array(1006, 336), + 'login' => array(628, 326), + 'select' => array(924, 810), + 'schema' => array(690, 406), + 'sql' => array(870, 788), + 'table' => array(816, 750), + ) as $filename => list($w, $h) +) { $im = imagecreatefrompng("screenshots/$filename.png"); $im2 = imagecreatetruecolor($w, $h); imagecopy($im2, $im, 0, 0, 0, 0, $w, $h);