Merge pull request #7466 from AndrolGenhald/loadXdebugStub-deprecation

Mark loadXdebugStub as deprecated (removed in #7107).
vimeo · Jan 22, 2022 · 67c4a7e · 67c4a7e
2 parents 0bf3c43 + 01868a9
commit 67c4a7e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/config.xsd b/config.xsd
@@ -85,6 +85,11 @@
                 <xs:documentation xml:lang="en">
                     Default is runtime-specific: if not present, Psalm will only load the Xdebug stub if psalm has unloaded the extension.
                 </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. In Psalm 5 extensions will be loaded based on composer.json and overridden with enableExtensions/disableExtensions.
+                </xs:documentation>
             </xs:annotation>
         </xs:attribute>
         <xs:attribute name="memoizeMethodCallResults" type="xs:boolean" default="false" />

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -26,13 +26,14 @@
     </PossiblyUnusedProperty>
   </file>
   <file src="src/Psalm/Config.php">
-    <DeprecatedProperty occurrences="6">
+    <DeprecatedProperty occurrences="7">
       <code>$codebase-&gt;php_major_version</code>
       <code>$codebase-&gt;php_major_version</code>
       <code>$codebase-&gt;php_major_version</code>
       <code>$codebase-&gt;php_major_version</code>
       <code>$codebase-&gt;php_minor_version</code>
       <code>$codebase-&gt;php_minor_version</code>
+      <code>$this-&gt;load_xdebug_stub</code>
     </DeprecatedProperty>
     <DeprecatedMethod occurrences="3">
       <code>getAdditionalFileExtensions</code>
@@ -386,6 +387,12 @@
       <code>$stmt-&gt;expr-&gt;getArgs()[0]</code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
+  <file src="src/Psalm/Internal/Cli/Psalm.php">
+    <DeprecatedProperty occurrences="2">
+      <code>$config-&gt;load_xdebug_stub</code>
+      <code>$config-&gt;load_xdebug_stub</code>
+    </DeprecatedProperty>
+  </file>
   <file src="src/Psalm/Internal/Codebase/ConstantTypeResolver.php">
     <DeprecatedClass occurrences="2">
       <code>new TEmpty()</code>

diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -195,6 +195,8 @@ class Config
     /**
      * Whether or not to load Xdebug stub
      *
+     * @deprecated going to be removed in Psalm 5
+     *
      * @var bool|null
      */
     public $load_xdebug_stub;