Merge branch '2.2-develop' of github.com:magento-jackalopes/magento2ce into MAGETWO-71765

Michael Yu · Michael Yu · commit 0c26a71e82b2 · 2017-09-05T14:50:16.000-05:00
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -259,6 +259,14 @@ protected function getConditions()
             $conditions = $this->conditionsHelper->decode($conditions);
         }
 
+        foreach ($conditions as $key => $condition) {
+            if (!empty($condition['attribute'])
+                && in_array($condition['attribute'], ['special_from_date', 'special_to_date'])
+            ) {
+                $conditions[$key]['value'] = date('Y-m-d H:i:s', strtotime($condition['value']));
+            }
+        }
+
         $this->rule->loadPost(['conditions' => $conditions]);
         return $this->rule->getConditions();
     }
diff --git a/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php b/app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php
@@ -288,6 +288,11 @@ public function testCreateCollection($pagerEnable, $productsCount, $productsPerP
         $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
         $this->productsList->setData('conditions_encoded', 'some_serialized_conditions');
 
+        $this->widgetConditionsHelper->expects($this->once())
+            ->method('decode')
+            ->with('some_serialized_conditions')
+            ->willReturn([]);
+
         $this->builder->expects($this->once())->method('attachConditionToCollection')
             ->with($collection, $this->getConditionsForCollection($collection))
             ->willReturnSelf();
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -9,6 +9,7 @@
 
 use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
 use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Customer\Model\Session;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Locale\Format;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -31,6 +32,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
     /**
      * Current customer
      *
+     * @deprecated, as unused property
      * @var CurrentCustomer
      */
     protected $currentCustomer;
@@ -67,6 +69,11 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      */
     private $localeFormat;
 
+    /**
+     * @var Session
+     */
+    private $customerSession;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
@@ -78,6 +85,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      * @param ConfigurableAttributeData $configurableAttributeData
      * @param array $data
      * @param Format|null $localeFormat
+     * @param Session|null $customerSession
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -90,7 +98,8 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         ConfigurableAttributeData $configurableAttributeData,
         array $data = [],
-        Format $localeFormat = null
+        Format $localeFormat = null,
+        Session $customerSession = null
     ) {
         $this->priceCurrency = $priceCurrency;
         $this->helper = $helper;
@@ -99,6 +108,7 @@ public function __construct(
         $this->currentCustomer = $currentCustomer;
         $this->configurableAttributeData = $configurableAttributeData;
         $this->localeFormat = $localeFormat ?: ObjectManager::getInstance()->get(Format::class);
+        $this->customerSession = $customerSession ?: ObjectManager::getInstance()->get(Session::class);
 
         parent::__construct(
             $context,
@@ -117,6 +127,7 @@ public function getCacheKeyInfo()
     {
         $parentData = parent::getCacheKeyInfo();
         $parentData[] = $this->priceCurrency->getCurrencySymbol();
+        $parentData[] = $this->customerSession->getCustomerGroupId();
         return $parentData;
     }
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Block\Product\View\Type;
 
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\State;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -65,6 +68,11 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
      */
     private $storeManager;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSession;
+
     protected function setUp()
     {
         $this->mockContextObject();
@@ -92,6 +100,28 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $appState = $this->getMockBuilder(State::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getAppState')
+            ->willReturn($appState);
+        $appState->expects($this->any())
+            ->method('getAreaCode')
+            ->willReturn('frontend');
+        $urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getUrlBuilder')
+            ->willReturn($urlBuilder);
+        $fileResolverMock = $this
+            ->getMockBuilder(\Magento\Framework\View\Element\Template\File\Resolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->once())
+            ->method('getResolver')
+            ->willReturn($fileResolverMock);
         $this->configurableAttributeData = $this->getMockBuilder(
             \Magento\ConfigurableProduct\Model\ConfigurableAttributeData::class
         )
@@ -102,6 +132,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->customerSession = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->block = new \Magento\ConfigurableProduct\Block\Product\View\Type\Configurable(
             $this->context,
             $this->arrayUtils,
@@ -112,10 +146,92 @@ protected function setUp()
             $this->priceCurrency,
             $this->configurableAttributeData,
             [],
-            $this->localeFormat
+            $this->localeFormat,
+            $this->customerSession
         );
     }
 
+    /**
+     * Provide cache key info
+     *
+     * @return array
+     */
+    public function cacheKeyProvider() : array
+    {
+        return [
+            'without_currency_and_customer_group' => [
+                [
+                    0 => 'BLOCK_TPL',
+                    1 => 'default',
+                    2 => null,
+                    'base_url' => null,
+                    'template' => null,
+                    3 => null,
+                    4 => null,
+                ],
+                null,
+                null,
+            ],
+            'with_customer_group' => [
+                [
+                    0 => 'BLOCK_TPL',
+                    1 => 'default',
+                    2 => null,
+                    'base_url' => null,
+                    'template' => null,
+                    3 => null,
+                    4 => 1,
+                ],
+                null,
+                1,
+            ],
+            'with_price_currency' => [
+                [
+                    0 => 'BLOCK_TPL',
+                    1 => 'default',
+                    2 => null,
+                    'base_url' => null,
+                    'template' => null,
+                    3 => '$',
+                    4 => null,
+                ],
+                '$',
+                null,
+            ]
+        ];
+    }
+
+    /**
+     * Test cache Tags
+     * @dataProvider cacheKeyProvider
+     * @param array $expected
+     * @param string|null $priceCurrency
+     * @param string|null $customerGroupId
+     */
+    public function testGetCacheKeyInfo(array $expected, string $priceCurrency = null, string $customerGroupId = null)
+    {
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->setMethods([
+                'getCurrentCurrency',
+            ])
+            ->getMockForAbstractClass();
+        $storeMock->expects($this->any())
+            ->method('getCode')
+            ->willReturn('default');
+
+        $this->storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($storeMock);
+        $this->priceCurrency->expects($this->once())
+            ->method('getCurrencySymbol')
+            ->willReturn($priceCurrency);
+        $this->customerSession->expects($this->once())
+            ->method('getCustomerGroupId')
+            ->willReturn($customerGroupId);
+        $actual = $this->block->getCacheKeyInfo();
+        $this->assertEquals($expected, $actual);
+    }
+
     /**
      * Check that getJsonConfig() method returns expected value
      */
diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
@@ -119,9 +119,7 @@ public function getConfig()
         $configuration['isCustomerLoggedIn'] = $this->isCustomerLoggedIn();
         $configuration['formKey'] = $this->formKey->getFormKey();
         $store = $this->storeManager->getStore();
-        $configuration['baseUrl'] = $store->isFrontUrlSecure()
-                ? $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, true)
-                : $store->getBaseUrl(UrlInterface::URL_TYPE_LINK, false);
+        $configuration['baseUrl'] = $store->getBaseUrl(UrlInterface::URL_TYPE_LINK);
         return $configuration;
     }
 
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageConfigProviderTest.php
@@ -98,13 +98,12 @@ public function testGetConfig()
         $storeCode = 4;
         $messageDataMock = ['from' => 'John Doe', 'to' => 'Jane Doe'];
         $formKey = 'ABCDEFGHIJKLMNOP';
-        $isFrontUrlSecure = true;
         $baseUrl = 'https://magento.com/';
         $quoteItemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
         $storeMock = $this->createPartialMock(
             \Magento\Store\Model\Store::class,
-            ['isFrontUrlSecure', 'getBaseUrl', 'getCode']
+            ['getBaseUrl', 'getCode']
         );
         $quoteMock = $this->createPartialMock(
             \Magento\Quote\Model\Quote::class,
@@ -142,8 +141,7 @@ public function testGetConfig()
             ->willReturn($isCustomerLoggedIn);
         $this->formKeyMock->expects($this->once())->method('getFormKey')->willReturn($formKey);
         $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
-        $storeMock->expects($this->once())->method('isFrontUrlSecure')->willReturn($isFrontUrlSecure);
-        $storeMock->expects($this->once())->method('getBaseUrl')->with(UrlInterface::URL_TYPE_LINK, $isFrontUrlSecure)
+        $storeMock->expects($this->once())->method('getBaseUrl')->with(UrlInterface::URL_TYPE_LINK)
             ->willReturn($baseUrl);
 
         $expectedResult = [
diff --git a/app/code/Magento/Rule/Model/Condition/Sql/Builder.php b/app/code/Magento/Rule/Model/Condition/Sql/Builder.php
@@ -108,6 +108,8 @@ protected function _joinTablesToCollection(
     }
 
     /**
+     * Returns sql expression based on rule condition.
+     *
      * @param AbstractCondition $condition
      * @param string $value
      * @return string
@@ -116,24 +118,27 @@ protected function _joinTablesToCollection(
     protected function _getMappedSqlCondition(AbstractCondition $condition, $value = '')
     {
         $argument = $condition->getMappedSqlField();
-        if ($argument) {
-            $conditionOperator = $condition->getOperatorForValidate();
 
-            if (!isset($this->_conditionOperatorMap[$conditionOperator])) {
-                throw new \Magento\Framework\Exception\LocalizedException(__('Unknown condition operator'));
-            }
+        // If rule hasn't valid argument - create negative expression to prevent incorrect rule behavior.
+        if (empty($argument)) {
+            return $this->_expressionFactory->create(['expression' => '1 = -1']);
+        }
 
-            $sql = str_replace(
-                ':field',
-                $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), 0),
-                $this->_conditionOperatorMap[$conditionOperator]
-            );
+        $conditionOperator = $condition->getOperatorForValidate();
 
-            return $this->_expressionFactory->create(
-                ['expression' => $value . $this->_connection->quoteInto($sql, $condition->getBindArgumentValue())]
-            );
+        if (!isset($this->_conditionOperatorMap[$conditionOperator])) {
+            throw new \Magento\Framework\Exception\LocalizedException(__('Unknown condition operator'));
         }
-        return '';
+
+        $sql = str_replace(
+            ':field',
+            $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), 0),
+            $this->_conditionOperatorMap[$conditionOperator]
+        );
+
+        return $this->_expressionFactory->create(
+            ['expression' => $value . $this->_connection->quoteInto($sql, $condition->getBindArgumentValue())]
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Rule/Model/Condition/Sql/BuilderTest.php b/dev/tests/integration/testsuite/Magento/Rule/Model/Condition/Sql/BuilderTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Rule\Model\Condition\Sql;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+class BuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Rule\Model\Condition\Sql\Builder
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = Bootstrap::getObjectManager()->create(\Magento\Rule\Model\Condition\Sql\Builder::class);
+    }
+
+    public function testAttachConditionToCollection()
+    {
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory */
+        $collectionFactory = Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class
+        );
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+        $collection = $collectionFactory->create();
+
+        /** @var \Magento\CatalogWidget\Model\RuleFactory $ruleFactory */
+        $ruleFactory = Bootstrap::getObjectManager()->create(\Magento\CatalogWidget\Model\RuleFactory::class);
+        /** @var \Magento\CatalogWidget\Model\Rule $rule */
+        $rule = $ruleFactory->create();
+
+        $ruleConditionArray = [
+            'conditions' => [
+                '1' => [
+                    'type' => \Magento\CatalogWidget\Model\Rule\Condition\Combine::class,
+                    'aggregator' => 'all',
+                    'value' => '1',
+                    'new_child' => ''
+                ],
+                '1--1' => [
+                    'type' => \Magento\CatalogWidget\Model\Rule\Condition\Product::class,
+                    'attribute' => 'category_ids',
+                    'operator' => '==',
+                    'value' => '3'
+                ],
+                '1--2' => [
+                    'type' => \Magento\CatalogWidget\Model\Rule\Condition\Product::class,
+                    'attribute' => 'special_to_date',
+                    'operator' => '==',
+                    'value' => '2017-09-15'
+                ],
+            ]
+        ];
+
+        $rule->loadPost($ruleConditionArray);
+        $this->model->attachConditionToCollection($collection, $rule->getConditions());
+
+        $whereString = 'WHERE (category_id IN (\'3\')))) AND(IFNULL(`e`.`entity_id`, 0) = \'2017-09-15\') ))';
+        $this->assertNotFalse(strpos($collection->getSelectSql(true), $whereString));
+    }
+}
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx

Original file line number	Diff line number	Diff line change
`@@ -259,6 +259,14 @@ protected function getConditions()`
`259`	`259`	`$conditions = $this->conditionsHelper->decode($conditions);`
`260`	`260`	`}`
`261`	`261`
	`262`	`+ foreach ($conditions as $key => $condition) {`
	`263`	`+ if (!empty($condition['attribute'])`
	`264`	`+ && in_array($condition['attribute'], ['special_from_date', 'special_to_date'])`
	`265`	`+ ) {`
	`266`	`+ $conditions[$key]['value'] = date('Y-m-d H:i:s', strtotime($condition['value']));`
	`267`	`+ }`
	`268`	`+ }`
	`269`	`+`
`262`	`270`	`$this->rule->loadPost(['conditions' => $conditions]);`
`263`	`271`	`return $this->rule->getConditions();`
`264`	`272`	`}`