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

Doc-comments: Fix type errors

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-28 11:46:17 +01:00
parent c169c55d70
commit a9143ccbdc
10 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -417,7 +417,7 @@ if (!defined('Adminer\DRIVER')) {
/** Get database collation
* @param string[][] $collations result of collations()
*/
function db_collation(string $db, array $collations): string {
function db_collation(string $db, array $collations): ?string {
$return = null;
$create = get_val("SHOW CREATE DATABASE " . idf_escape($db), 1);
if (preg_match('~ COLLATE ([^ ]+)~', $create, $match)) {
@@ -698,7 +698,7 @@ if (!defined('Adminer\DRIVER')) {
* @param string $auto_increment number
* @return Result|bool
*/
function alter_table(string $table, string $name, array $fields, array $foreign, string $comment, string $engine, string $collation, string $auto_increment, string $partitioning) {
function alter_table(string $table, string $name, array $fields, array $foreign, ?string $comment, string $engine, string $collation, string $auto_increment, string $partitioning) {
global $connection;
$alter = array();
foreach ($fields as $field) {
@@ -928,7 +928,7 @@ if (!defined('Adminer\DRIVER')) {
}
/** Get last auto increment ID
* @param Result $result or true
* @param Result|bool $result
*/
function last_id($result): string {
return get_val("SELECT LAST_INSERT_ID()"); // mysql_insert_id() truncates bigint

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

@@ -48,7 +48,7 @@ if (isset($_GET["pgsql"])) {
);
}
function value(string $val, array $field): string {
function value(?string $val, array $field): ?string {
return ($field["type"] == "bytea" && $val !== null ? pg_unescape_bytea($val) : $val);
}