Merge pull request #3254 from seferov/array-type-convert

Throw ConversionException when unserialization fail for array and object types
doctrine · Aug 18, 2018 · d2159ea · d2159ea
2 parents 319e20f + ceb2616
commit d2159ea
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 29 deletions.
diff --git a/lib/Doctrine/DBAL/Types/ArrayType.php b/lib/Doctrine/DBAL/Types/ArrayType.php
@@ -21,7 +21,9 @@
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use function is_resource;
+use function restore_error_handler;
 use function serialize;
+use function set_error_handler;
 use function stream_get_contents;
 use function unserialize;
 
@@ -59,12 +61,16 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
         }
 
         $value = (is_resource($value)) ? stream_get_contents($value) : $value;
-        $val = unserialize($value);
-        if ($val === false && $value != 'b:0;') {
-            throw ConversionException::conversionFailed($value, $this->getName());
-        }
 
-        return $val;
+        set_error_handler(function (int $code, string $message) : void {
+            throw ConversionException::conversionFailedUnserialization($this->getName(), $message);
+        });
+
+        try {
+            return unserialize($value);
+        } finally {
+            restore_error_handler();
+        }
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Types/ConversionException.php b/lib/Doctrine/DBAL/Types/ConversionException.php
@@ -120,4 +120,13 @@ public static function conversionFailedSerialization($value, $format, $error)
             $error
         ));
     }
+
+    public static function conversionFailedUnserialization(string $format, string $error) : self
+    {
+        return new self(sprintf(
+            "Could not convert database value to '%s' as an error was triggered by the unserialization: '%s'",
+            $format,
+            $error
+        ));
+    }
 }
diff --git a/lib/Doctrine/DBAL/Types/ObjectType.php b/lib/Doctrine/DBAL/Types/ObjectType.php
@@ -21,7 +21,9 @@
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use function is_resource;
+use function restore_error_handler;
 use function serialize;
+use function set_error_handler;
 use function stream_get_contents;
 use function unserialize;
 
@@ -58,12 +60,16 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
         }
 
         $value = (is_resource($value)) ? stream_get_contents($value) : $value;
-        $val = unserialize($value);
-        if ($val === false && $value !== 'b:0;') {
-            throw ConversionException::conversionFailed($value, $this->getName());
-        }
 
-        return $val;
+        set_error_handler(function (int $code, string $message) : void {
+            throw ConversionException::conversionFailedUnserialization($this->getName(), $message);
+        });
+
+        try {
+            return unserialize($value);
+        } finally {
+            restore_error_handler();
+        }
     }
 
     /**

diff --git a/tests/Doctrine/Tests/DBAL/Types/ArrayTest.php b/tests/Doctrine/Tests/DBAL/Types/ArrayTest.php
@@ -5,9 +5,6 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\Tests\DBAL\Mocks\MockPlatform;
-use const E_ALL;
-use const E_STRICT;
-use function error_reporting;
 use function serialize;
 
 class ArrayTest extends \Doctrine\Tests\DbalTestCase
@@ -28,12 +25,6 @@ protected function setUp()
         $this->_type = Type::getType('array');
     }
 
-    protected function tearDown()
-    {
-        error_reporting(-1); // reactive all error levels
-    }
-
-
     public function testArrayConvertsToDatabaseValue()
     {
         self::assertInternalType(
@@ -52,8 +43,8 @@ public function testArrayConvertsToPHPValue()
 
     public function testConversionFailure()
     {
-        error_reporting( (E_ALL | E_STRICT) - \E_NOTICE );
         $this->expectException('Doctrine\DBAL\Types\ConversionException');
+        $this->expectExceptionMessage("Could not convert database value to 'array' as an error was triggered by the unserialization: 'unserialize(): Error at offset 0 of 7 bytes'");
         $this->_type->convertToPHPValue('abcdefg', $this->_platform);
     }
 

diff --git a/tests/Doctrine/Tests/DBAL/Types/ObjectTest.php b/tests/Doctrine/Tests/DBAL/Types/ObjectTest.php
@@ -4,9 +4,6 @@
 
 use Doctrine\DBAL\Types\Type;
 use Doctrine\Tests\DBAL\Mocks\MockPlatform;
-use const E_ALL;
-use const E_STRICT;
-use function error_reporting;
 use function serialize;
 
 class ObjectTest extends \Doctrine\Tests\DbalTestCase
@@ -27,11 +24,6 @@ protected function setUp()
         $this->_type = Type::getType('object');
     }
 
-    protected function tearDown()
-    {
-        error_reporting(-1); // reactive all error levels
-    }
-
     public function testObjectConvertsToDatabaseValue()
     {
         self::assertInternalType('string', $this->_type->convertToDatabaseValue(new \stdClass(), $this->_platform));
@@ -44,8 +36,8 @@ public function testObjectConvertsToPHPValue()
 
     public function testConversionFailure()
     {
-        error_reporting( (E_ALL | E_STRICT) - \E_NOTICE );
         $this->expectException('Doctrine\DBAL\Types\ConversionException');
+        $this->expectExceptionMessage("Could not convert database value to 'object' as an error was triggered by the unserialization: 'unserialize(): Error at offset 0 of 7 bytes'");
         $this->_type->convertToPHPValue('abcdefg', $this->_platform);
     }