From 34397a5d08d4e4b2d3155f163e187490e1298fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mor=C3=A1vek?= <petr@pada.cz>
Date: Mon, 8 Jan 2024 22:25:37 +0100
Subject: [PATCH] Update phpstan ignore

---
 phpstan.neon.dist                    | 20 ++------------------
 tests/PHPStan/conditional.config.php | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 62a3c6f..8ef9937 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -51,20 +51,12 @@ parameters:
             message: "#^Parameter \\#1 \\$value \\(bool\\|Nette\\\\Utils\\\\Html\\|string\\) of method Nepada\\\\FileUploadControl\\\\FileUploadControl\\:\\:setRequired\\(\\) should be contravariant with parameter \\$value \\(bool\\|object\\|string\\) of method Nextras\\\\FormComponents\\\\Fragments\\\\UIControl\\\\BaseControl\\:\\:setRequired\\(\\)$#"
             count: 1
             path: src/FileUploadControl/FileUploadControl.php
-        -
-            message: "#^Parameter \\#1 \\$value of method Nette\\\\Forms\\\\Rules\\:\\:setRequired\\(\\) expects bool\\|string, bool\\|Nette\\\\Utils\\\\Html\\|string given\\.$#"
-            count: 1
-            path: src/FileUploadControl/FileUploadControl.php
-        -
-            message: "#^Return type \\(Nette\\\\Utils\\\\Html\\|string\\|null\\) of method Nepada\\\\FileUploadControl\\\\Validation\\\\FakeUploadControl\\:\\:getCaption\\(\\) should be covariant with return type \\(object\\|string\\) of method Nette\\\\Forms\\\\Controls\\\\BaseControl\\:\\:getCaption\\(\\)$#"
-            count: 1
-            path: src/FileUploadControl/Validation/FakeUploadControl.php
         -
             message: "#^Method Nepada\\\\FileUploadControl\\\\Validation\\\\FakeUploadControl\\:\\:getCaption\\(\\) should return Nette\\\\Utils\\\\Html\\|string\\|null but returns object\\|string\\.$#"
             count: 1
             path: src/FileUploadControl/Validation/FakeUploadControl.php
         -
-            message: "#^Parameter \\#1 \\$message \\(Nette\\\\Utils\\\\Html\\|string\\) of method Nepada\\\\FileUploadControl\\\\Validation\\\\FakeUploadControl\\:\\:addError\\(\\) should be contravariant with parameter \\$message \\(object\\|string\\) of method Nette\\\\Forms\\\\Controls\\\\BaseControl\\:\\:addError\\(\\)$#"
+            message: "#^Parameter \\#1 \\$message \\(Nette\\\\Utils\\\\Html\\|string\\) of method Nepada\\\\FileUploadControl\\\\Validation\\\\FakeUploadControl\\:\\:addError\\(\\) should be contravariant with parameter \\$message \\((object\\|)?string(\\|Stringable)?\\) of method Nette\\\\Forms\\\\Controls\\\\BaseControl(<.*>)?\\:\\:addError\\(\\)$#"
             count: 1
             path: src/FileUploadControl/Validation/FakeUploadControl.php
         -
@@ -75,10 +67,6 @@ parameters:
             message: "#^Parameter \\#2 \\$validator \\(\\(callable\\(\\)\\: mixed\\)\\|string\\) of method Nepada\\\\FileUploadControl\\\\FileUploadControl\\:\\:addConditionOn\\(\\) should be contravariant with parameter \\$validator \\(mixed\\) of method Nextras\\\\FormComponents\\\\Fragments\\\\UIControl\\\\BaseControl\\:\\:addConditionOn\\(\\)$#"
             count: 1
             path: src/FileUploadControl/FileUploadControl.php
-        -
-            message: "#^Cannot cast mixed to string\\.$#"
-            count: 1
-            path: src/FileUploadControl/FileUploadControl.php
         -
             message: "#^Dead catch \\- Throwable is never thrown in the try block\\.$#"
             count: 1
