class-string-map is not working as documented

[stof]

The documentation shows class-string-map<T of Foo, SomethingBasedOn<T>> while the working syntax is class-string-map<T as Foo, SomethingBasedOn<T>>. It looks like of does not work there, only as (unlike in @template).

[psalm-github-bot]

Hey @stof, can you reproduce the issue on https://psalm.dev ?

[stof]

see https://psalm.dev/r/6f7e81fe99 for a reproducer, which is literally a copy-paste of the example in the documentation of class-string-map

[psalm-github-bot]

I found these snippets:

https://psalm.dev/r/6f7e81fe99

<?php

/**
 * @psalm-consistent-constructor
 */
class Foo {}

/**
 * @psalm-consistent-constructor
 */
class Bar extends Foo {}

class A {
  /** @var class-string-map<T of Foo, T> */
  private static array $map = [];

  /**
   * @template U of Foo
   * @param class-string<U> $class
   * @return U
   */
  public static function get(string $class) : Foo {
    if (isset(self::$map[$class])) {
      return self::$map[$class];
    }

    self::$map[$class] = new $class();
    return self::$map[$class];
  }
}

$foo = A::get(Foo::class);
$bar = A::get(Bar::class);

/** @psalm-trace $foo */; // Foo
/** @psalm-trace $bar */; // Bar

Psalm output (using commit 73ebe22):

INFO: Trace - 35:25 - $foo: Foo

INFO: Trace - 36:25 - $bar: Bar

ERROR: UndefinedDocblockClass - 15:18 - Docblock-defined class, interface or enum named T does not exist

ERROR: InvalidReturnStatement - 24:14 - The inferred type 'T' does not match the declared return type 'U:fn-a::get as Foo' for A::get

ERROR: PropertyTypeCoercion - 27:5 - A::$map expects 'class-string-map<TofFoo as object, T>',  parent type 'class-string-map<TofFoo as object, T|(TofFoo:class-string-map as object)>' provided

ERROR: InvalidReturnStatement - 28:12 - The inferred type 'T|(U:fn-a::get as Foo)' does not match the declared return type 'U:fn-a::get as Foo' for A::get

ERROR: InvalidReturnType - 20:14 - The declared return type 'U:fn-a::get as Foo' for A::get is incorrect, got 'T|(U:fn-a::get as Foo)'

ERROR: UndefinedDocblockClass - 15:3 - Docblock-defined class, interface or enum named T does not exist

[weirdan]

Fixed in #10326