Merge pull request #9405 from weirdan/callmap-is-always-non-empty

vimeo · Feb 26, 2023 · a0ea8eb · a0ea8eb
2 parents c0e757c + e743cd9
commit a0ea8eb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/dictionaries/InternalTaintSinkMap.php b/dictionaries/InternalTaintSinkMap.php
@@ -5,7 +5,7 @@
 // This maps internal function names to sink types that we don’t want to end up there
 
 /**
- * @var array<string, list<list<TaintKind::*>>>
+ * @var non-empty-array<string, non-empty-list<list<TaintKind::*>>>
  */
 return [
 'exec' => [['shell']],

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -137,7 +137,6 @@
       <code>$args[0]</code>
       <code>$args[0]</code>
       <code>$args[1]</code>
-      <code>$callmap_callables[0]</code>
       <code>$method_name</code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
@@ -257,17 +256,6 @@
       <code>$stub</code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
-  <file src="src/Psalm/Internal/Codebase/InternalCallMapHandler.php">
-    <PossiblyUndefinedIntArrayOffset>
-      <code>$callables[0]</code>
-      <code>$callables[0]</code>
-    </PossiblyUndefinedIntArrayOffset>
-  </file>
-  <file src="src/Psalm/Internal/Codebase/Methods.php">
-    <PossiblyUndefinedIntArrayOffset>
-      <code>$function_callables[0]</code>
-    </PossiblyUndefinedIntArrayOffset>
-  </file>
   <file src="src/Psalm/Internal/Codebase/Properties.php">
     <PossiblyUndefinedIntArrayOffset>
       <code>$property_name</code>

diff --git a/src/Psalm/Internal/Codebase/InternalCallMapHandler.php b/src/Psalm/Internal/Codebase/InternalCallMapHandler.php
@@ -43,19 +43,19 @@ class InternalCallMapHandler
     private static ?int $loaded_php_minor_version = null;
 
     /**
-     * @var array<lowercase-string, array<int|string,string>>|null
+     * @var non-empty-array<lowercase-string, array<int|string,string>>|null
      */
     private static ?array $call_map = null;
 
     /**
-     * @var array<list<TCallable>>|null
+     * @var array<string, non-empty-list<TCallable>>|null
      */
     private static ?array $call_map_callables = [];
 
     /**
-     * @var array<string, list<list<TaintKind::*>>>
+     * @var non-empty-array<string, non-empty-list<list<TaintKind::*>>>|null
      */
-    private static array $taint_sink_map = [];
+    private static ?array $taint_sink_map = null;
 
     /**
      * @param  list<PhpParser\Node\Arg>   $args
@@ -84,7 +84,7 @@ public static function getCallableFromCallMapById(
     }
 
     /**
-     * @param  array<int, TCallable>  $callables
+     * @param  non-empty-list<TCallable>  $callables
      * @param  list<PhpParser\Node\Arg>                 $args
      */
     public static function getMatchingCallableFromCallMapOptions(
@@ -216,7 +216,7 @@ public static function getMatchingCallableFromCallMapOptions(
     }
 
     /**
-     * @return list<TCallable>|null
+     * @return non-empty-list<TCallable>|null
      */
     public static function getCallablesFromCallMap(string $function_id): ?array
     {
@@ -332,7 +332,9 @@ public static function getCallablesFromCallMap(string $function_id): ?array
     /**
      * Gets the method/function call map
      *
-     * @return array<string, array<int|string, string>>
+     * @return non-empty-array<string, array<int|string, string>>
+     * @psalm-assert !null self::$taint_sink_map
+     * @psalm-assert !null self::$call_map
      */
     public static function getCallMap(): array
     {
@@ -353,26 +355,31 @@ public static function getCallMap(): array
             return self::$call_map;
         }
 
-        /** @var array<string, array<int|string, string>> */
-        $call_map = require(dirname(__DIR__, 4) . '/dictionaries/CallMap.php');
+        /** @var non-empty-array<string, array<int|string, string>> */
+        $call_map_data = require(dirname(__DIR__, 4) . '/dictionaries/CallMap.php');
 
-        self::$call_map = [];
+        $call_map = [];
 
-        foreach ($call_map as $key => $value) {
+        foreach ($call_map_data as $key => $value) {
             $cased_key = strtolower($key);
-            self::$call_map[$cased_key] = $value;
+            $call_map[$cased_key] = $value;
         }
 
+        self::$call_map = $call_map;
+
         /**
-         * @var array<string, list<list<TaintKind::*>>>
+         * @var non-empty-array<string, non-empty-list<list<TaintKind::*>>>
          */
-        $taint_map = require(dirname(__DIR__, 4) . '/dictionaries/InternalTaintSinkMap.php');
+        $taint_map_data = require(dirname(__DIR__, 4) . '/dictionaries/InternalTaintSinkMap.php');
 
-        foreach ($taint_map as $key => $value) {
+        $taint_map = [];
+        foreach ($taint_map_data as $key => $value) {
             $cased_key = strtolower($key);
-            self::$taint_sink_map[$cased_key] = $value;
+            $taint_map[$cased_key] = $value;
         }
 
+        self::$taint_sink_map = $taint_map;
+
         if (version_compare($analyzer_version, $current_version, '<')) {
             // the following assumes both minor and major versions a single digits
             for ($i = $current_version_int; $i > $analyzer_version_int && $i >= self::LOWEST_AVAILABLE_DELTA; --$i) {
@@ -408,6 +415,7 @@ public static function getCallMap(): array
                 }
             }
         }
+        assert(!empty(self::$call_map));
 
         self::$loaded_php_major_version = $analyzer_major_version;
         self::$loaded_php_minor_version = $analyzer_minor_version;