Actually run some checks on all PHP versions

vimeo · Jan 27, 2022 · 6c41fdb · 6c41fdb
1 parent 60b7086
commit 6c41fdb
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/Psalm/Internal/Analyzer/MethodComparator.php b/src/Psalm/Internal/Analyzer/MethodComparator.php
@@ -118,16 +118,18 @@ public static function compare(
 
         if (!$guide_classlike_storage->user_defined
             && $implementer_classlike_storage->user_defined
-            && $codebase->analysis_php_version_id >= 80100
             && ($guide_method_storage->return_type
                 || $guide_method_storage->signature_return_type
             )
             && !$implementer_method_storage->signature_return_type
-            && !array_filter(
-                $implementer_method_storage->attributes,
-                function (AttributeStorage $s) {
-                    return $s->fq_class_name === 'ReturnTypeWillChange';
-                }
+            && (
+                $codebase->analysis_php_version_id >= 80000
+                || !array_filter(
+                    $implementer_method_storage->attributes,
+                    function (AttributeStorage $s) {
+                        return $s->fq_class_name === 'ReturnTypeWillChange';
+                    }
+                )
             )
         ) {
             IssueBuffer::maybeAdd(