Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-65293

Author: rganin

app/code/Magento/CacheInvalidate/Model/PurgeCache.php

@@ -58,6 +58,7 @@ public function sendPurgeRequest($tagsPattern)
         $headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $tagsPattern];
         $socketAdapter->setOptions(['timeout' => 10]);
         foreach ($servers as $server) {
+            $headers['Host'] = $server->getHost();
             try {
                 $socketAdapter->connect($server->getHost(), $server->getPort());
                 $socketAdapter->write(

app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php

@@ -70,7 +70,7 @@ public function testSendPurgeRequest($hosts)
                 ->with($uri->getHost(), $uri->getPort());
             $this->socketAdapterMock->expects($this->at($i++))
                 ->method('write')
-                ->with('PURGE', $uri, '1.1', ['X-Magento-Tags-Pattern' => 'tags']);
+                ->with('PURGE', $uri, '1.1', ['X-Magento-Tags-Pattern' => 'tags', 'Host' => $uri->getHost()]);
             $i++;
         }
         $this->socketAdapterMock->expects($this->exactly(count($uris)))

app/code/Magento/Catalog/Block/Product/View/Attributes.php

@@ -12,6 +12,7 @@
 namespace Magento\Catalog\Block\Product\View;
 
 use Magento\Catalog\Model\Product;
+use Magento\Framework\Phrase;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 class Attributes extends \Magento\Framework\View\Element\Template
@@ -85,8 +86,8 @@ public function getAdditionalData(array $excludeAttr = [])
                 } elseif ($attribute->getFrontendInput() == 'price' && is_string($value)) {
                     $value = $this->priceCurrency->convertAndFormat($value);
                 }
-
-                if (is_string($value) && strlen($value)) {
+    
+                if ($value instanceof Phrase || (is_string($value) && strlen($value))) {
                     $data[$attribute->getAttributeCode()] = [
                         'label' => __($attribute->getStoreLabel()),
                         'value' => $value,

app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php

@@ -74,6 +74,9 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
         $attributes = $this->_productIndexerHelper->getAttributes();
         $eavAttributes = $this->_productIndexerHelper->getTablesStructure($attributes);
         $entityTableColumns = $eavAttributes[$entityTableName];
+        $linkField = $this->getMetadataPool()
+            ->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->getLinkField();
 
         $temporaryEavAttributes = $eavAttributes;
 
@@ -101,11 +104,11 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
             $temporaryTableName = $this->_getTemporaryTableName($tableName);
 
             //Add primary key to temporary table for increase speed of joins in future
-            $this->_addPrimaryKeyToTable($temporaryTableName);
+            $this->_addPrimaryKeyToTable($temporaryTableName, $linkField);
 
             //Create temporary table for composite attributes
             if (isset($valueTables[$temporaryTableName . $valueFieldSuffix])) {
-                $this->_addPrimaryKeyToTable($temporaryTableName . $valueFieldSuffix);
+                $this->_addPrimaryKeyToTable($temporaryTableName . $valueFieldSuffix, $linkField);
             }
 
             //Fill temporary tables with attributes grouped by it type

app/code/Magento/Catalog/Setup/UpgradeData.php

@@ -7,7 +7,6 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
-use Magento\Eav\Model\Entity\AttributeCache;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
@@ -35,26 +34,16 @@ class UpgradeData implements UpgradeDataInterface
      */
     private $eavSetupFactory;
 
-    /**
-     * @var AttributeCache
-     */
-    private $attributeCache;
-
     /**
      * Init
      *
      * @param CategorySetupFactory $categorySetupFactory
      * @param EavSetupFactory $eavSetupFactory
-     * @param AttributeCache $attributeCache
      */
-    public function __construct(
-        CategorySetupFactory $categorySetupFactory,
-        EavSetupFactory $eavSetupFactory,
-        AttributeCache $attributeCache
-    ) {
+    public function __construct(CategorySetupFactory $categorySetupFactory, EavSetupFactory $eavSetupFactory)
+    {
         $this->categorySetupFactory = $categorySetupFactory;
         $this->eavSetupFactory = $eavSetupFactory;
-        $this->attributeCache = $attributeCache;
     }
 
     /**
@@ -146,24 +135,19 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
         }
 
         if (version_compare($context->getVersion(), '2.0.4') < 0) {
-            $mediaBackendType = 'static';
-            $mediaBackendModel = null;
             /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
             $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
             $categorySetup->updateAttribute(
                 'catalog_product',
                 'media_gallery',
                 'backend_type',
-                $mediaBackendType
+                'static'
             );
             $categorySetup->updateAttribute(
                 'catalog_product',
                 'media_gallery',
-                'backend_model',
-                $mediaBackendModel
+                'backend_model'
             );
-
-            $this->changeMediaGalleryAttributeInCache($mediaBackendType, $mediaBackendModel);
         }
 
         if (version_compare($context->getVersion(), '2.0.5', '<')) {
@@ -397,25 +381,4 @@ private function changePriceAttributeDefaultScope($categorySetup)
 
         }
     }
-
-    /**
-     * @param string $mediaBackendType
-     * @param string $mediaBackendModel
-     * @return void
-     */
-    private function changeMediaGalleryAttributeInCache($mediaBackendType, $mediaBackendModel)
-    {
-        // need to do, because media_gallery has backend model in cache.
-        $catalogProductAttributes = $this->attributeCache->getAttributes('catalog_product', '0-0');
-
-        if (is_array($catalogProductAttributes)) {
-            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $catalogProductAttribute */
-            foreach ($catalogProductAttributes as $catalogProductAttribute) {
-                if ($catalogProductAttribute->getAttributeCode() == 'media_gallery') {
-                    $catalogProductAttribute->setBackendModel($mediaBackendModel);
-                    $catalogProductAttribute->setBackendType($mediaBackendType);
-                }
-            }
-        }
-    }
 }

app/code/Magento/Catalog/Test/Unit/Model/Entity/AttributeTest.php

@@ -3,9 +3,6 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 namespace Magento\Catalog\Test\Unit\Model\Entity;
 
 use Magento\Catalog\Model\Entity\Attribute;
@@ -20,72 +17,72 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Catalog\Model\Entity\Attribute
      */
-    protected $attribute;
+    private $attribute;
 
     /**
      * @var \Magento\Framework\Model\Context|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $contextMock;
+    private $contextMock;
 
     /**
      * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $registryMock;
+    private $registryMock;
 
     /**
      * @var \Magento\Framework\Api\MetadataServiceInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $metadataServiceMock;
+    private $metadataServiceMock;
 
     /**
      * @var \Magento\Framework\Api\AttributeValueFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $attributeValueFactoryMock;
+    private $attributeValueFactoryMock;
 
     /**
      * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $configMock;
+    private $configMock;
 
     /**
      * @var \Magento\Eav\Model\Entity\TypeFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $typeFactoryMock;
+    private $typeFactoryMock;
 
     /**
      * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $storeManagerMock;
+    private $storeManagerMock;
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Helper|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $helperMock;
+    private $helperMock;
 
     /**
      * @var \Magento\Framework\Validator\UniversalFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $universalFactoryMock;
+    private $universalFactoryMock;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $timezoneMock;
+    private $timezoneMock;
 
     /**
      * @var \Magento\Catalog\Model\Product\ReservedAttributeList|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $reservedAttributeListMock;
+    private $reservedAttributeListMock;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $resolverMock;
+    private $resolverMock;
 
     /**
      * @var \Magento\Catalog\Model\Attribute\LockValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $lockValidatorMock;
+    private $lockValidatorMock;
 
     /**
      * @var \Magento\Framework\Model\ResourceModel\AbstractResource|\PHPUnit_Framework_MockObject_MockObject
@@ -199,9 +196,6 @@ protected function setUp()
             ->expects($this->any())
             ->method('getEventDispatcher')
             ->willReturn($this->eventDispatcher);
-        $attributeCacheMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\AttributeCache::class)
-        ->disableOriginalConstructor()
-        ->getMock();
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->attribute = $objectManagerHelper->getObject(
             Attribute::class,
@@ -222,8 +216,7 @@ protected function setUp()
                 'reservedAttributeList' => $this->reservedAttributeListMock,
                 'resolver' => $this->resolverMock,
                 'dateTimeFormatter' => $this->dateTimeFormatter,
-                'resource' => $this->resourceMock,
-                'attributeCache' => $attributeCacheMock
+                'resource' => $this->resourceMock
             ]
         );
     }

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Eav/AttributeTest.php

@@ -113,10 +113,6 @@ protected function setUp()
             ->method('getConnection')
             ->will($this->returnValue($dbAdapterMock));
 
-        $attributeCacheMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\AttributeCache::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_model = $objectManager->getObject(
             \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
@@ -126,8 +122,7 @@ protected function setUp()
                     'indexerEavProcessor' => $this->_eavProcessor,
                     'resource' => $this->resourceMock,
                     'data' => ['id' => 1],
-                    'eavConfig' => $this->eavConfigMock,
-                    'attributeCache' => $attributeCacheMock
+                    'eavConfig' => $this->eavConfigMock
                 ]
         );
     }

app/code/Magento/CatalogInventory/Helper/Stock.php

@@ -156,7 +156,7 @@ public function addIsInStockFilterToCollection($collection)
             $resource = $this->getStockStatusResource();
             $resource->addStockDataToCollection(
                 $collection,
-                !$isShowOutOfStock && $collection->getFlag('require_stock_items')
+                !$isShowOutOfStock || $collection->getFlag('require_stock_items')
             );
             $collection->setFlag($stockFlag, true);
         }