sync with latest Symfony