- {% set notification = event.message.getNotification() %}
{{- 'Subject: ' ~ notification.getSubject() }}
+
{{ source('@WebProfiler/Icon/symfony.svg') }}
diff --git a/Tests/Controller/ProfilerControllerTest.php b/Tests/Controller/ProfilerControllerTest.php
index 86de485e..67355d90 100644
--- a/Tests/Controller/ProfilerControllerTest.php
+++ b/Tests/Controller/ProfilerControllerTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Bundle\WebProfilerBundle\Tests\Controller;
+use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Bundle\FrameworkBundle\KernelBrowser;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Symfony\Bundle\WebProfilerBundle\Controller\ProfilerController;
@@ -135,7 +136,7 @@ public function testToolbarActionWithEmptyToken($token)
$this->assertEquals(200, $response->getStatusCode());
}
- public function getEmptyTokenCases()
+ public static function getEmptyTokenCases()
{
return [
[null],
@@ -164,7 +165,7 @@ public function testOpeningDisallowedPaths($path, $isAllowed)
}
}
- public function getOpenFileCases()
+ public static function getOpenFileCases()
{
return [
['README.md', true],
@@ -354,7 +355,7 @@ public function testPhpinfoAction()
$this->assertStringContainsString('PHP License', $client->getResponse()->getContent());
}
- public function provideCspVariants()
+ public static function provideCspVariants()
{
return [
[true],
@@ -366,6 +367,99 @@ public function provideCspVariants()
* @dataProvider defaultPanelProvider
*/
public function testDefaultPanel(string $expectedPanel, Profile $profile)
+ {
+ $this->assertDefaultPanel($expectedPanel, $profile);
+ }
+
+ public static function defaultPanelProvider(): \Generator
+ {
+ // Test default behavior
+ $profile = new Profile('xxxxxx');
+ $profile->addCollector($requestDataCollector = new RequestDataCollector());
+ yield [$requestDataCollector->getName(), $profile];
+
+ // Test exception
+ $profile = new Profile('xxxxxx');
+ $profile->addCollector($exceptionDataCollector = new ExceptionDataCollector());
+ $exceptionDataCollector->collect(new Request(), new Response(), new \DomainException());
+ yield [$exceptionDataCollector->getName(), $profile];
+ }
+
+ private function createController($profiler, $twig, $withCSP, array $templates = []): ProfilerController
+ {
+ $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
+
+ if ($withCSP) {
+ $nonceGenerator = $this->createMock(NonceGenerator::class);
+ $nonceGenerator->method('generate')->willReturn('dummy_nonce');
+
+ return new ProfilerController($urlGenerator, $profiler, $twig, $templates, new ContentSecurityPolicyHandler($nonceGenerator));
+ }
+
+ return new ProfilerController($urlGenerator, $profiler, $twig, $templates);
+ }
+
+ public function testDumpPanelExceptionPriority()
+ {
+ $exceptionDataCollector = new ExceptionDataCollector();
+ $exceptionDataCollector->collect(new Request(), new Response(), new \DomainException());
+
+ $dumpDataCollector = $this->createDumpDataCollector();
+
+ $profile = new Profile('xxxxxx');
+ $profile->setCollectors([$exceptionDataCollector, $dumpDataCollector]);
+
+ $this->assertDefaultPanel($exceptionDataCollector->getName(), $profile);
+ }
+
+ public function testDumpPanelWhenDefinedAfterwards()
+ {
+ $exceptionDataCollector = new ExceptionDataCollector();
+ $exceptionDataCollector->collect(new Request(), new Response(), new \DomainException());
+
+ $dumpDataCollector = $this->createDumpDataCollector();
+ $dumpDataCollector
+ ->expects($this->atLeastOnce())
+ ->method('getDumpsCount')
+ ->willReturn(1)
+ ;
+
+ $profile = new Profile('xxxxxx');
+ $profile->setCollectors([$dumpDataCollector, $exceptionDataCollector]);
+
+ $this->assertDefaultPanel($exceptionDataCollector->getName(), $profile);
+ }
+
+ public function testDumpPanel()
+ {
+ $dumpDataCollector = $this->createDumpDataCollector();
+ $dumpDataCollector
+ ->expects($this->atLeastOnce())
+ ->method('getDumpsCount')
+ ->willReturn(1)
+ ;
+
+ $profile = new Profile('xxxxxx');
+ $profile->addCollector($dumpDataCollector);
+
+ $this->assertDefaultPanel($dumpDataCollector->getName(), $profile);
+ }
+
+ /**
+ * @return MockObject&DumpDataCollector
+ */
+ private function createDumpDataCollector(): MockObject
+ {
+ $dumpDataCollector = $this->createMock(DumpDataCollector::class);
+ $dumpDataCollector
+ ->expects($this->atLeastOnce())
+ ->method('getName')
+ ->willReturn('dump');
+
+ return $dumpDataCollector;
+ }
+
+ private function assertDefaultPanel(string $expectedPanel, Profile $profile)
{
$profiler = $this->createMock(Profiler::class);
$profiler
@@ -415,56 +509,4 @@ public function testDefaultPanel(string $expectedPanel, Profile $profile)
}, $collectorsNames))
->panelAction(new Request(), $profile->getToken());
}
-
- public function defaultPanelProvider(): \Generator
- {
- // Test default behavior
- $profile = new Profile('xxxxxx');
- $profile->addCollector($requestDataCollector = new RequestDataCollector());
- yield [$requestDataCollector->getName(), $profile];
-
- // Test exception
- $profile = new Profile('xxxxxx');
- $profile->addCollector($exceptionDataCollector = new ExceptionDataCollector());
- $exceptionDataCollector->collect(new Request(), new Response(), new \DomainException());
- yield [$exceptionDataCollector->getName(), $profile];
-
- // Test exception priority
- $dumpDataCollector = $this->createMock(DumpDataCollector::class);
- $dumpDataCollector
- ->expects($this->atLeastOnce())
- ->method('getName')
- ->willReturn('dump');
- $dumpDataCollector
- ->expects($this->atLeastOnce())
- ->method('getDumpsCount')
- ->willReturn(1);
- $profile = new Profile('xxxxxx');
- $profile->setCollectors([$exceptionDataCollector, $dumpDataCollector]);
- yield [$exceptionDataCollector->getName(), $profile];
-
- // Test exception priority when defined afterwards
- $profile = new Profile('xxxxxx');
- $profile->setCollectors([$dumpDataCollector, $exceptionDataCollector]);
- yield [$exceptionDataCollector->getName(), $profile];
-
- // Test dump
- $profile = new Profile('xxxxxx');
- $profile->addCollector($dumpDataCollector);
- yield [$dumpDataCollector->getName(), $profile];
- }
-
- private function createController($profiler, $twig, $withCSP, array $templates = []): ProfilerController
- {
- $urlGenerator = $this->createMock(UrlGeneratorInterface::class);
-
- if ($withCSP) {
- $nonceGenerator = $this->createMock(NonceGenerator::class);
- $nonceGenerator->method('generate')->willReturn('dummy_nonce');
-
- return new ProfilerController($urlGenerator, $profiler, $twig, $templates, new ContentSecurityPolicyHandler($nonceGenerator));
- }
-
- return new ProfilerController($urlGenerator, $profiler, $twig, $templates);
- }
}
diff --git a/Tests/Csp/ContentSecurityPolicyHandlerTest.php b/Tests/Csp/ContentSecurityPolicyHandlerTest.php
index c345b5fb..7d5c0761 100644
--- a/Tests/Csp/ContentSecurityPolicyHandlerTest.php
+++ b/Tests/Csp/ContentSecurityPolicyHandlerTest.php
@@ -46,7 +46,7 @@ public function testOnKernelResponse($nonce, $expectedNonce, Request $request, R
}
}
- public function provideRequestAndResponses()
+ public static function provideRequestAndResponses()
{
$nonce = bin2hex(random_bytes(16));
@@ -73,7 +73,7 @@ public function provideRequestAndResponses()
];
}
- public function provideRequestAndResponsesForOnKernelResponse()
+ public static function provideRequestAndResponsesForOnKernelResponse()
{
$nonce = bin2hex(random_bytes(16));
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
index a0bc7f43..d957cafc 100644
--- a/Tests/DependencyInjection/ConfigurationTest.php
+++ b/Tests/DependencyInjection/ConfigurationTest.php
@@ -29,7 +29,7 @@ public function testConfigTree(array $options, array $expectedResult)
$this->assertEquals($expectedResult, $config);
}
- public function getDebugModes()
+ public static function getDebugModes()
{
return [
[
@@ -71,7 +71,7 @@ public function testConfigTreeUsingInterceptRedirects(bool $interceptRedirects,
$this->assertEquals($expectedResult, $config);
}
- public function getInterceptRedirectsConfiguration()
+ public static function getInterceptRedirectsConfiguration()
{
return [
[
diff --git a/Tests/DependencyInjection/WebProfilerExtensionTest.php b/Tests/DependencyInjection/WebProfilerExtensionTest.php
index fbfd2ed5..decbd99e 100644
--- a/Tests/DependencyInjection/WebProfilerExtensionTest.php
+++ b/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -22,6 +22,9 @@
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\HttpKernel\Profiler\Profiler;
+use Symfony\Component\HttpKernel\Profiler\ProfilerStorageInterface;
+use Symfony\Component\Routing\RouterInterface;
class WebProfilerExtensionTest extends TestCase
{
@@ -55,11 +58,15 @@ protected function setUp(): void
$this->kernel = $this->createMock(KernelInterface::class);
+ $profiler = $this->createMock(Profiler::class);
+ $profilerStorage = $this->createMock(ProfilerStorageInterface::class);
+ $router = $this->createMock(RouterInterface::class);
+
$this->container = new ContainerBuilder();
$this->container->register('data_collector.dump', DumpDataCollector::class)->setPublic(true);
$this->container->register('error_handler.error_renderer.html', HtmlErrorRenderer::class)->setPublic(true);
$this->container->register('event_dispatcher', EventDispatcher::class)->setPublic(true);
- $this->container->register('router', $this->getMockClass('Symfony\\Component\\Routing\\RouterInterface'))->setPublic(true);
+ $this->container->register('router', $router::class)->setPublic(true);
$this->container->register('twig', 'Twig\Environment')->setPublic(true);
$this->container->register('twig_loader', 'Twig\Loader\ArrayLoader')->addArgument([])->setPublic(true);
$this->container->register('twig', 'Twig\Environment')->addArgument(new Reference('twig_loader'))->setPublic(true);
@@ -71,9 +78,9 @@ protected function setUp(): void
$this->container->setParameter('kernel.charset', 'UTF-8');
$this->container->setParameter('debug.file_link_format', null);
$this->container->setParameter('profiler.class', ['Symfony\\Component\\HttpKernel\\Profiler\\Profiler']);
- $this->container->register('profiler', $this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\Profiler'))
+ $this->container->register('profiler', $profiler::class)
->setPublic(true)
- ->addArgument(new Definition($this->getMockClass('Symfony\\Component\\HttpKernel\\Profiler\\ProfilerStorageInterface')));
+ ->addArgument(new Definition($profilerStorage::class));
$this->container->setParameter('data_collector.templates', []);
$this->container->set('kernel', $this->kernel);
$this->container->addCompilerPass(new RegisterListenersPass());
@@ -103,7 +110,7 @@ public function testDefaultConfig($debug)
self::assertSaneContainer($this->getCompiledContainer());
}
- public function getDebugModes()
+ public static function getDebugModes()
{
return [
['debug' => false],
@@ -129,7 +136,7 @@ public function testToolbarConfig(bool $toolbarEnabled, bool $listenerInjected,
}
}
- public function getToolbarConfig()
+ public static function getToolbarConfig()
{
return [
[
@@ -170,7 +177,7 @@ public function testToolbarConfigUsingInterceptRedirects(
}
}
- public function getInterceptRedirectsToolbarConfig()
+ public static function getInterceptRedirectsToolbarConfig()
{
return [
[
diff --git a/Tests/EventListener/WebDebugToolbarListenerTest.php b/Tests/EventListener/WebDebugToolbarListenerTest.php
index 845d1413..3744e47c 100644
--- a/Tests/EventListener/WebDebugToolbarListenerTest.php
+++ b/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -39,7 +39,7 @@ public function testInjectToolbar($content, $expected)
$this->assertEquals($expected, $response->getContent());
}
- public function getInjectToolbarTests()
+ public static function getInjectToolbarTests()
{
return [
['', "\nWDT\n"],
@@ -133,6 +133,7 @@ public function testToolbarIsNotInjectedOnContentDispositionAttachment()
/**
* @depends testToolbarIsInjected
+ *
* @dataProvider provideRedirects
*/
public function testToolbarIsNotInjectedOnRedirection($statusCode)
@@ -147,7 +148,7 @@ public function testToolbarIsNotInjectedOnRedirection($statusCode)
$this->assertEquals('', $response->getContent());
}
- public function provideRedirects()
+ public static function provideRedirects()
{
return [
[301],
diff --git a/Tests/Resources/IconTest.php b/Tests/Resources/IconTest.php
index 9ce9a4c5..721ebf59 100644
--- a/Tests/Resources/IconTest.php
+++ b/Tests/Resources/IconTest.php
@@ -32,7 +32,7 @@ public function testIconFileContents($iconFilePath)
$this->assertMatchesRegularExpression('~.* ~s', file_get_contents($iconFilePath), sprintf('The SVG file of the "%s" icon must include a "viewBox" attribute.', $iconFilePath));
}
- public function provideIconFilePaths()
+ public static function provideIconFilePaths()
{
return array_map(function ($filePath) { return (array) $filePath; }, glob(__DIR__.'/../../Resources/views/Icon/*.svg'));
}
diff --git a/Tests/Twig/WebProfilerExtensionTest.php b/Tests/Twig/WebProfilerExtensionTest.php
index 6b026bcc..1bb1296b 100644
--- a/Tests/Twig/WebProfilerExtensionTest.php
+++ b/Tests/Twig/WebProfilerExtensionTest.php
@@ -42,7 +42,7 @@ class_exists(EscaperExtension::class); // Load twig_escape_filter()
self::assertSame($dump2HasHeader, str_contains($dump2, $needle));
}
- public function provideMessages(): iterable
+ public static function provideMessages(): iterable
{
yield ['Some message', ['foo' => 'foo', 'bar' => 'bar'], false, true];
yield ['Some message {@see some text}', ['foo' => 'foo', 'bar' => 'bar'], false, true];