WebDevStudios / CMB2

includes/types/CMB2_Type_Base.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	public function __construct( CMB2_Types $types, $args = array() ) {
 		$this->types = $types;
-		$args['rendered'] = isset( $args['rendered'] ) ? (bool) $args['rendered'] : true;
+		$args[ 'rendered' ] = isset( $args[ 'rendered' ] ) ? (bool) $args[ 'rendered' ] : true;
 		$this->args = $args;
 	}
 
@@ -56,7 +56,7 @@ 
 	 * @return string|CMB2_Type_Base           Rendered output or this object.
 	 */
 	public function rendered( $rendered ) {
-		if ( $this->args['rendered'] ) {
+		if ( $this->args[ 'rendered' ] ) {
 			return is_a( $rendered, __CLASS__ ) ? $rendered->rendered : $rendered;
 		}
 

Doc Comments +2 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
 	 * Stores the rendered field output.
 	 *
 	 * @since  2.2.2
-	 * @param  string|CMB2_Type_Base $rendered Rendered output.
+	 * @param  string $rendered Rendered output.
 	 * @return string|CMB2_Type_Base           Rendered output or this object.
 	 */
 	public function rendered( $rendered ) {
@@ -117,7 +117,6 @@ 
 	/**
 	 * Fall back to CMB2_Types methods
 	 *
-	 * @param string $field
 	 * @throws Exception Throws an exception if the field is invalid.
 	 * @return mixed
 	 */
@@ -139,7 +138,7 @@ 
 	 *
 	 * @param string $field
 	 * @throws Exception Throws an exception if the field is invalid.
-	 * @return mixed
+	 * @return CMB2_Field
 	 */
 	public function __get( $field ) {
 		switch ( $field ) {

includes/types/CMB2_Type_Text.php

Spacing +3 added lines, -3 removed lines

@@ -50,12 +50,12 @@
 			'js_dependencies' => array(),
 		), $args );
 
-		if ( ! empty( $a['js_dependencies'] ) ) {
-			$this->field->add_js_dependencies( $a['js_dependencies'] );
+		if ( ! empty( $a[ 'js_dependencies' ] ) ) {
+			$this->field->add_js_dependencies( $a[ 'js_dependencies' ] );
 		}
 
 		return $this->rendered(
-			sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] )
+			sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] )
 		);
 	}
 }

includes/CMB2_Sanitize.php

Spacing +8 added lines, -8 removed lines

@@ -172,7 +172,7 @@ 
 
 		global $wp_locale;
 
-		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
+		$search = array( $wp_locale->number_format[ 'thousands_sep' ], $wp_locale->number_format[ 'decimal_point' ] );
 		$replace = array( '', '.' );
 
 		// for repeatable
@@ -215,8 +215,8 @@ 
 			return $repeat_value;
 		}
 
