ObjectRepository find* method does not resolve entity type since PhpStorm 2016.2#PS-162.1121.38

[dimarick]

This code is not works:

        $manager = $container->get('doctrine')->getManagerForClass(MyEntity::class);
        $repository = $manager->getRepository(MyEntity::class);
        $object = $repository->find($Id);
        $object->getId(); //Not resolved

Very strange, but this works:

        /** @var \Doctrine\Common\Persistence\ObjectManager|null $manager */
        $manager = $container->get('doctrine')->getManagerForClass(MyEntity::class);
        $repository = $manager->getRepository(MyEntity::class);
        $object = $repository->find($Id);
        $object->getId(); //Resolved!

Method getManagerForClass has declared return type ObjectManager|null and this type is successfully resolved by phpStorm. But plugin works only if /** @var */ present