Skip to content

Commit a6f9324

Browse files
committed
Merge remote-tracking branch '32919/cleanup/remove-extra-space-in-link-script-tag' into community_prs_april
2 parents 1933e66 + c03b74a commit a6f9324

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

lib/internal/Magento/Framework/View/Page/Config/Renderer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,12 +375,12 @@ protected function getAssetTemplate($contentType, $attributes)
375375
{
376376
switch ($contentType) {
377377
case 'js':
378-
$groupTemplate = '<script ' . $attributes . ' src="%s"></script>' . "\n";
378+
$groupTemplate = preg_replace('/\s+/', ' ', '<script ' . $attributes . ' src="%s"></script>') . "\n";
379379
break;
380380

381381
case 'css':
382382
default:
383-
$groupTemplate = '<link ' . $attributes . ' href="%s" />' . "\n";
383+
$groupTemplate = preg_replace('/\s+/', ' ', '<link ' . $attributes . ' href="%s" />') . "\n";
384384
break;
385385
}
386386
return $groupTemplate;

lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -427,40 +427,40 @@ public function dataProviderRenderAssets(): array
427427
[
428428
['type' => 'css', 'attributes' => '', 'condition' => null],
429429
['type' => 'js', 'attributes' => 'attr="value"', 'condition' => null],
430-
'<link rel="stylesheet" type="text/css" media="all" href="url" />' . "\n"
431-
. '<link rel="stylesheet" type="text/css" media="all" href="url" />' . "\n"
432-
. '<script type="text/javascript" attr="value" src="no_route_url"></script>' . "\n"
430+
'<link rel="stylesheet" type="text/css" media="all" href="url" />' . "\n"
431+
. '<link rel="stylesheet" type="text/css" media="all" href="url" />' . "\n"
432+
. '<script type="text/javascript" attr="value" src="no_route_url"></script>' . "\n"
433433
],
434434
[
435435
['type' => 'js', 'attributes' => ['attr' => 'value'], 'condition' => 'lt IE 7'],
436436
['type' => 'css', 'attributes' => 'attr="value"', 'condition' => null],
437-
'<link rel="stylesheet" type="text/css" attr="value" href="no_route_url" />' . "\n"
437+
'<link rel="stylesheet" type="text/css" attr="value" href="no_route_url" />' . "\n"
438438
. '<!--[if lt IE 7]>' . "\n"
439-
. '<script type="text/javascript" attr="value" src="url"></script>' . "\n"
440-
. '<script type="text/javascript" attr="value" src="url"></script>' . "\n"
439+
. '<script type="text/javascript" attr="value" src="url"></script>' . "\n"
440+
. '<script type="text/javascript" attr="value" src="url"></script>' . "\n"
441441
. '<![endif]-->' . "\n"
442442
],
443443
[
444444
['type' => 'ico', 'attributes' => 'attr="value"', 'condition' => null],
445445
['type' => 'css', 'attributes' => '', 'condition' => null],
446-
'<link rel="stylesheet" type="text/css" media="all" href="no_route_url" />' . "\n"
447-
. '<link attr="value" href="url" />' . "\n"
448-
. '<link attr="value" href="url" />' . "\n"
446+
'<link rel="stylesheet" type="text/css" media="all" href="no_route_url" />' . "\n"
447+
. '<link attr="value" href="url" />' . "\n"
448+
. '<link attr="value" href="url" />' . "\n"
449449
],
450450
[
451451
['type' => 'js', 'attributes' => '', 'condition' => null],
452452
['type' => 'ico', 'attributes' => ['attr' => 'value'], 'condition' => null],
453-
'<link attr="value" href="no_route_url" />' . "\n"
454-
. '<script type="text/javascript" src="url"></script>' . "\n"
455-
. '<script type="text/javascript" src="url"></script>' . "\n"
453+
'<link attr="value" href="no_route_url" />' . "\n"
454+
. '<script type="text/javascript" src="url"></script>' . "\n"
455+
. '<script type="text/javascript" src="url"></script>' . "\n"
456456
],
457457
[
458458
['type' => 'non', 'attributes' => ['attr' => 'value'], 'condition' => null],
459459
['type' => 'ico', 'attributes' => '', 'condition' => null],
460-
'<link href="no_route_url" />' . "\n"
461-
. '<link attr="value" href="url" />' . "\n"
462-
. '<link attr="value" href="url" />' . "\n"
463-
]
460+
'<link href="no_route_url" />' . "\n"
461+
. '<link attr="value" href="url" />' . "\n"
462+
. '<link attr="value" href="url" />' . "\n"
463+
],
464464
];
465465
}
466466

@@ -506,7 +506,7 @@ public function testRenderAssetWithNoContentType() : void
506506
->willReturn([$groupMockOne]);
507507

508508
$this->assertEquals(
509-
'<link rel="some-rel" href="url" />' . "\n",
509+
'<link rel="some-rel" href="url" />' . "\n",
510510
$this->renderer->renderAssets($this->renderer->getAvailableResultGroups())
511511
);
512512
}

0 commit comments

Comments
 (0)