Merge branch '2.2-develop' of github.com:magento/magento2ce into MQE-741-2.2-develop

Author: okolesnyk

app/code/Magento/Catalog/Plugin/Model/ResourceModel/ReadSnapshotPlugin.php

@@ -7,7 +7,7 @@
 
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Config as EavConfig;
 use Magento\Eav\Model\ResourceModel\ReadSnapshot;
 use Magento\Framework\EntityManager\MetadataPool;
 
@@ -24,17 +24,17 @@ class ReadSnapshotPlugin
     private $metadataPool;
 
     /**
-     * @var Config
+     * @var EavConfig
      */
     private $config;
 
     /**
      * @param MetadataPool $metadataPool
-     * @param Config $config
+     * @param EavConfig $config
      */
     public function __construct(
         MetadataPool $metadataPool,
-        Config $config
+        EavConfig $config
     ) {
         $this->metadataPool = $metadataPool;
         $this->config = $config;

app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Ui\DataProvider\Product;
+
+/**
+ * Collection which is used for rendering product list in the backend.
+ *
+ * Used for product grid and customizes behavior of the default Product collection for grid needs.
+ */
+class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
+{
+    /**
+     * Disables using of price index for grid rendering
+     *
+     * Admin area shouldn't use price index and should rely on actual product data instead.
+     *
+     * @codeCoverageIgnore
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     */
+    protected function _productLimitationJoinPrice()
+    {
+        $this->_productLimitationFilters->setUsePriceIndex(false);
+        return $this->_productLimitationPrice(true);
+    }
+}

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -78,6 +78,11 @@
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
         <plugin name="invalidate_pagecache_after_attribute_save" type="Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save" />
     </type>
+    <virtualType name="\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory" type="\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
+        <arguments>
+            <argument name="instanceName" xsi:type="string">\Magento\Catalog\Ui\DataProvider\Product\ProductCollection</argument>
+        </arguments>
+    </virtualType>
     <type name="Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider">
         <arguments>
             <argument name="addFieldStrategies" xsi:type="array">
@@ -86,6 +91,7 @@
             <argument name="addFilterStrategies" xsi:type="array">
                 <item name="store_id" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\AddStoreFieldToCollection</item>
             </argument>
+            <argument name="collectionFactory" xsi:type="object">\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory</argument>
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Product\Action">

app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml

@@ -23,7 +23,7 @@
                            value=""
                            title="<?= /* @escapeNotVerified */ __('Qty') ?>"
                            class="input-text qty"
-                           data-validate="{'required-number':true,digits:true}"/>
+                           data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"/>
                 </div>
             </div>
             <?php endif; ?>

app/code/Magento/Customer/Model/Account/Redirect.php

@@ -206,6 +206,10 @@ protected function processLoggedCustomer()
             $referer = $this->request->getParam(CustomerUrl::REFERER_QUERY_PARAM_NAME);
             if ($referer) {
                 $referer = $this->urlDecoder->decode($referer);
+                preg_match('/logoutSuccess/', $referer, $matches, PREG_OFFSET_CAPTURE);
+                if (!empty($matches)) {
+                    $referer = str_replace('logoutSuccess', '', $referer);
+                }
                 if ($this->hostChecker->isOwnOrigin($referer)) {
                     $this->applyRedirect($referer);
                 }

app/code/Magento/Customer/Model/FileUploader.php

@@ -110,7 +110,7 @@ public function upload()
         $result = $fileProcessor->saveTemporaryFile($this->scope . '[' . $this->getAttributeCode() . ']');
 
         // Update tmp_name param. Required for attribute validation!
-        $result['tmp_name'] = $result['path'] . '/' . ltrim($result['file'], '/');
+        $result['tmp_name'] = ltrim($result['file'], '/');
 
         $result['url'] = $fileProcessor->getViewUrl(
             FileProcessor::TMP_DIR . '/' . ltrim($result['name'], '/'),

app/code/Magento/Customer/Test/Unit/Model/FileUploaderTest.php

@@ -140,7 +140,7 @@ public function testUpload()
             'name' => $resultFileName,
             'file' => $resultFileName,
             'path' => $resultFilePath,
-            'tmp_name' => $resultFilePath . $resultFileName,
+            'tmp_name' => ltrim($resultFileName, '/'),
             'url' => $resultFileUrl,
         ];
 

app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php

@@ -133,6 +133,8 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * @var array
      */
     private $emptyStringTypes = [
+        'int',
+        'decimal',
         'datetime',
         'varchar',
         'text',

app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php

@@ -41,7 +41,7 @@ public function beforeSave($object)
     {
         // parent::beforeSave() is not called intentionally
         $attrCode = $this->getAttribute()->getAttributeCode();
-        if ($object->hasData($attrCode)) {
+        if ($object->hasData($attrCode) && !$this->isJsonEncoded($object->getData($attrCode))) {
             $object->setData($attrCode, $this->jsonSerializer->serialize($object->getData($attrCode)));
         }
         return $this;
@@ -61,4 +61,24 @@ public function afterLoad($object)
         $object->setData($attrCode, $this->jsonSerializer->unserialize($object->getData($attrCode) ?: '{}'));
         return $this;
     }
+
+    /**
+     * Returns true if given param is a valid json value else false.
+     *
+     * @param string|int|float|bool|array|null $value
+     * @return bool
+     */
+    private function isJsonEncoded($value): bool
+    {
+        $result = is_string($value);
+        if ($result) {
+            try {
+                $this->jsonSerializer->unserialize($value);
+            } catch (\InvalidArgumentException $e) {
+                $result = false;
+            }
+        }
+
+        return $result;
+    }
 }

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php

@@ -210,17 +210,19 @@ public function setAttributeSetsFilter(array $setIds)
      */
     public function setInAllAttributeSetsFilter(array $setIds)
     {
-        foreach ($setIds as $setId) {
-            $setId = (int)$setId;
-            if (!$setId) {
-                continue;
-            }
-            $alias = sprintf('entity_attribute_%d', $setId);
-            $joinCondition = $this->getConnection()->quoteInto(
-                "{$alias}.attribute_id = main_table.attribute_id AND {$alias}.attribute_set_id =?",
-                $setId
-            );
-            $this->join([$alias => 'eav_entity_attribute'], $joinCondition, 'attribute_id');
+        if (!empty($setIds)) {
+            $this->getSelect()
+                ->join(
+                    ['entity_attribute' => $this->getTable('eav_entity_attribute')],
+                    'entity_attribute.attribute_id = main_table.attribute_id',
+                    ['count' => new \Zend_Db_Expr('COUNT(*)')]
+                )
+                ->where(
+                    'entity_attribute.attribute_set_id IN (?)',
+                    $setIds
+                )
+                ->group('entity_attribute.attribute_id')
+                ->having('count = ' . count($setIds));
         }
 
         //$this->getSelect()->distinct(true);