adobe-stock-integration#1792: fix category image is not removed from tmp folder after category save

Viktor Kopin · Viktor Kopin · commit 70b0d06f94d2 · 2020-09-04T16:59:28.000+03:00
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php b/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
@@ -81,17 +81,18 @@ public function __construct(
      *
      * @param ImageUploader $subject
      * @param string $imagePath
+     * @param string $initialImageName
      * @return string
      * @throws LocalizedException
      */
-    public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath): string
+    public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath, string $initialImageName): string
     {
         if (!$this->config->isEnabled()) {
             return $imagePath;
         }
 
         $absolutePath = $this->storage->getCmsWysiwygImages()->getStorageRoot() . $imagePath;
-        $tmpPath = $subject->getBaseTmpPath() . '/' . substr(strrchr($imagePath, '/'), 1);
+        $tmpPath = $subject->getBaseTmpPath() . '/' . $initialImageName;
         $tmpAssets = $this->getAssetsByPaths->execute([$tmpPath]);
 
         if (!empty($tmpAssets)) {

Original file line number	Diff line number	Diff line change
`@@ -81,17 +81,18 @@ public function __construct(`
`81`	`81`	`*`
`82`	`82`	`* @param ImageUploader $subject`
`83`	`83`	`* @param string $imagePath`
	`84`	`+ * @param string $initialImageName`
`84`	`85`	`* @return string`
`85`	`86`	`* @throws LocalizedException`
`86`	`87`	`*/`
`87`		`- public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath): string`
	`88`	`+ public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath, string $initialImageName): string`
`88`	`89`	`{`
`89`	`90`	`if (!$this->config->isEnabled()) {`
`90`	`91`	`return $imagePath;`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`$absolutePath = $this->storage->getCmsWysiwygImages()->getStorageRoot() . $imagePath;`
`94`		`- $tmpPath = $subject->getBaseTmpPath() . '/' . substr(strrchr($imagePath, '/'), 1);`
	`95`	`+ $tmpPath = $subject->getBaseTmpPath() . '/' . $initialImageName;`
`95`	`96`	`$tmpAssets = $this->getAssetsByPaths->execute([$tmpPath]);`
`96`	`97`
`97`	`98`	`if (!empty($tmpAssets)) {`