Merge pull request #3730 from magento-arcticfoxes/pr

2.3-develop combined PR

Author: joanhe

app/code/Magento/Developer/Model/Setup/Declaration/Schema/WhitelistGenerator.php

@@ -206,20 +206,25 @@ private function getElementsWithAutogeneratedName(Schema $schema, string $tableN
             foreach ($tableData[$elementType] as $tableElementData) {
                 if ($tableElementData['type'] === 'foreign') {
                     $referenceTable = $schema->getTableByName($tableElementData['referenceTable']);
-                    $constraintName = $this->elementNameResolver->getFullFKName(
-                        $table,
-                        $table->getColumnByName($tableElementData['column']),
-                        $referenceTable,
-                        $referenceTable->getColumnByName($tableElementData['referenceColumn'])
-                    );
+                    $column = $table->getColumnByName($tableElementData['column']);
+                    $referenceColumn = $referenceTable->getColumnByName($tableElementData['referenceColumn']);
+                    $constraintName = ($column !== false && $referenceColumn !== false) ?
+                        $this->elementNameResolver->getFullFKName(
+                            $table,
+                            $column,
+                            $referenceTable,
+                            $referenceColumn
+                        ) : null;
                 } else {
                     $constraintName = $this->elementNameResolver->getFullIndexName(
                         $table,
                         $tableElementData['column'],
                         $tableElementData['type']
                     );
                 }
-                $declaredStructure[$elementType][$constraintName] = true;
+                if ($constraintName) {
+                    $declaredStructure[$elementType][$constraintName] = true;
+                }
             }
         }
 

app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php

