Skip to content

Commit 84121ef

Browse files
committed
MAGETWO-52660: Improve performance of static assets deployment
1 parent a94756b commit 84121ef

File tree

2 files changed

+3
-29
lines changed

2 files changed

+3
-29
lines changed

app/code/Magento/Deploy/Model/Deploy/TemplateMinifier.php

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,10 @@
77
namespace Magento\Deploy\Model\Deploy;
88

99
use Magento\Framework\View\Template\Html\MinifierInterface;
10-
use Magento\Framework\View\Asset\ConfigInterface as AssetConfig;
1110
use Magento\Framework\App\Utility\Files;
1211

1312
class TemplateMinifier
1413
{
15-
/**
16-
* @var AssetConfig
17-
*/
18-
private $assetConfig;
19-
2014
/**
2115
* @var Files
2216
*/
@@ -28,16 +22,13 @@ class TemplateMinifier
2822
private $htmlMinifier;
2923

3024
/**
31-
* @param AssetConfig $assetConfig
3225
* @param Files $filesUtils
3326
* @param MinifierInterface $htmlMinifier
3427
*/
3528
public function __construct(
36-
AssetConfig $assetConfig,
3729
Files $filesUtils,
3830
MinifierInterface $htmlMinifier
3931
) {
40-
$this->assetConfig = $assetConfig;
4132
$this->filesUtils = $filesUtils;
4233
$this->htmlMinifier = $htmlMinifier;
4334
}
@@ -49,13 +40,10 @@ public function __construct(
4940
public function minifyTemplates()
5041
{
5142
$minified = 0;
52-
if ($this->assetConfig->isMinifyHtml()) {
53-
foreach ($this->filesUtils->getPhtmlFiles(false, false) as $template) {
54-
$this->htmlMinifier->minify($template);
55-
$minified++;
56-
}
43+
foreach ($this->filesUtils->getPhtmlFiles(false, false) as $template) {
44+
$this->htmlMinifier->minify($template);
45+
$minified++;
5746
}
58-
5947
return $minified;
6048
}
6149
}

app/code/Magento/Deploy/Test/Unit/Model/Deploy/TemplateMinifierTest.php

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ class TemplateMinifierTest extends \PHPUnit_Framework_TestCase
1515
*/
1616
private $model;
1717

18-
/**
19-
* @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\View\Asset\ConfigInterface
20-
*/
21-
private $assetConfigMock;
22-
2318
/**
2419
* @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Utility\Files
2520
*/
@@ -32,13 +27,6 @@ class TemplateMinifierTest extends \PHPUnit_Framework_TestCase
3227

3328
protected function setUp()
3429
{
35-
$this->assetConfigMock = $this->getMock(
36-
\Magento\Framework\View\Asset\ConfigInterface::class,
37-
[],
38-
[],
39-
'',
40-
false
41-
);
4230
$this->minifierMock = $this->getMock(
4331
\Magento\Framework\View\Template\Html\MinifierInterface::class,
4432
[],
@@ -49,7 +37,6 @@ protected function setUp()
4937
$this->filesUtilsMock = $this->getMock(\Magento\Framework\App\Utility\Files::class, [], [], '', false);
5038

5139
$this->model = new \Magento\Deploy\Model\Deploy\TemplateMinifier(
52-
$this->assetConfigMock,
5340
$this->filesUtilsMock,
5441
$this->minifierMock
5542
);
@@ -60,7 +47,6 @@ public function testMinifyTemplates()
6047
$templateMock = "template.phtml";
6148
$templatesMock = [$templateMock];
6249

63-
$this->assetConfigMock->expects($this->once())->method('isMinifyHtml')->willReturn(true);
6450
$this->filesUtilsMock->expects($this->once())->method('getPhtmlFiles')->with(false, false)
6551
->willReturn($templatesMock);
6652
$this->minifierMock->expects($this->once())->method('minify')->with($templateMock);

0 commit comments

Comments
 (0)