@@ -103,15 +91,11 @@ parameters:
             message: "#^Parameter \\#2 \\$size of class Nepada\\\\FileUploadControl\\\\Storage\\\\Metadata\\\\FileUploadMetadata constructor expects int, mixed given\\.$#"
             count: 1
             path: src/FileUploadControl/Storage/Metadata/FileUploadMetadata.php
-        -
-            message: "#^Parameter \\#1 \\$control \\(Nette\\\\Forms\\\\Control\\<mixed\\>\\) of method Nepada\\\\FileUploadControl\\\\FileUploadControl\\:\\:addConditionOn\\(\\) should be contravariant with parameter \\$control \\(Nette\\\\Forms\\\\IControl\\) of method Nextras\\\\FormComponents\\\\Fragments\\\\UIControl\\\\BaseControl\\:\\:addConditionOn\\(\\)$#"
-            count: 1
-            path: src/FileUploadControl/FileUploadControl.php
         - # Used for checksum only
             message: "#^Calling sha1\\(\\) is forbidden, use hash\\(\\) with at least SHA\\-256 for secure hash, or password_hash\\(\\) for passwords$#"
             count: 1
             path: src/FileUploadControl/Storage/Metadata/FileUploadMetadata.php
         - # false positive
-            message: "#^Invalid var phpdoc of \\$files\\. Cannot assign array\\<string\\>\\|string to array\\<int, Nette\\\\Http\\\\FileUpload\\>$#"
+            message: "#^Invalid var phpdoc of \\$files\\. Cannot assign array.* to array\\<int, Nette\\\\Http\\\\FileUpload\\>$#"
             count: 1
             path: src/FileUploadControl/FileUploadControl.php
diff --git a/tests/PHPStan/conditional.config.php b/tests/PHPStan/conditional.config.php
index 856ad31..78edb37 100644
--- a/tests/PHPStan/conditional.config.php
+++ b/tests/PHPStan/conditional.config.php
@@ -27,6 +27,26 @@
     $config['parameters']['ignoreErrors'][] = [
         'message' => '~contains generic type Nette\\\\Forms\\\\Control<mixed> but interface Nette\\\\Forms\\\\Control is not generic~',
     ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Cannot cast mixed to string\\.$#',
+        'path' => '../../src/FileUploadControl/FileUploadControl.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Return type \\(Nette\\\\Utils\\\\Html\\|string\\|null\\) of method Nepada\\\\FileUploadControl\\\\Validation\\\\FakeUploadControl\\:\\:getCaption\\(\\) should be covariant with return type \\(object\\|string\\) of method Nette\\\\Forms\\\\Controls\\\\BaseControl\\:\\:getCaption\\(\\)$#',
+        'path' => '../../src/FileUploadControl/Validation/FakeUploadControl.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Parameter \\#1 \\$control \\(Nette\\\\Forms\\\\Control\\<mixed\\>\\) of method Nepada\\\\FileUploadControl\\\\FileUploadControl\\:\\:addConditionOn\\(\\) should be contravariant with parameter \\$control \\(Nette\\\\Forms\\\\IControl\\) of method Nextras\\\\FormComponents\\\\Fragments\\\\UIControl\\\\BaseControl\\:\\:addConditionOn\\(\\)$#s',
+        'path' => '../../src/FileUploadControl/FileUploadControl.php',
+        'count' => 1,
+    ];
+    $config['parameters']['ignoreErrors'][] = [
+        'message' => '#^Parameter \\#1 \\$value of method Nette\\\\Forms\\\\Rules\\:\\:setRequired\\(\\) expects bool\\|string, bool\\|Nette\\\\Utils\\\\Html\\|string given\\.$#',
+        'path' => '../../src/FileUploadControl/FileUploadControl.php',
+        'count' => 1,
+    ];
 }
 
 return $config;