Merge branch '2.4-develop' into MC-42938

Author: nvshivakumar

app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php

@@ -205,14 +205,15 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
             return $valid;
         }
 
-        if (!strlen(trim($rowData[$attrCode]))) {
+        if ($rowData[$attrCode] === null || trim($rowData[$attrCode]) === '') {
             return true;
         }
 
         if ($rowData[$attrCode] === $this->context->getEmptyAttributeValueConstant() && !$attrParams['is_required']) {
             return true;
         }
 
+        $valid = false;
         switch ($attrParams['type']) {
             case 'varchar':
             case 'text':

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php

@@ -23,39 +23,29 @@ class PersonalInfo extends \Magento\Backend\Block\Template
      * since his last activity. Used only if it's impossible to get such setting
      * from configuration.
      */
-    const DEFAULT_ONLINE_MINUTES_INTERVAL = 15;
+    public const DEFAULT_ONLINE_MINUTES_INTERVAL = 15;
 
     /**
-     * Customer
-     *
      * @var \Magento\Customer\Api\Data\CustomerInterface
      */
     protected $customer;
 
     /**
-     * Customer log
-     *
      * @var \Magento\Customer\Model\Log
      */
     protected $customerLog;
 
     /**
-     * Customer logger
-     *
      * @var \Magento\Customer\Model\Logger
      */
     protected $customerLogger;
 
     /**
-     * Customer registry
-     *
      * @var \Magento\Customer\Model\CustomerRegistry
      */
     protected $customerRegistry;
 
     /**
-     * Account management
-     *
      * @var AccountManagementInterface
      */
     protected $accountManagement;
@@ -68,43 +58,31 @@ class PersonalInfo extends \Magento\Backend\Block\Template
     protected $groupRepository;
 
     /**
-     * Customer data factory
-     *
      * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
      */
     protected $customerDataFactory;
 
     /**
-     * Address helper
-     *
      * @var \Magento\Customer\Helper\Address
      */
     protected $addressHelper;
 
     /**
-     * Date time
-     *
      * @var \Magento\Framework\Stdlib\DateTime
      */
     protected $dateTime;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $coreRegistry;
 
     /**
-     * Address mapper
-     *
      * @var Mapper
      */
     protected $addressMapper;
 
     /**
-     * Data object helper
-     *
      * @var \Magento\Framework\Api\DataObjectHelper
      */
     protected $dataObjectHelper;
@@ -439,7 +417,8 @@ public function getLastLoginDate()
      */
     public function getStoreLastLoginDate()
     {
-        $date = strtotime($this->getCustomerLog()->getLastLoginAt());
+        $lastLogin = $this->getCustomerLog()->getLastLoginAt();
+        $date = $lastLogin !== null ? strtotime($lastLogin) : false;
 
         if ($date) {
             $date = $this->_localeDate->scopeDate($this->getCustomer()->getStoreId(), $date, true);

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

@@ -49,7 +49,7 @@ public function getNamePrefixOptions($store = null)
     {
         return $this->prepareNamePrefixSuffixOptions(
             $this->addressHelper->getConfig('prefix_options', $store),
-            $this->addressHelper->getConfig('prefix_show', $store) == NooptreqSource::VALUE_OPTIONAL
+            $this->addressHelper->getConfig('prefix_show', $store) === NooptreqSource::VALUE_OPTIONAL
         );
     }
 
@@ -63,7 +63,7 @@ public function getNameSuffixOptions($store = null)
     {
         return $this->prepareNamePrefixSuffixOptions(
             $this->addressHelper->getConfig('suffix_options', $store),
-            $this->addressHelper->getConfig('suffix_show', $store) == NooptreqSource::VALUE_OPTIONAL
+            $this->addressHelper->getConfig('suffix_show', $store) === NooptreqSource::VALUE_OPTIONAL
         );
     }
 
@@ -93,13 +93,12 @@ protected function _prepareNamePrefixSuffixOptions($options, $isOptional = false
      */
     private function prepareNamePrefixSuffixOptions($options, $isOptional = false)
     {
-        $options = trim($options);
-        if (empty($options)) {
+        if ($options === null || empty(trim($options))) {
             return false;
         }
-
         $result = [];
-        $options = explode(';', $options);
+        $options = explode(';', trim($options));
+
         foreach ($options as $value) {
             $result[] = $this->escaper->escapeHtml(trim($value)) ?: ' ';
         }

app/code/Magento/Dhl/Model/Carrier.php

@@ -482,11 +482,12 @@ public function setRequest(\Magento\Framework\DataObject $request)
         );
 
         $shippingWeight = $request->getPackageWeight();
+        $destStreet = $request->getDestStreet() !== null ? str_replace("\n", '', $request->getDestStreet()) : '';
 
         $requestObject->setValue(sprintf('%.2f', $request->getPackageValue()))
             ->setValueWithDiscount($request->getPackageValueWithDiscount())
             ->setCustomsValue($request->getPackageCustomsValue())
-            ->setDestStreet($this->string->substr(str_replace("\n", '', $request->getDestStreet()), 0, 35))
+            ->setDestStreet($this->string->substr($destStreet, 0, 35))
             ->setDestStreetLine2($request->getDestStreetLine2())
             ->setDestCity($request->getDestCity())
             ->setOrigCompanyName($request->getOrigCompanyName())
@@ -939,7 +940,7 @@ protected function _getDimension($dimension, $configWeightUnit = false)
             );
         }
 
-        return round($dimension, 3);
+        return round((float) $dimension, 3);
     }
 
     /**

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

@@ -91,7 +91,8 @@ public function initQuery(RequestInterface $request)
             'body' => [
                 'from' => min(self::ELASTIC_INT_MAX, $request->getFrom()),
                 'size' => $request->getSize(),
-                'stored_fields' => ['_id', '_score'],
+                'stored_fields' => '_none_',
+                'docvalue_fields' => ['_id', '_score'],
                 'sort' => $this->sortBuilder->getSort($request),
                 'query' => [],
             ],

app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php

@@ -59,6 +59,10 @@ private function getEntityStorage(array $queryResult)
     {
         $ids = [];
         foreach ($queryResult['hits']['hits'] as $document) {
+            if (!array_key_exists('_id', $document) && isset($document['fields']['_id'][0])) {
+                $document['_id'] = $document['fields']['_id'][0];
+                unset($document['fields']);
+            }
             $ids[] = $document['_id'];
         }
 

app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php

@@ -8,7 +8,7 @@
 use Magento\Framework\ObjectManagerInterface;
 
 /**
- * Response Factory
+ * Query Response Factory
  * @api
  * @since 100.1.0
  */
@@ -23,15 +23,15 @@ class ResponseFactory
     protected $objectManager;
 
     /**
-     * Document Factory
+     * Document Factory to create Search Document instance
      *
      * @var DocumentFactory
      * @since 100.1.0
      */
     protected $documentFactory;
 
     /**
-     * Aggregation Factory
+     * Aggregation Factory to create Aggregation instance
      *
      * @var AggregationFactory
      * @since 100.1.0
@@ -64,6 +64,10 @@ public function create($response)
     {
         $documents = [];
         foreach ($response['documents'] as $rawDocument) {
+            if (!array_key_exists('_id', $rawDocument) && isset($rawDocument['fields']['_id'][0])) {
+                $rawDocument['_id'] = $rawDocument['fields']['_id'][0];
+                unset($rawDocument['fields']);
+            }
             /** @var \Magento\Framework\Api\Search\Document[] $documents */
             $documents[] = $this->documentFactory->create(
                 $rawDocument

app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php

@@ -72,8 +72,32 @@ protected function setUp(): void
     public function testCreate(): void
     {
         $documents = [
-            ['title' => 'oneTitle', 'description' => 'oneDescription'],
-            ['title' => 'twoTitle', 'description' => 'twoDescription']
+            [
+                'title' => 'oneTitle',
+                'description' => 'oneDescription',
+                'fields' => [
+                    '_id' => ['1']
+                ]
+            ],
+            [
+                'title' => 'twoTitle',
+                'description' => 'twoDescription',
+                'fields' => [
+                    '_id' => ['2']
+                ]
+            ]
+        ];
+        $modifiedDocuments = [
+            [
+                'title' => 'oneTitle',
+                'description' => 'oneDescription',
+                '_id' => '1'
+            ],
+            [
+                'title' => 'twoTitle',
+                'description' => 'twoDescription',
+                '_id' => '2'
+            ]
         ];
         $aggregations = [
             'aggregation1' => [
@@ -113,7 +137,7 @@ public function testCreate(): void
 
         $this->documentFactory
             ->method('create')
-            ->withConsecutive([$documents[0]], [$documents[1]])
+            ->withConsecutive([$modifiedDocuments[0]], [$modifiedDocuments[1]])
             ->willReturnOnConsecutiveCalls('document1', 'document2');
 
         $this->aggregationFactory

app/code/Magento/Elasticsearch/composer.json

@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "elasticsearch/elasticsearch": "~7.15.0"
+        "elasticsearch/elasticsearch": "~7.16.0"
     },
     "suggest": {
         "magento/module-config": "*"

app/code/Magento/Elasticsearch6/composer.json

@@ -8,7 +8,7 @@
         "magento/module-catalog-search": "*",
         "magento/module-search": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~7.15.0"
+        "elasticsearch/elasticsearch": "~7.16.0"
     },
     "suggest": {
         "magento/module-config": "*"