MAGETWO-70056: Get sitemap product images from image cache, if available #9082

 - Coding Style updated

Author: ishakhsuvarov

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

@@ -10,15 +10,12 @@
 
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Store\Model\Store;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Sitemap resource product collection model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.LongVariable)
- * @SuppressWarnings(PHPMD.CamelCasePropertyName)
- * @SuppressWarnings(PHPMD.CamelCaseMethodName)
  */
 class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -84,12 +81,12 @@ class Product extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * @var \Magento\Catalog\Model\Product
      */
-    protected $productModel;
+    private $productModel;
 
     /**
      * @var \Magento\Catalog\Helper\Image
      */
-    protected $catalogImageHelper;
+    private $catalogImageHelper;
 
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
@@ -128,8 +125,9 @@ public function __construct(
         $this->mediaGalleryReadHandler = $mediaGalleryReadHandler;
         $this->_mediaConfig = $mediaConfig;
         $this->_sitemapData = $sitemapData;
-        $this->productModel = $productModel ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Catalog\Model\Product::class);
-        $this->catalogImageHelper = $catalogImageHelper ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Catalog\Helper\Image::class);
+        $this->productModel = $productModel ?: ObjectManager::getInstance()->get(\Magento\Catalog\Model\Product::class);
+        $this->catalogImageHelper = $catalogImageHelper ?: ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Helper\Image::class);
         parent::__construct($context, $connectionName);
     }
 

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

@@ -27,9 +27,6 @@
  * @method \Magento\Sitemap\Model\Sitemap setStoreId(int $value)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
- * @SuppressWarnings(PHPMD.CamelCasePropertyName)
- * @SuppressWarnings(PHPMD.CamelCaseMethodName)
  */
 class Sitemap extends \Magento\Framework\Model\AbstractModel
 {