-		if ( isset( $this->value['date'], $this->value['time'] ) ) {
-			$this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] );
+		if ( isset( $this->value[ 'date' ], $this->value[ 'time' ] ) ) {
+			$this->value = $this->field->get_timestamp_from_value( $this->value[ 'date' ] . ' ' . $this->value[ 'time' ] );
 		}
 
 		if ( $tz_offset = $this->field->field_timezone_offset() ) {
@@ -254,7 +254,7 @@ 
 		$tzstring = null;
 
 		if ( is_array( $this->value ) && array_key_exists( 'timezone', $this->value ) ) {
-			$tzstring = $this->value['timezone'];
+			$tzstring = $this->value[ 'timezone' ];
 		}
 
 		if ( empty( $tzstring ) ) {
@@ -274,8 +274,8 @@ 
 			$tzstring = false !== $tzstring ? $tzstring : timezone_name_from_abbr( '', 0, 0 );
 		}
 
-		$full_format = $this->field->args['date_format'] . ' ' . $this->field->args['time_format'];
-		$full_date   = $this->value['date'] . ' ' . $this->value['time'];
+		$full_format = $this->field->args[ 'date_format' ] . ' ' . $this->field->args[ 'time_format' ];
+		$full_date   = $this->value[ 'date' ] . ' ' . $this->value[ 'time' ];
 
 		try {
 
@@ -298,7 +298,7 @@ 
 			} else {
 				// Save the utc timestamp supporting field
 				if ( $repeat ) {
-					$utc_values[ $utc_key ][] = $utc_stamp;
+					$utc_values[ $utc_key ][ ] = $utc_stamp;
 				} else {
 					$this->_save_utc_value( $utc_key, $utc_stamp );
 				}
@@ -433,7 +433,7 @@ 
 			if ( $this->value ) {
 				$val = $this->$method( true );
 				if ( ! empty( $val ) ) {
-					$new_value[] = $val;
+					$new_value[ ] = $val;
 				}
 			}
 		}

Doc Comments +3 added lines

@@ -433,6 +433,7 @@ 
 	 * Gets the values for the `file` field type from the data being saved.
 	 *
 	 * @since  2.2.0
+	 * @param string $id_key
 	 */
 	public function _get_group_file_value_array( $id_key ) {
 		$alldata = $this->field->group->data_to_save;
@@ -460,6 +461,7 @@ 
 	 * Peforms saving of `file` attachement's ID
 	 *
 	 * @since  1.1.0
+	 * @param string $file_id_key
 	 */
 	public function _save_file_id_value( $file_id_key ) {
 		$id_field = $this->_new_supporting_field( $file_id_key );
@@ -481,6 +483,7 @@ 
 	 * Peforms saving of `text_datetime_timestamp_timezone` utc timestamp
 	 *
 	 * @since  2.2.0
+	 * @param string $utc_key
 	 */
 	public function _save_utc_value( $utc_key, $utc_stamp ) {
 		return $this->_new_supporting_field( $utc_key )->save_field( $utc_stamp );

includes/helper-functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -317,8 +317,8 @@
 	 * Reimplementation of DateTime::createFromFormat for PHP < 5.3. :(
 	 * Borrowed from http://stackoverflow.com/questions/5399075/php-datetimecreatefromformat-in-5-2
 	 *
-	 * @param $date_format
-	 * @param $date_value
+	 * @param string $date_format
+	 * @param string $date_value
 	 *
 	 * @return DateTime
 	 */

Spacing +21 added lines, -21 removed lines

@@ -96,18 +96,18 @@ 
 	$oembed = cmb2_ajax()->get_oembed_no_edit( $args );
 
 	// Send back our embed
-	if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
-		return '<div class="cmb2-oembed">' . $oembed['embed'] . '</div>';
+	if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) {
+		return '<div class="cmb2-oembed">' . $oembed[ 'embed' ] . '</div>';
 	}
 
 	$error = sprintf(
 		/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
 		esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
-		$oembed['fallback'],
+		$oembed[ 'fallback' ],
 		'<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>'
 	);
 
-	if ( isset( $args['wp_error'] ) && $args['wp_error'] ) {
+	if ( isset( $args[ 'wp_error' ] ) && $args[ 'wp_error' ] ) {
 		return new WP_Error( 'cmb2_get_oembed_result', $error, compact( 'oembed', 'args' ) );
 	}
 
@@ -229,7 +229,7 @@ 
 		$cmb = CMB2_Boxes::get( $meta_box );
 	} else {
 		// See if we already have an instance of this metabox
-		$cmb = CMB2_Boxes::get( $meta_box['id'] );
+		$cmb = CMB2_Boxes::get( $meta_box[ 'id' ] );
 		// If not, we'll initate a new metabox
 		$cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id );
 	}
@@ -307,7 +307,7 @@ 
 	) );
 
 	// Set object type explicitly (rather than trying to guess from context)
-	$cmb->object_type( $args['object_type'] );
+	$cmb->object_type( $args[ 'object_type' ] );
 
 	// Save the metabox if it's been submitted
 	// check permissions
@@ -315,32 +315,32 @@ 
 	if (
 		$cmb->prop( 'save_fields' )
 		// check nonce
-		&& isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] )
+		&& isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] )
 		&& wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() )
