Simplify parseLiteral to call parseValue

API-Skeletons · Oct 18, 2024 · 9c32917 · 9c32917
1 parent cfb37cf
commit 9c32917
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 99 deletions.
diff --git a/src/Type/Date.php b/src/Type/Date.php
@@ -30,11 +30,7 @@ public function parseLiteral(ASTNode $valueNode, array|null $variables = null):
 
         // @codeCoverageIgnoreEnd
 
-        if (! preg_match('/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/', $valueNode->value)) {
-            throw new Error('Date format does not match Y-m-d e.g. 2004-02-12.');
-        }
-
-        return DateTime::createFromFormat(DateTime::ATOM, $valueNode->value . 'T00:00:00+00:00');
+        return $this->parseValue($valueNode->value);
     }
 
     public function parseValue(mixed $value): DateTime

diff --git a/src/Type/DateImmutable.php b/src/Type/DateImmutable.php
@@ -30,11 +30,7 @@ public function parseLiteral(ASTNode $valueNode, array|null $variables = null):
 
         // @codeCoverageIgnoreEnd
 
-        if (! preg_match('/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/', $valueNode->value)) {
-            throw new Error('Date format does not match Y-m-d e.g. 2004-02-12.');
-        }
-
-        return DateTimeImmutable::createFromFormat(DateTimeImmutable::ATOM, $valueNode->value . 'T00:00:00+00:00');
+        return $this->parseValue($valueNode->value);
     }
 
     public function parseValue(mixed $value): DateTimeImmutable|false

diff --git a/src/Type/DateTime.php b/src/Type/DateTime.php
@@ -21,7 +21,7 @@ class DateTime extends ScalarType
     public string|null $description = 'The `datetime` scalar type represents datetime data.'
     . 'The format is ISO-8601 e.g. 2004-02-12T15:19:21+00:00.';
 
