Upgrade to symfony 2.5