Completed
Pull Request — trunk (#752)
by
unknown
06:18
created
includes/CMB2_Utils.php 2 patches
Spacing   +21 added lines, -22 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		$dir = wp_upload_dir();
38 38
 
39 39
 		// Is URL in uploads directory?
40
-		if ( false === strpos( $img_url, $dir['baseurl'] . '/' ) ) {
40
+		if ( false === strpos( $img_url, $dir[ 'baseurl' ] . '/' ) ) {
41 41
 			return false;
42 42
 		}
43 43
 
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 
63 63
 			foreach ( $query->posts as $post_id ) {
64 64
 				$meta = wp_get_attachment_metadata( $post_id );
65
-				$original_file       = basename( $meta['file'] );
66
-				$cropped_image_files = isset( $meta['sizes'] ) ? wp_list_pluck( $meta['sizes'], 'file' ) : array();
65
+				$original_file       = basename( $meta[ 'file' ] );
66
+				$cropped_image_files = isset( $meta[ 'sizes' ] ) ? wp_list_pluck( $meta[ 'sizes' ], 'file' ) : array();
67 67
 				if ( $original_file === $file || in_array( $file, $cropped_image_files ) ) {
68 68
 					$attachment_id = $post_id;
69 69
 					break;
@@ -147,8 +147,7 @@  discard block
 block discarded – undo
147 147
 		}
148 148
 
149 149
 		return self::is_valid_time_stamp( $string )
150
-			? (int) $string :
151
-			strtotime( (string) $string );
150
+			? (int) $string : strtotime( (string) $string );
152 151
 	}
153 152
 
154 153
 	/**
@@ -179,7 +178,7 @@  discard block
 block discarded – undo
179 178
 	 * @param  mixed $value Value to check
180 179
 	 * @return bool         True or false
181 180
 	 */
182
-	public static function notempty( $value ){
181
+	public static function notempty( $value ) {
183 182
 		return null !== $value && '' !== $value && false !== $value;
184 183
 	}
185 184
 
@@ -337,24 +336,24 @@  discard block
 block discarded – undo
337 336
 
338 337
 		// order is relevant here, since the replacement will be done sequentially.
339 338
 		$supported_options = array(
340
-			'd' => 'dd',  // Day, leading 0
341
-			'j' => 'd',   // Day, no 0
342
-			'z' => 'o',   // Day of the year, no leading zeroes,
339
+			'd' => 'dd', // Day, leading 0
340
+			'j' => 'd', // Day, no 0
341
+			'z' => 'o', // Day of the year, no leading zeroes,
343 342
 			// 'D' => 'D',   // Day name short, not sure how it'll work with translations
344 343
 			// 'l' => 'DD',  // Day name full, idem before
345
-			'm' => 'mm',  // Month of the year, leading 0
346
-			'n' => 'm',   // Month of the year, no leading 0
344
+			'm' => 'mm', // Month of the year, leading 0
345
+			'n' => 'm', // Month of the year, no leading 0
347 346
 			// 'M' => 'M',   // Month, Short name
348 347
 			// 'F' => 'MM',  // Month, full name,
349
-			'y' => 'y',   // Year, two digit
350
-			'Y' => 'yy',  // Year, full
351
-			'H' => 'HH',  // Hour with leading 0 (24 hour)
352
-			'G' => 'H',   // Hour with no leading 0 (24 hour)
353
-			'h' => 'hh',  // Hour with leading 0 (12 hour)
354
-			'g' => 'h',   // Hour with no leading 0 (12 hour),
355
-			'i' => 'mm',  // Minute with leading 0,
356
-			's' => 'ss',  // Second with leading 0,
357
-			'a' => 'tt',  // am/pm
348
+			'y' => 'y', // Year, two digit
349
+			'Y' => 'yy', // Year, full
350
+			'H' => 'HH', // Hour with leading 0 (24 hour)
351
+			'G' => 'H', // Hour with no leading 0 (24 hour)
352
+			'h' => 'hh', // Hour with leading 0 (12 hour)
353
+			'g' => 'h', // Hour with no leading 0 (12 hour),
354
+			'i' => 'mm', // Minute with leading 0,
355
+			's' => 'ss', // Second with leading 0,
356
+			'a' => 'tt', // am/pm
358 357
 			'A' => 'TT'   // AM/PM
359 358
 		);
360 359
 
@@ -375,7 +374,7 @@  discard block
 block discarded – undo
375 374
 	 * @return string Modified value
376 375
 	 */
377 376
 	public static function wrap_escaped_chars( $value ) {
378
-		return "'" . str_replace( '\\', '', $value[0] ) . "'";
377
+		return "'" . str_replace( '\\', '', $value[ 0 ] ) . "'";
379 378
 	}
380 379
 
381 380
 	/**
@@ -435,7 +434,7 @@  discard block
 block discarded – undo
435 434
 	 * @return string               String of attributes for form element.
436 435
 	 */
437 436
 	public static function concat_attrs( $attrs, $attr_exclude = array() ) {
438
-		$attr_exclude[] = 'rendered';
437
+		$attr_exclude[ ] = 'rendered';
439 438
 		$attributes = '';
440 439
 		foreach ( $attrs as $attr => $val ) {
441 440
 			$excluded = in_array( $attr, (array) $attr_exclude, true );
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,7 +122,8 @@  discard block
 block discarded – undo
122 122
 			$tzstring = '';
123 123
 		}
124 124
 
125
-		if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
125
+		if ( empty( $tzstring ) ) {
126
+// Create a UTC+- zone if no timezone string exists
126 127
 			if ( 0 == $current_offset ) {
127 128
 				$tzstring = 'UTC+0';
128 129
 			} elseif ( $current_offset < 0 ) {
@@ -179,7 +180,7 @@  discard block
 block discarded – undo
179 180
 	 * @param  mixed $value Value to check
180 181
 	 * @return bool         True or false
181 182
 	 */
182
-	public static function notempty( $value ){
183
+	public static function notempty( $value ) {
183 184
 		return null !== $value && '' !== $value && false !== $value;
184 185
 	}
185 186
 
Please login to merge, or discard this patch.
includes/types/CMB2_Type_File_Base.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -55,11 +55,11 @@  discard block
 block discarded – undo
55 55
 	 */
56 56
 	public function img_status_output( $args ) {
57 57
 		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>',
58
-			$args['tag'],
59
-			$args['image'],
60
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
58
+			$args[ 'tag' ],
59
+			$args[ 'image' ],
60
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
61 61
 			esc_html( $this->_text( 'remove_image_text', esc_html__( 'Remove Image', 'cmb2' ) ) ),
62
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
62
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
63 63
 		);
64 64
 	}
65 65
 
@@ -71,14 +71,14 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	public function file_status_output( $args ) {
73 73
 		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>',
74
-			$args['tag'],
74
+			$args[ 'tag' ],
75 75
 			esc_html( $this->_text( 'file_text', esc_html__( 'File:', 'cmb2' ) ) ),
76
-			CMB2_Utils::get_file_name_from_path( $args['value'] ),
77
-			$args['value'],
76
+			CMB2_Utils::get_file_name_from_path( $args[ 'value' ] ),
77
+			$args[ 'value' ],
78 78
 			esc_html( $this->_text( 'file_download_text', esc_html__( 'Download', 'cmb2' ) ) ),
79
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
79
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
80 80
 			esc_html( $this->_text( 'remove_text', esc_html__( 'Remove', 'cmb2' ) ) ),
81
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
81
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
82 82
 		);
83 83
 	}
84 84
 
Please login to merge, or discard this patch.
includes/CMB2_Types.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 
171 171
 		$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() ) );
172 172
 
173
-		$message[] = is_object( $this->type )
173
+		$message[ ] = is_object( $this->type )
174 174
 			? esc_html__( 'That field type may not work as expected.', 'cmb2' )
175 175
 			: esc_html__( 'That field type will not work as expected.', 'cmb2' );
176 176
 
177
-		$message[] = esc_html__( 'For more information about this change see: https://github.com/mustardBees/cmb-field-select2/pull/34w', 'cmb2' );
177
+		$message[ ] = esc_html__( 'For more information about this change see: https://github.com/mustardBees/cmb-field-select2/pull/34w', 'cmb2' );
178 178
 
179 179
 		_doing_it_wrong( __CLASS__ . '::' . $method, implode( ' ', $message ), '2.2.2' );
180 180
 	}
@@ -394,8 +394,8 @@  discard block
 block discarded – undo
394 394
 			'class' => 'cmb2-hidden',
395 395
 		);
396 396
 		if ( $this->field->group ) {
397
-			$args['data-groupid'] = $this->field->group->id();
398
-			$args['data-iterator'] = $this->iterator;
397
+			$args[ 'data-groupid' ] = $this->field->group->id();
398
+			$args[ 'data-iterator' ] = $this->iterator;
399 399
 		}
400 400
 		return $this->input( $args );
401 401
 	}
