Merge branch '1.2'

* 1.2:
  fixed some tests
  fixed CS
  simplified the build matrix
  fixed tests for Symfony 2.6+
  allowed any Symfony 2.x versions
  Grammar correction

Conflicts:
	composer.json
	tests/Silex/Tests/Application/UrlGeneratorTraitTest.php
	tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php

.travis.yml

 language: php
 
-env:
-    - SYMFONY_DEPS_VERSION=2.3
-    - SYMFONY_DEPS_VERSION=2.4
-    - SYMFONY_DEPS_VERSION=2.5
-
 before_script:
     # symfony/*
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.5' ]; then sed -i 's/>=2.3,<2.6-dev/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.3,<2.6-dev/2.4.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
-    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.3' ]; then sed -i 's/>=2.3,<2.6-dev/2.3.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.7' ]; then sed -i 's/~2.3/2.7.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '' ]; then sed -i 's/~2.3/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.3/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.3/2.4.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
+    - sh -c "if [ '$SYMFONY_DEPS_VERSION' = '2.3' ]; then sed -i 's/~2.3/2.3.*@dev/g' composer.json; composer update --dev --prefer-source; fi"
     - composer install --dev --prefer-source
 
 script: phpunit
@@ -24,3 +21,12 @@ php:
 matrix:
     allow_failures:
         - php: hhvm
+    include:
+        - php: 5.6
+          env: SYMFONY_DEPS_VERSION=2.3
+        - 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

bin/skeleton/index.php

@@ -4,7 +4,7 @@ require_once __DIR__.'/../vendor/autoload.php';
 
 $app = new Silex\Application();
 
