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

PHPStan: Fix level 2 errors

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-26 15:38:04 +01:00
parent d39cc24c61
commit 7e5757f8b4
16 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,7 +385,7 @@ WHERE c.object_id = " . q($table_id)) as $row
) {
$type = $row["type"];
$length = (preg_match("~char|binary~", $type)
? $row["max_length"] / ($type[0] == 'n' ? 2 : 1)
? intval($row["max_length"]) / ($type[0] == 'n' ? 2 : 1)
: ($type == "decimal" ? "$row[precision],$row[scale]" : "")
);
$return[$row["name"]] = array(

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

@@ -550,7 +550,6 @@ if (!defined('Adminer\DRIVER')) {
* @param string
* @param bool return only "Name", "Engine" and "Comment" fields
* @return TableStatus[]
* @phpstan-type TableStatus array{Name:string, Engine:string, Comment:string, Oid:int, Rows:int, Collation:string, Auto_increment:int, Data_length:int, Index_length:int, Data_free:int}
*/
function table_status($name = "", $fast = false) {
$return = array();
@@ -596,7 +595,6 @@ if (!defined('Adminer\DRIVER')) {
/** Get information about fields
* @param string
* @return Field[]
* @phpstan-type Field array{field:string, full_type:string, type:string, length:int, unsigned:string, default:string, null:bool, auto_increment:bool, on_update:string, collation:string, privileges:int[], comment:string, primary:bool, generated:string}
*/
function fields($table) {
global $connection;
@@ -653,7 +651,6 @@ if (!defined('Adminer\DRIVER')) {
* @param string
* @param string Db to use
* @return Index[]
* @phpstan-type Index array{type:string, columns:list<string>, lengths:list<int>, descs:list<bool>}
*/
function indexes($table, $connection2 = null) {
$return = array();
@@ -670,7 +667,6 @@ if (!defined('Adminer\DRIVER')) {
/** Get foreign keys in table
* @param string
* @return ForeignKey[]
* @phpstan-type ForeignKey array{db:string, ns:string, table:string, source:list<string>, target:list<string>, on_delete:string, on_update:string}
*/
function foreign_keys($table) {
global $driver;
@@ -963,7 +959,6 @@ if (!defined('Adminer\DRIVER')) {
* @param string trigger name
* @param string
* @return Trigger
* @phpstan-type Trigger array{Trigger:string, Timing:string, Event:string, Of:string, Type:string, Statement:string}
*/
function trigger($name, $table) {
if ($name == "") {
@@ -1000,7 +995,6 @@ if (!defined('Adminer\DRIVER')) {
* @param string
* @param string "FUNCTION" or "PROCEDURE"
* @return Routine
* @phpstan-type Routine array{fields:list<array{field:string, type:string, length:string, unsigned:string, null:bool, full_type:string, inout:string, collation:string}>, comment:string, returns:array, definition:string, language:string}
*/
function routine($name, $type) {
global $driver;
@@ -1185,7 +1179,7 @@ if (!defined('Adminer\DRIVER')) {
/** Convert field in select and edit
* @param Field one element from fields()
* @return ?string
* @return string|void
*/
function convert_field($field) {
if (preg_match("~binary~", $field["type"])) {

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

@@ -89,7 +89,7 @@ if (isset($_GET["oracle"])) {
private function convert($row) {
foreach ((array) $row as $key => $val) {
if (is_a($val, 'OCI-Lob')) {
if (is_a($val, 'OCILob') || is_a($val, 'OCI-Lob')) {
$row[$key] = $val->load();
}
}

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

@@ -499,7 +499,7 @@ ORDER BY indisprimary DESC, indisunique DESC", $connection2) as $row
$return[$relname]["columns"][] = $columns[$indkey];
}
foreach (explode(" ", $row["indoption"]) as $indoption) {
$return[$relname]["descs"][] = ($indoption & 1 ? '1' : null); // 1 - INDOPTION_DESC
$return[$relname]["descs"][] = (intval($indoption) & 1 ? '1' : null); // 1 - INDOPTION_DESC
}
}
$return[$relname]["lengths"] = array();