Merge pull request #9135 from lptn/unify-deprecation-messages

Unify warning messages for deprecated config variables

Author: orklah

src/Psalm/Config.php

@@ -2243,9 +2243,8 @@ public function visitStubFiles(Codebase $codebase, ?Progress $progress = null):
             $is_stub_already_loaded = in_array($ext_stub_path, $this->internal_stubs, true);
             if (! $is_stub_already_loaded && extension_loaded($ext_name)) {
                 $this->internal_stubs[] = $ext_stub_path;
-                $progress->write("Deprecation: Psalm stubs for ext-$ext_name loaded using legacy way."
-                    . " Instead, please declare ext-$ext_name as dependency in composer.json"
-                    . " or use <enableExtensions> and/or <disableExtensions> directives in Psalm config.\n");
+                $this->config_warnings[] = "Psalm 6 will not automatically load stubs for ext-$ext_name."
+                    . " You should explicitly enable or disable this ext in composer.json or Psalm config.";
             }
         }
 

src/Psalm/Internal/Analyzer/ProjectAnalyzer.php

@@ -564,8 +564,8 @@ private function generatePHPVersionMessage(): string
             $source,
         );
 
-        if (count($codebase->config->php_extensions) > 0) {
-            $enabled_extensions_names = array_keys(array_filter($codebase->config->php_extensions));
+        $enabled_extensions_names = array_keys(array_filter($codebase->config->php_extensions));
+        if (count($enabled_extensions_names) > 0) {
             $message .= ' Enabled extensions: ' . implode(', ', $enabled_extensions_names);
         }
 

src/Psalm/Internal/Cli/Psalm.php

@@ -1155,7 +1155,7 @@ private static function configureShepherd(Config $config, array $options, array
         if (is_string(getenv('PSALM_SHEPHERD_HOST'))) { // remove this block in Psalm 6
             fwrite(
                 STDERR,
-                'PSALM_SHEPHERD_HOST env variable is deprecated and will be removed in Psalm 6.'
+                'Warning: PSALM_SHEPHERD_HOST env variable will be removed in Psalm 6.'
                 .' Please use "--shepherd" cli option or PSALM_SHEPHERD env variable'
                 .' to specify a custom Shepherd host/endpoint.'
                 . PHP_EOL,

tests/EndToEnd/PsalmEndToEndTest.php

@@ -20,7 +20,6 @@
 use function readdir;
 use function rmdir;
 use function str_replace;
-use function substr_count;
 use function sys_get_temp_dir;
 use function tempnam;
 use function unlink;
@@ -168,7 +167,7 @@ public function testPsalmDiff(): void
         $this->assertStringContainsString('InvalidReturnType', $result['STDOUT']);
         $this->assertStringContainsString('InvalidReturnStatement', $result['STDOUT']);
         $this->assertStringContainsString('3 errors', $result['STDOUT']);
-        $this->assertEquals(1, substr_count($result['STDERR'], 'E')); // Should only have 'E' from 'Extensions' in version message
+        $this->assertStringNotContainsString('E', $result['STDERR']);
 
         $this->assertSame(2, $result['CODE']);