Merge remote-tracking branch 'arcticfoxes/MC-15575' into 2.3-qwerty-pr

Author: Joan He

app/code/Magento/Email/Model/Template/Filter.php

@@ -321,6 +321,8 @@ public function setDesignParams(array $designParams)
     }
 
     /**
+     * Get Css processor
+     *
      * @deprecated 100.1.2
      * @return Css\Processor
      */
@@ -333,6 +335,8 @@ private function getCssProcessor()
     }
 
     /**
+     * Get pub directory
+     *
      * @deprecated 100.1.2
      * @param string $dirType
      * @return ReadInterface
@@ -523,6 +527,7 @@ public function mediaDirective($construction)
 
     /**
      * Retrieve store URL directive
+     *
      * Support url and direct_url properties
      *
      * @param string[] $construction
@@ -849,7 +854,7 @@ public function cssDirective($construction)
             return $css;
         } else {
             // Return CSS comment for debugging purposes
-            return '/* ' . sprintf(__('Contents of %s could not be loaded or is empty'), $file) . ' */';
+            return '/* ' . __('Contents of the specified CSS file could not be loaded or is empty') . ' */';
         }
     }
 
@@ -958,6 +963,8 @@ public function getCssFilesContent(array $files)
     }
 
     /**
+     * Apply inline css
+     *
      * Merge HTML and CSS and return HTML that has CSS styles applied "inline" to the HTML tags. This is necessary
      * in order to support all email clients.
      *

dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php

@@ -267,7 +267,7 @@ public function cssDirectiveDataProvider()
             'Empty or missing file' => [
                 TemplateTypesInterface::TYPE_HTML,
                 'file="css/non-existent-file.css"',
-                '/* Contents of css/non-existent-file.css could not be loaded or is empty */'
+                '/* Contents of the specified CSS file could not be loaded or is empty */'
             ],
             'File with compilation error results in error message' => [
                 TemplateTypesInterface::TYPE_HTML,