fixed field object

Author: Spamercz

src/Mapping/Settings/Mapping.php

@@ -57,6 +57,9 @@ public function toArray(): array
 			if ($field instanceof \Spameri\ElasticQuery\Mapping\Settings\Mapping\SubFields) {
 				$fields[$field->key()] = $field->toArray();
 
+			} elseif ($field instanceof \Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldObject) {
+				$fields[$field->key()] = $field->toArray();
+
 			} else {
 				$fields[$field->key()] = $field->toArray()[$field->key()];
 			}

src/Mapping/Settings/Mapping/FieldObject.php

@@ -19,7 +19,7 @@ class FieldObject
 
 	public function __construct(
 		string $name,
-		\Spameri\ElasticQuery\Mapping\Settings $fields
+		\Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldCollection $fields
 	)
 	{
 		$this->name = $name;
@@ -38,13 +38,12 @@ public function toArray(): array
 		$fields = [];
 		/** @var \Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldInterface $field */
 		foreach ($this->fields as $field) {
-			$fields[$field->key()] = $field->toArray();
+			$fields[$field->key()] = $field->toArray()[$field->key()];
 		}
 
 		return [
-			$this->name => [
-				'properties' => $fields,
-			],
+			'properties' => $fields,
+			'type' => 'object',
 		];
 	}
 

src/Response/Result/Aggregation/Bucket.php

@@ -48,7 +48,7 @@ public function __construct(
 
 	public function key() : string
 	{
-		return $this->key;
+		return (string) $this->key;
 	}