Remove MixedInferredReturnType as the related issue is more accuratly…

… reported by MixedReturnStatement
vimeo · Oct 26, 2023 · 1628ea4 · 1628ea4
1 parent 147505c
commit 1628ea4
Show file tree

Hide file tree

Showing 26 changed files with 25 additions and 165 deletions.
diff --git a/UPGRADING.md b/UPGRADING.md
@@ -12,8 +12,11 @@
 - [BC] The only optional boolean parameter of `TKeyedArray::getGenericArrayType` was removed, and was replaced with a string parameter with a different meaning.
 
 - [BC] The `TDependentListKey` type was removed and replaced with an optional property of the `TIntRange` type.
+- 
 - [BC] `TCallableArray` and `TCallableList` removed and replaced with `TCallableKeyedArray`.
 
+- [BC] Class `Psalm\Issue\MixedInferredReturnType` was removed
+
 - [BC] Value of constant `Psalm\Type\TaintKindGroup::ALL_INPUT` changed to reflect new `TaintKind::INPUT_SLEEP` and `TaintKind::INPUT_XPATH` have been added. Accordingly, default values for `$taint` parameters of `Psalm\Codebase::addTaintSource()` and `Psalm\Codebase::addTaintSink()` have been changed as well.
 
 - [BC] Property `Config::$shepherd_host` was replaced with `Config::$shepherd_endpoint`

diff --git a/config.xsd b/config.xsd
@@ -333,7 +333,6 @@
             <xs:element name="MixedAssignment" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MixedClone" type="ArgumentIssueHandlerType" minOccurs="0" />
             <xs:element name="MixedFunctionCall" type="IssueHandlerType" minOccurs="0" />
-            <xs:element name="MixedInferredReturnType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MixedMethodCall" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MixedOperand" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MixedPropertyAssignment" type="IssueHandlerType" minOccurs="0" />

diff --git a/docs/running_psalm/error_levels.md b/docs/running_psalm/error_levels.md
@@ -262,7 +262,6 @@ Level 5 and above allows a more non-verifiable code, and higher levels are even
  - [MixedAssignment](issues/MixedAssignment.md)
  - [MixedClone](issues/MixedClone.md)
  - [MixedFunctionCall](issues/MixedFunctionCall.md)
- - [MixedInferredReturnType](issues/MixedInferredReturnType.md)
  - [MixedMethodCall](issues/MixedMethodCall.md)
  - [MixedOperand](issues/MixedOperand.md)
  - [MixedPropertyAssignment](issues/MixedPropertyAssignment.md)

diff --git a/docs/running_psalm/issues.md b/docs/running_psalm/issues.md
@@ -134,7 +134,6 @@
  - [MixedAssignment](issues/MixedAssignment.md)
  - [MixedClone](issues/MixedClone.md)
  - [MixedFunctionCall](issues/MixedFunctionCall.md)
- - [MixedInferredReturnType](issues/MixedInferredReturnType.md)
  - [MixedMethodCall](issues/MixedMethodCall.md)
  - [MixedOperand](issues/MixedOperand.md)
  - [MixedPropertyAssignment](issues/MixedPropertyAssignment.md)

diff --git a/docs/running_psalm/issues/MixedInferredReturnType.md b/docs/running_psalm/issues/MixedInferredReturnType.md
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -156,7 +156,6 @@ final class Config
         'MixedArrayTypeCoercion',
         'MixedAssignment',
         'MixedFunctionCall',
-        'MixedInferredReturnType',
         'MixedMethodCall',
         'MixedOperand',
         'MixedPropertyFetch',

diff --git a/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeAnalyzer.php
@@ -40,7 +40,6 @@
 use Psalm\Issue\MismatchingDocblockReturnType;
 use Psalm\Issue\MissingClosureReturnType;
 use Psalm\Issue\MissingReturnType;
-use Psalm\Issue\MixedInferredReturnType;
 use Psalm\Issue\MixedReturnTypeCoercion;
 use Psalm\Issue\MoreSpecificReturnType;
 use Psalm\Issue\UnresolvableConstant;
@@ -516,17 +515,6 @@ public static function verifyReturnType(
             }
 
             if ($inferred_return_type->hasMixed()) {
-                if (IssueBuffer::accepts(
-                    new MixedInferredReturnType(
-                        'Could not verify return type \'' . $declared_return_type . '\' for ' .
-                            $cased_method_id,
-                        $return_type_location,
-                    ),
-                    $suppressed_issues,
-                )) {
-                    return false;
-                }
-
                 return null;
             }
 

