🔃 [EngCom] Public Pull Requests - 2.3-develop

magento-engcom-team · web-flow · commit dcca45847f62 · 2018-06-21T18:20:07.000+03:00
Accepted Public Pull Requests: - magento#16275: Simplified TypeProcessor (by @joni-jones) - magento#15842: [Forwardport] Add missing table aliases to fields mapping for Customer Group filter� (by @hitesh-wagento) - magento#15744: [Forwardport] [BUGFIX] magento#15564 Generated admin API token expires immediately (by @vijay-wagento) - magento#15726: Forwardport] Feature space between category page #1 (by @sanjay-wagento) - magento#15698: [Forwardport] Variant product image in sidebar wishlist block (by @dmytro-ch) - magento#15672: [FORWARDPORT magento#15097] Add field to filter to collection (by @dverkade) - magento#16256: magento#15255 unlock customer after password reset (by @vgelani) - magento#16246: [Forwardport] array_push(...) calls behaving as '$array[] = ...', $array[] = works faster than invoking functions in PHP (by @lfluvisotto) - magento#16224: [Forwardport] Correct return type of methods and typo correction. (by @saurabh-aureate) - magento#16225: Navigation dropdown caret icon. (by @tejash-wagento) - magento#15980: Use correct error message for duplicate error key in product import (by @denteblu) Fixed GitHub Issues: - magento#15822: SQL Error: ambiguous column 'customer_group_id' in 'All customers' page in admin when extension attribute table is joined (reported by @radio) has been fixed in magento#15842 by @hitesh-wagento in 2.3-develop branch Related commits: 1. 0f23ed7 - magento#15564: 2.2.4 Created admin token has no access (reported by @krukas) has been fixed in magento#15744 by @vijay-wagento in 2.3-develop branch Related commits: 1. 7f34b22 2. 349d178 - magento#12601: A space between the category page and the main footer when applying specific settings (reported by @wd7080) has been fixed in magento#15726 by @sanjay-wagento in 2.3-develop branch Related commits: 1. ce176d2 - magento#15255: Customer who exceeded max login failures not able to login even after reset password (reported by @tizzyguy87) has been fixed in magento#16256 by @vgelani in 2.3-develop branch Related commits: 1. a108233
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2715,7 +2715,12 @@ protected function checkUrlKeyDuplicates()
             );
             foreach ($urlKeyDuplicates as $entityData) {
                 $rowNum = $this->rowNumbers[$entityData['store_id']][$entityData['request_path']];
-                $this->addRowError(ValidatorInterface::ERROR_DUPLICATE_URL_KEY, $rowNum);
+                $message = sprintf(
+                    $this->retrieveMessageTemplate(ValidatorInterface::ERROR_DUPLICATE_URL_KEY),
+                    $entityData['request_path'],
+                    $entityData['sku']
+                );
+                $this->addRowError(ValidatorInterface::ERROR_DUPLICATE_URL_KEY, $rowNum, 'url_key', $message);
             }
         }
     }
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Widget/CategoriesJson.php
@@ -32,7 +32,7 @@ public function __construct(Context $context, Registry $coreRegistry)
     /**
      * Initialize category object in registry
      *
-     * @return Category
+     * @return Category|bool
      */
     protected function _initCategory()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
@@ -120,7 +120,7 @@ public function processAttributeValue($attribute, $value)
      *
      * @param array $index
      * @param string $separator
-     * @return string
+     * @return array
      */
     public function prepareEntityIndex($index, $separator = ' ')
     {
diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -394,9 +394,9 @@ protected function orderCountryOptions(array $countryOptions)
         ]];
         foreach ($countryOptions as $countryOption) {
             if (empty($countryOption['value']) || in_array($countryOption['value'], $this->topCountryCodes)) {
-                array_push($headOptions, $countryOption);
+                $headOptions[] = $countryOption;
             } else {
-                array_push($tailOptions, $countryOption);
+                $tailOptions[] = $countryOption;
             }
         }
         return array_merge($headOptions, $tailOptions);
diff --git a/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php b/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php
@@ -141,9 +141,9 @@ private function orderCountryOptions(array $countryOptions)
         ]];
         foreach ($countryOptions as $countryOption) {
             if (empty($countryOption['value']) || in_array($countryOption['value'], $topCountryCodes)) {
-                array_push($headOptions, $countryOption);
+                $headOptions[] = $countryOption;
             } else {
-                array_push($tailOptions, $countryOption);
+                $tailOptions[] = $countryOption;
             }
         }
         return array_merge($headOptions, $tailOptions);
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -624,6 +624,7 @@ public function resetPassword($email, $resetToken, $newPassword)
         $customerSecure->setRpToken(null);
         $customerSecure->setRpTokenCreatedAt(null);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
