Merge remote-tracking branch 'origin/libs-upgrade' into fix-calls-count

Author: buskamuza

app/code/Magento/AdvancedSearch/composer.json

@@ -13,7 +13,7 @@
         "magento/module-customer": "100.3.*",
         "magento/module-search": "100.3.*",
         "magento/module-store": "100.3.*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

app/code/Magento/Amqp/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "100.3.*",
         "magento/framework-amqp": "100.1.*",
         "magento/framework-message-queue": "100.3.*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

app/code/Magento/AsynchronousOperations/composer.json

@@ -11,7 +11,7 @@
         "magento/module-backend": "100.3.*",
         "magento/module-ui": "100.3.*",
         "magento/module-user": "100.3.*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "suggest": {
         "magento/module-admin-notification": "100.3.*",

app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php

@@ -48,27 +48,46 @@ public function __construct(
     }
 
     /**
-     * Delete all price values for non-admin stores if PRICE_SCOPE is global
+     * Delete all price values for non-admin stores if PRICE_SCOPE is set to global.
      *
      * @return void
      */
     public function execute()
     {
-        $priceScope = $this->scopeConfig->getValue(Store::XML_PATH_PRICE_SCOPE);
-        if ($priceScope == Store::PRICE_SCOPE_GLOBAL) {
-            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $priceAttribute */
-            $priceAttribute = $this->attributeRepository
-                ->get(ProductAttributeInterface::ENTITY_TYPE_CODE, ProductAttributeInterface::CODE_PRICE);
-            $connection = $this->resource->getConnection();
-            $conditions = [
-                $connection->quoteInto('attribute_id = ?', $priceAttribute->getId()),
-                $connection->quoteInto('store_id != ?', Store::DEFAULT_STORE_ID),
-            ];
+        if (!$this->isPriceScopeSetToGlobal()) {
+            return;
+        }
+
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $priceAttribute */
+        $priceAttribute = $this->attributeRepository
+            ->get(ProductAttributeInterface::ENTITY_TYPE_CODE, ProductAttributeInterface::CODE_PRICE);
+        $connection = $this->resource->getConnection();
+        $conditions = [
+            $connection->quoteInto('attribute_id = ?', $priceAttribute->getId()),
+            $connection->quoteInto('store_id != ?', Store::DEFAULT_STORE_ID),
+        ];
 
-            $connection->delete(
-                $priceAttribute->getBackend()->getTable(),
-                $conditions
-            );
+        $connection->delete(
+            $priceAttribute->getBackend()->getTable(),
+            $conditions
+        );
+    }
+
+    /**
+     * Checks if price scope config option explicitly equal to global value.
+     *
+     * Such strict comparision is required to prevent price deleting when
+     * price scope config option is null for some reason.
+     *
+     * @return bool
+     */
+    private function isPriceScopeSetToGlobal()
+    {
+        $priceScope = $this->scopeConfig->getValue(Store::XML_PATH_PRICE_SCOPE);
+        if ($priceScope === null) {
+            return false;
         }
+
+        return (int)$priceScope === Store::PRICE_SCOPE_GLOBAL;
     }
 }

app/code/Magento/Elasticsearch/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-elasticsearch",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/module-advanced-search": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-catalog-search": "100.2.*",

app/code/Magento/MessageQueue/composer.json