diff --git a/src/Psalm/Issue/MixedInferredReturnType.php b/src/Psalm/Issue/MixedInferredReturnType.php
diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
@@ -2250,9 +2250,6 @@ function getCachedMixed(array $cache, string $locale) : string {
             ],
             'mergeWithDeeplyNestedArray' => [
                 'code' => '<?php
-                    /**
-                     * @psalm-suppress MixedInferredReturnType
-                     */
                     function getTwoPartsLocale(array $cache, string $a, string $b) : string
                     {
                         if (!isset($cache[$b])) {

diff --git a/tests/CallableTest.php b/tests/CallableTest.php
@@ -1917,7 +1917,7 @@ public function bar($argOne, $argTwo)
                         }
                     }',
                 'error_message' => 'InvalidFunctionCall',
-                'ignored_issues' => ['UndefinedClass', 'MixedInferredReturnType'],
+                'ignored_issues' => ['UndefinedClass'],
             ],
             'undefinedCallableMethodFullString' => [
                 'code' => '<?php

diff --git a/tests/ClassTest.php b/tests/ClassTest.php
@@ -341,7 +341,6 @@ function foo() : D {
                 'assertions' => [],
                 'ignored_issues' => [
                     'UndefinedClass',
-                    'MixedInferredReturnType',
                     'InvalidArgument',
                 ],
             ],
@@ -356,7 +355,6 @@ function foo() : D {
                 'assertions' => [],
                 'ignored_issues' => [
                     'UndefinedClass',
-                    'MixedInferredReturnType',
                     'InvalidArgument',
                 ],
             ],

diff --git a/tests/DocumentationTest.php b/tests/DocumentationTest.php
@@ -288,10 +288,6 @@ public function providerInvalidCodeParse(): array
                     $ignored_issues = ['InvalidReturnStatement'];
                     break;
 
-                case 'MixedInferredReturnType':
-                    $ignored_issues = ['MixedReturnStatement'];
-                    break;
-
                 case 'MixedStringOffsetAssignment':
                     $ignored_issues = ['MixedAssignment'];
                     break;

diff --git a/tests/FunctionCallTest.php b/tests/FunctionCallTest.php
@@ -917,7 +917,7 @@ function portismaybeint(string $s) : ? int {
                     '$porta' => 'false|int|null',
                     '$porte' => 'false|int|null',
                 ],
-                'ignored_issues' => ['MixedReturnStatement', 'MixedInferredReturnType'],
+                'ignored_issues' => ['MixedReturnStatement'],
             ],
             'parseUrlComponent' => [
                 'code' => '<?php

diff --git a/tests/JsonOutputTest.php b/tests/JsonOutputTest.php
@@ -90,7 +90,7 @@ function fooFoo(int $a): string {
                     function fooFoo(int $a): int {
                         return $b + 1;
                     }',
-                'error_count' => 5,
+                'error_count' => 4,
                 'message' => 'Cannot find referenced variable $b',
                 'line' => 3,
                 'error' => '$b',
@@ -100,7 +100,7 @@ function fooFoo(int $a): int {
                     function fooFoo(Badger\Bodger $a): Badger\Bodger {
                         return $a;
                     }',
-                'error_count' => 3,
+                'error_count' => 2,
                 'message' => 'Class, interface or enum named Badger\\Bodger does not exist',
                 'line' => 2,
                 'error' => 'Badger\\Bodger',

diff --git a/tests/MagicPropertyTest.php b/tests/MagicPropertyTest.php
@@ -398,7 +398,7 @@ public function __get(string $name) : string {
                         }
                     }',
                 'assertions' => [],
-                'ignored_issues' => ['MixedReturnStatement', 'MixedInferredReturnType'],
+                'ignored_issues' => ['MixedReturnStatement'],
             ],
             'overrideInheritedProperty' => [
                 'code' => '<?php

diff --git a/tests/MethodCallTest.php b/tests/MethodCallTest.php
@@ -1150,7 +1150,7 @@ public static function createFromInterface(\DateTimeInterface $datetime): static
                         }
                     }',
                 'assertions' => [],
-                'ignored_issues' => ['MixedReturnStatement', 'MixedInferredReturnType'],
+                'ignored_issues' => ['MixedReturnStatement'],
                 'php_version' => '8.0',
             ],
             'nullsafeShortCircuit' => [
@@ -1342,7 +1342,7 @@ public function returns_nullable_class() {
                         }
                     }',
                 'error_message' => 'LessSpecificReturnStatement',
-                'ignored_issues' => ['MixedInferredReturnType', 'MixedReturnStatement', 'MixedMethodCall'],
+                'ignored_issues' => ['MixedReturnStatement', 'MixedMethodCall'],
             ],
             'undefinedVariableStaticCall' => [
                 'code' => '<?php

diff --git a/tests/ReferenceConstraintTest.php b/tests/ReferenceConstraintTest.php
@@ -81,7 +81,6 @@ function testRef() : array {
                     'MixedAssignment',
                     'MixedArrayAccess',
                     'MixedReturnStatement',
-                    'MixedInferredReturnType',
                     'MixedOperand',
                 ],
             ],