Merge branch '2.4.5-develop' of github.com:magento-gl/magento2ce into AC-3632

Author: faizan-shk

app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php

@@ -92,7 +92,7 @@ public function getSort(RequestInterface $request)
             if (in_array($item['field'], $this->skippedFields)) {
                 continue;
             }
-            $attribute = $this->attributeAdapterProvider->getByAttributeCode($item['field']);
+            $attribute = $this->attributeAdapterProvider->getByAttributeCode((string)$item['field']);
             $fieldName = $this->fieldNameResolver->getFieldName($attribute);
             if (isset($this->map[$fieldName])) {
                 $fieldName = $this->map[$fieldName];

app/code/Magento/Multishipping/Model/Cart/MultishippingClearItemAddress.php

@@ -104,6 +104,7 @@ public function clearAddressItem($subject, $request)
                 $quote = $this->cartRepository->get($quote->getId());
                 $this->cartmodel->setQuote($quote);
             }
+            $this->checkoutSession->clearQuote();
         } elseif ($this->disableMultishipping->execute($quote) && $this->isVirtualItemInQuote($quote)) {
             $quote->setTotalsCollectedFlag(false);
             $this->cartRepository->save($quote);

app/code/Magento/Multishipping/Test/Unit/Model/Cart/MultishippingClearItemAddressTest.php

@@ -100,7 +100,8 @@ public function testClearAddressItem(
             ->willReturn($actionName);
         $this->checkoutSessionMock->method('getQuote')
             ->willReturn($quoteMock);
-
+        $this->checkoutSessionMock->method('clearQuote')
+            ->willReturnSelf();
         $addressMock = $this->createMock(Address::class);
         $addressMock->method('getId')
             ->willReturn($addressId);

app/code/Magento/QuoteGraphQl/Model/Resolver/AvailablePaymentMethods.php

@@ -81,12 +81,13 @@ private function getPaymentMethodsData(CartInterface $cart): array
              */
             if ((int)$grandTotal === 0 && $carrierCode === self::FREE_SHIPPING_METHOD
                 && $paymentMethod->getCode() === self::FREE_PAYMENT_METHOD_CODE) {
-                $paymentMethodsData[] = [
-                    'title' => $paymentMethod->getTitle(),
-                    'code' => $paymentMethod->getCode(),
+                return [
+                    [
+                        'title' => $paymentMethod->getTitle(),
+                        'code' => $paymentMethod->getCode(),
+                    ]
                 ];
-            } elseif ((int)$grandTotal >= 0
-                && $carrierCode !== self::FREE_SHIPPING_METHOD) {
+            } elseif ((int)$grandTotal >= 0) {
                 $paymentMethodsData[] = [
                     'title' => $paymentMethod->getTitle(),
                     'code' => $paymentMethod->getCode(),

composer.json

@@ -66,7 +66,7 @@
         "magento/composer-dependency-version-audit-plugin": "~0.1",
         "magento/magento-composer-installer": ">=0.3.0",
         "magento/zendframework1": "~1.15.0",
-        "monolog/monolog": "^2.6",
+        "monolog/monolog": "^2.7",
         "pelago/emogrifier": "^6.0.0",
         "php-amqplib/php-amqplib": "~3.2.0",
         "phpseclib/mcrypt_compat": "~2.0.2",

composer.lock

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Logger\Monolog;
 use Monolog\Handler\HandlerInterface;
+use Monolog\DateTimeImmutable;
 
 class Logger extends Monolog
 {
@@ -43,6 +44,8 @@ public function __construct(
     }
 
     /**
+     * Clear messages
+     *
      * @return void
      */
     public function clearMessages(): void
@@ -51,6 +54,8 @@ public function clearMessages(): void
     }
 
     /**
+     * Get messages
+     *
      * @return array
      */
     public function getMessages(): array
@@ -64,19 +69,21 @@ public function getMessages(): array
      * @param int $level The logging level
      * @param string $message The log message
      * @param array $context The log context
+     * @param DateTimeImmutable $datetime Optional log date to log into the past or future
      * @return bool Whether the record has been processed
      */
     public function addRecord(
         int $level,
         string $message,
-        array $context = []
+        array $context = [],
+        DateTimeImmutable $datetime = null
     ): bool {
         if ($level <= $this->minimumErrorLevel) {
             $this->messages[] = [
                 'level' => $this->getLevelName($level),
                 'message' => $message,
             ];
         }
-        return parent::addRecord($level, $message, $context);
+        return parent::addRecord($level, $message, $context, $datetime);
     }
 }

dev/tests/integration/framework/Magento/TestFramework/ErrorLog/Logger.php

@@ -120,6 +120,7 @@ public function unsetData($key = null)
      * @param string $key
      * @param string|int $index
      * @return mixed
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getData($key = '', $index = null)
     {
@@ -128,7 +129,7 @@ public function getData($key = '', $index = null)
         }
 
         /* process a/b/c key as ['a']['b']['c'] */
-        if (strpos((string)$key, '/') !== false) {
+        if ($key !== null && strpos($key, '/') !== false) {
             $data = $this->getDataByPath($key);
         } else {
             $data = $this->_getData($key);

lib/internal/Magento/Framework/DataObject.php

@@ -37,7 +37,7 @@
         "laminas/laminas-validator": "^2.17.0",
         "magento/composer-dependency-version-audit-plugin": "~0.1",
         "magento/zendframework1": "~1.15.0",
-        "monolog/monolog": "^2.6",
+        "monolog/monolog": "^2.7",
         "ramsey/uuid": "~4.2.0",
         "symfony/console": "~4.4.0",
         "symfony/process": "~4.4.0",