[php-symfony2] Some TODO cleanup