bumped min version of Symfony to 2.6 (2.4 and 2.5 are not maintained anymore)

.travis.yml

@@ -2,11 +2,8 @@ language: php
 
 before_script:
     # symfony/*
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.8' ]; then sed -i 's/~2.4/2.8.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.7' ]; then sed -i 's/~2.4/2.7.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '' ]; then sed -i 's/~2.4/2.6.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.5' ]; then sed -i 's/~2.4/2.5.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.4' ]; then sed -i 's/~2.4/2.4.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.8' ]; then sed -i 's/~2.7/2.8.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.7' ]; then sed -i 's/~2.6/2.7.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
     - composer install --dev --prefer-source
 
 script: phpunit
@@ -22,11 +19,6 @@ matrix:
     allow_failures:
         - php: hhvm
     include:
-        - php: 5.6
-          env: SYMFONY_DEPS_VERSION=2.4
-        - php: 5.6
-          env: SYMFONY_DEPS_VERSION=2.5
-        - php: 5.6
           env: SYMFONY_DEPS_VERSION=2.7
         - php: 5.6
           env: SYMFONY_DEPS_VERSION=2.8

composer.json

@@ -18,39 +18,39 @@
     "require": {
         "php": ">=5.3.9",
         "pimple/pimple": "~3.0",
-        "symfony/event-dispatcher": "~2.4",
-        "symfony/http-foundation": "~2.4",
-        "symfony/http-kernel": "~2.4",
-        "symfony/routing": "~2.4"
+        "symfony/event-dispatcher": "~2.6",
+        "symfony/http-foundation": "~2.6",
+        "symfony/http-kernel": "~2.6",
+        "symfony/routing": "~2.6"
     },
     "require-dev": {
-        "symfony/security": "~2.4",
-        "symfony/config": "~2.4",
-        "symfony/locale": "~2.4",
-        "symfony/form": "~2.4",
-        "symfony/browser-kit": "~2.4",
-        "symfony/css-selector": "~2.4",
-        "symfony/debug": "~2.4",
-        "symfony/dom-crawler": "~2.4",
-        "symfony/finder": "~2.4",
-        "symfony/monolog-bridge": "~2.4",
-        "symfony/doctrine-bridge": "~2.4",
-        "symfony/options-resolver": "~2.4",
-        "symfony/process": "~2.4",
-        "symfony/serializer": "~2.4",
-        "symfony/translation": "~2.4",
-        "symfony/twig-bridge": "~2.4",
-        "symfony/validator": "~2.4",
+        "symfony/security": "~2.6",
+        "symfony/config": "~2.6",
+        "symfony/locale": "~2.6",
+        "symfony/form": "~2.6",
+        "symfony/browser-kit": "~2.6",
+        "symfony/css-selector": "~2.6",
+        "symfony/debug": "~2.6",
+        "symfony/dom-crawler": "~2.6",
+        "symfony/finder": "~2.6",
+        "symfony/monolog-bridge": "~2.6",
+        "symfony/doctrine-bridge": "~2.6",
+        "symfony/options-resolver": "~2.6",
+        "symfony/process": "~2.6",
+        "symfony/serializer": "~2.6",
+        "symfony/translation": "~2.6",
+        "symfony/twig-bridge": "~2.6",
+        "symfony/validator": "~2.6",
         "twig/twig": ">=1.8.0,<2.0-dev",
         "doctrine/dbal": "~2.2",
         "swiftmailer/swiftmailer": "5.*",
         "monolog/monolog": "~1.4,>=1.4.1"
     },
     "suggest": {
-        "symfony/browser-kit": "~2.4",
-        "symfony/css-selector": "~2.4",
-        "symfony/dom-crawler": "~2.4",
-        "symfony/form": "~2.4"
+        "symfony/browser-kit": "~2.6",
+        "symfony/css-selector": "~2.6",
+        "symfony/dom-crawler": "~2.6",
+        "symfony/form": "~2.6"
     },
     "replace": {
         "silex/api": "self.version",

doc/providers/form.rst

@@ -20,9 +20,7 @@ Services
   that is used for build a form.
 
 * **form.csrf_provider**: An instance of an implementation of
-  `CsrfProviderInterface
-  <http://api.symfony.com/2.3/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderInterface.html>`_ for Symfony 2.3 or
-  `CsrfTokenManagerInterface <http://api.symfony.com/2.7/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.html>`_ for Symfony 2.4+.
+  `CsrfTokenManagerInterface <http://api.symfony.com/2.7/Symfony/Component/Security/Csrf/CsrfTokenManagerInterface.html>`_.
 
 Registering
 -----------
@@ -67,7 +65,7 @@ Registering
         composer require symfony/validator symfony/config symfony/translation
         
     The Symfony Security CSRF component is used to protect forms against CSRF
-    attacks (as of Symfony 2.4+):
+    attacks:
 
     .. code-block:: bash
     

doc/providers/http_fragment.rst

@@ -4,10 +4,6 @@ HttpFragmentServiceProvider
 The *HttpFragmentServiceProvider* provides support for the Symfony2 fragment
 sub-framework, which allows you to embed fragments of HTML in a template.
 
-.. warning::
-
-    This service provider only work with Symfony 2.4+.
-
 Parameters
 ----------
 

src/Silex/Provider/FormServiceProvider.php

@@ -107,19 +107,9 @@ class FormServiceProvider implements ServiceProviderInterface
         };
 
         $app['form.csrf_provider'] = function ($app) {
-            if (!class_exists('Symfony\Component\Form\Extension\DataCollector\DataCollectorExtension')) {
-                // Symfony 2.3
-                if (isset($app['session'])) {
-                    return new SessionCsrfProvider($app['session'], $app['form.secret']);
-                }
-
-                return new DefaultCsrfProvider($app['form.secret']);
-            } else {
-                // Symfony 2.4+
-                $storage = isset($app['session']) ? new SessionTokenStorage($app['session']) : new NativeSessionTokenStorage();
+            $storage = isset($app['session']) ? new SessionTokenStorage($app['session']) : new NativeSessionTokenStorage();
 
-                return new CsrfTokenManager(null, $storage);
-            }
+            return new CsrfTokenManager(null, $storage);
         };
     }
 }

