From 9afe27eedb9432a115670720af9fbb3c83794e0f Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 16 May 2020 12:16:23 +0200 Subject: [PATCH] Update baselines Signed-off-by: William Desportes --- phpstan-baseline.neon | 53 ++++--------------------------------------- psalm-baseline.xml | 39 +++---------------------------- 2 files changed, 7 insertions(+), 85 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index dfb28f1ffc..423ec3c004 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -855,16 +855,6 @@ parameters: count: 1 path: libraries/classes/Database/Events.php - - - message: "#^Cannot access offset 'item_name' on array\\|true\\.$#" - count: 1 - path: libraries/classes/Database/Events.php - - - - message: "#^Cannot access offset 'item_original_name' on array\\|true\\.$#" - count: 1 - path: libraries/classes/Database/Events.php - - message: "#^Cannot access offset 'EVENT_NAME' on \\(array\\)\\|true\\.$#" count: 1 @@ -945,31 +935,11 @@ parameters: count: 1 path: libraries/classes/Database/Qbe.php - - - message: "#^Cannot access offset 'item_name' on array\\|true\\.$#" - count: 1 - path: libraries/classes/Database/Routines.php - - - - message: "#^Cannot access offset 'item_original_name' on array\\|true\\.$#" - count: 1 - path: libraries/classes/Database/Routines.php - - message: "#^Parameter \\#1 \\$mode of method PhpMyAdmin\\\\Database\\\\Routines\\:\\:getEditorForm\\(\\) expects string, string\\|null given\\.$#" count: 1 path: libraries/classes/Database/Routines.php - - - message: "#^Parameter \\#3 \\$routine of method PhpMyAdmin\\\\Database\\\\Routines\\:\\:getEditorForm\\(\\) expects array, array\\|null given\\.$#" - count: 1 - path: libraries/classes/Database/Routines.php - - - - message: "#^Offset 'item_type' does not exist on array\\|null\\.$#" - count: 1 - path: libraries/classes/Database/Routines.php - - message: "#^Parameter \\#2 \\$create_routine of method PhpMyAdmin\\\\Database\\\\Routines\\:\\:create\\(\\) expects string, string\\|null given\\.$#" count: 1 @@ -1016,7 +986,7 @@ parameters: path: libraries/classes/Database/Routines.php - - message: "#^Cannot access offset 'item_name' on array\\|bool\\.$#" + message: "#^Offset 'item_name' does not exist on array\\|null\\.$#" count: 1 path: libraries/classes/Database/Routines.php @@ -1026,7 +996,7 @@ parameters: path: libraries/classes/Database/Routines.php - - message: "#^Cannot access offset 'item_type' on array\\|bool\\.$#" + message: "#^Offset 'item_type' does not exist on array\\|null\\.$#" count: 1 path: libraries/classes/Database/Routines.php @@ -1036,27 +1006,12 @@ parameters: path: libraries/classes/Database/Routines.php - - message: "#^Parameter \\#1 \\$routine of method PhpMyAdmin\\\\Database\\\\Routines\\:\\:getExecuteForm\\(\\) expects array, array\\|true given\\.$#" - count: 1 - path: libraries/classes/Database/Routines.php - - - - message: "#^Cannot access offset 'create' on array\\|bool\\.$#" + message: "#^Offset 'create' does not exist on array\\|null\\.$#" count: 1 path: libraries/classes/Database/Triggers.php - - message: "#^Cannot access offset 'drop' on array\\|bool\\.$#" - count: 1 - path: libraries/classes/Database/Triggers.php - - - - message: "#^Cannot access offset 'item_name' on array\\|true\\.$#" - count: 1 - path: libraries/classes/Database/Triggers.php - - - - message: "#^Cannot access offset 'item_original_name' on array\\|true\\.$#" + message: "#^Offset 'drop' does not exist on array\\|null\\.$#" count: 1 path: libraries/classes/Database/Triggers.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index ed26c0f220..02c63c37ce 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -716,11 +716,7 @@ - - $item - - - $item['item_name'] + $item['EVENT_NAME'] $item['STATUS'] $item['EVENT_TYPE'] @@ -734,9 +730,6 @@ $item['DEFINER'] $item['EVENT_COMMENT'] - - $item['item_original_name'] - $create_item @@ -758,17 +751,12 @@ - - $routine + $routine['item_type_toggle'] $routine['item_returntype'] $row - $routine - - $routine['item_name'] - $routine['item_type'] - $routine['item_type'] + $routine['SPECIFIC_NAME'] $routine['ROUTINE_TYPE'] $routine['ROUTINE_DEFINITION'] @@ -777,15 +765,7 @@ $routine['SECURITY_TYPE'] $routine['SQL_DATA_ACCESS'] $routine['ROUTINE_COMMENT'] - $routine['item_type'] - $routine['item_type'] - $routine['item_name'] - $routine['item_name'] - - $routine['item_original_name'] - $routine['item_original_type'] - $mode $create_routine @@ -801,19 +781,6 @@ $this->searchTypes[$_POST['criteriaSearchType']] - - - $item - - - $trigger['create'] - $trigger['drop'] - $item['item_name'] - - - $item['item_original_name'] - - $result_target[]