Merge pull request #73 from magento-commerce/MCLOUD-10279

MCLOUD-10279: Added ACSD-50165 patch

Author: BaDos

patches.json

@@ -267,6 +267,10 @@
     },
     "Auto increment number jumping up for catalog_product_entity_* tables": {
       ">=2.3.7 <2.4.7": "MCLOUD-10032__Increment_number_for_catalog_product_entity_tables__2.4.3-p1.patch"
+    },
+    "Fixes the error 'The file can't be deleted. Warning!unlink: No such file or directory' when flushing JS/CSS cache from the Admin": {
+      ">=2.4.0 <2.4.1-p1": "MCLOUD-10279__errors_when_flushing_js_css_cache_from_admin__2.4.0.patch",
+      ">=2.4.1-p1 <2.4.7": "MCLOUD-10279__errors_when_flushing_js_css_cache_from_admin__2.4.4.patch"
     }
   },
   "magento/module-paypal": {

patches/MCLOUD-10279__errors_when_flushing_js_css_cache_from_admin__2.4.0.patch

@@ -0,0 +1,24 @@
+diff -Nuar a/vendor/magento/framework/Filesystem/Driver/File.php b/vendor/magento/framework/Filesystem/Driver/File.php
+index 1affad552137..4edb095f6c48 100644
+--- a/vendor/magento/framework/Filesystem/Driver/File.php
++++ b/vendor/magento/framework/Filesystem/Driver/File.php
+@@ -391,8 +391,8 @@ public function symlink($source, $destination, DriverInterface $targetDriver = n
+      */
+     public function deleteFile($path)
+     {
+-        $result = @unlink($this->getScheme() . $path);
+-        if (!$result) {
++        @unlink($this->getScheme() . $path);
++        if ($this->isFile($path)) {
+             throw new FileSystemException(
+                 new Phrase(
+                     'The "%1" file can\'t be deleted. %2',
+@@ -400,7 +400,7 @@ public function deleteFile($path)
+                 )
+             );
+         }
+-        return $result;
++        return true;
+     }
+ 
+     /**

patches/MCLOUD-10279__errors_when_flushing_js_css_cache_from_admin__2.4.4.patch

@@ -0,0 +1,28 @@
+diff -Nuar a/vendor/magento/framework/Filesystem/Driver/File.php b/vendor/magento/framework/Filesystem/Driver/File.php
+index 5dcfeeef23ab..e26acb5a9369 100644
+--- a/vendor/magento/framework/Filesystem/Driver/File.php
++++ b/vendor/magento/framework/Filesystem/Driver/File.php
+@@ -440,11 +440,12 @@ 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',
+@@ -452,7 +453,7 @@ public function deleteFile($path)
+                 )
+             );
+         }
+-        return $result;
++        return true;
+     }
+ 
+     /**