Add check for PHP version for backwards compatibility

doctrine · Apr 1, 2022 · 21f2a6b · 21f2a6b
1 parent e1de222
commit 21f2a6b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/src/DoctrineObject.php b/src/DoctrineObject.php
@@ -34,7 +34,6 @@
 use function get_class_methods;
 use function gettype;
 use function in_array;
-use function interface_exists;
 use function is_array;
 use function is_callable;
 use function is_int;
@@ -320,7 +319,7 @@ public function hydrateValue(string $name, $value, ?array $data = null)
             return null;
         }
 
-        if (interface_exists('BackedEnum') && $value instanceof BackedEnum) {
+        if (PHP_VERSION_ID >= 80100 && $value instanceof BackedEnum) {
             return $value;
         }
 

diff --git a/tests/Assets/SimpleEntityWithEnum.php b/tests/Assets/SimpleEntityWithEnum.php
@@ -6,9 +6,11 @@
 
 class SimpleEntityWithEnum
 {
-    protected int $id;
+    /** @var int */
+    protected $id;
 
-    protected ?SimpleEnum $enum;
+    /** @var SimpleEnum|null */
+    protected $enum;
 
     public function setId(int $id): void
     {

diff --git a/tests/Assets/SimpleEnumStrategy.php b/tests/Assets/SimpleEnumStrategy.php
@@ -10,8 +10,10 @@ class SimpleEnumStrategy implements StrategyInterface
 {
     /**
      * @param  mixed $value
+     *
+     * @return int|null
      */
-    public function extract($value, ?object $object = null): int|null
+    public function extract($value, ?object $object = null)
     {
         if ($value === null) {
             return null;
@@ -21,10 +23,12 @@ public function extract($value, ?object $object = null): int|null
     }
 
     /**
-     * @param mixed                        $value
-     * @param array<array-key, mixed>|null $data
+     * @param  mixed                        $value
+     * @param  array<array-key, mixed>|null $data
+     *
+     * @return int|null
      */
-    public function hydrate($value, ?array $data): SimpleEnum|null
+    public function hydrate($value, ?array $data)
     {
         if ($value === null) {
             return null;

diff --git a/tests/DoctrineObjectTest.php b/tests/DoctrineObjectTest.php
@@ -29,6 +29,8 @@
 use function implode;
 use function time;
 
+use const PHP_VERSION_ID;
+
 class DoctrineObjectTest extends TestCase
 {
     use ProphecyTrait;
@@ -2927,6 +2929,10 @@ public function testNestedHydrationByReference()
 
     public function testHandleEnumConversionUsingByValue(): void
     {
+        if (PHP_VERSION_ID < 80100) {
+            $this->markTestSkipped('PHP 8.1 required for enum compatibility');
+        }
+
         // When using hydration by value, it will use the public API of the entity to set values (setters)
         $entity = new Assets\SimpleEntityWithEnum();
         $this->configureObjectManagerForSimpleEntityWithEnum();
@@ -2943,6 +2949,10 @@ public function testHandleEnumConversionUsingByValue(): void
 
     public function testNullValueIsNotConvertedToEnum(): void
     {
+        if (PHP_VERSION_ID < 80100) {
+            $this->markTestSkipped('PHP 8.1 required for enum compatibility');
+        }
+
         $entity = new Assets\SimpleEntityWithEnum();
         $this->configureObjectManagerForSimpleEntityWithEnum();
 
@@ -2956,6 +2966,10 @@ public function testNullValueIsNotConvertedToEnum(): void
 
     public function testWrongEnumBackedValueThrowsException(): void
     {
+        if (PHP_VERSION_ID < 80100) {
+            $this->markTestSkipped('PHP 8.1 required for enum compatibility');
+        }
+
         $entity = new Assets\SimpleEntityWithEnum();
         $this->configureObjectManagerForSimpleEntityWithEnum();