Merge branch 'fix_virtual' into fixes

zoonru · Dec 1, 2023 · 0652151 · 0652151
2 parents 1532e46 + eabb57f
commit 0652151
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -135,6 +135,7 @@ jobs:
       CHUNK_COUNT: "${{ matrix.count }}"
       CHUNK_NUMBER: "${{ matrix.chunk }}"
       PARALLEL_PROCESSES: 5
+      BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
     steps:
       - name: Set up PHP

diff --git a/bin/tests-github-actions.sh b/bin/tests-github-actions.sh
@@ -3,13 +3,15 @@
 set -eu
 
 function get_seeded_random() {
-  openssl enc -aes-256-ctr -pass pass:"vimeo/psalm" -nosalt </dev/zero 2>/dev/null
+  local -r branch_name="$1"
+  openssl enc -aes-256-ctr -pass pass:"$branch_name" -nosalt </dev/zero 2>/dev/null
 }
 
 function run {
   local -r chunk_count="$1"
   local -r chunk_number="$2"
   local -r parallel_processes="$3"
+  local -r branch_name="$4"
 
   local -r phpunit_cmd='
 echo "::group::{}";
@@ -23,7 +25,7 @@ exit "$exit_code"'
 
   mkdir -p build/parallel/ build/phpunit/logs/
 
-  find tests -name '*Test.php' | shuf --random-source=<(get_seeded_random) > build/tests_all
+  find tests -name '*Test.php' | shuf --random-source=<(get_seeded_random "$branch_name") > build/tests_all
   # split incorrectly splits the lines by byte size, which means that the number of tests per file are as evenly distributed as possible
   #split --number="l/$chunk_number/$chunk_count" build/tests_all > build/tests_split
   local -r lines=$(wc -l <build/tests_all)
@@ -47,5 +49,6 @@ exit "$exit_code"'
 if [ -z "${CHUNK_COUNT:-}" ]; then echo "Did not find env var CHUNK_COUNT."; exit 1; fi
 if [ -z "${CHUNK_NUMBER:-}" ]; then echo "Did not find env var CHUNK_NUMBER."; exit 1; fi
 if [ -z "${PARALLEL_PROCESSES:-}" ]; then echo "Did not find env var PARALLEL_PROCESSES."; exit 1; fi
+if [ -z "${BRANCH_NAME:-}" ]; then echo "Did not find env var BRANCH_NAME."; exit 1; fi
 
-run "$CHUNK_COUNT" "$CHUNK_NUMBER" "$PARALLEL_PROCESSES"
+run "$CHUNK_COUNT" "$CHUNK_NUMBER" "$PARALLEL_PROCESSES" "$BRANCH_NAME"
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -1552,7 +1552,7 @@
 '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
@@ -64,6 +64,10 @@
       '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
@@ -9937,7 +9937,7 @@
     '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/FunctionLikeAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
@@ -189,7 +189,7 @@ public function analyze(
                 || !in_array("UnusedPsalmSuppress", $storage->suppressed_issues)
             ) {
                 foreach ($storage->suppressed_issues as $offset => $issue_name) {
-                    IssueBuffer::addUnusedSuppression($this->getFilePath(), $offset, $issue_name);
+                    IssueBuffer::addUnusedSuppression($storage->location->file_path, $offset, $issue_name);
                 }
             }
         }

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NamedFunctionCallHandler.php
@@ -228,7 +228,38 @@ public static function handle(
         }
 
         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;
         }