Merge branch 'ACP2E-2147_corrected' of https://github.com/magento-l3/magento2ce into PR2-L3-09132023

Author: chittima

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

@@ -893,16 +893,24 @@ public function fileClose($resource): bool
      */
     public function fileOpen($path, $mode)
     {
+        $_mode = str_replace(['b', '+'], '', strtolower($mode));
+        if (!in_array($_mode, ['r', 'w', 'a'], true)) {
+            throw new FileSystemException(new Phrase('Invalid file open mode "%1".', [$mode]));
+        }
         $path = $this->normalizeRelativePath($path, true);
 
         if (!isset($this->streams[$path])) {
             $this->streams[$path] = tmpfile();
             try {
                 if ($this->adapter->fileExists($path)) {
-                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
-                    fwrite($this->streams[$path], $this->adapter->read($path));
-                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
-                    rewind($this->streams[$path]);
+                    if ($_mode !== 'w') {
+                        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+                        fwrite($this->streams[$path], $this->adapter->read($path));
+                        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+                        if ($_mode !== 'a') {
+                            rewind($this->streams[$path]);
+                        }
+                    }
                 }
             } catch (FlysystemFilesystemException $e) {
                 $this->logger->error($e->getMessage());

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

@@ -537,4 +537,42 @@ public function testFileCloseShouldReturnFalseIfTheArgumentIsNotAResource(): voi
         $this->assertEquals(false, $this->driver->fileClose(null));
         $this->assertEquals(false, $this->driver->fileClose(false));
     }
+
+    /**
+     * @dataProvider fileOpenModesDataProvider
+     */
+    public function testFileOppenedMode($mode, $expected): void
+    {
+        $this->adapterMock->method('fileExists')->willReturn(true);
+        if ($mode !== 'w') {
+            $this->adapterMock->expects($this->once())->method('read')->willReturn('aaa');
+        } else {
+            $this->adapterMock->expects($this->never())->method('read');
+        }
+        $resource = $this->driver->fileOpen('test/path', $mode);
+        $this->assertEquals($expected, ftell($resource));
+    }
+
+    /**
+     * Data provider for testFileOppenedMode
+     *
+     * @return array[]
+     */
+    public function fileOpenModesDataProvider(): array
+    {
+        return [
+            [
+                "mode" => "a",
+                "expected" => 3
+            ],
+            [
+                "mode" => "r",
+                "expected" => 0
+            ],
+            [
+                "mode" => "w",
+                "expected" => 0
+            ]
+        ];
+    }
 }