-		&& $object_id && $_POST['object_id'] == $object_id
+		&& $object_id && $_POST[ 'object_id' ] == $object_id
 	) {
 		$cmb->save_fields( $object_id, $cmb->object_type(), $_POST );
 	}
 
 	// Enqueue JS/CSS
-	if ( $args['cmb_styles'] ) {
+	if ( $args[ 'cmb_styles' ] ) {
 		CMB2_hookup::enqueue_cmb_css();
 	}
 
-	if ( $args['enqueue_js'] ) {
+	if ( $args[ 'enqueue_js' ] ) {
 		CMB2_hookup::enqueue_cmb_js();
 	}
 
-	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb );
+	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb );
 
 	$format_parts = explode( '%3$s', $form_format );
 
 	// Show cmb form
-	printf( $format_parts[0], $cmb->cmb_id, $object_id );
+	printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id );
 	$cmb->show_form();
 
-	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
-		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] );
+	if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) {
+		printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] );
 	}
 
 }
@@ -354,7 +354,7 @@ 
  * @param  array $args      Optional arguments array
  */
 function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
-	if ( ! isset( $args['echo'] ) || $args['echo'] ) {
+	if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) {
 		cmb2_print_metabox_form( $meta_box, $object_id, $args );
 	} else {
 		return cmb2_get_metabox_form( $meta_box, $object_id, $args );
@@ -393,12 +393,12 @@ 
 			 * 4 or 2 characters, as needed
 			 */
 			'%04d-%02d-%02d %02d:%02d:%02d',
-			$parsed_time['tm_year'] + 1900,  // This will be "111", so we need to add 1900.
-			$parsed_time['tm_mon'] + 1,      // This will be the month minus one, so we add one.
-			$parsed_time['tm_mday'],
-			$parsed_time['tm_hour'],
-			$parsed_time['tm_min'],
-			$parsed_time['tm_sec']
+			$parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900.
+			$parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one.
+			$parsed_time[ 'tm_mday' ],
+			$parsed_time[ 'tm_hour' ],
+			$parsed_time[ 'tm_min' ],
+			$parsed_time[ 'tm_sec' ]
 		);
 
 		return new DateTime( $ymd );

includes/CMB2_Ajax.php

Spacing +20 added lines, -20 removed lines

@@ -59,12 +59,12 @@ 
 	public function oembed_handler() {
 
 		// Verify our nonce
-		if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) {
+		if ( ! ( isset( $_REQUEST[ 'cmb2_ajax_nonce' ], $_REQUEST[ 'oembed_url' ] ) && wp_verify_nonce( $_REQUEST[ 'cmb2_ajax_nonce' ], 'ajax_nonce' ) ) ) {
 			die();
 		}
 
 		// Sanitize our search string
-		$oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] );
+		$oembed_string = sanitize_text_field( $_REQUEST[ 'oembed_url' ] );
 
 		// Send back error if empty
 		if ( empty( $oembed_string ) ) {
@@ -72,7 +72,7 @@ 
 		}
 
 		// Set width of embed
-		$embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640';
+		$embed_width = isset( $_REQUEST[ 'oembed_width' ] ) && intval( $_REQUEST[ 'oembed_width' ] ) < 640 ? intval( $_REQUEST[ 'oembed_width' ] ) : '640';
 
 		// Set url
 		$oembed_url = esc_url( $oembed_string );
@@ -85,10 +85,10 @@ 
 		// Get embed code (or fallback link)
 		$html = $this->get_oembed( array(
 			'url'         => $oembed_url,
-			'object_id'   => $_REQUEST['object_id'],
-			'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post',
+			'object_id'   => $_REQUEST[ 'object_id' ],
+			'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post',
 			'oembed_args' => $embed_args,
-			'field_id'    => $_REQUEST['field_id'],
+			'field_id'    => $_REQUEST[ 'field_id' ],
 		) );
 
 		wp_send_json_success( $html );
