Added native enum field

Author: akadlec

src/Hydrators/Fields/ConsistenceEnumField.php

@@ -0,0 +1,69 @@
+<?php declare(strict_types = 1);
+
+/**
+ * ConsistenceEnumField.php
+ *
+ * @license        More in LICENSE.md
+ * @copyright      https://www.fastybird.com
+ * @author         Adam Kadlec <adam.kadlec@fastybird.com>
+ * @package        FastyBird:JsonApi!
+ * @subpackage     Hydrators
+ * @since          0.1.0
+ *
+ * @date           26.05.20
+ */
+
+namespace FastyBird\JsonApi\Hydrators\Fields;
+
+use Consistence;
+use IPub\JsonAPIDocument;
+use function call_user_func;
+use function is_callable;
+
+/**
+ * Entity consistence enum field
+ *
+ * @package        FastyBird:JsonApi!
+ * @subpackage     Hydrators
+ *
+ * @author         Adam Kadlec <adam.kadlec@fastybird.com>
+ */
+final class ConsistenceEnumField extends Field
+{
+
+	public function __construct(
+		private readonly string $typeClass,
+		private readonly bool $isNullable,
+		string $mappedName,
+		string $fieldName,
+		bool $isRequired,
+		bool $isWritable,
+	)
+	{
+		parent::__construct($mappedName, $fieldName, $isRequired, $isWritable);
+	}
+
+	/**
+	 * @param JsonAPIDocument\Objects\IStandardObject<string, mixed> $attributes
+	 */
+	public function getValue(JsonAPIDocument\Objects\IStandardObject $attributes): Consistence\Enum\Enum|null
+	{
+		$value = $attributes->get($this->getMappedName());
+
+		$callable = [$this->typeClass, 'get'];
+
+		if (is_callable($callable)) {
+			$result = $value !== null ? call_user_func($callable, $value) : null;
+
+			return $result instanceof Consistence\Enum\Enum ? $result : null;
+		}
+
+		return null;
+	}
+
+	public function isNullable(): bool
+	{
+		return $this->isNullable;
+	}
+
+}

src/Hydrators/Fields/EnumField.php

@@ -10,15 +10,13 @@
  * @subpackage     Hydrators
  * @since          0.1.0
  *
- * @date           26.05.20
+ * @date           08.02.24
  */
 
 namespace FastyBird\JsonApi\Hydrators\Fields;
 
-use Consistence;
 use IPub\JsonAPIDocument;
-use function call_user_func;
-use function is_callable;
+use ReflectionClass;
 
 /**
  * Entity consistence enum field
@@ -31,6 +29,9 @@
 final class EnumField extends Field
 {
 
+	/**
+	 * @param class-string $typeClass
+	 */
 	public function __construct(
 		private readonly string $typeClass,
 		private readonly bool $isNullable,
@@ -46,16 +47,16 @@ public function __construct(
 	/**
 	 * @param JsonAPIDocument\Objects\IStandardObject<string, mixed> $attributes
 	 */
-	public function getValue(JsonAPIDocument\Objects\IStandardObject $attributes): Consistence\Enum\Enum|null
+	public function getValue(JsonAPIDocument\Objects\IStandardObject $attributes): object|null
 	{
 		$value = $attributes->get($this->getMappedName());
 
-		$callable = [$this->typeClass, 'get'];
+		$rc = new ReflectionClass($this->typeClass);
 
-		if (is_callable($callable)) {
-			$result = $value !== null ? call_user_func($callable, $value) : null;
+		if ($rc->isEnum()) {
+			$result = $value !== null ? $this->typeClass::from($value) : null;
 
-			return $result instanceof Consistence\Enum\Enum ? $result : null;
+			return $result instanceof $this->typeClass ? $result : null;
 		}
 
 		return null;

src/Hydrators/Hydrator.php

@@ -541,7 +541,7 @@ protected function mapEntity(string $entityClassName): array
 								);
 
 							} elseif ($typeRc->isSubclassOf(Consistence\Enum\Enum::class)) {
-								$fields[] = new Hydrators\Fields\EnumField(
+								$fields[] = new Hydrators\Fields\ConsistenceEnumField(
 									$className,
 									$isNullable,
 									$mappedKey,
@@ -559,6 +559,16 @@ protected function mapEntity(string $entityClassName): array
 									$isWritable,
 								);
 
+							} elseif ($typeRc->isEnum()) {
+								$fields[] = new Hydrators\Fields\EnumField(
+									$className,
+									$isNullable,
+									$mappedKey,
+									$fieldName,
+									$isRequired,
+									$isWritable,
+								);
+
 							} else {
 								$fields[] = new Hydrators\Fields\SingleEntityField(
 									$className,