Fix autoloader throwing an exception while trying to serialize a poss…

…ible `callable` (#1280)
getsentry · Jan 15, 2022 · e4dd045 · e4dd045
1 parent 1b1c35a
commit e4dd045
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix another case of serialization with autoloader that throws exceptions (#1280)
+
 ## 3.3.6 (2022-01-14)
 
 - Optimize `Span` constructor and add benchmarks (#1274)

diff --git a/src/Serializer/AbstractSerializer.php b/src/Serializer/AbstractSerializer.php
@@ -248,8 +248,12 @@ protected function serializeValue($value)
             return 'Resource ' . get_resource_type($value);
         }
 
-        if (\is_callable($value)) {
-            return $this->serializeCallable($value);
+        try {
+            if (\is_callable($value)) {
+                return $this->serializeCallable($value);
+            }
+        } catch (\Throwable $exception) {
+            // Do nothing on purpose
         }
 
         if (\is_array($value)) {

diff --git a/tests/phpt/serialize_broken_class.phpt b/tests/phpt/serialize_broken_class.phpt
@@ -34,5 +34,5 @@ testSerialization([BrokenClass::class, 'brokenMethod']);
 
 ?>
 --EXPECT--
-"Sentry\\Tests\\Fixtures\\code\\BrokenClass::brokenMethod {serialization error}"
+"Sentry\\Tests\\Fixtures\\code\\BrokenClass::brokenMethod"
 ["Sentry\\Tests\\Fixtures\\code\\BrokenClass","brokenMethod"]
diff --git a/tests/phpt/serialize_callable_that_makes_autoloader_throw.phpt b/tests/phpt/serialize_callable_that_makes_autoloader_throw.phpt
@@ -20,14 +20,14 @@ while (!file_exists($vendor . '/vendor')) {
 
 require $vendor . '/vendor/autoload.php';
 
-function testSerialization() {
-    $serializer = new Serializer(new Options());
+function testSerialization(int $depth = 3) {
+    $serializer = new Serializer(new Options(), $depth);
 
     echo json_encode($serializer->serialize(['FakeClass', 'fakeMethod']));
+    echo PHP_EOL;
 }
 
 testSerialization();
-echo PHP_EOL;
 $brokenAutoloader = function (string $classname): void {
     throw new \RuntimeException('Autoloader throws while loading ' . $classname);
 };
@@ -36,10 +36,12 @@ spl_autoload_register($brokenAutoloader, true, true);
 
 try {
     testSerialization();
+    testSerialization(0);
 } finally {
     spl_autoload_unregister($brokenAutoloader);
 }
 ?>
 --EXPECT--
 ["FakeClass","fakeMethod"]
 ["FakeClass","fakeMethod"]
+"Array of length 2"