chore!: remove old deprecations (#428)

Author: justlevine

CHANGELOG.md

@@ -13,6 +13,9 @@
 - feat: Add `FieldError.connectedFormField` connection to `FieldError` type.
 - dev: Remove `vendor` directory from the GitHub repository.
 - dev: Use `FormFieldsDataLoader` to resolve fields instead of instantiating a new `Model`.
+- chore!: Remove deprecated fields from the schema: `FormsConnectionOrderbyInput.field`, `GfFieldWithDisableQuantitySetting.isQuantityDisabled`. `GfSubmittedEntry.entryId`. `GfForm.button`, `gfForm.entryId`, `gfForm.lastPageButton`.
+- chore!: Remove deprecated hooks: `graphql_gf_form_modeled_data_experimental`, `graphql_gf_form_field_setting_properties`, `graphql_gf_form_field_value_properties`.
+- chore!: Remove deprecated helper method: `GFUtils::handle_file_upload()`.
 - chore: Add iterable type hints.
 - chore!: Bump minimum WPGraphQL version to v1.26.0.
 - chore!: Bump minimum WordPress version to v6.0.0.

src/Data/Connection/FormsConnectionResolver.php

@@ -212,11 +212,6 @@ private function prepare_sort( array $args ): array {
 		];
 
 		if ( ! empty( $args['where']['orderby'] ) && is_array( $args['where']['orderby'] ) ) {
-			// @todo remove support for deprecated `field` input.
-			if ( empty( $args['where']['orderby']['column'] ) && ! empty( $args['where']['orderby']['field'] ) ) {
-				$args['where']['orderby']['column'] = $args['where']['orderby']['field'];
-			}
-
 			$sort = [
 				'key'       => $args['where']['orderby']['column'] ?? '',
 				'direction' => $args['where']['orderby']['order'] ?? 'ASC',

src/Model/Form.php

@@ -255,15 +255,6 @@ static function ( $confirmation ) {
 				'hasValidationSummary'         => fn (): bool => ! empty( $this->data['validationSummary'] ),
 				'version'                      => fn (): ?string => ! empty( $this->data['version'] ) ? $this->data['version'] : null,
 			];
-
-			/**
-			 * Internal Filter for modifying the model.
-			 *
-			 * To be replaced by https://github.com/wp-graphql/wp-graphql/issues/2198
-			 *
-			 * @deprecated 0.11.0 use "graphql_model_prepare_fields"
-			 */
-			$this->fields = apply_filters_deprecated( 'graphql_gf_form_modeled_data_experimental', [ $this->fields, $this->data ], '0.11.0', 'graphql_model_prepare_fields' );
 		}
 	}
 }

src/Registry/FormFieldRegistry.php

