Merge remote-tracking branch 'origin/ACP2E-3890' into PR_2025_07_08_muntianu

Author: katmoon

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -188,7 +188,9 @@ private function createDirectoryRecursively(string $path): bool
         $parentDir = dirname($path);
 
         while (!$this->isDirectory($parentDir)) {
-            $this->createDirectoryRecursively($parentDir);
+            if (!$this->createDirectoryRecursively($parentDir)) {
+                return false;
+            }
         }
 
         if (!$this->isDirectory($path)) {

app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php

@@ -18,6 +18,7 @@
 
 /**
  * @see AwsS3
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AwsS3Test extends TestCase
 {
@@ -497,6 +498,23 @@ public function testCreateDirectory(): void
         self::assertTrue($this->driver->createDirectory(self::URL . 'test/test2/'));
     }
 
+    /**
+     * This test ensures that the method does not loop infinitely in case of an exception
+     *
+     * @return void
+     * @throws FileSystemException
+     * @throws \PHPUnit\Framework\MockObject\Exception
+     */
+    public function testShouldFailSafelyIfUnableToCreateDirectory(): void
+    {
+        $this->adapterMock->expects(self::once())
+            ->method('createDirectory')
+            ->willThrowException($this->createMock(\League\Flysystem\FilesystemException::class))
+            ->with('test');
+
+        self::assertFalse($this->driver->createDirectory(self::URL . 'test/test2/'));
+    }
+
     public function testRename(): void
     {
         $this->adapterMock->expects(self::once())