From 52f9225356774accce656af9bd9210b5444019b9 Mon Sep 17 00:00:00 2001
From: Matthew Brown <github@muglug.com>
Date: Thu, 30 Nov 2017 00:01:41 -0500
Subject: [PATCH] Add separate issues for implemented return type mismatch

---
 config.xsd                                            | 2 ++
 src/Psalm/Checker/FunctionLikeChecker.php             | 6 ++++--
 src/Psalm/Issue/ImplementedReturnTypeMismatch.php     | 6 ++++++
 src/Psalm/Issue/MoreSpecificImplementedReturnType.php | 6 ++++++
 tests/InterfaceTest.php                               | 2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 src/Psalm/Issue/ImplementedReturnTypeMismatch.php
 create mode 100644 src/Psalm/Issue/MoreSpecificImplementedReturnType.php

diff --git a/config.xsd b/config.xsd
index bd74acd5e..e9f11d92c 100644
--- a/config.xsd
+++ b/config.xsd
@@ -95,6 +95,7 @@
             <xs:element name="DuplicateClass" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="EmptyArrayAccess" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="ForbiddenCode" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="ImplementedReturnTypeMismatch" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="ImplicitToStringCast" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="InaccessibleClassConstant" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="InaccessibleMethod" type="IssueHandlerType" minOccurs="0" />
@@ -144,6 +145,7 @@
             <xs:element name="MixedStringOffsetAssignment" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MixedTypeCoercion" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MoreSpecificReturnType" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="MoreSpecificImplementedReturnType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="NoInterfaceProperties" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="NonStaticSelfCall" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="NullArgument" type="IssueHandlerType" minOccurs="0" />
diff --git a/src/Psalm/Checker/FunctionLikeChecker.php b/src/Psalm/Checker/FunctionLikeChecker.php
index 8fffa4eeb..d6056817e 100644
--- a/src/Psalm/Checker/FunctionLikeChecker.php
+++ b/src/Psalm/Checker/FunctionLikeChecker.php
@@ -13,6 +13,7 @@ use Psalm\Context;
 use Psalm\EffectsAnalyser;
 use Psalm\FileManipulation\FunctionDocblockManipulator;
 use Psalm\FunctionLikeParameter;
+use Psalm\Issue\ImplementedReturnTypeMismatch;
 use Psalm\Issue\InvalidDocblock;
 use Psalm\Issue\InvalidParamDefault;
 use Psalm\Issue\InvalidReturnType;
@@ -22,6 +23,7 @@ use Psalm\Issue\MethodSignatureMismatch;
 use Psalm\Issue\MissingClosureReturnType;
 use Psalm\Issue\MissingReturnType;
 use Psalm\Issue\MixedInferredReturnType;
+use Psalm\Issue\MoreSpecificImplementedReturnType;
 use Psalm\Issue\MoreSpecificReturnType;
 use Psalm\Issue\OverriddenMethodAccess;
 use Psalm\Issue\PossiblyUnusedVariable;
@@ -643,7 +645,7 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
                 // is the declared return type more specific than the inferred one?
                 if ($type_coerced) {
                     if (IssueBuffer::accepts(
-                        new MoreSpecificReturnType(
+                        new MoreSpecificImplementedReturnType(
                             'The return type \'' . $guide_method_storage->return_type
                             . '\' for ' . $cased_guide_method_id . ' is more specific than the implemented '
                             . 'return type for ' . $implementer_declaring_method_id . ' \''
@@ -656,7 +658,7 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
                     }
                 } else {
                     if (IssueBuffer::accepts(
-                        new InvalidReturnType(
+                        new ImplementedReturnTypeMismatch(
                             'The return type \'' . $guide_method_storage->return_type
                             . '\' for ' . $cased_guide_method_id . ' is different to the implemented '
                             . 'return type for ' . $implementer_declaring_method_id . ' \''
diff --git a/src/Psalm/Issue/ImplementedReturnTypeMismatch.php b/src/Psalm/Issue/ImplementedReturnTypeMismatch.php
new file mode 100644
index 000000000..5d7d9fea7
--- /dev/null
+++ b/src/Psalm/Issue/ImplementedReturnTypeMismatch.php
@@ -0,0 +1,6 @@
+<?php
+namespace Psalm\Issue;
+
+class ImplementedReturnTypeMismatch extends CodeError
+{
+}
diff --git a/src/Psalm/Issue/MoreSpecificImplementedReturnType.php b/src/Psalm/Issue/MoreSpecificImplementedReturnType.php
new file mode 100644
index 000000000..c6daaa65d
--- /dev/null
+++ b/src/Psalm/Issue/MoreSpecificImplementedReturnType.php
@@ -0,0 +1,6 @@
+<?php
+namespace Psalm\Issue;
+
+class MoreSpecificImplementedReturnType extends CodeError
+{
+}
diff --git a/tests/InterfaceTest.php b/tests/InterfaceTest.php
index 88dc1962b..7f12890b0 100644
--- a/tests/InterfaceTest.php
+++ b/tests/InterfaceTest.php
@@ -416,7 +416,7 @@ class InterfaceTest extends TestCase
                         return "hello";
                       }
                     }',
-                'error_message' => 'InvalidReturnType',
+                'error_message' => 'ImplementedReturnTypeMismatch',
             ],
             'abstractInterfaceImplementsButCallUndefinedMethod' => [
                 '<?php