From def7293b858e9ea562b953ca52a602a7a14309c5 Mon Sep 17 00:00:00 2001
From: Daniil Gentili <daniil@daniil.it>
Date: Fri, 7 Feb 2025 21:37:20 +0100
Subject: [PATCH] Fix tests

---
 tests/ReportOutputTest.php                    | 19 ++++++++++---------
 ...nditional_constant_define_inferred.phpstub |  7 +++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tests/ReportOutputTest.php b/tests/ReportOutputTest.php
index 2b32e2abeea..5c4292f573e 100644
--- a/tests/ReportOutputTest.php
+++ b/tests/ReportOutputTest.php
@@ -1029,7 +1029,7 @@ public function testConsoleReportNoSnippet(): void
             ERROR: MixedReturnStatement - somefile.php:3:10 - Could not infer a return type (see https://psalm.dev/138)
 
 
-            ERROR: UndefinedConstant - somefile.php:8:6 - Const CHANGE_ME is not defined (see https://psalm.dev/020)
+            ERROR: UndefinedConstant - somefile.php:8:6 - Const CHANGE_ME is not defined, consider enabling the allConstantsGlobal config option if scanning legacy codebases (see https://psalm.dev/020)
 
 
             INFO: PossiblyUndefinedGlobalVariable - somefile.php:17:6 - Possibly undefined global variable $a, first seen on line 11 (see https://psalm.dev/126)
@@ -1087,14 +1087,15 @@ public function testCompactReport(): void
             <<<'EOF'
             FILE: somefile.php
 
-            +----------+------+---------------------------------+--------------------------------------------------------------+
-            | SEVERITY | LINE | ISSUE                           | DESCRIPTION                                                  |
-            +----------+------+---------------------------------+--------------------------------------------------------------+
-            | ERROR    | 3    | UndefinedVariable               | Cannot find referenced variable $as_you_____type             |
-            | ERROR    | 3    | MixedReturnStatement            | Could not infer a return type                                |
-            | ERROR    | 8    | UndefinedConstant               | Const CHANGE_ME is not defined, consider enabling the allConstantsGlobal config option if scanning legacy codebases |
-            | INFO     | 17   | PossiblyUndefinedGlobalVariable | Possibly undefined global variable $a, first seen on line 11 |
-            +----------+------+---------------------------------+--------------------------------------------------------------+
+            +----------+------+---------------------------------+------------------------------------------------------------------------+
+            | SEVERITY | LINE | ISSUE                           | DESCRIPTION                                                            |
+            +----------+------+---------------------------------+------------------------------------------------------------------------+
+            | ERROR    | 3    | UndefinedVariable               | Cannot find referenced variable $as_you_____type                       |
+            | ERROR    | 3    | MixedReturnStatement            | Could not infer a return type                                          |
+            | ERROR    | 8    | UndefinedConstant               | Const CHANGE_ME is not defined, consider enabling the allConstantsGlob |
+            |          |      |                                 | al config option if scanning legacy codebases                          |
+            | INFO     | 17   | PossiblyUndefinedGlobalVariable | Possibly undefined global variable $a, first seen on line 11           |
+            +----------+------+---------------------------------+------------------------------------------------------------------------+
 
             EOF,
             $this->toUnixLineEndings(IssueBuffer::getOutput(IssueBuffer::getIssuesData(), $compact_report_options)),
diff --git a/tests/fixtures/stubs/conditional_constant_define_inferred.phpstub b/tests/fixtures/stubs/conditional_constant_define_inferred.phpstub
index af6d3d6abeb..409f93f7a8b 100644
--- a/tests/fixtures/stubs/conditional_constant_define_inferred.phpstub
+++ b/tests/fixtures/stubs/conditional_constant_define_inferred.phpstub
@@ -1,6 +1,9 @@
 <?php
 
-if (!defined('CODE_DIR')) {
-   $codeDir = 1;
+/** @return int */
+function getInteger(): int { return 1; }
+
+if (!defined('CODE_DIR') && !defined('PSALM_VERSION')) {
+   $codeDir = getInteger();
    define('CODE_DIR', $codeDir);
 }