fix: clean up unnecessary variables and ternaries (#766)

justlevine · web-flow · commit 58fbce7c5780 · 2023-07-19T16:10:23.000-04:00
diff --git a/includes/admin/class-general.php b/includes/admin/class-general.php
@@ -76,7 +76,7 @@ public static function get_fields() {
 					. ( defined( 'NO_QL_SESSION_HANDLER' ) ? __( ' This setting is disabled. The "NO_QL_SESSION_HANDLER" flag has been triggered with code', 'wp-graphql-woocommerce' ) : '' ),
 				'type'     => 'checkbox',
 				'value'    => defined( 'NO_QL_SESSION_HANDLER' ) ? 'on' : woographql_setting( 'disable_ql_session_handler', 'off' ),
-				'disabled' => defined( 'NO_QL_SESSION_HANDLER' ) ? true : false,
+				'disabled' => defined( 'NO_QL_SESSION_HANDLER' ),
 			],
 			[
 				'name'    => 'enable_unsupported_product_type',
@@ -101,7 +101,7 @@ public static function get_fields() {
 					]
 				),
 				'value'             => $enable_auth_urls_hardcoded ? $all_urls_checked : woographql_setting( 'enable_authorizing_url_fields', [] ),
-				'disabled'          => $enable_auth_urls_hardcoded ? true : false,
+				'disabled'          => $enable_auth_urls_hardcoded,
 				'sanitize_callback' => static function( $value ) {
 					if ( empty( $value ) ) {
 						return [];
diff --git a/includes/connection/class-products.php b/includes/connection/class-products.php
@@ -398,7 +398,7 @@ public static function bypass_get_args_sanitization( $args, $connection_resolver
 	 * @return \WPGraphQL\Data\Connection\PostObjectConnectionResolver
 	 */
 	public static function set_ordering_query_args( $resolver, $args ) {
-		$backward = isset( $args['last'] ) ? true : false;
+		$backward = isset( $args['last'] );
 
 		if ( ! empty( $args['where']['orderby'] ) ) {
 			$default_fields = [
diff --git a/includes/connection/class-wc-terms.php b/includes/connection/class-wc-terms.php
@@ -40,7 +40,7 @@ public static function register_connections() {
 		$wc_post_types      = WP_GraphQL_WooCommerce::get_post_types();
 
 		// Loop through the allowed_taxonomies to register appropriate connections.
-		foreach ( $allowed_taxonomies as $taxonomy => $tax_object ) {
+		foreach ( $allowed_taxonomies as $tax_object ) {
 			foreach ( $wc_post_types as $post_type ) {
 				if ( 'product' === $post_type ) {
 					continue;
diff --git a/includes/data/connection/class-cart-item-connection-resolver.php b/includes/data/connection/class-cart-item-connection-resolver.php
@@ -103,9 +103,7 @@ public function get_query() {
 	 * {@inheritDoc}
 	 */
 	public function get_ids_from_query() {
-		$ids = ! empty( $this->query ) ? $this->query : [];
-
-		return $ids;
+		return ! empty( $this->query ) ? $this->query : [];
 	}
 
 	/**
diff --git a/includes/data/connection/class-downloadable-item-connection-resolver.php b/includes/data/connection/class-downloadable-item-connection-resolver.php
@@ -140,9 +140,7 @@ public function get_query() {
 	 * @return array
 	 */
 	public function get_ids_from_query() {
-		$ids = ! empty( $this->query ) ? $this->query : [];
-
-		return $ids;
+		return ! empty( $this->query ) ? $this->query : [];
 	}
 
 	/**
diff --git a/includes/data/connection/class-order-item-connection-resolver.php b/includes/data/connection/class-order-item-connection-resolver.php
@@ -99,7 +99,7 @@ public function get_query() {
 		}//end switch
 
 		$items = [];
-		foreach ( $this->source->get_items( $type ) as $id => $item ) {
+		foreach ( $this->source->get_items( $type ) as $item ) {
 			$items[] = $item;
 		}
 
diff --git a/includes/data/mutation/class-order-mutation.php b/includes/data/mutation/class-order-mutation.php
@@ -262,8 +262,7 @@ protected static function get_order_item_keys( $type ) {
 				 * @param array  $item_keys  Order item keys.
 				 * @param string $type       Order item type slug.
 				 */
-				$item_keys = apply_filters( 'woographql_get_order_item_keys', [], $type );
-				return $item_keys;
+				return apply_filters( 'woographql_get_order_item_keys', [], $type );
 		}//end switch
 	}
 
diff --git a/includes/model/class-order.php b/includes/model/class-order.php
@@ -299,7 +299,7 @@ protected function owner_matches_current_user() {
 		}
 
 		// If customer ID matches current user, return true.
-		return absint( $customer_id ) === absint( $this->current_user->ID ) ? true : false;
+		return absint( $customer_id ) === absint( $this->current_user->ID );
 	}
 
 	/**
@@ -327,7 +327,7 @@ public function guest_order_customer_matches_current_user() {
 		}
 
 		// If customer email matches current user, return true.
-		return $customer_email === $session_customer->get_billing_email() ? true : false;
+		return $customer_email === $session_customer->get_billing_email();
 	}
 
 	/**
@@ -336,7 +336,7 @@ public function guest_order_customer_matches_current_user() {
 	 * @return bool
 	 */
 	public function is_private() {
-		return wc_is_order_status( 'wc-' . $this->data->get_status() ) ? false : true;
+		return ! wc_is_order_status( 'wc-' . $this->data->get_status() );
 	}
 
 	/**
diff --git a/includes/mutation/class-cart-add-fee.php b/includes/mutation/class-cart-add-fee.php
@@ -42,7 +42,7 @@ public static function register_mutation() {
 	 * @return array
 	 */
 	public static function get_input_fields() {
-		$input_fields = [
+		return [
 			'name'     => [
 				'type'        => [ 'non_null' => 'String' ],
 				'description' => __( 'Unique name for the fee.', 'wp-graphql-woocommerce' ),
@@ -60,8 +60,6 @@ public static function get_input_fields() {
 				'description' => __( 'The tax class for the fee if taxable.', 'wp-graphql-woocommerce' ),
 			],
 		];
-
-		return $input_fields;
 	}
 
 	/**
diff --git a/includes/mutation/class-cart-add-item.php b/includes/mutation/class-cart-add-item.php
@@ -76,9 +76,7 @@ public static function get_output_fields() {
 			'cartItem' => [
 				'type'    => 'CartItem',
 				'resolve' => static function ( $payload ) {
-					$item = \WC()->cart->get_cart_item( $payload['key'] );
-
-					return $item;
+					return \WC()->cart->get_cart_item( $payload['key'] );
 				},
 			],
 			'cart'     => Cart_Mutation::get_cart_field( true ),
diff --git a/includes/mutation/class-order-create.php b/includes/mutation/class-order-create.php
@@ -44,7 +44,7 @@ public static function register_mutation() {
 	 * @return array
 	 */
 	public static function get_input_fields() {
-		$input_fields = [
+		return [
 			'parentId'           => [
 				'type'        => 'Int',
 				'description' => __( 'Parent order ID.', 'wp-graphql-woocommerce' ),
@@ -110,8 +110,6 @@ public static function get_input_fields() {
 				'description' => __( 'Define if the order is paid. It will set the status to processing and reduce stock items.', 'wp-graphql-woocommerce' ),
 			],
 		];
-
-		return $input_fields;
 	}
 
 	/**
diff --git a/includes/mutation/class-order-update.php b/includes/mutation/class-order-update.php
@@ -150,8 +150,8 @@ public static function mutate_and_get_payload() {
 			// Actions for after the order is saved.
 			if ( true === $input['isPaid'] ) {
 				$order->payment_complete(
-					! empty( $input['transactionId'] ) ?
-						$input['transactionId']
+					! empty( $input['transactionId'] )
+						? $input['transactionId']
 						: ''
 				);
 			}
diff --git a/includes/type/object/class-customer-type.php b/includes/type/object/class-customer-type.php
@@ -237,13 +237,12 @@ public static function register() {
 					'description' => __( 'Customer\'s stored payment tokens.', 'wp-graphql-woocommerce' ),
 					'resolve'     => static function( $source ) {
 						if ( get_current_user_id() === $source->ID ) {
-							$tokens = array_filter(
+							return array_filter(
 								array_values( \WC_Payment_Tokens::get_customer_tokens( $source->ID ) ),
 								static function ( $token ) {
 									return 'CC' === $token->get_type();
 								}
 							);
-							return $tokens;
 						}
 
 						throw new UserError( __( 'Not authorized to view this user\'s payment methods.', 'wp-graphql-woocommerce' ) );
@@ -254,13 +253,12 @@ static function ( $token ) {
 					'description' => __( 'Customer\'s stored payment tokens.', 'wp-graphql-woocommerce' ),
 					'resolve'     => static function( $source ) {
 						if ( get_current_user_id() === $source->ID ) {
-							$tokens = array_filter(
+							return array_filter(
 								array_values( \WC_Payment_Tokens::get_customer_tokens( $source->ID ) ),
 								static function ( $token ) {
 									return 'eCheck' === $token->get_type();
 								}
 							);
-							return $tokens;
 						}
 
 						throw new UserError( __( 'Not authorized to view this user\'s payment methods.', 'wp-graphql-woocommerce' ) );
diff --git a/includes/type/object/class-meta-data-type.php b/includes/type/object/class-meta-data-type.php
@@ -85,7 +85,7 @@ public static function get_metadata_field_definition() {
 			],
 			'resolve'     => static function( $source, array $args ) {
 				// Set unique flag.
-				$single = ! empty( $args['multiple'] ) ? false : true;
+				$single = empty( $args['multiple'] );
 
 				// Check "key" argument and format meta_data objects.
 				if ( ! empty( $args['key'] ) && $source->meta_exists( $args['key'] ) ) {
diff --git a/includes/type/object/class-root-query.php b/includes/type/object/class-root-query.php
@@ -586,9 +586,7 @@ public static function register_fields() {
 							throw new UserError( sprintf( __( 'No product exists with the %1$s: %2$s', 'wp-graphql-woocommerce' ), $id_type, $product_id ) );
 						}
 
-						$product = Factory::resolve_crud_object( $product_id, $context );
-
-						return $product;
+						return Factory::resolve_crud_object( $product_id, $context );
 					},
 				]
 			);
diff --git a/includes/utils/class-transfer-session-handler.php b/includes/utils/class-transfer-session-handler.php
@@ -107,8 +107,6 @@ public function get_client_session_id() {
 			return $client_session_id;
 		}
 
-		$client_session_id = '';
-
-		return $client_session_id;
+		return '';
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function get_query() {`
`99`	`99`	`}//end switch`
`100`	`100`
`101`	`101`	`$items = [];`
`102`		`- foreach ( $this->source->get_items( $type ) as $id => $item ) {`
	`102`	`+ foreach ( $this->source->get_items( $type ) as $item ) {`
`103`	`103`	`$items[] = $item;`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,7 @@ protected static function get_order_item_keys( $type ) {`
`262`	`262`	`* @param array $item_keys Order item keys.`
`263`	`263`	`* @param string $type Order item type slug.`
`264`	`264`	`*/`
`265`		`- $item_keys = apply_filters( 'woographql_get_order_item_keys', [], $type );`
`266`		`- return $item_keys;`
	`265`	`+ return apply_filters( 'woographql_get_order_item_keys', [], $type );`
`267`	`266`	`}//end switch`
`268`	`267`	`}`
`269`	`268`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ protected function owner_matches_current_user() {`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`// If customer ID matches current user, return true.`
`302`		`- return absint( $customer_id ) === absint( $this->current_user->ID ) ? true : false;`
	`302`	`+ return absint( $customer_id ) === absint( $this->current_user->ID );`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`/**`
`@@ -327,7 +327,7 @@ public function guest_order_customer_matches_current_user() {`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`// If customer email matches current user, return true.`
`330`		`- return $customer_email === $session_customer->get_billing_email() ? true : false;`
	`330`	`+ return $customer_email === $session_customer->get_billing_email();`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`/**`
`@@ -336,7 +336,7 @@ public function guest_order_customer_matches_current_user() {`
`336`	`336`	`* @return bool`
`337`	`337`	`*/`
`338`	`338`	`public function is_private() {`
`339`		`- return wc_is_order_status( 'wc-' . $this->data->get_status() ) ? false : true;`
	`339`	`+ return ! wc_is_order_status( 'wc-' . $this->data->get_status() );`
`340`	`340`	`}`
`341`	`341`
`342`	`342`	`/**`