From 01868a9766c8b1207d4f8f3ab3bcfb0425146884 Mon Sep 17 00:00:00 2001 From: AndrolGenhald Date: Sat, 22 Jan 2022 16:03:35 -0600 Subject: [PATCH] Mark loadXdebugStub as deprecated (removed in #7107). --- config.xsd | 5 +++++ psalm-baseline.xml | 9 ++++++++- src/Psalm/Config.php | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/config.xsd b/config.xsd index 7d076a14b88..01115776b3d 100644 --- a/config.xsd +++ b/config.xsd @@ -85,6 +85,11 @@ Default is runtime-specific: if not present, Psalm will only load the Xdebug stub if psalm has unloaded the extension. + + + + Deprecated. In Psalm 5 extensions will be loaded based on composer.json and overridden with enableExtensions/disableExtensions. + diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 1a2dc6c1b8e..bd1946230cc 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -26,13 +26,14 @@ - + $codebase->php_major_version $codebase->php_major_version $codebase->php_major_version $codebase->php_major_version $codebase->php_minor_version $codebase->php_minor_version + $this->load_xdebug_stub getAdditionalFileExtensions @@ -386,6 +387,12 @@ $stmt->expr->getArgs()[0] + + + $config->load_xdebug_stub + $config->load_xdebug_stub + + new TEmpty() diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php index 6392d72d449..3cf99bb8bfb 100644 --- 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;