TASK: Remove _type argument, which is not needed for modern ES versions

Author: daniellienert

Classes/Driver/Version6/DocumentDriver.php

@@ -37,7 +37,6 @@ public function delete(NodeInterface $node, string $identifier): array
         return [
             [
                 'delete' => [
-                    '_type' =>'_doc',
                     '_id' => $identifier
                 ]
             ]

Classes/Driver/Version6/IndexerDriver.php

@@ -41,7 +41,6 @@ public function document(string $indexName, NodeInterface $node, ElasticSearchDo
             return [
                 [
                     'update' => [
-                        '_type' => '_doc',
                         '_id' => $document->getId(),
                         '_index' => $indexName,
                         'retry_on_conflict' => 3
@@ -70,7 +69,6 @@ public function document(string $indexName, NodeInterface $node, ElasticSearchDo
         return [
             [
                 'index' => [
-                    '_type' => '_doc',
                     '_id' => $document->getId(),
                     '_index' => $indexName,
                 ]
@@ -110,7 +108,6 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, string
         return [
             [
                 'update' => [
-                    '_type' => '_doc',
                     '_id' => $closestFulltextNodeDocumentIdentifier
                 ]
             ],

Configuration/Settings.yaml

@@ -80,3 +80,4 @@ Flowpack:
             nodeTypeMappingBuilder:
               className: 'Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version6\Mapping\NodeTypeMappingBuilder'
           7.x: *v6x
+          8.x: *v6x

Tests/Functional/BaseElasticsearchContentRepositoryAdapterTest.php

@@ -18,6 +18,7 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
 use Neos\ContentRepository\Domain\Service\ContextFactoryInterface;
 use Neos\Flow\Tests\FunctionalTestCase;
+use function RectorPrefix202304\dump;
 
 abstract class BaseElasticsearchContentRepositoryAdapterTest extends FunctionalTestCase
 {
@@ -58,7 +59,13 @@ public function tearDown(): void
 
         if (!$this->isIndexInitialized()) {
             // clean up any existing indices
-            $this->searchClient->request('DELETE', '/' . self::TESTING_INDEX_PREFIX . '*');
+            $aliases = $this->searchClient->request('GET', '_aliases')->getTreatedContent();
+
+            foreach ($aliases as $alias => $aliasConfiguration) {
+                if(str_starts_with($alias, self::TESTING_INDEX_PREFIX)) {
+                    $this->searchClient->request('DELETE', '/' . $alias);
+                }
+            }
         }
     }