Upgrade to Symfony 2.2