merge magento/2.2-develop into magento-tsg/2.2-develop-pr104

Author: magento-cicd2

app/code/Magento/Backend/Block/Dashboard/Bar.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Block\Dashboard;
 
+use Magento\Store\Model\Store;
+
 /**
  * Adminhtml dashboard bar block
  *
@@ -73,6 +75,7 @@ public function setCurrency($currency)
      * Retrieve currency model if not set then return currency model for current store
      *
      * @return \Magento\Directory\Model\Currency
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getCurrency()
     {
@@ -90,7 +93,8 @@ public function getCurrency()
                     $this->getRequest()->getParam('group')
                 )->getWebsite()->getBaseCurrency();
             } else {
-                $this->_currentCurrencyCode = $this->_storeManager->getStore()->getBaseCurrency();
+                $this->_currentCurrencyCode = $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)
+                    ->getBaseCurrency();
             }
         }
 

app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminDashboardPageIsVisibleActionGroup.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertAdminDashboardPageIsVisibleActionGroup">
+        <seeInCurrentUrl url="{{AdminDashboardPage.url}}" stepKey="seeDashboardUrl"/>
+        <see userInput="Dashboard" selector="{{AdminHeaderSection.pageTitle}}" stepKey="seeDashboardTitle"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/Data/CookieConfigData.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ChangedCookieDomainForMainWebsiteConfigData">
+        <data key="path">web/cookie/cookie_domain</data>
+        <data key="scope">website</data>
+        <data key="scope_code">base</data>
+        <data key="value">testDomain.com</data>
+    </entity>
+    <entity name="EmptyCookieDomainForMainWebsiteConfigData">
+        <data key="path">web/cookie/cookie_domain</data>
+        <data key="scope">website</data>
+        <data key="scope_code">base</data>
+        <data key="value">''</data>
+    </entity>
+</entities>

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminLoginAfterChangeCookieDomainTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Login on the Admin Backend"/>
+            <title value="Admin user can login after changing cookie domain on main website scope without changing cookie domain on default scope"/>
+            <description value="Admin user can login after changing cookie domain on main website scope without changing cookie domain on default scope"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-17931"/>
+            <useCaseId value="MC-17292"/>
+            <group value="backend"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{ChangedCookieDomainForMainWebsiteConfigData.path}} --scope={{ChangedCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{ChangedCookieDomainForMainWebsiteConfigData.scope_code}} {{ChangedCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteBeforeTestRun"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set {{EmptyCookieDomainForMainWebsiteConfigData.path}} --scope={{EmptyCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{EmptyCookieDomainForMainWebsiteConfigData.scope_code}} {{EmptyCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteAfterTestComplete"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestComplete"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <actionGroup ref="AssertAdminDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>
+        <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+    </test>
+</tests>

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -86,6 +86,7 @@
         <arguments>
             <argument name="lifetimePath" xsi:type="const">Magento\Backend\Model\Auth\Session::XML_PATH_SESSION_LIFETIME</argument>
             <argument name="sessionName" xsi:type="const">Magento\Backend\Model\Session\AdminConfig::SESSION_NAME_ADMIN</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\View\Result\PageFactory">

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

@@ -281,8 +281,6 @@ protected function customizeNewDateRangeField(array $meta)
             $fromContainerPath = $this->arrayManager->slicePath($fromFieldPath, 0, -2);
             $toContainerPath = $this->arrayManager->slicePath($toFieldPath, 0, -2);
             $commonFieldsMeta = [
-                'outputDateTimeToISO' => false,
-                'inputDateTimeFormat' => 'YYYY-MM-DD h:mm',
                 'options' => [
                     'showsTime' => true,
                 ]

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php

@@ -11,7 +11,6 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
-use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 
 /**
  * CatalogInventory Default Stock Status Indexer Resource Model
@@ -226,8 +225,6 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
     {
         $connection = $this->getConnection();
         $qtyExpr = $connection->getCheckSql('cisi.qty > 0', 'cisi.qty', 0);
-        $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-        $linkField = $metadata->getLinkField();
 
         $select = $connection->select()->from(
             ['e' => $this->getTable('catalog_product_entity')],
@@ -241,12 +238,6 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
             ['cisi' => $this->getTable('cataloginventory_stock_item')],
             'cisi.stock_id = cis.stock_id AND cisi.product_id = e.entity_id',
             []
-        )->joinInner(
-            ['mcpei' => $this->getTable('catalog_product_entity_int')],
-            'e.' . $linkField . ' = mcpei.' . $linkField
-            . ' AND mcpei.attribute_id = ' . $this->_getAttribute('status')->getId()
-            . ' AND mcpei.value = ' . ProductStatus::STATUS_ENABLED,
-            []
         )->columns(
             ['qty' => $qtyExpr]
         )->where(
@@ -317,7 +308,8 @@ protected function _updateIndex($entityIds)
     }
 
     /**
-     * Delete records by their ids from index table
+     * Delete records by their ids from index table.
+     *
      * Used to clean table before re-indexation
      *
      * @param array $ids
@@ -362,6 +354,8 @@ public function getIdxTable($table = null)
     }
 
     /**
+     * Get status expression
+     *
      * @param AdapterInterface $connection
      * @param bool $isAggregate
      * @return mixed
@@ -387,6 +381,8 @@ protected function getStatusExpression(AdapterInterface $connection, $isAggregat
     }
 
     /**
+     * Get stock configuration
+     *
      * @return StockConfigurationInterface
      *
      * @deprecated 100.1.0
@@ -402,6 +398,8 @@ protected function getStockConfiguration()
     }
 
     /**
+     * Get query processor composite
+     *
      * @return QueryProcessorComposite
      */
     private function getQueryProcessorComposite()

