Skip to content

Commit 63c8298

Browse files
committed
Removed extra space in link and script tag
1 parent dcbbe78 commit 63c8298

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
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: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -405,39 +405,39 @@ public function dataProviderRenderAssets()
405405
[
406406
['type' => 'css', 'attributes' => '', 'condition' => null],
407407
['type' => 'js', 'attributes' => 'attr="value"', 'condition' => null],
408-
'<link rel="stylesheet" type="text/css" media="all" href="url" />' . "\n"
409-
. '<link rel="stylesheet" type="text/css" media="all" href="url" />' . "\n"
410-
. '<script type="text/javascript" attr="value" src="no_route_url"></script>' . "\n"
408+
'<link rel="stylesheet" type="text/css" media="all" href="url" />' . "\n"
409+
. '<link rel="stylesheet" type="text/css" media="all" href="url" />' . "\n"
410+
. '<script type="text/javascript" attr="value" src="no_route_url"></script>' . "\n"
411411
],
412412
[
413413
['type' => 'js', 'attributes' => ['attr' => 'value'], 'condition' => 'lt IE 7'],
414414
['type' => 'css', 'attributes' => 'attr="value"', 'condition' => null],
415-
'<link rel="stylesheet" type="text/css" attr="value" href="no_route_url" />' . "\n"
415+
'<link rel="stylesheet" type="text/css" attr="value" href="no_route_url" />' . "\n"
416416
. '<!--[if lt IE 7]>' . "\n"
417-
. '<script type="text/javascript" attr="value" src="url"></script>' . "\n"
418-
. '<script type="text/javascript" attr="value" src="url"></script>' . "\n"
417+
. '<script type="text/javascript" attr="value" src="url"></script>' . "\n"
418+
. '<script type="text/javascript" attr="value" src="url"></script>' . "\n"
419419
. '<![endif]-->' . "\n"
420420
],
421421
[
422422
['type' => 'ico', 'attributes' => 'attr="value"', 'condition' => null],
423423
['type' => 'css', 'attributes' => '', 'condition' => null],
424-
'<link rel="stylesheet" type="text/css" media="all" href="no_route_url" />' . "\n"
425-
. '<link attr="value" href="url" />' . "\n"
426-
. '<link attr="value" href="url" />' . "\n"
424+
'<link rel="stylesheet" type="text/css" media="all" href="no_route_url" />' . "\n"
425+
. '<link attr="value" href="url" />' . "\n"
426+
. '<link attr="value" href="url" />' . "\n"
427427
],
428428
[
429429
['type' => 'js', 'attributes' => '', 'condition' => null],
430430
['type' => 'ico', 'attributes' => ['attr' => 'value'], 'condition' => null],
431-
'<link attr="value" href="no_route_url" />' . "\n"
432-
. '<script type="text/javascript" src="url"></script>' . "\n"
433-
. '<script type="text/javascript" src="url"></script>' . "\n"
431+
'<link attr="value" href="no_route_url" />' . "\n"
432+
. '<script type="text/javascript" src="url"></script>' . "\n"
433+
. '<script type="text/javascript" src="url"></script>' . "\n"
434434
],
435435
[
436436
['type' => 'non', 'attributes' => ['attr' => 'value'], 'condition' => null],
437437
['type' => 'ico', 'attributes' => '', 'condition' => null],
438-
'<link href="no_route_url" />' . "\n"
439-
. '<link attr="value" href="url" />' . "\n"
440-
. '<link attr="value" href="url" />' . "\n"
438+
'<link href="no_route_url" />' . "\n"
439+
. '<link attr="value" href="url" />' . "\n"
440+
. '<link attr="value" href="url" />' . "\n"
441441
],
442442
];
443443
}
@@ -481,7 +481,7 @@ public function testRenderAssetWithNoContentType() : void
481481
->willReturn([$groupMockOne]);
482482

483483
$this->assertEquals(
484-
'<link rel="some-rel" href="url" />' . "\n",
484+
'<link rel="some-rel" href="url" />' . "\n",
485485
$this->renderer->renderAssets($this->renderer->getAvailableResultGroups())
486486
);
487487
}

0 commit comments

Comments
 (0)