Configure default baseline

vimeo · Feb 11, 2024 · f566167 · f566167
1 parent 346f2d8
commit f566167
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -130,7 +130,7 @@
 class Config
 {
     private const DEFAULT_FILE_NAME = 'psalm.xml';
-    private const DEFAULT_BASELINE_NAME = 'psalm-baseline.xml';
+    public const DEFAULT_BASELINE_NAME = 'psalm-baseline.xml';
     public const CONFIG_NAMESPACE = 'https://getpsalm.org/schema/config';
     public const REPORT_INFO = 'info';
     public const REPORT_ERROR = 'error';
@@ -549,8 +549,8 @@ class Config
      */
     public $hash = '';
 
-    /** @var string */
-    public $error_baseline = self::DEFAULT_BASELINE_NAME;
+    /** @var null|string */
+    public $error_baseline = null;
 
     /**
      * @var bool

diff --git a/src/Psalm/Internal/Cli/Psalm.php b/src/Psalm/Internal/Cli/Psalm.php
@@ -649,7 +649,7 @@ private static function generateBaseline(
     ): array {
         fwrite(STDERR, 'Writing error baseline to file...' . PHP_EOL);
 
-        $errorBaseline = ((string) $options['set-baseline']) ?: $config->error_baseline;
+        $errorBaseline = ((string) $options['set-baseline']) ?: $config->error_baseline ?: Config::DEFAULT_BASELINE_NAME;
 
         try {
             $issue_baseline = ErrorBaseline::read(
@@ -660,7 +660,6 @@ private static function generateBaseline(
             $issue_baseline = [];
         }
 
-        echo $errorBaseline;
         ErrorBaseline::create(
             new FileProvider,
             $errorBaseline,
@@ -670,7 +669,7 @@ private static function generateBaseline(
 
         fwrite(STDERR, "Baseline saved to $errorBaseline.");
 
-        if ($options['set-baseline'] && $options['set-baseline'] !== $config->error_baseline) {
+        if ($errorBaseline !== $config->error_baseline) {
             CliUtils::updateConfigFile(
                 $config,
                 $path_to_config ?? $current_dir,