[1.1] Remove symfony <2.3 hacks

src/Silex/Application.php

@@ -28,9 +28,7 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\Routing\RouteCollection;
-use Silex\RequestContext;
-use Silex\RedirectableUrlMatcher;
-use Silex\ControllerResolver;
+use Symfony\Component\Routing\RequestContext;
 use Silex\EventListener\LocaleListener;
 use Silex\EventListener\MiddlewareListener;
 use Silex\EventListener\ConverterListener;
@@ -437,10 +435,6 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
      */
     public function sendFile($file, $status = 200, $headers = array(), $contentDisposition = null)
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\BinaryFileResponse')) {
-            throw new \RuntimeException('The "sendFile" method is only supported as of Http Foundation 2.2.');
-        }
-
         return new BinaryFileResponse($file, $status, $headers, true, $contentDisposition);
     }
 

src/Silex/Provider/RememberMeServiceProvider.php

@@ -101,11 +101,6 @@ class RememberMeServiceProvider implements ServiceProviderInterface
             throw new \LogicException('You must register the SecurityServiceProvider to use the RememberMeServiceProvider');
         }
 
-        // In Symfony 2.2, this is a proper subscriber
-        if ($app['security.remember_me.response_listener'] instanceof EventSubscriberInterface) {
-            $app['dispatcher']->addSubscriber($app['security.remember_me.response_listener']);
-        } else {
-            $app['dispatcher']->addListener('kernel.response', array($app['security.remember_me.response_listener'], 'onKernelResponse'));
-        }
+        $app['dispatcher']->addSubscriber($app['security.remember_me.response_listener']);
     }
 }

src/Silex/Provider/SecurityServiceProvider.php

@@ -33,7 +33,6 @@ use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
 use Symfony\Component\Security\Core\Role\RoleHierarchy;
 use Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator;
-use Symfony\Component\Security\Core\Validator\Constraint\UserPasswordValidator as DeprecatedUserPasswordValidator;
 use Symfony\Component\Security\Http\Firewall;
 use Symfony\Component\Security\Http\FirewallMap;
 use Symfony\Component\Security\Http\Firewall\AbstractAuthenticationListener;
