mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-07 07:06:45 +02:00
Code Issues Releases Wiki Activity

Explicitly mark nullable params (thanks to @dg)

Browse Source
This commit is contained in:
Jakub Vrana
2025-04-01 19:14:44 +02:00
parent 01ea001f22
commit 04ed73be26
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ namespace Adminer;
* @param ?Db $connection2 custom connection to use instead of the default
* @return Db
*/
function connection(Db $connection2 = null) {
function connection(?Db $connection2 = null) {
// can be used in customization, Db::$instance is minified
return ($connection2 ?: Db::$instance);
}
@@ -108,7 +108,7 @@ function bracket_escape(string $idf, bool $back = false): string {
* @param string|float $version required version
* @param string|float $maria_db required MariaDB version
*/
function min_version($version, $maria_db = "", Db $connection2 = null): bool {
function min_version($version, $maria_db = "", ?Db $connection2 = null): bool {
$connection2 = connection($connection2);
$server_info = $connection2->server_info;
if ($maria_db && preg_match('~([\d.]+)-MariaDB~', $server_info, $match)) {
@@ -191,7 +191,7 @@ function get_vals(string $query, $column = 0): array {
/** Get keys from first column and values from second
* @return string[]
*/
function get_key_vals(string $query, Db $connection2 = null, bool $set_keys = true): array {
function get_key_vals(string $query, ?Db $connection2 = null, bool $set_keys = true): array {
$connection2 = connection($connection2);
$return = array();
$result = $connection2->query($query);
@@ -210,7 +210,7 @@ function get_key_vals(string $query, Db $connection2 = null, bool $set_keys = tr
/** Get all rows of result
* @return list<string[]> of associative arrays
*/
function get_rows(string $query, Db $connection2 = null, string $error = "<p class='error'>"): array {
function get_rows(string $query, ?Db $connection2 = null, string $error = "<p class='error'>"): array {
$conn = connection($connection2);
$return = array();
$result = $conn->query($query);