-$app->get('/hello', function() {
+$app->get('/hello', function () {
     return 'Hello!';
 });
 

composer.json

@@ -18,39 +18,39 @@
     "require": {
         "php": ">=5.3.3",
         "pimple/pimple": "~3.0",
-        "symfony/event-dispatcher": ">=2.4,<2.6-dev",
-        "symfony/http-foundation": ">=2.4,<2.6-dev",
-        "symfony/http-kernel": ">=2.4,<2.6-dev",
-        "symfony/routing": ">=2.4,<2.6-dev"
+        "symfony/event-dispatcher": "~2.3",
+        "symfony/http-foundation": "~2.3",
+        "symfony/http-kernel": "~2.3",
+        "symfony/routing": "~2.3"
     },
     "require-dev": {
-        "symfony/security": ">=2.4,<2.6-dev",
-        "symfony/config": ">=2.4,<2.6-dev",
-        "symfony/locale": ">=2.4,<2.6-dev",
-        "symfony/form": ">=2.4,<2.6-dev",
-        "symfony/browser-kit": ">=2.4,<2.6-dev",
-        "symfony/css-selector": ">=2.4,<2.6-dev",
-        "symfony/debug": ">=2.4,<2.6-dev",
-        "symfony/dom-crawler": ">=2.4,<2.6-dev",
-        "symfony/finder": ">=2.4,<2.6-dev",
-        "symfony/monolog-bridge": ">=2.4,<2.6-dev",
-        "symfony/doctrine-bridge": ">=2.4,<2.6-dev",
-        "symfony/options-resolver": ">=2.4,<2.6-dev",
-        "symfony/process": ">=2.4,<2.6-dev",
-        "symfony/serializer": ">=2.4,<2.6-dev",
-        "symfony/translation": ">=2.4,<2.6-dev",
-        "symfony/twig-bridge": ">=2.4,<2.6-dev",
-        "symfony/validator": ">=2.4,<2.6-dev",
+        "symfony/security": "~2.3",
+        "symfony/config": "~2.3",
+        "symfony/locale": "~2.3",
+        "symfony/form": "~2.3",
+        "symfony/browser-kit": "~2.3",
+        "symfony/css-selector": "~2.3",
+        "symfony/debug": "~2.3",
+        "symfony/dom-crawler": "~2.3",
+        "symfony/finder": "~2.3",
+        "symfony/monolog-bridge": "~2.3",
+        "symfony/doctrine-bridge": "~2.3",
+        "symfony/options-resolver": "~2.3",
+        "symfony/process": "~2.3",
+        "symfony/serializer": "~2.3",
+        "symfony/translation": "~2.3",
+        "symfony/twig-bridge": "~2.3",
+        "symfony/validator": "~2.3",
         "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,<2.6-dev",
-        "symfony/css-selector": ">=2.4,<2.6-dev",
-        "symfony/dom-crawler": ">=2.4,<2.6-dev",
-        "symfony/form": ">=2.4,<2.6-dev"
+        "symfony/browser-kit": "~2.3",
+        "symfony/css-selector": "~2.3",
+        "symfony/dom-crawler": "~2.3",
+        "symfony/form": "~2.3"
     },
     "replace": {
         "silex/api": "self.version",

doc/middlewares.rst

@@ -147,7 +147,7 @@ Short-circuiting the Controller
 -------------------------------
 
 If a before middleware returns a Response object, the Request handling is
-short-circuited (the next middlewares won't be run, neither the route
+short-circuited (the next middlewares won't be run, nor the route
 callback), and the Response is passed to the after middlewares right away::
 
     $app->before(function (Request $request) {

src/Silex/Application/SecurityTrait.php

@@ -31,11 +31,11 @@ trait SecurityTrait
     public function user()
     {
         if (null === $token = $this['security']->getToken()) {
-            return null;
+            return;
         }
 
         if (!is_object($user = $token->getUser())) {
-            return null;
+            return;
         }
 
         return $user;

src/Silex/Provider/SecurityServiceProvider.php

@@ -156,7 +156,7 @@ class SecurityServiceProvider implements ServiceProviderInterface, EventListener
                     'security.authentication_provider.'.$name.'.'.$provider,
                     'security.authentication_listener.'.$name.'.'.$type,
                     $entryPoint ? 'security.entry_point.'.$name.'.'.$entryPoint : null,
-                    $type
+                    $type,
                 );
             });
         }

tests/Silex/Tests/Application/FormTraitTest.php

@@ -11,7 +11,6 @@
 
 namespace Silex\Tests\Application;
 
-use Silex\Application;
 use Silex\Provider\FormServiceProvider;
 
 /**

tests/Silex/Tests/Application/MonologTraitTest.php

@@ -11,7 +11,6 @@
 
 namespace Silex\Tests\Application;
 
-use Silex\Application;
 use Silex\Provider\MonologServiceProvider;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;

tests/Silex/Tests/Application/SecurityTraitTest.php

@@ -11,7 +11,6 @@
 
 namespace Silex\Tests\Application;
 
-use Silex\Application;
 use Silex\Provider\SecurityServiceProvider;
 use Symfony\Component\Security\Core\User\User;
 use Symfony\Component\HttpFoundation\Request;

tests/Silex/Tests/Application/SwiftmailerTraitTest.php

@@ -11,7 +11,6 @@
 
 namespace Silex\Tests\Application;
 
-use Silex\Application;
 use Silex\Provider\SwiftmailerServiceProvider;
 
 /**

tests/Silex/Tests/Application/TranslationTraitTest.php

@@ -11,7 +11,6 @@
 
 namespace Silex\Tests\Application;
 
-use Silex\Application;
 use Silex\Provider\TranslationServiceProvider;
 
 /**

tests/Silex/Tests/Application/TwigTraitTest.php

@@ -11,7 +11,6 @@
 
 namespace Silex\Tests\Application;
 
-use Silex\Application;
 use Silex\Provider\TwigServiceProvider;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;

tests/Silex/Tests/Application/UrlGeneratorTraitTest.php

@@ -13,6 +13,7 @@ namespace Silex\Tests\Application;
 
 use Silex\Application;
 use Silex\Provider\RoutingServiceProvider;
+use Silex\Provider\UrlGeneratorServiceProvider;
 
 /**
  * UrlGeneratorTrait test cases.

tests/Silex/Tests/CallbackResolverTest.php

@@ -24,7 +24,7 @@ class CallbackResolverTest extends \PHPUnit_Framework_Testcase
 
     public function testShouldResolveCallback()
     {
-        $this->app['some_service'] = function() { return new \stdClass(); };
+        $this->app['some_service'] = function () { return new \stdClass(); };
 
         $this->assertTrue($this->resolver->isValid('some_service:methodName'));
         $this->assertEquals(

tests/Silex/Tests/CallbackServicesTests.php → tests/Silex/Tests/CallbackServicesTest.php

@@ -14,6 +14,7 @@ namespace Silex\Tests;
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Silex\Provider\ServiceControllerServiceProvider;
 
 /**
  * Callback as services test cases.
@@ -27,6 +28,7 @@ class CallbackServicesTest extends \PHPUnit_Framework_TestCase
     public function testCallbacksAsServices()
     {
         $app = new Application();
+        $app->register(new ServiceControllerServiceProvider());
 
         $app['service'] = function () {
             return new self();
@@ -50,10 +52,10 @@ class CallbackServicesTest extends \PHPUnit_Framework_TestCase
         $app->terminate($request, $response);
 
         $this->assertEquals(array(
-            'CONVERT',
             'BEFORE APP',
             'ON REQUEST',
             'BEFORE',
+            'CONVERT',
             'ERROR',
             'AFTER',
             'AFTER APP',

tests/Silex/Tests/ExceptionHandlerTest.php

@@ -72,7 +72,7 @@ class ExceptionHandlerTest extends \PHPUnit_Framework_TestCase
 
         $request = Request::create('/foo');
         $response = $app->handle($request);
-        $this->assertContains('No route found for "GET /foo"', $response->getContent());
+        $this->assertContains('No route found for "GET /foo"', html_entity_decode($response->getContent()));
         $this->assertEquals(404, $response->getStatusCode());
     }
 
@@ -99,7 +99,7 @@ class ExceptionHandlerTest extends \PHPUnit_Framework_TestCase
 
         $request = Request::create('/foo', 'POST');
         $response = $app->handle($request);
-        $this->assertContains('No route found for "POST /foo": Method Not Allowed (Allow: GET)', $response->getContent());
+        $this->assertContains('No route found for "POST /foo": Method Not Allowed (Allow: GET)', html_entity_decode($response->getContent()));
         $this->assertEquals(405, $response->getStatusCode());
         $this->assertEquals('GET', $response->headers->get('Allow'));
     }

tests/Silex/Tests/MiddlewareTest.php

@@ -168,9 +168,9 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase
 
         $app->before(function () { return new Response('app before'); });
 
-        $app->get('/', function() {
+        $app->get('/', function () {
             return new Response('test');
-        })->before(function() {
+        })->before(function () {
             return new Response('middleware before');
         });
 
@@ -247,14 +247,14 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase
             $middlewareTarget[] = 'application_before_middleware_triggered';
         };
 
-        $applicationAfterMiddleware = function ($request, $response, $app) use (&$middlewareTarget, $test){
+        $applicationAfterMiddleware = function ($request, $response, $app) use (&$middlewareTarget, $test) {
             $test->assertInstanceOf('\Symfony\Component\HttpFoundation\Request', $request);
             $test->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
             $test->assertInstanceOf('\Silex\Application', $app);
             $middlewareTarget[] = 'application_after_middleware_triggered';
         };
 
-        $applicationFinishMiddleware = function ($request, $response, $app) use (&$middlewareTarget, $test){
+        $applicationFinishMiddleware = function ($request, $response, $app) use (&$middlewareTarget, $test) {
             $test->assertInstanceOf('\Symfony\Component\HttpFoundation\Request', $request);
             $test->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
             $test->assertInstanceOf('\Silex\Application', $app);
@@ -267,7 +267,7 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase
             $middlewareTarget[] = 'route_before_middleware_triggered';
         };
 
-        $routeAfterMiddleware = function ($request, $response, $app) use (&$middlewareTarget, $test){
+        $routeAfterMiddleware = function ($request, $response, $app) use (&$middlewareTarget, $test) {
             $test->assertInstanceOf('\Symfony\Component\HttpFoundation\Request', $request);
             $test->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
             $test->assertInstanceOf('\Silex\Application', $app);

tests/Silex/Tests/Provider/FormServiceProviderTest.php

@@ -91,7 +91,7 @@ class FormServiceProviderTest extends \PHPUnit_Framework_TestCase
         $app->register(new TranslationServiceProvider());
         $app['translator.domains'] = array(
             'messages' => array(
-                'de' => array (
+                'de' => array(
                     'The CSRF token is invalid. Please try to resubmit the form.' => 'German translation',
                 ),
             ),

tests/Silex/Tests/Provider/SecurityServiceProviderTest.php

@@ -54,7 +54,7 @@ class SecurityServiceProviderTest extends WebTestCase
         $this->assertEquals('ANONYMOUS', $client->getResponse()->getContent());
 
         $client->request('post', '/login_check', array('_username' => 'fabien', '_password' => 'bar'));
-        $this->assertEquals('Bad credentials', $app['security.last_error']($client->getRequest()));
+        $this->assertContains('Bad credentials', $app['security.last_error']($client->getRequest()));
         // hack to re-close the session as the previous assertions re-opens it
         $client->getRequest()->getSession()->save();
 
@@ -131,7 +131,7 @@ class SecurityServiceProviderTest extends WebTestCase
                     'http' => true,
                     'users' => array(
                         'admin' => array('ROLE_ADMIN', '513aeb0121909'),
-                    )
+                    ),
                 ),
             ),
         ));
@@ -219,13 +219,13 @@ class SecurityServiceProviderTest extends WebTestCase
             ),
         ));
 
-        $app->get('/login', function(Request $request) use ($app) {
+        $app->get('/login', function (Request $request) use ($app) {
             $app['session']->start();
 
             return $app['security.last_error']($request);
         });
 
-        $app->get('/', function() use ($app) {
+        $app->get('/', function () use ($app) {
             $user = $app['security']->getToken()->getUser();
 
             $content = is_object($user) ? $user->getUsername() : 'ANONYMOUS';
@@ -241,7 +241,7 @@ class SecurityServiceProviderTest extends WebTestCase
             return $content;
         });
 
-        $app->get('/admin', function() use ($app) {
+        $app->get('/admin', function () use ($app) {
             return 'admin';
         });
 
@@ -270,7 +270,7 @@ class SecurityServiceProviderTest extends WebTestCase
             ),
         ));
 
-        $app->get('/', function() use ($app) {
+        $app->get('/', function () use ($app) {
             $user = $app['security']->getToken()->getUser();
 
             $content = is_object($user) ? $user->getUsername() : 'ANONYMOUS';
@@ -286,7 +286,7 @@ class SecurityServiceProviderTest extends WebTestCase
             return $content;
         });
 
-        $app->get('/admin', function() use ($app) {
+        $app->get('/admin', function () use ($app) {
             return 'admin';
         });
 

tests/Silex/Tests/Provider/SwiftmailerServiceProviderTest.php

@@ -38,7 +38,7 @@ class SwiftmailerServiceProviderTest extends \PHPUnit_Framework_TestCase
             return new SpoolStub();
         };
 
-        $app->get('/', function() use ($app) {
+        $app->get('/', function () use ($app) {
             $app['mailer']->send(\Swift_Message::newInstance());
         });
 
@@ -64,7 +64,7 @@ class SwiftmailerServiceProviderTest extends \PHPUnit_Framework_TestCase
             return new SpoolStub();
         };
 
-        $app->get('/', function() use ($app) { });
+        $app->get('/', function () use ($app) { });
 
         $request = Request::create('/');
         $response = $app->handle($request);

tests/Silex/Tests/Provider/TranslationServiceProviderTest.php

@@ -33,22 +33,22 @@ class TranslationServiceProviderTest extends \PHPUnit_Framework_TestCase
         $app->register(new TranslationServiceProvider());
         $app['translator.domains'] = array(
             'messages' => array(
-                'en' => array (
+                'en' => array(
                     'key1' => 'The translation',
                     'key_only_english' => 'Foo',
                     'key2' => 'One apple|%count% apples',
                     'test' => array(
-                        'key' => 'It works'
-                    )
+                        'key' => 'It works',
+                    ),
                 ),
-                'de' => array (
+                'de' => array(
                     'key1' => 'The german translation',
                     'key2' => 'One german apple|%count% german apples',
                     'test' => array(
-                        'key' => 'It works in german'
-                    )
-                )
-            )
+                        'key' => 'It works in german',
+                    ),
+                ),
+            ),
         );
 
         return $app;

tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php

@@ -45,7 +45,7 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
         $app->register(new ValidatorServiceProvider(), array(
             'validator.validator_service_ids' => array(
                 'test.custom.validator' => 'custom.validator',
-            )
+            ),
         ));
 
         return $app;
@@ -109,5 +109,4 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
             array('email@sample.com', true, 0, 0),
         );
     }
-
 }

tests/Silex/Tests/ServiceControllerResolverTest.php

@@ -45,7 +45,7 @@ class ServiceControllerResolverTest extends \PHPUnit_Framework_Testcase
             ->with('some_service:methodName')
             ->will($this->returnValue(array('callback')));
 
-        $this->app['some_service'] = function() { return new \stdClass(); };
+        $this->app['some_service'] = function () { return new \stdClass(); };
 
         $req = Request::create('/');
         $req->attributes->set('_controller', 'some_service:methodName');
@@ -79,6 +79,6 @@ class ServiceControllerResolverTest extends \PHPUnit_Framework_Testcase
             ->with($req)
             ->will($this->returnValue(123));
 
-        $this->assertEquals(123, $this->resolver->getArguments($req, function() {}));
+        $this->assertEquals(123, $this->resolver->getArguments($req, function () {}));
     }
 }