Commit 67d47190 authored by Fabien Potencier's avatar Fabien Potencier

fixed deprecation notices

parent eefb8a68
......@@ -14,6 +14,7 @@ namespace Silex;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Symfony\Component\HttpKernel\HttpKernel;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\TerminableInterface;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
......@@ -97,7 +98,11 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
$urlMatcher = new LazyUrlMatcher(function () use ($app) {
return $app['url_matcher'];
});
$dispatcher->addSubscriber(new RouterListener($urlMatcher, $app['request_context'], $app['logger'], $app['request_stack']));
if (Kernel::VERSION_ID >= 20800) {
$dispatcher->addSubscriber(new RouterListener($urlMatcher, $app['request_stack'], $app['request_context'], $app['logger']));
} else {
$dispatcher->addSubscriber(new RouterListener($urlMatcher, $app['request_context'], $app['logger'], $app['request_stack']));
}
$dispatcher->addSubscriber(new LocaleListener($app, $urlMatcher, $app['request_stack']));
if (isset($app['exception_handler'])) {
$dispatcher->addSubscriber($app['exception_handler']);
......
......@@ -13,6 +13,7 @@ namespace Silex\EventListener;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\EventListener\LocaleListener as BaseLocaleListener;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Routing\RequestContextAwareInterface;
use Silex\Application;
......@@ -28,7 +29,11 @@ class LocaleListener extends BaseLocaleListener
public function __construct(Application $app, RequestContextAwareInterface $router = null, RequestStack $requestStack = null)
{
parent::__construct($app['locale'], $router, $requestStack);
if (Kernel::VERSION_ID >= 20800) {
parent::__construct($requestStack, $app['locale'], $router);
} else {
parent::__construct($app['locale'], $router, $requestStack);
}
$this->app = $app;
}
......
......@@ -18,6 +18,7 @@ use Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer;
use Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer;
use Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer;
use Symfony\Component\HttpKernel\EventListener\FragmentListener;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\HttpKernel\UriSigner;
/**
......@@ -36,6 +37,10 @@ class HttpFragmentServiceProvider implements ServiceProviderInterface
}
$app['fragment.handler'] = $app->share(function ($app) {
if (Kernel::VERSION_ID >= 20800) {
return new FragmentHandler($app['request_stack'], $app['fragment.renderers'], $app['debug']);
}
return new FragmentHandler($app['fragment.renderers'], $app['debug'], $app['request_stack']);
});
......
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