Fix rehydration of subscription args with differing internal representations

src/Schema/Types/LaravelEnumType.php

@@ -151,4 +151,13 @@ public function serialize($value): string
 
         return $key;
     }
+
+    public function parseValue($value)
+    {
+        if ($value instanceof $this->enumClass) {
+            return $value;
+        }
+
+        return parent::parseValue($value);
+    }
 }

tests/Integration/Subscriptions/SubscriptionTest.php

@@ -39,14 +39,24 @@ protected function setUp(): void
             body: String @guard
         }
 
+        enum PostStatus {
+            PUBLISHED @enum(value: "published")
+            DELETED @enum(value: "deleted")
+        }
+
         type Subscription {
             onPostCreated: Post
+            onPostUpdated(status: PostStatus!): Post
         }
 
         type Mutation {
             createPost(title: String!, body: String): Post
                 @mock
                 @broadcast(subscription: "onPostCreated")
+
+            updatePost(post: String!): Post
+                @mock
+                @broadcast(subscription: "onPostUpdated")
         }
 
         type Query {
@@ -121,7 +131,6 @@ public function testBroadcastSubscriptions(): void
         ');
 
         $broadcastManager = $this->app->make(BroadcastManager::class);
-
         $log = $broadcastManager->driver();
         assert($log instanceof LogBroadcaster);
 
@@ -192,6 +201,115 @@ public function testWithoutExcludeEmpty(): void
         ]);
     }
 
+    public function testSubscriptionWithEnumInputCorrectlyResolves(): void
+    {
+        $this->graphQL(/** @lang GraphQL */ '
+        subscription {
+            onPostUpdated(status: DELETED) {
+                body
+            }
+        }
+        ');
+
+        $this->graphQL(/** @lang GraphQL */ '
+        mutation {
+            updatePost(post: "Foobar") {
+                body
+            }
+        }
+        ');
+
+        $broadcastManager = $this->app->make(BroadcastManager::class);
+        $log = $broadcastManager->driver();
+        assert($log instanceof LogBroadcaster);
+
+        $this->assertCount(1, $log->broadcasts());
+
+        $broadcasted = Arr::get(Arr::first($log->broadcasts()), 'data', []);
+        $this->assertArrayHasKey('onPostUpdated', $broadcasted);
+        $this->assertSame(['body' => 'Foobar'], $broadcasted['onPostUpdated']);
+    }
+
+    public function testSubscriptionWithEnumInputVariableCorrectlyResolves(): void
+    {
+        $this->postGraphQL([
+            'query' => /** @lang GraphQL */ '
+                subscription OnPostUpdated($status: PostStatus!) {
+                    onPostUpdated(status: $status) {
+                        body
+                    }
+                }
+            ',
+            'variables' => [
+                'status' => 'DELETED',
+            ],
+            'operationName' => 'OnPostUpdated',
+        ]);
+
+        $this->graphQL(/** @lang GraphQL */ '
+            mutation {
+                updatePost(post: "Foobar") {
+                    body
+                }
+            }
+        ');
+
+        $broadcastManager = $this->app->make(BroadcastManager::class);
+        $log = $broadcastManager->driver();
+        assert($log instanceof LogBroadcaster);
+
+        $this->assertCount(1, $log->broadcasts());
+
+        $broadcasted = Arr::get(Arr::first($log->broadcasts()), 'data', []);
+        $this->assertArrayHasKey('onPostUpdated', $broadcasted);
+        $this->assertSame(['body' => 'Foobar'], $broadcasted['onPostUpdated']);
+    }
+
+    public function testSubscriptionWithEnumInputCorrectlyResolvesUsingBatchedQuery(): void
+    {
+        $this
+            ->postGraphQL([
+                [
+                    'query' => /** @lang GraphQL */ '
+                        {
+                            bar
+                        }
+                    ',
+                ],
+                [
+                    'query' => /** @lang GraphQL */ '
+                        subscription OnPostUpdated($status: PostStatus!) {
+                            onPostUpdated(status: $status) {
+                                body
+                            }
+                        }
+                    ',
+                    'variables' => [
+                        'status' => 'DELETED',
+                    ],
+                    'operationName' => 'OnPostUpdated',
+                ],
+            ]);
+
+        $this->graphQL(/** @lang GraphQL */ '
+            mutation {
+                updatePost(post: "Foobar") {
+                    body
+                }
+            }
+        ');
+
+        $broadcastManager = $this->app->make(BroadcastManager::class);
+        $log = $broadcastManager->driver();
+        assert($log instanceof LogBroadcaster);
+
+        $this->assertCount(1, $log->broadcasts());
+
+        $broadcasted = Arr::get(Arr::first($log->broadcasts()), 'data', []);
+        $this->assertArrayHasKey('onPostUpdated', $broadcasted);
+        $this->assertSame(['body' => 'Foobar'], $broadcasted['onPostUpdated']);
+    }
+
     public function testWithExcludeEmpty(): void
     {
         $config = $this->app->make(ConfigRepository::class);
@@ -353,11 +471,11 @@ protected function subscribe(): TestResponse
      *
      * @return array<string, array<string, mixed>>
      */
-    protected function buildResponse(string $channelName, string $channel): array
+    protected function buildResponse(string $fieldName, string $channel): array
     {
         return [
             'data' => [
-                'onPostCreated' => null,
+                $fieldName => null,
             ],
             'extensions' => [
                 'lighthouse_subscriptions' => [

tests/Utils/Subscriptions/OnPostUpdated.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Utils\Subscriptions;
+
+use Illuminate\Http\Request;
+use Nuwave\Lighthouse\Schema\Types\GraphQLSubscription;
+use Nuwave\Lighthouse\Subscriptions\Subscriber;
+
+class OnPostUpdated extends GraphQLSubscription
+{
+    /**
+     * Check if subscriber is allowed to listen to the subscription.
+     */
+    public function authorize(Subscriber $subscriber, Request $request): bool
+    {
+        return true;
+    }
+
+    /**
+     * Filter which subscribers should receive the subscription.
+     */
+    public function filter(Subscriber $subscriber, $root): bool
+    {
+        return true;
+    }
+}