woocommerce / woocommerce-rest-api

src/Server.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 *
 	 * @var array
 	 */
-	protected $controllers = [];
+	protected $controllers = [ ];
 
 	/**
 	 * Hook into WordPress ready to init the REST API as needed.

src/Controllers/Version4/Data.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 
 		foreach ( $resources as $resource ) {
 			$item   = $this->prepare_item_for_response( (object) $resource, $request );
-			$data[] = $this->prepare_response_for_collection( $item );
+			$data[ ] = $this->prepare_response_for_collection( $item );
 		}
 
 		return rest_ensure_response( $data );

src/Controllers/Version4/SystemStatusTools.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -572,7 +572,7 @@
 	protected function clear_sessions() {
 		global $wpdb;
 
-		$wpdb->query( "TRUNCATE {$wpdb->prefix}woocommerce_sessions" );
+		$wpdb->query( "truncate {$wpdb->prefix}woocommerce_sessions" );
 		$result = absint( $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE meta_key='_woocommerce_persistent_cart_" . get_current_blog_id() . "';" ) ); // WPCS: unprepared SQL ok.
 		wp_cache_flush();
 		/* translators: %d: amount of sessions */

Spacing +20 added lines, -20 removed lines

@@ -164,7 +164,7 @@ 
 
 		// Jetpack does the image resizing heavy lifting so you don't have to.
 		if ( ( class_exists( 'Jetpack' ) && Jetpack::is_module_active( 'photon' ) ) || ! apply_filters( 'woocommerce_background_image_regeneration', true ) ) {
-			unset( $tools['regenerate_thumbnails'] );
+			unset( $tools[ 'regenerate_thumbnails' ] );
 		}
 
 		return apply_filters( 'woocommerce_debug_tools', $tools );
