Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MAGETWO-93786

# Conflicts:
#	app/code/Magento/Paypal/Controller/Transparent/Response.php

Author: Oleksandr Gorkun

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/AdvancedSearch/Model/ResourceModel/Index.php

@@ -6,18 +6,22 @@
 namespace Magento\AdvancedSearch\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
 use Magento\Framework\Search\Request\Dimension;
 use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
 
 /**
  * @api
  * @since 100.1.0
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Index extends AbstractDb
 {
@@ -38,25 +42,34 @@ class Index extends AbstractDb
      */
     private $tableResolver;
 
+    /**
+     * @var DimensionCollectionFactory|null
+     */
+    private $dimensionCollectionFactory;
+
     /**
      * Index constructor.
      * @param Context $context
      * @param StoreManagerInterface $storeManager
      * @param MetadataPool $metadataPool
      * @param null $connectionName
      * @param TableResolver|null $tableResolver
+     * @param DimensionCollectionFactory|null $dimensionCollectionFactory
      */
     public function __construct(
         Context $context,
         StoreManagerInterface $storeManager,
         MetadataPool $metadataPool,
         $connectionName = null,
-        TableResolver $tableResolver = null
+        TableResolver $tableResolver = null,
+        DimensionCollectionFactory $dimensionCollectionFactory = null
     ) {
         parent::__construct($context, $connectionName);
         $this->storeManager = $storeManager;
         $this->metadataPool = $metadataPool;
-        $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
+        $this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(IndexScopeResolverInterface::class);
+        $this->dimensionCollectionFactory = $dimensionCollectionFactory
+            ?: ObjectManager::getInstance()->get(DimensionCollectionFactory::class);
     }
 
     /**
@@ -78,18 +91,22 @@ protected function _construct()
     protected function _getCatalogProductPriceData($productIds = null)
     {
         $connection = $this->getConnection();
-
-        $select = $connection->select()->from(
-            $this->getTable('catalog_product_index_price'),
-            ['entity_id', 'customer_group_id', 'website_id', 'min_price']
-        );
-
-        if ($productIds) {
-            $select->where('entity_id IN (?)', $productIds);
+        $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);
+            }
         }
 
+        $catalogProductIndexPriceUnionSelect = $connection->select()->union($catalogProductIndexPriceSelect);
+
         $result = [];
-        foreach ($connection->fetchAll($select) as $row) {
+        foreach ($connection->fetchAll($catalogProductIndexPriceUnionSelect) as $row) {
             $result[$row['website_id']][$row['entity_id']][$row['customer_group_id']] = round($row['min_price'], 2);
         }
 

app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php

@@ -15,6 +15,9 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Select;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class IndexTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -59,10 +62,24 @@ protected function setUp()
         $this->resourceConnectionMock->expects($this->any())->method('getConnection')->willReturn($this->adapterMock);
         $this->metadataPoolMock = $this->createMock(MetadataPool::class);
 
+        $indexScopeResolverMock = $this->createMock(
+            \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver::class
+        );
+        $traversableMock = $this->createMock(\Traversable::class);
+        $dimensionsMock = $this->createMock(\Magento\Framework\Indexer\MultiDimensionProvider::class);
+        $dimensionsMock->method('getIterator')->willReturn($traversableMock);
+        $dimensionFactoryMock = $this->createMock(
+            \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
+        );
+        $dimensionFactoryMock->method('create')->willReturn($dimensionsMock);
+
         $this->model = new Index(
             $this->resourceContextMock,
             $this->storeManagerMock,
-            $this->metadataPoolMock
+            $this->metadataPoolMock,
+            'connectionName',
+            $indexScopeResolverMock,
+            $dimensionFactoryMock
         );
     }
 
@@ -71,11 +88,13 @@ public function testGetPriceIndexDataUsesFrontendPriceIndexerTable()
         $storeId = 1;
         $storeMock = $this->createMock(StoreInterface::class);
         $storeMock->expects($this->any())->method('getId')->willReturn($storeId);
+        $storeMock->method('getWebsiteId')->willReturn(1);
         $this->storeManagerMock->expects($this->once())->method('getStore')->with($storeId)->willReturn($storeMock);
 
         $selectMock = $this->createMock(Select::class);
         $selectMock->expects($this->any())->method('from')->willReturnSelf();
         $selectMock->expects($this->any())->method('where')->willReturnSelf();
+        $selectMock->expects($this->any())->method('union')->willReturnSelf();
         $this->adapterMock->expects($this->once())->method('select')->willReturn($selectMock);
         $this->adapterMock->expects($this->once())->method('fetchAll')->with($selectMock)->willReturn([]);
 

app/code/Magento/AdvancedSearch/etc/di.xml

@@ -19,12 +19,25 @@
             <argument name="title" xsi:type="string" translatable="true">Did you mean</argument>
         </arguments>
     </type>
+    <type name="Magento\AdvancedSearch\Model\Client\ClientResolver">
+        <arguments>
+            <argument name="path" xsi:type="const">Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH</argument>
+            <argument name="scopeType" xsi:type="const">\Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
+        </arguments>
+    </type>
     <type name="Magento\AdvancedSearch\Model\SuggestedQueries">
         <arguments>
             <argument name="data" xsi:type="array">
                 <item name="mysql" xsi:type="string">Magento\AdvancedSearch\Model\DataProvider\Suggestions</item>
             </argument>
         </arguments>
     </type>
+    <type name="Magento\AdvancedSearch\Model\ResourceModel\Index">
+        <arguments>
+            <argument name="tableResolver" xsi:type="object">
+                Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver
+            </argument>
+        </arguments>
+    </type>
     <preference for="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface" type="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProvider" />
 </config>

app/code/Magento/Backend/Block/System/Store/Delete/Group.php

@@ -19,7 +19,7 @@ protected function _prepareLayout()
     {
         $itemId = $this->getRequest()->getParam('group_id');
 
-        $this->setTemplate('system/store/delete_group.phtml');
+        $this->setTemplate('Magento_Backend::system/store/delete_group.phtml');
         $this->setAction($this->getUrl('adminhtml/*/deleteGroupPost', ['group_id' => $itemId]));
         $this->addChild(
             'confirm_deletion_button',

app/code/Magento/Backend/Block/System/Store/Delete/Website.php

@@ -19,7 +19,7 @@ protected function _prepareLayout()
     {
         $itemId = $this->getRequest()->getParam('website_id');
 
-        $this->setTemplate('system/store/delete_website.phtml');
+        $this->setTemplate('Magento_Backend::system/store/delete_website.phtml');
         $this->setAction($this->getUrl('adminhtml/*/deleteWebsitePost', ['website_id' => $itemId]));
         $this->addChild(
             'confirm_deletion_button',

app/code/Magento/Backend/Helper/Dashboard/Order.php

@@ -13,7 +13,7 @@
  * @api
  * @since 100.0.2
  */
-class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
+class Order extends AbstractDashboard
 {
     /**
      * @var \Magento\Reports\Model\ResourceModel\Order\Collection
@@ -29,32 +29,25 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection
+        \Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         $this->_orderCollection = $orderCollection;
-        parent::__construct($context);
-    }
+        $this->_storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(\Magento\Store\Model\StoreManagerInterface::class);
 
-    /**
-     * The getter function to get the new StoreManager dependency
-     *
-     * @return \Magento\Store\Model\StoreManagerInterface
-     *
-     * @deprecated 100.1.0
-     */
-    private function getStoreManager()
-    {
-        if ($this->_storeManager === null) {
-            $this->_storeManager = ObjectManager::getInstance()->get(\Magento\Store\Model\StoreManagerInterface::class);
-        }
-        return $this->_storeManager;
+        parent::__construct($context);
     }
 
     /**
      * @return void
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function _initCollection()
     {
@@ -65,15 +58,15 @@ protected function _initCollection()
         if ($this->getParam('store')) {
             $this->_collection->addFieldToFilter('store_id', $this->getParam('store'));
         } elseif ($this->getParam('website')) {
-            $storeIds = $this->getStoreManager()->getWebsite($this->getParam('website'))->getStoreIds();
+            $storeIds = $this->_storeManager->getWebsite($this->getParam('website'))->getStoreIds();
             $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
         } elseif ($this->getParam('group')) {
-            $storeIds = $this->getStoreManager()->getGroup($this->getParam('group'))->getStoreIds();
+            $storeIds = $this->_storeManager->getGroup($this->getParam('group'))->getStoreIds();
             $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
         } elseif (!$this->_collection->isLive()) {
             $this->_collection->addFieldToFilter(
                 'store_id',
-                ['eq' => $this->getStoreManager()->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
+                ['eq' => $this->_storeManager->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
             );
         }
         $this->_collection->load();

app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php

@@ -17,8 +17,6 @@ class TransactionRefund extends AbstractTransaction
     protected function process(array $data)
     {
         $storeId = $data['store_id'] ?? null;
-        // sending store id and other additional keys are restricted by Braintree API
-        unset($data['store_id']);
 
         return $this->adapterFactory->create($storeId)
             ->refund($data['transaction_id'], $data[PaymentDataBuilder::AMOUNT]);

app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php

@@ -19,8 +19,6 @@ class TransactionSubmitForSettlement extends AbstractTransaction
     protected function process(array $data)
     {
         $storeId = $data['store_id'] ?? null;
-        // sending store id and other additional keys are restricted by Braintree API
-        unset($data['store_id']);
 
         return  $this->adapterFactory->create($storeId)
             ->submitForSettlement($data[CaptureDataBuilder::TRANSACTION_ID], $data[PaymentDataBuilder::AMOUNT]);