mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-21 05:41:27 +02:00
Code Issues Releases Wiki Activity

PHPStan: Fix level 3 errors

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-26 16:57:58 +01:00
parent 7e5757f8b4
commit 309fdb0d86
11 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
adminer/drivers/mysql.inc.php
View File

@@ -505,7 +505,7 @@ if (!defined('Adminer\DRIVER')) {
/** Get database collation
* @param string
* @param list<string>[] result of collations()
* @param string[][] result of collations()
* @return string
*/
function db_collation($db, $collations) {
@@ -705,7 +705,7 @@ if (!defined('Adminer\DRIVER')) {
}
/** Get sorted grouped list of collations
* @return list<string>[]
* @return string[][]
*/
function collations() {
$return = array();
@@ -743,7 +743,7 @@ if (!defined('Adminer\DRIVER')) {
/** Create database
* @param string
* @param string
* @return string
* @return Result
*/
function create_database($db, $collation) {
return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . q($collation) : ""));
@@ -813,7 +813,7 @@ if (!defined('Adminer\DRIVER')) {
* @param string
* @param string number
* @param string
* @return bool
* @return Result|bool
*/
function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
global $connection;
@@ -852,7 +852,7 @@ if (!defined('Adminer\DRIVER')) {
/** Run commands to alter indexes
* @param string escaped table name
* @param array{string, string, 'DROP'|list<string>} of ["index type", "name", ["column definition", ...]] or ["index type", "name", "DROP"]
* @return bool
* @return Result|bool
*/
function alter_indexes($table, $alter) {
foreach ($alter as $key => $val) {
@@ -874,7 +874,7 @@ if (!defined('Adminer\DRIVER')) {
/** Drop views
* @param list<string>
* @return bool
* @return Result|bool
*/
function drop_views($views) {
return queries("DROP VIEW " . implode(", ", array_map('Adminer\table', $views)));
@@ -882,7 +882,7 @@ if (!defined('Adminer\DRIVER')) {
/** Drop tables
* @param list<string>
* @return bool
* @return Result|bool
*/
function drop_tables($tables) {
return queries("DROP TABLE " . implode(", ", array_map('Adminer\table', $tables)));
@@ -1014,7 +1014,7 @@ if (!defined('Adminer\DRIVER')) {
"type" => strtolower($param[5]),
"length" => preg_replace_callback("~$enum~s", 'Adminer\normalize_enum', $param[6]),
"unsigned" => strtolower(preg_replace('~\s+~', ' ', trim("$param[8] $param[7]"))),
"null" => 1,
"null" => true,
"full_type" => $param[4],
"inout" => strtoupper($param[1]),
"collation" => strtolower($param[9]),
@@ -1073,7 +1073,7 @@ if (!defined('Adminer\DRIVER')) {
/** Get approximate number of rows
* @param TableStatus
* @param list<string>
* @return int or null if approximate number can't be retrieved
* @return numeric-string|void null if approximate number can't be retrieved
*/
function found_rows($table_status, $where) {
return ($where || $table_status["Engine"] != "InnoDB" ? null : $table_status["Rows"]);
@@ -1222,7 +1222,7 @@ if (!defined('Adminer\DRIVER')) {
/** Kill a process
* @param int
* @return bool
* @return Result|bool
*/
function kill_process($val) {
return queries("KILL " . number($val));
@@ -1236,7 +1236,7 @@ if (!defined('Adminer\DRIVER')) {
}
/** Get maximum number of connections
* @return int
* @return numeric-string
*/
function max_connections() {
return get_val("SELECT @@max_connections");

1
adminer/drivers/pgsql.inc.php
View File

@@ -789,7 +789,6 @@ ORDER BY SPECIFIC_NAME');
if (preg_match("~ rows=([0-9]+)~", get_val("EXPLAIN SELECT * FROM " . idf_escape($table_status["Name"]) . ($where ? " WHERE " . implode(" AND ", $where) : "")), $regs)) {
return $regs[1];
}
return false;
}
function types() {

2
adminer/drivers/sqlite.inc.php
View File

@@ -88,7 +88,7 @@ if (isset($_GET["sqlite"])) {
}
function __destruct() {
return $this->result->finalize();
$this->result->finalize();
}
}

20
adminer/include/driver.inc.php
View File

@@ -53,7 +53,7 @@ abstract class SqlDriver {
}
/** Get structured types
* @return list<string>[] [$description => [$type, ...], ...]
* @return list<string>[]|list<string> [$description => [$type, ...], ...]
*/
function structuredTypes() {
return array_map('array_keys', $this->types);
@@ -82,7 +82,7 @@ abstract class SqlDriver {
* @param int result of $adminer->selectLimitProcess()
* @param int index of page starting at zero
* @param bool whether to print the query
* @return Result
* @return Result|false
*/
function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
global $adminer;
@@ -109,7 +109,7 @@ abstract class SqlDriver {
* @param string
* @param string " WHERE ..."
* @param int 0 or 1
* @return bool
* @return Result|bool
*/
function delete($table, $queryWhere, $limit = 0) {
$query = "FROM " . table($table);
@@ -122,7 +122,7 @@ abstract class SqlDriver {
* @param string " WHERE ..."
* @param int 0 or 1
* @param string
* @return bool
* @return Result|bool
*/
function update($table, $set, $queryWhere, $limit = 0, $separator = "\n") {
$values = array();
@@ -136,7 +136,7 @@ abstract class SqlDriver {
/** Insert data into table
* @param string
* @param string[] escaped columns in keys, quoted data in values
* @return bool
* @return Result|bool
*/
function insert($table, $set) {
return queries("INSERT INTO " . table($table) . ($set
@@ -145,7 +145,7 @@ abstract class SqlDriver {
) . $this->insertReturning($table));
}
/** Get RETURNING clause for INSERT queries, PostgreSQL specific
/** Get RETURNING clause for INSERT queries (PostgreSQL specific)
* @param string
* @return string
*/
@@ -157,28 +157,28 @@ abstract class SqlDriver {
* @param string
* @param list<string[]> of arrays with escaped columns in keys and quoted data in values
* @param int[] column names in keys
* @return bool
* @return Result|bool
*/
function insertUpdate($table, $rows, $primary) {
return false;
}
/** Begin transaction
* @return bool
* @return Result|bool
*/
function begin() {
return queries("BEGIN");
}
/** Commit transaction
* @return bool
* @return Result|bool
*/
function commit() {
return queries("COMMIT");
}
/** Rollback transaction
* @return bool
* @return Result|bool
*/
function rollback() {
return queries("ROLLBACK");

4
adminer/include/editing.inc.php
View File

@@ -435,7 +435,7 @@ function normalize_enum($match) {
* @param list<string>
* @param string
* @param string
* @return bool
* @return Result|bool
*/
function grant($grant, $privileges, $columns, $on) {
if (!$privileges) {
@@ -502,7 +502,7 @@ function create_trigger($on, $row) {
/** Generate SQL query for creating routine
* @param string "PROCEDURE" or "FUNCTION"
* @param string[] result of routine()
* @param Routine result of routine()
* @return string
*/
function create_routine($routine, $row) {

8
adminer/include/functions.inc.php
View File

@@ -722,7 +722,7 @@ function table_status1($table, $fast = false) {
/** Find out foreign keys for each column
* @param string
* @return list<string>[] [$col => []]
* @return list<ForeignKey>[] [$col => []]
*/
function column_foreign_keys($table) {
global $adminer;
@@ -814,7 +814,7 @@ function get_temp_dir() {
} else {
$filename = @tempnam("", ""); // @ - temp directory can be disabled by open_basedir
if (!$filename) {
return false;
return '';
}
$return = dirname($filename);
unlink($filename);
@@ -825,7 +825,7 @@ function get_temp_dir() {
/** Open and exclusively lock a file
* @param string
* @return resource or null for error
* @return resource|void null for error
*/
function file_open_lock($filename) {
if (is_link($filename)) {
@@ -873,7 +873,7 @@ function first($array) {
/** Read password from file adminer.key in temporary directory or create one
* @param bool
* @return string or false if the file can not be created
* @return string|false false if the file can not be created
*/
function password_file($create) {
$filename = get_temp_dir() . "/adminer.key";

4
adminer/include/html.inc.php
View File

@@ -344,12 +344,12 @@ function input($field, $value, $function, $autofocus = false) {
/** Process edit input field
* @param Field one field from fields()
* @return string or false to leave the original value
* @return mixed false to leave the original value
*/
function process_input($field) {
global $adminer, $driver;
if (stripos($field["default"], "GENERATED ALWAYS AS ") === 0) {
return null;
return;
}
$idf = bracket_escape($field["field"]);
$function = idx($_POST["function"], $idf);

2
adminer/include/xxtea.inc.php
View File

@@ -75,7 +75,7 @@ function encrypt_string($str, $key) {
/** Decipher
* @param string binary cipher
* @param string
* @return string plain-text password
* @return string|false plain-text password
*/
function decrypt_string($str, $key) {
if ($str == "") {