CS Fixes

src/Silex/Application.php

@@ -18,7 +18,6 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\TerminableInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 use Symfony\Component\HttpKernel\Event\PostResponseEvent;
 use Symfony\Component\HttpKernel\EventListener\ResponseListener;
 use Symfony\Component\HttpKernel\EventListener\RouterListener;
@@ -408,14 +407,14 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
     /**
      * Registers a view handler.
      *
-     * View handlers are simple callables which take a controller result and the 
-     * request as arguments, whenever a controller returns a value that is not 
-     * an instance of Response. When this occurs, all suitable handlers will be 
-     * called, until one returns a Response object.  
+     * View handlers are simple callables which take a controller result and the
+     * request as arguments, whenever a controller returns a value that is not
+     * an instance of Response. When this occurs, all suitable handlers will be
+     * called, until one returns a Response object.
      *
-     * @param callable   $callback View handler callback
-     * @param integer $priority The higher this value, the earlier an event
-     *                          listener will be triggered in the chain (defaults to 0)
+     * @param callable $callback View handler callback
+     * @param integer  $priority The higher this value, the earlier an event
+     *                           listener will be triggered in the chain (defaults to 0)
      */
     public function view($callback, $priority = 0)
     {

src/Silex/ViewListenerWrapper.php

@@ -49,7 +49,7 @@ class ViewListenerWrapper
 
         if ($response instanceof Response) {
             $event->setResponse($response);
-        } else if (null !== $response) {
+        } elseif (null !== $response) {
             $event->setControllerResult($response);
         }
     }

tests/Silex/Tests/ApplicationTest.php

@@ -563,9 +563,9 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
     public function testBeforeFilterOnMountedControllerGroupIsolatedToGroup()
     {
         $app = new Application();
-        $app->match('/', function() { return new Response('ok'); });
+        $app->match('/', function () { return new Response('ok'); });
         $mounted = $app['controllers_factory'];
-        $mounted->before(function() { return new Response('not ok'); });
+        $mounted->before(function () { return new Response('not ok'); });
         $app->mount('/group', $mounted);
 
         $response = $app->handle(Request::create('/'));
@@ -575,7 +575,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
     public function testViewListenerWithPrimitive()
     {
         $app = new Application();
-        $app->get('/foo', function() { return 123; });
+        $app->get('/foo', function () { return 123; });
         $app->view(function ($view, Request $request) {
             return new Response($view);
         });
@@ -588,7 +588,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
     public function testViewListenerWithArrayTypeHint()
     {
         $app = new Application();
-        $app->get('/foo', function() { return array('ok'); });
+        $app->get('/foo', function () { return array('ok'); });
         $app->view(function (array $view) {
             return new Response($view[0]);
         });
@@ -601,7 +601,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
     public function testViewListenerWithObjectTypeHint()
     {
         $app = new Application();
-        $app->get('/foo', function() { return (object) array('name' => 'world'); });
+        $app->get('/foo', function () { return (object) array('name' => 'world'); });
         $app->view(function (\stdClass $view) {
             return new Response('Hello '.$view->name);
         });
@@ -618,7 +618,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
         }
 
         $app = new Application();
-        $app->get('/foo', function() { return function() { return 'world'; }; });
+        $app->get('/foo', function () { return function () { return 'world'; }; });
         $app->view(function (callable $view) {
             return new Response('Hello '.$view());
         });
@@ -631,7 +631,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
     public function testViewListenersCanBeChained()
     {
         $app = new Application();
-        $app->get('/foo', function() { return (object) array('name' => 'world'); });
+        $app->get('/foo', function () { return (object) array('name' => 'world'); });
 
         $app->view(function (\stdClass $view) {
             return array('msg' => 'Hello '.$view->name);
@@ -649,7 +649,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
     public function testViewListenersAreIgnoredIfNotSuitable()
     {
         $app = new Application();
-        $app->get('/foo', function() { return 'Hello world'; });
+        $app->get('/foo', function () { return 'Hello world'; });
 
         $app->view(function (\stdClass $view) {
             throw new \Exception("View listener was called");
@@ -667,7 +667,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
     public function testViewListenersResponsesAreNotUsedIfNull()
     {
         $app = new Application();
-        $app->get('/foo', function() { return 'Hello world'; });
+        $app->get('/foo', function () { return 'Hello world'; });
 
         $app->view(function ($view) {
             return 'Hello view listener';