WebDevStudios / CMB2

includes/CMB2_Utils.php

Spacing +21 added lines, -22 removed lines

@@ -37,7 +37,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;
 		}
 
@@ -62,8 +62,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;
@@ -147,8 +147,7 @@ 
 		}
 
 		return self::is_valid_time_stamp( $string )
-			? (int) $string :
-			strtotime( (string) $string );
+			? (int) $string : strtotime( (string) $string );
 	}
 
 	/**
@@ -179,7 +178,7 @@ 
 	 * @param  mixed $value Value to check
 	 * @return bool         True or false
 	 */
-	public static function notempty( $value ){
+	public static function notempty( $value ) {
 		return null !== $value && '' !== $value && false !== $value;
 	}
 
@@ -337,24 +336,24 @@ 
 
 		// 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
+			'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
 		);
 
@@ -375,7 +374,7 @@ 
 	 * @return string Modified value
 	 */
 	public static function wrap_escaped_chars( $value ) {
-		return "'" . str_replace( '\\', '', $value[0] ) . "'";
+		return "'" . str_replace( '\\', '', $value[ 0 ] ) . "'";
 	}
 
 	/**
@@ -435,7 +434,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 +3 added lines, -2 removed lines

@@ -122,7 +122,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 ) {
@@ -179,7 +180,7 @@ 
 	 * @param  mixed $value Value to check
 	 * @return bool         True or false
 	 */
-	public static function notempty( $value ){
+	public static function notempty( $value ) {
 		return null !== $value && '' !== $value && false !== $value;
 	}
 

includes/types/CMB2_Type_File_Base.php

Spacing +9 added lines, -9 removed lines

@@ -55,11 +55,11 @@ 
 	 */
 	public function img_status_output( $args ) {
 		return sprintf( '<%1$s class="img-status">%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"><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' ] : ''
 		);
 	}
 

includes/CMB2_Types.php

Spacing +4 added lines, -4 removed lines

@@ -170,11 +170,11 @@ 
 
 		$message = array( sprintf( esc_html__( 'Custom field types require a Type object instantiation to use this method. This method was called by the \'%s\' field type.' ), $this->field->type() ) );
 
-		$message[] = is_object( $this->type )
+		$message[ ] = is_object( $this->type )
 			? esc_html__( 'That field type may not work as expected.', 'cmb2' )
 			: esc_html__( 'That field type will not work as expected.', 'cmb2' );
 
-		$message[] = esc_html__( 'For more information about this change see: https://github.com/mustardBees/cmb-field-select2/pull/34w', 'cmb2' );
+		$message[ ] = esc_html__( 'For more information about this change see: https://github.com/mustardBees/cmb-field-select2/pull/34w', 'cmb2' );
 
 		_doing_it_wrong( __CLASS__ . '::' . $method, implode( ' ', $message ), '2.2.2' );
 	}
@@ -394,8 +394,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->input( $args );
 	}

includes/CMB2_Base.php

Braces +2 added lines, -4 removed lines

