[VarExporter] unserialize() might throw an Exception on php 8.

derrabus · derrabus · commit 65112e11bc36 · 2020-09-07T23:10:21.000+02:00
diff --git a/src/Symfony/Component/VarExporter/Exception/NotInstantiableTypeException.php b/src/Symfony/Component/VarExporter/Exception/NotInstantiableTypeException.php
@@ -13,8 +13,8 @@
 
 class NotInstantiableTypeException extends \Exception implements ExceptionInterface
 {
-    public function __construct(string $type)
+    public function __construct(string $type, \Throwable $previous = null)
     {
-        parent::__construct(sprintf('Type "%s" is not instantiable.', $type));
+        parent::__construct(sprintf('Type "%s" is not instantiable.', $type), 0, $previous);
     }
 }
diff --git a/src/Symfony/Component/VarExporter/Internal/Registry.php b/src/Symfony/Component/VarExporter/Internal/Registry.php
@@ -89,8 +89,18 @@ public static function getClassReflector($class, $instantiableWithoutConstructor
                 $proto = $reflector->implementsInterface('Serializable') && !method_exists($class, '__unserialize') ? 'C:' : 'O:';
                 if ('C:' === $proto && !$reflector->getMethod('unserialize')->isInternal()) {
                     $proto = null;
-                } elseif (false === $proto = @unserialize($proto.\strlen($class).':"'.$class.'":0:{}')) {
-                    throw new NotInstantiableTypeException($class);
+                } else {
+                    try {
+                        $proto = @unserialize($proto.\strlen($class).':"'.$class.'":0:{}');
+                    } catch (\Exception $e) {
+                        if (__FILE__ !== $e->getFile()) {
+                            throw $e;
+                        }
+                        throw new NotInstantiableTypeException($class, $e);
+                    }
+                    if (false === $proto) {
+                        throw new NotInstantiableTypeException($class);
+                    }
                 }
             }
             if (null !== $proto && !$proto instanceof \Throwable && !$proto instanceof \Serializable && !method_exists($class, '__sleep') && (\PHP_VERSION_ID < 70400 || !method_exists($class, '__serialize'))) {

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`
`14`	`14`	`class NotInstantiableTypeException extends \Exception implements ExceptionInterface`
`15`	`15`	`{`
`16`		`- public function __construct(string $type)`
	`16`	`+ public function __construct(string $type, \Throwable $previous = null)`
`17`	`17`	`{`
`18`		`- parent::__construct(sprintf('Type "%s" is not instantiable.', $type));`
	`18`	`+ parent::__construct(sprintf('Type "%s" is not instantiable.', $type), 0, $previous);`
`19`	`19`	`}`
`20`	`20`	`}`