Commit 49217898 authored by Fabien Potencier's avatar Fabien Potencier

updated to the latest Symfony components

parent dbf85d8f
...@@ -29,9 +29,9 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; ...@@ -29,9 +29,9 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\Routing\Route; use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\RouteCollection;
use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\RequestContext;
use Symfony\Component\Routing\Exception\Exception as RoutingException; use Symfony\Component\Routing\Exception\ExceptionInterface as RoutingException;
use Symfony\Component\Routing\Exception\MethodNotAllowedException; use Symfony\Component\Routing\Exception\MethodNotAllowedException;
use Symfony\Component\Routing\Exception\NotFoundException; use Symfony\Component\Routing\Exception\ResourceNotFoundException;
use Symfony\Component\ClassLoader\UniversalClassLoader; use Symfony\Component\ClassLoader\UniversalClassLoader;
use Silex\RedirectableUrlMatcher; use Silex\RedirectableUrlMatcher;
...@@ -339,7 +339,7 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe ...@@ -339,7 +339,7 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
$this['dispatcher']->dispatch(Events::onSilexBefore); $this['dispatcher']->dispatch(Events::onSilexBefore);
if ($e instanceof NotFoundException) { if ($e instanceof ResourceNotFoundException) {
$message = sprintf('No route found for "%s %s"', $this['request']->getMethod(), $this['request']->getPathInfo()); $message = sprintf('No route found for "%s %s"', $this['request']->getMethod(), $this['request']->getPathInfo());
throw new NotFoundHttpException($message, $e); throw new NotFoundHttpException($message, $e);
} else if ($e instanceof MethodNotAllowedException) { } else if ($e instanceof MethodNotAllowedException) {
......
Subproject commit 7eaba011f506fd960456ea51c82a013247c739c2 Subproject commit 49f0daa3837a5c11906a422efe044cba2187db44
Subproject commit 65c3ae5741901c5394a293b353c75092021b7b51 Subproject commit 91c74fb89b928a175c07c76b72d4f228414ab17b
Subproject commit 3b88a86bb7a0621e123d62cc8dfe82b2fea48d88 Subproject commit d411144aba808a9866f09bc37fad5759bea661e9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment