MC-15763: Introduce critical CSS scope loaded through head

vzabaznov · vzabaznov · commit 65308b558bed · 2019-06-05T16:01:42.000-05:00
- Stabilization
diff --git a/lib/internal/Magento/Framework/View/Asset/MergeService.php b/lib/internal/Magento/Framework/View/Asset/MergeService.php
@@ -87,7 +87,7 @@ public function getMergedAssets(array $assets, $contentType)
     {
         $isCss = $contentType == 'css';
         $isJs = $contentType == 'js';
-        if (!in_array($contentType, self::SUPPORTED_MERGE_TYPE)) {
+        if (!in_array($contentType, self::SUPPORTED_MERGE_TYPE, true)) {
             throw new \InvalidArgumentException("Merge for content type '{$contentType}' is not supported.");
         }
 
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
@@ -425,7 +425,7 @@ protected function renderAssetHtml(\Magento\Framework\View\Asset\PropertyGroup $
      */
     private function canTypeBeFont(string $type): bool
     {
-        return in_array($type, self::FONTS_TYPE);
+        return in_array($type, self::FONTS_TYPE, true);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function getMergedAssets(array $assets, $contentType)`
`87`	`87`	`{`
`88`	`88`	`$isCss = $contentType == 'css';`
`89`	`89`	`$isJs = $contentType == 'js';`
`90`		`- if (!in_array($contentType, self::SUPPORTED_MERGE_TYPE)) {`
	`90`	`+ if (!in_array($contentType, self::SUPPORTED_MERGE_TYPE, true)) {`
`91`	`91`	`throw new \InvalidArgumentException("Merge for content type '{$contentType}' is not supported.");`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ protected function renderAssetHtml(\Magento\Framework\View\Asset\PropertyGroup $`
`425`	`425`	`*/`
`426`	`426`	`private function canTypeBeFont(string $type): bool`
`427`	`427`	`{`
`428`		`- return in_array($type, self::FONTS_TYPE);`
	`428`	`+ return in_array($type, self::FONTS_TYPE, true);`
`429`	`429`	`}`
`430`	`430`
`431`	`431`	`/**`