Skip to content

Commit 08f2bd4

Browse files
author
Mateusz Krzeszowiak
committed
Adjust code after review
1 parent 4fa5447 commit 08f2bd4

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,19 @@ public function __construct(ScopeConfigInterface $scopeConfig)
3939
*/
4040
public function beforeSendResponse(Http $subject)
4141
{
42-
$content = $subject->getContent() ?? '';
42+
$content = (string)$subject->getContent();
4343

4444
$bodyClose = '</body';
4545

46-
if (is_string($content) && strpos($content, $bodyClose) !== false && $this->scopeConfig->isSetFlag(
46+
if (strpos($content, $bodyClose) !== false && $this->scopeConfig->isSetFlag(
4747
self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
4848
ScopeInterface::SCOPE_STORE
4949
)) {
5050
$scripts = '';
51-
5251
$scriptOpen = '<script';
5352
$scriptClose = '</script>';
54-
5553
$scriptOpenPos = strpos($content, $scriptOpen);
54+
5655
while ($scriptOpenPos !== false) {
5756
$scriptClosePos = strpos($content, $scriptClose, $scriptOpenPos);
5857
$script = substr($content, $scriptOpenPos, $scriptClosePos - $scriptOpenPos + strlen($scriptClose));

0 commit comments

Comments
 (0)