@@ -370,15 +370,13 @@
 			if ( function_exists( '__' ) ) {
 				if ( ! is_null( $message ) ) {
 					trigger_error( sprintf( __( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s! %3$s', 'cmb2' ), $function, $version, $message ) );
-				}
-				else {
+				} else {
 					trigger_error( sprintf( __( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s with no alternative available.', 'cmb2' ), $function, $version ) );
 				}
 			} else {
 				if ( ! is_null( $message ) ) {
 					trigger_error( sprintf( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
-				}
-				else {
+				} else {
 					trigger_error( sprintf( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
 				}
 			}

Doc Comments -1 removed lines

@@ -413,7 +413,6 @@
 	 * Allows overloading the object with methods... Whooaaa oooh it's magic, y'knoooow.
 	 * @since 1.0.0
 	 * @param string $method Non-existent method.
-	 * @param array  $arguments All arguments passed to the method
 	 */
 	public function __call( $method, $args ) {
 		$object_class = strtolower( get_class( $this ) );

Spacing +3 added lines, -3 removed lines

@@ -335,11 +335,11 @@ 
 			switch ( $message ) {
 
 				case self::DEPRECATED_PARAM:
-					$message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] );
+					$message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] );
 					break;
 
 				case self::DEPRECATED_CB_PARAM:
-					$message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] );
+					$message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] );
 					break;
 
 				default:
@@ -418,7 +418,7 @@ 
 	public function __call( $method, $args ) {
 		$object_class = strtolower( get_class( $this ) );
 
-		if ( ! has_filter(  "{$object_class}_inherit_{$method}" ) ) {
+		if ( ! has_filter( "{$object_class}_inherit_{$method}" ) ) {
 			throw new Exception( 'Invalid ' . get_class( $this ) . ' method: ' . $method );
 		}
 

includes/types/CMB2_Type_Multi_Base.php

Spacing +12 added lines, -12 removed lines

@@ -18,8 +18,8 @@ 
 	 * @return string Generated optgroup element html
 	 */
 	public function select_optgroup( $args = array() ) {
-		return sprintf( "\t" . '<optgroup label="%s">' . "\n", $args['label']) . 
-			$args['options'] .
+		return sprintf( "\t" . '<optgroup label="%s">' . "\n", $args[ 'label' ] ) . 
+			$args[ 'options' ] .
 			sprintf( "\n\t</optgroup>\n" );
 	}
 	
@@ -30,7 +30,7 @@ 
 	 * @return string       Generated option element html
 	 */
 	public function select_option( $args = array() ) {
-		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n";
+		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n";
 	}
 
 	/**
@@ -50,7 +50,7 @@ 
 			'label' => '',
 		), $args );
 
-		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] );
+		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] );
 	}
 
 	/**
@@ -62,10 +62,10 @@ 
 	 */
 	public function list_input_checkbox( $args, $i ) {
 		$saved_value = $this->field->escaped_value();
-		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
-			$args['checked'] = 'checked';
+		if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) {
+			$args[ 'checked' ] = 'checked';
 		}
-		$args['type'] = 'checkbox';
+		$args[ 'type' ] = 'checkbox';
 		return $this->list_input( $args, $i );
 	}
 
@@ -78,8 +78,8 @@ 
 	public function concat_items( $args = array() ) {
 		$field = $this->field;
 
-		$method = isset( $args['method'] ) ? $args['method'] : 'select_option';
-		unset( $args['method'] );
+		$method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option';
+		unset( $args[ 'method' ] );
 
 		$value = null !== $field->escaped_value()
 			? $field->escaped_value()
@@ -101,12 +101,12 @@ 
 			// Clone args & modify for just this item
 			$a = $args;
 
-			$a['value'] = $opt_value;
-			$a['label'] = $opt_label;
+			$a[ 'value' ] = $opt_value;
+			$a[ 'label' ] = $opt_label;
 
 			// Check if this option is the value of the input
 			if ( $value === $opt_value ) {
-				$a['checked'] = 'checked';
+				$a[ 'checked' ] = 'checked';
 			}
 
 			$concatenated_items .= $this->$method( $a, $i++ );

includes/types/CMB2_Type_Taxonomy_Select.php

Spacing +12 added lines, -12 removed lines

@@ -12,7 +12,7 @@ 
  */
 class CMB2_Type_Taxonomy_Select extends CMB2_Type_Taxonomy_Base {
 
-	private function render_options( $terms , $saved_term ) {
+	private function render_options( $terms, $saved_term ) {
 		$options = '';
 		foreach ( $terms as $term ) {
 			$options .= $this->select_option( array(
@@ -27,7 +27,7 @@ 
 	public function render() {
 		$names = $this->get_object_terms();
 
-		$saved_term  = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[key( $names )]->slug;
+		$saved_term  = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[ key( $names ) ]->slug;
 		$terms       = $this->get_terms();
 		$options     = '';
 		$option_none = $this->field->args( 'show_option_none' );
@@ -69,22 +69,22 @@ 
 				$groups = array();
 				foreach ( $terms as $term ) {
 					if ( $term->parent == 0 ) {
-						if ( isset( $groups[$term->term_id] ) ) {
-							$groups[$term->term_id]['term'] = $term;
+						if ( isset( $groups[ $term->term_id ] ) ) {
+							$groups[ $term->term_id ][ 'term' ] = $term;
 						} else {
-							$groups[$term->term_id] = array( 'term' => $term, 'children' => array() );
+							$groups[ $term->term_id ] = array( 'term' => $term, 'children' => array() );
 						}
 					} else {
-						if ( !isset( $groups[$term->parent] ) ) {
-							$groups[$term->parent] = array('term' => null, 'children' => array() );
+						if ( ! isset( $groups[ $term->parent ] ) ) {
+							$groups[ $term->parent ] = array( 'term' => null, 'children' => array() );
 						}
-						$groups[$term->parent]['children'][] = $term;
+						$groups[ $term->parent ][ 'children' ][ ] = $term;
 					}
 				}
-				foreach( $groups as $group ) {
-					$options .= $this->select_optgroup( array (
-							'label' => $group['term']->name,
-							'options' => $this->render_options( $group['children'], $saved_term )
+				foreach ( $groups as $group ) {
+					$options .= $this->select_optgroup( array(
+							'label' => $group[ 'term' ]->name,
+							'options' => $this->render_options( $group[ 'children' ], $saved_term )
 					) );
 				}
 			} else {