From aae0630b784a7d66d53cb2de198ff2d9df98d275 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 13 Jul 2021 22:33:28 +0200
Subject: [PATCH] Update baselines and phpstan version to ^0.12.92

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 composer.json         | 2 +-
 phpstan-baseline.neon | 4 ++--
 psalm-baseline.xml    | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 253e203bb7..208f4cb3f6 100644
--- a/composer.json
+++ b/composer.json
@@ -84,7 +84,7 @@
         "php-webdriver/webdriver": "^1.11",
         "phpmyadmin/coding-standard": "^2.1.1",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^0.12.79",
+        "phpstan/phpstan": "^0.12.92",
         "phpstan/phpstan-phpunit": "^0.12.17",
         "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0",
         "pragmarx/google2fa-qrcode": "^1.0.1",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 7154ce2c41..85f7888985 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2066,7 +2066,7 @@ parameters:
 			path: libraries/classes/StorageEngine.php
 
 		-
-			message: "#^Parameter \\#1 \\$str of method PhpMyAdmin\\\\DatabaseInterface\\:\\:escapeString\\(\\) expects string, int given\\.$#"
+			message: "#^Parameter \\#1 \\$str of method PhpMyAdmin\\\\DatabaseInterface\\:\\:escapeString\\(\\) expects string, int\\<min, \\-1\\>\\|int\\<1, max\\> given\\.$#"
 			count: 1
 			path: libraries/classes/Table.php
 
@@ -2136,7 +2136,7 @@ parameters:
 			path: libraries/classes/Types.php
 
 		-
-			message: "#^Offset 'header' does not exist on array\\('proxy' \\=\\> string, 'request_fulluri' \\=\\> true\\)\\.$#"
+			message: "#^Offset 'header' does not exist on array\\('proxy' \\=\\> non\\-empty\\-string, 'request_fulluri' \\=\\> true\\)\\.$#"
 			count: 1
 			path: libraries/classes/Utils/HttpRequest.php
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index dfb9a1dd0f..7ed8af15d3 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -2484,13 +2484,10 @@
     <PossiblyInvalidOperand occurrences="1">
       <code>$insert_id</code>
     </PossiblyInvalidOperand>
-    <PossiblyNullArgument occurrences="22">
+    <PossiblyNullArgument occurrences="18">
       <code>$_POST['purge'] ?? null</code>
       <code>$db</code>
       <code>$db</code>
-      <code>$db</code>
-      <code>$db</code>
-      <code>$db</code>
       <code>$disp_message ?? null</code>
       <code>$extra_data ?? null</code>
       <code>$message_to_show ?? null</code>
@@ -2506,7 +2503,6 @@
       <code>$table</code>
       <code>$table</code>
       <code>$table</code>
-      <code>$table</code>
     </PossiblyNullArgument>
     <PossiblyNullArrayAccess occurrences="2">
       <code>$row[0]</code>