Fix Date scalar trying to parse Illuminate\Support\Carbon as `str…

…ing`

CHANGELOG.md

@@ -9,6 +9,10 @@ You can find and compare releases at the [GitHub release page](https://github.co
 
 ## Unreleased
 
+### Fixed
+
+- Fix `Date` scalar trying to parse `Illuminate\Support\Carbon` as `string` https://github.com/nuwave/lighthouse/pull/2470
+
 ## v6.34.0
 
 ### Added

src/Schema/AST/ASTBuilder.php

@@ -220,8 +220,7 @@ protected function missingBaseDefinition(string $typeName, ObjectTypeExtensionNo
     protected function assertExtensionMatchesDefinition(
         ObjectTypeExtensionNode|InputObjectTypeExtensionNode|InterfaceTypeExtensionNode|ScalarTypeExtensionNode|EnumTypeExtensionNode|UnionTypeExtensionNode $extension,
         ObjectTypeDefinitionNode|InputObjectTypeDefinitionNode|InterfaceTypeDefinitionNode|ScalarTypeDefinitionNode|EnumTypeDefinitionNode|UnionTypeDefinitionNode $definition,
-    ): void
-    {
+    ): void {
         if (static::EXTENSION_TO_DEFINITION_CLASS[$extension::class] !== $definition::class) {
             throw new DefinitionException("The type extension {$extension->name->value} of kind {$extension->kind} can not extend a definition of kind {$definition->kind}.");
         }

src/Schema/Types/Scalars/DateScalar.php

@@ -56,26 +56,28 @@ public function parseLiteral(Node $valueNode, ?array $variables = null): Illumin
     protected function tryParsingDate(mixed $value, string $exceptionClass): IlluminateCarbon
     {
         try {
-            if (
-                is_object($value)
+            if (is_object($value)) {
+                if ($value::class === IlluminateCarbon::class) {
+                    return $value;
+                }
+
                 // We want to know if we have exactly a Carbon\Carbon, not a subclass thereof
-                && (
-                    $value::class === CarbonCarbon::class
+                if ($value::class === CarbonCarbon::class
                     || $value::class === CarbonImmutable::class
-                )
-            ) {
-                $carbon = IlluminateCarbon::create(
-                    $value->year,
-                    $value->month,
-                    $value->day,
-                    $value->hour,
-                    $value->minute,
-                    $value->second,
-                    $value->timezone,
-                );
-                assert($carbon instanceof IlluminateCarbon, 'Given we had a valid Carbon instance before, this can not fail.');
+                ) {
+                    $carbon = IlluminateCarbon::create(
+                        $value->year,
+                        $value->month,
+                        $value->day,
+                        $value->hour,
+                        $value->minute,
+                        $value->second,
+                        $value->timezone,
+                    );
+                    assert($carbon instanceof IlluminateCarbon, 'Given we had a valid Carbon instance before, this can not fail.');
 
-                return $carbon;
+                    return $carbon;
+                }
             }
 
             return $this->parse($value);