+        $this->getAuthentication()->unlock($customer->getId());
         $this->sessionManager->destroy();
         $this->destroyCustomerSessions($customer->getId());
         $this->customerRepository->save($customer);
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
@@ -353,19 +353,19 @@
     <virtualType name="Magento\Customer\Model\Api\SearchCriteria\CollectionProcessor\GroupFilterProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor">
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
-                <item name="code" xsi:type="string">customer_group_code</item>
-                <item name="id" xsi:type="string">customer_group_id</item>
-                <item name="tax_class_name" xsi:type="string">class_name</item>
+                <item name="code" xsi:type="string">main_table.customer_group_code</item>
+                <item name="id" xsi:type="string">main_table.customer_group_id</item>
+                <item name="tax_class_name" xsi:type="string">tax_class_table.class_name</item>
             </argument>
         </arguments>
     </virtualType>
     <!-- @api -->
     <virtualType name="Magento\Customer\Model\Api\SearchCriteria\CollectionProcessor\GroupSortingProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\SortingProcessor">
         <arguments>
             <argument name="fieldMapping" xsi:type="array">
-                <item name="code" xsi:type="string">customer_group_code</item>
-                <item name="id" xsi:type="string">customer_group_id</item>
-                <item name="tax_class_name" xsi:type="string">class_name</item>
+                <item name="code" xsi:type="string">main_table.customer_group_code</item>
+                <item name="id" xsi:type="string">main_table.customer_group_id</item>
+                <item name="tax_class_name" xsi:type="string">tax_class_table.class_name</item>
             </argument>
             <argument name="defaultOrders" xsi:type="array">
                 <item name="id" xsi:type="string">ASC</item>
diff --git a/app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php b/app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php
@@ -188,7 +188,7 @@ private function buildMap($filePath, $packagePath, $contentType)
             if (!isset($this->map[$filePath])) {
                 $this->map[$filePath] = [];
             }
