Merge branch 'fix/163-date-range-returning-error' into fix/pagination-on-connection-fields

# Conflicts:
#	src/FieldType/User.php

Author: jasonbahl

.github/workflows/code-quality.yml

@@ -26,7 +26,7 @@ jobs:
           access_token: ${{ github.token }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/deploy-to-github.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/deploy-to-wordpress.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/schema-linter.yml

@@ -24,7 +24,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP w/ Composer & WP-CLI
         uses: shivammathur/setup-php@v2

.github/workflows/sync-develop-with-main.yml

@@ -10,7 +10,7 @@ jobs:
     timeout-minutes: 2
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.SYNC_TOKEN }}
       - name: Set Git config

.github/workflows/testing-integration.yml

@@ -39,7 +39,7 @@ jobs:
     name: WordPress ${{ matrix.wordpress }}, PHP ${{ matrix.php }}, ACF ${{matrix.acf_version}}, ACF & ACF EXTENDED PRO ${{matrix.acf_pro}}, WPGRAPHQL Content Blocks ${{matrix.wpgraphql_content_blocks}}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
         # This is used in case the IP gets blocked by one of the services used to download the pro plugins
       - name: 🔎 Check IP

.github/workflows/upload-schema-artifact.yml

@@ -19,7 +19,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP w/ Composer & WP-CLI
         uses: shivammathur/setup-php@v2

.github/workflows/wordpress-coding-standards.yml

@@ -26,7 +26,7 @@ jobs:
           access_token: ${{ github.token }}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

src/FieldType/User.php

@@ -39,7 +39,7 @@ public static function register_field_type(): void {
 									return null;
 								}
 
-								$values = [];
+								$values = is_array( $value ) ? $value : [];
 								if ( ! is_array( $value ) ) {
 									$values[] = $value;
 								} else {

src/ThirdParty/AcfExtended/FieldType/AcfeDateRangePicker.php

@@ -18,6 +18,17 @@ public static function register_field_type(): void {
 					$value      = $field_config->resolve_field( $root, $args, $context, $info );
 					$start_date = $value['start'] ?? null;
 					$end_date   = $value['end'] ?? null;
+					$acf_field  = $field_config->get_acf_field();
+
+					// handle resolving from a block
+					if ( empty( $start_date ) ) {
+						$start_date = $field_config->resolve_field( $root, $args, $context, $info, [ 'name' => $acf_field['name'] . '_start' ] );
+					}
+
+					// handle resolving from a block
+					if ( empty( $end_date ) ) {
+						$end_date = $field_config->resolve_field( $root, $args, $context, $info, [ 'name' => $acf_field['name'] . '_end' ] );
+					}
 
 					if ( ! empty( $start_date ) ) {
 						$_start_date = \DateTime::createFromFormat( 'Ymd|', $start_date );