From 8f3b3a760d64fc3c48b2216f8a4b16eb519fe89d Mon Sep 17 00:00:00 2001 From: Aurelijus Date: Thu, 24 Mar 2011 16:17:34 +0200 Subject: [PATCH 1/5] Updated arguments for MethodNotAllowedHttpException --- src/Symfony/Bundle/FrameworkBundle/RequestListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/RequestListener.php b/src/Symfony/Bundle/FrameworkBundle/RequestListener.php index 8f5ccdf536..c3e8e918be 100644 --- a/src/Symfony/Bundle/FrameworkBundle/RequestListener.php +++ b/src/Symfony/Bundle/FrameworkBundle/RequestListener.php @@ -110,7 +110,7 @@ class RequestListener if (null !== $this->logger) { $this->logger->err($message); } - throw new MethodNotAllowedHttpException($e->getAllowedMethods(), 'Method Not Allowed', $message, 0, $e); + throw new MethodNotAllowedHttpException($e->getAllowedMethods(), $message, $e, 0); } } } From e2492a4879585b5d5bd7ebc1298d5bf59ecc7126 Mon Sep 17 00:00:00 2001 From: Aurelijus Date: Thu, 24 Mar 2011 16:21:55 +0200 Subject: [PATCH 2/5] removed 0 --- src/Symfony/Bundle/FrameworkBundle/RequestListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/RequestListener.php b/src/Symfony/Bundle/FrameworkBundle/RequestListener.php index c3e8e918be..5a5c81721d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/RequestListener.php +++ b/src/Symfony/Bundle/FrameworkBundle/RequestListener.php @@ -110,7 +110,7 @@ class RequestListener if (null !== $this->logger) { $this->logger->err($message); } - throw new MethodNotAllowedHttpException($e->getAllowedMethods(), $message, $e, 0); + throw new MethodNotAllowedHttpException($e->getAllowedMethods(), $message, $e); } } } From 2f8d5cd1c04b588ccc43fa3c6d3f79a041192bd7 Mon Sep 17 00:00:00 2001 From: Kris Wallsmith Date: Thu, 24 Mar 2011 15:17:59 -0700 Subject: [PATCH 3/5] [FrameworkBundle] fixed build of config for asset packages --- .../DependencyInjection/FrameworkExtension.php | 4 ++-- .../FrameworkBundle/Resources/config/templating_php.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 45c3251085..dabbe6f65c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -340,12 +340,12 @@ class FrameworkExtension extends Extension $packages = array(); foreach ($config['packages'] as $name => $package) { - $packages[$name] = new Definition('Symfony\\Component\\Templating\\Asset\\AssetPackage', array( + $packages[$name] = new Definition('%templating.asset_package.class%', array( $package['base_urls'], $package['version'], )); } - $container->setParameter('templating.assets.packages', $packages); + $container->getDefinition('templating.helper.assets')->setArgument(3, $packages); if (!empty($config['loaders'])) { $loaders = array_map(function($loader) { return new Reference($loader); }, $config['loaders']); diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml index 1b92314e3d..39974b624e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml @@ -16,6 +16,7 @@ Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables + Symfony\Component\Templating\Asset\AssetPackage @@ -36,7 +37,7 @@ %templating.assets.base_urls% %templating.assets.version% - %templating.assets.packages% + From 614cf4c7b00eabc88ea3ef521df43ad5eb8d1e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20H=C3=A9rault?= Date: Fri, 25 Mar 2011 00:15:19 +0100 Subject: [PATCH 4/5] Remove kernel from the web debug toolbar --- .../Bundle/WebProfilerBundle/Resources/config/toolbar.xml | 1 - .../Tests/WebDebugToolbarListenerTest.php | 7 ++----- .../Bundle/WebProfilerBundle/WebDebugToolbarListener.php | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml index 6ca5ba0419..a65a331129 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml @@ -12,7 +12,6 @@ - %debug.toolbar.intercept_redirects% diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php index cf1765bee2..d1c79c357b 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php @@ -21,14 +21,13 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase */ public function testInjectToolbar($content, $expected) { - $kernel = $this->getMock('Symfony\Bundle\FrameworkBundle\HttpKernel', array(), array(), '', false); $templating = $this->getMock('Symfony\Bundle\TwigBundle\TwigEngine', array(), array(), '', false); $templating->expects($this->any()) ->method('render') ->will($this->returnValue('WDT')); ; $request = $this->getMock('Symfony\Component\HttpFoundation\Request'); - $listener = new WebDebugToolbarListener($kernel, $templating); + $listener = new WebDebugToolbarListener($templating); $m = new \ReflectionMethod($listener, 'injectToolbar'); $m->setAccessible(true); @@ -51,9 +50,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase - -WDT - + \nWDT\n "), ); } diff --git a/src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php index bd83a4e706..310fcf749c 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php +++ b/src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php @@ -30,13 +30,11 @@ use Symfony\Bundle\TwigBundle\TwigEngine; */ class WebDebugToolbarListener { - protected $kernel; protected $templating; protected $interceptRedirects; - public function __construct(HttpKernel $kernel, TwigEngine $templating, $interceptRedirects = false) + public function __construct(TwigEngine $templating, $interceptRedirects = false) { - $this->kernel = $kernel; $this->templating = $templating; $this->interceptRedirects = $interceptRedirects; } @@ -48,7 +46,7 @@ class WebDebugToolbarListener } $response = $event->getResponse(); - $request = $event->getRequest(); + $request = $event->getRequest(); if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects) { // keep current flashes for one more request From 0e57943531775a6fe571958b60bea46261b8d7bd Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 25 Mar 2011 07:19:02 +0100 Subject: [PATCH 5/5] [HttpKernel] fixed typo --- src/Symfony/Component/HttpKernel/Exception/HttpException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/Exception/HttpException.php b/src/Symfony/Component/HttpKernel/Exception/HttpException.php index c487f7a057..4e1b52632b 100644 --- a/src/Symfony/Component/HttpKernel/Exception/HttpException.php +++ b/src/Symfony/Component/HttpKernel/Exception/HttpException.php @@ -26,7 +26,7 @@ class HttpException extends \RuntimeException implements HttpExceptionInterface $this->statusCode = $statusCode; $this->headers = $headers; - parent::__construct($message, 0, $previous); + parent::__construct($message, $code, $previous); } public function getStatusCode()