- chore!: change FieldWithPhoneFormat.phoneFormat from PhoneFieldFormatEnum to GfPhoneFormat.

Author: justlevine

CHANGELOG.md

@@ -7,7 +7,7 @@
 - chore!: Bump minimum required Gravity Forms version to 2.9.0
 - chore!: Bump minimum required WPGraphQL version to 2.5.0
 - chore!: Remove the following deprecated fields: `FieldWithPhoneFormat._phoneFormatExperimental` field. `FieldWithProductField.productField` field.
-- chore!: Change the following field types: `FieldWithPhoneFormat.phoneFormat` from `PhoneFieldFormatEnum` to `GfPhoneFormat`.
+- chore!: change `FieldWithPhoneFormat.phoneFormat` from `PhoneFieldFormatEnum` to `GfPhoneFormat`.
 - chore!: Remove the following unused methods: `Utils::to_snake_case()`, `Utils::deprecate_property()`.
 - chore: Test compatibility against PHP 8.5.
 

tests/_support/Helper/GFHelpers/ExpectedFormFields.php

@@ -484,21 +484,21 @@ public function pen_size_setting( GF_Field $field, array &$properties ): void {
 	public function phone_format_setting( GF_Field $field, array &$properties ): void {
 		$properties[] = $this->expectedField( 'phoneFormatType', ! empty( $field->phoneFormat ) ? GFHelpers::get_enum_for_value( Enum\PhoneFieldFormatEnum::$type, $field->phoneFormat ) : self::IS_NULL );
 
-		// Add _phoneFormatExperimental field.
+		// Add phoneFormat field.
 		if ( ! empty( $field->phoneFormat ) ) {
-			$properties[] = $this->expectedField( '_phoneFormatExperimental.label', self::NOT_NULL );
-			$properties[] = $this->expectedField( '_phoneFormatExperimental.type', self::NOT_NULL );
+			$properties[] = $this->expectedField( 'phoneFormat.label', self::NOT_NULL );
+			$properties[] = $this->expectedField( 'phoneFormat.type', self::NOT_NULL );
 			if ( 'international' === $field->phoneFormat ) {
-				$properties[] = $this->expectedField( '_phoneFormatExperimental.mask', self::IS_NULL );
-				$properties[] = $this->expectedField( '_phoneFormatExperimental.regex', self::IS_NULL );
-				$properties[] = $this->expectedField( '_phoneFormatExperimental.instruction', self::IS_NULL );
+				$properties[] = $this->expectedField( 'phoneFormat.mask', self::IS_NULL );
+				$properties[] = $this->expectedField( 'phoneFormat.regex', self::IS_NULL );
+				$properties[] = $this->expectedField( 'phoneFormat.instruction', self::IS_NULL );
 			} else {
-				$properties[] = $this->expectedField( '_phoneFormatExperimental.mask', self::NOT_NULL );
-				$properties[] = $this->expectedField( '_phoneFormatExperimental.regex', self::NOT_NULL );
-				$properties[] = $this->expectedField( '_phoneFormatExperimental.instruction', self::NOT_NULL );
+				$properties[] = $this->expectedField( 'phoneFormat.mask', self::NOT_NULL );
+				$properties[] = $this->expectedField( 'phoneFormat.regex', self::NOT_NULL );
+				$properties[] = $this->expectedField( 'phoneFormat.instruction', self::NOT_NULL );
 			}
 		} else {
-			$properties[] = $this->expectedField( '_phoneFormatExperimental', self::IS_NULL );
+			$properties[] = $this->expectedField( 'phoneFormat', self::IS_NULL );
 		}
 	}
 

tests/wpunit/PhoneFieldFormatTest.php

@@ -69,7 +69,7 @@ public function testStandardPhoneFormat(): void {
 						nodes {
 							... on PhoneField {
 								phoneFormatType
-								_phoneFormatExperimental {
+								phoneFormat {
 									label
 									mask
 									regex
@@ -89,7 +89,7 @@ public function testStandardPhoneFormat(): void {
 		$this->assertArrayNotHasKey( 'errors', $response );
 		$this->assertEquals( 'STANDARD', $response['data']['gfForm']['formFields']['nodes'][0]['phoneFormatType'] );
 
-		$properties = $response['data']['gfForm']['formFields']['nodes'][0]['_phoneFormatExperimental'];
+		$properties = $response['data']['gfForm']['formFields']['nodes'][0]['phoneFormat'];
 		$this->assertNotNull( $properties );
 		$this->assertNotNull( $properties['label'] );
 		$this->assertNotNull( $properties['mask'] );
@@ -111,7 +111,7 @@ public function testInternationalPhoneFormat(): void {
 						nodes {
 							... on PhoneField {
 								phoneFormatType
-								_phoneFormatExperimental {
+								phoneFormat {
 									label
 									mask
 									regex
@@ -131,7 +131,7 @@ public function testInternationalPhoneFormat(): void {
 		$this->assertArrayNotHasKey( 'errors', $response );
 		$this->assertEquals( 'INTERNATIONAL', $response['data']['gfForm']['formFields']['nodes'][0]['phoneFormatType'] );
 
-		$properties = $response['data']['gfForm']['formFields']['nodes'][0]['_phoneFormatExperimental'];
+		$properties = $response['data']['gfForm']['formFields']['nodes'][0]['phoneFormat'];
 		$this->assertNotNull( $properties );
 		$this->assertNotNull( $properties['label'] );
 		$this->assertNull( $properties['mask'] );
@@ -177,7 +177,7 @@ static function ( $formats ) use ( $custom_format ) {
 					formFields {
 						nodes {
 							... on PhoneField {
-								_phoneFormatExperimental {
+								phoneFormat {
 									label
 									mask
 									regex
@@ -195,7 +195,7 @@ static function ( $formats ) use ( $custom_format ) {
 
 		$this->assertArrayNotHasKey( 'errors', $response );
 
-		$properties = $response['data']['gfForm']['formFields']['nodes'][0]['_phoneFormatExperimental'];
+		$properties = $response['data']['gfForm']['formFields']['nodes'][0]['phoneFormat'];
 		$this->assertNotNull( $properties );
 		$this->assertEquals( $custom_format['label'], $properties['label'] );
 		$this->assertEquals( $custom_format['mask'], $properties['mask'] );

tests/wpunit/PhoneFieldTest.php

@@ -116,7 +116,7 @@ public function field_query(): string {
 					shouldExport
 				}
 				phoneFormatType
-				_phoneFormatExperimental {
+				phoneFormat {
 					label
 					mask
 					regex