[cross-repo from server#312] Conformance blocker: expand replay coverage beyond current smoke (#638)

Author: durable-workflow-ops

src/V2/Support/WorkflowStepHistory.php

@@ -4,10 +4,12 @@
 
 namespace Workflow\V2\Support;
 
+use Workflow\V2\Activity;
 use Workflow\V2\Enums\HistoryEventType;
 use Workflow\V2\Exceptions\HistoryEventShapeMismatchException;
 use Workflow\V2\Models\WorkflowHistoryEvent;
 use Workflow\V2\Models\WorkflowRun;
+use Workflow\V2\Workflow;
 
 final class WorkflowStepHistory
 {
@@ -201,7 +203,10 @@ private static function detailMismatchForSequence(
 
             $recorded = self::recordedDetail($event, $expectedField);
 
-            if ($recorded === null || $recorded === $expected) {
+            if (
+                $recorded === null
+                || in_array($recorded, self::expectedDetailCandidates($expectedField, $expected), true)
+            ) {
                 continue;
             }
 
@@ -238,13 +243,53 @@ private static function recordedDetail(WorkflowHistoryEvent $event, string $fiel
             return $value;
         }
 
+        if ($field === 'activity_type') {
+            return self::stringValue($event->payload['activity_class'] ?? null);
+        }
+
         if ($field === 'child_workflow_type') {
-            return self::stringValue($event->payload['workflow_type'] ?? null);
+            foreach (['workflow_type', 'child_workflow_class', 'workflow_class'] as $fallbackField) {
+                $fallback = self::stringValue($event->payload[$fallbackField] ?? null);
+
+                if ($fallback !== null) {
+                    return $fallback;
+                }
+            }
         }
 
         return null;
     }
 
+    /**
+     * @return list<string>
+     */
+    private static function expectedDetailCandidates(string $field, string $expected): array
+    {
+        $candidates = [$expected];
+
+        if ($field === 'activity_type' && is_subclass_of($expected, Activity::class)) {
+            $candidates[] = self::durableTypeForClass($expected);
+        }
+
+        if ($field === 'child_workflow_type' && is_subclass_of($expected, Workflow::class)) {
+            $candidates[] = self::durableTypeForClass($expected);
+        }
+
+        return array_values(array_unique(array_filter(
+            $candidates,
+            static fn (mixed $value): bool => is_string($value) && $value !== '',
+        )));
+    }
+
+    private static function durableTypeForClass(string $class): ?string
+    {
+        try {
+            return TypeRegistry::for($class);
+        } catch (\Throwable) {
+            return null;
+        }
+    }
+
     /**
      * @param array<string, string|null> $expectedDetails
      */

tests/Unit/V2/WorkflowStepHistoryTest.php

@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\V2;
+
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use PHPUnit\Framework\TestCase;
+use Tests\Fixtures\V2\TestChildGreetingWorkflow;
+use Tests\Fixtures\V2\TestMixedEntryActivity;
+use Workflow\V2\Enums\HistoryEventType;
+use Workflow\V2\Exceptions\HistoryEventShapeMismatchException;
+use Workflow\V2\Models\WorkflowHistoryEvent;
+use Workflow\V2\Models\WorkflowRun;
+use Workflow\V2\Support\WorkflowStepHistory;
+
+final class WorkflowStepHistoryTest extends TestCase
+{
+    public function testActivityTypeDetailAcceptsCanonicalTypeAliasForYieldedClass(): void
+    {
+        $run = $this->runWithHistoryEvents([
+            $this->historyEvent(HistoryEventType::ActivityScheduled, [
+                'sequence' => 1,
+                'activity_type' => 'test-mixed-entry-activity',
+                'activity_class' => TestMixedEntryActivity::class,
+            ]),
+        ]);
+
+        WorkflowStepHistory::assertCompatible($run, 1, WorkflowStepHistory::ACTIVITY, [
+            'activity_type' => TestMixedEntryActivity::class,
+        ]);
+
+        $this->addToAssertionCount(1);
+    }
+
+    public function testActivityTypeDetailRejectsMutatedTypeEvenWhenClassFallbackMatches(): void
+    {
+        $run = $this->runWithHistoryEvents([
+            $this->historyEvent(HistoryEventType::ActivityScheduled, [
+                'sequence' => 1,
+                'activity_type' => 'changed-activity-type',
+                'activity_class' => TestMixedEntryActivity::class,
+            ]),
+        ]);
+
+        $this->expectException(HistoryEventShapeMismatchException::class);
+        $this->expectExceptionMessage('Recorded activity_type [changed-activity-type]');
+
+        WorkflowStepHistory::assertCompatible($run, 1, WorkflowStepHistory::ACTIVITY, [
+            'activity_type' => TestMixedEntryActivity::class,
+        ]);
+    }
+
+    public function testChildWorkflowTypeDetailAcceptsCanonicalTypeAliasForYieldedClass(): void
+    {
+        $run = $this->runWithHistoryEvents([
+            $this->historyEvent(HistoryEventType::ChildWorkflowScheduled, [
+                'sequence' => 2,
+                'child_workflow_type' => 'test-child-greeting-workflow',
+                'child_workflow_class' => TestChildGreetingWorkflow::class,
+            ]),
+        ]);
+
+        WorkflowStepHistory::assertCompatible($run, 2, WorkflowStepHistory::CHILD_WORKFLOW, [
+            'child_workflow_type' => TestChildGreetingWorkflow::class,
+        ]);
+
+        $this->addToAssertionCount(1);
+    }
+
+    /**
+     * @param list<WorkflowHistoryEvent> $events
+     */
+    private function runWithHistoryEvents(array $events): WorkflowRun
+    {
+        $run = new WorkflowRun();
+        $run->setRelation('historyEvents', new EloquentCollection($events));
+
+        return $run;
+    }
+
+    /**
+     * @param array<string, mixed> $payload
+     */
+    private function historyEvent(HistoryEventType $type, array $payload): WorkflowHistoryEvent
+    {
+        $event = new WorkflowHistoryEvent();
+        $event->forceFill([
+            'sequence' => $payload['sequence'] ?? 1,
+            'event_type' => $type->value,
+            'payload' => $payload,
+        ]);
+
+        return $event;
+    }
+}