Error with the return of repositories

[rgrassian]

Hi,

I just upgraded from 1.3.29 to 1.3.31, and also doctrine/doctrine-bundle from 2.7.0 to 2.8.2
I have now errors with the repository->findOneBy method which returns now object|null instead of the expected entity or null.
I use an objectManagerLoader, I include vendor/phpstan/phpstan-doctrine/extension.neon and vendor/phpstan/phpstan-doctrine/rules.neon. I tried with and without bleedingEdge.

The errors disappear when I downgrade the StubFilesExtensionLoader->getFiles() method and go back to the

return 
[
    $path . '/ORM/QueryBuilder.stub',
    $path . '/EntityRepository.stub',
];

I saw that an other issue was created and solved by 1.3.30 but it's still not ok for me.

[ondrejmirtes]

Please create a small reproducing repository that shows the problem.

[ste93cry]

I prepared the reproducing repo here. Just run vendor/bin/phpstan and the error that comes out as result is:

Parameter #1 $fooEntity of method App\Controller\FooController::useFoo() expects App\Entity\FooEntity|null, object|null given.

[ondrejmirtes]

This should work now with PHPStan 1.9.11 and phpstan-doctrine 1.3.32. Please test it :)

The fix: 6812cf4

The background: Because of how the declaration of the class is conditional (https://github.com/doctrine/DoctrineBundle/blob/2.8.x/Repository/ServiceEntityRepository.php), PHPStan always sees the first definition (class ServiceEntityRepository extends LazyServiceEntityRepository).

But the previous logic in StubFilesExtensionLoader didn't reflect this, which means that the used stub said @extends EntityRepository<TEntityClass>, but because the rest of PHPStan saw class ServiceEntityRepository extends LazyServiceEntityRepository, it didn't use the @extends tag.

The new logic in StubFilesExtensionLoader should be resilient to this.

[ste93cry]

Thank you, it works!

[rgrassian]

Thank you @ondrejmirtes !

[github-actions]

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.