Merge pull request #11726 from vimeo/copilot/fix-failing-tests

danog · web-flow · commit c12e3e92e1fc · 2026-03-13T20:27:04.000+01:00
Fix TypeError in PR #11725: update remaining callers to pass `?Context` instead of two strings
diff --git a/dictionaries/CallMap_74.php b/dictionaries/CallMap_74.php
@@ -100897,7 +100897,7 @@
   array (
     0 => 'mixed',
     'variable_representation' => 'string',
-    'allowed_classes=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+    'allowed_classes=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
   ),
   'unset' => 
   array (
diff --git a/dictionaries/CallMap_80.php b/dictionaries/CallMap_80.php
@@ -98231,7 +98231,7 @@
   array (
     0 => 'mixed',
     'data' => 'string',
-    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
   ),
   'unset' => 
   array (
diff --git a/dictionaries/CallMap_81.php b/dictionaries/CallMap_81.php
@@ -96565,7 +96565,7 @@
   array (
     0 => 'mixed',
     'data' => 'string',
-    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
   ),
   'unset' => 
   array (
diff --git a/dictionaries/CallMap_82.php b/dictionaries/CallMap_82.php
@@ -96991,7 +96991,7 @@
   array (
     0 => 'mixed',
     'data' => 'string',
-    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
   ),
   'unset' => 
   array (
diff --git a/dictionaries/CallMap_83.php b/dictionaries/CallMap_83.php
@@ -97838,7 +97838,7 @@
   array (
     0 => 'mixed',
     'data' => 'string',
-    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
   ),
   'unset' => 
   array (
diff --git a/dictionaries/CallMap_84.php b/dictionaries/CallMap_84.php
@@ -102134,7 +102134,7 @@
   array (
     0 => 'mixed',
     'data' => 'string',
-    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
   ),
   'unset' => 
   array (
diff --git a/dictionaries/CallMap_85.php b/dictionaries/CallMap_85.php
@@ -10199,7 +10199,7 @@
   'curl_share_init_persistent' => 
   array (
     0 => 'CurlSharePersistentHandle',
-    'share_options' => 'array<array-key, mixed>',
+    'share_options' => 'non-empty-array<array-key, 3|4|5|6>',
   ),
   'curl_share_setopt' => 
   array (
@@ -83485,7 +83485,7 @@
   array (
     0 => 'mixed',
     'data' => 'string',
-    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
   ),
   'unset' => 
   array (
diff --git a/dictionaries/override/CallMap.php b/dictionaries/override/CallMap.php
@@ -65620,7 +65620,7 @@
   array (
     0 => 'mixed',
     'data' => 'string',
-    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+    'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
   ),
   'unset' => 
   array (
diff --git a/dictionaries/override/CallMap_74_delta.php b/dictionaries/override/CallMap_74_delta.php
@@ -1847,6 +1847,21 @@
         'allowable_tags=' => 'list<non-empty-string>|string',
       ),
     ),
+    'unserialize' => 
+    array (
+      'old' => 
+      array (
+        0 => 'mixed',
+        'variable_representation' => 'string',
+        'allowed_classes=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+      ),
+      'new' => 
+      array (
+        0 => 'mixed',
+        'variable_representation' => 'string',
+        'allowed_classes=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
+      ),
+    ),
   ),
   'removed' => 
   array (
diff --git a/dictionaries/override/CallMap_80_delta.php b/dictionaries/override/CallMap_80_delta.php
@@ -33376,13 +33376,13 @@
       array (
         0 => 'mixed',
         'variable_representation' => 'string',
-        'allowed_classes=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+        'allowed_classes=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
       ),
       'new' => 
       array (
         0 => 'mixed',
         'data' => 'string',
-        'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool}',
+        'options=' => 'array{allowed_classes?: array<array-key, class-string>|bool, max_depth?: int}',
       ),
     ),
     'urldecode' => 
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -2839,6 +2839,8 @@ public function getPHPVersionFromComposerJson(): ?string
                     '8.1',
                     '8.2',
                     '8.3',
+                    '8.4',
+                    '8.5',
                 ];
 
                 foreach ($php_versions as $candidate) {
diff --git a/src/Psalm/Internal/Analyzer/ClassAnalyzer.php b/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
@@ -1770,7 +1770,7 @@ private function analyzeClassMethod(
                         $declaring_method_storage,
                         $this->fq_class_name,
                         $implementer_method_storage->visibility,
-                        new CodeLocation($source, $stmt),
+                        $implementer_method_storage->stmt_location ?? new CodeLocation($source, $stmt),
                         $implementer_method_storage->suppressed_issues,
                         false,
                     );
diff --git a/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php b/src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
@@ -1446,7 +1446,7 @@ private function alterParams(
                     $this,
                     $param_name_node,
                     $resolved_name,
-                    $context->calling_method_id,
+                    $context,
                     false,
                     true,
                 );
@@ -1480,7 +1480,7 @@ private function alterParams(
                     $this,
                     $return_name_node,
                     $resolved_name,
-                    $context->calling_method_id,
+                    $context,
                     false,
                     true,
                 );
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/TryAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/TryAnalyzer.php
@@ -193,7 +193,7 @@ public static function analyze(
                         $statements_analyzer,
                         $catch_type,
                         $fq_catch_class,
-                        $context->calling_method_id,
+                        $context,
                     );
                 }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/StaticPropertyAssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/StaticPropertyAssignmentAnalyzer.php
@@ -156,7 +156,7 @@ public static function analyze(
                     $statements_analyzer,
                     $stmt->class,
                     $fq_class_name,
-                    $context->calling_method_id,
+                    $context,
                 );
 
                 if (!$moved_class) {
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
@@ -1442,8 +1442,7 @@ private static function verifyExplicitParam(
                     $statements_analyzer,
                     $input_expr->value,
                     $arg_location,
-                    $context->self,
-                    $context->calling_method_id,
+                    $context,
                     $statements_analyzer->getSuppressedIssues(),
                     new ClassLikeNameOptions(true),
                 ) === false
@@ -1461,8 +1460,7 @@ private static function verifyExplicitParam(
                                     $statements_analyzer,
                                     $item->value->value,
                                     $arg_location,
-                                    $context->self,
-                                    $context->calling_method_id,
+                                    $context,
                                     $statements_analyzer->getSuppressedIssues(),
                                     new ClassLikeNameOptions(true),
                                 ) === false
@@ -1542,8 +1540,7 @@ private static function verifyExplicitParam(
                                     $statements_analyzer,
                                     $callable_fq_class_name,
                                     $arg_location,
-                                    $context->self,
-                                    $context->calling_method_id,
+                                    $context,
                                     $statements_analyzer->getSuppressedIssues(),
                                     new ClassLikeNameOptions(true),
                                 ) === false
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php
@@ -187,7 +187,7 @@ public static function analyze(
                     $statements_analyzer,
                     $stmt->class,
                     $fq_class_name,
-                    $context->calling_method_id,
+                    $context,
                 );
             }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/AtomicStaticCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/AtomicStaticCallAnalyzer.php
@@ -790,7 +790,7 @@ private static function handleNamedCall(
                     $statements_analyzer,
                     $stmt->class,
                     $fq_class_name,
-                    $context->calling_method_id,
+                    $context,
                 );
             }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/ExistingAtomicStaticCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/ExistingAtomicStaticCallAnalyzer.php
@@ -357,7 +357,7 @@ public static function analyze(
                             $statements_analyzer,
                             $stmt->class,
                             $new_fq_class_name,
-                            $context->calling_method_id,
+                            $context,
                             strtolower($old_declaring_fq_class_name) !== strtolower($new_fq_class_name),
                             $stmt->class->getFirst() === 'self',
                         )) {
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/ClassConstAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/ClassConstAnalyzer.php
@@ -136,7 +136,7 @@ public static function analyzeFetch(
                     $statements_analyzer,
                     $stmt->class,
                     $fq_class_name,
-                    $context->calling_method_id,
+                    $context,
                     false,
                     $stmt->class->getFirst() === 'self',
                 );
@@ -522,7 +522,7 @@ public static function analyzeFetch(
                     $statements_analyzer,
                     $stmt->class,
                     $fq_class_name,
-                    $context->calling_method_id,
+                    $context,
                 );
             }
 
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/StaticPropertyFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/StaticPropertyFetchAnalyzer.php
@@ -337,7 +337,7 @@ public static function analyze(
                 $statements_analyzer,
                 $stmt->class,
                 $fq_class_name,
-                $context->calling_method_id,
+                $context,
             );
 
             if (!$moved_class) {
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/InstanceofAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/InstanceofAnalyzer.php
@@ -86,7 +86,7 @@ public static function analyze(
                         $statements_analyzer,
                         $stmt->class,
                         $fq_class_name,
-                        $context->calling_method_id,
+                        $context,
                     );
                 }
             }
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/MagicConstAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/MagicConstAnalyzer.php
@@ -52,7 +52,7 @@ public static function analyze(
                         $statements_analyzer,
                         $stmt,
                         $context->self,
-                        $context->calling_method_id,
+                        $context,
                     );
                 }
 
diff --git a/src/Psalm/Internal/CliUtils.php b/src/Psalm/Internal/CliUtils.php
@@ -548,6 +548,7 @@ public static function checkRuntimeRequirements(): void
             8_02_27 => '8.2.27',
             8_03_16 => '8.3.16',
             8_04_03 => '8.4.3',
+            8_05_00 => '8.5.0',
         ] as $version => $txt) {
             $version_m = $version - ($version % 100);
             if ($version_m === $major_minor) {
diff --git a/src/Psalm/Internal/Codebase/ClassLikes.php b/src/Psalm/Internal/Codebase/ClassLikes.php
@@ -335,8 +335,8 @@ public function hasFullyQualifiedClassName(
         ?CodeLocation $code_location = null,
         ?Context $context = null,
     ): bool {
-        $calling_fq_class_name = $context->self ?? null;
-        $calling_method_id = $context->calling_method_id ?? null;
+        $calling_fq_class_name = $context?->self;
+        $calling_method_id = $context?->calling_method_id;
 
         $fq_class_name_lc = strtolower($this->getUnAliasedName($fq_class_name));
 
@@ -408,8 +408,8 @@ public function hasFullyQualifiedInterfaceName(
         ?CodeLocation $code_location = null,
         ?Context $context = null,
     ): bool {
-        $calling_fq_class_name = $context->self ?? null;
-        $calling_method_id = $context->calling_method_id ?? null;
+        $calling_fq_class_name = $context?->self;
+        $calling_method_id = $context?->calling_method_id;
         $fq_class_name_lc = strtolower($this->getUnAliasedName($fq_class_name));
 
         // fixme: this looks like a crazy caching hack
@@ -480,8 +480,8 @@ public function hasFullyQualifiedEnumName(
         ?CodeLocation $code_location = null,
         ?Context $context = null,
     ): bool {
-        $calling_fq_class_name = $context->self ?? null;
-        $calling_method_id = $context->calling_method_id ?? null;
+        $calling_fq_class_name = $context?->self;
+        $calling_method_id = $context?->calling_method_id;
         $fq_class_name_lc = strtolower($this->getUnAliasedName($fq_class_name));
 
         // fixme: this looks like a crazy caching hack
@@ -1331,7 +1331,7 @@ public function handleClassLikeReferenceInMigration(
             return false;
         }
         $calling_fq_class_name = $source->getFQCLN();
-        $calling_method_id = $context->calling_method_id ?? null;
+        $calling_method_id = $context?->calling_method_id;
 
         // if we're inside a moved class static method
         if ($codebase->methods_to_move
diff --git a/src/Psalm/Internal/Codebase/Populator.php b/src/Psalm/Internal/Codebase/Populator.php
@@ -5,14 +5,14 @@
 namespace Psalm\Internal\Codebase;
 
 use BackedEnum;
-use Exception;
 use InvalidArgumentException;
 use Psalm\Internal\Analyzer\ClassLikeAnalyzer;
 use Psalm\Internal\MethodIdentifier;
 use Psalm\Internal\Provider\ClassLikeStorageProvider;
 use Psalm\Internal\Provider\FileReferenceProvider;
 use Psalm\Internal\Provider\FileStorageProvider;
 use Psalm\Issue\CircularReference;
+use Psalm\Issue\UndefinedTrait;
 use Psalm\IssueBuffer;
 use Psalm\Progress\Progress;
 use Psalm\Storage\ClassConstantStorage;
@@ -447,7 +447,7 @@ private function populateDataFromTrait(
         $storage->pseudo_property_set_types += $trait_storage->pseudo_property_set_types;
 
         $storage->pseudo_static_methods += $trait_storage->pseudo_static_methods;
-        
+
         $storage->pseudo_methods += $trait_storage->pseudo_methods;
         $storage->declaring_pseudo_method_ids += $trait_storage->declaring_pseudo_method_ids;
     }
@@ -886,8 +886,29 @@ private function inheritConstantsFromTrait(
         ClassLikeStorage $trait_storage,
     ): void {
         if (!$trait_storage->is_trait) {
-            throw new Exception('Class like storage is not for a trait.');
+            $location = $storage->location ?? $storage->stmt_location;
+            if (!$location) {
+                return;
+            }
+
+            $trait_real_type = 'Class';
+            if ($trait_storage->is_enum) {
+                $trait_real_type = 'Enum';
+            } elseif ($trait_storage->is_interface) {
+                $trait_real_type = 'Interface';
+            }
+
+            IssueBuffer::maybeAdd(
+                new UndefinedTrait(
+                    $trait_real_type . ' ' . $trait_storage->name . ' is not a trait',
+                    $location,
+                ),
+                $storage->suppressed_issues,
+            );
+
+            return;
         }
+
         foreach ($trait_storage->constants as $constant_name => $class_constant_storage) {
             $trait_alias_map_cased = array_flip($storage->trait_alias_map_cased);
             if (isset($trait_alias_map_cased[$constant_name])) {
diff --git a/tests/FunctionCallTest.php b/tests/FunctionCallTest.php
diff --git a/tests/TraitTest.php b/tests/TraitTest.php
