more invalid tests

vimeo · Mar 12, 2024 · 2344c1b · 2344c1b
1 parent 4436c1a
commit 2344c1b
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 6 deletions.
diff --git a/tests/ArrayFunctionCallTest.php b/tests/ArrayFunctionCallTest.php
@@ -2988,13 +2988,17 @@ function merger(array $a, array $b) : array {
                     array_merge(...$map);
                 ',
                 'error_message' => 'NamedArgumentNotAllowed',
+                'ignored_issues' => [],
+                'php_version' => '8.1',
             ],
             'arrayMergeRecursiveNoNamed' => [
                 'code' => '<?php
                     $map = ["a" => []];
                     array_merge_recursive(...$map);
                 ',
                 'error_message' => 'NamedArgumentNotAllowed',
+                'ignored_issues' => [],
+                'php_version' => '8.1',
             ],
             'arrayUniquePreservesEmptyInput' => [
                 'code' => '<?php

diff --git a/tests/AttributeTest.php b/tests/AttributeTest.php
@@ -72,6 +72,9 @@ public function __construct(
                             public string $name = "",
                         ) {}
                     }',
+                'assertions' => [],
+                'ignored_issues' => [],
+                'php_version' => '8.0',
             ],
             'functionAttributeExists' => [
                 'code' => '<?php
@@ -145,6 +148,9 @@ public function __construct(array $methods = []) {
                     #[Route(methods: ["GET"])]
                     class HealthController
                     {}',
+                'assertions' => [],
+                'ignored_issues' => [],
+                'php_version' => '8.0',
             ],
             'allowsRepeatableFlag' => [
                 'code' => '<?php
@@ -168,6 +174,9 @@ public function __construct(string $_className)
 
                     #[Foo(_className: Baz::class)]
                     class Baz {}',
+                'assertions' => [],
+                'ignored_issues' => [],
+                'php_version' => '8.0',
             ],
             'allowsClassStringFromDifferentNamespace' => [
                 'code' => '<?php
@@ -203,6 +212,9 @@ class Bar implements FoobarInterface {}
                         class Baz {}
                     }
                 ',
+                'assertions' => [],
+                'ignored_issues' => [],
+                'php_version' => '8.0',
             ],
             'returnTypeWillChange7.1' => [
                 'code' => '<?php

diff --git a/tests/CallableTest.php b/tests/CallableTest.php
@@ -107,7 +107,7 @@ public function __invoke(Closure ...$_fn): int
                     '$a' => 'int',
                 ],
                 'ignored_issues' => [],
-                'php_version' => '7.4',
+                'php_version' => '8.0',
             ],
             'inferArgFromClassContextInGenericContext' => [
                 'code' => '<?php

diff --git a/tests/CoreStubsTest.php b/tests/CoreStubsTest.php
@@ -447,12 +447,16 @@ public function providerInvalidCodeParse(): iterable
                 json_decode("true", depth: -1);
             ',
             'error_message' => 'InvalidArgument',
+            'ignored_issues' => [],
+            'php_version' => '8.0',
         ];
         yield 'json_encode invalid depth' => [
             'code' => '<?php
                 json_encode([], depth: 439877348953739);
             ',
             'error_message' => 'InvalidArgument',
+            'ignored_issues' => [],
+            'php_version' => '8.0',
         ];
         yield 'str_contains literal haystack' => [
             'code' => '<?php

diff --git a/tests/IntRangeTest.php b/tests/IntRangeTest.php
@@ -668,8 +668,8 @@ function getInt(): int{return 0;}
                     $i = max($b, $c, $d);
                     $j = max($d, $e);
                     $k = max($e, 40);
-                    $l = min($a, ...[$b, $c], $d);
-                    $m = max(...[$a, ...[$b, $c]], $d);
+                    $l = min($a, $d, ...[$b, $c]);
+                    $m = max($d, ...[$a, ...[$b, $c]]);
                     ',
                 'assertions' => [
                     '$f===' => 'int<min, -16>',

diff --git a/tests/Template/ClassTemplateCovarianceTest.php b/tests/Template/ClassTemplateCovarianceTest.php
@@ -315,7 +315,9 @@ public function __construct(...$a) {
                          */
                         public function add($a) : Collection
                         {
-                          return new Collection(...$this->arr, $a);
+                          $data = $this->arr;
+                          $data[] = $a;
+                          return new Collection(...$data);
                         }
                     }
 

diff --git a/tests/UnusedCodeTest.php b/tests/UnusedCodeTest.php
@@ -1737,6 +1737,8 @@ function baz(): string
                         return $f;
                     }',
                 'error_message' => 'UnusedFunctionCall',
+                'ignored_issues' => [],
+                'php_version' => '8.0',
             ],
             'propertyWrittenButNotRead' => [
                 'code' => '<?php

diff --git a/tests/UnusedVariableTest.php b/tests/UnusedVariableTest.php
@@ -2228,8 +2228,11 @@ function f(): array {
             'funcGetArgs' => [
                 'code' => '<?php
                     function validate(bool $b, bool $c) : void {
-                        /** @psalm-suppress MixedArgument */
-                        print_r(...func_get_args());
+                        $args = func_get_args();
+                        if ($args !== array()) {
+                            /** @psalm-suppress MixedArgument */
+                            print_r(...$args);
+                        }
                     }',
             ],
             'nullCoalesce' => [