Merge pull request #61 from gquemener/final-serializable-internal-chi…

…ld-fix Adds support of internal child class instantiation
doctrine · Oct 21, 2019 · ae466f7 · ae466f7
2 parents 67dbbd5 + 126eab1
commit ae466f7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/src/Doctrine/Instantiator/Instantiator.php b/src/Doctrine/Instantiator/Instantiator.php
@@ -2,12 +2,15 @@
 
 namespace Doctrine\Instantiator;
 
+use ArrayIterator;
 use Doctrine\Instantiator\Exception\InvalidArgumentException;
 use Doctrine\Instantiator\Exception\UnexpectedValueException;
 use Exception;
 use ReflectionClass;
 use ReflectionException;
+use Serializable;
 use function class_exists;
+use function is_subclass_of;
 use function restore_error_handler;
 use function set_error_handler;
 use function sprintf;
@@ -94,7 +97,7 @@ private function buildFactory(string $className) : callable
 
         $serializedString = sprintf(
             '%s:%d:"%s":0:{}',
-            self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER,
+            is_subclass_of($className, Serializable::class) ? self::SERIALIZATION_FORMAT_USE_UNSERIALIZER : self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER,
             strlen($className),
             $className
         );
@@ -130,7 +133,7 @@ private function getReflectionClass(string $className) : ReflectionClass
      */
     private function checkIfUnSerializationIsSupported(ReflectionClass $reflectionClass, string $serializedString) : void
     {
-        set_error_handler(static function (int $code, string $message, string $file, int $line) use ($reflectionClass, & $error) : bool {
+        set_error_handler(static function (int $code, string $message, string $file, int $line) use ($reflectionClass, &$error) : bool {
             $error = UnexpectedValueException::fromUncleanUnSerialization(
                 $reflectionClass,
                 $message,
@@ -193,6 +196,8 @@ private function hasInternalAncestors(ReflectionClass $reflectionClass) : bool
      */
     private function isSafeToClone(ReflectionClass $reflection) : bool
     {
-        return $reflection->isCloneable() && ! $reflection->hasMethod('__clone');
+        return $reflection->isCloneable()
+            && ! $reflection->hasMethod('__clone')
+            && ! $reflection->isSubclassOf(ArrayIterator::class);
     }
 }
diff --git a/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php b/tests/DoctrineTest/InstantiatorTest/InstantiatorTest.php
@@ -13,6 +13,7 @@
 use DoctrineTest\InstantiatorTestAsset\FinalExceptionAsset;
 use DoctrineTest\InstantiatorTestAsset\PharExceptionAsset;
 use DoctrineTest\InstantiatorTestAsset\SerializableArrayObjectAsset;
+use DoctrineTest\InstantiatorTestAsset\SerializableFinalInternalChildAsset;
 use DoctrineTest\InstantiatorTestAsset\SimpleSerializableAsset;
 use DoctrineTest\InstantiatorTestAsset\SimpleTraitAsset;
 use DoctrineTest\InstantiatorTestAsset\UnCloneableAsset;
@@ -124,6 +125,7 @@ public function getInstantiableClasses() : array
             [SerializableArrayObjectAsset::class],
             [WakeUpNoticesAsset::class],
             [UnserializeExceptionArrayObjectAsset::class],
+            [SerializableFinalInternalChildAsset::class],
         ];
     }
 

diff --git a/tests/DoctrineTest/InstantiatorTestAsset/SerializableFinalInternalChildAsset.php b/tests/DoctrineTest/InstantiatorTestAsset/SerializableFinalInternalChildAsset.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+
+namespace DoctrineTest\InstantiatorTestAsset;
+
+use ArrayIterator;
+
+final class SerializableFinalInternalChildAsset extends ArrayIterator
+{
+}