fix enum instance after entity deserialization

consistence · Apr 17, 2018 · 7bbce8f · 7bbce8f
1 parent 7e2d9ed
commit 7bbce8f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/src/Enum/EnumPostLoadEntityListener.php b/src/Enum/EnumPostLoadEntityListener.php
@@ -97,12 +97,13 @@ private function processField(
 	)
 	{
 		$metadata = $this->getClassMetadata($entityManager, get_class($entity));
-		$scalarValue = $metadata->getFieldValue($entity, $fieldName);
-		if (!is_scalar($scalarValue)) {
-			return;
+		$enumValue = $metadata->getFieldValue($entity, $fieldName);
+
+		if ($enumValue === null) {
+			return null;
 		}
 
-		$enum = $enumClassName::get($scalarValue);
+		$enum = $enumClassName::get(($enumValue instanceof Enum) ? $enumValue->getValue() : $enumValue);
 		$metadata->setFieldValue($entity, $fieldName, $enum);
 		$entityManager->getUnitOfWork()->setOriginalEntityProperty(
 			spl_object_hash($entity),

diff --git a/tests/Enum/LoadEnumToEntityIntegrationTest.php b/tests/Enum/LoadEnumToEntityIntegrationTest.php
@@ -27,6 +27,18 @@ public function testLoadNullEnumToEntity()
 		$this->assertNull($foo->getNullableEnum());
 	}
 
+	public function testLoadEnumToUnserializedEntity()
+	{
+		$fooBeforeSerialization = new FooEntity();
+		$fooBeforeSerialization->setEnum(FooEnum::get(FooEnum::ONE));
+
+		$foo = unserialize(serialize($fooBeforeSerialization));
+		$this->callPostLoadEventOnEntity($foo);
+
+		$this->assertSame(FooEnum::get(FooEnum::ONE), $foo->getEnum());
+		$this->assertNull($foo->getNullableEnum());
+	}
+
 	public function testMultipleLoadEvents()
 	{
 		$foo = new FooEntity();

diff --git a/tests/Enum/data/FooEntity.php b/tests/Enum/data/FooEntity.php
@@ -53,6 +53,11 @@ public function __construct()
 		$this->embedded = new FooEmbeddable();
 	}
 
+	public function setEnum(FooEnum $enum)
+	{
+		$this->enum = $enum;
+	}
+
 	public function getEnum(): FooEnum
 	{
 		return $this->enum;