WebDevStudios / CMB2

includes/rest-api/CMB2_REST_Controller_Boxes.php

Spacing +10 added lines, -10 removed lines

@@ -68,7 +68,7 @@ 
 			'schema' => array( $this, 'get_item_schema' ),
 		) );
 
-		$args['_rendered'] = array(
+		$args[ '_rendered' ] = array(
 			'description' => __( 'Includes the fully rendered attributes, \'form_open\', \'form_close\', as well as the enqueued \'js_dependencies\' script handles, and \'css_dependencies\' stylesheet handles.', 'cmb2' ),
 		);
 
@@ -132,9 +132,9 @@ 
 				// And make sure current user can view this box.
 				&& $this->get_item_permissions_check_filter( $this->request )
 			) {
-				$boxes_data[] = $this->server->response_to_data(
+				$boxes_data[ ] = $this->server->response_to_data(
 					$this->get_rest_box(),
-					isset( $this->request['_embed'] )
+					isset( $this->request[ '_embed' ] )
 				);
 			}
 		}
@@ -210,9 +210,9 @@ 
 
 		$boxes_data = $cmb->meta_box;
 
-		if ( isset( $this->request['_rendered'] ) && $this->namespace_base !== ltrim( CMB2_REST_Controller::get_intial_route(), '/' ) ) {
-			$boxes_data['form_open'] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
-			$boxes_data['form_close'] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
+		if ( isset( $this->request[ '_rendered' ] ) && $this->namespace_base !== ltrim( CMB2_REST_Controller::get_intial_route(), '/' ) ) {
+			$boxes_data[ 'form_open' ] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
+			$boxes_data[ 'form_close' ] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
 
 			global $wp_scripts, $wp_styles;
 			$before_css = $wp_styles->queue;
@@ -220,15 +220,15 @@ 
 
 			CMB2_JS::enqueue();
 
-			$boxes_data['js_dependencies'] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
-			$boxes_data['css_dependencies'] = array_values( array_diff( $wp_styles->queue, $before_css ) );
+			$boxes_data[ 'js_dependencies' ] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
+			$boxes_data[ 'css_dependencies' ] = array_values( array_diff( $wp_styles->queue, $before_css ) );
 		}
 
 		// TODO: look into 'embed' parameter.
 		// http://demo.wp-api.org/wp-json/wp/v2/posts?_embed
-		unset( $boxes_data['fields'] );
+		unset( $boxes_data[ 'fields' ] );
 		// Handle callable properties.
-		unset( $boxes_data['show_on_cb'] );
+		unset( $boxes_data[ 'show_on_cb' ] );
 
 		$response = rest_ensure_response( $boxes_data );
 

includes/types/CMB2_Type_Taxonomy_Radio.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 		if ( ! $terms ) {
 			$options .= sprintf( '<li><label>%s</label></li>', esc_html( $this->_text( 'no_terms_text', esc_html__( 'No terms', 'cmb2' ) ) ) );
 		} else {
-			$option_none  = $field->args( 'show_option_none' );
+			$option_none = $field->args( 'show_option_none' );
 			if ( ! empty( $option_none ) ) {
 
 				$field_id = $this->_id();
@@ -54,7 +54,7 @@ 
 					'label' => $option_none,
 				);
 				if ( $saved_term == $option_none_value ) {
-					$args['checked'] = 'checked';
+					$args[ 'checked' ] = 'checked';
 				}
 				$options .= $this->list_input( $args, $i );
 				$i++;
@@ -67,7 +67,7 @@ 
 				);
 
 				if ( $saved_term == $term->slug ) {
-					$args['checked'] = 'checked';
+					$args[ 'checked' ] = 'checked';
 				}
 				$options .= $this->list_input( $args, $i );
 				$i++;

includes/CMB2_Utils.php

Doc Comments +1 added lines, -1 removed lines

@@ -547,7 +547,7 @@
 	 * @since  2.2.3
 	 *
 	 * @param  mixed $value   Value to ensure is array.
-	 * @param  array $default Default array. Defaults to empty array.
+	 * @param  string[] $default Default array. Defaults to empty array.
 	 *
 	 * @return array          The array.
 	 */

Spacing +33 added lines, -34 removed lines

@@ -40,7 +40,7 @@ 
 		$dir = wp_upload_dir();
 
 		// Is URL in uploads directory?
-		if ( false === strpos( $img_url, $dir['baseurl'] . '/' ) ) {
+		if ( false === strpos( $img_url, $dir[ 'baseurl' ] . '/' ) ) {
 			return false;
 		}
 
@@ -65,8 +65,8 @@ 
 
 			foreach ( $query->posts as $post_id ) {
 				$meta = wp_get_attachment_metadata( $post_id );
-				$original_file       = basename( $meta['file'] );
-				$cropped_image_files = isset( $meta['sizes'] ) ? wp_list_pluck( $meta['sizes'], 'file' ) : array();
+				$original_file       = basename( $meta[ 'file' ] );
+				$cropped_image_files = isset( $meta[ 'sizes' ] ) ? wp_list_pluck( $meta[ 'sizes' ], 'file' ) : array();
 				if ( $original_file === $file || in_array( $file, $cropped_image_files ) ) {
 					$attachment_id = $post_id;
 					break;
@@ -128,31 +128,31 @@ 
 			foreach ( $image_sizes as $_size => $data ) {
 
 				// If there's an exact match to an existing image size, short circuit.
-				if ( $data['width'] == $size[0] && $data['height'] == $size[1] ) {
-					$candidates[ $data['width'] * $data['height'] ] = array( $_size, $data );
+				if ( $data[ 'width' ] == $size[ 0 ] && $data[ 'height' ] == $size[ 1 ] ) {
+					$candidates[ $data[ 'width' ] * $data[ 'height' ] ] = array( $_size, $data );
 					break;
 				}
 
 				// If it's not an exact match, consider larger sizes with the same aspect ratio.
-				if ( $data['width'] >= $size[0] && $data['height'] >= $size[1] ) {
+				if ( $data[ 'width' ] >= $size[ 0 ] && $data[ 'height' ] >= $size[ 1 ] ) {
 
 					/*
 					 * To test for varying crops, we constrain the dimensions of the larger image
 					 * to the dimensions of the smaller image and see if they match.
 					 */
-					if ( $data['width'] > $size[0] ) {
-						$constrained_size = wp_constrain_dimensions( $data['width'], $data['height'], $size[0] );
-						$expected_size = array( $size[0], $size[1] );
+					if ( $data[ 'width' ] > $size[ 0 ] ) {
+						$constrained_size = wp_constrain_dimensions( $data[ 'width' ], $data[ 'height' ], $size[ 0 ] );
+						$expected_size = array( $size[ 0 ], $size[ 1 ] );
 					} else {
-						$constrained_size = wp_constrain_dimensions( $size[0], $size[1], $data['width'] );
-						$expected_size = array( $data['width'], $data['height'] );
+						$constrained_size = wp_constrain_dimensions( $size[ 0 ], $size[ 1 ], $data[ 'width' ] );
+						$expected_size = array( $data[ 'width' ], $data[ 'height' ] );
 					}
 
 					// If the image dimensions are within 1px of the expected size, we consider it a match.
-					$matched = ( abs( $constrained_size[0] - $expected_size[0] ) <= 1 && abs( $constrained_size[1] - $expected_size[1] ) <= 1 );
+					$matched = ( abs( $constrained_size[ 0 ] - $expected_size[ 0 ] ) <= 1 && abs( $constrained_size[ 1 ] - $expected_size[ 1 ] ) <= 1 );
 
 					if ( $matched ) {
-						$candidates[ $data['width'] * $data['height'] ] = array( $_size, $data );
+						$candidates[ $data[ 'width' ] * $data[ 'height' ] ] = array( $_size, $data );
 					}
 				}
 			}
@@ -164,8 +164,8 @@ 
 				}
 
 				$data = array_shift( $candidates );
-				$data = $data[0];
-			} elseif ( ! empty( $image_sizes['thumbnail'] ) && $image_sizes['thumbnail']['width'] >= $size[0] && $image_sizes['thumbnail']['width'] >= $size[1] ) {
+				$data = $data[ 0 ];
+			} elseif ( ! empty( $image_sizes[ 'thumbnail' ] ) && $image_sizes[ 'thumbnail' ][ 'width' ] >= $size[ 0 ] && $image_sizes[ 'thumbnail' ][ 'width' ] >= $size[ 1 ] ) {
 				/*
 				 * When the size requested is smaller than the thumbnail dimensions, we
 				 * fall back to the thumbnail size.
@@ -260,8 +260,7 @@ 
 		}
 
 		return self::is_valid_time_stamp( $string )
-			? (int) $string :
-			strtotime( (string) $string );
+			? (int) $string : strtotime( (string) $string );
 	}
 
 	/**
@@ -457,25 +456,25 @@ 
 
 		// order is relevant here, since the replacement will be done sequentially.
 		$supported_options = array(
-			'd' => 'dd',  // Day, leading 0
-			'j' => 'd',   // Day, no 0
-			'z' => 'o',   // Day of the year, no leading zeroes,
+			'd' => 'dd', // Day, leading 0
+			'j' => 'd', // Day, no 0
+			'z' => 'o', // Day of the year, no leading zeroes,
 			// 'D' => 'D',   // Day name short, not sure how it'll work with translations
 			// 'l' => 'DD',  // Day name full, idem before
-			'm' => 'mm',  // Month of the year, leading 0
-			'n' => 'm',   // Month of the year, no leading 0
+			'm' => 'mm', // Month of the year, leading 0
+			'n' => 'm', // Month of the year, no leading 0
 			// 'M' => 'M',   // Month, Short name
 			// 'F' => 'MM',  // Month, full name,
-			'y' => 'y',   // Year, two digit
-			'Y' => 'yy',  // Year, full
-			'H' => 'HH',  // Hour with leading 0 (24 hour)
-			'G' => 'H',   // Hour with no leading 0 (24 hour)
-			'h' => 'hh',  // Hour with leading 0 (12 hour)
-			'g' => 'h',   // Hour with no leading 0 (12 hour),
-			'i' => 'mm',  // Minute with leading 0,
-			's' => 'ss',  // Second with leading 0,
-			'a' => 'tt',  // am/pm
-			'A' => 'TT',// AM/PM
+			'y' => 'y', // Year, two digit
+			'Y' => 'yy', // Year, full
+			'H' => 'HH', // Hour with leading 0 (24 hour)
+			'G' => 'H', // Hour with no leading 0 (24 hour)
+			'h' => 'hh', // Hour with leading 0 (12 hour)
+			'g' => 'h', // Hour with no leading 0 (12 hour),
+			'i' => 'mm', // Minute with leading 0,
+			's' => 'ss', // Second with leading 0,
+			'a' => 'tt', // am/pm
+			'A' => 'TT', // AM/PM
 		);
 
 		foreach ( $supported_options as $php => $js ) {
@@ -496,7 +495,7 @@ 
 	 * @return string Modified value
 	 */
 	public static function wrap_escaped_chars( $value ) {
-		return '&#39;' . str_replace( '\\', '', $value[0] ) . '&#39;';
+		return '&#39;' . str_replace( '\\', '', $value[ 0 ] ) . '&#39;';
 	}
 
 	/**
@@ -559,7 +558,7 @@ 
 	 * @return string               String of attributes for form element.
 	 */
 	public static function concat_attrs( $attrs, $attr_exclude = array() ) {
-		$attr_exclude[] = 'rendered';
+		$attr_exclude[ ] = 'rendered';
 		$attributes = '';
 		foreach ( $attrs as $attr => $val ) {
 			$excluded = in_array( $attr, (array) $attr_exclude, true );

Braces +2 added lines, -1 removed lines

@@ -234,7 +234,8 @@
 			$tzstring = '';
 		}
 
-		if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
+		if ( empty( $tzstring ) ) {
+// Create a UTC+- zone if no timezone string exists
 			if ( 0 == $current_offset ) {
 				$tzstring = 'UTC+0';
 			} elseif ( $current_offset < 0 ) {

includes/CMB2_Types.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 
 		// Check for methods to be proxied to the CMB2_Type_Base object.
 		if ( $exists = $this->maybe_proxy_method( $fieldtype, $arguments ) ) {
-			return $exists['value'];
+			return $exists[ 'value' ];
 		}
 
 		// Check for custom field type class.
@@ -481,8 +481,8 @@ 
 			'class' => 'cmb2-hidden',
 		);
 		if ( $this->field->group ) {
-			$args['data-groupid'] = $this->field->group->id();
-			$args['data-iterator'] = $this->iterator;
+			$args[ 'data-groupid' ] = $this->field->group->id();
+			$args[ 'data-iterator' ] = $this->iterator;
 		}
 
 		return $this->get_new_render_type( __FUNCTION__, 'CMB2_Type_Text', $args, 'input' )->render();

Doc Comments +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
 	 * @param  string $fieldtype         The type of field being rendered.
 	 * @param  string $render_class_name The default field type class to use. Defaults to null.
 	 * @param  array  $args              Optional arguments to pass to type class.
-	 * @param  mixed  $additional        Optional additional argument to pass to type class.
+	 * @param  string  $additional        Optional additional argument to pass to type class.
 	 * @return CMB2_Type_Base                    Type object.
 	 */
 	public function get_new_render_type( $fieldtype, $render_class_name = null, $args = array(), $additional = '' ) {

includes/types/CMB2_Type_Select_Timezone.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 	public function render() {
 
-		$this->field->args['default'] = $this->field->get_default()
+		$this->field->args[ 'default' ] = $this->field->get_default()
 			? $this->field->get_default()
 			: CMB2_Utils::timezone_string();
 

includes/types/CMB2_Type_Taxonomy_Multicheck.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 				);
 
 				if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) {
-					$args['checked'] = 'checked';
+					$args[ 'checked' ] = 'checked';
 				}
 				$options .= $this->list_input( $args, $i );
 				$i++;

includes/types/CMB2_Type_File.php

Spacing +4 added lines, -4 removed lines

@@ -24,15 +24,15 @@ 
 		$img_size_data = parent::get_image_size_data( $img_size, 'large' );
 
 		// if options array and 'url' => false, then hide the url field
-		$input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text';
+		$input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text';
 
 		$output .= parent::render( array(
 			'type'  => $input_type,
 			'class' => 'cmb2-upload-file regular-text',
 			'size'  => 45,
 			'desc'  => '',
-			'data-previewsize' => sprintf( '[%d,%d]', $img_size_data['width'], $img_size_data['height'] ),
-			'data-sizename'    => $img_size_data['name'],
+			'data-previewsize' => sprintf( '[%d,%d]', $img_size_data[ 'width' ], $img_size_data[ 'height' ] ),
+			'data-sizename'    => $img_size_data[ 'name' ],
 			'data-queryargs'   => ! empty( $query_args ) ? json_encode( $query_args ) : '',
 			'js_dependencies'  => 'media-editor',
 		) );
@@ -80,7 +80,7 @@ 
 				if ( $_id_value ) {
 					$image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) );
 				} else {
-					$image = '<img style="max-width: ' . absint( $img_size_data['width'] ) . 'px; width: 100%;" src="' . $meta_value . '" class="cmb-file-field-image" alt="" />';
+					$image = '<img style="max-width: ' . absint( $img_size_data[ 'width' ] ) . 'px; width: 100%;" src="' . $meta_value . '" class="cmb-file-field-image" alt="" />';
 				}
 
 				$output .= $this->img_status_output( array(

includes/types/CMB2_Type_File_Base.php

Spacing +23 added lines, -23 removed lines

@@ -55,11 +55,11 @@ 
 	 */
 	public function img_status_output( $args ) {
 		return sprintf( '<%1$s class="img-status cmb2-media-item">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>',
-			$args['tag'],
-			$args['image'],
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
+			$args[ 'tag' ],
+			$args[ 'image' ],
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
 			esc_html( $this->_text( 'remove_image_text', esc_html__( 'Remove Image', 'cmb2' ) ) ),
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
 		);
 	}
 
@@ -71,14 +71,14 @@ 
 	 */
 	public function file_status_output( $args ) {
 		return sprintf( '<%1$s class="file-status cmb2-media-item"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>',
-			$args['tag'],
+			$args[ 'tag' ],
 			esc_html( $this->_text( 'file_text', esc_html__( 'File:', 'cmb2' ) ) ),
-			CMB2_Utils::get_file_name_from_path( $args['value'] ),
-			$args['value'],
+			CMB2_Utils::get_file_name_from_path( $args[ 'value' ] ),
+			$args[ 'value' ],
 			esc_html( $this->_text( 'file_download_text', esc_html__( 'Download', 'cmb2' ) ) ),
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
 			esc_html( $this->_text( 'remove_text', esc_html__( 'Remove', 'cmb2' ) ) ),
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
 		);
 	}
 
@@ -103,13 +103,13 @@ 
 		$data = array();
 
 		if ( is_array( $img_size ) ) {
-			$data['width']  = intval( $img_size[0] );
-			$data['height'] = intval( $img_size[1] );
-			$data['name']   = '';
+			$data[ 'width' ]  = intval( $img_size[ 0 ] );
+			$data[ 'height' ] = intval( $img_size[ 1 ] );
+			$data[ 'name' ]   = '';
 
 			// Try and get the closest named size from our array of dimensions
 			if ( $named_size = CMB2_Utils::get_named_size( $img_size ) ) {
-				$data['name'] = $named_size;
+				$data[ 'name' ] = $named_size;
 			}
 		} else {
 
@@ -126,9 +126,9 @@ 
 			}
 
 			// Get image dimensions from named sizes
-			$data['width']  = intval( $image_sizes[ $img_size ]['width'] );
-			$data['height'] = intval( $image_sizes[ $img_size ]['height'] );
-			$data['name']   = $img_size;
+			$data[ 'width' ]  = intval( $image_sizes[ $img_size ][ 'width' ] );
+			$data[ 'height' ] = intval( $image_sizes[ $img_size ][ 'height' ] );
+			$data[ 'name' ]   = $img_size;
 		}
 
 		return $data;
@@ -150,17 +150,17 @@ 
 		foreach ( CMB2_Utils::get_available_image_sizes() as $size => $info ) {
 
 			// registered image size exists for this attachment
-			if ( isset( $meta['sizes'][ $size ] ) ) {
+			if ( isset( $meta[ 'sizes' ][ $size ] ) ) {
 
 				$attachment_url = wp_get_attachment_url( $attachment->ID );
 				$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
-				$size_meta = $meta['sizes'][ $size ];
+				$size_meta = $meta[ 'sizes' ][ $size ];
 
-				$response['sizes'][ $size ] = array(
-					'url'         => $base_url . $size_meta['file'],
-					'height'      => $size_meta['height'],
-					'width'       => $size_meta['width'],
-					'orientation' => $size_meta['height'] > $size_meta['width'] ? 'portrait' : 'landscape',
+				$response[ 'sizes' ][ $size ] = array(
+					'url'         => $base_url . $size_meta[ 'file' ],
+					'height'      => $size_meta[ 'height' ],
+					'width'       => $size_meta[ 'width' ],
+					'orientation' => $size_meta[ 'height' ] > $size_meta[ 'width' ] ? 'portrait' : 'landscape',
 				);
 			}
 		}

includes/CMB2_JS.php

Spacing +5 added lines, -5 removed lines

@@ -56,24 +56,24 @@
 		$min = $debug ? '' : '.min';
 
 		// if colorpicker
-		if ( ! is_admin() && isset( $dependencies['wp-color-picker'] ) ) {
+		if ( ! is_admin() && isset( $dependencies[ 'wp-color-picker' ] ) ) {
 			self::colorpicker_frontend();
 		}
 
 		// if file/file_list
-		if ( isset( $dependencies['media-editor'] ) ) {
+		if ( isset( $dependencies[ 'media-editor' ] ) ) {
 			wp_enqueue_media();
 			CMB2_Type_File_Base::output_js_underscore_templates();
 		}
 
 		// if timepicker
-		if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) {
+		if ( isset( $dependencies[ 'jquery-ui-datetimepicker' ] ) ) {
 			wp_register_script( 'jquery-ui-datetimepicker', CMB2_Utils::url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), CMB2_VERSION );
 		}
 
 		// if cmb2-wysiwyg
-		$enqueue_wysiwyg = isset( $dependencies['cmb2-wysiwyg'] ) && $debug;
-		unset( $dependencies['cmb2-wysiwyg'] );
+		$enqueue_wysiwyg = isset( $dependencies[ 'cmb2-wysiwyg' ] ) && $debug;
+		unset( $dependencies[ 'cmb2-wysiwyg' ] );
 
 		// Enqueue cmb JS
 		wp_enqueue_script( self::$handle, CMB2_Utils::url( "js/cmb2{$min}.js" ), $dependencies, CMB2_VERSION, true );