Merge remote-tracking branch 'origin/2.3-develop' into hashed-cart-create-refactor

Author: Valeriy Nayda

app/bootstrap.php

@@ -54,8 +54,16 @@
     && isset($_SERVER['HTTP_ACCEPT'])
     && strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
 ) {
-    \Magento\Framework\Profiler::applyConfig(
-        (isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])) ? $_SERVER['MAGE_PROFILER'] : trim(file_get_contents(BP . '/var/profiler.flag')),
+    $profilerConfig = isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])
+        ? $_SERVER['MAGE_PROFILER']
+        : trim(file_get_contents(BP . '/var/profiler.flag'));
+
+    if ($profilerConfig) {
+        $profilerConfig = json_decode($profilerConfig, true) ?: $profilerConfig;
+    }
+
+    Magento\Framework\Profiler::applyConfig(
+        $profilerConfig,
         BP,
         !empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
     );

app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php

@@ -37,7 +37,7 @@ public function __construct(
     }
 
     /**
-     * Predispath admin action controller
+     * Predispatch admin action controller
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void

app/code/Magento/AdminNotification/etc/adminhtml/menu.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_AdminNotification::system_adminnotification"      title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
+        <add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
     </menu>
 </config>

app/code/Magento/AdminNotification/etc/db_schema_whitelist.json

@@ -1,32 +1,32 @@
 {
-  "adminnotification_inbox": {
-    "column": {
-      "notification_id": true,
-      "severity": true,
-      "date_added": true,
-      "title": true,
-      "description": true,
-      "url": true,
-      "is_read": true,
-      "is_remove": true
+    "adminnotification_inbox": {
+        "column": {
+            "notification_id": true,
+            "severity": true,
+            "date_added": true,
+            "title": true,
+            "description": true,
+            "url": true,
+            "is_read": true,
+            "is_remove": true
+        },
+        "index": {
+            "ADMINNOTIFICATION_INBOX_SEVERITY": true,
+            "ADMINNOTIFICATION_INBOX_IS_READ": true,
+            "ADMINNOTIFICATION_INBOX_IS_REMOVE": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
     },
-    "index": {
-      "ADMINNOTIFICATION_INBOX_SEVERITY": true,
-      "ADMINNOTIFICATION_INBOX_IS_READ": true,
-      "ADMINNOTIFICATION_INBOX_IS_REMOVE": true
-    },
-    "constraint": {
-      "PRIMARY": true
-    }
-  },
-  "admin_system_messages": {
-    "column": {
-      "identity": true,
-      "severity": true,
-      "created_at": true
-    },
-    "constraint": {
-      "PRIMARY": true
+    "admin_system_messages": {
+        "column": {
+            "identity": true,
+            "severity": true,
+            "created_at": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
     }
-  }
 }

app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

@@ -37,10 +37,10 @@ public function execute()
                 );
                 return $resultLayout;
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         } else {
-            $this->messageManager->addError(__('Please correct the data sent.'));
+            $this->messageManager->addErrorMessage(__('Please correct the data sent.'));
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);

app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php

@@ -16,6 +16,7 @@
 use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
 use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
 
 /**
  * @api
@@ -47,12 +48,17 @@ class Index extends AbstractDb
      */
     private $dimensionCollectionFactory;
 
+    /**
+     * @var int|null
+     */
+    private $websiteId;
+
     /**
      * Index constructor.
      * @param Context $context
      * @param StoreManagerInterface $storeManager
      * @param MetadataPool $metadataPool
-     * @param null $connectionName
+     * @param string|null $connectionName
      * @param TableResolver|null $tableResolver
      * @param DimensionCollectionFactory|null $dimensionCollectionFactory
      */
@@ -94,12 +100,17 @@ protected function _getCatalogProductPriceData($productIds = null)
         $catalogProductIndexPriceSelect = [];
 
         foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
