ACP2E-3854: Bundled/Merged JS not part of SRI Hashes

Author: aplapana

app/code/Magento/Csp/Plugin/GenerateBundleAssetIntegrity.php

@@ -65,13 +65,16 @@ public function __construct(
     }
 
     /**
+     * Generate SRI hashes for JS files in the bundle directory.
+     *
      * @param Bundle $subject
      * @param string|null $result
      * @param string $area
      * @param string $theme
      * @param string $locale
      * @return void
      * @throws FileSystemException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterDeploy(Bundle $subject, ?string $result, string $area, string $theme, string $locale)
     {

app/code/Magento/Csp/Plugin/GenerateMergedAssetIntegrity.php

@@ -13,6 +13,7 @@
 use Magento\Csp\Model\SubresourceIntegrityFactory;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\View\Asset\LocalInterface;
 use Magento\Framework\View\Asset\MergeStrategy\FileExists;
@@ -47,9 +48,9 @@ class GenerateMergedAssetIntegrity
      */
     public function __construct(
         SubresourceIntegrityRepositoryPool $sourceIntegrityRepositoryPool,
-        HashGenerator                      $hashGenerator,
-        SubresourceIntegrityFactory        $integrityFactory,
-        Filesystem                         $filesystem
+        HashGenerator $hashGenerator,
+        SubresourceIntegrityFactory $integrityFactory,
+        Filesystem $filesystem
     ) {
         $this->sourceIntegrityRepository = $sourceIntegrityRepositoryPool->get(Area::AREA_FRONTEND);
         $this->hashGenerator = $hashGenerator;
@@ -58,12 +59,15 @@ public function __construct(
     }
 
     /**
+     * Generate SRI hash for merged JS files.
+     *
      * @param FileExists $subject
      * @param string|null $result
      * @param array $assetsToMerge
      * @param LocalInterface $resultAsset
      * @return string|null
-     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws FileSystemException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterMerge(FileExists $subject, ?string $result, array $assetsToMerge, LocalInterface $resultAsset)
     {