Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-83560-deadlock

Author: mslabko

app/code/Magento/Catalog/Model/Product/Link/SaveHandler.php

@@ -30,28 +30,20 @@ class SaveHandler
      */
     private $linkResource;
 
-    /**
-     * @var linkTypeProvider
-     */
-    private $linkTypeProvider;
-
     /**
      * SaveHandler constructor.
      * @param MetadataPool $metadataPool
      * @param Link $linkResource
      * @param ProductLinkRepositoryInterface $productLinkRepository
-     * @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
      */
     public function __construct(
         MetadataPool $metadataPool,
         Link $linkResource,
-        ProductLinkRepositoryInterface $productLinkRepository,
-        \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
+        ProductLinkRepositoryInterface $productLinkRepository
     ) {
         $this->metadataPool = $metadataPool;
         $this->linkResource = $linkResource;
         $this->productLinkRepository = $productLinkRepository;
-        $this->linkTypeProvider = $linkTypeProvider;
     }
 
     /**

app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php

@@ -595,8 +595,7 @@ public function getAttributeRawValue($entityId, $attribute, $store)
         }
 
         if (is_array($attributesData) && sizeof($attributesData) == 1) {
-            $_data = each($attributesData);
-            $attributesData = $_data[1];
+            $attributesData = array_shift($attributesData);
         }
 
         return $attributesData === false ? false : $attributesData;

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -366,15 +366,21 @@ protected function _renderFiltersBefore()
                 'search_result.'. TemporaryStorage::FIELD_SCORE . ' ' . $this->relevanceOrderDirection
             );
         }
+        return parent::_renderFiltersBefore();
+    }
 
+    /**
+     * @inheritdoc
+     */
+    protected function _beforeLoad()
+    {
         /*
          * This order is required to force search results be the same
          * for the same requests and products with the same relevance
          * NOTE: this does not replace existing orders but ADDs one more
          */
         $this->setOrder('entity_id');
-
-        return parent::_renderFiltersBefore();
+        return parent::_beforeLoad();
     }
 
     /**

app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php

@@ -803,7 +803,7 @@ public function joinTable($table, $bind, $fields = null, $cond = null, $joinType
     {
         $tableAlias = null;
         if (is_array($table)) {
-            list($tableAlias, $tableName) = each($table);
+            list($tableAlias, $tableName) = [key($table), current($table)];
         } else {
             $tableName = $table;
         }

app/code/Magento/Tax/etc/config.xml

@@ -20,7 +20,6 @@
                 <based_on>shipping</based_on>
                 <price_includes_tax>0</price_includes_tax>
                 <shipping_includes_tax>0</shipping_includes_tax>
-                <discount_tax>0</discount_tax>
                 <apply_tax_on>0</apply_tax_on>
             </calculation>
             <defaults>

app/code/Magento/Tax/i18n/en_US.csv

@@ -178,3 +178,4 @@ Rate,Rate
 "Your credit card will be charged for","Your credit card will be charged for"
 "An error occurred while loading tax rates.","An error occurred while loading tax rates."
 "You will be charged for","You will be charged for"
+"Not yet calculated", "Not yet calculated"

app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js

@@ -11,8 +11,10 @@ define([
     'ko',
     'Magento_Checkout/js/view/summary/abstract-total',
     'Magento_Checkout/js/model/quote',
-    'Magento_Checkout/js/model/totals'
-], function (ko, Component, quote, totals) {
+    'Magento_Checkout/js/model/totals',
+    'jquery',
+    'mage/translate'
+], function (ko, Component, quote, totals, $) {
     'use strict';
 
     var isTaxDisplayedInGrandTotal = window.checkoutConfig.includeTaxInGrandTotal,
@@ -22,7 +24,7 @@ define([
     return Component.extend({
         defaults: {
             isTaxDisplayedInGrandTotal: isTaxDisplayedInGrandTotal,
-            notCalculatedMessage: 'Not yet calculated',
+            notCalculatedMessage: $.mage.__('Not yet calculated'),
             template: 'Magento_Tax/checkout/summary/tax'
         },
         totals: quote.getTotals(),

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php

@@ -160,4 +160,29 @@ public function addAttributeToSortDataProvider()
             ]
         ];
     }
+
+    /**
+     * Checks a case if table for join specified as an array.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testJoinTable()
+    {
+        $this->collection->joinTable(
+            ['alias' => 'url_rewrite'],
+            'entity_id = entity_id',
+            ['request_path'],
+            '{{table}}.entity_type = \'product\'',
+            'left'
+        );
+        $sql = (string) $this->collection->getSelect();
+        $productTable = $this->collection->getTable('catalog_product_entity');
+        $urlRewriteTable = $this->collection->getTable('url_rewrite');
+
+        $expected = 'SELECT `e`.*, `alias`.`request_path` FROM `' . $productTable . '` AS `e`'
+            . ' LEFT JOIN `' . $urlRewriteTable . '` AS `alias` ON (alias.entity_id =e.entity_id)'
+            . ' AND (alias.entity_type = \'product\')';
+
+        self::assertContains($expected, str_replace(PHP_EOL, '', $sql));
+    }
 }

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/ProductTest.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model\ResourceModel;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class ProductTest extends TestCase
+{
+    /**
+     * @var Product
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->model = $this->objectManager->get(Product::class);
+    }
+
+    /**
+     * Checks a possibility to retrieve product raw attribute value.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testGetAttributeRawValue()
+    {
+        $sku = 'simple';
+        $attribute = 'name';
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($sku);
+
+        $actual = $this->model->getAttributeRawValue($product->getId(), $attribute, null);
+        self::assertEquals($product->getName(), $actual);
+    }
+}

dev/tests/static/testsuite/Magento/Test/Integrity/CircularDependencyTest.php

@@ -44,9 +44,9 @@ protected function buildModulesDependencies()
             $moduleName = str_replace('/', '_', $moduleName[1]);
             $config = simplexml_load_file($configFile);
             $result = $config->xpath("/config/module/depends/module") ?: [];
-            while (list(, $node) = each($result)) {
+            foreach ($result as $node) {
                 /** @var \SimpleXMLElement $node */
-                $this->moduleDependencies[$moduleName][] = (string)$node['name'];
+                $this->moduleDependencies[$moduleName][] = (string) $node['name'];
             }
         }
     }