Merge 3.3.x into 3.4.x

src/Types/ArrayType.php

@@ -11,6 +11,9 @@
 use function stream_get_contents;
 use function unserialize;
 
+use const E_DEPRECATED;
+use const E_USER_DEPRECATED;
+
 /**
  * Type that maps a PHP array to a clob SQL type.
  */
@@ -45,6 +48,10 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
         $value = is_resource($value) ? stream_get_contents($value) : $value;
 
         set_error_handler(function (int $code, string $message): bool {
+            if ($code === E_DEPRECATED || $code === E_USER_DEPRECATED) {
+                return false;
+            }
+
             throw ConversionException::conversionFailedUnserialization($this->getName(), $message);
         });
 

tests/Types/ArrayTest.php

@@ -3,6 +3,7 @@
 namespace Doctrine\DBAL\Tests\Types;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Tests\Types\Fixtures\UnserializeWithDeprecationObject;
 use Doctrine\DBAL\Types\ArrayType;
 use Doctrine\DBAL\Types\ConversionException;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -45,6 +46,14 @@ public function testConversionFailure(): void
         $this->type->convertToPHPValue('abcdefg', $this->platform);
     }
 
+    public function testDeprecationDuringConversion(): void
+    {
+        @self::assertInstanceOf(UnserializeWithDeprecationObject::class, $this->type->convertToPHPValue(
+            serialize(new UnserializeWithDeprecationObject()),
+            $this->platform
+        ));
+    }
+
     public function testNullConversion(): void
     {
         self::assertNull($this->type->convertToPHPValue(null, $this->platform));

tests/Types/Fixtures/UnserializeWithDeprecationObject.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Doctrine\DBAL\Tests\Types\Fixtures;
+
+use function trigger_error;
+
+use const E_USER_DEPRECATED;
+
+class UnserializeWithDeprecationObject
+{
+    public function __wakeup(): void
+    {
+        trigger_error('Deprecation triggered', E_USER_DEPRECATED);
+    }
+}