diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into experimental

Browse Source
This commit is contained in:
Bernhard Schussek 2011-03-25 09:24:38 +01:00
commit eb18676354
7 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -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']);

2
src/Symfony/Bundle/FrameworkBundle/RequestListener.php
View File

@ -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);
}
}
}

3
src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
View File

@ -16,6 +16,7 @@
<parameter key="templating.helper.translator.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\TranslatorHelper</parameter>
<parameter key="templating.helper.form.class">Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper</parameter>
<parameter key="templating.globals.class">Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables</parameter>
<parameter key="templating.asset_package.class">Symfony\Component\Templating\Asset\AssetPackage</parameter>
</parameters>
<services>
@ -36,7 +37,7 @@
<argument type="service" id="request" strict="false" />
<argument>%templating.assets.base_urls%</argument>
<argument>%templating.assets.version%</argument>
<argument>%templating.assets.packages%</argument>
<argument type="collection" />
</service>
<service id="templating.helper.request" class="%templating.helper.request.class%">

1
src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
View File

@ -12,7 +12,6 @@
<services>
<service id="debug.toolbar" class="%debug.toolbar.class%">
<tag name="kernel.listener" event="onCoreResponse" priority="-128" />
<argument type="service" id="http_kernel" />
<argument type="service" id="templating.engine.twig" />
<argument>%debug.toolbar.intercept_redirects%</argument>
</service>

7
src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php
View File

@ -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
<head></head>
<body>
<textarea><html><head></head><body></body></html></textarea>
WDT
</body>
\nWDT\n</body>
</html>"),
);
}

6
src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php
View File

@ -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

2
src/Symfony/Component/HttpKernel/Exception/HttpException.php
View File

@ -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()