AC-15165: SRI Improvements.

Use global static array for SRI collector.

Author: admanesachin

app/code/Magento/Csp/Model/SubresourceIntegrityCollector.php

@@ -7,22 +7,35 @@
 
 namespace Magento\Csp\Model;
 
+use Magento\Framework\App\ObjectManager;
+use Psr\Log\LoggerInterface;
+
 /**
  * Collector of Integrity objects.
+ * 
+ * Uses static storage to persist data across ObjectManager instances
+ * during area emulation in static content deployment.
  */
 class SubresourceIntegrityCollector
 {
     /**
+     * Global storage that persists across ObjectManager instances
      * @var array
      */
-    private array $data = [];
+    private static array $globalData = [];
 
     /**
-     * @param array $data
+     * @var LoggerInterface
      */
-    public function __construct(array $data = [])
-    {
-        $this->data = $data;
+    private LoggerInterface $logger;
+
+    /**
+     * @param LoggerInterface|null $logger
+     */
+    public function __construct(?LoggerInterface $logger = null) {
+        $this->logger = $logger ?? ObjectManager::getInstance()->get(LoggerInterface::class);
+        
+        $this->logger->info('SRI Collector: Initialized with ' . count(self::$globalData) . ' objects (global storage)');
     }
 
     /**
@@ -34,7 +47,8 @@ public function __construct(array $data = [])
      */
     public function collect(SubresourceIntegrity $integrity): void
     {
-        $this->data[] = $integrity;
+        self::$globalData[] = $integrity;
+        $this->logger->info('SRI Collector: Collected object, total: ' . count(self::$globalData));
     }
 
     /**
@@ -44,6 +58,20 @@ public function collect(SubresourceIntegrity $integrity): void
      */
     public function release(): array
     {
-        return $this->data;
+        $count = count(self::$globalData);
+        $this->logger->info('SRI Collector: Releasing ' . $count . ' objects');
+        return self::$globalData;
+    }
+
+    /**
+     * Clear all collected data.
+     *
+     * @return void
+     */
+    public function clear(): void
+    {
+        $count = count(self::$globalData);
+        self::$globalData = [];
+        $this->logger->info('SRI Collector: Cleared ' . $count . ' objects');
     }
 }

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

@@ -12,6 +12,7 @@
 use Magento\Deploy\Console\DeployStaticOptions;
 use Magento\Deploy\Service\DeployStaticContent;
 use Magento\Csp\Model\SubresourceIntegrityRepositoryPool;
+use Magento\Csp\Model\SubresourceIntegrityCollector;
 
 /**
  * Plugin that removes existing integrity hashes for all assets.
@@ -23,13 +24,21 @@ class RemoveAllAssetIntegrityHashes
      */
     private SubresourceIntegrityRepositoryPool $integrityRepositoryPool;
 
+    /**
+     * @var SubresourceIntegrityCollector
+     */
+    private SubresourceIntegrityCollector $integrityCollector;
+
     /**
      * @param SubresourceIntegrityRepositoryPool $integrityRepositoryPool
+     * @param SubresourceIntegrityCollector $integrityCollector
      */
     public function __construct(
-        SubresourceIntegrityRepositoryPool $integrityRepositoryPool
+        SubresourceIntegrityRepositoryPool $integrityRepositoryPool,
+        SubresourceIntegrityCollector $integrityCollector
     ) {
         $this->integrityRepositoryPool = $integrityRepositoryPool;
+        $this->integrityCollector = $integrityCollector;
     }
 
     /**
@@ -47,10 +56,14 @@ public function beforeDeploy(
         array $options
     ): void {
         if (PHP_SAPI == 'cli' && !$this->isRefreshContentVersionOnly($options)) {
+            // Clear stored integrity hashes from all areas
             foreach ([Package::BASE_AREA, Area::AREA_FRONTEND, Area::AREA_ADMINHTML] as $area) {
                 $this->integrityRepositoryPool->get($area)
                     ->deleteAll();
             }
+            
+            // Clear any leftover in-memory integrity hashes from previous runs
+            $this->integrityCollector->clear();
         }
     }