Merge pull request #64 from mirko-bukilic/release/2.0.x

Removed 'query' wrapper in QueryStringOperator for es2

Author: ppavlovic

Makefile

@@ -2,7 +2,7 @@ TITLE = [data-mapper]
 
 unit-tests:
 	@/bin/echo "${TITLE} unit test suite started..." \
-	&& XDEBUG_MODE=off php5.6 ./vendor/bin/phpunit -c tests/unit/phpunit.xml --coverage-html tests/unit/coverage
+	&& XDEBUG_MODE=off php ./vendor/bin/phpunit -c tests/unit/phpunit.xml --coverage-html tests/unit/coverage
 
 integration-tests:
 	@/bin/echo "${TITLE} starting virtual machine ..." \

src/Engine/Elasticsearch/Operators/QueryStringOperator.php

@@ -18,13 +18,10 @@ public function __construct($name, SingleValue $value)
     public function format()
     {
         return [
-            QueryConnector::NAME_QUERY_STRING_QUERY =>
+            QueryConnector::NAME_QUERY_STRING =>
                 [
-                    QueryConnector::NAME_QUERY_STRING =>
-                        [
-                            QueryConnector::NAME_QUERY_STRING_QUERY => $this->value->getValue(),
-                            QueryConnector::ANALYZE_WILDCARD => true,
-                        ],
+                    QueryConnector::NAME_QUERY_STRING_QUERY => $this->value->getValue(),
+                    QueryConnector::ANALYZE_WILDCARD => true,
                 ],
         ];
     }

tests/unit/src/Engine/Elasticsearch/ElasticsearchComparisonFormatterTest.php

@@ -29,7 +29,7 @@ protected function setUp(): void
     public function tearDown(): void
     {
         $this->comparisonFormatter = null;
-        $this->operatorMock        = null;
+        $this->operatorMock = null;
     }
 
     public function testEqual()
@@ -51,8 +51,8 @@ public function testEqualCI()
             ['match' => [
                 'email' => [
                     'query' => 'text@example.com',
-                    'type' => 'phrase'
-                ]
+                    'type' => 'phrase',
+                ],
             ]],
             $this->comparisonFormatter->format('email', $this->operatorMock, new SingleValue('text@example.com'))
         );
@@ -69,8 +69,8 @@ public function testEqualCIEsVersion7()
         $this->assertEquals(
             ['match' => [
                 'email' => [
-                    'query' => 'text@example.com'
-                ]
+                    'query' => 'text@example.com',
+                ],
             ]],
             $comparisonFormatter->format('email', $this->operatorMock, new SingleValue('text@example.com'))
         );
@@ -157,10 +157,10 @@ public function testTimeFromInMinutes()
         $this->assertEquals([
             'range' => [
                 'online' => [
-                    'gt'     => strtotime("-15 minute", time()),
+                    'gt' => strtotime("-15 minute", time()),
                     'format' => 'epoch_second',
-                ]
-            ]
+                ],
+            ],
         ], $this->comparisonFormatter->format('online', $this->operatorMock, new SingleValue(15)));
     }
 
@@ -214,12 +214,10 @@ public function testQueryString()
 
         $this->assertEquals(
             [
-                'query' => [
-                        'query_string' => [
-                                'query' => 'username: *test* OR email: *test*',
-                                'analyze_wildcard' => true,
-                            ],
-                    ]
+                'query_string' => [
+                    'query' => 'username: *test* OR email: *test*',
+                    'analyze_wildcard' => true,
+                ],
             ],
             $this->comparisonFormatter
                 ->format('', $this->operatorMock, new SingleValue('username: *test* OR email: *test*'))
@@ -237,8 +235,8 @@ public function testQueryStringVersion7()
         $this->assertEquals(
             [
                 'query_string' => [
-                    'query' => 'username: *test* OR email: *test*'
-                ]
+                    'query' => 'username: *test* OR email: *test*',
+                ],
             ],
             $comparisonFormatter->format('', $this->operatorMock, new SingleValue('username: *test* OR email: *test*'))
         );