Completed
Pull Request — trunk (#541)
by Justin
40:31 queued 37:55
created
includes/shim/WP_REST_Controller.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 		}
167 167
 
168 168
 		if ( ! empty( $links ) ) {
169
-			$data['_links'] = $links;
169
+			$data[ '_links' ] = $links;
170 170
 		}
171 171
 
172 172
 		return $data;
@@ -183,21 +183,21 @@  discard block
 block discarded – undo
183 183
 
184 184
 		$schema = $this->get_item_schema();
185 185
 		foreach ( $data as $key => $value ) {
186
-			if ( empty( $schema['properties'][ $key ] ) || empty( $schema['properties'][ $key ]['context'] ) ) {
186
+			if ( empty( $schema[ 'properties' ][ $key ] ) || empty( $schema[ 'properties' ][ $key ][ 'context' ] ) ) {
187 187
 				continue;
188 188
 			}
189 189
 
190
-			if ( ! in_array( $context, $schema['properties'][ $key ]['context'] ) ) {
190
+			if ( ! in_array( $context, $schema[ 'properties' ][ $key ][ 'context' ] ) ) {
191 191
 				unset( $data[ $key ] );
192 192
 				continue;
193 193
 			}
194 194
 
195
-			if ( 'object' === $schema['properties'][ $key ]['type'] && ! empty( $schema['properties'][ $key ]['properties'] ) ) {
196
-				foreach ( $schema['properties'][ $key ]['properties'] as $attribute => $details ) {
197
-					if ( empty( $details['context'] ) ) {
195
+			if ( 'object' === $schema[ 'properties' ][ $key ][ 'type' ] && ! empty( $schema[ 'properties' ][ $key ][ 'properties' ] ) ) {
196
+				foreach ( $schema[ 'properties' ][ $key ][ 'properties' ] as $attribute => $details ) {
197
+					if ( empty( $details[ 'context' ] ) ) {
198 198
 						continue;
199 199
 					}
200
-					if ( ! in_array( $context, $details['context'] ) ) {
200
+					if ( ! in_array( $context, $details[ 'context' ] ) ) {
201 201
 						if ( isset( $data[ $key ][ $attribute ] ) ) {
202 202
 							unset( $data[ $key ][ $attribute ] );
203 203
 						}
@@ -227,9 +227,9 @@  discard block
 block discarded – undo
227 227
 
228 228
 		$schema = $this->get_item_schema();
229 229
 
230
-		foreach ( $schema['properties'] as &$property ) {
231
-			if ( isset( $property['arg_options'] ) ) {
232
-				unset( $property['arg_options'] );
230
+		foreach ( $schema[ 'properties' ] as &$property ) {
231
+			if ( isset( $property[ 'arg_options' ] ) ) {
232
+				unset( $property[ 'arg_options' ] );
233 233
 			}
234 234
 		}
235 235
 
@@ -286,18 +286,18 @@  discard block
 block discarded – undo
286 286
 			'validate_callback'  => 'rest_validate_request_arg',
287 287
 		);
288 288
 		$schema = $this->get_item_schema();
289
-		if ( empty( $schema['properties'] ) ) {
289
+		if ( empty( $schema[ 'properties' ] ) ) {
290 290
 			return array_merge( $param_details, $args );
291 291
 		}
292 292
 		$contexts = array();
293
-		foreach ( $schema['properties'] as $attributes ) {
294
-			if ( ! empty( $attributes['context'] ) ) {
295
-				$contexts = array_merge( $contexts, $attributes['context'] );
293
+		foreach ( $schema[ 'properties' ] as $attributes ) {
294
+			if ( ! empty( $attributes[ 'context' ] ) ) {
295
+				$contexts = array_merge( $contexts, $attributes[ 'context' ] );
296 296
 			}
297 297
 		}
298 298
 		if ( ! empty( $contexts ) ) {
299
-			$param_details['enum'] = array_unique( $contexts );
300
-			rsort( $param_details['enum'] );
299
+			$param_details[ 'enum' ] = array_unique( $contexts );
300
+			rsort( $param_details[ 'enum' ] );
301 301
 		}
302 302
 		return array_merge( $param_details, $args );
303 303
 	}
@@ -315,11 +315,11 @@  discard block
 block discarded – undo
315 315
 
316 316
 		foreach ( $additional_fields as $field_name => $field_options ) {
317 317
 
318
-			if ( ! $field_options['get_callback'] ) {
318
+			if ( ! $field_options[ 'get_callback' ] ) {
319 319
 				continue;
320 320
 			}
321 321
 
322
-			$object[ $field_name ] = call_user_func( $field_options['get_callback'], $object, $field_name, $request, $this->get_object_type() );
322
+			$object[ $field_name ] = call_user_func( $field_options[ 'get_callback' ], $object, $field_name, $request, $this->get_object_type() );
323 323
 		}
324 324
 
325 325
 		return $object;
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 
338 338
 		foreach ( $additional_fields as $field_name => $field_options ) {
339 339
 
340
-			if ( ! $field_options['update_callback'] ) {
340
+			if ( ! $field_options[ 'update_callback' ] ) {
341 341
 				continue;
342 342
 			}
343 343
 
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 				continue;
347 347
 			}
348 348
 
349
-			call_user_func( $field_options['update_callback'], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() );
349
+			call_user_func( $field_options[ 'update_callback' ], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() );
350 350
 		}
351 351
 	}
352 352
 
@@ -358,23 +358,23 @@  discard block
 block discarded – undo
358 358
 	 * @param array $schema Schema array.
359 359
 	 */
360 360
 	protected function add_additional_fields_schema( $schema ) {
361
-		if ( empty( $schema['title'] ) ) {
361
+		if ( empty( $schema[ 'title' ] ) ) {
362 362
 			return $schema;
363 363
 		}
364 364
 
365 365
 		/**
366 366
 		 * Can't use $this->get_object_type otherwise we cause an inf loop.
367 367
 		 */
368
-		$object_type = $schema['title'];
368
+		$object_type = $schema[ 'title' ];
369 369
 
370 370
 		$additional_fields = $this->get_additional_fields( $object_type );
371 371
 
372 372
 		foreach ( $additional_fields as $field_name => $field_options ) {
373
-			if ( ! $field_options['schema'] ) {
373
+			if ( ! $field_options[ 'schema' ] ) {
374 374
 				continue;
375 375
 			}
376 376
 
377
-			$schema['properties'][ $field_name ] = $field_options['schema'];
377
+			$schema[ 'properties' ][ $field_name ] = $field_options[ 'schema' ];
378 378
 		}
379 379
 
380 380
 		return $schema;
@@ -413,11 +413,11 @@  discard block
 block discarded – undo
413 413
 	protected function get_object_type() {
414 414
 		$schema = $this->get_item_schema();
415 415
 
416
-		if ( ! $schema || ! isset( $schema['title'] ) ) {
416
+		if ( ! $schema || ! isset( $schema[ 'title' ] ) ) {
417 417
 			return null;
418 418
 		}
419 419
 
420
-		return $schema['title'];
420
+		return $schema[ 'title' ];
421 421
 	}
422 422
 
423 423
 	/**
@@ -433,13 +433,13 @@  discard block
 block discarded – undo
433 433
 	public function get_endpoint_args_for_item_schema( $method = WP_REST_Server::CREATABLE ) {
434 434
 
435 435
 		$schema                = $this->get_item_schema();
436
-		$schema_properties     = ! empty( $schema['properties'] ) ? $schema['properties'] : array();
436
+		$schema_properties     = ! empty( $schema[ 'properties' ] ) ? $schema[ 'properties' ] : array();
437 437
 		$endpoint_args = array();
438 438
 
439 439
 		foreach ( $schema_properties as $field_id => $params ) {
440 440
 
441 441
 			// Arguments specified as `readonly` are not allowed to be set.
442
-			if ( ! empty( $params['readonly'] ) ) {
442
+			if ( ! empty( $params[ 'readonly' ] ) ) {
443 443
 				continue;
444 444
 			}
445 445
 
@@ -448,16 +448,16 @@  discard block
 block discarded – undo
448 448
 				'sanitize_callback' => 'rest_sanitize_request_arg',
449 449
 			);
450 450
 
451
-			if ( isset( $params['description'] ) ) {
452
-				$endpoint_args[ $field_id ]['description'] = $params['description'];
451
+			if ( isset( $params[ 'description' ] ) ) {
452
+				$endpoint_args[ $field_id ][ 'description' ] = $params[ 'description' ];
453 453
 			}
454 454
 
455
-			if ( WP_REST_Server::CREATABLE === $method && isset( $params['default'] ) ) {
456
-				$endpoint_args[ $field_id ]['default'] = $params['default'];
455
+			if ( WP_REST_Server::CREATABLE === $method && isset( $params[ 'default' ] ) ) {
456
+				$endpoint_args[ $field_id ][ 'default' ] = $params[ 'default' ];
457 457
 			}
458 458
 
459
-			if ( WP_REST_Server::CREATABLE === $method && ! empty( $params['required'] ) ) {
460
-				$endpoint_args[ $field_id ]['required'] = true;
459
+			if ( WP_REST_Server::CREATABLE === $method && ! empty( $params[ 'required' ] ) ) {
460
+				$endpoint_args[ $field_id ][ 'required' ] = true;
461 461
 			}
462 462
 
463 463
 			foreach ( array( 'type', 'format', 'enum' ) as $schema_prop ) {
@@ -467,14 +467,14 @@  discard block
 block discarded – undo
467 467
 			}
468 468
 
469 469
 			// Merge in any options provided by the schema property.
470
-			if ( isset( $params['arg_options'] ) ) {
470
+			if ( isset( $params[ 'arg_options' ] ) ) {
471 471
 
472 472
 				// Only use required / default from arg_options on CREATABLE endpoints.
473 473
 				if ( WP_REST_Server::CREATABLE !== $method ) {
474
-					$params['arg_options'] = array_diff_key( $params['arg_options'], array( 'required' => '', 'default' => '' ) );
474
+					$params[ 'arg_options' ] = array_diff_key( $params[ 'arg_options' ], array( 'required' => '', 'default' => '' ) );
475 475
 				}
476 476
 
477
-				$endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params['arg_options'] );
477
+				$endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params[ 'arg_options' ] );
478 478
 			}
479 479
 		}
480 480
 
Please login to merge, or discard this patch.
includes/rest-api/CMB2_REST.php 2 patches
Doc Comments   +7 added lines, -6 removed lines patch added patch discarded remove patch
@@ -197,6 +197,7 @@  discard block
 block discarded – undo
197 197
 	 * @param string|array $object_types Object(s) the field is being registered
198 198
 	 *                                   to, "post"|"term"|"comment" etc.
199 199
 	 * @param string $object_types       Canonical object type for callbacks.
200
+	 * @param string $object_type
200 201
 	 *
201 202
 	 * @return void
202 203
 	 */
@@ -391,7 +392,7 @@  discard block
 block discarded – undo
391 392
 	 *
392 393
 	 * @since  2.2.4
393 394
 	 *
394
-	 * @param  mixed           $value       The value of the field
395
+	 * @param  mixed           $values       The value of the field
395 396
 	 * @param  object          $object      The object from the response
396 397
 	 * @param  string          $field_name  Name of field
397 398
 	 * @param  WP_REST_Request $request     Current request
@@ -410,7 +411,7 @@  discard block
 block discarded – undo
410 411
 	 *
411 412
 	 * @since  2.2.4
412 413
 	 *
413
-	 * @param  mixed           $value       The value of the field
414
+	 * @param  mixed           $values       The value of the field
414 415
 	 * @param  object          $object      The object from the response
415 416
 	 * @param  string          $field_name  Name of field
416 417
 	 * @param  WP_REST_Request $request     Current request
@@ -429,7 +430,7 @@  discard block
 block discarded – undo
429 430
 	 *
430 431
 	 * @since  2.2.4
431 432
 	 *
432
-	 * @param  mixed           $value       The value of the field
433
+	 * @param  mixed           $values       The value of the field
433 434
 	 * @param  object          $object      The object from the response
434 435
 	 * @param  string          $field_name  Name of field
435 436
 	 * @param  WP_REST_Request $request     Current request
@@ -448,7 +449,7 @@  discard block
 block discarded – undo
448 449
 	 *
449 450
 	 * @since  2.2.4
450 451
 	 *
451
-	 * @param  mixed           $value       The value of the field
452
+	 * @param  mixed           $values       The value of the field
452 453
 	 * @param  object          $object      The object from the response
453 454
 	 * @param  string          $field_name  Name of field
454 455
 	 * @param  WP_REST_Request $request     Current request
@@ -467,7 +468,7 @@  discard block
 block discarded – undo
467 468
 	 *
468 469
 	 * @since  2.2.4
469 470
 	 *
470
-	 * @param  mixed           $value            The value of the field
471
+	 * @param  mixed           $values            The value of the field
471 472
 	 * @param  object          $object           The object from the response
472 473
 	 * @param  WP_REST_Request $request          Current request
473 474
 	 * @param  string          $object_type      The request object type
@@ -665,7 +666,7 @@  discard block
 block discarded – undo
665 666
 	 * Retrieve all CMB2_REST instances from the registry.
666 667
 	 *
667 668
 	 * @since  2.2.4
668
-	 * @return CMB2[] Array of all registered CMB2_REST instances.
669
+	 * @return CMB2_REST[] Array of all registered CMB2_REST instances.
669 670
 	 */
670 671
 	public static function get_all() {
671 672
 		return self::$boxes;
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -143,30 +143,30 @@  discard block
 block discarded – undo
143 143
 		foreach ( self::$boxes as $cmb_id => $rest_box ) {
144 144
 			$types = array_flip( $rest_box->cmb->box_types() );
145 145
 
146
-			if ( isset( $types['user'] ) ) {
147
-				unset( $types['user'] );
148
-				self::$type_boxes['user'][ $cmb_id ] = $cmb_id;
146
+			if ( isset( $types[ 'user' ] ) ) {
147
+				unset( $types[ 'user' ] );
148
+				self::$type_boxes[ 'user' ][ $cmb_id ] = $cmb_id;
149 149
 			}
150 150
 
151
-			if ( isset( $types['comment'] ) ) {
152
-				unset( $types['comment'] );
153
-				self::$type_boxes['comment'][ $cmb_id ] = $cmb_id;
151
+			if ( isset( $types[ 'comment' ] ) ) {
152
+				unset( $types[ 'comment' ] );
153
+				self::$type_boxes[ 'comment' ][ $cmb_id ] = $cmb_id;
154 154
 			}
155 155
 
156
-			if ( isset( $types['term'] ) ) {
157
-				unset( $types['term'] );
156
+			if ( isset( $types[ 'term' ] ) ) {
157
+				unset( $types[ 'term' ] );
158 158
 
159 159
 				$taxonomies = array_merge(
160 160
 					$taxonomies,
161 161
 					CMB2_Utils::ensure_array( $rest_box->cmb->prop( 'taxonomies' ) )
162 162
 				);
163 163
 
164
-				self::$type_boxes['term'][ $cmb_id ] = $cmb_id;
164
+				self::$type_boxes[ 'term' ][ $cmb_id ] = $cmb_id;
165 165
 			}
166 166
 
167 167
 			if ( ! empty( $types ) ) {
168 168
 				$alltypes = array_merge( $alltypes, array_flip( $types ) );
169
-				self::$type_boxes['post'][ $cmb_id ] = $cmb_id;
169
+				self::$type_boxes[ 'post' ][ $cmb_id ] = $cmb_id;
170 170
 			}
171 171
 		}
172 172
 
@@ -176,15 +176,15 @@  discard block
 block discarded – undo
176 176
 			self::register_rest_field( $alltypes, 'post' );
177 177
 		}
178 178
 
179
-		if ( ! empty( self::$type_boxes['user'] ) ) {
179
+		if ( ! empty( self::$type_boxes[ 'user' ] ) ) {
180 180
 			self::register_rest_field( 'user', 'user' );
181 181
 		}
182 182
 
183
-		if ( ! empty( self::$type_boxes['comment'] ) ) {
183
+		if ( ! empty( self::$type_boxes[ 'comment' ] ) ) {
184 184
 			self::register_rest_field( 'comment', 'comment' );
185 185
 		}
186 186
 
187
-		if ( ! empty( self::$type_boxes['term'] ) ) {
187
+		if ( ! empty( self::$type_boxes[ 'term' ] ) ) {
188 188
 			self::register_rest_field( $taxonomies, 'term' );
189 189
 		}
190 190
 	}
@@ -217,18 +217,18 @@  discard block
 block discarded – undo
217 217
 	 */
218 218
 	protected function declare_read_edit_fields() {
219 219
 		foreach ( $this->cmb->prop( 'fields' ) as $field ) {
220
-			$show_in_rest = isset( $field['show_in_rest'] ) ? $field['show_in_rest'] : null;
220
+			$show_in_rest = isset( $field[ 'show_in_rest' ] ) ? $field[ 'show_in_rest' ] : null;
221 221
 
222 222
 			if ( false === $show_in_rest ) {
223 223
 				continue;
224 224
 			}
225 225
 
226 226
 			if ( $this->can_read( $show_in_rest ) ) {
227
-				$this->read_fields[] = $field['id'];
227
+				$this->read_fields[ ] = $field[ 'id' ];
228 228
 			}
229 229
 
230 230
 			if ( $this->can_edit( $show_in_rest ) ) {
231
-				$this->edit_fields[] = $field['id'];
231
+				$this->edit_fields[ ] = $field[ 'id' ];
232 232
 			}
233 233
 
234 234
 		}
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 	 * @return mixed
360 360
 	 */
361 361
 	protected static function get_rest_values( $object, $request, $object_type, $main_object_type = 'post' ) {
362
-		if ( ! isset( $object['id'] ) ) {
362
+		if ( ! isset( $object[ 'id' ] ) ) {
363 363
 			return;
364 364
 		}
365 365
 
@@ -370,12 +370,12 @@  discard block
 block discarded – undo
370 370
 				$rest_box = self::$boxes[ $cmb_id ];
371 371
 
372 372
 				foreach ( $rest_box->read_fields as $field_id ) {
373
-					$rest_box->cmb->object_id( $object['id'] );
373
+					$rest_box->cmb->object_id( $object[ 'id' ] );
374 374
 					$rest_box->cmb->object_type( $main_object_type );
375 375
 
376 376
 					$field = $rest_box->cmb->get_field( $field_id );
377 377
 
378
-					$field->object_id( $object['id'] );
378
+					$field->object_id( $object[ 'id' ] );
379 379
 					$field->object_type( $main_object_type );
380 380
 
381 381
 					$values[ $cmb_id ][ $field->id( true ) ] = $field->get_data();
@@ -609,8 +609,8 @@  discard block
 block discarded – undo
609 609
 					return intval( $object->comment_ID );
610 610
 				}
611 611
 			case 'term':
612
-				if ( is_array( $object ) && isset( $object['term_id'] ) ) {
613
-					return intval( $object['term_id'] );
612
+				if ( is_array( $object ) && isset( $object[ 'term_id' ] ) ) {
613
+					return intval( $object[ 'term_id' ] );
614 614
 				} elseif ( isset( $object->term_id ) ) {
615 615
 					return intval( $object->term_id );
616 616
 				}
Please login to merge, or discard this patch.
includes/rest-api/CMB2_REST_Controller.php 2 patches
Doc Comments   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -142,7 +142,6 @@  discard block
 block discarded – undo
142 142
 	 *
143 143
 	 * @since 2.2.4
144 144
 	 *
145
-	 * @param  mixed $data
146 145
 	 * @return array $data
147 146
 	 */
148 147
 	public function prepare_item( $post ) {
@@ -155,7 +154,7 @@  discard block
 block discarded – undo
155 154
 	 * @since  2.2.4
156 155
 	 *
157 156
 	 * @param  mixed $cb Callable function/method.
158
-	 * @return mixed     Results of output buffer after calling function/method.
157
+	 * @return string     Results of output buffer after calling function/method.
159 158
 	 */
160 159
 	public function get_cb_results( $cb ) {
161 160
 		$args = func_get_args();
@@ -171,7 +170,6 @@  discard block
 block discarded – undo
171 170
 	 *
172 171
 	 * @since 2.2.4
173 172
 	 *
174
-	 * @param  mixed            $item     WordPress representation of the item.
175 173
 	 * @param  WP_REST_Request  $request  Request object.
176 174
 	 * @return WP_REST_Response $response
177 175
 	 */
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	 * @return WP_REST_Response $response
227 227
 	 */
228 228
 	public function prepare_item_for_response( $data, $request = null ) {
229
-		$data = $this->filter_response_by_context( $data, $this->request['context'] );
229
+		$data = $this->filter_response_by_context( $data, $this->request[ 'context' ] );
230 230
 
231 231
 		/**
232 232
 		 * Filter the prepared CMB2 item response.
@@ -297,12 +297,12 @@  discard block
 block discarded – undo
297 297
 
298 298
 		} else {
299 299
 
300
-			if ( isset( $this->request['object_id'] ) ) {
301
-				$this->rest_box->cmb->object_id( sanitize_text_field( $this->request['object_id'] ) );
300
+			if ( isset( $this->request[ 'object_id' ] ) ) {
301
+				$this->rest_box->cmb->object_id( sanitize_text_field( $this->request[ 'object_id' ] ) );
302 302
 			}
303 303
 
304
-			if ( isset( $this->request['object_type'] ) ) {
305
-				$this->rest_box->cmb->object_type( sanitize_text_field( $this->request['object_type'] ) );
304
+			if ( isset( $this->request[ 'object_type' ] ) ) {
305
+				$this->rest_box->cmb->object_type( sanitize_text_field( $this->request[ 'object_type' ] ) );
306 306
 			}
307 307
 		}
308 308
 	}
@@ -320,8 +320,8 @@  discard block
 block discarded – undo
320 320
 	public function initiate_request( $request, $request_type ) {
321 321
 		$this->request = $request;
322 322
 
323
-		if ( ! isset( $this->request['context'] ) || empty( $this->request['context'] ) ) {
324
-			$this->request['context'] = 'view';
323
+		if ( ! isset( $this->request[ 'context' ] ) || empty( $this->request[ 'context' ] ) ) {
324
+			$this->request[ 'context' ] = 'view';
325 325
 		}
326 326
 
327 327
 		if ( ! self::$request_type ) {
Please login to merge, or discard this patch.
includes/rest-api/CMB2_REST_Controller_Boxes.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 		foreach ( $boxes as $this->rest_box ) {
89 89
 			if ( $this->rest_box->rest_read ) {
90 90
 				$rest_box = $this->get_rest_box();
91
-				$boxes_data[] = $this->server->response_to_data( $rest_box, isset( $this->request['_embed'] ) );
91
+				$boxes_data[ ] = $this->server->response_to_data( $rest_box, isset( $this->request[ '_embed' ] ) );
92 92
 			}
93 93
 		}
94 94
 
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
 
126 126
 		$boxes_data = $cmb->meta_box;
127 127
 
128
-		if ( isset( $this->request['_rendered'] ) && $this->namespace_base !== CMB2_REST_Controller::get_intial_route() ) {
129
-			$boxes_data['form_open'] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
130
-			$boxes_data['form_close'] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
128
+		if ( isset( $this->request[ '_rendered' ] ) && $this->namespace_base !== CMB2_REST_Controller::get_intial_route() ) {
129
+			$boxes_data[ 'form_open' ] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
130
+			$boxes_data[ 'form_close' ] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
131 131
 
132 132
 			global $wp_scripts, $wp_styles;
133 133
 			$before_css = $wp_styles->queue;
@@ -135,15 +135,15 @@  discard block
 block discarded – undo
135 135
 
136 136
 			CMB2_JS::enqueue();
137 137
 
138
-			$boxes_data['js_dependencies'] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
139
-			$boxes_data['css_dependencies'] = array_values( array_diff( $wp_styles->queue, $before_css ) );
138
+			$boxes_data[ 'js_dependencies' ] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
139
+			$boxes_data[ 'css_dependencies' ] = array_values( array_diff( $wp_styles->queue, $before_css ) );
140 140
 		}
141 141
 
142 142
 		// TODO: look into 'embed' parameter.
143 143
 		// http://demo.wp-api.org/wp-json/wp/v2/posts?_embed
144
-		unset( $boxes_data['fields'] );
144
+		unset( $boxes_data[ 'fields' ] );
145 145
 		// Handle callable properties.
146
-		unset( $boxes_data['show_on_cb'] );
146
+		unset( $boxes_data[ 'show_on_cb' ] );
147 147
 
148 148
 		$response = rest_ensure_response( $boxes_data );
149 149
 
Please login to merge, or discard this patch.
includes/rest-api/CMB2_REST_Controller_Fields.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 		) );
50 50
 
51 51
 		$delete_args = $args;
52
-		$delete_args['object_id']['required'] = true;
53
-		$delete_args['object_type']['required'] = true;
52
+		$delete_args[ 'object_id' ][ 'required' ] = true;
53
+		$delete_args[ 'object_type' ][ 'required' ] = true;
54 54
 
55 55
 		// Returns specific field data.
56 56
 		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<cmb_id>[\w-]+)/fields/(?P<field_id>[\w-]+)', array(
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
 
95 95
 		$fields = array();
96 96
 		foreach ( $this->rest_box->cmb->prop( 'fields', array() ) as $field ) {
97
-			$field_id = $field['id'];
97
+			$field_id = $field[ 'id' ];
98 98
 			$rest_field = $this->get_rest_field( $field_id );
99 99
 
100 100
 			if ( ! is_wp_error( $rest_field ) ) {
101
-				$fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $this->request['_embed'] ) );
101
+				$fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $this->request[ '_embed' ] ) );
102 102
 			} else {
103 103
 				$fields[ $field_id ] = array( 'error' => $rest_field->get_error_message() );
104 104
 			}
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	public function update_field_value( $request ) {
143 143
 		$this->initiate_rest_read_box( $request, 'field_value_update' );
144 144
 
145
-		if ( ! $this->request['value'] ) {
145
+		if ( ! $this->request[ 'value' ] ) {
146 146
 			return new WP_Error( 'cmb2_rest_update_field_error', __( 'CMB2 Field value cannot be updated without the value parameter specified.', 'cmb2' ), array( 'status' => 400 ) );
147 147
 		}
148 148
 
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 	 */
179 179
 	public function modify_field_value( $activity, $field ) {
180 180
 
181
-		if ( ! $this->request['object_id'] || ! $this->request['object_type'] ) {
181
+		if ( ! $this->request[ 'object_id' ] || ! $this->request[ 'object_type' ] ) {
182 182
 			return new WP_Error( 'cmb2_rest_modify_field_value_error', __( 'CMB2 Field value cannot be modified without the object_id and object_type parameters specified.', 'cmb2' ), array( 'status' => 400 ) );
183 183
 		}
184 184
 
@@ -190,13 +190,13 @@  discard block
 block discarded – undo
190 190
 			return new WP_Error( 'cmb2_rest_no_field_by_id_error', __( 'No field found by that id.', 'cmb2' ), array( 'status' => 403 ) );
191 191
 		}
192 192
 
193
-		$field->args["value_{$activity}"] = (bool) 'deleted' === $activity
193
+		$field->args[ "value_{$activity}" ] = (bool) 'deleted' === $activity
194 194
 			? $field->remove_data()
195
-			: $field->save_field( $this->request['value'] );
195
+			: $field->save_field( $this->request[ 'value' ] );
196 196
 
197 197
 		// If options page, save the $activity options
198
-		if ( 'options-page' == $this->request['object_type'] ) {
199
-			$field->args["value_{$activity}"] = cmb2_options( $this->request['object_id'] )->set();
198
+		if ( 'options-page' == $this->request[ 'object_type' ] ) {
199
+			$field->args[ "value_{$activity}" ] = cmb2_options( $this->request[ 'object_id' ] )->set();
200 200
 		}
201 201
 
202 202
 		$field_data = $this->get_rest_field( $field );
@@ -265,13 +265,13 @@  discard block
 block discarded – undo
265 265
 				$value = $field->options();
266 266
 			} elseif ( in_array( $key, CMB2_Field::$callable_fields, true ) ) {
267 267
 
268
-				if ( isset( $this->request['_rendered'] ) ) {
268
+				if ( isset( $this->request[ '_rendered' ] ) ) {
269 269
 					$value = $key === 'render_row_cb' ? $rendered : $field->get_param_callback_result( $key );
270 270
 				} elseif ( is_array( $value ) ) {
271 271
 					// We need to rewrite callbacks as string as they will cause
272 272
 					// JSON recursion errors.
273
-					$class = is_string( $value[0] ) ? $value[0] : get_class( $value[0] );
274
-					$value = $class . '::' . $value[1];
273
+					$class = is_string( $value[ 0 ] ) ? $value[ 0 ] : get_class( $value[ 0 ] );
274
+					$value = $class . '::' . $value[ 1 ];
275 275
 				}
276 276
 			}
277 277
 
@@ -284,8 +284,8 @@  discard block
 block discarded – undo
284 284
 			}
285 285
 		}
286 286
 
287
-		if ( $this->request['object_id'] && $this->request['object_type'] ) {
288
-			$field_data['value'] = $field->get_data();
287
+		if ( $this->request[ 'object_id' ] && $this->request[ 'object_type' ] ) {
288
+			$field_data[ 'value' ] = $field->get_data();
289 289
 		}
290 290
 
291 291
 		return $field_data;
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 
319 319
 		// Don't embed boxes when looking at boxes route.
320 320
 		if ( '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
321
-			$links['up']['embeddable'] = true;
321
+			$links[ 'up' ][ 'embeddable' ] = true;
322 322
 		}
323 323
 
324 324
 		return $links;
Please login to merge, or discard this patch.