#14338 Fixed according to review

Author: Stanislav Idolov

app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php

@@ -108,10 +108,10 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @param \Magento\Catalog\Model\ResourceModel\Product\Gallery $mediaGalleryResourceModel
      * @param \Magento\Catalog\Model\Product\Gallery\ReadHandler $mediaGalleryReadHandler
      * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param string $connectionName
      * @param \Magento\Catalog\Model\Product $productModel
      * @param \Magento\Catalog\Helper\Image $catalogImageHelper
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface|null $scopeConfig
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -124,10 +124,10 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Gallery $mediaGalleryResourceModel,
         \Magento\Catalog\Model\Product\Gallery\ReadHandler $mediaGalleryReadHandler,
         \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         $connectionName = null,
         \Magento\Catalog\Model\Product $productModel = null,
-        \Magento\Catalog\Helper\Image $catalogImageHelper = null
+        \Magento\Catalog\Helper\Image $catalogImageHelper = null,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null
     ) {
         $this->_productResource = $productResource;
         $this->_storeManager = $storeManager;
@@ -140,8 +140,8 @@ public function __construct(
         $this->productModel = $productModel ?: ObjectManager::getInstance()->get(\Magento\Catalog\Model\Product::class);
         $this->catalogImageHelper = $catalogImageHelper ?: ObjectManager::getInstance()
             ->get(\Magento\Catalog\Helper\Image::class);
-
-        $this->scopeConfig = $scopeConfig;    
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()
+            ->get(\Magento\Framework\App\Config\ScopeConfigInterface::class);  
         parent::__construct($context, $connectionName);
     }
 
@@ -299,7 +299,8 @@ public function getCollection($storeId)
             []
         )->joinLeft(
             ['url_rewrite' => $this->getTable('url_rewrite')],
-            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 AND url_rewrite.metadata IS ' . $urlsConfigCondition . 'NULL'
+            'e.entity_id = url_rewrite.entity_id AND url_rewrite.is_autogenerated = 1 AND url_rewrite.metadata IS ' 
+            . $urlsConfigCondition . 'NULL'
             . $connection->quoteInto(' AND url_rewrite.store_id = ?', $store->getId())
             . $connection->quoteInto(' AND url_rewrite.entity_type = ?', ProductUrlRewriteGenerator::ENTITY_TYPE),
             ['url' => 'request_path']