-    public function parseLiteral(ASTNode $valueNode, array|null $variables = null): PHPDateTime|null
+    public function parseLiteral(ASTNode $valueNode, array|null $variables = null): PHPDateTime
     {
         // @codeCoverageIgnoreStart
         if (! $valueNode instanceof StringValueNode) {
@@ -30,17 +30,7 @@ public function parseLiteral(ASTNode $valueNode, array|null $variables = null):
 
         // @codeCoverageIgnoreEnd
 
-        if (! $valueNode->value) {
-            return null;
-        }
-
-        $data = PHPDateTime::createFromFormat(PHPDateTime::ATOM, $valueNode->value);
-
-        if ($data === false) {
-            throw new Error('datetime format does not match ISO 8601.');
-        }
-
-        return $data;
+        return $this->parseValue($valueNode->value);
     }
 
     public function parseValue(mixed $value): PHPDateTime

diff --git a/src/Type/DateTimeImmutable.php b/src/Type/DateTimeImmutable.php
@@ -21,7 +21,7 @@ class DateTimeImmutable extends ScalarType
     public string|null $description = 'The `datetime_immutable` scalar type represents datetime data.'
     . 'The format is ISO-8601 e.g. 2004-02-12T15:19:21+00:00';
 
-    public function parseLiteral(ASTNode $valueNode, array|null $variables = null): PHPDateTimeImmutable|null
+    public function parseLiteral(ASTNode $valueNode, array|null $variables = null): PHPDateTimeImmutable
     {
         // @codeCoverageIgnoreStart
         if (! $valueNode instanceof StringValueNode) {
@@ -30,17 +30,7 @@ public function parseLiteral(ASTNode $valueNode, array|null $variables = null):
 
         // @codeCoverageIgnoreEnd
 
-        if (! $valueNode->value) {
-            return null;
-        }
-
-        $data = PHPDateTimeImmutable::createFromFormat(PHPDateTimeImmutable::ATOM, $valueNode->value);
-
-        if ($data === false) {
-            throw new Error('datetime format does not match ISO 8601.');
-        }
-
-        return $data;
+        return $this->parseValue($valueNode->value);
     }
 
     public function parseValue(mixed $value): PHPDateTimeImmutable

diff --git a/src/Type/DateTimeTZ.php b/src/Type/DateTimeTZ.php
@@ -21,7 +21,7 @@ class DateTimeTZ extends ScalarType
     public string|null $description = 'The `datetimetz` scalar type represents datetime data.'
     . 'The format is ISO-8601 e.g. 2004-02-12T15:19:21+00:00.';
 
-    public function parseLiteral(ASTNode $valueNode, array|null $variables = null): PHPDateTimeTZ|null
+    public function parseLiteral(ASTNode $valueNode, array|null $variables = null): PHPDateTimeTZ
     {
         // @codeCoverageIgnoreStart
         if (! $valueNode instanceof StringValueNode) {
@@ -30,17 +30,7 @@ public function parseLiteral(ASTNode $valueNode, array|null $variables = null):
 
         // @codeCoverageIgnoreEnd
 
-        if (! $valueNode->value) {
-            return null;
-        }
-
-        $data = PHPDateTimeTZ::createFromFormat(PHPDateTimeTZ::ATOM, $valueNode->value);
-
-        if ($data === false) {
-            throw new Error('datetimetz format does not match ISO 8601.');
-        }
-
-        return $data;
+        return $this->parseValue($valueNode->value);
     }
 
     public function parseValue(mixed $value): PHPDateTimeTZ

diff --git a/src/Type/DateTimeTZImmutable.php b/src/Type/DateTimeTZImmutable.php
@@ -21,7 +21,7 @@ class DateTimeTZImmutable extends ScalarType
     public string|null $description = 'The `datetimetz_immutable` scalar type represents datetime data.'
     . 'The format is ISO-8601 e.g. 2004-02-12T15:19:21+00:00';
 
-    public function parseLiteral(ASTNode $valueNode, array|null $variables = null): PHPDateTimeTZImmutable|null
+    public function parseLiteral(ASTNode $valueNode, array|null $variables = null): PHPDateTimeTZImmutable
     {
         // @codeCoverageIgnoreStart
         if (! $valueNode instanceof StringValueNode) {
@@ -30,20 +30,10 @@ public function parseLiteral(ASTNode $valueNode, array|null $variables = null):
 
         // @codeCoverageIgnoreEnd
 
-        if (! $valueNode->value) {
-            return null;
-        }
-
-        $data = PHPDateTimeTZImmutable::createFromFormat(PHPDateTimeTZImmutable::ATOM, $valueNode->value);
-
-        if ($data === false) {
-            throw new Error('datetimetz_immutable format does not match ISO 8601.  ' . $valueNode->value);
-        }
-
-        return $data;
+        return $this->parseValue($valueNode->value);
     }
 
-    public function parseValue(mixed $value): PHPDateTimeTZImmutable|false
+    public function parseValue(mixed $value): PHPDateTimeTZImmutable
     {
         if (! is_string($value)) {
             throw new Error('datetimetz_immutable is not a string: ' . $value);

diff --git a/test/Feature/Type/DateTimeImmutableTest.php b/test/Feature/Type/DateTimeImmutableTest.php
@@ -45,16 +45,6 @@ public function testParseValueInvalid(): void
         $result   = $dateType->parseValue('2023-11-26');
     }
 
-    public function testParseLiteralNull(): void
-    {
-        $dateTimeType = new DateTimeImmutable();
-        $node         = new StringValueNode([]);
-        $node->value  = '';
-        $result       = $dateTimeType->parseLiteral($node);
-
-        $this->AssertNull($result);
-    }
-
     public function testParseLiteralInvalid(): void
     {
         $this->expectException(Error::class);

diff --git a/test/Feature/Type/DateTimeTZImmutableTest.php b/test/Feature/Type/DateTimeTZImmutableTest.php
@@ -45,16 +45,6 @@ public function testParseValueInvalid(): void
         $result   = $dateType->parseValue('03/01/2020');
     }
 
-    public function testParseLiteralNull(): void
-    {
-        $dateTimeType = new DateTimeType();
-        $node         = new StringValueNode([]);
-        $node->value  = '';
-        $result       = $dateTimeType->parseLiteral($node);
-
-        $this->AssertNull($result);
-    }
-
     public function testParseLiteralInvalid(): void
     {
         $this->expectException(Error::class);

diff --git a/test/Feature/Type/DateTimeTZTest.php b/test/Feature/Type/DateTimeTZTest.php
@@ -43,16 +43,6 @@ public function testParseValueInvalid(): void
         $result   = $dateType->parseValue('03/01/2020');
     }
 
-    public function testParseLiteralNull(): void
-    {
-        $dateTimeType = new DateTimeType();
-        $node         = new StringValueNode([]);
-        $node->value  = '';
-        $result       = $dateTimeType->parseLiteral($node);
-
-        $this->AssertNull($result);
-    }
-
     public function testParseLiteralInvalid(): void
     {
         $this->expectException(Error::class);

diff --git a/test/Feature/Type/DateTimeTest.php b/test/Feature/Type/DateTimeTest.php
@@ -45,16 +45,6 @@ public function testParseValueInvalid(): void
         $result   = $dateType->parseValue('03/01/2020');
     }
 
-    public function testParseLiteralNull(): void
-    {
-        $dateTimeType = new DateTimeType();
-        $node         = new StringValueNode([]);
-        $node->value  = '';
-        $result       = $dateTimeType->parseLiteral($node);
-
-        $this->AssertNull($result);
-    }
-
     public function testParseLiteralInvalid(): void
     {
         $this->expectException(Error::class);