Merge remote-tracking branch 'origin/MC-21860' into 2.3-develop-pr38

Author: serhii-balko

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

@@ -10,6 +10,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
 use Magento\Framework\UrlInterface;
 use Magento\Robots\Model\Config\Value;
 use Magento\Sitemap\Model\ItemProvider\ItemProviderInterface;
@@ -191,6 +192,16 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      */
     private $lastModMinTsVal;
 
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var DocumentRoot
+     */
+    private $documentRoot;
+
     /**
      * Initialize dependencies.
      *
@@ -238,8 +249,9 @@ public function __construct(
     ) {
         $this->_escaper = $escaper;
         $this->_sitemapData = $sitemapData;
-        $documentRoot = $documentRoot ?: ObjectManager::getInstance()->get(DocumentRoot::class);
-        $this->_directory = $filesystem->getDirectoryWrite($documentRoot->getPath());
+        $this->documentRoot = $documentRoot ?: ObjectManager::getInstance()->get(DocumentRoot::class);
+        $this->filesystem = $filesystem;
+        $this->_directory = $filesystem->getDirectoryWrite($this->documentRoot->getPath());
         $this->_categoryFactory = $categoryFactory;
         $this->_productFactory = $productFactory;
         $this->_cmsFactory = $cmsFactory;
@@ -727,8 +739,8 @@ protected function _getFormattedLastmodDate($date)
      */
     protected function _getDocumentRoot()
     {
-        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-        return realpath($this->_request->getServer('DOCUMENT_ROOT'));
+        return $this->filesystem->getDirectoryRead($this->documentRoot->getPath())
+            ->getAbsolutePath();
     }
 
     /**

dev/tests/integration/testsuite/Magento/Sitemap/Model/SitemapTest.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Sitemap\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Sitemap\Model\Sitemap;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Request;
+use Zend\Stdlib\Parameters;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for Sitemap
+ */
+class SitemapTest extends TestCase
+{
+    /**
+     * @var Sitemap
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->get(Sitemap::class);
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+    }
+
+    /**
+     * Test get sitemap URL from parent root directory path
+     *
+     * @return void
+     */
+    public function testGetSitemapUrlFromParentRootDirectoryPath(): void
+    {
+        $baseUrl = 'http://localhost/';
+
+        $rootDir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT)
+            ->getAbsolutePath();
+        $requestPath = dirname($rootDir);
+
+        /** @var Request $request */
+        $request = $this->objectManager->get(Request::class);
+        //imitation run script from parent root directory
+        $request->setServer(new Parameters(['DOCUMENT_ROOT' => $requestPath]));
+
+        $sitemapUrl = $this->model->getSitemapUrl('/', 'sitemap.xml');
+
+        $this->assertEquals($baseUrl.'sitemap.xml', $sitemapUrl);
+    }
+}