From d2be169ce50938809ccd7203eb99c9d8d4f56690 Mon Sep 17 00:00:00 2001
From: kkmuffme <11071985+kkmuffme@users.noreply.github.com>
Date: Wed, 3 Aug 2022 19:56:38 +0200
Subject: [PATCH] update tests

---
 tests/ClosureTest.php                 | 2 +-
 tests/ReturnTypeTest.php              | 2 +-
 tests/Template/ClassTemplateTest.php  | 4 ++--
 tests/TypeReconciliation/TypeTest.php | 4 ++--
 tests/UnusedVariableTest.php          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/ClosureTest.php b/tests/ClosureTest.php
index def99f9955c..cea843a3725 100644
--- a/tests/ClosureTest.php
+++ b/tests/ClosureTest.php
@@ -1149,7 +1149,7 @@ function takesB(B $_b) : void {}
 
                     takesA($getAButReallyB());
                     takesB($getAButReallyB());',
-                'error_message' => 'ArgumentTypeCoercion - src' . DIRECTORY_SEPARATOR . 'somefile.php:13:28 - Argument 1 of takesB expects B, parent type A provided',
+                'error_message' => 'ArgumentTypeCoercion - src' . DIRECTORY_SEPARATOR . 'somefile.php:13:28 - Argument 1 of takesB expects B, but parent type A provided',
             ],
             'closureByRefUseToMixed' => [
                 '<?php
diff --git a/tests/ReturnTypeTest.php b/tests/ReturnTypeTest.php
index 492044b7436..9c522ee9df1 100644
--- a/tests/ReturnTypeTest.php
+++ b/tests/ReturnTypeTest.php
@@ -1500,7 +1500,7 @@ function($iter) use ($predicate) {
 
                 $res = map(function(int $i): string { return (string) $i; })([1,2,3]);
                 ',
-                'error_message' => 'InvalidArgument - src' . DIRECTORY_SEPARATOR . 'somefile.php:13:54 - Argument 1 expects T:fn-map as mixed, int provided',
+                'error_message' => 'InvalidArgument - src' . DIRECTORY_SEPARATOR . 'somefile.php:13:54 - Argument 1 expects T:fn-map as mixed, but int provided',
             ],
             'cannotInferReturnClosureWithDifferentReturnTypes' => [
                 '<?php
diff --git a/tests/Template/ClassTemplateTest.php b/tests/Template/ClassTemplateTest.php
index afe14f81132..b76c93c3e05 100644
--- a/tests/Template/ClassTemplateTest.php
+++ b/tests/Template/ClassTemplateTest.php
@@ -3936,7 +3936,7 @@ public function __construct(callable $closure)
                             type($closure);
                         }
                     }',
-                'error_message' => 'InvalidArgument - src' . DIRECTORY_SEPARATOR . 'somefile.php:20:34 - Argument 1 of type expects string, callable(State):(T:AlmostFooMap as mixed)&Foo provided',
+                'error_message' => 'InvalidArgument - src' . DIRECTORY_SEPARATOR . 'somefile.php:20:34 - Argument 1 of type expects string, but callable(State):(T:AlmostFooMap as mixed)&Foo provided',
             ],
             'templateWithNoReturn' => [
                 '<?php
@@ -4118,7 +4118,7 @@ class CharacterRow extends Row {}
                     $mario = new CharacterRow(["id" => 5, "name" => "Mario", "height" => 3.5]);
 
                     $mario->ame = "Luigi";',
-                'error_message' => 'InvalidArgument - src' . DIRECTORY_SEPARATOR . 'somefile.php:47:29 - Argument 1 of CharacterRow::__set expects "height"|"id"|"name", "ame" provided',
+                'error_message' => 'InvalidArgument - src' . DIRECTORY_SEPARATOR . 'somefile.php:47:29 - Argument 1 of CharacterRow::__set expects "height"|"id"|"name", but "ame" provided',
             ],
             'specialiseTypeBeforeReturning' => [
                 '<?php
diff --git a/tests/TypeReconciliation/TypeTest.php b/tests/TypeReconciliation/TypeTest.php
index 6908b92dd48..4a5754825be 100644
--- a/tests/TypeReconciliation/TypeTest.php
+++ b/tests/TypeReconciliation/TypeTest.php
@@ -1519,7 +1519,7 @@ class C extends A {}
 
                     function takesB(B $i): void {}',
                 'error_message' => 'ArgumentTypeCoercion - src' . DIRECTORY_SEPARATOR . 'somefile.php:14:32 - Argument 1 of takesB expects B,'
-                    . ' parent type A&static provided',
+                    . ' but parent type A&static provided',
             ],
             'intersectionTypeInterfaceCheckAfterInstanceof' => [
                 '<?php
@@ -1540,7 +1540,7 @@ public static function getFoo(): void {
                     interface I {}
 
                     function takesI(I $i): void {}',
-                'error_message' => 'InvalidArgument - src' . DIRECTORY_SEPARATOR . 'somefile.php:12:32 - Argument 1 of takesI expects I, A&static provided',
+                'error_message' => 'InvalidArgument - src' . DIRECTORY_SEPARATOR . 'somefile.php:12:32 - Argument 1 of takesI expects I, but A&static provided',
             ],
         ];
     }
diff --git a/tests/UnusedVariableTest.php b/tests/UnusedVariableTest.php
index 048025186ca..618f871d651 100644
--- a/tests/UnusedVariableTest.php
+++ b/tests/UnusedVariableTest.php
@@ -3451,7 +3451,7 @@ function takesArray($a) : void {
                         $arr = [$a];
                         takesArrayOfString($arr);
                     }',
-                'error_message' => 'MixedArgumentTypeCoercion - src' . DIRECTORY_SEPARATOR . 'somefile.php:12:44 - Argument 1 of takesArrayOfString expects array<array-key, string>, parent type array{mixed} provided. Consider improving the type at src' . DIRECTORY_SEPARATOR . 'somefile.php:10:41'
+                'error_message' => 'MixedArgumentTypeCoercion - src' . DIRECTORY_SEPARATOR . 'somefile.php:12:44 - Argument 1 of takesArrayOfString expects array<array-key, string>, but parent type array{mixed} provided. Consider improving the type at src' . DIRECTORY_SEPARATOR . 'somefile.php:10:41'
             ],
             'warnAboutUnusedVariableInTryReassignedInCatch' => [
                 '<?php