Merge remote-tracking branch 'trigger/MAGETWO-87454' into BugFixPR

Author: joanhe

app/code/Magento/Rule/Model/Condition/Sql/Builder.php

@@ -41,6 +41,14 @@ class Builder
         '!()'   => ':field NOT IN (?)',
     ];
 
+    /**
+     * @var array
+     */
+    private $stringConditionOperatorMap = [
+        '{}' => ':field LIKE ?',
+        '!{}' => ':field NOT LIKE ?',
+    ];
+
     /**
      * @var \Magento\Rule\Model\Condition\Sql\ExpressionFactory
      */
@@ -152,15 +160,27 @@ protected function _getMappedSqlCondition(
         }
 
         $defaultValue = 0;
-        $sql = str_replace(
-            ':field',
-            $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), $defaultValue),
-            $this->_conditionOperatorMap[$conditionOperator]
-        );
-
-        $bindValue = $condition->getBindArgumentValue();
-        $expression = $value . $this->_connection->quoteInto($sql, $bindValue);
-
+        //operator 'contains {}' is mapped to 'IN()' query that cannot work with substrings
+        // adding mapping to 'LIKE %%'
+        if ($condition->getInputType() === 'string'
+            && in_array($conditionOperator, array_keys($this->stringConditionOperatorMap), true)
+        ) {
+            $sql = str_replace(
+                ':field',
+                $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), $defaultValue),
+                $this->stringConditionOperatorMap[$conditionOperator]
+            );
+            $bindValue = $condition->getBindArgumentValue();
+            $expression = $value . $this->_connection->quoteInto($sql, "%$bindValue%");
+        } else {
+            $sql = str_replace(
+                ':field',
+                $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), $defaultValue),
+                $this->_conditionOperatorMap[$conditionOperator]
+            );
+            $bindValue = $condition->getBindArgumentValue();
+            $expression = $value . $this->_connection->quoteInto($sql, $bindValue);
+        }
         // values for multiselect attributes can be saved in comma-separated format
         // below is a solution for matching such conditions with selected values
         if (is_array($bindValue) && \in_array($conditionOperator, ['()', '{}'], true)) {

dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php

@@ -131,4 +131,45 @@ private function performAssertions(int $count)
             "Product collection was not filtered according to the widget condition."
         );
     }
+
+    /**
+     * Check that collection returns correct result if use not contains operator for string attribute
+     *
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_xss.php
+     * @magentoDataFixture Magento/Catalog/_files/product_virtual.php
+     * @dataProvider createCollectionForSkuDataProvider
+     * @param string $encodedConditions
+     * @param string $sku
+     * @return void
+     */
+    public function testCreateCollectionForSku($encodedConditions, $sku)
+    {
+        $this->block->setData('conditions_encoded', $encodedConditions);
+        $productCollection = $this->block->createCollection();
+        $productCollection->load();
+        $this->assertEquals(
+            1,
+            $productCollection->count(),
+            "Product collection was not filtered according to the widget condition."
+        );
+        $this->assertEquals($sku, $productCollection->getFirstItem()->getSku());
+    }
+
+    /**
+     * @return array
+     */
+    public function createCollectionForSkuDataProvider()
+    {
+        return [
+            'contains' => ['^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,'
+                . '`aggregator`:`all`,`value`:`1`,`new_child`:``^],'
+                . '`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,'
+                . '`attribute`:`sku`,`operator`:`^[^]`,`value`:`virtual`^]^]' , 'virtual-product'],
+            'not contains' => ['^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,'
+                . '`aggregator`:`all`,`value`:`1`,`new_child`:``^],'
+                . '`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,'
+                . '`attribute`:`sku`,`operator`:`!^[^]`,`value`:`virtual`^]^]', 'product-with-xss']
+        ];
+    }
 }