@@ -179,13 +179,13 @@ 
 	public function get_items( $request ) {
 		$tools = array();
 		foreach ( $this->get_tools() as $id => $tool ) {
-			$tools[] = $this->prepare_response_for_collection(
+			$tools[ ] = $this->prepare_response_for_collection(
 				$this->prepare_item_for_response(
 					array(
 						'id'          => $id,
-						'name'        => $tool['name'],
-						'action'      => $tool['button'],
-						'description' => $tool['desc'],
+						'name'        => $tool[ 'name' ],
+						'action'      => $tool[ 'button' ],
+						'description' => $tool[ 'desc' ],
 					),
 					$request
 				)
@@ -204,17 +204,17 @@ 
 	 */
 	public function get_item( $request ) {
 		$tools = $this->get_tools();
-		if ( empty( $tools[ $request['id'] ] ) ) {
+		if ( empty( $tools[ $request[ 'id' ] ] ) ) {
 			return new \WP_Error( 'woocommerce_rest_system_status_tool_invalid_id', __( 'Invalid tool ID.', 'woocommerce-rest-api' ), array( 'status' => 404 ) );
 		}
-		$tool = $tools[ $request['id'] ];
+		$tool = $tools[ $request[ 'id' ] ];
 		return rest_ensure_response(
 			$this->prepare_item_for_response(
 				array(
-					'id'          => $request['id'],
-					'name'        => $tool['name'],
-					'action'      => $tool['button'],
-					'description' => $tool['desc'],
+					'id'          => $request[ 'id' ],
+					'name'        => $tool[ 'name' ],
+					'action'      => $tool[ 'button' ],
+					'description' => $tool[ 'desc' ],
 				),
 				$request
 			)
@@ -229,19 +229,19 @@ 
 	 */
 	public function update_item( $request ) {
 		$tools = $this->get_tools();
-		if ( empty( $tools[ $request['id'] ] ) ) {
+		if ( empty( $tools[ $request[ 'id' ] ] ) ) {
 			return new \WP_Error( 'woocommerce_rest_system_status_tool_invalid_id', __( 'Invalid tool ID.', 'woocommerce-rest-api' ), array( 'status' => 404 ) );
 		}
 
-		$tool = $tools[ $request['id'] ];
+		$tool = $tools[ $request[ 'id' ] ];
 		$tool = array(
-			'id'          => $request['id'],
-			'name'        => $tool['name'],
-			'action'      => $tool['button'],
-			'description' => $tool['desc'],
+			'id'          => $request[ 'id' ],
+			'name'        => $tool[ 'name' ],
+			'action'      => $tool[ 'button' ],
+			'description' => $tool[ 'desc' ],
 		);
 
-		$execute_return = $this->execute_tool( $request['id'] );
+		$execute_return = $this->execute_tool( $request[ 'id' ] );
 		$tool           = array_merge( $tool, $execute_return );
 
 		/**
@@ -330,7 +330,7 @@ 
 		$base  = '/' . $this->namespace . '/' . $this->rest_base;
 		$links = array(
 			'item' => array(
-				'href'       => rest_url( trailingslashit( $base ) . $item['id'] ),
+				'href'       => rest_url( trailingslashit( $base ) . $item[ 'id' ] ),
 				'embeddable' => true,
 			),
 		);
@@ -365,7 +365,7 @@ 
 				throw new Exception( __( 'There was an error calling this tool. There is no callback present.', 'woocommerce-rest-api' ) );
 			}
 
-			$callback = isset( $tools[ $tool ]['callback'] ) ? $tools[ $tool ]['callback'] : array( $this, $tool );
+			$callback = isset( $tools[ $tool ][ 'callback' ] ) ? $tools[ $tool ][ 'callback' ] : array( $this, $tool );
 
 			if ( ! is_callable( $callback ) ) {
 				throw new Exception( __( 'There was an error calling this tool. Invalid callback.', 'woocommerce-rest-api' ) );

src/Controllers/Version4/Requests/AbstractObjectRequest.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
 		if ( ! is_null( $meta_data ) ) {
 			foreach ( $meta_data as $meta ) {
-				$object->update_meta_data( $meta['key'], $meta['value'], isset( $meta['id'] ) ? $meta['id'] : '' );
+				$object->update_meta_data( $meta[ 'key' ], $meta[ 'value' ], isset( $meta[ 'id' ] ) ? $meta[ 'id' ] : '' );
 			}
 		}
 	}

src/Controllers/Version4/Requests/CustomerRequest.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 		];
 
 		$request_props = array_intersect_key( $this->request, array_flip( $props ) );
-		$prop_values   = [];
+		$prop_values   = [ ];
 
 		foreach ( $request_props as $prop => $value ) {
 			switch ( $prop ) {
@@ -94,7 +94,7 @@ 
 	 * @return array
 	 */
 	protected function parse_address_field( $data, $object, $type = 'billing' ) {
-		$address = [];
+		$address = [ ];
 		foreach ( $data as $key => $value ) {
 			if ( is_callable( array( $object, "set_{$type}_{$key}" ) ) ) {
 				$address[ "{$type}_{$key}" ] = $value;

src/Controllers/Version4/Requests/ProductVariationRequest.php

Spacing +16 added lines, -16 removed lines

@@ -77,22 +77,22 @@ 
 		];
 
 		$request_props = array_intersect_key( $this->request, array_flip( $props ) );
-		$prop_values   = [];
+		$prop_values   = [ ];
 
 		foreach ( $request_props as $prop => $value ) {
 			switch ( $prop ) {
 				case 'image':
-					$prop_values['image_id'] = $this->parse_image_field( $value, $object );
+					$prop_values[ 'image_id' ] = $this->parse_image_field( $value, $object );
 					break;
 				case 'attributes':
-					$prop_values['attributes'] = $this->parse_attributes_field( $value, $object );
+					$prop_values[ 'attributes' ] = $this->parse_attributes_field( $value, $object );
 					break;
 				case 'dimensions':
 					$dimensions  = $this->parse_dimensions_fields( $value );
 					$prop_values = array_merge( $prop_values, $dimensions );
 					break;
 				case 'shipping_class':
-					$prop_values['shipping_class_id'] = $this->parse_shipping_class( $value, $object );
+					$prop_values[ 'shipping_class_id' ] = $this->parse_shipping_class( $value, $object );
 					break;
 				default:
 					$prop_values[ $prop ] = $value;
@@ -120,11 +120,11 @@ 
 			$attribute_name = '';
 
 			// Check ID for global attributes or name for product attributes.
-			if ( ! empty( $attribute['id'] ) ) {
-				$attribute_id   = absint( $attribute['id'] );
+			if ( ! empty( $attribute[ 'id' ] ) ) {
+				$attribute_id   = absint( $attribute[ 'id' ] );
 				$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
-			} elseif ( ! empty( $attribute['name'] ) ) {
-				$attribute_name = sanitize_title( $attribute['name'] );
+			} elseif ( ! empty( $attribute[ 'name' ] ) ) {
+				$attribute_name = sanitize_title( $attribute[ 'name' ] );
 			}
 
 			if ( ! $attribute_id && ! $attribute_name ) {
@@ -136,7 +136,7 @@ 
 			}
 
 			$attribute_key   = sanitize_title( $parent_attributes[ $attribute_name ]->get_name() );
-			$attribute_value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
+			$attribute_value = isset( $attribute[ 'option' ] ) ? wc_clean( stripslashes( $attribute[ 'option' ] ) ) : '';
 
 			if ( $parent_attributes[ $attribute_name ]->is_taxonomy() ) {
 				// If dealing with a taxonomy, we need to get the slug from the name posted to the API.
@@ -168,19 +168,19 @@ 
 			return '';
 		}
 
-		$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
+		$attachment_id = isset( $image[ 'id' ] ) ? absint( $image[ 'id' ] ) : 0;
 		$attachment    = new ImageAttachment( $attachment_id, $object->get_id() );
 
-		if ( 0 === $attachment->id && ! empty( $image['src'] ) ) {
-			$attachment->upload_image_from_src( $image['src'] );
+		if ( 0 === $attachment->id && ! empty( $image[ 'src' ] ) ) {
+			$attachment->upload_image_from_src( $image[ 'src' ] );
 		}
 
-		if ( ! empty( $image['alt'] ) ) {
-			$attachment->update_alt_text( $image['alt'] );
+		if ( ! empty( $image[ 'alt' ] ) ) {
+			$attachment->update_alt_text( $image[ 'alt' ] );
 		}
 
-		if ( ! empty( $image['name'] ) ) {
-			$attachment->update_name( $image['name'] );
+		if ( ! empty( $image[ 'name' ] ) ) {
+			$attachment->update_name( $image[ 'name' ] );
 		}
 
 		return $attachment->id;

src/Controllers/Version4/Requests/ProductRequest.php

Spacing +48 added lines, -48 removed lines

@@ -129,7 +129,7 @@ 
 		];
 
 		$request_props = array_intersect_key( $this->request, array_flip( $props ) );
-		$prop_values   = [];
+		$prop_values   = [ ];
 
 		foreach ( $request_props as $prop => $value ) {
 			switch ( $prop ) {
@@ -146,20 +146,20 @@ 
 					$prop_values = array_merge( $prop_values, $images );
 					break;
 				case 'categories':
-					$prop_values['category_ids'] = wp_list_pluck( $value, 'id' );
+					$prop_values[ 'category_ids' ] = wp_list_pluck( $value, 'id' );
 					break;
 				case 'tags':
-					$prop_values['tag_ids'] = wp_list_pluck( $value, 'id' );
+					$prop_values[ 'tag_ids' ] = wp_list_pluck( $value, 'id' );
 					break;
 				case 'attributes':
-					$prop_values['attributes'] = $this->parse_attributes_field( $value );
+					$prop_values[ 'attributes' ] = $this->parse_attributes_field( $value );
 					break;
 				case 'dimensions':
 					$dimensions  = $this->parse_dimensions_fields( $value );
 					$prop_values = array_merge( $prop_values, $dimensions );
 					break;
 				case 'shipping_class':
-					$prop_values['shipping_class_id'] = $this->parse_shipping_class( $value, $object );
+					$prop_values[ 'shipping_class_id' ] = $this->parse_shipping_class( $value, $object );
 					break;
 				default:
 					$prop_values[ $prop ] = $value;
@@ -248,34 +248,34 @@ 
 		$attributes = array();
 
 		foreach ( $raw_attributes as $attribute ) {
-			if ( ! empty( $attribute['id'] ) ) {
-				$attribute_id   = absint( $attribute['id'] );
+			if ( ! empty( $attribute[ 'id' ] ) ) {
+				$attribute_id   = absint( $attribute[ 'id' ] );
 				$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
-			} elseif ( ! empty( $attribute['name'] ) ) {
+			} elseif ( ! empty( $attribute[ 'name' ] ) ) {
 				$attribute_id   = 0;
-				$attribute_name = wc_clean( $attribute['name'] );
+				$attribute_name = wc_clean( $attribute[ 'name' ] );
 			}
 
-			if ( ! $attribute_name || ! isset( $attribute['options'] ) ) {
+			if ( ! $attribute_name || ! isset( $attribute[ 'options' ] ) ) {
 				continue;
 			}
 
-			if ( ! is_array( $attribute['options'] ) ) {
-				$attribute['options'] = explode( \WC_DELIMITER, $attribute['options'] );
+			if ( ! is_array( $attribute[ 'options' ] ) ) {
+				$attribute[ 'options' ] = explode( \WC_DELIMITER, $attribute[ 'options' ] );
 			}
 
 			if ( $attribute_id ) {
-				$attribute['options'] = array_filter( array_map( 'wc_sanitize_term_text_based', $attribute['options'] ), 'strlen' );
+				$attribute[ 'options' ] = array_filter( array_map( 'wc_sanitize_term_text_based', $attribute[ 'options' ] ), 'strlen' );
 			}
 
 			$attribute_object = new \WC_Product_Attribute();
 			$attribute_object->set_id( $attribute_id );
 			$attribute_object->set_name( $attribute_name );
-			$attribute_object->set_options( $attribute['options'] );
-			$attribute_object->set_position( isset( $attribute['position'] ) ? (string) absint( $attribute['position'] ) : '0' );
-			$attribute_object->set_visible( ! empty( $attribute['visible'] ) ? 1 : 0 );
-			$attribute_object->set_variation( ! empty( $attribute['variation'] ) ? 1 : 0 );
-			$attributes[] = $attribute_object;
+			$attribute_object->set_options( $attribute[ 'options' ] );
+			$attribute_object->set_position( isset( $attribute[ 'position' ] ) ? (string) absint( $attribute[ 'position' ] ) : '0' );
+			$attribute_object->set_visible( ! empty( $attribute[ 'visible' ] ) ? 1 : 0 );
+			$attribute_object->set_variation( ! empty( $attribute[ 'variation' ] ) ? 1 : 0 );
+			$attributes[ ] = $attribute_object;
 		}
 		return $attributes;
 	}
@@ -291,35 +291,35 @@ 
 	protected function parse_images_field( $images, $object ) {
 		$response = [
 			'image_id'          => '',
-			'gallery_image_ids' => [],
+			'gallery_image_ids' => [ ],
 		];
 
-		$images = is_array( $images ) ? array_filter( $images ) : [];
+		$images = is_array( $images ) ? array_filter( $images ) : [ ];
 
 		if ( empty( $images ) ) {
 			return $response;
 		}
 
 		foreach ( $images as $index => $image ) {
-			$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
+			$attachment_id = isset( $image[ 'id' ] ) ? absint( $image[ 'id' ] ) : 0;
 			$attachment    = new ImageAttachment( $attachment_id, $object->get_id() );
 
-			if ( 0 === $attachment->id && ! empty( $image['src'] ) ) {
-				$attachment->upload_image_from_src( $image['src'] );
+			if ( 0 === $attachment->id && ! empty( $image[ 'src' ] ) ) {
+				$attachment->upload_image_from_src( $image[ 'src' ] );
 			}
 
-			if ( ! empty( $image['alt'] ) ) {
-				$attachment->update_alt_text( $image['alt'] );
+			if ( ! empty( $image[ 'alt' ] ) ) {
+				$attachment->update_alt_text( $image[ 'alt' ] );
 			}
 
-			if ( ! empty( $image['name'] ) ) {
-				$attachment->update_name( $image['name'] );
+			if ( ! empty( $image[ 'name' ] ) ) {
+				$attachment->update_name( $image[ 'name' ] );
 			}
 
 			if ( 0 === $index ) {
-				$response['image_id'] = $attachment->id;
+				$response[ 'image_id' ] = $attachment->id;
 			} else {
-				$response['gallery_image_ids'][] = $attachment->id;
+				$response[ 'gallery_image_ids' ][ ] = $attachment->id;
 			}
 		}
 
@@ -333,18 +333,18 @@ 
 	 * @return array
 	 */
 	protected function parse_dimensions_fields( $dimensions ) {
-		$response = [];
+		$response = [ ];
 
-		if ( isset( $dimensions['length'] ) ) {
-			$response['length'] = $dimensions['length'];
+		if ( isset( $dimensions[ 'length' ] ) ) {
+			$response[ 'length' ] = $dimensions[ 'length' ];
 		}
 
-		if ( isset( $dimensions['width'] ) ) {
-			$response['width'] = $dimensions['width'];
+		if ( isset( $dimensions[ 'width' ] ) ) {
+			$response[ 'width' ] = $dimensions[ 'width' ];
 		}
 
-		if ( isset( $dimensions['height'] ) ) {
-			$response['height'] = $dimensions['height'];
+		if ( isset( $dimensions[ 'height' ] ) ) {
+			$response[ 'height' ] = $dimensions[ 'height' ];
 		}
 
 		return $response;
@@ -371,15 +371,15 @@ 
 	protected function parse_downloads_field( $downloads ) {
 		$files = array();
 		foreach ( $downloads as $key => $file ) {
-			if ( empty( $file['file'] ) ) {
+			if ( empty( $file[ 'file' ] ) ) {
 				continue;
 			}
 
 			$download = new \WC_Product_Download();
-			$download->set_id( ! empty( $file['id'] ) ? $file['id'] : wp_generate_uuid4() );
-			$download->set_name( $file['name'] ? $file['name'] : wc_get_filename_from_url( $file['file'] ) );
-			$download->set_file( $file['file'] );
-			$files[] = $download;
+			$download->set_id( ! empty( $file[ 'id' ] ) ? $file[ 'id' ] : wp_generate_uuid4() );
+			$download->set_name( $file[ 'name' ] ? $file[ 'name' ] : wc_get_filename_from_url( $file[ 'file' ] ) );
+			$download->set_file( $file[ 'file' ] );
+			$files[ ] = $download;
 		}
 		return $files;
 	}
@@ -400,11 +400,11 @@ 
 			$attribute_name = '';
 
 			// Check ID for global attributes or name for product attributes.
-			if ( ! empty( $attribute['id'] ) ) {
-				$attribute_id   = absint( $attribute['id'] );
+			if ( ! empty( $attribute[ 'id' ] ) ) {
+				$attribute_id   = absint( $attribute[ 'id' ] );
 				$attribute_name = wc_attribute_taxonomy_name_by_id( $attribute_id );
-			} elseif ( ! empty( $attribute['name'] ) ) {
-				$attribute_name = sanitize_title( $attribute['name'] );
+			} elseif ( ! empty( $attribute[ 'name' ] ) ) {
+				$attribute_name = sanitize_title( $attribute[ 'name' ] );
 			}
 
 			if ( ! $attribute_id && ! $attribute_name ) {
@@ -414,10 +414,10 @@ 
 			if ( isset( $attributes[ $attribute_name ] ) ) {
 				$_attribute = $attributes[ $attribute_name ];
 
-				if ( $_attribute['is_variation'] ) {
-					$value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
+				if ( $_attribute[ 'is_variation' ] ) {
+					$value = isset( $attribute[ 'option' ] ) ? wc_clean( stripslashes( $attribute[ 'option' ] ) ) : '';
 
-					if ( ! empty( $_attribute['is_taxonomy'] ) ) {
+					if ( ! empty( $_attribute[ 'is_taxonomy' ] ) ) {
 						// If dealing with a taxonomy, we need to get the slug from the name posted to the API.
 						$term = get_term_by( 'name', $value, $attribute_name );
 

src/Controllers/Version4/ProductCategories.php

Spacing +13 added lines, -13 removed lines

@@ -56,7 +56,7 @@ 
 		if ( $image_id ) {
 			$attachment = get_post( $image_id );
 
-			$data['image'] = array(
+			$data[ 'image' ] = array(
 				'id'                => (int) $image_id,
 				'date_created'      => wc_rest_prepare_date_response( $attachment->post_date ),
 				'date_created_gmt'  => wc_rest_prepare_date_response( $attachment->post_date_gmt ),
@@ -82,17 +82,17 @@ 
 	protected function update_term_meta_fields( $term, $request ) {
 		$id = (int) $term->term_id;
 
-		if ( isset( $request['display'] ) ) {
-			update_term_meta( $id, 'display_type', 'default' === $request['display'] ? '' : $request['display'] );
+		if ( isset( $request[ 'display' ] ) ) {
+			update_term_meta( $id, 'display_type', 'default' === $request[ 'display' ] ? '' : $request[ 'display' ] );
 		}
 
-		if ( isset( $request['menu_order'] ) ) {
-			update_term_meta( $id, 'order', $request['menu_order'] );
+		if ( isset( $request[ 'menu_order' ] ) ) {
+			update_term_meta( $id, 'order', $request[ 'menu_order' ] );
 		}
 
-		if ( isset( $request['image'] ) ) {
-			if ( empty( $request['image']['id'] ) && ! empty( $request['image']['src'] ) ) {
-				$upload = wc_rest_upload_image_from_url( esc_url_raw( $request['image']['src'] ) );
+		if ( isset( $request[ 'image' ] ) ) {
+			if ( empty( $request[ 'image' ][ 'id' ] ) && ! empty( $request[ 'image' ][ 'src' ] ) ) {
+				$upload = wc_rest_upload_image_from_url( esc_url_raw( $request[ 'image' ][ 'src' ] ) );
 
 				if ( is_wp_error( $upload ) ) {
 					return $upload;
@@ -100,7 +100,7 @@ 
 
 				$image_id = wc_rest_set_uploaded_image_as_attachment( $upload );
 			} else {
-				$image_id = isset( $request['image']['id'] ) ? absint( $request['image']['id'] ) : 0;
+				$image_id = isset( $request[ 'image' ][ 'id' ] ) ? absint( $request[ 'image' ][ 'id' ] ) : 0;
 			}
 
 			// Check if image_id is a valid image attachment before updating the term meta.
@@ -108,16 +108,16 @@ 
 				update_term_meta( $id, 'thumbnail_id', $image_id );
 
 				// Set the image alt.
-				if ( ! empty( $request['image']['alt'] ) ) {
-					update_post_meta( $image_id, '_wp_attachment_image_alt', wc_clean( $request['image']['alt'] ) );
+				if ( ! empty( $request[ 'image' ][ 'alt' ] ) ) {
+					update_post_meta( $image_id, '_wp_attachment_image_alt', wc_clean( $request[ 'image' ][ 'alt' ] ) );
 				}
 
 				// Set the image title.
-				if ( ! empty( $request['image']['name'] ) ) {
+				if ( ! empty( $request[ 'image' ][ 'name' ] ) ) {
 					wp_update_post(
 						array(
 							'ID'         => $image_id,
-							'post_title' => wc_clean( $request['image']['name'] ),
+							'post_title' => wc_clean( $request[ 'image' ][ 'name' ] ),
 						)
 					);
 				}

src/Controllers/Version4/Settings.php

Spacing +6 added lines, -6 removed lines

@@ -83,19 +83,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;
 			}
 		}
 
@@ -114,7 +114,7 @@ 
 		$base  = '/' . $this->namespace . '/' . $this->rest_base;
 		$links = array(
 			'options' => array(
-				'href' => rest_url( trailingslashit( $base ) . $item['id'] ),
+				'href' => rest_url( trailingslashit( $base ) . $item[ 'id' ] ),
 			),
 		);