Merge remote-tracking branch 'local/ACP2E-1701' into PR_6_MAR_2023

Author: o-dubovyk

dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Test for \Magento\Framework\Filesystem\Driver\File
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -174,6 +172,18 @@ public function testFilePutWithoutContents(): void
         $this->assertEquals(0, $this->driver->filePutContents($path, ''));
     }
 
+    /**
+     * Delete a not existing file
+     *
+     * @return void
+     * @throws FileSystemException
+     */
+    public function testDeleteFileEdge(): void
+    {
+        $path = $this->absolutePath . 'foo/file_four.txt';
+        $this->assertEquals(true, $this->driver->deleteFile($path));
+    }
+
     /**
      * Remove generated directories.
      *

lib/internal/Magento/Framework/Filesystem/Driver/File.php

@@ -440,19 +440,20 @@ public function symlink($source, $destination, DriverInterface $targetDriver = n
      */
     public function deleteFile($path)
     {
-        $result = @unlink($this->getScheme() . $path);
+        @unlink($this->getScheme() . $path);
         if ($this->stateful) {
             clearstatcache(true, $this->getScheme() . $path);
         }
-        if (!$result) {
+
+        if ($this->isFile($path)) {
             throw new FileSystemException(
                 new Phrase(
                     'The "%1" file can\'t be deleted. %2',
                     [$path, $this->getWarningMessage()]
                 )
             );
         }
-        return $result;
+        return true;
     }
 
     /**