-            $catalogProductIndexPriceSelect[] = $connection->select()->from(
-                $this->tableResolver->resolve('catalog_product_index_price', $dimensions),
-                ['entity_id', 'customer_group_id', 'website_id', 'min_price']
-            );
-            if ($productIds) {
-                current($catalogProductIndexPriceSelect)->where('entity_id IN (?)', $productIds);
+            if (!isset($dimensions[WebsiteDimensionProvider::DIMENSION_NAME]) ||
+                $this->websiteId === null ||
+                $dimensions[WebsiteDimensionProvider::DIMENSION_NAME]->getValue() === $this->websiteId) {
+                $select = $connection->select()->from(
+                    $this->tableResolver->resolve('catalog_product_index_price', $dimensions),
+                    ['entity_id', 'customer_group_id', 'website_id', 'min_price']
+                );
+                if ($productIds) {
+                    $select->where('entity_id IN (?)', $productIds);
+                }
+                $catalogProductIndexPriceSelect[] = $select;
             }
         }
 
@@ -123,9 +134,12 @@ protected function _getCatalogProductPriceData($productIds = null)
      */
     public function getPriceIndexData($productIds, $storeId)
     {
+        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+
+        $this->websiteId = $websiteId;
         $priceProductsIndexData = $this->_getCatalogProductPriceData($productIds);
+        $this->websiteId = null;
 
-        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
         if (!isset($priceProductsIndexData[$websiteId])) {
             return [];
         }

app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json

@@ -1,14 +1,14 @@
 {
-  "catalogsearch_recommendations": {
-    "column": {
-      "id": true,
-      "query_id": true,
-      "relation_id": true
-    },
-    "constraint": {
-      "PRIMARY": true,
-      "CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID": true,
-      "CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID": true
+    "catalogsearch_recommendations": {
+        "column": {
+            "id": true,
+            "query_id": true,
+            "relation_id": true
+        },
+        "constraint": {
+            "PRIMARY": true,
+            "CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID": true,
+            "CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID": true
+        }
     }
-  }
 }

app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php

@@ -30,4 +30,9 @@ public function toBody(array $data);
      * @return string
      */
     public function getContentTypeHeader();
+
+    /**
+     * @return string
+     */
+    public function getContentMediaType(): string;
 }

app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Analytics\Model\Connector\Http;
 
 use Magento\Framework\Serialize\Serializer\Json;
@@ -14,9 +16,16 @@ class JsonConverter implements ConverterInterface
 {
     /**
      * Content-Type HTTP header for json.
+     * @deprecated
+     * @see CONTENT_MEDIA_TYPE
      */
     const CONTENT_TYPE_HEADER = 'Content-Type: application/json';
 
+    /**
+     * Media-Type corresponding to this converter.
+     */
+    const CONTENT_MEDIA_TYPE = 'application/json';
+
     /**
      * @var Json
      */
@@ -56,6 +65,14 @@ public function toBody(array $data)
      */
     public function getContentTypeHeader()
     {
-        return self::CONTENT_TYPE_HEADER;
+        return sprintf('Content-Type: %s', self::CONTENT_MEDIA_TYPE);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getContentMediaType(): string
+    {
+        return self::CONTENT_MEDIA_TYPE;
     }
 }

app/code/Magento/Analytics/Model/Connector/Http/ResponseResolver.php

@@ -38,7 +38,15 @@ public function __construct(ConverterInterface $converter, array $responseHandle
     public function getResult(\Zend_Http_Response $response)
     {
         $result = false;
-        $responseBody = $this->converter->fromBody($response->getBody());
+        $converterMediaType = $this->converter->getContentMediaType();
+
+        /** Content-Type header may not only contain media-type declaration */
+        if ($response->getBody() && is_int(strripos($response->getHeader('Content-Type'), $converterMediaType))) {
+            $responseBody = $this->converter->fromBody($response->getBody());
+        } else {
+            $responseBody = [];
+        }
+
         if (array_key_exists($response->getStatus(), $this->responseHandlers)) {
             $result = $this->responseHandlers[$response->getStatus()]->handleResponse($responseBody);
         }