diff options
| -rw-r--r-- | libraries/classes/Core.php | 17 | ||||
| -rw-r--r-- | phpstan-baseline.neon | 5 | ||||
| -rw-r--r-- | psalm-baseline.xml | 24 | ||||
| -rw-r--r-- | test/classes/CoreTest.php | 24 |
4 files changed, 4 insertions, 66 deletions
diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 3422f02a6d..02e69fcbab 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -52,7 +52,6 @@ use function substr; use function trigger_error; use function unserialize; use function urldecode; -use function vsprintf; use const DATE_RFC1123; use const E_USER_ERROR; @@ -83,20 +82,10 @@ class Core * * loads language file if not loaded already * - * @param string $error_message the error message or named error message - * @param string|array $message_args arguments applied to $error_message + * @param string $error_message the error message or named error message */ - public static function fatalError( - string $error_message, - $message_args = null - ): void { - /* Use format string if applicable */ - if (is_string($message_args)) { - $error_message = sprintf($error_message, $message_args); - } elseif (is_array($message_args)) { - $error_message = vsprintf($error_message, $message_args); - } - + public static function fatalError(string $error_message): void + { /** * Avoid using Response class as config does not have to be loaded yet * (this can happen on early fatal error) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index e021197269..d7d160f556 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1996,11 +1996,6 @@ parameters: path: libraries/classes/Core.php - - message: "#^Method PhpMyAdmin\\\\Core\\:\\:fatalError\\(\\) has parameter \\$message_args with no value type specified in iterable type array\\.$#" - count: 1 - path: libraries/classes/Core.php - - - message: "#^Method PhpMyAdmin\\\\Core\\:\\:previewSQL\\(\\) has parameter \\$query_data with no value type specified in iterable type array\\.$#" count: 1 path: libraries/classes/Core.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 490e888f5b..25f139f684 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -2088,16 +2088,8 @@ <code>$GLOBALS['whatStrucOrData']</code> </PossiblyInvalidCast> <PossiblyInvalidPropertyAssignmentValue occurrences="2"/> - <PossiblyNullArgument occurrences="18"> + <PossiblyNullArgument occurrences="10"> <code>$GLOBALS['charset']</code> - <code>$GLOBALS['export_plugin']</code> - <code>$GLOBALS['export_plugin']</code> - <code>$GLOBALS['export_plugin']</code> - <code>$GLOBALS['export_plugin']</code> - <code>$GLOBALS['export_plugin']</code> - <code>$GLOBALS['export_plugin']</code> - <code>$GLOBALS['export_plugin']</code> - <code>$GLOBALS['export_plugin']</code> <code>$GLOBALS['export_type']</code> <code>$GLOBALS['export_type']</code> <code>$GLOBALS['export_type']</code> @@ -2108,10 +2100,6 @@ <code>$GLOBALS['export_type']</code> <code>$GLOBALS['filename_template']</code> </PossiblyNullArgument> - <PossiblyNullReference occurrences="2"> - <code>exportFooter</code> - <code>exportHeader</code> - </PossiblyNullReference> <RedundantCondition occurrences="2"> <code>! $GLOBALS['save_on_server']</code> <code>$outputFormat === 'sendit' && ! $GLOBALS['save_on_server']</code> @@ -3059,22 +3047,12 @@ <code>$value</code> </MixedAssignment> </file> - <file src="libraries/classes/Controllers/Setup/FormController.php"> - <UndefinedClass occurrences="1"> - <code>new $formClass($this->config)</code> - </UndefinedClass> - </file> <file src="libraries/classes/Controllers/Setup/HomeController.php"> <MixedArgumentTypeCoercion occurrences="2"> <code>$id</code> <code>$id</code> </MixedArgumentTypeCoercion> </file> - <file src="libraries/classes/Controllers/Setup/ValidateController.php"> - <MixedAssignment occurrences="1"> - <code>$values</code> - </MixedAssignment> - </file> <file src="libraries/classes/Controllers/Sql/ColumnPreferencesController.php"> <MixedAssignment occurrences="2"> <code>$colorder</code> diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php index d221bf6daf..4ac496dbfb 100644 --- a/test/classes/CoreTest.php +++ b/test/classes/CoreTest.php @@ -376,30 +376,6 @@ class CoreTest extends AbstractNetworkTestCase } /** - * Test for Core::fatalError - */ - public function testFatalErrorMessageWithArgs(): void - { - $_REQUEST = []; - ResponseRenderer::getInstance()->setAjax(false); - - $message = 'Fatal error #%d in file %s.'; - $params = [ - 1, - 'error_file.php', - ]; - - $this->expectOutputRegex('/Fatal error #1 in file error_file.php./'); - Core::fatalError($message, $params); - - $message = 'Fatal error in file %s.'; - $params = 'error_file.php'; - - $this->expectOutputRegex('/Fatal error in file error_file.php./'); - Core::fatalError($message, $params); - } - - /** * Test for Core::getRealSize * * @param string $size Size |