@@ -12,12 +12,18 @@
 use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType;
 use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
 
 /**
  * Map product index data to search engine metadata
  */
 class ProductDataMapper implements BatchDataMapperInterface
 {
+    /**
+     * @var AttributeOptionInterface[]
+     */
+    private $attributeOptionsCache;
+
     /**
      * @var Builder
      */
@@ -95,6 +101,7 @@ public function __construct(
         $this->excludedAttributes = array_merge($this->defaultExcludedAttributes, $excludedAttributes);
         $this->additionalFieldsProvider = $additionalFieldsProvider;
         $this->dataProvider = $dataProvider;
+        $this->attributeOptionsCache = [];
     }
 
     /**
@@ -272,7 +279,13 @@ private function isAttributeDate(Attribute $attribute): bool
     private function getValuesLabels(Attribute $attribute, array $attributeValues): array
     {
         $attributeLabels = [];
-        foreach ($attribute->getOptions() as $option) {
+
+        $options = $this->getAttributeOptions($attribute);
+        if (empty($options)) {
+            return $attributeLabels;
+        }
+
+        foreach ($options as $option) {
             if (\in_array($option->getValue(), $attributeValues)) {
                 $attributeLabels[] = $option->getLabel();
             }
@@ -281,6 +294,22 @@ private function getValuesLabels(Attribute $attribute, array $attributeValues):
         return $attributeLabels;
     }
 
+    /**
+     * Retrieve options for attribute
+     *
+     * @param Attribute $attribute
+     * @return array
+     */
+    private function getAttributeOptions(Attribute $attribute): array
+    {
+        if (!isset($this->attributeOptionsCache[$attribute->getId()])) {
+            $options = $attribute->getOptions() ?? [];
+            $this->attributeOptionsCache[$attribute->getId()] = $options;
+        }
+
+        return $this->attributeOptionsCache[$attribute->getId()];
+    }
+
     /**
      * Retrieve value for field. If field have only one value this method return it.
      * Otherwise will be returned array of these values.

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicField.php

@@ -126,7 +126,7 @@ public function getFields(array $context = []): array
         foreach ($groups as $group) {
             $groupPriceKey = $this->fieldNameResolver->getFieldName(
                 $priceAttribute,
-                ['customerGroupId' => $group->getId(), 'websiteId' => $context['websiteId']]
+                array_merge($context, ['customerGroupId' => $group->getId()])
             );
             $allAttributes[$groupPriceKey] = [
                 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_FLOAT),

app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php

@@ -8,24 +8,29 @@
 use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
 use Magento\Framework\Search\Dynamic\DataProviderInterface;
 
+/**
+ * Builder for term buckets.
+ */
 class Term implements BucketBuilderInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build(
         RequestBucketInterface $bucket,
         array $dimensions,
         array $queryResult,
         DataProviderInterface $dataProvider
     ) {
+        $buckets = $queryResult['aggregations'][$bucket->getName()]['buckets'] ?? [];
         $values = [];
-        foreach ($queryResult['aggregations'][$bucket->getName()]['buckets'] as $resultBucket) {
+        foreach ($buckets as $resultBucket) {
             $values[$resultBucket['key']] = [
                 'value' => $resultBucket['key'],
                 'count' => $resultBucket['doc_count'],
             ];
         }
+
         return $values;
     }
 }

app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php

@@ -5,11 +5,16 @@
  */
 namespace Magento\Elasticsearch\SearchAdapter\Query\Builder;
 
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerPool;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
 use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
 
+/**
+ * Builder for match query.
+ */
 class Match implements QueryInterface
 {
     /**
@@ -23,24 +28,35 @@ class Match implements QueryInterface
     private $fieldMapper;
 
     /**
+     * @deprecated
+     * @see \Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer
      * @var PreprocessorInterface[]
      */
     protected $preprocessorContainer;
 
+    /**
+     * @var ValueTransformerPool
+     */
+    private $valueTransformerPool;
+
     /**
      * @param FieldMapperInterface $fieldMapper
      * @param PreprocessorInterface[] $preprocessorContainer
+     * @param ValueTransformerPool|null $valueTransformerPool
      */
     public function __construct(
         FieldMapperInterface $fieldMapper,
-        array $preprocessorContainer
+        array $preprocessorContainer,
+        ValueTransformerPool $valueTransformerPool = null
     ) {
         $this->fieldMapper = $fieldMapper;
         $this->preprocessorContainer = $preprocessorContainer;
+        $this->valueTransformerPool = $valueTransformerPool ?? ObjectManager::getInstance()
+            ->get(ValueTransformerPool::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build(array $selectQuery, RequestQueryInterface $requestQuery, $conditionType)
     {
@@ -61,16 +77,14 @@ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $
     }
 
     /**
+     * Prepare query.
+     *
      * @param string $queryValue
      * @param string $conditionType
      * @return array
      */
     protected function prepareQuery($queryValue, $conditionType)
     {
-        $queryValue = $this->escape($queryValue);
-        foreach ($this->preprocessorContainer as $preprocessor) {
-            $queryValue = $preprocessor->process($queryValue);
-        }
         $condition = $conditionType === BoolExpression::QUERY_CONDITION_NOT ?
             self::QUERY_CONDITION_MUST_NOT : $conditionType;
         return [
@@ -99,21 +113,34 @@ protected function buildQueries(array $matches, array $queryValue)
 
         // Checking for quoted phrase \"phrase test\", trim escaped surrounding quotes if found
         $count = 0;
-        $value = preg_replace('#^\\\\"(.*)\\\\"$#m', '$1', $queryValue['value'], -1, $count);
+        $value = preg_replace('#^"(.*)"$#m', '$1', $queryValue['value'], -1, $count);
         $condition = ($count) ? 'match_phrase' : 'match';
 
+        $attributesTypes = $this->fieldMapper->getAllAttributesTypes();
+        $transformedTypes = [];
         foreach ($matches as $match) {
             $resolvedField = $this->fieldMapper->getFieldName(
                 $match['field'],
                 ['type' => FieldMapperInterface::TYPE_QUERY]
             );
+            $valueTransformer = $this->valueTransformerPool->get($attributesTypes[$resolvedField]['type'] ?? 'text');
+            $valueTransformerHash = \spl_object_hash($valueTransformer);
+            if (!isset($transformedTypes[$valueTransformerHash])) {
+                $transformedTypes[$valueTransformerHash] = $valueTransformer->transform($value);
+            }
+            $transformedValue = $transformedTypes[$valueTransformerHash];
+            if (null === $transformedValue) {
+                //Value is incompatible with this field type.
+                continue;
+            }
+
             $conditions[] = [
                 'condition' => $queryValue['condition'],
                 'body' => [
                     $condition => [
                         $resolvedField => [
-                            'query' => $value,
-                            'boost' => isset($match['boost']) ? $match['boost'] : 1,
+                            'query' => $transformedValue,
+                            'boost' => $match['boost'] ?? 1,
                         ],
                     ],
                 ],
@@ -124,18 +151,15 @@ protected function buildQueries(array $matches, array $queryValue)
     }
 
     /**
-     * Cut trailing plus or minus sign, and @ symbol, using of which causes InnoDB to report a syntax error.
-     * @link https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html Fulltext-boolean search docs.
-     *
      * Escape a value for special query characters such as ':', '(', ')', '*', '?', etc.
      *
+     * @deprecated
+     * @see \Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer
      * @param string $value
      * @return string
      */
     protected function escape($value)
     {
-        $value = preg_replace('/@+|[@+-]+$/', '', $value);
-
         $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
         $replace = '\\\$1';
 

app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/DateTransformer.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\Model\Adapter\FieldType\Date;
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+
+/**
+ * Value transformer for date type fields.
+ */
+class DateTransformer implements ValueTransformerInterface
+{
+    /**
+     * @var Date
+     */
+    private $dateFieldType;
+
+    /**
+     * @param Date $dateFieldType
+     */
+    public function __construct(Date $dateFieldType)
+    {
+        $this->dateFieldType = $dateFieldType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): ?string
+    {
+        try {
+            $formattedDate = $this->dateFieldType->formatDate(null, $value);
+        } catch (\Exception $e) {
+            $formattedDate = null;
+        }
+
+        return $formattedDate;
+    }
+}

app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/FloatTransformer.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+
+/**
+ * Value transformer for float type fields.
+ */
+class FloatTransformer implements ValueTransformerInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): ?float
+    {
+        return \is_numeric($value) ? (float) $value : null;
+    }
+}

app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/IntegerTransformer.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformerInterface;
+
+/**
+ * Value transformer for integer type fields.
+ */
+class IntegerTransformer implements ValueTransformerInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function transform(string $value): ?int
+    {
+        return \is_numeric($value) ? (int) $value : null;
+    }
+}