+
+
{{ include('@WebProfiler/Profiler/toolbar.html.twig', {
templates: {
'request': '@WebProfiler/Profiler/cancel.html.twig'
@@ -453,60 +454,32 @@
showToolbar: function(token) {
var sfwdt = this.getSfwdt(token);
- removeClass(sfwdt, 'sf-display-none');
- if (getPreference('toolbar/displayState') == 'none') {
- document.getElementById('sfToolbarMainContent-' + token).style.display = 'none';
- document.getElementById('sfToolbarClearer-' + token).style.display = 'none';
- document.getElementById('sfMiniToolbar-' + token).style.display = 'block';
+ if ('closed' === getPreference('toolbar/displayState')) {
+ addClass(sfwdt, 'sf-toolbar-closed');
+ removeClass(sfwdt, 'sf-toolbar-opened');
} else {
- document.getElementById('sfToolbarMainContent-' + token).style.display = 'block';
- document.getElementById('sfToolbarClearer-' + token).style.display = 'block';
- document.getElementById('sfMiniToolbar-' + token).style.display = 'none';
+ addClass(sfwdt, 'sf-toolbar-opened');
+ removeClass(sfwdt, 'sf-toolbar-closed');
}
},
hideToolbar: function(token) {
var sfwdt = this.getSfwdt(token);
- addClass(sfwdt, 'sf-display-none');
+ addClass(sfwdt, 'sf-toolbar-closed');
+ removeClass(sfwdt, 'sf-toolbar-opened');
},
initToolbar: function(token) {
this.showToolbar(token);
- var hideButton = document.getElementById('sfToolbarHideButton-' + token);
- var hideButtonSvg = hideButton.querySelector('svg');
- hideButtonSvg.setAttribute('aria-hidden', 'true');
- hideButtonSvg.setAttribute('focusable', 'false');
- addEventListener(hideButton, 'click', function (event) {
+ var toggleButton = document.querySelector(`#sfToolbarToggleButton-${token}`);
+ addEventListener(toggleButton, 'click', function (event) {
event.preventDefault();
- var p = this.parentNode;
- p.style.display = 'none';
- (p.previousElementSibling || p.previousSibling).style.display = 'none';
- document.getElementById('sfMiniToolbar-' + token).style.display = 'block';
- setPreference('toolbar/displayState', 'none');
- });
-
- var showButton = document.getElementById('sfToolbarMiniToggler-' + token);
- var showButtonSvg = showButton.querySelector('svg');
- showButtonSvg.setAttribute('aria-hidden', 'true');
- showButtonSvg.setAttribute('focusable', 'false');
- addEventListener(showButton, 'click', function (event) {
- event.preventDefault();
-
- var elem = this.parentNode;
- if (elem.style.display == 'none') {
- document.getElementById('sfToolbarMainContent-' + token).style.display = 'none';
- document.getElementById('sfToolbarClearer-' + token).style.display = 'none';
- elem.style.display = 'block';
- } else {
- document.getElementById('sfToolbarMainContent-' + token).style.display = 'block';
- document.getElementById('sfToolbarClearer-' + token).style.display = 'block';
- elem.style.display = 'none'
- }
-
- setPreference('toolbar/displayState', 'block');
+ const newState = 'opened' === getPreference('toolbar/displayState') ? 'closed' : 'opened';
+ setPreference('toolbar/displayState', newState);
+ 'opened' === newState ? Sfjs.showToolbar(token) : Sfjs.hideToolbar(token);
});
},
@@ -655,3 +628,4 @@
Sfjs.loadToolbar('{{ token }}');
/*]]>*/
+
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
index d957cafc..6a9fc99f 100644
--- a/Tests/DependencyInjection/ConfigurationTest.php
+++ b/Tests/DependencyInjection/ConfigurationTest.php
@@ -36,7 +36,10 @@ public static function getDebugModes()
'options' => [],
'expectedResult' => [
'intercept_redirects' => false,
- 'toolbar' => false,
+ 'toolbar' => [
+ 'enabled' => false,
+ 'ajax_replace' => false,
+ ],
'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt',
],
],
@@ -44,7 +47,10 @@ public static function getDebugModes()
'options' => ['toolbar' => true],
'expectedResult' => [
'intercept_redirects' => false,
- 'toolbar' => true,
+ 'toolbar' => [
+ 'enabled' => true,
+ 'ajax_replace' => false,
+ ],
'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt',
],
],
@@ -52,10 +58,24 @@ public static function getDebugModes()
'options' => ['excluded_ajax_paths' => 'test'],
'expectedResult' => [
'intercept_redirects' => false,
- 'toolbar' => false,
+ 'toolbar' => [
+ 'enabled' => false,
+ 'ajax_replace' => false,
+ ],
'excluded_ajax_paths' => 'test',
],
],
+ [
+ 'options' => ['toolbar' => ['ajax_replace' => true]],
+ 'expectedResult' => [
+ 'intercept_redirects' => false,
+ 'toolbar' => [
+ 'enabled' => true,
+ 'ajax_replace' => true,
+ ],
+ 'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt',
+ ],
+ ],
];
}
@@ -78,7 +98,10 @@ public static function getInterceptRedirectsConfiguration()
'interceptRedirects' => true,
'expectedResult' => [
'intercept_redirects' => true,
- 'toolbar' => false,
+ 'toolbar' => [
+ 'enabled' => false,
+ 'ajax_replace' => false,
+ ],
'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt',
],
],
@@ -86,7 +109,10 @@ public static function getInterceptRedirectsConfiguration()
'interceptRedirects' => false,
'expectedResult' => [
'intercept_redirects' => false,
- 'toolbar' => false,
+ 'toolbar' => [
+ 'enabled' => false,
+ 'ajax_replace' => false,
+ ],
'excluded_ajax_paths' => '^/((index|app(_[\w]+)?)\.php/)?_wdt',
],
],
diff --git a/Tests/EventListener/WebDebugToolbarListenerTest.php b/Tests/EventListener/WebDebugToolbarListenerTest.php
index cf3c1892..981c85be 100644
--- a/Tests/EventListener/WebDebugToolbarListenerTest.php
+++ b/Tests/EventListener/WebDebugToolbarListenerTest.php
@@ -360,6 +360,66 @@ public function testNullContentTypeWithNoDebugEnv()
$this->expectNotToPerformAssertions();
}
+ public function testAjaxReplaceHeaderOnDisabledToolbar()
+ {
+ $response = new Response();
+ $event = new ResponseEvent($this->createMock(Kernel::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $response);
+
+ $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::DISABLED, null, '', null, null, true);
+ $listener->onKernelResponse($event);
+
+ $this->assertFalse($response->headers->has('Symfony-Debug-Toolbar-Replace'));
+ }
+
+ public function testAjaxReplaceHeaderOnDisabledReplace()
+ {
+ $response = new Response();
+ $event = new ResponseEvent($this->createMock(Kernel::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $response);
+
+ $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, null, '', null, null);
+ $listener->onKernelResponse($event);
+
+ $this->assertFalse($response->headers->has('Symfony-Debug-Toolbar-Replace'));
+ }
+
+ public function testAjaxReplaceHeaderOnEnabledAndNonXHR()
+ {
+ $response = new Response();
+ $event = new ResponseEvent($this->createMock(Kernel::class), new Request(), HttpKernelInterface::MAIN_REQUEST, $response);
+
+ $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, null, '', null, null, true);
+ $listener->onKernelResponse($event);
+
+ $this->assertFalse($response->headers->has('Symfony-Debug-Toolbar-Replace'));
+ }
+
+ public function testAjaxReplaceHeaderOnEnabledAndXHR()
+ {
+ $request = new Request();
+ $request->headers->set('X-Requested-With', 'XMLHttpRequest');
+ $response = new Response();
+ $event = new ResponseEvent($this->createMock(Kernel::class), $request, HttpKernelInterface::MAIN_REQUEST, $response);
+
+ $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, null, '', null, null, true);
+ $listener->onKernelResponse($event);
+
+ $this->assertSame('1', $response->headers->get('Symfony-Debug-Toolbar-Replace'));
+ }
+
+ public function testAjaxReplaceHeaderOnEnabledAndXHRButPreviouslySet()
+ {
+ $request = new Request();
+ $request->headers->set('X-Requested-With', 'XMLHttpRequest');
+ $response = new Response();
+ $response->headers->set('Symfony-Debug-Toolbar-Replace', '0');
+ $event = new ResponseEvent($this->createMock(Kernel::class), $request, HttpKernelInterface::MAIN_REQUEST, $response);
+
+ $listener = new WebDebugToolbarListener($this->getTwigMock(), false, WebDebugToolbarListener::ENABLED, null, '', null, null, true);
+ $listener->onKernelResponse($event);
+
+ $this->assertSame('0', $response->headers->get('Symfony-Debug-Toolbar-Replace'));
+ }
+
protected function getTwigMock($render = 'WDT')
{
$templating = $this->createMock(Environment::class);
diff --git a/Tests/Functional/WebProfilerBundleKernel.php b/Tests/Functional/WebProfilerBundleKernel.php
index 64389602..0447e578 100644
--- a/Tests/Functional/WebProfilerBundleKernel.php
+++ b/Tests/Functional/WebProfilerBundleKernel.php
@@ -43,8 +43,8 @@ public function registerBundles(): iterable
protected function configureRoutes(RoutingConfigurator $routes): void
{
- $routes->import(__DIR__.'/../../Resources/config/routing/profiler.xml')->prefix('/_profiler');
- $routes->import(__DIR__.'/../../Resources/config/routing/wdt.xml')->prefix('/_wdt');
+ $routes->import(__DIR__.'/../../Resources/config/routing/profiler.php')->prefix('/_profiler');
+ $routes->import(__DIR__.'/../../Resources/config/routing/wdt.php')->prefix('/_wdt');
$routes->add('_', '/')->controller('kernel::homepageController');
}
@@ -55,7 +55,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
'http_method_override' => false,
'php_errors' => ['log' => true],
'secret' => 'foo-secret',
- 'profiler' => ['only_exceptions' => false],
+ 'profiler' => ['only_exceptions' => false, 'collect_serializer_data' => true],
'session' => ['handler_id' => null, 'storage_factory_id' => 'session.storage.factory.mock_file', 'cookie-secure' => 'auto', 'cookie-samesite' => 'lax'],
'router' => ['utf8' => true],
];
diff --git a/composer.json b/composer.json
index ce94b4b6..00269dd2 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,9 @@
],
"require": {
"php": ">=8.2",
- "symfony/config": "^6.4|^7.0",
+ "composer-runtime-api": ">=2.1",
+ "symfony/config": "^7.3",
+ "symfony/deprecation-contracts": "^2.5|^3",
"symfony/framework-bundle": "^6.4|^7.0",
"symfony/http-kernel": "^6.4|^7.0",
"symfony/routing": "^6.4|^7.0",
@@ -34,7 +36,8 @@
"symfony/form": "<6.4",
"symfony/mailer": "<6.4",
"symfony/messenger": "<6.4",
- "symfony/serializer": "<7.2"
+ "symfony/serializer": "<7.2",
+ "symfony/workflow": "<7.3"
},
"autoload": {
"psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" },