@@ -351,22 +351,6 @@ public static function get_description( string $field_name ): string {
 	public static function get_fields( GF_Field $field, array $settings, $interfaces ): array {
 		$fields = [];
 
-		if ( has_filter( 'graphql_gf_form_field_setting_properties' ) ) {
-			foreach ( $settings as $setting_key ) {
-				/**
-				 * Filter to modify the Form Field GraphQL fields based on GF_Field::form_editor_field_settings().
-				 *
-				 * @deprecated 0.12.0 Use `graphql_gf_form_field_setting_fields` instead.
-				 *
-				 * @param array<string,array<string,mixed>> $fields      An array of GraphQL field configs. See https://www.wpgraphql.com/functions/register_graphql_fields/
-				 * @param string                            $setting_key The `form_editor_field_settings()` key.
-				 * @param \GF_Field                         $field       The Gravity Forms Field object.
-				 * @param string[]                          $interfaces  The list of interfaces for the GraphQL type.
-				 */
-				$fields = apply_filters_deprecated( 'graphql_gf_form_field_setting_properties', [ $fields, $setting_key, $field ], '0.12.0', 'graphql_gf_form_field_setting_fields' );
-			}
-		}
-
 		/**
 		 * Filter to modify the Form Field GraphQL fields.
 		 *
@@ -408,11 +392,6 @@ public static function get_field_value_fields( GF_Field $field ): array {
 				$fields += FieldValues::consent_value();
 				break;
 			case 'fileupload':
-				// Deprecate values field.
-				$values                                = FieldValues::values();
-				$values['values']['deprecationReason'] = __( 'Use `fileUploadValues` instead.', 'wp-graphql-gravity-forms' );
-				$fields                               += $values;
-
 				$fields += FieldValues::file_upload_values();
 				break;
 			case 'list':
@@ -441,16 +420,6 @@ public static function get_field_value_fields( GF_Field $field ): array {
 				break;
 		}
 
-		/**
-		 * Filter to modify the Form Field value GraphQL fields.
-		 *
-		 * @deprecated 0.12.0 Use `graphql_gf_form_field_value_fields` instead.
-		 *
-		 * @param array<string,array<string,mixed>> $fields An array of GraphQL field configs. See https://www.wpgraphql.com/functions/register_graphql_fields/
-		 * @param \GF_Field                         $field The Gravity Forms Field object.
-		 */
-		$fields = apply_filters_deprecated( 'graphql_gf_form_field_value_properties', [ $fields, $field ], '0.12.0', 'graphql_gf_form_field_value_fields' );
-
 		/**
 		 * Filter to modify the Form Field Value GraphQL fields.
 		 *

src/Type/Input/FormsConnectionOrderbyInput.php

@@ -36,11 +36,6 @@ public static function get_description(): string {
 	 */
 	public static function get_fields(): array {
 		return [
-			'field'  => [
-				'type'              => 'String',
-				'description'       => __( 'The field name used to sort the results.', 'wp-graphql-gravity-forms' ),
-				'deprecationReason' => __( 'Use the `orderBy` field instead.', 'wp-graphql-gravity-forms' ),
-			],
 			'column' => [
 				'type'        => FormsConnectionOrderByEnum::$type,
 				'description' => __( 'The form column name used to sort the results.', 'wp-graphql-gravity-forms' ),

src/Type/WPInterface/FieldSetting/FieldWithDisableQuantity.php

@@ -33,17 +33,11 @@ class FieldWithDisableQuantity extends AbstractFieldSetting {
 	 */
 	public static function get_fields(): array {
 		return [
-			'hasQuantity'        => [
+			'hasQuantity' => [
 				'type'        => 'Boolean',
 				'description' => __( 'Whether the field has the quantity property enabled.', 'wp-graphql-gravity-forms' ),
 				'resolve'     => static fn ( $source ) => empty( $source->disableQuantity ),
 			],
-			'isQuantityDisabled' => [
-				'type'              => 'Boolean',
-				'description'       => __( 'Whether the quantity property should be disabled for this field.', 'wp-graphql-gravity-forms' ),
-				'deprecationReason' => __( 'Use `hasQuantity` instead', 'wp-graphql-gravity-forms' ),
-				'resolve'           => static fn ( $source ) => ! empty( $source->disableQuantity ),
-			],
 		];
 	}
 }

src/Type/WPObject/Entry/SubmittedEntry.php

@@ -72,12 +72,6 @@ public static function get_description(): string {
 	 */
 	public static function get_fields(): array {
 		return [
-			'entryId'        => [
-				'type'              => 'Int',
-				'description'       => __( 'The entry ID. Returns null for draft entries.', 'wp-graphql-gravity-forms' ),
-				'deprecationReason' => __( 'Deprecated in favor of the databaseId field.', 'wp-graphql-gravity-forms' ),
-				'resolve'           => static fn ( $source ) => $source->databaseId ?? null,
-			],
 			'isStarred'      => [
 				'type'        => 'Boolean',
 				'description' => __( 'Indicates if the entry has been starred (i.e marked with a star).', 'wp-graphql-gravity-forms' ),

src/Type/WPObject/Form/Form.php

@@ -25,7 +25,6 @@
 use WPGraphQL\GF\Type\WPInterface\Entry;
 use WPGraphQL\GF\Type\WPInterface\FormField;
 use WPGraphQL\GF\Type\WPObject\AbstractObject;
-use WPGraphQL\GF\Type\WPObject\Button;
 use WPGraphQL\GF\Utils\Utils;
 
 /**
@@ -137,12 +136,6 @@ public static function get_description(): string {
 	 */
 	public static function get_fields(): array {
 		return [
-			'button'                       => [
-				'type'              => FormSubmitButton::$type,
-				'description'       => __( 'Contains the form button settings such as the button text or image button source.', 'wp-graphql-gravity-forms' ),
-				'deprecationReason' => __( 'Use `submitButton` field instead', 'wp-graphql-gravity-forms' ),
-				'resolve'           => static fn ( $source ) => $source->submitButton,
-			],
 			'confirmations'                => [
 				'type'        => [ 'list_of' => FormConfirmation::$type ],
 				'description' => __( 'Contains the form confirmation settings such as confirmation text or redirect URL.', 'wp-graphql-gravity-forms' ),
@@ -187,12 +180,6 @@ public static function get_fields(): array {
 				'type'        => 'String',
 				'description' => __( 'CSS class for the first page.', 'wp-graphql-gravity-forms' ),
 			],
-			'formId'                       => [
-				'type'              => 'Int',
-				'description'       => __( 'Form ID.', 'wp-graphql-gravity-forms' ),
-				'deprecationReason' => __( 'Deprecated in favor of the databaseId field.', 'wp-graphql-gravity-forms' ),
-				'resolve'           => static fn ( $source ) => $source->databaseId,
-			],
 			'hasValidationSummary'         => [
 				'type'        => 'Boolean',
 				'description' => __( 'If enabled, will show a summary that lists form validation errors at the top of the form when a user attempts a failed submission.', 'wp-graphql-gravity-forms' ),
@@ -209,12 +196,6 @@ public static function get_fields(): array {
 				'type'        => Enum\FormLabelPlacementEnum::$type,
 				'description' => __( 'Determines where the field labels should be placed in relation to the field.', 'wp-graphql-gravity-forms' ),
 			],
-			'lastPageButton'               => [
-				'type'              => Button\FormLastPageButton::$type,
-				'description'       => __( 'Last page button data.', 'wp-graphql-gravity-forms' ),
-				'deprecationReason' => __( 'Use `pagination.lastPageButton` instead', 'wp-graphql-gravity-forms' ),
-				'resolve'           => static fn ( $source ) => ! empty( $source->pagination ) ? $source->pagination['lastPageButton'] : null,
-			],
 			'login'                        => [
 				'type'        => FormLogin::$type,
 				'description' => __( 'Login requirements data.', 'wp-graphql-gravity-forms' ),

src/Utils/GFUtils.php

@@ -437,75 +437,4 @@ public static function get_gravity_forms_upload_dir( int $form_id ): array {
 			'baseurl' => untrailingslashit( GFFormsModel::get_upload_url_root() ),
 		];
 	}
-
-	/**
-	 * Handle custom file upload.
-	 *
-	 * This mimics WP Core upload functionality but allows for uploading file to a custom directory rather than the standard WP uploads dir.
-	 * Slightly modified from source.
-	 *
-	 * @see https://developer.wordpress.org/reference/functions/_wp_handle_upload/
-	 *
-	 * @author WebDevStudios
-	 * @source https://github.com/WebDevStudios/wds-headless-wordpress/blob/5a8e84a2dbb7a0bb537422223ab409ecd2568b00/themes/wds_headless/inc/wp-graphql.php#L452
-	 * @param array<string,mixed> $file   File data to upload.
-	 * @param array<string,mixed> $target Target upload directory; WP uploads dir will be used if none provided.
-	 *
-	 * @return array{file:string,url:string,type:mixed}
-	 *
-	 * @deprecated 0.11.0
-	 *
-	 * @throws \GraphQL\Error\UserError .
-	 */
-	public static function handle_file_upload( $file, $target ) {
-		_doing_it_wrong( __FUNCTION__, esc_html__( 'GFUtils::handle_file_upload() is deprecated. Please use native WP/GF methods instead.', 'wp-graphql-gravity-forms' ), '0.11.0' );
-
-		$target = $target ?: wp_upload_dir();
-
-		$wp_filetype     = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'] );
-		$ext             = empty( $wp_filetype['ext'] ) ? '' : $wp_filetype['ext'];
-		$type            = empty( $wp_filetype['type'] ) ? '' : $wp_filetype['type'];
-		$proper_filename = empty( $wp_filetype['proper_filename'] ) ? '' : $wp_filetype['proper_filename'];
-
-		// Check to see if wp_check_filetype_and_ext() determined the filename was incorrect.
-		if ( ! empty( $proper_filename ) ) {
-			$file['name'] = $proper_filename;
-		}
-
-		// Return error if file type not allowed.
-		if ( ( ! $type || ! $ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
-			throw new UserError( esc_html__( 'This file type is not permitted for security reasons.', 'wp-graphql-gravity-forms' ) );
-		}
-
-		$type = empty( $type ) ? $file['type'] : $type;
-
-		$filename = wp_unique_filename( $target['path'], $file['name'] );
-
-		// Move the file to the GF uploads dir.
-		$new_file = $target['path'] . sprintf( '/%s', $filename );
-
-		// Use copy and unlink because rename breaks streams.
-		$move_new_file = @copy( $file['tmp_name'], $new_file ); // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged,Generic.PHP.NoSilencedErrors.Forbidden
-		unlink( $file['tmp_name'] ); // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.file_ops_unlink
-
-		if ( ! $move_new_file ) {
-			throw new UserError( esc_html__( 'Failed to copy the file to the server.', 'wp-graphql-gravity-forms' ) );
-		}
-
-		// Set correct file permissions.
-		$stat = stat( dirname( $new_file ) );
-		if ( is_array( $stat ) ) {
-			$perms = $stat['mode'] & 0000666;
-			chmod( $new_file, $perms ); // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.chmod_chmod
-		}
-
-		// Compute the URL.
-		$url = $target['url'] . sprintf( '/%s', $filename );
-
-		return [
-			'file' => $new_file,
-			'url'  => $url,
-			'type' => $type,
-		];
-	}
 }