@@ -103,10 +103,10 @@ 
 	public function get_oembed_no_edit( $args ) {
 		global $wp_embed;
 
-		$oembed_url = esc_url( $args['url'] );
+		$oembed_url = esc_url( $args[ 'url' ] );
 
 		// Sanitize object_id
-		$this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] );
+		$this->object_id = is_numeric( $args[ 'object_id' ] ) ? absint( $args[ 'object_id' ] ) : sanitize_text_field( $args[ 'object_id' ] );
 
 		$args = wp_parse_args( $args, array(
 			'object_type' => 'post',
@@ -115,7 +115,7 @@ 
 			'wp_error'    => false,
 		) );
 
-		$this->embed_args =& $args;
+		$this->embed_args = & $args;
 
 		/**
 		 * Set the post_ID so oEmbed won't fail
@@ -124,9 +124,9 @@ 
 		$wp_embed->post_ID = $this->object_id;
 
 		// Special scenario if NOT a post object
-		if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) {
+		if ( isset( $args[ 'object_type' ] ) && 'post' != $args[ 'object_type' ] ) {
 
-			if ( 'options-page' == $args['object_type'] ) {
+			if ( 'options-page' == $args[ 'object_type' ] ) {
 
 				// Bogus id to pass some numeric checks. Issue with a VERY large WP install?
 				$wp_embed->post_ID = 1987645321;
@@ -134,7 +134,7 @@ 
 
 			// Ok, we need to hijack the oembed cache system
 			$this->hijack = true;
-			$this->object_type = $args['object_type'];
+			$this->object_type = $args[ 'object_type' ];
 
 			// Gets ombed cache from our object's meta (vs postmeta)
 			add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 );
@@ -146,7 +146,7 @@ 
 
 		$embed_args = '';
 
-		foreach ( $args['oembed_args'] as $key => $val ) {
+		foreach ( $args[ 'oembed_args' ] as $key => $val ) {
 			$embed_args .= " $key=\"$val\"";
 		}
 
@@ -169,8 +169,8 @@ 
 		$oembed = $this->get_oembed_no_edit( $args );
 
 		// Send back our embed
-		if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
-			return '<div class="cmb2-oembed embed-status">' . $oembed['embed'] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed['args']['field_id'] . '">' . esc_html__( 'Remove Embed', 'cmb2' ) . '</a></p></div>';
+		if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) {
+			return '<div class="cmb2-oembed embed-status">' . $oembed[ 'embed' ] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed[ 'args' ][ 'field_id' ] . '">' . esc_html__( 'Remove Embed', 'cmb2' ) . '</a></p></div>';
 		}
 
 		// Otherwise, send back error info that no oEmbeds were found
@@ -179,7 +179,7 @@ 
 			sprintf(
 				/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
 				esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
-				$oembed['fallback'],
+				$oembed[ 'fallback' ],
 				'<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>'
 			)
 		);
@@ -244,15 +244,15 @@ 
 	 */
 	protected function cache_action( $meta_key ) {
 		$func_args = func_get_args();
-		$action    = isset( $func_args[1] ) ? 'update' : 'get';
+		$action    = isset( $func_args[ 1 ] ) ? 'update' : 'get';
 
 		if ( 'options-page' === $this->object_type ) {
 
 			$args = array( $meta_key );
 
 			if ( 'update' === $action ) {
-				$args[] = $func_args[1];
-				$args[] = true;
+				$args[ ] = $func_args[ 1 ];
+				$args[ ] = true;
 			}
 
 			// Cache the result to our options
@@ -260,7 +260,7 @@ 
 		} else {
 
 			$args = array( $this->object_type, $this->object_id, $meta_key );
-			$args[] = 'update' === $action ? $func_args : true;
+			$args[ ] = 'update' === $action ? $func_args : true;
 
 			// Cache the result to our metadata
 			$status = call_user_func_array( $action . '_metadata', $args );

includes/types/CMB2_Type_Wysiwyg.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 		) );
 
 		if ( ! $field->group ) {
-			return $this->rendered( $this->get_wp_editor( $a ) . $a['desc'] );
+			return $this->rendered( $this->get_wp_editor( $a ) . $a[ 'desc' ] );
 		}
 
 		// wysiwyg fields in a group need some special handling.
