Scan on 8.0+, fix tests

vimeo · Feb 8, 2022 · 6852146 · 6852146
1 parent 5b76139
commit 6852146
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Codebase/Reflection.php b/src/Psalm/Internal/Codebase/Reflection.php
@@ -310,7 +310,7 @@ public function extractReflectionMethodInfo(ReflectionMethod $method): void
             $storage->setParams($callables[0]->params);
 
             $storage->return_type = $callables[0]->return_type;
-            if ($this->codebase->analysis_php_version_id >= 80100) {
+            if ($this->codebase->analysis_php_version_id >= 80000) {
                 $storage->signature_return_type = $storage->return_type;
             }
             $storage->return_type->queueClassLikesForScanning($this->codebase);

diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php
@@ -987,7 +987,7 @@ private static function handleReturn(
                 }
             } elseif ($classlike_storage
                 && !$classlike_storage->user_defined
-                && $codebase->analysis_php_version_id >= 80100
+                && $codebase->analysis_php_version_id >= 80000
                 && !$storage->signature_return_type
             ) {
                 $new = [];

diff --git a/tests/AttributeTest.php b/tests/AttributeTest.php
@@ -229,6 +229,9 @@ public function getIterator()
                     use IteratorAggregate;
                     use ReturnTypeWillChange;
 
+                    /**
+                     * @psalm-suppress MethodSignatureMismatch
+                     */
                     final class EmptyCollection implements IteratorAggregate
                     {
                         #[ReturnTypeWillChange]