Merge branch 'MC-37306' of https://github.com/magento-tango/magento2ce into 2.4-develop

Author: thiaramus

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

@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sitemap\Model;
 
-use Magento\Sitemap\Model\EmailNotification as SitemapEmail;
+use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Sitemap\Model\EmailNotification as SitemapEmail;
 use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
+use Magento\Store\Model\App\Emulation;
 use Magento\Store\Model\ScopeInterface;
 
 /**
@@ -61,20 +65,28 @@ class Observer
      */
     private $emailNotification;
 
+    /**
+     * @var Emulation
+     */
+    private $appEmulation;
+
     /**
      * Observer constructor.
      * @param ScopeConfigInterface $scopeConfig
      * @param CollectionFactory $collectionFactory
      * @param EmailNotification $emailNotification
+     * @param Emulation $appEmulation
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         CollectionFactory $collectionFactory,
-        SitemapEmail $emailNotification
+        SitemapEmail $emailNotification,
+        Emulation $appEmulation
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->collectionFactory = $collectionFactory;
         $this->emailNotification = $emailNotification;
+        $this->appEmulation = $appEmulation;
     }
 
     /**
@@ -105,9 +117,16 @@ public function scheduledGenerateSitemaps()
         foreach ($collection as $sitemap) {
             /* @var $sitemap \Magento\Sitemap\Model\Sitemap */
             try {
+                $this->appEmulation->startEnvironmentEmulation(
+                    $sitemap->getStoreId(),
+                    Area::AREA_FRONTEND,
+                    true
+                );
                 $sitemap->generateXml();
             } catch (\Exception $e) {
                 $errors[] = $e->getMessage();
+            } finally {
+                $this->appEmulation->stopEnvironmentEmulation();
             }
         }
         if ($errors && $recipient) {

app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php

@@ -142,4 +142,39 @@ public function testScheduledGenerateSitemapsSendsExceptionEmail()
 
         $this->observer->scheduledGenerateSitemaps();
     }
+
+    /**
+     * Test if cron scheduled XML sitemap generation will start and stop the store environment emulation
+     *
+     * @throws \Exception
+     */
+    public function testCronGenerateSitemapEnvironmentEmulation()
+    {
+        $storeId = 1;
+
+        $this->scopeConfigMock->expects($this->once())->method('isSetFlag')->willReturn(true);
+
+        $this->collectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->sitemapCollectionMock);
+
+        $this->sitemapCollectionMock->expects($this->any())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([$this->sitemapMock]));
+
+        $this->sitemapMock->expects($this->at(0))
+            ->method('getStoreId')
+            ->willReturn($storeId);
+
+        $this->sitemapMock->expects($this->once())
+            ->method('generateXml');
+
+        $this->appEmulationMock->expects($this->once())
+            ->method('startEnvironmentEmulation');
+
+        $this->appEmulationMock->expects($this->once())
+            ->method('stopEnvironmentEmulation');
+
+        $this->observer->scheduledGenerateSitemaps();
+    }
 }