Wrong TypeDoesNotContainNull determination

[chriskapp]

Hi, I have found also another case where Psalm thinks that in the example the $existing variable does not contain null s.

https://psalm.dev/r/74b5ec5ba5

But it could be null in case $foo is 1 and $bar is null. It looks like Psalm does not recognize the elseif and thinks that there is a standalone if which would indeed remove the null type.

Maybe this is also related to #7099

[psalm-github-bot]

I found these snippets:

https://psalm.dev/r/74b5ec5ba5

<?php

function getFoo(): ?int {
    return rand(0, 1) === 1 ? 1 : null;
}

function test(?stdClass $existing = null): void {
    $foo = getFoo();
    $bar = getFoo();

	/** @psalm-trace $existing */;
    
    if ($foo !== null) {
        assert($foo === 1);
    } elseif ($existing === null) {
        throw new \RuntimeException('foo');
    }

	/** @psalm-trace $existing */;
    
    if ($bar !== null) {
        assert($bar === 1);
    } elseif ($existing === null) {
        throw new \RuntimeException('bar');
    }
}

test(null);

Psalm output (using commit b6cba5a):

INFO: Trace - 11:31 - $existing: null|stdClass

INFO: Trace - 19:31 - $existing: stdClass

ERROR: TypeDoesNotContainNull - 23:15 - stdClass does not contain null

[chriskapp]

If the elseif block is moved into a separate if inside an else it works like expected s.
https://psalm.dev/r/d274855806

[psalm-github-bot]

I found these snippets:

https://psalm.dev/r/d274855806

<?php

function getFoo(): ?int {
    return rand(0, 1) === 1 ? 1 : null;
}

function test(?stdClass $existing = null): void {
    $foo = getFoo();
    $bar = getFoo();

	/** @psalm-trace $existing */;
    
    if ($foo !== null) {
        assert($foo === 1);
    } else {
    	if ($existing === null) {
    	    throw new \RuntimeException('foo');
	    }
    }

	/** @psalm-trace $existing */;
    
    if ($bar !== null) {
        assert($bar === 1);
    } elseif ($existing === null) {
        throw new \RuntimeException('bar');
    }
}

test(null);

Psalm output (using commit b6cba5a):

INFO: Trace - 11:31 - $existing: null|stdClass

INFO: Trace - 21:31 - $existing: null|stdClass

[theodorejb]

Is this issue still relevant? It looks like it was fixed.

[weirdan]

I believe this is fixed in #9922