From dbf47b16c3b093f2e7cfe3a1d38764024e726c77 Mon Sep 17 00:00:00 2001
From: orklah <ronan_morin@hotmail.com>
Date: Sat, 12 Feb 2022 09:30:37 +0100
Subject: [PATCH 1/2] deprecate totallyTyped

---
 config.xsd           | 13 ++++++++++++-
 src/Psalm/Config.php |  4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/config.xsd b/config.xsd
index a4ba114c2b5..9805ba361fe 100644
--- a/config.xsd
+++ b/config.xsd
@@ -97,7 +97,18 @@
         <xs:attribute name="resolveFromConfigFile" type="xs:boolean" default="true" />
         <xs:attribute name="strictBinaryOperands" type="xs:boolean" default="false" />
         <xs:attribute name="throwExceptionOnError" type="xs:boolean" default="false" />
-        <xs:attribute name="totallyTyped" type="xs:boolean" default="false" />
+        <xs:attribute name="totallyTyped" type="xs:boolean" default="false">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">
+                    Setting `totallyTyped` to `"true"` is equivalent to setting `errorLevel` to `"1"`. Setting `totallyTyped` to `"false"` is equivalent to setting `errorLevel` to `"2"` and `reportMixedIssues` to `"false"`
+                </xs:documentation>
+
+                <!-- note: for PHPStorm to mark the attribute as deprecated the doc entry has to be *single line* and start with the word `deprecated` -->
+                <xs:documentation xml:lang="en">
+                    Deprecated. Replaced by `errorLevel` and `reportMixedIssues`.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="errorLevel" type="xs:integer" default="2" />
         <xs:attribute name="reportMixedIssues" type="xs:boolean" default="true" />
         <xs:attribute name="useDocblockTypes" type="xs:boolean" default="true" />
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
index f87ea240977..415e254e852 100644
--- a/src/Psalm/Config.php
+++ b/src/Psalm/Config.php
@@ -814,7 +814,9 @@ private static function processConfigDeprecations(
         $deprecated_attributes = [
             'allowCoercionFromStringToClassConst',
             'allowPhpStormGenerics',
-            'forbidEcho'
+            'forbidEcho',
+            'loadXdebugStub',
+            'totallyTyped'
         ];
 
         $deprecated_elements = [

From 24ae96b373cb44186c58360543dcf0987436df0c Mon Sep 17 00:00:00 2001
From: orklah <ronan_morin@hotmail.com>
Date: Sat, 12 Feb 2022 09:51:06 +0100
Subject: [PATCH 2/2] remove usage of totallyTyped internally

---
 bin/phar.psalm.xml                             | 2 +-
 tests/Config/ConfigFileTest.php                | 8 ++------
 tests/fixtures/DestructiveAutoloader/psalm.xml | 1 -
 tests/fixtures/DummyProject/psalm.xml          | 1 -
 tests/fixtures/ModularConfig/psalm.xml         | 1 -
 tests/fixtures/SuicidalAutoloader/psalm.xml    | 1 -
 6 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/bin/phar.psalm.xml b/bin/phar.psalm.xml
index 01098a2d88b..7fd4c48868e 100644
--- a/bin/phar.psalm.xml
+++ b/bin/phar.psalm.xml
@@ -2,7 +2,7 @@
 <psalm
     name="Psalm for Psalm"
     useDocblockTypes="true"
-    totallyTyped="true"
+    errorLevel=1
     strictBinaryOperands="false"
     rememberPropertyAssignmentsAfterCall="true"
     throwExceptionOnError="0"
diff --git a/tests/Config/ConfigFileTest.php b/tests/Config/ConfigFileTest.php
index a6b5f4cd503..277f197aef3 100644
--- a/tests/Config/ConfigFileTest.php
+++ b/tests/Config/ConfigFileTest.php
@@ -174,9 +174,7 @@ public function removeKillsSpecifiedPluginWithOneRemaining(): void
     {
         $noPlugins = trim('
             <?xml version="1.0"?>
-            <psalm
-                totallyTyped="false"
-            >
+            <psalm>
                 <plugins>
                     <pluginClass class="d\e\f"/>
                 </plugins>
@@ -185,9 +183,7 @@ public function removeKillsSpecifiedPluginWithOneRemaining(): void
 
         $abcEnabled = trim('
             <?xml version="1.0"?>
-            <psalm
-                totallyTyped="false"
-            >
+            <psalm>
                 <plugins>
                     <pluginClass class="a\b\c"/>
                     <pluginClass class="d\e\f"/>
diff --git a/tests/fixtures/DestructiveAutoloader/psalm.xml b/tests/fixtures/DestructiveAutoloader/psalm.xml
index ec68f8f2e72..3a4cc64a8af 100644
--- a/tests/fixtures/DestructiveAutoloader/psalm.xml
+++ b/tests/fixtures/DestructiveAutoloader/psalm.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="true"
     autoloader="autoloader.php"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/tests/fixtures/DummyProject/psalm.xml b/tests/fixtures/DummyProject/psalm.xml
index ba8191451d8..2b18be6acda 100644
--- a/tests/fixtures/DummyProject/psalm.xml
+++ b/tests/fixtures/DummyProject/psalm.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
diff --git a/tests/fixtures/ModularConfig/psalm.xml b/tests/fixtures/ModularConfig/psalm.xml
index ded23a9be02..e36faa8769e 100644
--- a/tests/fixtures/ModularConfig/psalm.xml
+++ b/tests/fixtures/ModularConfig/psalm.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
diff --git a/tests/fixtures/SuicidalAutoloader/psalm.xml b/tests/fixtures/SuicidalAutoloader/psalm.xml
index ec68f8f2e72..3a4cc64a8af 100644
--- a/tests/fixtures/SuicidalAutoloader/psalm.xml
+++ b/tests/fixtures/SuicidalAutoloader/psalm.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="true"
     autoloader="autoloader.php"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"