Update for newer version of Symfony