Merge remote-tracking branch 'origin/ACP2E-4246' into PR_2025_10_16_muntianu

Author: katmoon

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Framework\View\Asset;
@@ -16,6 +16,8 @@
  */
 class File implements MergeableInterface
 {
+    private const MAX_READ_ATTEMPTS = 3;
+
     /**
      * @var string
      */
@@ -183,11 +185,27 @@ public function getSourceContentType()
      */
     public function getContent()
     {
-        $content = $this->source->getContent($this);
-        if (false === $content) {
-            throw new File\NotFoundException("Unable to get content for '{$this->getPath()}'");
+        $attempt    = 0;
+        while ($attempt < self::MAX_READ_ATTEMPTS) {
+            $attempt++;
+            $content = trim($this->source->getContent($this));
+
+            if ($content) {
+                return $content;
+            }
+
+            if ($attempt < self::MAX_READ_ATTEMPTS) {
+                usleep(random_int(10000, 1000000));
+            }
         }
-        return $content;
+
+        throw new File\NotFoundException(
+            sprintf(
+                "Unable to get content for '%s' after %d attempts.",
+                $this->getPath(),
+                self::MAX_READ_ATTEMPTS
+            )
+        );
     }
 
     /**

lib/internal/Magento/Framework/View/Test/Unit/Asset/FileTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -124,36 +124,39 @@ public function testGetSourceFileMissing()
     }
 
     /**
-     * @param string $content
-     *
-     * @dataProvider getContentDataProvider
+     * @return void
      */
-    public function testGetContent($content)
+    public function testGetContentRegularRead(): void
     {
-        $this->source->expects($this->exactly(2))
+        $content = 'some content here';
+        $this->source->expects($this->once())
             ->method('getContent')
             ->with($this->object)
             ->willReturn($content);
         $this->assertEquals($content, $this->object->getContent());
-        $this->assertEquals($content, $this->object->getContent()); // no in-memory caching for content
     }
 
     /**
-     * @return array
+     * @return void
      */
-    public static function getContentDataProvider()
+    public function testGetContentWithRetries(): void
     {
-        return [
-            'normal content' => ['content'],
-            'empty content'  => [''],
-        ];
+        $content = 'some content here';
+        $this->source->expects($this->exactly(3))
+            ->method('getContent')
+            ->with($this->object)
+            ->willReturnOnConsecutiveCalls('', false, $content);
+        $this->assertEquals($content, $this->object->getContent());
     }
 
-    public function testGetContentNotFound()
+    /**
+     * @return void
+     */
+    public function testGetContentNotFound(): void
     {
         $this->expectException('Magento\Framework\View\Asset\File\NotFoundException');
         $this->expectExceptionMessage('Unable to get content for \'Magento_Module/dir/file.css\'');
-        $this->source->expects($this->once())
+        $this->source->expects($this->exactly(3))
             ->method('getContent')
             ->with($this->object)
             ->willReturn(false);