fix incompatibilities

Author: saimaz

Service/IndexService.php

@@ -425,7 +425,7 @@ public function persist($document): void
         $this->bulk('index', $documentArray);
     }
 
-    public function commit($commitMode = 'flush', array $params = []): array
+    public function commit($commitMode = 'refresh', array $params = []): array
     {
         $bulkResponse = [];
         if (!empty($this->bulkQueries)) {

Tests/Functional/Command/IndexExportCommandTest.php

@@ -25,17 +25,17 @@ protected function getDataArray()
         return [
             DummyDocument::class => [
                 [
-                    '_id' => 'doc1',
+                    '_id' => 1,
                     'title' => 'Foo Product',
                     'number' => 5.00,
                 ],
                 [
-                    '_id' => 'doc2',
+                    '_id' => 2,
                     'title' => 'Bar Product',
                     'number' => 8.33,
                 ],
                 [
-                    '_id' => 'doc3',
+                    '_id' => 3,
                     'title' => 'Lao Product',
                     'number' => 1.95,
                 ],
@@ -88,6 +88,9 @@ public function testIndexExport(array $options, array $expectedResults)
         );
 
         $results = $this->parseResult(vfsStream::url('tmp/test.json'), count($expectedResults));
+        usort($results, function ($a, $b){
+            return (int)$a['_id'] <=> (int)$b['_id'];
+        });
         $this->assertEquals($expectedResults, $results);
     }
 
@@ -97,7 +100,6 @@ public function testIndexExport(array $options, array $expectedResults)
     private function transformDataToResult(string $class): array
     {
         $expectedResults = [];
-        $index = $this->getIndex($class);
 
         foreach ($this->getDataArray()[$class] as $document) {
             $id = $document['_id'];

Tests/Functional/Command/IndexImportCommandTest.php

@@ -62,6 +62,7 @@ public function testIndexImport(int $bulkSize, int $realSize, string $filename)
             ]
         );
 
+//        $index->refresh();
         $search = $index->createSearch()->addQuery(new MatchAllQuery())->setSize($realSize);
         $results = $index->findDocuments($search);
 

Tests/Functional/Result/PersistObjectsTest.php

@@ -55,11 +55,13 @@ public function testAddingValuesToPrivateIdsWithoutSetters()
 
         $document = new IndexWithFieldsDataDocument();
         $document->title = 'acme';
-
         $index->persist($document);
         $index->commit();
 
+        $index->refresh();
+
         $document = $index->findOneBy(['private' => 'acme']);
+
         $this->assertNotNull($document->getId());
     }
 }

Tests/Unit/Result/AbstractResultsIteratorTest.php

@@ -47,7 +47,9 @@ public function testGetDocumentScore()
     {
         $rawData = [
             'hits' => [
-                'total' => 3,
+                'total' => [
+                    'value' => 3
+                ],
                 'hits' => [
                     [
                         '_index' => 'test',
@@ -86,7 +88,7 @@ public function testGetDocumentScore()
         $expectedScores = [1, 2, null];
         $actualScores = [];
 
-        $this->assertEquals($rawData['hits']['total'], $results->count());
+        $this->assertEquals($rawData['hits']['total']['value'], $results->count());
         $this->assertEquals($rawData, $results->getRaw());
 
         foreach ($results as $item) {