diff --git a/libraries/classes/Plugins/Import/Upload/UploadProgress.php b/libraries/classes/Plugins/Import/Upload/UploadProgress.php index 323e045e4c..fc971e173b 100644 --- a/libraries/classes/Plugins/Import/Upload/UploadProgress.php +++ b/libraries/classes/Plugins/Import/Upload/UploadProgress.php @@ -13,7 +13,6 @@ use PhpMyAdmin\Plugins\UploadInterface; use function array_key_exists; use function function_exists; use function trim; -use function uploadprogress_get_info; /** * Implementation for upload progress @@ -67,7 +66,8 @@ class UploadProgress implements UploadInterface $status = null; // @see https://pecl.php.net/package/uploadprogress if (function_exists('uploadprogress_get_info')) { - $status = uploadprogress_get_info($id); + // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName + $status = \uploadprogress_get_info($id); } if ($status) { diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 2448f23c7c..8c3604bc45 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -8,6 +8,8 @@ parameters: - libraries/constants.php bootstrapFiles: - test/phpstan-constants.php + stubFiles: + - test/stubs/uploadprogress.stub excludePaths: - examples/openid.php - node_modules/* diff --git a/psalm-baseline.xml b/psalm-baseline.xml index dca6ad5b7a..0778feae08 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -191,6 +191,9 @@ mb_strpos($row, ' ON ') mb_strpos($row, ' ON ') + + $row[0] + @@ -5380,7 +5383,7 @@ int|bool - + $_SERVER['SCRIPT_NAME'] $a $arrayKeys @@ -5403,7 +5406,6 @@ $link $link $link - $link $one_database_tables $one_database_tables $one_table_name @@ -10505,14 +10507,10 @@ $_SESSION[$SESSION_KEY] - + $_SESSION[$SESSION_KEY][$id] $ret['finished'] $ret['total'] - $status['bytes_total'] - $status['bytes_total'] - $status['bytes_uploaded'] - $status['bytes_uploaded'] $_SESSION[$SESSION_KEY][$id] @@ -10529,20 +10527,13 @@ $_SESSION[$SESSION_KEY] $_SESSION[$SESSION_KEY] - + $_SESSION[$SESSION_KEY][$id] $ret - $ret['complete'] - $ret['percent'] - $ret['total'] - $status array|null - - $ret['complete'] - $ret $ret diff --git a/psalm.xml b/psalm.xml index 4dc7a64b78..be42de0e80 100644 --- a/psalm.xml +++ b/psalm.xml @@ -25,6 +25,10 @@ + + + + diff --git a/test/stubs/uploadprogress.stub b/test/stubs/uploadprogress.stub new file mode 100644 index 0000000000..92e8676dd3 --- /dev/null +++ b/test/stubs/uploadprogress.stub @@ -0,0 +1,19 @@ +