ACP2E-3532: Sitemap Generation Warnings

Author: dhorytskyi

app/code/Magento/Sitemap/Model/Sitemap.php

@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
-
 namespace Magento\Sitemap\Model;
 
 use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
@@ -12,14 +11,13 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Robots\Model\Config\Value;
 use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface;
 use Magento\Sitemap\Model\ResourceModel\Sitemap as SitemapResource;
 
 /**
- * Sitemap model.
- *
  * @method string getSitemapType()
  * @method \Magento\Sitemap\Model\Sitemap setSitemapType(string $value)
  * @method string getSitemapFilename()
@@ -199,13 +197,11 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
     private $filesystem;
 
     /**
-     * @var DocumentRoot
+     * @var WriteInterface
      */
-    private $documentRoot;
+    private $tmpDirectory;
 
     /**
-     * Initialize dependencies.
-     *
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Escaper $escaper
@@ -252,6 +248,7 @@ public function __construct(
         $this->_sitemapData = $sitemapData;
         $this->filesystem = $filesystem;
         $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::PUB);
+        $this->tmpDirectory = $filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
         $this->_categoryFactory = $categoryFactory;
         $this->_productFactory = $productFactory;
         $this->_cmsFactory = $cmsFactory;
@@ -480,13 +477,11 @@ public function generateXml()
 
         $this->_finalizeSitemap();
 
-        if ($this->_sitemapIncrement == 1) {
+        if ($this->_sitemapIncrement == -1) {
             // In case when only one increment file was created use it as default sitemap
-            $sitemapPath = $this->getSitemapPath() !== null ? rtrim($this->getSitemapPath(), '/') : '';
-            $path = $sitemapPath . '/' . $this->_getCurrentSitemapFilename($this->_sitemapIncrement);
-            $destination = $sitemapPath . '/' . $this->getSitemapFilename();
-
-            $this->_directory->renameFile($path, $destination);
+            $path = $this->getFilePath($this->_getCurrentSitemapFilename($this->_sitemapIncrement));
+            $destination = $this->getFilePath($this->getSitemapFilename());
+            $this->tmpDirectory->renameFile($path, $destination, $this->_directory);
         } else {
             // Otherwise create index file with list of generated sitemaps
             $this->_createSitemapIndex();
@@ -507,10 +502,15 @@ protected function _createSitemapIndex()
     {
         $this->_createSitemap($this->getSitemapFilename(), self::TYPE_INDEX);
         for ($i = 1; $i <= $this->_sitemapIncrement; $i++) {
-            $xml = $this->_getSitemapIndexRow($this->_getCurrentSitemapFilename($i), $this->_getCurrentDateTime());
+            $fileName = $this->_getCurrentSitemapFilename($i);
+            $path = $this->getFilePath($fileName);
+            $this->tmpDirectory->renameFile($path, $path, $this->_directory);
+            $xml = $this->_getSitemapIndexRow($fileName, $this->_getCurrentDateTime());
             $this->_writeSitemapRow($xml);
         }
         $this->_finalizeSitemap(self::TYPE_INDEX);
+        $path = $this->getFilePath($this->getSitemapFilename());
+        $this->tmpDirectory->renameFile($path, $path, $this->_directory);
     }
 
     /**
@@ -638,9 +638,8 @@ protected function _createSitemap($fileName = null, $type = self::TYPE_URL)
             $this->_sitemapIncrement++;
             $fileName = $this->_getCurrentSitemapFilename($this->_sitemapIncrement);
         }
-
-        $path = ($this->getSitemapPath() !== null ? rtrim($this->getSitemapPath(), '/') : '') . '/' . $fileName;
-        $this->_stream = $this->_directory->openFile($path);
+        $path = $this->getFilePath($fileName);
+        $this->_stream = $this->tmpDirectory->openFile($path);
 
         $fileHeader = sprintf($this->_tags[$type][self::OPEN_TAG_KEY], $type);
         $this->_stream->write($fileHeader);
@@ -688,6 +687,20 @@ protected function _getCurrentSitemapFilename($index)
             . '-' . $this->getStoreId() . '-' . $index . '.xml';
     }
 
+    /**
+     * Get path to sitemap file
+     *
+     * @param string $fileName
+     * @return string
+     */
+    private function getFilePath(string $fileName): string
+    {
+        $path = $this->getSitemapPath() !== null ? rtrim($this->getSitemapPath(), '/') : '';
+        $path .= '/' . $fileName;
+
+        return $path;
+    }
+
     /**
      * Get base dir
      *