Merge branch 'EPAM-PR-14' of github.com:magento-epam/magento2ce into EPAM-PR-11-14-15

Author: rganin

app/code/Magento/Catalog/Model/Product.php

@@ -71,6 +71,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     const STORE_ID = 'store_id';
 
+    /**
+     * Product Url path.
+     */
+    const URL_PATH = 'url_path';
+
     /**
      * @var string
      */
@@ -923,8 +928,8 @@ public function beforeSave()
      *
      * If value specified, it will be set.
      *
-     * @param   bool $value
-     * @return  bool
+     * @param bool $value
+     * @return bool
      */
     public function canAffectOptions($value = null)
     {

app/code/Magento/Catalog/Model/Product/Copier.php

@@ -8,7 +8,11 @@
 namespace Magento\Catalog\Model\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
 
+/**
+ * The copier creates product duplicates.
+ */
 class Copier
 {
     /**
@@ -49,7 +53,7 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product
      */
-    public function copy(\Magento\Catalog\Model\Product $product)
+    public function copy(Product $product)
     {
         $product->getWebsiteIds();
         $product->getCategoryIds();
@@ -79,6 +83,7 @@ public function copy(\Magento\Catalog\Model\Product $product)
                 ? $matches[1] . '-' . ($matches[2] + 1)
                 : $urlKey . '-1';
             $duplicate->setUrlKey($urlKey);
+            $duplicate->setData(Product::URL_PATH, null);
             try {
                 $duplicate->save();
                 $isDuplicateSaved = true;
@@ -94,6 +99,8 @@ public function copy(\Magento\Catalog\Model\Product $product)
     }
 
     /**
+     * Returns product option repository.
+     *
      * @return Option\Repository
      * @deprecated 101.0.0
      */
@@ -107,6 +114,8 @@ private function getOptionRepository()
     }
 
     /**
+     * Returns metadata pool.
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      * @deprecated 101.0.0
      */

app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use \Magento\Catalog\Model\Product\Copier;
+use Magento\Catalog\Model\Product;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -54,7 +55,7 @@ protected function setUp()
             \Magento\Catalog\Model\Product\Option\Repository::class
         );
         $this->optionRepositoryMock;
-        $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $this->productMock = $this->createMock(Product::class);
         $this->productMock->expects($this->any())->method('getEntityId')->willReturn(1);
 
         $this->metadata = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadata::class)
