Commitc36fcff

authored and

committed

[WebProfilerBundle] Render the toolbar stylesheet

1 parentbb53ec1 commitc36fcffCopy full SHA for c36fcff

File tree

+56

-3

lines changed

+56

-3

lines changed

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,27 @@ public function toolbarAction(Request $request, ?string $token = null): Response`
`162`	`162`	`]);`
`163`	`163`	`}`
`164`	`164`
	`165`	`+/**`
	`166`	`+ * Renders the Web Debug Toolbar stylesheet.`
	`167`	`+ *`
	`168`	`+ * @throws NotFoundHttpException`
	`169`	`+ */`
	`170`	`+publicfunctiontoolbarStylesheetAction():Response`
	`171`	`+ {`
	`172`	`+$this->denyAccessIfProfilerDisabled();`
	`173`	`+`
	`174`	`+$this->cspHandler?->disableCsp();`
	`175`	`+`
	`176`	`+returnnewResponse(`
	`177`	`+$this->twig->render('@WebProfiler/Profiler/toolbar.css.twig'),`
	`178`	`+200,`
	`179`	`+ [`
	`180`	`+'Content-Type' =>'text/css',`
	`181`	`+'Cache-Control' =>'max-age=600, private',`
	`182`	`+ ],`
	`183`	`+ );`
	`184`	`+ }`
	`185`	`+`
`165`	`186`	`/**`
`166`	`187`	`* Renders the profiler search bar.`
`167`	`188`	`*`
`@@ -383,6 +404,9 @@ protected function getTemplateManager(): TemplateManager`
`383`	`404`	`return$this->templateManager ??=newTemplateManager($this->profiler,$this->twig,$this->templates);`
`384`	`405`	`}`
`385`	`406`
	`407`	`+/**`
	`408`	`+ * @throws NotFoundHttpException`
	`409`	`+ */`
`386`	`410`	`privatefunctiondenyAccessIfProfilerDisabled():void`
`387`	`411`	`{`
`388`	`412`	`if (null ===$this->profiler) {`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,10 @@`
`4`	`4`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`5`	`5`	`xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">`
`6`	`6`
	`7`	`+ <routeid="_wdt_stylesheet"path="/styles.css">`
	`8`	`+ <defaultkey="_controller">web_profiler.controller.profiler::toolbarStylesheetAction</default>`
	`9`	`+ </route>`
	`10`	`+`
`7`	`11`	`<routeid="_wdt"path="/{token}">`
`8`	`12`	`<defaultkey="_controller">web_profiler.controller.profiler::toolbarAction</default>`
`9`	`13`	`</route>`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,7 @@`
`9`	`9`	`}) }}`
`10`	`10`	`</div>`
`11`	`11`
`12`		`-<style{%ifcsp_style_nonce %}nonce="{{csp_style_nonce }}"{%endif %}>`
`13`		`- {{include('@WebProfiler/Profiler/toolbar.css.twig') }}`
`14`		`-</style>`
	`12`	`+<linkrel="stylesheet"{%ifcsp_style_nonce %}nonce="{{csp_style_nonce }}"{%endif %}href="{{ url('_wdt_stylesheet') }}" />`
`15`	`13`
`16`	`14`	`{# CAUTION: the contents of this file are processed by Twig before loading`
`17`	`15`	`them as JavaScript source code. Always use '/*' comments instead`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,33 @@ public function testToolbarActionWithEmptyToken($token)`
`137`	`137`	`$this->assertEquals(200,$response->getStatusCode());`
`138`	`138`	`}`
`139`	`139`
	`140`	`+publicfunctiontestToolbarStylesheetActionWithProfilerDisabled()`
	`141`	`+ {`
	`142`	`+$urlGenerator =$this->createMock(UrlGeneratorInterface::class);`
	`143`	`+$twig =$this->createMock(Environment::class);`
	`144`	`+`
	`145`	`+$controller =newProfilerController($urlGenerator,null,$twig, []);`
	`146`	`+`
	`147`	`+$this->expectException(NotFoundHttpException::class);`
	`148`	`+$this->expectExceptionMessage('The profiler must be enabled.');`
	`149`	`+`
	`150`	`+$controller->toolbarStylesheetAction();`
	`151`	`+ }`
	`152`	`+`
	`153`	`+publicfunctiontestToolbarStylesheetAction()`
	`154`	`+ {`
	`155`	`+$urlGenerator =$this->createMock(UrlGeneratorInterface::class);`
	`156`	`+$twig =$this->createMock(Environment::class);`
	`157`	`+$profiler =$this->createMock(Profiler::class);`
	`158`	`+`
	`159`	`+$controller =newProfilerController($urlGenerator,$profiler,$twig, []);`
	`160`	`+`
	`161`	`+$response =$controller->toolbarStylesheetAction();`
	`162`	`+$this->assertSame(200,$response->getStatusCode());`
	`163`	`+$this->assertSame('text/css',$response->headers->get('Content-Type'));`
	`164`	`+$this->assertSame('max-age=600, private',$response->headers->get('Cache-Control'));`
	`165`	`+ }`
	`166`	`+`
`140`	`167`	`publicstaticfunctiongetEmptyTokenCases()`
`141`	`168`	`{`
`142`	`169`	`return [`

Comments

(0)