MC-15763: Introduce critical CSS scope loaded through head

- Stabilization

Author: vzabaznov

app/code/Magento/Theme/Block/Html/Header/CriticalCss.php

@@ -15,7 +15,7 @@
 use Magento\Framework\View\Asset\File\NotFoundException;
 
 /**
- * This ViewModel will add inline critical css in case dev/css/use_css_critical_path is enabled
+ * This ViewModel will add inline critical css in case dev/css/use_css_critical_path is enabled.
  */
 class CriticalCss implements ArgumentInterface
 {
@@ -30,10 +30,8 @@ class CriticalCss implements ArgumentInterface
     private $filePath;
 
     /**
-     * @param Template\Context $context
      * @param Repository $assetRepo
      * @param string $filePath
-     * @param array $data
      */
     public function __construct(
         Repository $assetRepo,
@@ -54,8 +52,11 @@ public function getCriticalCssData()
         try {
             $asset = $this->assetRepo->createAsset($this->filePath, ['_secure' => 'false']);
             $content = $asset->getContent();
-        } catch (LocalizedException | NotFoundException $e) {
-            throw new LocalizedException(__("Cannot get critical css file data: ", $e->getMessage()));
+        } catch (NotFoundException $e) {
+            throw new LocalizedException(__(
+                'Cannot get critical css file data: "%1"',
+                $e->getMessage()
+            ));
         };
 
         return $content;

lib/internal/Magento/Framework/View/Asset/Repository.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * A repository service for view assets
@@ -201,9 +202,10 @@ private function getDefaultParameter($name)
     /**
      * Create a file asset that's subject of fallback system
      *
-     * @param string $fileId
+     * @param $fileId
      * @param array $params
      * @return File
+     * @throws LocalizedException
      */
     public function createAsset($fileId, array $params = [])
     {

lib/internal/Magento/Framework/View/Layout/etc/head.xsd

@@ -67,6 +67,7 @@
             <xs:element name="script" type="scriptType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="remove" type="srcRemoveType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="attribute" type="headAttributeType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="font" type="linkType" minOccurs="0" maxOccurs="unbounded"/>app/code/Magento/Theme/Block/Html/Header/CriticalCss.php
         </xs:sequence>
     </xs:complexType>
 </xs:schema>

lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php

@@ -35,8 +35,6 @@ class Head implements Layout\ReaderInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return string[]
      */
     public function getSupportedNodes()
     {
@@ -66,10 +64,6 @@ protected function addContentTypeByNodeName(Layout\Element $node)
 
     /**
      * {@inheritdoc}
-     *
-     * @param Layout\Reader\Context $readerContext
-     * @param Layout\Element $headElement
-     * @return $this
      */
     public function interpret(
         Layout\Reader\Context $readerContext,