🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #15598: [BUGFIX] #15564 Generated admin API token expires immediately (by @krukas)
 - #15602: set correct annotation (by @sanjay-wagento)
 - #15477: Variant product image in sidebar wishlist block (by @kishanpatadia)
 - #15305: chore: remove extraneous cursor property (by @DanielRuf)
 - #15097: Add field to filter to collection (by @dverkade)


Fixed GitHub Issues:
 - #15564: 2.2.4 Created admin token has no access (reported by @krukas) has been fixed in #15598 by @krukas in 2.2-develop branch
   Related commits:
     1. eab3674
     2. 3ca1c6f

Author: magento-engcom-team

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

@@ -177,27 +177,27 @@ private function convertSerializedDataToJson($setupVersion, SalesSetup $salesSet
     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();
         }
     }
 }

app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php

@@ -133,6 +133,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;
         }

app/code/Magento/Wishlist/CustomerData/Wishlist.php

@@ -147,6 +147,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');

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

@@ -286,8 +286,8 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
      * @param string|\DateTimeInterface $date
      * @param int $dateType
      * @param int $timeType
-     * @param null $locale
-     * @param null $timezone
+     * @param string|null $locale
+     * @param string|null $timezone
      * @param string|null $pattern
      * @return string
      */

lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php

@@ -124,8 +124,8 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null);
      * @param string|\DateTimeInterface $date
      * @param int $dateType
      * @param int $timeType
-     * @param null $locale
-     * @param null $timezone
+     * @param string|null $locale
+     * @param string|null $timezone
      * @param string|null $pattern
      * @return string
      */

lib/web/css/source/lib/_buttons.less

@@ -266,8 +266,7 @@
     &.disabled,
     &[disabled],
     fieldset[disabled] & {
-        cursor: not-allowed;
-        pointer-events: none; // Disabling of clicks
+        pointer-events: none; // Disabling of all pointer events
         .lib-css(opacity, @button__disabled__opacity);
     }
 }