diff --git a/config.xsd b/config.xsd index a909e644933..a4f4b5042f5 100644 --- a/config.xsd +++ b/config.xsd @@ -49,18 +49,6 @@ - - - - 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/docs/running_psalm/configuration.md b/docs/running_psalm/configuration.md index dae932211a6..d50b3633e32 100644 --- a/docs/running_psalm/configuration.md +++ b/docs/running_psalm/configuration.md @@ -246,17 +246,6 @@ When `true`, Psalm will attempt to find all unused code (including unused variab ``` When `true`, Psalm will report all `@psalm-suppress` annotations that aren't used, the equivalent of running with `--find-unused-psalm-suppress`. Defaults to `false`. -#### loadXdebugStub -```xml - -``` -Deprecated, use <enableExtensions> instead. -If not present, Psalm will only load the Xdebug stub if Psalm has unloaded the extension. -When `true`, Psalm will load the Xdebug extension stub (as the extension is unloaded when Psalm runs). -Setting to `false` prevents the stub from loading. - #### ensureArrayStringOffsetsExist ```xml - + $comment_block->tags['variablesfrom'][0] @@ -24,9 +24,6 @@ getAdditionalFileTypeAnalyzers getAdditionalFileTypeScanners - - $this->load_xdebug_stub - @@ -203,12 +200,6 @@ $stmt->expr->getArgs()[0] - - - $config->load_xdebug_stub - $config->load_xdebug_stub - - $callables[0] @@ -286,8 +277,7 @@ $storage->template_extended_count - - $imported_type_data[3] + $l[4] $r[4] $var_line_parts[0] diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php index 06c89692b43..44ac5f26387 100644 --- a/src/Psalm/Config.php +++ b/src/Psalm/Config.php @@ -196,15 +196,6 @@ class Config */ public $throw_exception = false; - /** - * Whether or not to load Xdebug stub - * - * @deprecated going to be removed in Psalm 5 - * - * @var bool|null - */ - public $load_xdebug_stub; - /** * The directory to store PHP Parser (and other) caches * @@ -957,7 +948,6 @@ private static function fromXmlAndPaths( 'ignoreInternalFunctionFalseReturn' => 'ignore_internal_falsable_issues', 'ignoreInternalFunctionNullReturn' => 'ignore_internal_nullable_issues', 'includePhpVersionsInErrorBaseline' => 'include_php_versions_in_error_baseline', - 'loadXdebugStub' => 'load_xdebug_stub', 'ensureArrayStringOffsetsExist' => 'ensure_array_string_offsets_exist', 'ensureArrayIntOffsetsExist' => 'ensure_array_int_offsets_exist', 'reportMixedIssues' => 'show_mixed_issues', @@ -1004,10 +994,6 @@ private static function fromXmlAndPaths( $config->php_extensions[$ext] = isset($composer_json["require"]["ext-$ext"]); } - if ($config->load_xdebug_stub !== null) { - $config->php_extensions["xdebug"] = $config->load_xdebug_stub; - } - if (isset($config_xml->enableExtensions) && isset($config_xml->enableExtensions->extension)) { foreach ($config_xml->enableExtensions->extension as $extension) { assert(isset($extension["name"])); diff --git a/src/Psalm/Internal/Cli/Psalm.php b/src/Psalm/Internal/Cli/Psalm.php index 70893dddc4a..2063355c711 100644 --- a/src/Psalm/Internal/Cli/Psalm.php +++ b/src/Psalm/Internal/Cli/Psalm.php @@ -253,7 +253,7 @@ public static function run(array $argv): void self::emitMacPcreWarning($options, $threads); - self::restart($options, $config, $threads); + self::restart($options, $threads); if (isset($options['debug-emitted-issues'])) { $config->debug_emitted_issues = true; @@ -882,7 +882,7 @@ private static function emitMacPcreWarning(array $options, int $threads): void } } - private static function restart(array $options, Config $config, int $threads): void + private static function restart(array $options, int $threads): void { $ini_handler = new PsalmRestarter('PSALM'); @@ -907,10 +907,6 @@ private static function restart(array $options, Config $config, int $threads): v // If Xdebug is enabled, restart without it $ini_handler->check(); - - if ($config->load_xdebug_stub === null && PsalmRestarter::getSkippedVersion() !== '') { - $config->load_xdebug_stub = true; - } } private static function detectThreads(array $options, Config $config, bool $in_ci): int