Merge remote-tracking branch 'l3/ACP2E-615' into PR_L3_18_04_2022

Author: veloraven

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

@@ -19,6 +19,18 @@ class IntegerTransformer implements ValueTransformerInterface
      */
     public function transform(string $value): ?int
     {
-        return \is_numeric($value) ? (int) $value : null;
+        return (\is_numeric($value) &&
+            $this->validateIntegerTypesWithInRange((int) $value)) ? (int) $value : null;
+    }
+
+    /**
+     * Validate integer value is within the range of 32 bytes as per elasticsearch.
+     *
+     * @param int $value
+     * @return bool
+     */
+    public function validateIntegerTypesWithInRange(int $value): bool
+    {
+        return (abs($value) & 0x7FFFFFFF) === abs($value);
     }
 }

app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/ValueTransformer/IntegerTransformerTest.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\IntegerTransformer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test value transformer
+ */
+class IntegerTransformerTest extends TestCase
+{
+    /**
+     * @var IntegerTransformer
+     */
+    protected $model;
+
+    /**
+     * Setup method
+     * @return void
+     */
+    public function setUp(): void
+    {
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            IntegerTransformer::class
+        );
+    }
+
+    /**
+     * Test integer transform value
+     * @param string $value
+     * @param int|null $expected
+     * @return void
+     * @dataProvider valuesDataProvider
+     */
+    public function testIntegerTransform(string $value, ?int $expected): void
+    {
+        $this->assertEquals($expected, $this->model->transform($value));
+    }
+
+    /**
+     * Values data provider
+     *
+     * @return array
+     */
+    public function valuesDataProvider(): array
+    {
+        return [
+            ['12345', 12345],
+            ['3310042623',null]
+        ];
+    }
+}