Skip to content

Commit 3fc1085

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: [Console] Windows Test Error - change completecar for windows for passing test Increase compatibility of debug toolbar compatibility with Turbo
2 parents 3540952 + 578c2e3 commit 3fc1085

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -414,11 +414,7 @@
414414
renderAjaxRequests: renderAjaxRequests,
415415
416416
getSfwdt: function(token) {
417-
if (!this.sfwdt) {
418-
this.sfwdt = document.getElementById('sfwdt' + token);
419-
}
420-
421-
return this.sfwdt;
417+
return document.getElementById('sfwdt' + token);
422418
},
423419
424420
load: function(selector, url, onSuccess, onError, options) {

src/Symfony/Component/Console/Tests/Command/TraceableCommandTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ public function testRunIsNotOverriddenWithProfile()
5959

6060
public function assertLoopOutputCorrectness(string $output)
6161
{
62-
self::assertMatchesRegularExpression('~3/3\s+\[▓+]\s+100%~u', $output);
62+
$completeChar = '\\' !== \DIRECTORY_SEPARATOR ? '' : '=';
63+
self::assertMatchesRegularExpression('~3/3\s+\['.$completeChar.'+]\s+100%~u', $output);
6364
self::assertStringContainsString('Loop finished.', $output);
6465
self::assertEquals(3, substr_count($output, 'Hello world'));
6566
}

0 commit comments

Comments
 (0)