Done. I did that because Doctrine\ORM\Query is a final class, but you were right it was not needed.