woocommerce / woocommerce-rest-api

src/Controllers/Version4/Settings.php

Spacing +7 added lines, -7 removed lines

@@ -102,19 +102,19 @@ 
 		foreach ( $groups as $group ) {
 			$sub_groups = array();
 			foreach ( $groups as $_group ) {
-				if ( ! empty( $_group['parent_id'] ) && $group['id'] === $_group['parent_id'] ) {
-					$sub_groups[] = $_group['id'];
+				if ( ! empty( $_group[ 'parent_id' ] ) && $group[ 'id' ] === $_group[ 'parent_id' ] ) {
+					$sub_groups[ ] = $_group[ 'id' ];
 				}
 			}
-			$group['sub_groups'] = $sub_groups;
+			$group[ 'sub_groups' ] = $sub_groups;
 
 			$group = wp_parse_args( $group, $defaults );
-			if ( ! is_null( $group['id'] ) && ! is_null( $group['label'] ) ) {
+			if ( ! is_null( $group[ 'id' ] ) && ! is_null( $group[ 'label' ] ) ) {
 				$group_obj  = $this->filter_group( $group );
 				$group_data = $this->prepare_item_for_response( $group_obj, $request );
 				$group_data = $this->prepare_response_for_collection( $group_data );
 
-				$filtered_groups[] = $group_data;
+				$filtered_groups[ ] = $group_data;
 			}
 		}
 
@@ -148,13 +148,13 @@ 
 	 * @return \WP_REST_Response $response Response data.
 	 */
 	public function prepare_item_for_response( $item, $request ) {
-		$context = empty( $request['context'] ) ? 'view' : $request['context'];
+		$context = empty( $request[ 'context' ] ) ? 'view' : $request[ 'context' ];
 		$data    = $this->add_additional_fields_to_object( $item, $request );
 		$data    = $this->filter_response_by_context( $data, $context );
 
 		$response = rest_ensure_response( $data );
 
-		$response->add_links( $this->prepare_links( $item['id'] ) );
+		$response->add_links( $this->prepare_links( $item[ 'id' ] ) );
 
 		return $response;
 	}

src/Controllers/Version4/ShippingZoneLocations.php

Spacing +9 added lines, -9 removed lines

@@ -54,7 +54,7 @@ 
 	 * @return \WP_REST_Response|\WP_Error
 	 */
 	public function get_items( $request ) {
-		$zone = $this->get_zone( (int) $request['id'] );
+		$zone = $this->get_zone( (int) $request[ 'id' ] );
 
 		if ( is_wp_error( $zone ) ) {
 			return $zone;
@@ -66,7 +66,7 @@ 
 		foreach ( $locations as $location_obj ) {
 			$location = $this->prepare_item_for_response( $location_obj, $request );
 			$location = $this->prepare_response_for_collection( $location );
-			$data[]   = $location;
+			$data[ ]   = $location;
 		}
 
 		return rest_ensure_response( $data );
@@ -79,7 +79,7 @@ 
 	 * @return \WP_REST_Response|\WP_Error
 	 */
 	public function update_items( $request ) {
-		$zone = $this->get_zone( (int) $request['id'] );
+		$zone = $this->get_zone( (int) $request[ 'id' ] );
 
 		if ( is_wp_error( $zone ) ) {
 			return $zone;
@@ -93,18 +93,18 @@ 
 		$locations     = array();
 
 		foreach ( (array) $raw_locations as $raw_location ) {
-			if ( empty( $raw_location['code'] ) ) {
+			if ( empty( $raw_location[ 'code' ] ) ) {
 				continue;
 			}
 
-			$type = ! empty( $raw_location['type'] ) ? sanitize_text_field( $raw_location['type'] ) : 'country';
+			$type = ! empty( $raw_location[ 'type' ] ) ? sanitize_text_field( $raw_location[ 'type' ] ) : 'country';
 
 			if ( ! in_array( $type, array( 'postcode', 'state', 'country', 'continent' ), true ) ) {
 				continue;
 			}
 
-			$locations[] = array(
-				'code' => sanitize_text_field( $raw_location['code'] ),
+			$locations[ ] = array(
+				'code' => sanitize_text_field( $raw_location[ 'code' ] ),
 				'type' => sanitize_text_field( $type ),
 			);
 		}
@@ -123,14 +123,14 @@ 
 	 * @return \WP_REST_Response $response
 	 */
 	public function prepare_item_for_response( $item, $request ) {
-		$context = empty( $request['context'] ) ? 'view' : $request['context'];
+		$context = empty( $request[ 'context' ] ) ? 'view' : $request[ 'context' ];
 		$data    = $this->add_additional_fields_to_object( $item, $request );
 		$data    = $this->filter_response_by_context( $data, $context );
 
 		// Wrap the data in a response object.
 		$response = rest_ensure_response( $data );
 
-		$response->add_links( $this->prepare_links( (int) $request['id'] ) );
+		$response->add_links( $this->prepare_links( (int) $request[ 'id' ] ) );
 
 		return $response;
 	}

src/Controllers/Version4/ShippingZones.php

Spacing +7 added lines, -7 removed lines

@@ -124,7 +124,7 @@ 
 		foreach ( $zones as $zone_obj ) {
 			$zone   = $this->prepare_item_for_response( $zone_obj, $request );
 			$zone   = $this->prepare_response_for_collection( $zone );
-			$data[] = $zone;
+			$data[ ] = $zone;
 		}
 
 		return rest_ensure_response( $data );
@@ -209,7 +209,7 @@ 
 			return $zone;
 		}
 
-		$force = $request['force'];
+		$force = $request[ 'force' ];
 
 		// We don't support trashing for this type, error out.
 		if ( ! $force ) {
@@ -238,19 +238,19 @@ 
 	 */
 	public function prepare_item_for_response( $item, $request ) {
 		$data = array(
-			'id'    => (int) $item['id'],
-			'name'  => $item['zone_name'],
-			'order' => (int) $item['zone_order'],
+			'id'    => (int) $item[ 'id' ],
+			'name'  => $item[ 'zone_name' ],
+			'order' => (int) $item[ 'zone_order' ],
 		);
 
-		$context = empty( $request['context'] ) ? 'view' : $request['context'];
+		$context = empty( $request[ 'context' ] ) ? 'view' : $request[ 'context' ];
 		$data    = $this->add_additional_fields_to_object( $data, $request );
 		$data    = $this->filter_response_by_context( $data, $context );
 
 		// Wrap the data in a response object.
 		$response = rest_ensure_response( $data );
 
-		$response->add_links( $this->prepare_links( $data['id'] ) );
+		$response->add_links( $this->prepare_links( $data[ 'id' ] ) );
 
 		return $response;
 	}

src/Controllers/Version4/TaxClasses.php

Spacing +15 added lines, -15 removed lines

@@ -130,7 +130,7 @@ 
 		$tax_classes = array();
 
 		// Add standard class.
-		$tax_classes[] = array(
+		$tax_classes[ ] = array(
 			'slug' => 'standard',
 			'name' => __( 'Standard rate', 'woocommerce' ),
 		);
@@ -138,7 +138,7 @@ 
 		$classes = \WC_Tax::get_tax_classes();
 
 		foreach ( $classes as $class ) {
-			$tax_classes[] = array(
+			$tax_classes[ ] = array(
 				'slug' => sanitize_title( $class ),
 				'name' => $class,
 			);
@@ -148,7 +148,7 @@ 
 		foreach ( $tax_classes as $tax_class ) {
 			$class  = $this->prepare_item_for_response( $tax_class, $request );
 			$class  = $this->prepare_response_for_collection( $class );
-			$data[] = $class;
+			$data[ ] = $class;
 		}
 
 		return rest_ensure_response( $data );
@@ -164,13 +164,13 @@ 
 		$exists    = false;
 		$classes   = \WC_Tax::get_tax_classes();
 		$tax_class = array(
-			'slug' => sanitize_title( $request['name'] ),
-			'name' => $request['name'],
+			'slug' => sanitize_title( $request[ 'name' ] ),
+			'name' => $request[ 'name' ],
 		);
 
 		// Check if class exists.
 		foreach ( $classes as $key => $class ) {
-			if ( sanitize_title( $class ) === $tax_class['slug'] ) {
+			if ( sanitize_title( $class ) === $tax_class[ 'slug' ] ) {
 				$exists = true;
 				break;
 			}
@@ -182,7 +182,7 @@ 
 		}
 
 		// Add the new class.
-		$classes[] = $tax_class['name'];
+		$classes[ ] = $tax_class[ 'name' ];
 
 		update_option( 'woocommerce_tax_classes', implode( "\n", $classes ) );
 
@@ -201,7 +201,7 @@ 
 		$response = $this->prepare_item_for_response( $tax_class, $request );
 		$response = rest_ensure_response( $response );
 		$response->set_status( 201 );
-		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $tax_class['slug'] ) ) );
+		$response->header( 'Location', rest_url( sprintf( '/%s/%s/%s', $this->namespace, $this->rest_base, $tax_class[ 'slug' ] ) ) );
 
 		return $response;
 	}
@@ -215,7 +215,7 @@ 
 	public function delete_item( $request ) {
 		global $wpdb;
 
-		$force = isset( $request['force'] ) ? (bool) $request['force'] : false;
+		$force = isset( $request[ 'force' ] ) ? (bool) $request[ 'force' ] : false;
 
 		// We don't support trashing for this type, error out.
 		if ( ! $force ) {
@@ -223,15 +223,15 @@ 
 		}
 
 		$tax_class = array(
-			'slug' => sanitize_title( $request['slug'] ),
+			'slug' => sanitize_title( $request[ 'slug' ] ),
 			'name' => '',
 		);
 		$classes = \WC_Tax::get_tax_classes();
 		$deleted = false;
 
 		foreach ( $classes as $key => $class ) {
-			if ( sanitize_title( $class ) === $tax_class['slug'] ) {
-				$tax_class['name'] = $class;
+			if ( sanitize_title( $class ) === $tax_class[ 'slug' ] ) {
+				$tax_class[ 'name' ] = $class;
 				unset( $classes[ $key ] );
 				$deleted = true;
 				break;
@@ -258,12 +258,12 @@ 
 					ON rates.tax_rate_id = locations.tax_rate_id
 				WHERE rates.tax_rate_class = %s
 				",
-				$tax_class['slug']
+				$tax_class[ 'slug' ]
 			)
 		);
 
 		// Delete tax rates in the selected class.
-		$wpdb->delete( $wpdb->prefix . 'woocommerce_tax_rates', array( 'tax_rate_class' => $tax_class['slug'] ), array( '%s' ) );
+		$wpdb->delete( $wpdb->prefix . 'woocommerce_tax_rates', array( 'tax_rate_class' => $tax_class[ 'slug' ] ), array( '%s' ) );
 
 		$response = new \WP_REST_Response();
 		$response->set_data(
@@ -295,7 +295,7 @@ 
 	public function prepare_item_for_response( $tax_class, $request ) {
 		$data = $tax_class;
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$context = ! empty( $request[ 'context' ] ) ? $request[ 'context' ] : 'view';
 		$data    = $this->add_additional_fields_to_object( $data, $request );
 		$data    = $this->filter_response_by_context( $data, $context );
 

src/Controllers/Version4/SystemStatus.php

Spacing +35 added lines, -35 removed lines

@@ -69,11 +69,11 @@ 
 
 		foreach ( $mappings as $section => $values ) {
 			foreach ( $values as $key => $value ) {
-				if ( isset( $schema['properties'][ $section ]['properties'][ $key ]['type'] ) ) {
-					settype( $values[ $key ], $schema['properties'][ $section ]['properties'][ $key ]['type'] );
+				if ( isset( $schema[ 'properties' ][ $section ][ 'properties' ][ $key ][ 'type' ] ) ) {
+					settype( $values[ $key ], $schema[ 'properties' ][ $section ][ 'properties' ][ $key ][ 'type' ] );
 				}
 			}
-			settype( $values, $schema['properties'][ $section ]['type'] );
+			settype( $values, $schema[ 'properties' ][ $section ][ 'type' ] );
 			$response[ $section ] = $values;
 		}
 
@@ -593,7 +593,7 @@ 
 		$curl_version = '';
 		if ( function_exists( 'curl_version' ) ) {
 			$curl_version = curl_version();
-			$curl_version = $curl_version['version'] . ', ' . $curl_version['ssl_version'];
+			$curl_version = $curl_version[ 'version' ] . ', ' . $curl_version[ 'ssl_version' ];
 		} elseif ( extension_loaded( 'curl' ) ) {
 			$curl_version = __( 'cURL installed but unable to retrieve version.', 'woocommerce' );
 		}
@@ -620,7 +620,7 @@ 
 				)
 			);
 			if ( ! is_wp_error( $response ) ) {
-				$post_response_code = $response['response']['code'];
+				$post_response_code = $response[ 'response' ][ 'code' ];
 			}
 			set_transient( 'woocommerce_test_remote_post', $post_response_code, HOUR_IN_SECONDS );
 		}
@@ -633,7 +633,7 @@ 
 		if ( false === $get_response_code || is_wp_error( $get_response_code ) ) {
 			$response = wp_safe_remote_get( 'https://woocommerce.com/wc-api/product-key-api?request=ping&network=' . ( is_multisite() ? '1' : '0' ) );
 			if ( ! is_wp_error( $response ) ) {
-				$get_response_code = $response['response']['code'];
+				$get_response_code = $response[ 'response' ][ 'code' ];
 			}
 			set_transient( 'woocommerce_test_remote_get', $get_response_code, HOUR_IN_SECONDS );
 		}
@@ -656,7 +656,7 @@ 
 			'wp_cron'                   => ! ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ),
 			'language'                  => get_locale(),
 			'external_object_cache'     => wp_using_ext_object_cache(),
-			'server_info'               => isset( $_SERVER['SERVER_SOFTWARE'] ) ? wc_clean( wp_unslash( $_SERVER['SERVER_SOFTWARE'] ) ) : '',
+			'server_info'               => isset( $_SERVER[ 'SERVER_SOFTWARE' ] ) ? wc_clean( wp_unslash( $_SERVER[ 'SERVER_SOFTWARE' ] ) ) : '',
 			'php_version'               => phpversion(),
 			'php_post_max_size'         => wc_let_to_num( ini_get( 'post_max_size' ) ),
 			'php_max_execution_time'    => ini_get( 'max_execution_time' ),
@@ -664,8 +664,8 @@ 
 			'curl_version'              => $curl_version,
 			'suhosin_installed'         => extension_loaded( 'suhosin' ),
 			'max_upload_size'           => wp_max_upload_size(),
-			'mysql_version'             => $database_version['number'],
-			'mysql_version_string'      => $database_version['string'],
+			'mysql_version'             => $database_version[ 'number' ],
+			'mysql_version_string'      => $database_version[ 'string' ],
 			'default_timezone'          => date_default_timezone_get(),
 			'fsockopen_or_curl_enabled' => ( function_exists( 'fsockopen' ) || function_exists( 'curl_init' ) ),
 			'soapclient_enabled'        => class_exists( 'SoapClient' ),
@@ -770,8 +770,8 @@ 
 				'engine' => $table->engine,
 			);
 
-			$database_size['data']  += $table->data;
-			$database_size['index'] += $table->index;
+			$database_size[ 'data' ]  += $table->data;
+			$database_size[ 'index' ] += $table->index;
 		}
 
 		// Return all database info. Described by JSON Schema.
@@ -819,7 +819,7 @@ 
 
 		foreach ( $active_plugins as $plugin ) {
 			$data                  = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
-			$active_plugins_data[] = $this->format_plugin_data( $plugin, $data );
+			$active_plugins_data[ ] = $this->format_plugin_data( $plugin, $data );
 		}
 
 		return $active_plugins_data;
@@ -851,7 +851,7 @@ 
 			if ( in_array( $plugin, $active_plugins, true ) ) {
 				continue;
 			}
-			$plugins_data[] = $this->format_plugin_data( $plugin, $data );
+			$plugins_data[ ] = $this->format_plugin_data( $plugin, $data );
 		}
 
 		return $plugins_data;
@@ -877,7 +877,7 @@ 
 			$this->available_updates = get_plugin_updates();
 		}
 
-		$version_latest = $data['Version'];
+		$version_latest = $data[ 'Version' ];
 
 		// Find latest version.
 		if ( isset( $this->available_updates[ $plugin ]->update->new_version ) ) {
@@ -886,13 +886,13 @@ 
 
 		return array(
 			'plugin'            => $plugin,
-			'name'              => $data['Name'],
-			'version'           => $data['Version'],
+			'name'              => $data[ 'Name' ],
+			'version'           => $data[ 'Version' ],
 			'version_latest'    => $version_latest,
-			'url'               => $data['PluginURI'],
-			'author_name'       => $data['AuthorName'],
-			'author_url'        => esc_url_raw( $data['AuthorURI'] ),
-			'network_activated' => $data['Network'],
+			'url'               => $data[ 'PluginURI' ],
+			'author_name'       => $data[ 'AuthorName' ],
+			'author_url'        => esc_url_raw( $data[ 'AuthorURI' ] ),
+			'network_activated' => $data[ 'Network' ],
 		);
 	}
 
@@ -909,21 +909,21 @@ 
 			'mu_plugins' => array(),
 		);
 		foreach ( $dropins as $key => $dropin ) {
-			$plugins['dropins'][] = array(
+			$plugins[ 'dropins' ][ ] = array(
 				'plugin' => $key,
-				'name'   => $dropin['Name'],
+				'name'   => $dropin[ 'Name' ],
 			);
 		}
 
 		$mu_plugins = get_mu_plugins();
 		foreach ( $mu_plugins as $plugin => $mu_plugin ) {
-			$plugins['mu_plugins'][] = array(
+			$plugins[ 'mu_plugins' ][ ] = array(
 				'plugin'      => $plugin,
-				'name'        => $mu_plugin['Name'],
-				'version'     => $mu_plugin['Version'],
-				'url'         => $mu_plugin['PluginURI'],
-				'author_name' => $mu_plugin['AuthorName'],
-				'author_url'  => esc_url_raw( $mu_plugin['AuthorURI'] ),
+				'name'        => $mu_plugin[ 'Name' ],
+				'version'     => $mu_plugin[ 'Version' ],
+				'url'         => $mu_plugin[ 'PluginURI' ],
+				'author_name' => $mu_plugin[ 'AuthorName' ],
+				'author_url'  => esc_url_raw( $mu_plugin[ 'AuthorURI' ] ),
 			);
 		}
 		return $plugins;
@@ -989,7 +989,7 @@ 
 						$outdated_templates = true;
 					}
 				}
-				$override_files[] = array(
+				$override_files[ ] = array(
 					'file'         => str_replace( WP_CONTENT_DIR . '/themes/', '', $theme_file ),
 					'version'      => $theme_version,
 					'core_version' => $core_version,
@@ -1036,7 +1036,7 @@ 
 		// Check if WooCommerce.com account is connected.
 		$woo_com_connected = 'no';
 		$helper_options    = get_option( 'woocommerce_helper_data', array() );
-		if ( array_key_exists( 'auth', $helper_options ) && ! empty( $helper_options['auth'] ) ) {
+		if ( array_key_exists( 'auth', $helper_options ) && ! empty( $helper_options[ 'auth' ] ) ) {
 			$woo_com_connected = 'yes';
 		}
 
@@ -1103,7 +1103,7 @@ 
 
 		$pages_output = array();
 		foreach ( $check_pages as $page_name => $values ) {
-			$page_id            = get_option( $values['option'] );
+			$page_id            = get_option( $values[ 'option' ] );
 			$page_set           = false;
 			$page_exists        = false;
 			$page_visible       = false;
@@ -1122,22 +1122,22 @@ 
 			}
 
 			// Shortcode checks.
-			if ( $values['shortcode'] && get_post( $page_id ) ) {
+			if ( $values[ 'shortcode' ] && get_post( $page_id ) ) {
 				$shortcode_required = true;
 				$page               = get_post( $page_id );
-				if ( strstr( $page->post_content, $values['shortcode'] ) ) {
+				if ( strstr( $page->post_content, $values[ 'shortcode' ] ) ) {
 					$shortcode_present = true;
 				}
 			}
 
 			// Wrap up our findings into an output array.
-			$pages_output[] = array(
+			$pages_output[ ] = array(
 				'page_name'          => $page_name,
 				'page_id'            => $page_id,
 				'page_set'           => $page_set,
 				'page_exists'        => $page_exists,
 				'page_visible'       => $page_visible,
-				'shortcode'          => $values['shortcode'],
+				'shortcode'          => $values[ 'shortcode' ],
 				'shortcode_required' => $shortcode_required,
 				'shortcode_present'  => $shortcode_present,
 			);

src/Controllers/Version4/ShippingZoneMethods.php

Spacing +34 added lines, -34 removed lines

@@ -105,13 +105,13 @@ 
 	 * @return \WP_REST_Response|\WP_Error
 	 */
 	public function get_item( $request ) {
-		$zone = $this->get_zone( $request['zone_id'] );
+		$zone = $this->get_zone( $request[ 'zone_id' ] );
 
 		if ( is_wp_error( $zone ) ) {
 			return $zone;
 		}
 
-		$instance_id = (int) $request['instance_id'];
+		$instance_id = (int) $request[ 'instance_id' ];
 		$methods     = $zone->get_shipping_methods();
 		$method      = false;
 
@@ -138,7 +138,7 @@ 
 	 * @return \WP_REST_Response|\WP_Error
 	 */
 	public function get_items( $request ) {
-		$zone = $this->get_zone( $request['zone_id'] );
+		$zone = $this->get_zone( $request[ 'zone_id' ] );
 
 		if ( is_wp_error( $zone ) ) {
 			return $zone;
@@ -149,7 +149,7 @@ 
 
 		foreach ( $methods as $method_obj ) {
 			$method = $this->prepare_item_for_response( $method_obj, $request );
-			$data[] = $method;
+			$data[ ] = $method;
 		}
 
 		return rest_ensure_response( $data );
@@ -162,8 +162,8 @@ 
 	 * @return \WP_REST_Request|\WP_Error
 	 */
 	public function create_item( $request ) {
-		$method_id = $request['method_id'];
-		$zone      = $this->get_zone( $request['zone_id'] );
+		$method_id = $request[ 'method_id' ];
+		$zone      = $this->get_zone( $request[ 'zone_id' ] );
 		if ( is_wp_error( $zone ) ) {
 			return $zone;
 		}
@@ -198,13 +198,13 @@ 
 	 * @return \WP_Error|boolean
 	 */
 	public function delete_item( $request ) {
-		$zone = $this->get_zone( $request['zone_id'] );
+		$zone = $this->get_zone( $request[ 'zone_id' ] );
 		if ( is_wp_error( $zone ) ) {
 			return $zone;
 		}
 
-		$instance_id = (int) $request['instance_id'];
-		$force       = $request['force'];
+		$instance_id = (int) $request[ 'instance_id' ];
+		$force       = $request[ 'force' ];
 
 		// We don't support trashing for this type, error out.
 		if ( ! $force ) {
@@ -262,12 +262,12 @@ 
 	 * @return \WP_REST_Response|\WP_Error
 	 */
 	public function update_item( $request ) {
-		$zone = $this->get_zone( $request['zone_id'] );
+		$zone = $this->get_zone( $request[ 'zone_id' ] );
 		if ( is_wp_error( $zone ) ) {
 			return $zone;
 		}
 
-		$instance_id = (int) $request['instance_id'];
+		$instance_id = (int) $request[ 'instance_id' ];
 		$methods     = $zone->get_shipping_methods();
 		$method      = false;
 
@@ -304,16 +304,16 @@ 
 		global $wpdb;
 
 		// Update settings if present.
-		if ( isset( $request['settings'] ) ) {
+		if ( isset( $request[ 'settings' ] ) ) {
 			$method->init_instance_settings();
 			$instance_settings = $method->instance_settings;
 			$errors_found      = false;
 			foreach ( $method->get_instance_form_fields() as $key => $field ) {
-				if ( isset( $request['settings'][ $key ] ) ) {
-					if ( is_callable( array( $this, 'validate_setting_' . $field['type'] . '_field' ) ) ) {
-						$value = $this->{'validate_setting_' . $field['type'] . '_field'}( $request['settings'][ $key ], $field );
+				if ( isset( $request[ 'settings' ][ $key ] ) ) {
+					if ( is_callable( array( $this, 'validate_setting_' . $field[ 'type' ] . '_field' ) ) ) {
+						$value = $this->{'validate_setting_' . $field[ 'type' ] . '_field'}( $request[ 'settings' ][ $key ], $field );
 					} else {
-						$value = $this->validate_setting_text_field( $request['settings'][ $key ], $field );
+						$value = $this->validate_setting_text_field( $request[ 'settings' ][ $key ], $field );
 					}
 					if ( is_wp_error( $value ) ) {
 						$errors_found = true;
@@ -331,16 +331,16 @@ 
 		}
 
 		// Update order.
-		if ( isset( $request['order'] ) ) {
-			$wpdb->update( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'method_order' => absint( $request['order'] ) ), array( 'instance_id' => absint( $instance_id ) ) );
-			$method->method_order = absint( $request['order'] );
+		if ( isset( $request[ 'order' ] ) ) {
+			$wpdb->update( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'method_order' => absint( $request[ 'order' ] ) ), array( 'instance_id' => absint( $instance_id ) ) );
+			$method->method_order = absint( $request[ 'order' ] );
 		}
 
 		// Update if this method is enabled or not.
-		if ( isset( $request['enabled'] ) ) {
-			if ( $wpdb->update( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'is_enabled' => $request['enabled'] ), array( 'instance_id' => absint( $instance_id ) ) ) ) {
-				do_action( 'woocommerce_shipping_zone_method_status_toggled', $instance_id, $method->id, $request['zone_id'], $request['enabled'] );
-				$method->enabled = ( true === $request['enabled'] ? 'yes' : 'no' );
+		if ( isset( $request[ 'enabled' ] ) ) {
+			if ( $wpdb->update( "{$wpdb->prefix}woocommerce_shipping_zone_methods", array( 'is_enabled' => $request[ 'enabled' ] ), array( 'instance_id' => absint( $instance_id ) ) ) ) {
+				do_action( 'woocommerce_shipping_zone_method_status_toggled', $instance_id, $method->id, $request[ 'zone_id' ], $request[ 'enabled' ] );
+				$method->enabled = ( true === $request[ 'enabled' ] ? 'yes' : 'no' );
 			}
 		}
 
@@ -358,7 +358,7 @@ 
 		$method = array(
 			'id'                 => $item->instance_id,
 			'instance_id'        => $item->instance_id,
-			'title'              => $item->instance_settings['title'],
+			'title'              => $item->instance_settings[ 'title' ],
 			'order'              => $item->method_order,
 			'enabled'            => ( 'yes' === $item->enabled ),
 			'method_id'          => $item->id,
@@ -367,14 +367,14 @@ 
 			'settings'           => $this->get_settings( $item ),
 		);
 
-		$context = empty( $request['context'] ) ? 'view' : $request['context'];
+		$context = empty( $request[ 'context' ] ) ? 'view' : $request[ 'context' ];
 		$data    = $this->add_additional_fields_to_object( $method, $request );
 		$data    = $this->filter_response_by_context( $data, $context );
 
 		// Wrap the data in a response object.
 		$response = rest_ensure_response( $data );
 
-		$response->add_links( $this->prepare_links( $request['zone_id'], $item->instance_id ) );
+		$response->add_links( $this->prepare_links( $request[ 'zone_id' ], $item->instance_id ) );
 
 		$response = $this->prepare_response_for_collection( $response );
 
@@ -394,16 +394,16 @@ 
 		foreach ( $item->get_instance_form_fields() as $id => $field ) {
 			$data = array(
 				'id'          => $id,
-				'label'       => $field['title'],
-				'description' => empty( $field['description'] ) ? '' : $field['description'],
-				'type'        => $field['type'],
+				'label'       => $field[ 'title' ],
+				'description' => empty( $field[ 'description' ] ) ? '' : $field[ 'description' ],
+				'type'        => $field[ 'type' ],
 				'value'       => $item->instance_settings[ $id ],
-				'default'     => empty( $field['default'] ) ? '' : $field['default'],
-				'tip'         => empty( $field['description'] ) ? '' : $field['description'],
-				'placeholder' => empty( $field['placeholder'] ) ? '' : $field['placeholder'],
+				'default'     => empty( $field[ 'default' ] ) ? '' : $field[ 'default' ],
+				'tip'         => empty( $field[ 'description' ] ) ? '' : $field[ 'description' ],
+				'placeholder' => empty( $field[ 'placeholder' ] ) ? '' : $field[ 'placeholder' ],
 			);
-			if ( ! empty( $field['options'] ) ) {
-				$data['options'] = $field['options'];
+			if ( ! empty( $field[ 'options' ] ) ) {
+				$data[ 'options' ] = $field[ 'options' ];
 			}
 			$settings[ $id ] = $data;
 		}

src/Controllers/Version4/ProductAttributeTerms.php

Spacing +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
 			'count'       => (int) $item->count,
 		);
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$context = ! empty( $request[ 'context' ] ) ? $request[ 'context' ] : 'view';
 		$data    = $this->add_additional_fields_to_object( $data, $request );
 		$data    = $this->filter_response_by_context( $data, $context );
 
@@ -180,7 +180,7 @@ 
 	protected function update_term_meta_fields( $term, $request ) {
 		$id = (int) $term->term_id;
 
-		update_term_meta( $id, 'order_' . $this->taxonomy, $request['menu_order'] );
+		update_term_meta( $id, 'order_' . $this->taxonomy, $request[ 'menu_order' ] );
 
 		return true;
 	}

src/Controllers/Version4/Taxes.php

Spacing +41 added lines, -41 removed lines

@@ -203,21 +203,21 @@ 
 		global $wpdb;
 
 		$prepared_args           = array();
-		$prepared_args['order']  = $request['order'];
-		$prepared_args['number'] = $request['per_page'];
-		if ( ! empty( $request['offset'] ) ) {
-			$prepared_args['offset'] = $request['offset'];
+		$prepared_args[ 'order' ]  = $request[ 'order' ];
+		$prepared_args[ 'number' ] = $request[ 'per_page' ];
+		if ( ! empty( $request[ 'offset' ] ) ) {
+			$prepared_args[ 'offset' ] = $request[ 'offset' ];
 		} else {
-			$prepared_args['offset'] = ( $request['page'] - 1 ) * $prepared_args['number'];
+			$prepared_args[ 'offset' ] = ( $request[ 'page' ] - 1 ) * $prepared_args[ 'number' ];
 		}
 		$orderby_possibles        = array(
 			'id'    => 'tax_rate_id',
 			'order' => 'tax_rate_order',
 		);
-		$prepared_args['orderby'] = $orderby_possibles[ $request['orderby'] ];
-		$prepared_args['class']   = $request['class'];
-		$prepared_args['code']    = $request['code'];
-		$prepared_args['include'] = $request['include'];
+		$prepared_args[ 'orderby' ] = $orderby_possibles[ $request[ 'orderby' ] ];
+		$prepared_args[ 'class' ]   = $request[ 'class' ];
+		$prepared_args[ 'code' ]    = $request[ 'code' ];
+		$prepared_args[ 'include' ] = $request[ 'include' ];
 
 		/**
 		 * Filter arguments, before passing to $wpdb->get_results(), when querying taxes via the REST API.
@@ -234,13 +234,13 @@ 
 		";
 
 		// Filter by tax class.
-		if ( ! empty( $prepared_args['class'] ) ) {
-			$class  = 'standard' !== $prepared_args['class'] ? sanitize_title( $prepared_args['class'] ) : '';
+		if ( ! empty( $prepared_args[ 'class' ] ) ) {
+			$class  = 'standard' !== $prepared_args[ 'class' ] ? sanitize_title( $prepared_args[ 'class' ] ) : '';
 			$query .= " AND tax_rate_class = '$class'";
 		}
 
 		// Filter by tax code.
-		$tax_code_search = $prepared_args['code'];
+		$tax_code_search = $prepared_args[ 'code' ];
 		if ( $tax_code_search ) {
 			$tax_code_search = $wpdb->esc_like( $tax_code_search );
 			$tax_code_search = ' \'%' . $tax_code_search . '%\'';
@@ -248,17 +248,17 @@ 
 		}
 
 		// Filter by included tax rate IDs.
-		$included_taxes = $prepared_args['include'];
+		$included_taxes = $prepared_args[ 'include' ];
 		if ( ! empty( $included_taxes ) ) {
-			$included_taxes = implode( ',', $prepared_args['include'] );
+			$included_taxes = implode( ',', $prepared_args[ 'include' ] );
 			$query         .= " AND tax_rate_id IN ({$included_taxes})";
 		}
 
 		// Order tax rates.
-		$order_by = sprintf( ' ORDER BY %s', sanitize_key( $prepared_args['orderby'] ) );
+		$order_by = sprintf( ' ORDER BY %s', sanitize_key( $prepared_args[ 'orderby' ] ) );
 
 		// Pagination.
-		$pagination = sprintf( ' LIMIT %d, %d', $prepared_args['offset'], $prepared_args['number'] );
+		$pagination = sprintf( ' LIMIT %d, %d', $prepared_args[ 'offset' ], $prepared_args[ 'number' ] );
 
 		// Query taxes.
 		$results = $wpdb->get_results( $query . $order_by . $pagination ); // @codingStandardsIgnoreLine.
@@ -266,14 +266,14 @@ 
 		$taxes = array();
 		foreach ( $results as $tax ) {
 			$data    = $this->prepare_item_for_response( $tax, $request );
-			$taxes[] = $this->prepare_response_for_collection( $data );
+			$taxes[ ] = $this->prepare_response_for_collection( $data );
 		}
 
 		$response = rest_ensure_response( $taxes );
 
 		// Store pagination values for headers then unset for count query.
-		$per_page = (int) $prepared_args['number'];
-		$page     = ceil( ( ( (int) $prepared_args['offset'] ) / $per_page ) + 1 );
+		$per_page = (int) $prepared_args[ 'number' ];
+		$page     = ceil( ( ( (int) $prepared_args[ 'offset' ] ) / $per_page ) + 1 );
 
 		// Query only for ids.
 		$wpdb->get_results( str_replace( 'SELECT *', 'SELECT tax_rate_id', $query ) ); // @codingStandardsIgnoreLine.
@@ -310,7 +310,7 @@ 
 	 * @return object
 	 */
 	protected function create_or_update_tax( $request, $current = null ) {
-		$id          = absint( isset( $request['id'] ) ? $request['id'] : 0 );
+		$id          = absint( isset( $request[ 'id' ] ) ? $request[ 'id' ] : 0 );
 		$data        = array();
 		$fields      = array(
 			'tax_rate_country',
@@ -347,7 +347,7 @@ 
 					$data[ $field ] = absint( $request[ $key ] );
 					break;
 				case 'tax_rate_class':
-					$data[ $field ] = 'standard' !== $request['tax_rate_class'] ? $request['tax_rate_class'] : '';
+					$data[ $field ] = 'standard' !== $request[ 'tax_rate_class' ] ? $request[ 'tax_rate_class' ] : '';
 					break;
 				default:
 					$data[ $field ] = wc_clean( $request[ $key ] );
@@ -362,11 +362,11 @@ 
 		}
 
 		// Add locales.
-		if ( ! empty( $request['postcode'] ) ) {
-			\WC_Tax::_update_tax_rate_postcodes( $id, wc_clean( $request['postcode'] ) );
+		if ( ! empty( $request[ 'postcode' ] ) ) {
+			\WC_Tax::_update_tax_rate_postcodes( $id, wc_clean( $request[ 'postcode' ] ) );
 		}
-		if ( ! empty( $request['city'] ) ) {
-			\WC_Tax::_update_tax_rate_cities( $id, wc_clean( $request['city'] ) );
+		if ( ! empty( $request[ 'city' ] ) ) {
+			\WC_Tax::_update_tax_rate_cities( $id, wc_clean( $request[ 'city' ] ) );
 		}
 
 		return \WC_Tax::_get_tax_rate( $id, OBJECT );
@@ -379,7 +379,7 @@ 
 	 * @return \WP_Error\WP_REST_Response
 	 */
 	public function create_item( $request ) {
-		if ( ! empty( $request['id'] ) ) {
+		if ( ! empty( $request[ 'id' ] ) ) {
 			return new \WP_Error( 'woocommerce_rest_tax_exists', __( 'Cannot create existing resource.', 'woocommerce' ), array( 'status' => 400 ) );
 		}
 
@@ -412,7 +412,7 @@ 
 	 * @return \WP_Error\WP_REST_Response
 	 */
 	public function get_item( $request ) {
-		$id      = (int) $request['id'];
+		$id      = (int) $request[ 'id' ];
 		$tax_obj = \WC_Tax::_get_tax_rate( $id, OBJECT );
 
 		if ( empty( $id ) || empty( $tax_obj ) ) {
@@ -432,7 +432,7 @@ 
 	 * @return \WP_Error\WP_REST_Response
 	 */
 	public function update_item( $request ) {
-		$id      = (int) $request['id'];
+		$id      = (int) $request[ 'id' ];
 		$tax_obj = \WC_Tax::_get_tax_rate( $id, OBJECT );
 
 		if ( empty( $id ) || empty( $tax_obj ) ) {
@@ -468,8 +468,8 @@ 
 	public function delete_item( $request ) {
 		global $wpdb;
 
-		$id    = (int) $request['id'];
-		$force = isset( $request['force'] ) ? (bool) $request['force'] : false;
+		$id    = (int) $request[ 'id' ];
+		$force = isset( $request[ 'force' ] ) ? (bool) $request[ 'force' ] : false;
 
 		// We don't support trashing for this type, error out.
 		if ( ! $force ) {
@@ -547,7 +547,7 @@ 
 			}
 		}
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$context = ! empty( $request[ 'context' ] ) ? $request[ 'context' ] : 'view';
 		$data    = $this->add_additional_fields_to_object( $data, $request );
 		$data    = $this->filter_response_by_context( $data, $context );
 
@@ -675,10 +675,10 @@ 
 	 */
 	public function get_collection_params() {
 		$params                       = array();
-		$params['context']            = $this->get_context_param();
-		$params['context']['default'] = 'view';
+		$params[ 'context' ]            = $this->get_context_param();
+		$params[ 'context' ][ 'default' ] = 'view';
 
-		$params['page'] = array(
+		$params[ 'page' ] = array(
 			'description'        => __( 'Current page of the collection.', 'woocommerce' ),
 			'type'               => 'integer',
 			'default'            => 1,
@@ -686,7 +686,7 @@ 
 			'validate_callback'  => 'rest_validate_request_arg',
 			'minimum'            => 1,
 		);
-		$params['per_page'] = array(
+		$params[ 'per_page' ] = array(
 			'description'        => __( 'Maximum number of items to be returned in result set.', 'woocommerce' ),
 			'type'               => 'integer',
 			'default'            => 10,
@@ -695,13 +695,13 @@ 
 			'sanitize_callback'  => 'absint',
 			'validate_callback'  => 'rest_validate_request_arg',
 		);
-		$params['offset'] = array(
+		$params[ 'offset' ] = array(
 			'description'        => __( 'Offset the result set by a specific number of items.', 'woocommerce' ),
 			'type'               => 'integer',
 			'sanitize_callback'  => 'absint',
 			'validate_callback'  => 'rest_validate_request_arg',
 		);
-		$params['order'] = array(
+		$params[ 'order' ] = array(
 			'default'            => 'asc',
 			'description'        => __( 'Order sort attribute ascending or descending.', 'woocommerce' ),
 			'enum'               => array( 'asc', 'desc' ),
@@ -709,7 +709,7 @@ 
 			'type'               => 'string',
 			'validate_callback'  => 'rest_validate_request_arg',
 		);
-		$params['orderby'] = array(
+		$params[ 'orderby' ] = array(
 			'default'            => 'order',
 			'description'        => __( 'Sort collection by object attribute.', 'woocommerce' ),
 			'enum'               => array(
@@ -720,19 +720,19 @@ 
 			'type'               => 'string',
 			'validate_callback'  => 'rest_validate_request_arg',
 		);
-		$params['class'] = array(
+		$params[ 'class' ] = array(
 			'description'        => __( 'Sort by tax class.', 'woocommerce' ),
 			'enum'               => array_merge( array( 'standard' ), \WC_Tax::get_tax_class_slugs() ),
 			'sanitize_callback'  => 'sanitize_title',
 			'type'               => 'string',
 			'validate_callback'  => 'rest_validate_request_arg',
 		);
-		$params['code']    = array(
+		$params[ 'code' ] = array(
 			'description'       => __( 'Search by similar tax code.', 'woocommerce' ),
 			'type'              => 'string',
 			'validate_callback' => 'rest_validate_request_arg',
 		);
-		$params['include'] = array(
+		$params[ 'include' ] = array(
 			'description'       => __( 'Limit result set to items that have the specified rate ID(s) assigned.', 'woocommerce' ),
 			'type'              => 'array',
 			'items'             => array(

src/Controllers/Version4/SettingsOptions.php

Spacing +58 added lines, -58 removed lines

@@ -109,7 +109,7 @@ 
 	 * @return \WP_Error\WP_REST_Response
 	 */
 	public function get_item( $request ) {
-		$setting = $this->get_setting( $request['group_id'], $request['id'] );
+		$setting = $this->get_setting( $request[ 'group_id' ], $request[ 'id' ] );
 
 		if ( is_wp_error( $setting ) ) {
 			return $setting;
@@ -128,7 +128,7 @@ 
 	 * @return \WP_Error\WP_REST_Response
 	 */
 	public function get_items( $request ) {
-		$settings = $this->get_group_settings( $request['group_id'] );
+		$settings = $this->get_group_settings( $request[ 'group_id' ] );
 
 		if ( is_wp_error( $settings ) ) {
 			return $settings;
@@ -139,8 +139,8 @@ 
 		foreach ( $settings as $setting_obj ) {
 			$setting = $this->prepare_item_for_response( $setting_obj, $request );
 			$setting = $this->prepare_response_for_collection( $setting );
-			if ( $this->is_setting_type_valid( $setting['type'] ) ) {
-				$data[] = $setting;
+			if ( $this->is_setting_type_valid( $setting[ 'type' ] ) ) {
+				$data[ ] = $setting;
 			}
 		}
 
@@ -166,26 +166,26 @@ 
 
 		$filtered_settings = array();
 		foreach ( $settings as $setting ) {
-			$option_key = $setting['option_key'];
+			$option_key = $setting[ 'option_key' ];
 			$setting    = $this->filter_setting( $setting );
-			$default    = isset( $setting['default'] ) ? $setting['default'] : '';
+			$default    = isset( $setting[ 'default' ] ) ? $setting[ 'default' ] : '';
 			// Get the option value.
 			if ( is_array( $option_key ) ) {
-				$option           = get_option( $option_key[0] );
-				$setting['value'] = isset( $option[ $option_key[1] ] ) ? $option[ $option_key[1] ] : $default;
+				$option           = get_option( $option_key[ 0 ] );
+				$setting[ 'value' ] = isset( $option[ $option_key[ 1 ] ] ) ? $option[ $option_key[ 1 ] ] : $default;
 			} else {
 				$admin_setting_value = \WC_Admin_Settings::get_option( $option_key, $default );
-				$setting['value']    = $admin_setting_value;
+				$setting[ 'value' ]    = $admin_setting_value;
 			}
 
-			if ( 'multi_select_countries' === $setting['type'] ) {
-				$setting['options'] = WC()->countries->get_countries();
-				$setting['type']    = 'multiselect';
-			} elseif ( 'single_select_country' === $setting['type'] ) {
-				$setting['type']    = 'select';
-				$setting['options'] = $this->get_countries_and_states();
-			} elseif ( 'single_select_page' === $setting['type'] ) {
-				$pages   = get_pages(
+			if ( 'multi_select_countries' === $setting[ 'type' ] ) {
+				$setting[ 'options' ] = WC()->countries->get_countries();
+				$setting[ 'type' ]    = 'multiselect';
+			} elseif ( 'single_select_country' === $setting[ 'type' ] ) {
+				$setting[ 'type' ]    = 'select';
+				$setting[ 'options' ] = $this->get_countries_and_states();
+			} elseif ( 'single_select_page' === $setting[ 'type' ] ) {
+				$pages = get_pages(
 					array(
 						'sort_column'  => 'menu_order',
 						'sort_order'   => 'ASC',
@@ -196,11 +196,11 @@ 
 				foreach ( $pages as $page ) {
 					$options[ $page->ID ] = ! empty( $page->post_title ) ? $page->post_title : '#' . $page->ID;
 				}
-				$setting['type']    = 'select';
-				$setting['options'] = $options;
+				$setting[ 'type' ]    = 'select';
+				$setting[ 'options' ] = $options;
 			}
 
-			$filtered_settings[] = $setting;
+			$filtered_settings[ ] = $setting;
 		}
 
 		return $filtered_settings;
@@ -257,9 +257,9 @@ 
 			return new \WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'woocommerce' ), array( 'status' => 404 ) );
 		}
 
-		$setting = $settings[ $array_key[0] ];
+		$setting = $settings[ $array_key[ 0 ] ];
 
-		if ( ! $this->is_setting_type_valid( $setting['type'] ) ) {
+		if ( ! $this->is_setting_type_valid( $setting[ 'type' ] ) ) {
 			return new \WP_Error( 'rest_setting_setting_invalid', __( 'Invalid setting.', 'woocommerce' ), array( 'status' => 404 ) );
 		}
 
@@ -267,7 +267,7 @@ 
 			return $setting;
 		}
 
-		$setting['group_id'] = $group_id;
+		$setting[ 'group_id' ] = $group_id;
 
 		return $setting;
 	}
@@ -287,10 +287,10 @@ 
 		 * Since our batch settings update is group-specific and matches based on the route,
 		 * we inject the URL parameters (containing group) into the batch items
 		 */
-		if ( ! empty( $items['update'] ) ) {
+		if ( ! empty( $items[ 'update' ] ) ) {
 			$to_update = array();
-			foreach ( $items['update'] as $item ) {
-				$to_update[] = array_merge( $request->get_url_params(), $item );
+			foreach ( $items[ 'update' ] as $item ) {
+				$to_update[ ] = array_merge( $request->get_url_params(), $item );
 			}
 			$request = new \WP_REST_Request( $request->get_method() );
 			$request->set_body_params( array( 'update' => $to_update ) );
@@ -307,32 +307,32 @@ 
 	 * @return \WP_Error\WP_REST_Response
 	 */
 	public function update_item( $request ) {
-		$setting = $this->get_setting( $request['group_id'], $request['id'] );
+		$setting = $this->get_setting( $request[ 'group_id' ], $request[ 'id' ] );
 
 		if ( is_wp_error( $setting ) ) {
 			return $setting;
 		}
 
-		if ( is_callable( array( $this, 'validate_setting_' . $setting['type'] . '_field' ) ) ) {
-			$value = $this->{'validate_setting_' . $setting['type'] . '_field'}( $request['value'], $setting );
+		if ( is_callable( array( $this, 'validate_setting_' . $setting[ 'type' ] . '_field' ) ) ) {
+			$value = $this->{'validate_setting_' . $setting[ 'type' ] . '_field'}( $request[ 'value' ], $setting );
 		} else {
-			$value = $this->validate_setting_text_field( $request['value'], $setting );
+			$value = $this->validate_setting_text_field( $request[ 'value' ], $setting );
 		}
 
 		if ( is_wp_error( $value ) ) {
 			return $value;
 		}
 
-		if ( is_array( $setting['option_key'] ) ) {
-			$setting['value']       = $value;
-			$option_key             = $setting['option_key'];
-			$prev                   = get_option( $option_key[0] );
-			$prev[ $option_key[1] ] = $request['value'];
-			update_option( $option_key[0], $prev );
+		if ( is_array( $setting[ 'option_key' ] ) ) {
+			$setting[ 'value' ]       = $value;
+			$option_key             = $setting[ 'option_key' ];
+			$prev                   = get_option( $option_key[ 0 ] );
+			$prev[ $option_key[ 1 ] ] = $request[ 'value' ];
+			update_option( $option_key[ 0 ], $prev );
 		} else {
 			$update_data                           = array();
-			$update_data[ $setting['option_key'] ] = $value;
-			$setting['value']                      = $value;
+			$update_data[ $setting[ 'option_key' ] ] = $value;
+			$setting[ 'value' ]                      = $value;
 			\WC_Admin_Settings::save_fields( array( $setting ), $update_data );
 		}
 
@@ -350,12 +350,12 @@ 
 	 * @return \WP_REST_Response $response Response data.
 	 */
 	public function prepare_item_for_response( $item, $request ) {
-		unset( $item['option_key'] );
+		unset( $item[ 'option_key' ] );
 		$data     = $this->filter_setting( $item );
 		$data     = $this->add_additional_fields_to_object( $data, $request );
-		$data     = $this->filter_response_by_context( $data, empty( $request['context'] ) ? 'view' : $request['context'] );
+		$data     = $this->filter_response_by_context( $data, empty( $request[ 'context' ] ) ? 'view' : $request[ 'context' ] );
 		$response = rest_ensure_response( $data );
-		$response->add_links( $this->prepare_links( $data['id'], $request['group_id'] ) );
+		$response->add_links( $this->prepare_links( $data[ 'id' ], $request[ 'group_id' ] ) );
 		return $response;
 	}
 
@@ -425,11 +425,11 @@ 
 			array_flip( array_filter( array_keys( $setting ), array( $this, 'allowed_setting_keys' ) ) )
 		);
 
-		if ( empty( $setting['options'] ) ) {
-			unset( $setting['options'] );
+		if ( empty( $setting[ 'options' ] ) ) {
+			unset( $setting[ 'options' ] );
 		}
 
-		if ( 'image_width' === $setting['type'] ) {
+		if ( 'image_width' === $setting[ 'type' ] ) {
 			$setting = $this->cast_image_width( $setting );
 		}
 
@@ -448,9 +448,9 @@ 
 	public function cast_image_width( $setting ) {
 		foreach ( array( 'default', 'value' ) as $key ) {
 			if ( isset( $setting[ $key ] ) ) {
-				$setting[ $key ]['width']  = intval( $setting[ $key ]['width'] );
-				$setting[ $key ]['height'] = intval( $setting[ $key ]['height'] );
-				$setting[ $key ]['crop']   = (bool) $setting[ $key ]['crop'];
+				$setting[ $key ][ 'width' ]  = intval( $setting[ $key ][ 'width' ] );
+				$setting[ $key ][ 'height' ] = intval( $setting[ $key ][ 'height' ] );
+				$setting[ $key ][ 'crop' ]   = (bool) $setting[ $key ][ 'crop' ];
 			}
 		}
 		return $setting;
@@ -490,17 +490,17 @@ 
 	public function is_setting_type_valid( $type ) {
 		return in_array(
 			$type, array(
-				'text',         // Validates with validate_setting_text_field.
-				'email',        // Validates with validate_setting_text_field.
-				'number',       // Validates with validate_setting_text_field.
-				'color',        // Validates with validate_setting_text_field.
-				'password',     // Validates with validate_setting_text_field.
-				'textarea',     // Validates with validate_setting_textarea_field.
-				'select',       // Validates with validate_setting_select_field.
-				'multiselect',  // Validates with validate_setting_multiselect_field.
-				'radio',        // Validates with validate_setting_radio_field (-> validate_setting_select_field).
-				'checkbox',     // Validates with validate_setting_checkbox_field.
-				'image_width',  // Validates with validate_setting_image_width_field.
+				'text', // Validates with validate_setting_text_field.
+				'email', // Validates with validate_setting_text_field.
+				'number', // Validates with validate_setting_text_field.
+				'color', // Validates with validate_setting_text_field.
+				'password', // Validates with validate_setting_text_field.
+				'textarea', // Validates with validate_setting_textarea_field.
+				'select', // Validates with validate_setting_select_field.
+				'multiselect', // Validates with validate_setting_multiselect_field.
+				'radio', // Validates with validate_setting_radio_field (-> validate_setting_select_field).
+				'checkbox', // Validates with validate_setting_checkbox_field.
+				'image_width', // Validates with validate_setting_image_width_field.
 				'thumbnail_cropping', // Validates with validate_setting_text_field.
 			)
 		);