@@ -106,7 +107,7 @@ public function testCopy()
         $this->productMock->expects($this->once())->method('getResource')->will($this->returnValue($resourceMock));
 
         $duplicateMock = $this->createPartialMock(
-            \Magento\Catalog\Model\Product::class,
+            Product::class,
             [
                 '__wakeup',
                 'setData',
@@ -147,10 +148,10 @@ public function testCopy()
         )->with(
             \Magento\Store\Model\Store::DEFAULT_STORE_ID
         );
-        $duplicateMock->expects($this->once())->method('setData')->with($productData);
+        $duplicateMock->expects($this->atLeastOnce())->method('setData')->willReturn($duplicateMock);
         $this->copyConstructorMock->expects($this->once())->method('build')->with($this->productMock, $duplicateMock);
         $duplicateMock->expects($this->once())->method('getUrlKey')->willReturn('urk-key-1');
-        $duplicateMock->expects($this->once())->method('setUrlKey')->with('urk-key-2');
+        $duplicateMock->expects($this->once())->method('setUrlKey')->with('urk-key-2')->willReturn($duplicateMock);
         $duplicateMock->expects($this->once())->method('save');
 
         $this->metadata->expects($this->any())->method('getLinkField')->willReturn('linkField');

app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php

@@ -16,8 +16,7 @@
 use Magento\Catalog\Model\Product;
 
 /**
- * Class CustomAttributeFilter
- * Applies filters by custom attributes to base select
+ * Applies filters by custom attributes to base select.
  *
  * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
  *             will replace it as the default search engine.
@@ -74,13 +73,13 @@ public function __construct(
      * Applies filters by custom attributes to base select
      *
      * @param Select $select
-     * @param FilterInterface[] ...$filters
+     * @param FilterInterface[] $filters
      * @return Select
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \InvalidArgumentException
      * @throws \DomainException
      */
-    public function apply(Select $select, FilterInterface ... $filters)
+    public function apply(Select $select, FilterInterface ...$filters)
     {
         $select = clone $select;
         $mainTableAlias = $this->extractTableAliasFromSelect($select);
@@ -144,7 +143,6 @@ private function getJoinConditions($attrId, $mainTable, $joinTable)
     {
         return [
             sprintf('`%s`.`entity_id` = `%s`.`entity_id`', $mainTable, $joinTable),
-            sprintf('`%s`.`source_id` = `%s`.`source_id`', $mainTable, $joinTable),
             $this->conditionManager->generateCondition(
                 sprintf('%s.attribute_id', $joinTable),
                 '=',

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml

@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerAccountInformationSection">
+        <element name="statusInactive" type="button" selector=".admin__actions-switch-label"/>
         <element name="accountInformationTitle" type="text" selector=".admin__page-nav-title"/>
         <element name="accountInformationButton" type="text" selector="//a/span[text()='Account Information']"/>
         <element name="firstName" type="input" selector="input[name='customer[firstname]']"/>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerFiltersSection.xml

@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerFiltersSection">
+        <element name="customerStatus" type="button" selector="select[name='status']"/>
         <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button" timeout="30"/>
         <element name="nameInput" type="input" selector="input[name=name]"/>
         <element name="emailInput" type="input" selector="input[name=email]"/>

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php

@@ -28,6 +28,8 @@ class FieldType
     /**#@-*/
 
     /**
+     * Get field type by attribute
+     *
      * @param AbstractAttribute $attribute
      * @return string
      * @since 100.1.0
@@ -37,7 +39,7 @@ public function getFieldType($attribute)
         $backendType = $attribute->getBackendType();
         $frontendInput = $attribute->getFrontendInput();
 
-        if (in_array($backendType, ['timestamp', 'datetime'], true)) {
+        if ($backendType === 'timestamp') {
             $fieldType = self::ES_DATA_TYPE_DATE;
         } elseif ((in_array($backendType, ['int', 'smallint'], true)
             || (in_array($frontendInput, ['select', 'boolean'], true) && $backendType !== 'varchar'))

app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php

@@ -27,6 +27,8 @@ class FieldType
     /**#@-*/
 
     /**
+     * Get field type by attribute
+     *
      * @param AbstractAttribute $attribute
      * @return string
      * @since 100.1.0
@@ -36,7 +38,7 @@ public function getFieldType($attribute)
         $backendType = $attribute->getBackendType();
         $frontendInput = $attribute->getFrontendInput();
 
-        if (in_array($backendType, ['timestamp', 'datetime'], true)) {
+        if ($backendType === 'timestamp') {
             $fieldType = self::ES_DATA_TYPE_DATE;
         } elseif ((in_array($backendType, ['int', 'smallint'], true)
             || (in_array($frontendInput, ['select', 'boolean'], true) && $backendType !== 'varchar'))

app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php

@@ -94,7 +94,7 @@ public static function attributeTypesProvider()
             ['attr1', 'static', 'select', 'integer'],
             ['attr1', 'static', 'text', 'text'],
             ['attr1', 'timestamp', 'select', 'date'],
-            ['attr1', 'datetime', 'text', 'date'],
+            ['attr1', 'datetime', 'text', 'text'],
             ['attr1', 'int', 'select', 'integer'],
             ['attr1', 'decimal', 'text', 'float'],
             ['attr1', 'varchar', 'select', 'text'],

app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php

@@ -5,7 +5,11 @@
  */
 namespace Magento\Reports\Model\ResourceModel\Quote;
 
+use Magento\Store\Model\Store;
+
 /**
+ * Collection of abandoned quotes with reports join.
+ *
  * @api
  * @since 100.0.2
  */
@@ -48,6 +52,24 @@ public function __construct(
         $this->customerResource = $customerResource;
     }
 
+    /**
+     * Filter collections by stores.
+     *
+     * @param array $storeIds
+     * @param bool $withAdmin
+     * @return $this
+     */
+    public function addStoreFilter(array $storeIds, $withAdmin = true)
+    {
+        if ($withAdmin) {
+            $storeIds[] = Store::DEFAULT_STORE_ID;
+        }
+
+        $this->addFieldToFilter('store_id', ['in' => $storeIds]);
+
+        return $this;
+    }
+
     /**
      * Prepare for abandoned report
      *