Merge branch '2.2-develop' into ENGCOM-3271-magento-magento2-18808

Author: p-bystritsky

app/code/Magento/Catalog/Helper/Data.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -269,7 +270,8 @@ public function setStoreId($store)
 
     /**
      * Return current category path or get it from current category
-     * and creating array of categories|product paths for breadcrumbs
+     *
+     * Creating array of categories|product paths for breadcrumbs
      *
      * @return array
      */
@@ -378,6 +380,7 @@ public function getLastViewedUrl()
 
     /**
      * Split SKU of an item by dashes and spaces
+     *
      * Words will not be broken, unless this length is greater than $length
      *
      * @param string $sku
@@ -406,14 +409,15 @@ public function getAttributeHiddenFields()
     /**
      * Retrieve Catalog Price Scope
      *
-     * @return int
+     * @return int|null
      */
     public function getPriceScope()
     {
-        return $this->scopeConfig->getValue(
+        $priceScope = $this->scopeConfig->getValue(
             self::XML_PATH_PRICE_SCOPE,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
+        return isset($priceScope) ? (int)$priceScope : null;
     }
 
     /**
@@ -449,7 +453,7 @@ public function isUrlDirectivesParsingAllowed()
     {
         return $this->scopeConfig->isSetFlag(
             self::CONFIG_PARSE_URL_DIRECTIVES,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $this->_storeId
         );
     }
@@ -466,19 +470,22 @@ public function getPageTemplateProcessor()
 
     /**
      * Whether to display items count for each filter option
+     *
      * @param int $storeId Store view ID
      * @return bool
      */
     public function shouldDisplayProductCountOnLayer($storeId = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_DISPLAY_PRODUCT_COUNT,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $storeId
         );
     }
 
     /**
+     * Convert tax address array to address data object with country id and postcode
+     *
      * @param array $taxAddress
      * @return \Magento\Customer\Api\Data\AddressInterface|null
      */

app/code/Magento/Catalog/Model/Product/Attribute/Backend/TierPrice/UpdateHandler.php

@@ -82,14 +82,14 @@ public function execute($entity, $arguments = [])
                     __('Tier prices data should be array, but actually other type is received')
                 );
             }
-            $websiteId = $this->storeManager->getStore($entity->getStoreId())->getWebsiteId();
+            $websiteId = (int)$this->storeManager->getStore($entity->getStoreId())->getWebsiteId();
             $isGlobal = $attribute->isScopeGlobal() || $websiteId === 0;
             $identifierField = $this->metadataPoll->getMetadata(ProductInterface::class)->getLinkField();
-            $productId = $entity->getData($identifierField);
+            $productId = (int)$entity->getData($identifierField);
 
             // prepare original data to compare
             $origPrices = $entity->getOrigData($attribute->getName());
-            $old = $this->prepareOriginalDataToCompare($origPrices, $isGlobal);
+            $old = $this->prepareOldTierPriceToCompare($origPrices);
             // prepare data for save
             $new = $this->prepareNewDataForSave($priceRows, $isGlobal);
 
@@ -262,19 +262,18 @@ private function isWebsiteGlobal(int $websiteId): bool
     }
 
     /**
+     * Prepare old data to compare.
+     *
      * @param array|null $origPrices
-     * @param bool $isGlobal
      * @return array
      */
-    private function prepareOriginalDataToCompare($origPrices, $isGlobal = true): array
+    private function prepareOldTierPriceToCompare($origPrices): array
     {
         $old = [];
         if (is_array($origPrices)) {
             foreach ($origPrices as $data) {
-                if ($isGlobal === $this->isWebsiteGlobal((int)$data['website_id'])) {
-                    $key = $this->getPriceKey($data);
-                    $old[$key] = $data;
-                }
+                $key = $this->getPriceKey($data);
+                $old[$key] = $data;
             }
         }
 

app/code/Magento/Catalog/Model/Product/Url.php

@@ -7,6 +7,7 @@
 
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * Product Url model
@@ -45,38 +46,37 @@ class Url extends \Magento\Framework\DataObject
      */
     protected $urlFinder;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param \Magento\Framework\UrlFactory $urlFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Filter\FilterManager $filter
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param UrlFinderInterface $urlFinder
      * @param array $data
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         \Magento\Framework\UrlFactory $urlFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Filter\FilterManager $filter,
         \Magento\Framework\Session\SidResolverInterface $sidResolver,
         UrlFinderInterface $urlFinder,
-        array $data = []
+        array $data = [],
+        ScopeConfigInterface $scopeConfig = null
     ) {
         parent::__construct($data);
         $this->urlFactory = $urlFactory;
         $this->storeManager = $storeManager;
         $this->filter = $filter;
         $this->sidResolver = $sidResolver;
         $this->urlFinder = $urlFinder;
-    }
-
-    /**
-     * Retrieve URL Instance
-     *
-     * @return \Magento\Framework\UrlInterface
-     */
-    private function getUrlInstance()
-    {
-        return $this->urlFactory->create();
+        $this->scopeConfig = $scopeConfig ?:
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -157,10 +157,19 @@ public function getUrl(\Magento\Catalog\Model\Product $product, $params = [])
                     UrlRewrite::ENTITY_TYPE => \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator::ENTITY_TYPE,
                     UrlRewrite::STORE_ID => $storeId,
                 ];
-                if ($categoryId) {
+                $useCategories = $this->scopeConfig->getValue(
+                    \Magento\Catalog\Helper\Product::XML_PATH_PRODUCT_URL_USE_CATEGORY,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                );
+
+                if ($useCategories && $categoryId) {
                     $filterData[UrlRewrite::METADATA]['category_id'] = $categoryId;
+                } elseif (!$useCategories) {
+                    $filterData[UrlRewrite::METADATA]['category_id'] = '';
                 }
+
                 $rewrite = $this->urlFinder->findOneByData($filterData);
+
                 if ($rewrite) {
                     $requestPath = $rewrite->getRequestPath();
                     $product->setRequestPath($requestPath);
@@ -194,6 +203,8 @@ public function getUrl(\Magento\Catalog\Model\Product $product, $params = [])
             $routeParams['_query'] = [];
         }
 
-        return $this->getUrlInstance()->setScope($storeId)->getUrl($routePath, $routeParams);
+        $url = $this->urlFactory->create()->setScope($storeId);
+
+        return $url->getUrl($routePath, $routeParams);
     }
 }