Don't move Magento templates, fix tests

Mateusz Krzeszowiak · Mateusz Krzeszowiak · commit 4fa54472bab1 · 2020-03-18T21:30:45.000+01:00
diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -39,7 +39,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
      */
     public function beforeSendResponse(Http $subject)
     {
-        $content = $subject->getContent();
+        $content = $subject->getContent() ?? '';
 
         $bodyClose = '</body';
 
@@ -57,6 +57,11 @@ public function beforeSendResponse(Http $subject)
                 $scriptClosePos = strpos($content, $scriptClose, $scriptOpenPos);
                 $script = substr($content, $scriptOpenPos, $scriptClosePos - $scriptOpenPos + strlen($scriptClose));
 
+                if (strpos($script, 'text/x-magento-template') !== false) {
+                    $scriptOpenPos = strpos($content, $scriptOpen, $scriptClosePos);
+                    continue;
+                }
+
                 $scripts .= "\n" . $script;
                 $content = str_replace($script, '', $content);
                 // Script cut out, continue search from its position.
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Result/JsFooterPluginTest.php
@@ -74,9 +74,9 @@ public function sendResponseDataProvider(): array
                 "flag" => true,
                 "result" => "<body><h1>Test Title</h1>" .
                     "<script type=\"text/x-magento-template\">test</script>" .
-                    "<p>Test Content</p>" .
-                    "<script type=\"text/x-magento-init\">test</script>" .
-                    "\n</body>"
+                    "<p>Test Content</p>\n" .
+                    "<script type=\"text/x-magento-init\">test</script>\n" .
+                    "</body>"
             ],
             'content_with_config_disable' => [
                 "content" => "<body><p>Test Content</p></body>",