app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php

@@ -10,9 +10,16 @@
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\Autocomplete\DataProviderInterface;
 use Magento\Search\Model\Autocomplete\ItemFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface as ScopeConfig;
+use Magento\Store\Model\ScopeInterface;
 
 class DataProvider implements DataProviderInterface
 {
+    /**
+     * Autocomplete limit
+     */
+    private static $CONFIG_AUTOCOMPLETE_LIMIT = 'catalog/search/autocomplete_limit';
+
     /**
      * Query factory
      *
@@ -27,16 +34,25 @@ class DataProvider implements DataProviderInterface
      */
     protected $itemFactory;
 
+    /**
+     * Scope Config Object
+     *
+     * @var ScopeConfig
+     */
+    private $scopeConfig;
+
     /**
      * @param QueryFactory $queryFactory
      * @param ItemFactory $itemFactory
      */
     public function __construct(
         QueryFactory $queryFactory,
-        ItemFactory $itemFactory
+        ItemFactory $itemFactory,
+        ScopeConfig $scopeConfig
     ) {
         $this->queryFactory = $queryFactory;
         $this->itemFactory = $itemFactory;
+        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -46,6 +62,10 @@ public function getItems()
     {
         $collection = $this->getSuggestCollection();
         $query = $this->queryFactory->get()->getQueryText();
+        $limit = (int) $this->scopeConfig->getValue(
+            static::$CONFIG_AUTOCOMPLETE_LIMIT,
+            ScopeInterface::SCOPE_STORE
+        );
         $result = [];
         foreach ($collection as $item) {
             $resultItem = $this->itemFactory->create([
@@ -58,7 +78,7 @@ public function getItems()
                 $result[] = $resultItem;
             }
         }
-        return $result;
+        return ($limit) ? array_splice($result, 0, $limit) : $result;
     }
 
     /**

app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php

@@ -25,6 +25,11 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $itemFactory;
 
+    /**
+     * @var Magento\Framework\App\Config\ScopeConfigInterface |\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfig;
+
     /**
      * @var \Magento\Search\Model\ResourceModel\Query\Collection |\PHPUnit_Framework_MockObject_MockObject
      */
@@ -60,18 +65,25 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
+        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
+            ->setMethods(['getValue'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->model = $helper->getObject(
             \Magento\CatalogSearch\Model\Autocomplete\DataProvider::class,
             [
                 'queryFactory' => $queryFactory,
-                'itemFactory' => $this->itemFactory
+                'itemFactory' => $this->itemFactory,
+                'scopeConfig' => $this->scopeConfig
             ]
         );
     }
 
     public function testGetItems()
     {
         $queryString = 'string';
+        $limit = 3;
         $expected = ['title' => $queryString, 'num_results' => 100500];
         $collection = [
             ['query_text' => 'string1', 'num_results' => 1],
@@ -80,6 +92,8 @@ public function testGetItems()
             ['query_text' => 'string100', 'num_results' => 100],
             ['query_text' => $queryString, 'num_results' => 100500]
         ];
+        $this->scopeConfig->method('getValue')
+            ->willReturn($limit);
         $this->buildCollection($collection);
         $this->query->expects($this->once())
             ->method('getQueryText')
@@ -105,6 +119,7 @@ public function testGetItems()
         $this->itemFactory->expects($this->any())->method('create')->willReturn($itemMock);
         $result = $this->model->getItems();
         $this->assertEquals($expected, $result[0]->toArray());
+        $this->assertEquals($limit, count($result));
     }
 
     /**

app/code/Magento/CatalogSearch/etc/adminhtml/system.xml

@@ -34,6 +34,10 @@
                     <comment>Number of popular search terms to be cached for faster response. Use “0” to cache all results after a term is searched for the second time.</comment>
                     <validate>validate-digits</validate>
                 </field>
+                <field id="autocomplete_limit" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Autocomplete Limit</label>
+                    <validate>validate-digits</validate>
+                </field>
                 <field id="enable_eav_indexer" translate="label" type="select" sortOrder="18" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Enable EAV Indexer</label>
                     <comment>Enable/Disable Product EAV indexer to improve indexation speed. Make sure that indexer is not used by 3rd party extensions.</comment>