only fuse array & Traversable with phpstorm generics

[orklah]

This should fix #6682

The change is pretty weird though but I couldn't make sense of it otherwise. It seems this piece of code will only merge Array&Traversable into Iterable if we're not allowing PHPStorm generics. In fact, allowing them fix the example: https://psalm.dev/r/ba98d80cff

So I guess it was just a mistake. Seems like no test was covering this neither.

I'm very much thinking about deprecating the "allow PHPStorm generics" and removing it in Psalm 5. PHPStorm now supports standard generics notation so it makes little sense to have this now but this will come back to bite us when we'll try working with intersections. With #6672, it's the second fix I make to this config in a week.

[psalm-github-bot]

I found these snippets:

https://psalm.dev/r/ba98d80cff

<?php declare(strict_types=1);

/**
 * Copied from https://github.com/doctrine/doctrine-laminas-hydrator/blob/2.2.x/src/DoctrineObject.php#L638
 */
class DoctrineObject
{
    /**
     * Verifies if a provided identifier is to be considered null
     *
     * @param  mixed $identifier
     * @return bool
     */
    private function isNullIdentifier($identifier)
    {
        if (null === $identifier) {
            return true;
        }

        if ($identifier instanceof \Traversable || is_array($identifier)) {
            $nonNullIdentifiers = array_filter(
                ArrayUtils::iteratorToArray($identifier),
                function ($value) {
                    return null !== $value;
                }
            );

            return empty($nonNullIdentifiers);
        }

        return false;
    }
}
    
/**
 * Copied from https://github.com/laminas/laminas-stdlib/blob/3.7.x/src/ArrayUtils.php#L218
 */
class ArrayUtils 
{
    /**
     * Convert an iterator to an array.
     *
     * Converts an iterator to an array. The $recursive flag, on by default,
     * hints whether or not you want to do so recursively.
     *
     * @param  array|\Traversable  $iterator     The array or Traversable object to convert
     * @param  bool                $recursive    Recursively check all nested structures
     * @throws \InvalidArgumentException If $iterator is not an array or a Traversable object.
     * @return array
     */
    public static function iteratorToArray($iterator, $recursive = true)
    {
        return [];
    }
}

Psalm output (using commit f7a6336):

No issues!

[weirdan]

I'm very much thinking about deprecating the "allow PHPStorm generics" and removing it in Psalm 5

👍 on this. Mind adding it to #4700 ?

[weirdan]

it seems this piece of code will only merge Array&Traversable into Iterable if we're not allowing PHPStorm generics.

I think the idea was to prevent treating Traversable|float[] as iterable<mixed, mixed>.

[orklah]

I think the idea was to prevent treating Traversable|float[] as iterable<mixed, mixed>.

It will actually do the opposite if I'm not mistaken. But only if you don't use PHPStorm generics. If you do, Traversable|float[] will stay as is