@@ -7,7 +7,7 @@
     "require": {
         "magento/framework": "100.3.*",
         "magento/magento-composer-installer": "*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

app/code/Magento/MysqlMq/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "100.3.*",
         "magento/magento-composer-installer": "*",
         "magento/module-store": "100.3.*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "type": "magento2-module",
     "version": "100.3.0-dev",

app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedAtListProvider.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Model\ResourceModel\Provider;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+/**
+ * Retrieves ID's of not synced by `updated_at` column entities.
+ * The result should contain list of entities ID's from the main table which have `updated_at` column greater
+ * than in the grid table.
+ */
+class UpdatedAtListProvider implements NotSyncedDataProviderInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(ResourceConnection $resourceConnection)
+    {
+        $this->connection = $resourceConnection->getConnection('sales');
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIds($mainTableName, $gridTableName)
+    {
+        $mainTableName = $this->resourceConnection->getTableName($mainTableName);
+        $gridTableName = $this->resourceConnection->getTableName($gridTableName);
+        $select = $this->connection->select()
+            ->from($mainTableName, [$mainTableName . '.entity_id'])
+            ->joinInner(
+                [$gridTableName => $gridTableName],
+                sprintf(
+                    '%s.entity_id = %s.entity_id AND %s.updated_at > %s.updated_at',
+                    $mainTableName,
+                    $gridTableName,
+                    $mainTableName,
+                    $gridTableName
+                ),
+                []
+            );
+
+        return $this->connection->fetchAll($select, [], \Zend_Db::FETCH_COLUMN);
+    }
+}

app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php

@@ -38,10 +38,12 @@ public function __construct(
      */
     public function getIds($mainTableName, $gridTableName)
     {
+        $mainTableName = $this->resourceConnection->getTableName($mainTableName);
+        $gridTableName = $this->resourceConnection->getTableName($gridTableName);
         $select = $this->getConnection()->select()
-            ->from($this->getConnection()->getTableName($mainTableName), [$mainTableName . '.entity_id'])
+            ->from($mainTableName, [$mainTableName . '.entity_id'])
             ->joinLeft(
-                [$gridTableName => $this->getConnection()->getTableName($gridTableName)],
+                [$gridTableName => $gridTableName],
                 sprintf(
                     '%s.%s = %s.%s',
                     $mainTableName,

app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Provider/NotSyncedDataProviderTest.php

@@ -5,14 +5,13 @@
  */
 namespace Magento\Sales\Test\Unit\Model\ResourceModel\Provider;
 
-use Magento\Framework\ObjectManager\TMap;
 use Magento\Framework\ObjectManager\TMapFactory;
 use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider;
 use Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProviderInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class NotSyncedDataProviderTest
+ * Class for testing not synchronized DataProvider.
  */
 class NotSyncedDataProviderTest extends \PHPUnit\Framework\TestCase
 {
@@ -23,77 +22,46 @@ public function testGetIdsEmpty()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder(TMap::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
-        $tMapFactory->expects(static::once())
-            ->method('create')
-            ->with(
-                [
-                    'array' => [],
-                    'type' => NotSyncedDataProviderInterface::class
-                ]
-            )
-            ->willReturn($tMap);
-        $tMap->expects(static::once())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator([]));
+        $tMapFactory->method('create')
+            ->willReturn([]);
 
-        $provider = new NotSyncedDataProvider($tMapFactory, []);
-        static::assertEquals([], $provider->getIds('main_table', 'grid_table'));
+        $provider = new NotSyncedDataProvider($tMapFactory);
+        self::assertEquals([], $provider->getIds('main_table', 'grid_table'));
     }
 
-    /**
-     * @covers \Magento\Sales\Model\ResourceModel\Provider\NotSyncedDataProvider::getIds
-     */
     public function testGetIds()
     {
         /** @var TMapFactory|MockObject $tMapFactory */
         $tMapFactory = $this->getMockBuilder(TMapFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $tMap = $this->getMockBuilder(TMap::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
         $provider1 = $this->getMockBuilder(NotSyncedDataProviderInterface::class)
             ->getMockForAbstractClass();
-        $provider1->expects(static::once())
-            ->method('getIds')
+        $provider1->method('getIds')
             ->willReturn([1, 2]);
 
         $provider2 = $this->getMockBuilder(NotSyncedDataProviderInterface::class)
             ->getMockForAbstractClass();
-        $provider2->expects(static::once())
-            ->method('getIds')
+        $provider2->method('getIds')
             ->willReturn([2, 3, 4]);
 
-        $tMapFactory->expects(static::once())
-            ->method('create')
-            ->with(
+        $tMapFactory->method('create')
+            ->with(self::equalTo(
                 [
-                    'array' => [
-                        'provider1' => NotSyncedDataProviderInterface::class,
-                        'provider2' => NotSyncedDataProviderInterface::class
-                    ],
+                    'array' => [$provider1, $provider2],
                     'type' => NotSyncedDataProviderInterface::class
                 ]
-            )
-            ->willReturn($tMap);
-        $tMap->expects(static::once())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator([$provider1, $provider2]));
+            ))
+            ->willReturn([$provider1, $provider2]);
 
-        $provider = new NotSyncedDataProvider(
-            $tMapFactory,
-            [
-                'provider1' => NotSyncedDataProviderInterface::class,
-                'provider2' => NotSyncedDataProviderInterface::class,
-            ]
-        );
+        $provider = new NotSyncedDataProvider($tMapFactory, [$provider1, $provider2]);
 
-        static::assertEquals([1, 2, 3, 4], array_values($provider->getIds('main_table', 'grid_table')));
+        self::assertEquals(
+            [1, 2, 3, 4],
+            array_values($provider->getIds('main_table', 'grid_table'))
+        );
     }
 }