@@ -524,13 +523,7 @@ class SecurityServiceProvider implements ServiceProviderInterface
 
         if (isset($app['validator'])) {
             $app['security.validator.user_password_validator'] = $app->share(function ($app) {
-                // FIXME: in Symfony 2.2 Symfony\Component\Security\Core\Validator\Constraint
-                // is replaced by Symfony\Component\Security\Core\Validator\Constraints
-                if (class_exists('Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator')) {
-                    return new UserPasswordValidator($app['security'], $app['security.encoder_factory']);
-                }
-
-                return new DeprecatedUserPasswordValidator($app['security'], $app['security.encoder_factory']);
+                return new UserPasswordValidator($app['security'], $app['security.encoder_factory']);
             });
 
             if (!isset($app['validator.validator_service_ids'])) {
@@ -543,9 +536,7 @@ class SecurityServiceProvider implements ServiceProviderInterface
 
     public function boot(Application $app)
     {
-        // FIXME: in Symfony 2.2, this is a proper subscriber
-        //$app['dispatcher']->addSubscriber($app['security.firewall']);
-        $app['dispatcher']->addListener('kernel.request', array($app['security.firewall'], 'onKernelRequest'), 8);
+        $app['dispatcher']->addSubscriber($app['security.firewall']);
 
         foreach ($this->fakeRoutes as $route) {
             list($method, $pattern, $name) = $route;

src/Silex/Provider/ValidatorServiceProvider.php

@@ -36,22 +36,11 @@ class ValidatorServiceProvider implements ServiceProviderInterface
                 $app['translator']->addResource('xliff', dirname($r->getFilename()).'/Resources/translations/validators.'.$app['locale'].'.xlf', $app['locale'], 'validators');
             }
 
-            $params = $r->getConstructor()->getParameters();
-            if ('validatorInitializers' === $params[2]->getName()) {
-                // BC: to be removed before 1.0
-                // Compatibility with symfony/validator 2.1
-                // can be removed once silex requires 2.2
-                return new Validator(
-                    $app['validator.mapping.class_metadata_factory'],
-                    $app['validator.validator_factory']
-                );
-            } else {
-                return new Validator(
-                    $app['validator.mapping.class_metadata_factory'],
-                    $app['validator.validator_factory'],
-                    isset($app['translator']) ? $app['translator'] : new DefaultTranslator()
-                );
-            }
+            return new Validator(
+                $app['validator.mapping.class_metadata_factory'],
+                $app['validator.validator_factory'],
+                isset($app['translator']) ? $app['translator'] : new DefaultTranslator()
+            );
         });
 
         $app['validator.mapping.class_metadata_factory'] = $app->share(function ($app) {

src/Silex/RedirectableUrlMatcher.php

@@ -28,12 +28,7 @@ class RedirectableUrlMatcher extends BaseRedirectableUrlMatcher
     public function redirect($path, $route, $scheme = null)
     {
         $url = $this->context->getBaseUrl().$path;
-
-        // Query string support was added to RequestContext in 2.3
-        // Fall back to parameter injected by url_matcher closure for earlier versions
-        $query = method_exists($this->context, 'getQueryString')
-            ? $this->context->getQueryString()
-            : $this->context->getParameter('QUERY_STRING') ?: '';
+        $query = $this->context->getQueryString() ?: '';
 
         if ($query !== '') {
             $url .= '?'.$query;

src/Silex/RequestContext.php

-<?php
-
-/*
- * This file is part of the Silex framework.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Silex;
-
-use Symfony\Component\Routing\RequestContext as BaseRequestContext;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Request Context for Symfony <= 2.2
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class RequestContext extends BaseRequestContext
-{
-    public function fromRequest(Request $request)
-    {
-        parent::fromRequest($request);
-
-        // Inject the query string as a parameter for Symfony versions <= 2.2
-        if (!method_exists($this, 'getQueryString') && '' !== $qs = $request->server->get('QUERY_STRING')) {
-            $this->setParameter('QUERY_STRING', $qs);
-        }
-    }
-}

src/Silex/Route.php

@@ -89,8 +89,6 @@ class Route extends BaseRoute
     /**
      * Sets the requirement of host on this Route.
      *
-     * Note that this only works with at least version 2.2 of the Symfony Routing component.
-     *
      * @param string $host The host for which this route should be enabled
      *
      * @return Route $this The current Route instance

tests/Silex/Tests/Provider/SecurityServiceProviderTest.php

@@ -142,13 +142,7 @@ class SecurityServiceProviderTest extends WebTestCase
 
         $app->boot();
 
-        // FIXME: in Symfony 2.2 Symfony\Component\Security\Core\Validator\Constraint
-        // is replaced by Symfony\Component\Security\Core\Validator\Constraints
-        if (class_exists('Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator')) {
-            $this->assertInstanceOf('Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator', $app['security.validator.user_password_validator']);
-        } else {
-            $this->assertInstanceOf('Symfony\Component\Security\Core\Validator\Constraint\UserPasswordValidator', $app['security.validator.user_password_validator']);
-        }
+        $this->assertInstanceOf('Symfony\Component\Security\Core\Validator\Constraints\UserPasswordValidator', $app['security.validator.user_password_validator']);
     }
 
     public function createApplication($authenticationMethod = 'form')

tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php

@@ -87,9 +87,8 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
         ));
 
         $builder = $app['form.factory']->createBuilder('form', array(), array(
-            'validation_constraint' => $constraints, // symfony/validator >=2.1,<2.3
-            'constraints' => $constraints, // symfony/validator ~2.3
-            'csrf_protection'       => false,
+            'constraints'       => $constraints,
+            'csrf_protection'   => false,
         ));
 
         $form = $builder