Adjust code after review

magento · Apr 8, 2020 · 08f2bd4 · 08f2bd4
1 parent 4fa5447
commit 08f2bd4
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -39,20 +39,19 @@ public function __construct(ScopeConfigInterface $scopeConfig)
      */
     public function beforeSendResponse(Http $subject)
     {
-        $content = $subject->getContent() ?? '';
+        $content = (string)$subject->getContent();
 
         $bodyClose = '</body';
 
-        if (is_string($content) && strpos($content, $bodyClose) !== false && $this->scopeConfig->isSetFlag(
+        if (strpos($content, $bodyClose) !== false && $this->scopeConfig->isSetFlag(
             self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
             ScopeInterface::SCOPE_STORE
         )) {
             $scripts = '';
-
             $scriptOpen = '<script';
             $scriptClose = '</script>';
-
             $scriptOpenPos = strpos($content, $scriptOpen);
+
             while ($scriptOpenPos !== false) {
                 $scriptClosePos = strpos($content, $scriptClose, $scriptOpenPos);
                 $script = substr($content, $scriptOpenPos, $scriptClosePos - $scriptOpenPos + strlen($scriptClose));