Completed
Pull Request — trunk (#838)
by Andrew
06:40
created
includes/CMB2_Sanitize.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -357,6 +357,7 @@  discard block
 block discarded – undo
357 357
 	/**
358 358
 	 * Gets the values for the `file` field type from the data being saved.
359 359
 	 * @since  2.2.0
360
+	 * @param string $id_key
360 361
 	 */
361 362
 	public function _get_group_file_value_array( $id_key ) {
362 363
 		$alldata = $this->field->group->data_to_save;
@@ -378,6 +379,7 @@  discard block
 block discarded – undo
378 379
 	/**
379 380
 	 * Peforms saving of `file` attachement's ID
380 381
 	 * @since  1.1.0
382
+	 * @param string $file_id_key
381 383
 	 */
382 384
 	public function _save_file_id_value( $file_id_key ) {
383 385
 		$id_field = $this->_new_supporting_field( $file_id_key );
@@ -398,6 +400,7 @@  discard block
 block discarded – undo
398 400
 	/**
399 401
 	 * Peforms saving of `text_datetime_timestamp_timezone` utc timestamp
400 402
 	 * @since  2.2.0
403
+	 * @param string $utc_key
401 404
 	 */
402 405
 	public function _save_utc_value( $utc_key, $utc_stamp ) {
403 406
 		return $this->_new_supporting_field( $utc_key )->save_field( $utc_stamp );
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 
173 173
 		global $wp_locale;
174 174
 
175
-		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
175
+		$search = array( $wp_locale->number_format[ 'thousands_sep' ], $wp_locale->number_format[ 'decimal_point' ] );
176 176
 		$replace = array( '', '.' );
177 177
 
178 178
 		// for repeatable
@@ -215,8 +215,8 @@  discard block
 block discarded – undo
215 215
 			return $repeat_value;
216 216
 		}
217 217
 
218
-		if ( isset( $this->value['date'], $this->value['time'] ) ) {
219
-			$this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] );
218
+		if ( isset( $this->value[ 'date' ], $this->value[ 'time' ] ) ) {
219
+			$this->value = $this->field->get_timestamp_from_value( $this->value[ 'date' ] . ' ' . $this->value[ 'time' ] );
220 220
 		}
221 221
 
222 222
 		if ( $tz_offset = $this->field->field_timezone_offset() ) {
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 		$tzstring = null;
255 255
 
256 256
 		if ( is_array( $this->value ) && array_key_exists( 'timezone', $this->value ) ) {
257
-			$tzstring = $this->value['timezone'];
257
+			$tzstring = $this->value[ 'timezone' ];
258 258
 		}
259 259
 
260 260
 		if ( empty( $tzstring ) ) {
@@ -274,8 +274,8 @@  discard block
 block discarded – undo
274 274
 			$tzstring = false !== $tzstring ? $tzstring : timezone_name_from_abbr( '', 0, 0 );
275 275
 		}
276 276
 
277
-		$full_format = $this->field->args['date_format'] . ' ' . $this->field->args['time_format'];
278
-		$full_date   = $this->value['date'] . ' ' . $this->value['time'];
277
+		$full_format = $this->field->args[ 'date_format' ] . ' ' . $this->field->args[ 'time_format' ];
278
+		$full_date   = $this->value[ 'date' ] . ' ' . $this->value[ 'time' ];
279 279
 
280 280
 		try {
281 281
 
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 			} else {
299 299
 				// Save the utc timestamp supporting field
300 300
 				if ( $repeat ) {
301
-					$utc_values[ $utc_key ][] = $utc_stamp;
301
+					$utc_values[ $utc_key ][ ] = $utc_stamp;
302 302
 				} else {
303 303
 					$this->_save_utc_value( $utc_key, $utc_stamp );
304 304
 				}
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
 			if ( $this->value ) {
434 434
 				$val = $this->$method( true );
435 435
 				if ( ! empty( $val ) ) {
436
-					$new_value[] = $val;
436
+					$new_value[ ] = $val;
437 437
 				}
438 438
 			}
439 439
 		}
Please login to merge, or discard this patch.
includes/CMB2_Options.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
131 131
 
132 132
 			if ( ! $single ) {
133 133
 				// If multiple, add to array
134
-				$this->options[ $field_id ][] = $value;
134
+				$this->options[ $field_id ][ ] = $value;
135 135
 			} else {
136 136
 				$this->options[ $field_id ] = $value;
137 137
 			}
Please login to merge, or discard this patch.
includes/CMB2_Show_Filters.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -27,15 +27,15 @@  discard block
 block discarded – undo
27 27
 	 * @return mixed                show_on key or false
28 28
 	 */
29 29
 	private static function get_show_on_key( $meta_box_args ) {
30
-		$show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false;
30
+		$show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false;
31 31
 		if ( $show_on && is_array( $show_on ) ) {
32 32
 
33 33
 			if ( array_key_exists( 'key', $show_on ) ) {
34
-				return $show_on['key'];
34
+				return $show_on[ 'key' ];
35 35
 			}
36 36
 
37 37
 			$keys = array_keys( $show_on );
38
-			return $keys[0];
38
+			return $keys[ 0 ];
39 39
 		}
40 40
 
41 41
 		return false;
@@ -51,17 +51,17 @@  discard block
 block discarded – undo
51 51
 	 * @return mixed                show_on value or false
52 52
 	 */
53 53
 	private static function get_show_on_value( $meta_box_args ) {
54
-		$show_on = isset( $meta_box_args['show_on'] ) ? (array) $meta_box_args['show_on'] : false;
54
+		$show_on = isset( $meta_box_args[ 'show_on' ] ) ? (array) $meta_box_args[ 'show_on' ] : false;
55 55
 
56 56
 		if ( $show_on && is_array( $show_on ) ) {
57 57
 
58 58
 			if ( array_key_exists( 'value', $show_on ) ) {
59
-				return $show_on['value'];
59
+				return $show_on[ 'value' ];
60 60
 			}
61 61
 
62 62
 			$keys = array_keys( $show_on );
63 63
 
64
-			return $show_on[ $keys[0] ];
64
+			return $show_on[ $keys[ 0 ] ];
65 65
 		}
66 66
 
67 67
 		return array();
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 		if ( is_admin() ) {
142 142
 
143 143
 			// If there is no 'page' query var, our filter isn't applicable
144
-			if ( ! isset( $_GET['page'] ) ) {
144
+			if ( ! isset( $_GET[ 'page' ] ) ) {
145 145
 				return $display;
146 146
 			}
147 147
 
@@ -153,12 +153,12 @@  discard block
 block discarded – undo
153 153
 
154 154
 			if ( is_array( $show_on ) ) {
155 155
 				foreach ( $show_on as $page ) {
156
-					if ( $_GET['page'] == $page ) {
156
+					if ( $_GET[ 'page' ] == $page ) {
157 157
 						return true;
158 158
 					}
159 159
 				}
160 160
 			} else {
161
-				if ( $_GET['page'] == $show_on ) {
161
+				if ( $_GET[ 'page' ] == $show_on ) {
162 162
 					return true;
163 163
 				}
164 164
 			}
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Base.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -84,7 +84,6 @@  discard block
 block discarded – undo
84 84
 
85 85
 	/**
86 86
 	 * Fall back to CMB2_Types methods
87
-	 * @param string $field
88 87
 	 * @throws Exception Throws an exception if the field is invalid.
89 88
 	 * @return mixed
90 89
 	 */
@@ -105,7 +104,7 @@  discard block
 block discarded – undo
105 104
 	 * Magic getter for our object.
106 105
 	 * @param string $field
107 106
 	 * @throws Exception Throws an exception if the field is invalid.
108
-	 * @return mixed
107
+	 * @return CMB2_Field
109 108
 	 */
110 109
 	public function __get( $field ) {
111 110
 		switch ( $field ) {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	public function __construct( CMB2_Types $types, $args = array() ) {
40 40
 		$this->types = $types;
41
-		$args['rendered'] = isset( $args['rendered'] ) ? (bool) $args['rendered'] : true;
41
+		$args[ 'rendered' ] = isset( $args[ 'rendered' ] ) ? (bool) $args[ 'rendered' ] : true;
42 42
 		$this->args = $args;
43 43
 	}
44 44
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	 * @return string|CMB2_Type_Base           Rendered output or this object.
57 57
 	 */
58 58
 	public function rendered( $rendered ) {
59
-		if ( $this->args['rendered'] ) {
59
+		if ( $this->args[ 'rendered' ] ) {
60 60
 			return is_a( $rendered, __CLASS__ ) ? $rendered->rendered : $rendered;
61 61
 		}
62 62
 
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Text_Datetime_Timestamp.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -38,6 +38,9 @@  discard block
 block discarded – undo
38 38
 		return $date_input . "\n" . $time_input;
39 39
 	}
40 40
 
41
+	/**
42
+	 * @param boolean $has_good_value
43
+	 */
41 44
 	public function date_args( $args, $has_good_value ) {
42 45
 		$date_args = wp_parse_args( $args['datepicker'], array(
43 46
 			'class' => 'cmb2-text-small cmb2-datepicker',
@@ -51,6 +54,9 @@  discard block
 block discarded – undo
51 54
 		return $this->parse_picker_options( 'date', $date_args );
52 55
 	}
53 56
 
57
+	/**
58
+	 * @param boolean $has_good_value
59
+	 */
54 60
 	public function time_args( $args, $has_good_value ) {
55 61
 		$time_args = wp_parse_args( $args['timepicker'], array(
56 62
 			'class' => 'cmb2-timepicker text-time',
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -22,16 +22,16 @@  discard block
 block discarded – undo
22 22
 			'timepicker' => array(),
23 23
 		) );
24 24
 
25
-		if ( empty( $args['value'] ) ) {
26
-			$args['value'] = $field->escaped_value();
25
+		if ( empty( $args[ 'value' ] ) ) {
26
+			$args[ 'value' ] = $field->escaped_value();
27 27
 			// This will be used if there is a select_timezone set for this field
28 28
 			$tz_offset = $field->field_timezone_offset();
29 29
 			if ( ! empty( $tz_offset ) ) {
30
-				$args['value'] -= $tz_offset;
30
+				$args[ 'value' ] -= $tz_offset;
31 31
 			}
32 32
 		}
33 33
 
34
-		$has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] );
34
+		$has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] );
35 35
 
36 36
 		$date_input = parent::render( $this->date_args( $args, $has_good_value ) );
37 37
 		$time_input = parent::render( $this->time_args( $args, $has_good_value ) );
@@ -40,31 +40,31 @@  discard block
 block discarded – undo
40 40
 	}
41 41
 
42 42
 	public function date_args( $args, $has_good_value ) {
43
-		$date_args = wp_parse_args( $args['datepicker'], array(
43
+		$date_args = wp_parse_args( $args[ 'datepicker' ], array(
44 44
 			'class' => 'cmb2-text-small cmb2-datepicker',
45 45
 			'name'  => $this->_name( '[date]' ),
46 46
 			'id'    => $this->_id( '_date' ),
47
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '',
47
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '',
48 48
 			'desc'  => '',
49 49
 		) );
50 50
 
51
-		$date_args['rendered'] = true;
51
+		$date_args[ 'rendered' ] = true;
52 52
 
53 53
 		// Let's get the date-format, and set it up as a data attr for the field.
54 54
 		return $this->parse_picker_options( 'date', $date_args );
55 55
 	}
56 56
 
57 57
 	public function time_args( $args, $has_good_value ) {
58
-		$time_args = wp_parse_args( $args['timepicker'], array(
58
+		$time_args = wp_parse_args( $args[ 'timepicker' ], array(
59 59
 			'class' => 'cmb2-timepicker text-time',
60 60
 			'name'  => $this->_name( '[time]' ),
61 61
 			'id'    => $this->_id( '_time' ),
62
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '',
63
-			'desc'  => $args['desc'],
62
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '',
63
+			'desc'  => $args[ 'desc' ],
64 64
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
65 65
 		) );
66 66
 
67
-		$time_args['rendered'] = true;
67
+		$time_args[ 'rendered' ] = true;
68 68
 
69 69
 		// Let's get the time-format, and set it up as a data attr for the field.
70 70
 		return $this->parse_picker_options( 'time', $time_args );
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Oembed.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 			'data-objecttype' => $field->object_type,
34 34
 		) )
35 35
 		. '<p class="cmb-spinner spinner" style="display:none;"></p>'
36
-		. '<div id="'. $this->_id( '-status' ). '" class="cmb2-media-status ui-helper-clearfix embed_wrap">' . $oembed . '</div>';
36
+		. '<div id="' . $this->_id( '-status' ) . '" class="cmb2-media-status ui-helper-clearfix embed_wrap">' . $oembed . '</div>';
37 37
 	}
38 38
 
39 39
 }
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Select_Timezone.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 
15 15
 	public function render() {
16 16
 
17
-		$this->field->args['default'] = $this->field->get_default()
17
+		$this->field->args[ 'default' ] = $this->field->get_default()
18 18
 			? $this->field->get_default()
19 19
 			: cmb2_utils()->timezone_string();
20 20
 
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Taxonomy_Multicheck.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 				);
37 37
 
38 38
 				if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) {
39
-					$args['checked'] = 'checked';
39
+					$args[ 'checked' ] = 'checked';
40 40
 				}
41 41
 				$options .= $this->types->list_input( $args, $i );
42 42
 				$i++;
Please login to merge, or discard this patch.
includes/types/CMB2_Type_Checkbox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 			: $this->is_checked;
48 48
 
49 49
 		if ( $is_checked ) {
50
-			$defaults['checked'] = 'checked';
50
+			$defaults[ 'checked' ] = 'checked';
51 51
 		}
52 52
 
53 53
 		$args = $this->parse_args( 'checkbox', $defaults );
Please login to merge, or discard this patch.