Merge remote-tracking branch 'magento2/2.3-develop' into MPI_PR_2019_06_21

viktym · viktym · commit 17441d948635 · 2019-06-22T18:17:36.000-05:00
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
@@ -295,10 +295,11 @@ define([
 
             self.$selector.validate().form();
             self.$selector.trigger('afterValidate.beforeSubmit');
-            $('body').trigger('processStop');
 
             // validate parent form
             if (self.$selector.validate().errorList.length) {
+                $('body').trigger('processStop');
+
                 return false;
             }
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php b/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\CatalogUrlRewrite\Model\ResourceModel\Category;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
@@ -49,7 +52,7 @@ protected function _construct()
     public function saveMultiple(array $insertData)
     {
         $connection = $this->getConnection();
-        if (sizeof($insertData) <= self::CHUNK_SIZE) {
+        if (count($insertData) <= self::CHUNK_SIZE) {
             return $connection->insertMultiple($this->getTable(self::TABLE_NAME), $insertData);
         }
         $data = array_chunk($insertData, self::CHUNK_SIZE);
@@ -98,10 +101,13 @@ public function removeMultipleByProductCategory(array $filter)
     private function prepareSelect($data)
     {
         $select = $this->getConnection()->select();
-        $select->from($this->getTable(DbStorage::TABLE_NAME), 'url_rewrite_id');
-
+        $select->from(DbStorage::TABLE_NAME);
+        $select->join(
+            self::TABLE_NAME,
+            DbStorage::TABLE_NAME . '.url_rewrite_id = ' . self::TABLE_NAME . '.url_rewrite_id'
+        );
         foreach ($data as $column => $value) {
-            $select->where($this->getConnection()->quoteIdentifier($column) . ' IN (?)', $value);
+            $select->where(DbStorage::TABLE_NAME . '.' . $column . ' IN (?)', $value);
         }
         return $select;
     }
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -143,14 +143,19 @@ public function generateProductUrlRewrites(Category $category): array
         if ($category->getChangedProductIds()) {
             $this->generateChangedProductUrls($mergeDataProvider, $category, $storeId, $saveRewriteHistory);
         } else {
-            $mergeDataProvider->merge(
-                $this->getCategoryProductsUrlRewrites(
-                    $category,
-                    $storeId,
-                    $saveRewriteHistory,
-                    $category->getEntityId()
-                )
-            );
+            $categoryStoreIds = $this->getCategoryStoreIds($category);
+
+            foreach ($categoryStoreIds as $categoryStoreId) {
+                $this->isSkippedProduct[$category->getEntityId()] = [];
+                $mergeDataProvider->merge(
+                    $this->getCategoryProductsUrlRewrites(
+                        $category,
+                        $categoryStoreId,
+                        $saveRewriteHistory,
+                        $category->getEntityId()
+                    )
+                );
+            }
         }
 
         foreach ($this->childrenCategoriesProvider->getChildren($category, true) as $childCategory) {
@@ -241,7 +246,7 @@ private function getCategoryProductsUrlRewrites(
         $productCollection = $this->productCollectionFactory->create();
 
         $productCollection->addCategoriesFilter(['eq' => [$category->getEntityId()]])
-            ->setStoreId($storeId)
+            ->addStoreFilter($storeId)
             ->addAttributeToSelect('name')
             ->addAttributeToSelect('visibility')
             ->addAttributeToSelect('url_key')
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php
@@ -138,8 +138,14 @@ public function testGenerateProductUrlRewrites()
             ->willReturn(1);
         $category->expects($this->any())
             ->method('getData')
-            ->with('save_rewrites_history')
-            ->willReturn(true);
+            ->withConsecutive(
+                [$this->equalTo('save_rewrites_history')],
+                [$this->equalTo('initial_setup_flag')]
+            )
+            ->willReturnOnConsecutiveCalls(
+                true,
+                null
+            );
 
         /* @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject $childCategory1 */
         $childCategory1 = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
@@ -175,6 +181,7 @@ public function testGenerateProductUrlRewrites()
             ->method('addIdFilter')
             ->willReturnSelf();
         $productCollection->expects($this->any())->method('setStoreId')->willReturnSelf();
+        $productCollection->expects($this->any())->method('addStoreFilter')->willReturnSelf();
         $productCollection->expects($this->any())->method('addAttributeToSelect')->willReturnSelf();
         $iterator = new \ArrayIterator([]);
         $productCollection->expects($this->any())->method('getIterator')->will($this->returnValue($iterator));
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -288,9 +288,12 @@ private function getCustomerEntityFieldsToUpdate(array $entitiesToUpdate): array
     {
         $firstCustomer = reset($entitiesToUpdate);
         $columnsToUpdate = array_keys($firstCustomer);
-        $customerFieldsToUpdate = array_filter($this->customerFields, function ($field) use ($columnsToUpdate) {
-            return in_array($field, $columnsToUpdate);
-        });
+        $customerFieldsToUpdate = array_filter(
+            $this->customerFields,
+            function ($field) use ($columnsToUpdate) {
+                return in_array($field, $columnsToUpdate);
+            }
+        );
         return $customerFieldsToUpdate;
     }
 
@@ -423,6 +426,9 @@ protected function _prepareDataForUpdate(array $rowData)
             $attributeParameters = $this->_attributes[$attributeCode];
             if (in_array($attributeParameters['type'], ['select', 'boolean'])) {
                 $value = $this->getSelectAttrIdByValue($attributeParameters, $value);
+                if ($attributeCode === CustomerInterface::GENDER && $value === 0) {
+                    $value = null;
+                }
             } elseif ('multiselect' == $attributeParameters['type']) {
                 $ids = [];
                 foreach (explode($multiSeparator, mb_strtolower($value)) as $subValue) {
@@ -519,10 +525,8 @@ protected function _importData()
                         if (!isset($attributesToSave[$tableName])) {
                             $attributesToSave[$tableName] = [];
                         }
-                        $attributesToSave[$tableName] = array_diff_key(
-                            $attributesToSave[$tableName],
-                            $customerAttributes
-                        ) + $customerAttributes;
+                        $attributes = array_diff_key($attributesToSave[$tableName], $customerAttributes);
+                        $attributesToSave[$tableName] =  $attributes + $customerAttributes;
                     }
                 }
             }
@@ -578,13 +582,9 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                 $this->addRowError(self::ERROR_INVALID_STORE, $rowNumber);
             }
             // check password
-            if (isset(
-                $rowData['password']
-            ) && strlen(
-                $rowData['password']
-            ) && $this->string->strlen(
-                $rowData['password']
-            ) < self::MIN_PASSWORD_LENGTH
+            if (isset($rowData['password'])
+                && strlen($rowData['password'])
+                && $this->string->strlen($rowData['password']) < self::MIN_PASSWORD_LENGTH
             ) {
                 $this->addRowError(self::ERROR_PASSWORD_LENGTH, $rowNumber);
             }
diff --git a/app/code/Magento/Quote/etc/webapi_rest/di.xml b/app/code/Magento/Quote/etc/webapi_rest/di.xml
@@ -11,5 +11,6 @@
     </type>
     <type name="Magento\Quote\Model\QuoteRepository">
         <plugin name="accessControl" type="Magento\Quote\Model\QuoteRepository\Plugin\AccessChangeQuoteControl" />
+        <plugin name="authorization" type="Magento\Quote\Model\QuoteRepository\Plugin\Authorization" />
     </type>
 </config>
diff --git a/app/code/Magento/Quote/etc/webapi_soap/di.xml b/app/code/Magento/Quote/etc/webapi_soap/di.xml
@@ -11,5 +11,6 @@
     </type>
     <type name="Magento\Quote\Model\QuoteRepository">
         <plugin name="accessControl" type="Magento\Quote\Model\QuoteRepository\Plugin\AccessChangeQuoteControl" />
+        <plugin name="authorization" type="Magento\Quote\Model\QuoteRepository\Plugin\Authorization" />
     </type>
 </config>
diff --git a/app/code/Magento/Sales/etc/webapi_rest/di.xml b/app/code/Magento/Sales/etc/webapi_rest/di.xml
@@ -6,9 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Quote\Model\QuoteRepository">
-        <plugin name="authorization" type="Magento\Quote\Model\QuoteRepository\Plugin\Authorization" />
-    </type>
     <type name="Magento\Sales\Model\ResourceModel\Order">
         <plugin name="authorization" type="Magento\Sales\Model\ResourceModel\Order\Plugin\Authorization" />
     </type>
diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
@@ -6,9 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Quote\Model\QuoteRepository">
-        <plugin name="authorization" type="Magento\Quote\Model\QuoteRepository\Plugin\Authorization" />
-    </type>
     <type name="Magento\Sales\Model\ResourceModel\Order">
         <plugin name="authorization" type="Magento\Sales\Model\ResourceModel\Order\Plugin\Authorization" />
     </type>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/expandable.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/expandable.js
@@ -67,7 +67,11 @@ define([
                 }
             });
 
-            return labels.sort();
+            return labels.sort(
+                function (labelFirst, labelSecond) {
+                    return labelFirst.toLowerCase().localeCompare(labelSecond.toLowerCase());
+                }
+            );
         },
 
         /**
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
@@ -8,7 +8,9 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\ProductRepository;
+use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -318,6 +320,53 @@ public function testGenerateUrlRewritesWithoutGenerateProductRewrites()
         $this->assertResults($productExpectedResult, $actualResults);
     }
 
+    /**
+     * Check number of records after removing product
+     *
+     * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
+     * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     *
+     * @return void
+     */
+    public function testRemoveCatalogUrlRewrites()
+    {
+        /** @var CategoryRepository $categoryRepository */
+        $categoryRepository = $this->objectManager->create(CategoryRepository::class);
+        $category = $categoryRepository->get(5);
+        $categoryId = $category->getId();
+
+        /** @var ProductRepository $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepository::class);
+        $product = $productRepository->get('12345');
+        $productId = $product->getId();
+
+        $countBeforeRemoving = $this->getCountOfRewrites($productId, $categoryId);
+        $productRepository->delete($product);
+        $countAfterRemoving = $this->getCountOfRewrites($productId, $categoryId);
+        $this->assertEquals($countBeforeRemoving - 1, $countAfterRemoving);
+    }
+
+    /**
+     * Get count of records in table
+     *
+     * @param $productId
+     * @param $categoryId
+     * @return string
+     */
+    private function getCountOfRewrites($productId, $categoryId): string
+    {
+        /** @var Product $model */
+        $model = $this->objectManager->get(Product::class);
+        $connection = $model->getConnection();
+        $select = $connection->select();
+        $select->from(Product::TABLE_NAME, 'COUNT(*)');
+        $select->where('category_id = ?', $categoryId);
+        $select->where('product_id = ?', $productId);
+        return $connection->fetchOne($select);
+    }
+
     /**
      * @param array $expected
      * @param array $actual
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/expandable.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/expandable.test.js
@@ -69,5 +69,22 @@ define([
                 expect(expandable.getLabel).toHaveBeenCalled();
             });
         });
+
+        describe('getLabelsArray method', function () {
+            it('check if label array sort alphabetically case insensitive', function () {
+                record['shared_catalog'].push(1, 2, 3);
+                expandable.options.push({
+                    label: 'Default',
+                    value: '1'
+                }, {
+                    label: 'Label',
+                    value: '2'
+                }, {
+                    label: 'default',
+                    value: '3'
+                });
+                expect(expandable.getLabelsArray(record)).toEqual(['Default', 'default', 'Label']);
+            });
+        });
     });
 });
diff --git a/pub/media/.htaccess b/pub/media/.htaccess
@@ -31,7 +31,7 @@ SetHandler default-handler
     RewriteCond %{REQUEST_FILENAME} !-f
 
 ############################################
-## rewrite everything else to index.php
+## rewrite everything else to get.php
 
     RewriteRule .* ../get.php [L]
 </IfModule>
