- simplify resolvers for DatePicker and DateTimePicker

Author: jasonbahl

src/FieldType/DatePicker.php

@@ -1,6 +1,7 @@
 <?php
 namespace WPGraphQL\Acf\FieldType;
 
+use DateTimeInterface;
 use WPGraphQL\Acf\FieldConfig;
 
 class DatePicker {
@@ -24,27 +25,13 @@ public static function register_field_type(): void {
 				'resolve'                   => static function ( $root, $args, $context, $info, $field_type, FieldConfig $field_config ) {
 					$value = $field_config->resolve_field( $root, $args, $context, $info );
 
-					if ( empty( $value ) ) {
-						return null;
-					}
-
-					$acf_field = $field_config->get_acf_field();
-
-					// Get the return format from the ACF Field
-					$return_format = $acf_field['return_format'] ?? null;
-
-					if ( empty( $return_format ) ) {
-						return $value;
-					}
-
-					$date_time = \DateTime::createFromFormat( $return_format . '|', $value );
+					$timestamp = strtotime( $value );
 
-					if ( empty( $date_time ) ) {
+					if ( false === $timestamp ) {
 						return null;
 					}
 
-					// appending '|' to the format prevents the minutes and seconds from being determined from the current time
-					return $date_time->format( \DateTimeInterface::RFC3339 );
+					return gmdate( DateTimeInterface::RFC3339, $timestamp );
 				},
 			]
 		);

src/FieldType/DateTimePicker.php

@@ -29,22 +29,13 @@ public static function register_field_type(): void {
 						return null;
 					}
 
-					$acf_field = $field_config->get_acf_field();
+					$timestamp = strtotime( $value );
 
-					// Get the return format from the ACF Field
-					$return_format = $acf_field['return_format'] ?? null;
-
-					if ( empty( $return_format ) ) {
-						return $value;
-					}
-
-					$date_time = \DateTime::createFromFormat( $return_format, $value );
-
-					if ( empty( $date_time ) ) {
+					if ( false === $timestamp ) {
 						return null;
 					}
 
-					return $date_time->format( DateTimeInterface::RFC3339 );
+					return gmdate( DateTimeInterface::RFC3339, $timestamp );
 				},
 			]
 		);