tests/Silex/Tests/Provider/FormServiceProviderTest.php

@@ -17,7 +17,6 @@ use Silex\Provider\TranslationServiceProvider;
 use Silex\Provider\ValidatorServiceProvider;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\AbstractTypeExtension;
-use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
 use Symfony\Component\Form\FormTypeGuesserChain;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -190,40 +189,24 @@ if (method_exists('Symfony\Component\Form\AbstractType', 'configureOptions')) {
     }
 }
 
-if (!class_exists('Symfony\Component\Form\Extension\DataCollector\DataCollectorExtension')) {
-    // Symfony 2.3 only
-    class FakeCsrfProvider implements CsrfProviderInterface
+class FakeCsrfProvider implements CsrfTokenManagerInterface
+{
+    public function getToken($tokenId)
     {
-        public function generateCsrfToken($intention)
-        {
-            return $intention.'123';
-        }
-
-        public function isCsrfTokenValid($intention, $token)
-        {
-            return $token === $this->generateCsrfToken($intention);
-        }
+        return new CsrfToken($tokenId, '123');
     }
-} else {
-    class FakeCsrfProvider implements CsrfTokenManagerInterface
-    {
-        public function getToken($tokenId)
-        {
-            return new CsrfToken($tokenId, '123');
-        }
 
-        public function refreshToken($tokenId)
-        {
-            return new CsrfToken($tokenId, '123');
-        }
+    public function refreshToken($tokenId)
+    {
+        return new CsrfToken($tokenId, '123');
+    }
 
-        public function removeToken($tokenId)
-        {
-        }
+    public function removeToken($tokenId)
+    {
+    }
 
-        public function isTokenValid(CsrfToken $token)
-        {
-            return '123' === $token->getValue();
-        }
+    public function isTokenValid(CsrfToken $token)
+    {
+        return '123' === $token->getValue();
     }
 }

tests/Silex/Tests/Provider/HttpFragmentServiceProviderTest.php

@@ -21,10 +21,6 @@ class HttpFragmentServiceProviderTest extends \PHPUnit_Framework_TestCase
 {
     public function testRenderFunction()
     {
-        if (!class_exists('Symfony\Component\HttpFoundation\RequestStack')) {
-            $this->markTestSkipped('HttpFragmentServiceProvider is not available on Symfony <2.4');
-        }
-
         $app = new Application();
 
         $app->register(new HttpFragmentServiceProvider());