@@ -52,7 +52,7 @@ 
 
 	protected function get_wp_editor( $args ) {
 		ob_start();
-		wp_editor( $args['value'], $args['id'], $args['options'] );
+		wp_editor( $args[ 'value' ], $args[ 'id' ], $args[ 'options' ] );
 		return ob_get_clean();
 	}
 
@@ -60,7 +60,7 @@ 
 		$group_id = $this->field->group->id();
 		$field_id = $this->field->id( true );
 		$options  = $this->field->options();
-		$options['textarea_name'] = 'cmb2_n_' . $group_id . $field_id;
+		$options[ 'textarea_name' ] = 'cmb2_n_' . $group_id . $field_id;
 
 		// Initate the editor with special id/value/name so we can retrieve the options in JS.
 		$editor = $this->get_wp_editor( array(
@@ -83,7 +83,7 @@ 
 		// And put the editor instance in a JS template wrapper.
 		echo '<script type="text/template" id="tmpl-cmb2-wysiwyg-' . $group_id . '-' . $field_id . '">';
 		// Need to wrap the template in a wrapper div w/ specific data attributes which will be used when adding/removing rows.
-		echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="'. $group_id .'" data-id="'. $field_id .'">'. $editor .'</div>';
+		echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="' . $group_id . '" data-id="' . $field_id . '">' . $editor . '</div>';
 		echo '</script>';
 	}
 

includes/types/CMB2_Type_Title.php

Spacing +3 added lines, -3 removed lines

@@ -28,10 +28,10 @@
 		return $this->rendered(
 			sprintf(
 				'<%1$s %2$s>%3$s</%1$s>%4$s',
-				$a['tag'],
+				$a[ 'tag' ],
 				$this->concat_attrs( $a, array( 'tag', 'name', 'desc' ) ),
-				$a['name'],
-				$a['desc']
+				$a[ 'name' ],
+				$a[ 'desc' ]
 			)
 		);
 	}

includes/shim/WP_REST_Controller.php

Spacing +37 added lines, -37 removed lines

@@ -166,7 +166,7 @@ 
 		}
 
 		if ( ! empty( $links ) ) {
-			$data['_links'] = $links;
+			$data[ '_links' ] = $links;
 		}
 
 		return $data;
