🧙‍♂️

Author: Spamercz

src/Mapping/Analyzer/Custom/CommonGrams.php

@@ -5,6 +5,8 @@
 class CommonGrams implements \Spameri\ElasticQuery\Mapping\CustomAnalyzerInterface, \Spameri\ElasticQuery\Collection\Item
 {
 
+	public const NAME = 'customCommonGrams';
+
 	/**
 	 * @var \Spameri\ElasticQuery\Mapping\Settings\Analysis\FilterCollection
 	 */
@@ -42,7 +44,7 @@ public function key(): string
 
 	public function name(): string
 	{
-		return 'customCommonGrams';
+		return self::NAME;
 	}
 
 

src/Mapping/Analyzer/Custom/EdgeNgram.php

@@ -5,6 +5,8 @@
 class EdgeNgram implements \Spameri\ElasticQuery\Mapping\CustomAnalyzerInterface, \Spameri\ElasticQuery\Collection\Item
 {
 
+	public const NAME = 'customEdgeNgram';
+
 	/**
 	 * @var \Spameri\ElasticQuery\Mapping\Settings\Analysis\FilterCollection
 	 */
@@ -49,7 +51,7 @@ public function key(): string
 
 	public function name(): string
 	{
-		return 'customEdgeNgram';
+		return self::NAME;
 	}
 
 

src/Mapping/Analyzer/Custom/WordDelimiter.php

@@ -5,6 +5,8 @@
 class WordDelimiter implements \Spameri\ElasticQuery\Mapping\CustomAnalyzerInterface, \Spameri\ElasticQuery\Collection\Item
 {
 
+	public const NAME = 'customWordDelimiter';
+
 	/**
 	 * @var \Spameri\ElasticQuery\Mapping\Settings\Analysis\FilterCollection
 	 */
@@ -35,7 +37,7 @@ public function key(): string
 
 	public function name(): string
 	{
-		return 'customWordDelimiter';
+		return self::NAME;
 	}
 
 

src/Mapping/Settings/Mapping.php

@@ -15,10 +15,13 @@ class Mapping implements \Spameri\ElasticQuery\Entity\ArrayInterface
 	 */
 	private $fields;
 
+	private bool $dynamic;
+
 
 	public function __construct(
 		string $indexName,
-		?\Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldCollection $fields = NULL
+		?\Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldCollection $fields = NULL,
+		bool $dynamic = true
 	)
 	{
 		$this->indexName = $indexName;
@@ -28,8 +31,13 @@ public function __construct(
 		}
 
 		$this->fields = $fields;
+		$this->dynamic = $dynamic;
 	}
 
+	public function enableStrictMapping(): void
+	{
+		$this->dynamic = false;
+	}
 
 	public function getIndexName(): string
 	{
@@ -103,6 +111,7 @@ public function toArray(): array
 		return [
 			'mappings' => [
 				'properties' => $fields,
+				'dynamic' => $this->dynamic,
 			],
 		];
 	}

src/Mapping/Settings/Mapping/FieldSeparator.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\ElasticQuery\Mapping\Settings\Mapping;
+
+class FieldSeparator
+{
+
+	public const FIELD_SEPARATOR = '.';
+
+}

src/Response/Result/Hit.php

@@ -69,26 +69,36 @@ public function getValue(
 		string $key
 	)
 	{
-		$value = $this->source[$key] ?? NULL;
-		if ($value === NULL) {
-			return NULL;
-		}
+		$value = $this->getSubValue($key);
 
-		if (\strpos($key, '.') === FALSE) {
+		if ($value !== NULL) {
 			return $value;
 		}
 
-		$levels = \explode('.', $key);
+		return $this->source[$key] ?? NULL;
+	}
+
+	/**
+	 * @phpstan-return mixed
+	 */
+	public function getSubValue($key)
+	{
+		if (\str_contains($key, \Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldSeparator::FIELD_SEPARATOR) === TRUE) {
+			$levels = \explode(\Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldSeparator::FIELD_SEPARATOR, $key);
+
+			$value = $this->source[$levels[0]];
+			unset($levels[0]);
 
-		foreach ($levels as $subKey) {
-			$value = $value[$subKey] ?? NULL;
+			foreach ($levels as $subKey) {
+				$value = $value[$subKey] ?? NULL;
 
-			if ($value === NULL) {
-				return NULL;
+				if ($value !== NULL) {
+					return $value;
+				}
 			}
 		}
 
-		return $value;
+		return NULL;
 	}