Skip to content

Issue 5316 #16332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 3 commits into from
Jun 26, 2018
Merged

Issue 5316 #16332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
544c7b6
Fix HTML minification problem #5316
lisovyievhenii Jun 22, 2018
9804cb1
Merge branch '2.3-develop' of https://github.com/lisovyievhenii/magen…
lisovyievhenii Jun 22, 2018
721fe0f
Adjust html minifier test to cover possible cases of issue #5316
lisovyievhenii Jun 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/internal/Magento/Framework/View/Template/Html/Minifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ public function minify($file)
'#(?<!:|\\\\|\'|")//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
'',
preg_replace(
'#(?<!:|\'|")//[^\n\r]*(\s\?\>)#',
'$1',
'#(?<!:|\'|")//[^\n\r]*(\?\>)#',
' $1',
Copy link
Copy Markdown
Contributor

@phoenix128 phoenix128 Jun 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why you did not simpy change the regular expression in #(?<!:|'|")//[^\n\r]*(\s*\?\>)#, instead of adding the prefixing space in the replacement?

Copy link
Copy Markdown
Contributor Author

@lisovyievhenii lisovyievhenii Jun 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case if the code will be like this one:

<?php//else:?>

if the replacement string will be just '$1', we will get the result:

<?php?>

So it will cause calling of undefined conftant php and to prevent it I added the prefixing space in the replacement.

Copy link
Copy Markdown
Contributor

@phoenix128 phoenix128 Jun 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, right point.

preg_replace(
'#(?<!:)//[^\n\r]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
'',
Expand Down
7 changes: 6 additions & 1 deletion lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@ public function testMinify()
<?php echo '//some.link.com/' ?>
<em>inline text</em>
<a href="http://www.<?php echo 'hi' ?>"></a>
<?php// if (\$block->getSomeVariable() > 1):?>
<?php echo \$block->getChildHtml('someChildBlock'); ?>
<?php //else:?>
<?php // echo \$block->getChildHtml('anotherChildBlock'); ?>
<?php // endif; ?>
</body>
</html>
TEXT;
Expand All @@ -179,7 +184,7 @@ public function testMinify()
}
});
//]]>
</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a></body></html>
</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a> <?php ?> <?php echo \$block->getChildHtml('someChildBlock'); ?> <?php ?> <?php ?> <?php ?></body></html>
TEXT;

$this->appDirectoryMock->expects($this->once())
Expand Down