@@ -183,21 +183,21 @@ 
 
 		$schema = $this->get_item_schema();
 		foreach ( $data as $key => $value ) {
-			if ( empty( $schema['properties'][ $key ] ) || empty( $schema['properties'][ $key ]['context'] ) ) {
+			if ( empty( $schema[ 'properties' ][ $key ] ) || empty( $schema[ 'properties' ][ $key ][ 'context' ] ) ) {
 				continue;
 			}
 
-			if ( ! in_array( $context, $schema['properties'][ $key ]['context'] ) ) {
+			if ( ! in_array( $context, $schema[ 'properties' ][ $key ][ 'context' ] ) ) {
 				unset( $data[ $key ] );
 				continue;
 			}
 
-			if ( 'object' === $schema['properties'][ $key ]['type'] && ! empty( $schema['properties'][ $key ]['properties'] ) ) {
-				foreach ( $schema['properties'][ $key ]['properties'] as $attribute => $details ) {
-					if ( empty( $details['context'] ) ) {
+			if ( 'object' === $schema[ 'properties' ][ $key ][ 'type' ] && ! empty( $schema[ 'properties' ][ $key ][ 'properties' ] ) ) {
+				foreach ( $schema[ 'properties' ][ $key ][ 'properties' ] as $attribute => $details ) {
+					if ( empty( $details[ 'context' ] ) ) {
 						continue;
 					}
-					if ( ! in_array( $context, $details['context'] ) ) {
+					if ( ! in_array( $context, $details[ 'context' ] ) ) {
 						if ( isset( $data[ $key ][ $attribute ] ) ) {
 							unset( $data[ $key ][ $attribute ] );
 						}
@@ -227,9 +227,9 @@ 
 
 		$schema = $this->get_item_schema();
 
-		foreach ( $schema['properties'] as &$property ) {
-			if ( isset( $property['arg_options'] ) ) {
-				unset( $property['arg_options'] );
+		foreach ( $schema[ 'properties' ] as &$property ) {
+			if ( isset( $property[ 'arg_options' ] ) ) {
+				unset( $property[ 'arg_options' ] );
 			}
 		}
 
@@ -286,18 +286,18 @@ 
 			'validate_callback'  => 'rest_validate_request_arg',
 		);
 		$schema = $this->get_item_schema();
-		if ( empty( $schema['properties'] ) ) {
+		if ( empty( $schema[ 'properties' ] ) ) {
 			return array_merge( $param_details, $args );
 		}
 		$contexts = array();
-		foreach ( $schema['properties'] as $attributes ) {
-			if ( ! empty( $attributes['context'] ) ) {
-				$contexts = array_merge( $contexts, $attributes['context'] );
+		foreach ( $schema[ 'properties' ] as $attributes ) {
+			if ( ! empty( $attributes[ 'context' ] ) ) {
+				$contexts = array_merge( $contexts, $attributes[ 'context' ] );
 			}
 		}
 		if ( ! empty( $contexts ) ) {
-			$param_details['enum'] = array_unique( $contexts );
-			rsort( $param_details['enum'] );
+			$param_details[ 'enum' ] = array_unique( $contexts );
+			rsort( $param_details[ 'enum' ] );
 		}
 		return array_merge( $param_details, $args );
 	}
@@ -315,11 +315,11 @@ 
 
 		foreach ( $additional_fields as $field_name => $field_options ) {
 
-			if ( ! $field_options['get_callback'] ) {
+			if ( ! $field_options[ 'get_callback' ] ) {
 				continue;
 			}
 
-			$object[ $field_name ] = call_user_func( $field_options['get_callback'], $object, $field_name, $request, $this->get_object_type() );
+			$object[ $field_name ] = call_user_func( $field_options[ 'get_callback' ], $object, $field_name, $request, $this->get_object_type() );
 		}
 
 		return $object;
@@ -337,7 +337,7 @@ 
 
 		foreach ( $additional_fields as $field_name => $field_options ) {
 
-			if ( ! $field_options['update_callback'] ) {
+			if ( ! $field_options[ 'update_callback' ] ) {
 				continue;
 			}
 
@@ -346,7 +346,7 @@ 
 				continue;
 			}
 
-			call_user_func( $field_options['update_callback'], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() );
+			call_user_func( $field_options[ 'update_callback' ], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() );
 		}
 	}
 
@@ -358,23 +358,23 @@ 
 	 * @param array $schema Schema array.
 	 */
 	protected function add_additional_fields_schema( $schema ) {
-		if ( empty( $schema['title'] ) ) {
+		if ( empty( $schema[ 'title' ] ) ) {
 			return $schema;
 		}
 
 		/**
 		 * Can't use $this->get_object_type otherwise we cause an inf loop.
 		 */
-		$object_type = $schema['title'];
+		$object_type = $schema[ 'title' ];
 
 		$additional_fields = $this->get_additional_fields( $object_type );
 
 		foreach ( $additional_fields as $field_name => $field_options ) {
-			if ( ! $field_options['schema'] ) {
+			if ( ! $field_options[ 'schema' ] ) {
 				continue;
 			}
 
-			$schema['properties'][ $field_name ] = $field_options['schema'];
+			$schema[ 'properties' ][ $field_name ] = $field_options[ 'schema' ];
 		}
 
 		return $schema;
@@ -413,11 +413,11 @@ 
 	protected function get_object_type() {
 		$schema = $this->get_item_schema();
 
-		if ( ! $schema || ! isset( $schema['title'] ) ) {
+		if ( ! $schema || ! isset( $schema[ 'title' ] ) ) {
 			return null;
 		}
 
-		return $schema['title'];
+		return $schema[ 'title' ];
 	}
 
 	/**
@@ -433,13 +433,13 @@ 
 	public function get_endpoint_args_for_item_schema( $method = WP_REST_Server::CREATABLE ) {
 
 		$schema                = $this->get_item_schema();
-		$schema_properties     = ! empty( $schema['properties'] ) ? $schema['properties'] : array();
+		$schema_properties     = ! empty( $schema[ 'properties' ] ) ? $schema[ 'properties' ] : array();
 		$endpoint_args = array();
 
 		foreach ( $schema_properties as $field_id => $params ) {
 
 			// Arguments specified as `readonly` are not allowed to be set.
-			if ( ! empty( $params['readonly'] ) ) {
+			if ( ! empty( $params[ 'readonly' ] ) ) {
 				continue;
 			}
 
@@ -448,16 +448,16 @@ 
 				'sanitize_callback' => 'rest_sanitize_request_arg',
 			);
 
-			if ( isset( $params['description'] ) ) {
-				$endpoint_args[ $field_id ]['description'] = $params['description'];
+			if ( isset( $params[ 'description' ] ) ) {
+				$endpoint_args[ $field_id ][ 'description' ] = $params[ 'description' ];
 			}
 
-			if ( WP_REST_Server::CREATABLE === $method && isset( $params['default'] ) ) {
-				$endpoint_args[ $field_id ]['default'] = $params['default'];
+			if ( WP_REST_Server::CREATABLE === $method && isset( $params[ 'default' ] ) ) {
+				$endpoint_args[ $field_id ][ 'default' ] = $params[ 'default' ];
 			}
 
-			if ( WP_REST_Server::CREATABLE === $method && ! empty( $params['required'] ) ) {
-				$endpoint_args[ $field_id ]['required'] = true;
+			if ( WP_REST_Server::CREATABLE === $method && ! empty( $params[ 'required' ] ) ) {
+				$endpoint_args[ $field_id ][ 'required' ] = true;
 			}
 
 			foreach ( array( 'type', 'format', 'enum' ) as $schema_prop ) {
@@ -467,14 +467,14 @@ 
 			}
 
 			// Merge in any options provided by the schema property.
-			if ( isset( $params['arg_options'] ) ) {
+			if ( isset( $params[ 'arg_options' ] ) ) {
 
 				// Only use required / default from arg_options on CREATABLE endpoints.
 				if ( WP_REST_Server::CREATABLE !== $method ) {
-					$params['arg_options'] = array_diff_key( $params['arg_options'], array( 'required' => '', 'default' => '' ) );
+					$params[ 'arg_options' ] = array_diff_key( $params[ 'arg_options' ], array( 'required' => '', 'default' => '' ) );
 				}
 
-				$endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params['arg_options'] );
+				$endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params[ 'arg_options' ] );
 			}
 		}
 

includes/CMB2_Hookup_Base.php

Spacing +3 added lines, -3 removed lines

@@ -52,9 +52,9 @@
 
 		// Get object hash.. This bypasses issues with serializing closures.
 		if ( is_object( $hook ) ) {
-			$args[1] = spl_object_hash( $args[1] );
-		} elseif ( is_array( $hook ) && is_object( $hook[0] ) ) {
-			$args[1][0] = spl_object_hash( $hook[0] );
+			$args[ 1 ] = spl_object_hash( $args[ 1 ] );
+		} elseif ( is_array( $hook ) && is_object( $hook[ 0 ] ) ) {
+			$args[ 1 ][ 0 ] = spl_object_hash( $hook[ 0 ] );
 		}
 
 		$key = md5( serialize( $args ) );