-            array_push($this->map[$filePath], $resolvedMapPath);
+            $this->map[$filePath][] = $resolvedMapPath;
             $this->buildMap($resolvedMapPath, $packagePath, $contentType);
         };
         if ($content) {
diff --git a/app/code/Magento/ImportExport/Model/Report/Csv.php b/app/code/Magento/ImportExport/Model/Report/Csv.php
@@ -77,7 +77,7 @@ public function createReport(
         $outputCsv = $this->createOutputCsvModel($outputFileName);
 
         $columnsName = $sourceCsv->getColNames();
-        array_push($columnsName, self::REPORT_ERROR_COLUMN_NAME);
+        $columnsName[] = self::REPORT_ERROR_COLUMN_NAME;
         $outputCsv->setHeaderCols($columnsName);
 
         foreach ($sourceCsv as $rowNum => $rowData) {
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -2021,7 +2021,7 @@ public function getErrors()
         foreach ($this->getMessages() as $message) {
             /* @var $error \Magento\Framework\Message\AbstractMessage */
             if ($message->getType() == \Magento\Framework\Message\MessageInterface::TYPE_ERROR) {
-                array_push($errors, $message);
+                $errors[] = $message;
             }
         }
         return $errors;
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php b/app/code/Magento/Sales/Setup/Patch/Data/FillQuoteAddressIdInSalesOrderAddress.php
@@ -93,27 +93,27 @@ public function apply()
     public function fillQuoteAddressIdInSalesOrderAddress()
     {
         $addressCollection = $this->addressCollectionFactory->create();
+        $addressCollection->addFieldToFilter('quote_address_id', ['null' => true]);
+
         /** @var \Magento\Sales\Model\Order\Address $orderAddress */
         foreach ($addressCollection as $orderAddress) {
-            if (!$orderAddress->getData('quote_address_id')) {
-                $orderId = $orderAddress->getParentId();
-                $addressType = $orderAddress->getAddressType();
-
-                /** @var \Magento\Sales\Model\Order $order */
-                $order = $this->orderFactory->create()->load($orderId);
-                $quoteId = $order->getQuoteId();
-                $quote = $this->quoteFactory->create()->load($quoteId);
-
-                if ($addressType == \Magento\Sales\Model\Order\Address::TYPE_SHIPPING) {
-                    $quoteAddressId = $quote->getShippingAddress()->getId();
-                    $orderAddress->setData('quote_address_id', $quoteAddressId);
-                } elseif ($addressType == \Magento\Sales\Model\Order\Address::TYPE_BILLING) {
-                    $quoteAddressId = $quote->getBillingAddress()->getId();
-                    $orderAddress->setData('quote_address_id', $quoteAddressId);
-                }
-
-                $orderAddress->save();
+            $orderId = $orderAddress->getParentId();
+            $addressType = $orderAddress->getAddressType();
+
+            /** @var \Magento\Sales\Model\Order $order */
+            $order = $this->orderFactory->create()->load($orderId);
+            $quoteId = $order->getQuoteId();
+            $quote = $this->quoteFactory->create()->load($quoteId);
+
+            if ($addressType == \Magento\Sales\Model\Order\Address::TYPE_SHIPPING) {
+                $quoteAddressId = $quote->getShippingAddress()->getId();
+                $orderAddress->setData('quote_address_id', $quoteAddressId);
+            } elseif ($addressType == \Magento\Sales\Model\Order\Address::TYPE_BILLING) {
+                $quoteAddressId = $quote->getBillingAddress()->getId();
+                $orderAddress->setData('quote_address_id', $quoteAddressId);
             }
+
+            $orderAddress->save();
         }
     }
 
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
@@ -506,7 +506,7 @@ public function sortItemsByPriority($items, Address $address = null)
             foreach ($items as $itemKey => $itemValue) {
                 if ($rule->getActions()->validate($itemValue)) {
                     unset($items[$itemKey]);
-                    array_push($itemsSorted, $itemValue);
+                    $itemsSorted[] = $itemValue;
                 }
             }
         }
diff --git a/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php b/app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php
@@ -79,7 +79,7 @@ public function getUrlRewriteId()
 
     /**
      * @param int $urlRewriteId
-     * @return int
+     * @return $this
      */
     public function setUrlRewriteId($urlRewriteId)
     {
diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
@@ -72,7 +72,7 @@ public function getAdminPasswordLifetime()
     }
 
     /**
-     * Get admin maxiumum security failures from config
+     * Get admin maximum security failures from config
      *
      * @return int
      */
diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
@@ -132,6 +132,11 @@ private function isTokenExpired(Token $token): bool
             // other user-type tokens are considered always valid
             return false;
         }
+
+        if (empty($tokenTtl)) {
+            return false;
+        }
+
         if ($this->dateTime->strToTime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) {
             return true;
         }
diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -149,6 +149,14 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
      */
     protected function getImageData($product)
     {
+        /*Set variant product if it is configurable product.
+        It will show variant product image in sidebar instead of configurable product image.*/
+        $simpleOption = $product->getCustomOption('simple_product');
+        if ($simpleOption !== null) {
+            $optionProduct = $simpleOption->getProduct();
+            $product = $optionProduct;
+        }
+
         /** @var \Magento\Catalog\Helper\Image $helper */
         $helper = $this->imageHelperFactory->create()
             ->init($product, 'wishlist_sidebar_block');
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -507,6 +507,16 @@
         }
     }
 
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
+
 }
 
 //
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -747,6 +747,16 @@
             }
         }
     }
+
+    //
+    //  Category page 1 column layout
+    //  ---------------------------------------------
+
+    .catalog-category-view.page-layout-1column {
+        .column.main {
+            min-height: inherit;
+        }
+    }
 }
 
 //
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObject.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObject.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Reflection\Test\Unit;
 
+use Magento\Framework\Reflection\Test\Unit\Fixture\TSampleInterface;
+
 /**
  * Dummy data object to be used by TypeProcessorTest
  */
@@ -13,18 +15,23 @@ class DataObject
     /**
      * @var string
      */
-    protected $attrName;
+    private $attrName;
 
     /**
      * @var bool
      */
-    protected $isActive;
+    private $isActive;
 
     /**
      * @var string
      */
     private $name;
 
+    /**
+     * @var array
+     */
+    private $data = [];
+
     /**
      * @return string
      */
@@ -70,4 +77,32 @@ public function setName($name = null)
         $this->name = $name;
         return $this;
     }
