ENGCOM-7924: Fix robots.txt not store specific #29331

 - Merge Pull Request #29331 from engcom-Charlie/magento2:fix_sitemap
 - Merged commits:
   1. b1054ad
   2. 2020e98
   3. 1563ef2

Author: magento-engcom-team

app/code/Magento/Sitemap/Block/Robots.php

@@ -11,6 +11,8 @@
 use Magento\Robots\Model\Config\Value;
 use Magento\Sitemap\Helper\Data as SitemapHelper;
 use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
+use Magento\Sitemap\Model\SitemapConfigReader;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\StoreResolver;
 
@@ -29,6 +31,7 @@ class Robots extends AbstractBlock implements IdentityInterface
 
     /**
      * @var SitemapHelper
+     * @deprecated
      */
     private $sitemapHelper;
 
@@ -37,14 +40,19 @@ class Robots extends AbstractBlock implements IdentityInterface
      */
     private $storeManager;
 
+    /**
+     * @var SitemapConfigReader
+     */
+    private $sitemapConfigReader;
+
     /**
      * @param Context $context
      * @param StoreResolver $storeResolver
      * @param CollectionFactory $sitemapCollectionFactory
      * @param SitemapHelper $sitemapHelper
      * @param StoreManagerInterface $storeManager
      * @param array $data
-     *
+     * @param SitemapConfigReader|null $sitemapConfigReader
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
@@ -53,11 +61,14 @@ public function __construct(
         CollectionFactory $sitemapCollectionFactory,
         SitemapHelper $sitemapHelper,
         StoreManagerInterface $storeManager,
-        array $data = []
+        array $data = [],
+        ?SitemapConfigReader $sitemapConfigReader = null
     ) {
         $this->sitemapCollectionFactory = $sitemapCollectionFactory;
         $this->sitemapHelper = $sitemapHelper;
         $this->storeManager = $storeManager;
+        $this->sitemapConfigReader = $sitemapConfigReader
+            ?: ObjectManager::getInstance()->get(SitemapConfigReader::class);
 
         parent::__construct($context, $data);
     }
@@ -74,22 +85,16 @@ public function __construct(
      */
     protected function _toHtml()
     {
-        $defaultStore = $this->storeManager->getDefaultStoreView();
-
-        /** @var \Magento\Store\Model\Website $website */
-        $website = $this->storeManager->getWebsite($defaultStore->getWebsiteId());
+        $website = $this->storeManager->getWebsite();
 
         $storeIds = [];
         foreach ($website->getStoreIds() as $storeId) {
-            if ((bool)$this->sitemapHelper->getEnableSubmissionRobots($storeId)) {
-                $storeIds[] = (int)$storeId;
+            if ((bool) $this->sitemapConfigReader->getEnableSubmissionRobots($storeId)) {
+                $storeIds[] = (int) $storeId;
             }
         }
 
-        $links = [];
-        if ($storeIds) {
-            $links = array_merge($links, $this->getSitemapLinks($storeIds));
-        }
+        $links = $storeIds ? $this->getSitemapLinks($storeIds) : [];
 
         return $links ? implode(PHP_EOL, $links) . PHP_EOL : '';
     }
@@ -106,18 +111,12 @@ protected function _toHtml()
      */
     protected function getSitemapLinks(array $storeIds)
     {
-        $sitemapLinks = [];
-
-        /** @var \Magento\Sitemap\Model\ResourceModel\Sitemap\Collection $collection */
         $collection = $this->sitemapCollectionFactory->create();
         $collection->addStoreFilter($storeIds);
 
+        $sitemapLinks = [];
         foreach ($collection as $sitemap) {
-            /** @var \Magento\Sitemap\Model\Sitemap $sitemap */
-            $sitemapFilename = $sitemap->getSitemapFilename();
-            $sitemapPath = $sitemap->getSitemapPath();
-
-            $sitemapUrl = $sitemap->getSitemapUrl($sitemapPath, $sitemapFilename);
+            $sitemapUrl = $sitemap->getSitemapUrl($sitemap->getSitemapPath(), $sitemap->getSitemapFilename());
             $sitemapLinks[$sitemapUrl] = 'Sitemap: ' . $sitemapUrl;
         }