From 4f25ccee400c3e2241d393eb60332e5edabcc67c Mon Sep 17 00:00:00 2001
From: kkmuffme <11071985+kkmuffme@users.noreply.github.com>
Date: Wed, 29 Nov 2023 08:41:54 +0100
Subject: [PATCH] update define types to be correct

---
 dictionaries/CallMap.php                      |  2 +-
 dictionaries/CallMap_73_delta.php             |  4 +++
 dictionaries/CallMap_historical.php           |  2 +-
 .../Call/NamedFunctionCallHandler.php         | 33 ++++++++++++++++++-
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
index 4e7166ec1..5f3dba9c8 100644
--- a/dictionaries/CallMap.php
+++ b/dictionaries/CallMap.php
@@ -1552,7 +1552,7 @@ return [
 'decbin' => ['string', 'num'=>'int'],
 'dechex' => ['string', 'num'=>'int'],
 'decoct' => ['string', 'num'=>'int'],
-'define' => ['bool', 'constant_name'=>'string', 'value'=>'mixed', 'case_insensitive='=>'bool'],
+'define' => ['bool', 'constant_name'=>'string', 'value'=>'array|scalar|null', 'case_insensitive='=>'false'],
 'define_syslog_variables' => ['void'],
 'defined' => ['bool', 'constant_name'=>'string'],
 'deflate_add' => ['string|false', 'context'=>'DeflateContext', 'data'=>'string', 'flush_mode='=>'int'],
diff --git a/dictionaries/CallMap_73_delta.php b/dictionaries/CallMap_73_delta.php
index d79026c38..6352fa062 100644
--- a/dictionaries/CallMap_73_delta.php
+++ b/dictionaries/CallMap_73_delta.php
@@ -64,6 +64,10 @@ return [
       'old' => ['int', 'scale'=>'int'],
       'new' => ['int', 'scale='=>'int'],
     ],
+    'define' => [
+        'old' => ['bool', 'constant_name'=>'string', 'value'=>'array|scalar|null', 'case_insensitive='=>'bool'],
+        'new' => ['bool', 'constant_name'=>'string', 'value'=>'array|scalar|null', 'case_insensitive='=>'false'],
+    ],
     'ldap_compare' => [
       'old' => ['bool|int', 'ldap'=>'resource', 'dn'=>'string', 'attribute'=>'string', 'value'=>'string'],
       'new' => ['bool|int', 'ldap'=>'resource', 'dn'=>'string', 'attribute'=>'string', 'value'=>'string', 'controls='=>'array'],
diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
index afb21ba72..864b668bd 100644
--- a/dictionaries/CallMap_historical.php
+++ b/dictionaries/CallMap_historical.php
@@ -9937,7 +9937,7 @@ return [
     'decbin' => ['string', 'num'=>'int'],
     'dechex' => ['string', 'num'=>'int'],
     'decoct' => ['string', 'num'=>'int'],
-    'define' => ['bool', 'constant_name'=>'string', 'value'=>'mixed', 'case_insensitive='=>'bool'],
+    'define' => ['bool', 'constant_name'=>'string', 'value'=>'array|scalar|null', 'case_insensitive='=>'bool'],
     'define_syslog_variables' => ['void'],
     'defined' => ['bool', 'constant_name'=>'string'],
     'deflate_add' => ['string|false', 'context'=>'resource', 'data'=>'string', 'flush_mode='=>'int'],
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php
index 961662f70..514df1a55 100644
--- a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php
+++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php
@@ -225,7 +225,38 @@ final class NamedFunctionCallHandler
         }
 
         if ($function_id === 'defined') {
-            $context->check_consts = false;
+            if ($first_arg && !$context->inside_negation) {
+                $fq_const_name = ConstFetchAnalyzer::getConstName(
+                    $first_arg->value,
+                    $statements_analyzer->node_data,
+                    $codebase,
+                    $statements_analyzer->getAliases(),
+                );
+
+                if ($fq_const_name !== null) {
+                    $const_type = ConstFetchAnalyzer::getConstType(
+                        $statements_analyzer,
+                        $fq_const_name,
+                        true,
+                        $context,
+                    );
+
+                    if (!$const_type) {
+                        ConstFetchAnalyzer::setConstType(
+                            $statements_analyzer,
+                            $fq_const_name,
+                            Type::getMixed(),
+                            $context,
+                        );
+
+                        $context->check_consts = false;
+                    }
+                } else {
+                    $context->check_consts = false;
+                }
+            } else {
+                $context->check_consts = false;
+            }
             return;
         }