+
+    /**
+     * @param string $key Key is used as index
+     * @param string $value
+     * @return void
+     */
+    public function setData(string $key, string $value)
+    {
+        $this->data[$key] = $value;
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    public function addData(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @param TSampleInterface[] $list
+     * @return void
+     */
+    public function addObjectList(array $list)
+    {
+        $this->data['objects'] = $list;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
diff --git a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/FieldsFilter.php
diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less
diff --git a/setup/src/Magento/Setup/Module/Dependency/Circular.php b/setup/src/Magento/Setup/Module/Dependency/Circular.php
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlInterceptorScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlInterceptorScanner.php
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/XmlScanner.php

Original file line number	Diff line number	Diff line change
`@@ -2715,7 +2715,12 @@ protected function checkUrlKeyDuplicates()`
`2715`	`2715`	`);`
`2716`	`2716`	`foreach ($urlKeyDuplicates as $entityData) {`
`2717`	`2717`	`$rowNum = $this->rowNumbers[$entityData['store_id']][$entityData['request_path']];`
`2718`		`- $this->addRowError(ValidatorInterface::ERROR_DUPLICATE_URL_KEY, $rowNum);`
	`2718`	`+ $message = sprintf(`
	`2719`	`+ $this->retrieveMessageTemplate(ValidatorInterface::ERROR_DUPLICATE_URL_KEY),`
	`2720`	`+ $entityData['request_path'],`
	`2721`	`+ $entityData['sku']`
	`2722`	`+ );`
	`2723`	`+ $this->addRowError(ValidatorInterface::ERROR_DUPLICATE_URL_KEY, $rowNum, 'url_key', $message);`
`2719`	`2724`	`}`
`2720`	`2725`	`}`
`2721`	`2726`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(Context $context, Registry $coreRegistry)`
`32`	`32`	`/**`
`33`	`33`	`* Initialize category object in registry`
`34`	`34`	`*`
`35`		`- * @return Category`
	`35`	`+ * @return Category\|bool`
`36`	`36`	`*/`
`37`	`37`	`protected function _initCategory()`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function processAttributeValue($attribute, $value)`
`120`	`120`	`*`
`121`	`121`	`* @param array $index`
`122`	`122`	`* @param string $separator`
`123`		`- * @return string`
	`123`	`+ * @return array`
`124`	`124`	`*/`
`125`	`125`	`public function prepareEntityIndex($index, $separator = ' ')`
`126`	`126`	`{`
Original file line number	Diff line number	Diff line change
`@@ -394,9 +394,9 @@ protected function orderCountryOptions(array $countryOptions)`
`394`	`394`	`]];`
`395`	`395`	`foreach ($countryOptions as $countryOption) {`
`396`	`396`	`if (empty($countryOption['value']) \|\| in_array($countryOption['value'], $this->topCountryCodes)) {`
`397`		`- array_push($headOptions, $countryOption);`
	`397`	`+ $headOptions[] = $countryOption;`
`398`	`398`	`} else {`
`399`		`- array_push($tailOptions, $countryOption);`
	`399`	`+ $tailOptions[] = $countryOption;`
`400`	`400`	`}`
`401`	`401`	`}`
`402`	`402`	`return array_merge($headOptions, $tailOptions);`
Original file line number	Diff line number	Diff line change
`@@ -141,9 +141,9 @@ private function orderCountryOptions(array $countryOptions)`
`141`	`141`	`]];`
`142`	`142`	`foreach ($countryOptions as $countryOption) {`
`143`	`143`	`if (empty($countryOption['value']) \|\| in_array($countryOption['value'], $topCountryCodes)) {`
`144`		`- array_push($headOptions, $countryOption);`
	`144`	`+ $headOptions[] = $countryOption;`
`145`	`145`	`} else {`
`146`		`- array_push($tailOptions, $countryOption);`
	`146`	`+ $tailOptions[] = $countryOption;`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`	`return array_merge($headOptions, $tailOptions);`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ private function buildMap($filePath, $packagePath, $contentType)`
`188`	`188`	`if (!isset($this->map[$filePath])) {`
`189`	`189`	`$this->map[$filePath] = [];`
`190`	`190`	`}`
`191`		`- array_push($this->map[$filePath], $resolvedMapPath);`
	`191`	`+ $this->map[$filePath][] = $resolvedMapPath;`
`192`	`192`	`$this->buildMap($resolvedMapPath, $packagePath, $contentType);`
`193`	`193`	`};`
`194`	`194`	`if ($content) {`
Original file line number	Diff line number	Diff line change
`@@ -2021,7 +2021,7 @@ public function getErrors()`
`2021`	`2021`	`foreach ($this->getMessages() as $message) {`
`2022`	`2022`	`/* @var $error \Magento\Framework\Message\AbstractMessage */`
`2023`	`2023`	`if ($message->getType() == \Magento\Framework\Message\MessageInterface::TYPE_ERROR) {`
`2024`		`- array_push($errors, $message);`
	`2024`	`+ $errors[] = $message;`
`2025`	`2025`	`}`
`2026`	`2026`	`}`
`2027`	`2027`	`return $errors;`