merged branch fabpot/simplification (PR #371)

Commits
-------

e4641d41 made the code more readable
c89133e8 simplified some code

Discussion
----------

Code simplification

I propose to simplify some code. What do you think?

---------------------------------------------------------------------------

by stof at 2012-06-15T12:02:47Z

👍

---------------------------------------------------------------------------

by igorw at 2012-06-15T13:06:12Z

Fine with me. But please add an assignment before `setResponse` to keep the lines a bit shorter.

src/Silex/Application.php

@@ -345,7 +345,7 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
      */
     public function error($callback, $priority = 0)
     {
-        $this['dispatcher']->addListener(SilexEvents::ERROR, function (GetResponseForErrorEvent $event) use ($callback) {
+        $this['dispatcher']->addListener(SilexEvents::ERROR, function (GetResponseForExceptionEvent $event) use ($callback) {
             $exception = $event->getException();
 
             if (is_array($callback)) {
@@ -370,7 +370,9 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
             $result = call_user_func($callback, $exception, $code);
 
             if (null !== $result) {
-                $event->setStringResponse($result);
+                $response = $result instanceof Response ? $result : new Response((string) $result);
+
+                $event->setResponse($response);
             }
         }, $priority);
     }
@@ -567,8 +569,9 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
     public function onKernelView(GetResponseForControllerResultEvent $event)
     {
         $response = $event->getControllerResult();
-        $converter = new StringResponseConverter();
-        $event->setResponse($converter->convert($response));
+        $response = $response instanceof Response ? $response : new Response((string) $response);
+
+        $event->setResponse($response);
     }
 
     /**
@@ -621,7 +624,7 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
             }
         }
 
-        $errorEvent = new GetResponseForErrorEvent($this, $event->getRequest(), $event->getRequestType(), $event->getException());
+        $errorEvent = new GetResponseForExceptionEvent($this, $event->getRequest(), $event->getRequestType(), $event->getException());
         $this['dispatcher']->dispatch(SilexEvents::ERROR, $errorEvent);
 
         if ($errorEvent->hasResponse()) {

src/Silex/ExceptionHandler.php

@@ -13,6 +13,7 @@ namespace Silex;
 
 use Symfony\Component\HttpKernel\Debug\ExceptionHandler as DebugExceptionHandler;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 
 /**
  * Defaults exception handler.
@@ -21,7 +22,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
  */
 class ExceptionHandler implements EventSubscriberInterface
 {
-    public function onSilexError(GetResponseForErrorEvent $event)
+    public function onSilexError(GetResponseForExceptionEvent $event)
     {
         $app = $event->getKernel();
         $handler = new DebugExceptionHandler($app['debug']);

src/Silex/GetResponseForErrorEvent.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\HttpKernel\Event\GetResponseForExceptionEvent;
-
-/**
- * GetResponseForExceptionEvent with additional setStringResponse method
- *
- * setStringResponse will convert strings to response objects.
- *
- * @author Igor Wiedler <igor@wiedler.ch>
- */
-class GetResponseForErrorEvent extends GetResponseForExceptionEvent
-{
-    public function setStringResponse($response)
-    {
-        $converter = new StringResponseConverter();
-        $this->setResponse($converter->convert($response));
-    }
-}

src/Silex/StringResponseConverter.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\HttpFoundation\Response;
-
-/**
- * Converts string responses to Response objects.
- *
- * @author Igor Wiedler <igor@wiedler.ch>
- */
-class StringResponseConverter
-{
-    /**
-     * Does the conversion
-     *
-     * @param string $response The response string
-     *
-     * @return Response A Response object
-     */
-    public function convert($response)
-    {
-        if (!$response instanceof Response) {
-            return new Response((string) $response);
-        }
-
-        return $response;
-    }
-}