Merge pull request #372 from kdambekalns/task/allow-unset-elasticsearch-settings

daniellienert · web-flow · commit 2afe03345c8a · 2021-02-11T23:16:12.000+01:00
TASK: Allow to unset elasticSearchMapping parameters
diff --git a/Classes/Driver/Version6/Mapping/NodeTypeMappingBuilder.php b/Classes/Driver/Version6/Mapping/NodeTypeMappingBuilder.php
@@ -73,7 +73,7 @@ public function buildMappingInformation(Index $index): MappingCollection
 
                 if (isset($propertyConfiguration['search']['elasticSearchMapping'])) {
                     if (is_array($propertyConfiguration['search']['elasticSearchMapping'])) {
-                        $propertyMapping = $propertyConfiguration['search']['elasticSearchMapping'];
+                        $propertyMapping = array_filter($propertyConfiguration['search']['elasticSearchMapping']);
                         $mapping->setPropertyByPath($propertyName, $propertyMapping);
                     }
                 } elseif (isset($propertyConfiguration['type'], $this->defaultConfigurationPerType[$propertyConfiguration['type']]['elasticSearchMapping'])) {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function buildMappingInformation(Index $index): MappingCollection`
`73`	`73`
`74`	`74`	`if (isset($propertyConfiguration['search']['elasticSearchMapping'])) {`
`75`	`75`	`if (is_array($propertyConfiguration['search']['elasticSearchMapping'])) {`
`76`		`- $propertyMapping = $propertyConfiguration['search']['elasticSearchMapping'];`
	`76`	`+ $propertyMapping = array_filter($propertyConfiguration['search']['elasticSearchMapping']);`
`77`	`77`	`$mapping->setPropertyByPath($propertyName, $propertyMapping);`
`78`	`78`	`}`
`79`	`79`	`} elseif (isset($propertyConfiguration['type'], $this->defaultConfigurationPerType[$propertyConfiguration['type']]['elasticSearchMapping'])) {`