Complex rules using @return-phpstan seem to no longer work with PHPStan 2.1.53

[heiglandreas]

Bug report

We were using the code in https://phpstan.org/r/52564959-605b-4fa9-9765-e3dffe0a2387 with PHPStan 2.1.50 without issue. Version 2.1.53 suddenly complaints about

Foo::getMessage() should return non-empty-array<'html'|'markdown', string>|string but returns array{html?: string, markdown?: string}.  

Is that intended behaviour or a bug?

Code snippet that reproduces the problem

https://phpstan.org/r/52564959-605b-4fa9-9765-e3dffe0a2387

Expected output

No output 😁

Did PHPStan help you today? Did it make you happy in any way?

No response

[phpstan-bot]

@heiglandreas After the latest push in 2.2.x, PHPStan now reports different result with your code snippet:

@@ @@
-PHP 8.5 (1 error)
+PHP 8.5
 ==========
 
-31: Method Foo::getMessage() should return non-empty-array<'html'|'markdown', string>|string but returns array{html?: string, markdown?: string}.
+No errors
 
-PHP 7.2 – 8.4 (3 errors)
+PHP 7.2 – 8.4 (2 errors)
 ==========
 
 23: Function array_first not found.
-23: Parameter #2 $format of method Foo::formatMessage() expects string, mixed given.
-31: Method Foo::getMessage() should return non-empty-array<'html'|'markdown', string>|string but returns array{html?: string, markdown?: string}.
+23: Parameter #2 $format of method Foo::formatMessage() expects string, mixed given.

Full report

PHP 8.5

No errors

PHP 7.2 – 8.4 (2 errors)

Line	Error
23	Function array_first not found.
23	Parameter #2 $format of method Foo::formatMessage() expects string, mixed given.

[heiglandreas]

Looks like the fix for #14552 also fixes this issue. Thanks!