Please login to merge, or discard this patch.
includes/CMB2_Base.php 3 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -370,15 +370,13 @@
 block discarded – undo
370 370
 			if ( function_exists( '__' ) ) {
371 371
 				if ( ! is_null( $message ) ) {
372 372
 					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 ) );
373
-				}
374
-				else {
373
+				} else {
375 374
 					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 ) );
376 375
 				}
377 376
 			} else {
378 377
 				if ( ! is_null( $message ) ) {
379 378
 					trigger_error( sprintf( '%1$s was called with a parameter that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
380
-				}
381
-				else {
379
+				} else {
382 380
 					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 ) );
383 381
 				}
384 382
 			}
Please login to merge, or discard this patch.
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -413,7 +413,6 @@
 block discarded – undo
413 413
 	 * Allows overloading the object with methods... Whooaaa oooh it's magic, y'knoooow.
414 414
 	 * @since 1.0.0
415 415
 	 * @param string $method Non-existent method.
416
-	 * @param array  $arguments All arguments passed to the method
417 416
 	 */
418 417
 	public function __call( $method, $args ) {
419 418
 		$object_class = strtolower( get_class( $this ) );
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -335,11 +335,11 @@  discard block
 block discarded – undo
335 335
 			switch ( $message ) {
336 336
 
337 337
 				case self::DEPRECATED_PARAM:
338
-					$message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] );
338
+					$message = sprintf( __( 'The "%s" field parameter has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] );
339 339
 					break;
340 340
 
341 341
 				case self::DEPRECATED_CB_PARAM:
342
-					$message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[3], $args[4] );
342
+					$message = sprintf( __( 'Using the "%s" field parameter as a callback has been deprecated in favor of the "%s" parameter.', 'cmb2' ), $args[ 3 ], $args[ 4 ] );
343 343
 					break;
344 344
 
345 345
 				default:
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 	public function __call( $method, $args ) {
419 419
 		$object_class = strtolower( get_class( $this ) );
420 420
 
421
-		if ( ! has_filter(  "{$object_class}_inherit_{$method}" ) ) {
421
+		if ( ! has_filter( "{$object_class}_inherit_{$method}" ) ) {
422 422
 			throw new Exception( 'Invalid ' . get_class( $this ) . ' method: ' . $method );
423 423
 		}
424 424
 
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Multi_Base.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@  discard block
 block discarded – undo
18 18
 	 * @return string Generated optgroup element html
19 19
 	 */
20 20
 	public function select_optgroup( $args = array() ) {
21
-		return sprintf( "\t" . '<optgroup label="%s">' . "\n", $args['label']) . 
22
-			$args['options'] .
21
+		return sprintf( "\t" . '<optgroup label="%s">' . "\n", $args[ 'label' ] ) . 
22
+			$args[ 'options' ] .
23 23
 			sprintf( "\n\t</optgroup>\n" );
24 24
 	}
25 25
 	
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 * @return string       Generated option element html
31 31
 	 */
32 32
 	public function select_option( $args = array() ) {
33
-		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n";
33
+		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n";
34 34
 	}
35 35
 
36 36
 	/**
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 			'label' => '',
51 51
 		), $args );
52 52
 
53
-		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] );
53
+		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] );
54 54
 	}
55 55
 
56 56
 	/**
@@ -62,10 +62,10 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public function list_input_checkbox( $args, $i ) {
64 64
 		$saved_value = $this->field->escaped_value();
65
-		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
66
-			$args['checked'] = 'checked';
65
+		if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) {
66
+			$args[ 'checked' ] = 'checked';
67 67
 		}
68
-		$args['type'] = 'checkbox';
68
+		$args[ 'type' ] = 'checkbox';
69 69
 		return $this->list_input( $args, $i );
70 70
 	}
71 71
 
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
 	public function concat_items( $args = array() ) {
79 79
 		$field = $this->field;
80 80
 
81
-		$method = isset( $args['method'] ) ? $args['method'] : 'select_option';
82
-		unset( $args['method'] );
81
+		$method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option';
82
+		unset( $args[ 'method' ] );
83 83
 
84 84
 		$value = null !== $field->escaped_value()
85 85
 			? $field->escaped_value()
@@ -101,12 +101,12 @@  discard block
 block discarded – undo
101 101
 			// Clone args & modify for just this item
102 102
 			$a = $args;
103 103
 
104
-			$a['value'] = $opt_value;
105
-			$a['label'] = $opt_label;
104
+			$a[ 'value' ] = $opt_value;
105
+			$a[ 'label' ] = $opt_label;
106 106
 
107 107
 			// Check if this option is the value of the input
108 108
 			if ( $value === $opt_value ) {
109
-				$a['checked'] = 'checked';
109
+				$a[ 'checked' ] = 'checked';
110 110
 			}
111 111
 
112 112
 			$concatenated_items .= $this->$method( $a, $i++ );
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Taxonomy_Select.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
  */
13 13
 class CMB2_Type_Taxonomy_Select extends CMB2_Type_Taxonomy_Base {
14 14
 
15
-	private function render_options( $terms , $saved_term ) {
15
+	private function render_options( $terms, $saved_term ) {
16 16
 		$options = '';
17 17
 		foreach ( $terms as $term ) {
18 18
 			$options .= $this->select_option( array(
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	public function render() {
28 28
 		$names = $this->get_object_terms();
29 29
 
30
-		$saved_term  = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[key( $names )]->slug;
30
+		$saved_term  = is_wp_error( $names ) || empty( $names ) ? $this->field->get_default() : $names[ key( $names ) ]->slug;
31 31
 		$terms       = $this->get_terms();
32 32
 		$options     = '';
33 33
 		$option_none = $this->field->args( 'show_option_none' );
@@ -69,22 +69,22 @@  discard block
 block discarded – undo
69 69
 				$groups = array();
70 70
 				foreach ( $terms as $term ) {
71 71
 					if ( $term->parent == 0 ) {
72
-						if ( isset( $groups[$term->term_id] ) ) {
73
-							$groups[$term->term_id]['term'] = $term;
72
+						if ( isset( $groups[ $term->term_id ] ) ) {
73
+							$groups[ $term->term_id ][ 'term' ] = $term;
74 74
 						} else {
75
-							$groups[$term->term_id] = array( 'term' => $term, 'children' => array() );
75
+							$groups[ $term->term_id ] = array( 'term' => $term, 'children' => array() );
76 76
 						}
77 77
 					} else {
78
-						if ( !isset( $groups[$term->parent] ) ) {
79
-							$groups[$term->parent] = array('term' => null, 'children' => array() );
78
+						if ( ! isset( $groups[ $term->parent ] ) ) {
79
+							$groups[ $term->parent ] = array( 'term' => null, 'children' => array() );
80 80
 						}
81
-						$groups[$term->parent]['children'][] = $term;
81
+						$groups[ $term->parent ][ 'children' ][ ] = $term;
82 82
 					}
83 83
 				}
84
-				foreach( $groups as $group ) {
85
-					$options .= $this->select_optgroup( array (
86
-							'label' => $group['term']->name,
87
-							'options' => $this->render_options( $group['children'], $saved_term )
84
+				foreach ( $groups as $group ) {
85
+					$options .= $this->select_optgroup( array(
86
+							'label' => $group[ 'term' ]->name,
87
+							'options' => $this->render_options( $group[ 'children' ], $saved_term )
88 88
 					) );
89 89
 				}
90 90
 			} else {
Please login to merge, or discard this patch.