Fix #4945 - use assertion string for scalar templated assertions

src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php

@@ -721,7 +721,7 @@ class CallAnalyzer
                             } elseif ($replacement_atomic_type instanceof Type\Atomic\TNamedObject) {
                                 $ored_type_assertions[] = $prefix . $replacement_atomic_type->value;
                             } elseif ($replacement_atomic_type instanceof Type\Atomic\Scalar) {
-                                $ored_type_assertions[] = $prefix . $replacement_atomic_type->getId();
+                                $ored_type_assertions[] = $prefix . $replacement_atomic_type->getAssertionString();
                             } elseif ($replacement_atomic_type instanceof Type\Atomic\TNull) {
                                 $ored_type_assertions[] = $prefix . 'null';
                             } elseif ($replacement_atomic_type instanceof Type\Atomic\TTemplateParam) {

tests/Template/FunctionTemplateAssertTest.php

@@ -715,6 +715,23 @@ class FunctionTemplateAssertTest extends TestCase
                         return $value;
                     }'
             ],
+            'noCrashOnListKeyAssertion' => [
+                '<?php
+                    /**
+                     * @template T
+                     * @param T $t
+                     * @param mixed $other
+                     * @psalm-assert =T $other
+                     */
+                    function assertSame($t, $other) : void {}
+
+                    /** @param list<int> $list */
+                    function takesList(array $list) : void {
+                        foreach ($list as $i => $l) {
+                            assertSame($i, $l);
+                        }
+                    }'
+            ],
         ];
     }