Keep legacy PHP payloads off Avro serializer

Author: durable-workflow-ops

.github/workflows/php.yml

@@ -83,6 +83,7 @@ jobs:
         DB_CONNECTION: mysql
         DB_PORT: ${{ job.services.mysql.ports[3306] }}
         QUEUE_CONNECTION: redis
+        XDEBUG_MODE: off
 
     - name: Run test suite (PostgreSQL)
       timeout-minutes: 65
@@ -91,6 +92,7 @@ jobs:
         DB_CONNECTION: pgsql
         DB_PORT: ${{ job.services.postgres.ports[5432] }}
         QUEUE_CONNECTION: redis
+        XDEBUG_MODE: off
 
     - name: Upload laravel.log if tests fail
       if: failure()

src/Serializers/Serializer.php

@@ -5,6 +5,7 @@
 namespace Workflow\Serializers;
 
 use Illuminate\Queue\SerializesAndRestoresModelIdentifiers;
+use Laravel\SerializableClosure\SerializableClosure;
 use Throwable;
 
 final class Serializer
@@ -45,6 +46,10 @@ public static function __callStatic(string $name, array $arguments)
             $class = self::defaultCodecClass();
         }
 
+        if ($name === 'serialize' && $class === Avro::class && self::containsPhpOnlyValue($arguments[0] ?? null)) {
+            $class = Y::class;
+        }
+
         if ($name === 'serialize' && ! is_subclass_of($class, AbstractSerializer::class)) {
             $arguments[0] = self::normalizeForCodec($arguments[0] ?? null);
         }
@@ -155,6 +160,29 @@ private static function normalizeForCodec(mixed $data): mixed
         return self::serializeModels($data);
     }
 
+    private static function containsPhpOnlyValue(mixed $data): bool
+    {
+        if ($data instanceof Throwable) {
+            return false;
+        }
+
+        if ($data instanceof SerializableClosure) {
+            return true;
+        }
+
+        if (is_array($data)) {
+            foreach ($data as $value) {
+                if (self::containsPhpOnlyValue($value)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        return is_object($data) || is_resource($data);
+    }
+
     /**
      * @return array{class: class-string<Throwable>, message: string, code: int|string, line: int, file: string, trace: list<array<string, mixed>>}
      */

tests/Unit/Serializers/SerializeTest.php

@@ -4,6 +4,7 @@
 
 namespace Tests\Unit\Serializers;
 
+use Laravel\SerializableClosure\SerializableClosure;
 use Tests\Fixtures\TestEnum;
 use Tests\TestCase;
 use Throwable;
@@ -105,6 +106,22 @@ public function testLegacyYPayloadStillWinsOverAvroDefault(): void
         ], Serializer::unserialize($serialized));
     }
 
+    public function testLegacySerializeKeepsPhpOnlyValuesOnPhpSerializerWhenAvroIsConfigured(): void
+    {
+        config([
+            'workflows.serializer' => 'avro',
+        ]);
+
+        $serialized = Serializer::serialize([
+            new SerializableClosure(static fn (): string => 'ok'),
+        ]);
+
+        $unserialized = Serializer::unserialize($serialized);
+
+        $this->assertInstanceOf(SerializableClosure::class, $unserialized[0]);
+        $this->assertSame('ok', $unserialized[0]->getClosure()());
+    }
+
     private function testSerializeUnserialize($data, $serializer, $unserializer): void
     {
         config([