From d786e9deef3ab486779bd77686a081151e852fc4 Mon Sep 17 00:00:00 2001
From: orklah <ronan_morin@hotmail.com>
Date: Fri, 12 Nov 2021 13:19:24 +0100
Subject: [PATCH] deprecate attribute forbidEcho

---
 config.xsd                                 | 8 +++++++-
 docs/running_psalm/issues/ForbiddenEcho.md | 2 +-
 src/Psalm/Config.php                       | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/config.xsd b/config.xsd
index c119abdda45..afd6069e5b0 100644
--- a/config.xsd
+++ b/config.xsd
@@ -67,7 +67,13 @@
         <xs:attribute name="findUnusedCode" type="xs:boolean" default="false" />
         <xs:attribute name="findUnusedVariablesAndParams" type="xs:boolean" default="false" />
         <xs:attribute name="findUnusedPsalmSuppress" type="xs:boolean" default="false" />
-        <xs:attribute name="forbidEcho" type="xs:boolean" default="false" />
+        <xs:attribute name="forbidEcho" type="xs:boolean" default="false">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">
+                    Deprecated. Will be replaced by adding echo to forbiddenFunctions in Psalm 5.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="hideExternalErrors" type="xs:boolean" default="false" />
         <xs:attribute name="hoistConstants" type="xs:boolean" default="false" />
         <xs:attribute name="ignoreInternalFunctionFalseReturn" type="xs:boolean" default="true" />
diff --git a/docs/running_psalm/issues/ForbiddenEcho.md b/docs/running_psalm/issues/ForbiddenEcho.md
index 2a56883874d..4aedd3ee055 100644
--- a/docs/running_psalm/issues/ForbiddenEcho.md
+++ b/docs/running_psalm/issues/ForbiddenEcho.md
@@ -1,7 +1,7 @@
 # ForbiddenEcho
 
 Emitted when Psalm encounters an echo statement and the `forbidEcho` flag in your config is set to `true`
-
+This issue is deprecated and will be removed in Psalm 5. Adding echo to forbiddenFunctions in config will result in ForbiddenCode issue instead
 ```php
 <?php
 
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
index 511b0a5495e..2e16c505ec4 100644
--- a/src/Psalm/Config.php
+++ b/src/Psalm/Config.php
@@ -792,6 +792,7 @@ private static function processConfigDeprecations(
         $deprecated_attributes = [
             'allowCoercionFromStringToClassConst',
             'allowPhpStormGenerics',
+            'forbidEcho'
         ];
 
         $deprecated_elements = [