Completed
Pull Request — trunk (#696)
by
unknown
02:52
created
includes/helper-functions.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -86,18 +86,18 @@  discard block
 block discarded – undo
86 86
 	$oembed = cmb2_ajax()->get_oembed_no_edit( $args );
87 87
 
88 88
 	// Send back our embed
89
-	if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
90
-		return '<div class="cmb2-oembed">' . $oembed['embed'] . '</div>';
89
+	if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) {
90
+		return '<div class="cmb2-oembed">' . $oembed[ 'embed' ] . '</div>';
91 91
 	}
92 92
 
93 93
 	$error = sprintf(
94 94
 		/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
95 95
 		esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
96
-		$oembed['fallback'],
96
+		$oembed[ 'fallback' ],
97 97
 		'<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>'
98 98
 	);
99 99
 
100
-	if ( isset( $args['wp_error'] ) && $args['wp_error'] ) {
100
+	if ( isset( $args[ 'wp_error' ] ) && $args[ 'wp_error' ] ) {
101 101
 		return new WP_Error( 'cmb2_get_oembed_result', $wp_error, compact( 'oembed', 'args' ) );
102 102
 	}
103 103
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		$cmb = CMB2_Boxes::get( $meta_box );
213 213
 	} else {
214 214
 		// See if we already have an instance of this metabox
215
-		$cmb = CMB2_Boxes::get( $meta_box['id'] );
215
+		$cmb = CMB2_Boxes::get( $meta_box[ 'id' ] );
216 216
 		// If not, we'll initate a new metabox
217 217
 		$cmb = $cmb ? $cmb : new CMB2( $meta_box, $object_id );
218 218
 	}
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 	) );
289 289
 
290 290
 	// Set object type explicitly (rather than trying to guess from context)
291
-	$cmb->object_type( $args['object_type'] );
291
+	$cmb->object_type( $args[ 'object_type' ] );
292 292
 
293 293
 	// Save the metabox if it's been submitted
294 294
 	// check permissions
@@ -296,32 +296,32 @@  discard block
 block discarded – undo
296 296
 	if (
297 297
 		$cmb->prop( 'save_fields' )
298 298
 		// check nonce
299
-		&& isset( $_POST['submit-cmb'], $_POST['object_id'], $_POST[ $cmb->nonce() ] )
299
+		&& isset( $_POST[ 'submit-cmb' ], $_POST[ 'object_id' ], $_POST[ $cmb->nonce() ] )
300 300
 		&& wp_verify_nonce( $_POST[ $cmb->nonce() ], $cmb->nonce() )
301
-		&& $object_id && $_POST['object_id'] == $object_id
301
+		&& $object_id && $_POST[ 'object_id' ] == $object_id
302 302
 	) {
303 303
 		$cmb->save_fields( $object_id, $cmb->object_type(), $_POST );
304 304
 	}
305 305
 
306 306
 	// Enqueue JS/CSS
307
-	if ( $args['cmb_styles'] ) {
307
+	if ( $args[ 'cmb_styles' ] ) {
308 308
 		CMB2_hookup::enqueue_cmb_css();
309 309
 	}
310 310
 
311
-	if ( $args['enqueue_js'] ) {
311
+	if ( $args[ 'enqueue_js' ] ) {
312 312
 		CMB2_hookup::enqueue_cmb_js();
313 313
 	}
314 314
 
315
-	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args['form_format'], $object_id, $cmb );
315
+	$form_format = apply_filters( 'cmb2_get_metabox_form_format', $args[ 'form_format' ], $object_id, $cmb );
316 316
 
317 317
 	$format_parts = explode( '%3$s', $form_format );
318 318
 
319 319
 	// Show cmb form
320
-	printf( $format_parts[0], $cmb->cmb_id, $object_id );
320
+	printf( $format_parts[ 0 ], $cmb->cmb_id, $object_id );
321 321
 	$cmb->show_form();
322 322
 
323
-	if ( isset( $format_parts[1] ) && $format_parts[1] ) {
324
-		printf( str_ireplace( '%4$s', '%1$s', $format_parts[1] ), $args['save_button'] );
323
+	if ( isset( $format_parts[ 1 ] ) && $format_parts[ 1 ] ) {
324
+		printf( str_ireplace( '%4$s', '%1$s', $format_parts[ 1 ] ), $args[ 'save_button' ] );
325 325
 	}
326 326
 
327 327
 }
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
  * @param  array   $args      Optional arguments array
335 335
  */
336 336
 function cmb2_metabox_form( $meta_box, $object_id = 0, $args = array() ) {
337
-	if ( ! isset( $args['echo'] ) || $args['echo'] ) {
337
+	if ( ! isset( $args[ 'echo' ] ) || $args[ 'echo' ] ) {
338 338
 		cmb2_print_metabox_form( $meta_box, $object_id, $args );
339 339
 	} else {
340 340
 		return cmb2_get_metabox_form( $meta_box, $object_id, $args );
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 
357 357
 		$schedule_format = str_replace(
358 358
 			array( 'M', 'Y', 'm', 'd', 'H', 'i', 'a' ),
359
-			array('%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
359
+			array( '%b', '%Y', '%m', '%d', '%H', '%M', '%p' ),
360 360
 			$date_format
361 361
 		);
362 362
 
@@ -373,14 +373,14 @@  discard block
 block discarded – undo
373 373
 			 * 4 or 2 characters, as needed
374 374
 			 */
375 375
 			'%04d-%02d-%02d %02d:%02d:%02d',
376
-			$parsed_time['tm_year'] + 1900,  // This will be "111", so we need to add 1900.
377
-			$parsed_time['tm_mon'] + 1,      // This will be the month minus one, so we add one.
378
-			$parsed_time['tm_mday'],
379
-			$parsed_time['tm_hour'],
380
-			$parsed_time['tm_min'],
381
-			$parsed_time['tm_sec']
376
+			$parsed_time[ 'tm_year' ] + 1900, // This will be "111", so we need to add 1900.
377
+			$parsed_time[ 'tm_mon' ] + 1, // This will be the month minus one, so we add one.
378
+			$parsed_time[ 'tm_mday' ],
379
+			$parsed_time[ 'tm_hour' ],
380
+			$parsed_time[ 'tm_min' ],
381
+			$parsed_time[ 'tm_sec' ]
382 382
 		);
383 383
 
384
-		return new DateTime($ymd);
384
+		return new DateTime( $ymd );
385 385
 	}
386 386
 }
Please login to merge, or discard this patch.
includes/CMB2_Ajax.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -59,12 +59,12 @@  discard block
 block discarded – undo
59 59
 	public function oembed_handler() {
60 60
 
61 61
 		// Verify our nonce
62
-		if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) {
62
+		if ( ! ( isset( $_REQUEST[ 'cmb2_ajax_nonce' ], $_REQUEST[ 'oembed_url' ] ) && wp_verify_nonce( $_REQUEST[ 'cmb2_ajax_nonce' ], 'ajax_nonce' ) ) ) {
63 63
 			die();
64 64
 		}
65 65
 
66 66
 		// Sanitize our search string
67
-		$oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] );
67
+		$oembed_string = sanitize_text_field( $_REQUEST[ 'oembed_url' ] );
68 68
 
69 69
 		// Send back error if empty
70 70
 		if ( empty( $oembed_string ) ) {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 		}
73 73
 
74 74
 		// Set width of embed
75
-		$embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640';
75
+		$embed_width = isset( $_REQUEST[ 'oembed_width' ] ) && intval( $_REQUEST[ 'oembed_width' ] ) < 640 ? intval( $_REQUEST[ 'oembed_width' ] ) : '640';
76 76
 
77 77
 		// Set url
78 78
 		$oembed_url = esc_url( $oembed_string );
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
85 85
 		// Get embed code (or fallback link)
86 86
 		$html = $this->get_oembed( array(
87 87
 			'url'         => $oembed_url,
88
-			'object_id'   => $_REQUEST['object_id'],
89
-			'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post',
88
+			'object_id'   => $_REQUEST[ 'object_id' ],
89
+			'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post',
90 90
 			'oembed_args' => $embed_args,
91
-			'field_id'    => $_REQUEST['field_id'],
91
+			'field_id'    => $_REQUEST[ 'field_id' ],
92 92
 		) );
93 93
 
94 94
 		wp_send_json_success( $html );
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 	public function get_oembed_no_edit( $args ) {
104 104
 		global $wp_embed;
105 105
 
106
-		$oembed_url = esc_url( $args['url'] );
106
+		$oembed_url = esc_url( $args[ 'url' ] );
107 107
 
108 108
 		// Sanitize object_id
109
-		$this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] );
109
+		$this->object_id = is_numeric( $args[ 'object_id' ] ) ? absint( $args[ 'object_id' ] ) : sanitize_text_field( $args[ 'object_id' ] );
110 110
 
111 111
 		$args = wp_parse_args( $args, array(
112 112
 			'object_type' => 'post',
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 			'wp_error'    => false,
116 116
 		) );
117 117
 
118
-		$this->embed_args =& $args;
118
+		$this->embed_args = & $args;
119 119
 
120 120
 		/**
121 121
 		 * Set the post_ID so oEmbed won't fail
@@ -124,9 +124,9 @@  discard block
 block discarded – undo
124 124
 		$wp_embed->post_ID = $this->object_id;
125 125
 
126 126
 		// Special scenario if NOT a post object
127
-		if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) {
127
+		if ( isset( $args[ 'object_type' ] ) && 'post' != $args[ 'object_type' ] ) {
128 128
 
129
-			if ( 'options-page' == $args['object_type'] ) {
129
+			if ( 'options-page' == $args[ 'object_type' ] ) {
130 130
 
131 131
 				// Bogus id to pass some numeric checks. Issue with a VERY large WP install?
132 132
 				$wp_embed->post_ID = 1987645321;
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
 			// Ok, we need to hijack the oembed cache system
136 136
 			$this->hijack = true;
137
-			$this->object_type = $args['object_type'];
137
+			$this->object_type = $args[ 'object_type' ];
138 138
 
139 139
 			// Gets ombed cache from our object's meta (vs postmeta)
140 140
 			add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 );
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 
147 147
 		$embed_args = '';
148 148
 
149
-		foreach ( $args['oembed_args'] as $key => $val ) {
149
+		foreach ( $args[ 'oembed_args' ] as $key => $val ) {
150 150
 			$embed_args .= " $key=\"$val\"";
151 151
 		}
152 152
 
@@ -169,8 +169,8 @@  discard block
 block discarded – undo
169 169
 		$oembed = $this->get_oembed_no_edit( $args );
170 170
 
171 171
 		// Send back our embed
172
-		if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) {
173
-			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>';
172
+		if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) {
173
+			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>';
174 174
 		}
175 175
 
176 176
 		// Otherwise, send back error info that no oEmbeds were found
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 			sprintf(
180 180
 				/* translators: 1: results for. 2: link to codex.wordpress.org/Embeds */
181 181
 				esc_html__( 'No oEmbed Results Found for %1$s. View more info at %2$s.', 'cmb2' ),
182
-				$oembed['fallback'],
182
+				$oembed[ 'fallback' ],
183 183
 				'<a href="https://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>'
184 184
 			)
185 185
 		);
@@ -244,15 +244,15 @@  discard block
 block discarded – undo
244 244
 	 */
245 245
 	protected function cache_action( $meta_key ) {
246 246
 		$func_args = func_get_args();
247
-		$action    = isset( $func_args[1] ) ? 'update' : 'get';
247
+		$action    = isset( $func_args[ 1 ] ) ? 'update' : 'get';
248 248
 
249 249
 		if ( 'options-page' === $this->object_type ) {
250 250
 
251 251
 			$args = array( $meta_key );
252 252
 
253 253
 			if ( 'update' === $action ) {
254
-				$args[] = $func_args[1];
255
-				$args[] = true;
254
+				$args[ ] = $func_args[ 1 ];
255
+				$args[ ] = true;
256 256
 			}
257 257
 
258 258
 			// Cache the result to our options
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 		} else {
261 261
 
262 262
 			$args = array( $this->object_type, $this->object_id, $meta_key );
263
-			$args[] = 'update' === $action ? $func_args : true;
263
+			$args[ ] = 'update' === $action ? $func_args : true;
264 264
 
265 265
 			// Cache the result to our metadata
266 266
 			$status = call_user_func_array( $action . '_metadata', $args );
Please login to merge, or discard this patch.
includes/CMB2_Field.php 1 patch
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -86,21 +86,21 @@  discard block
 block discarded – undo
86 86
 	 */
87 87
 	public function __construct( $args ) {
88 88
 
89
-		if ( ! empty( $args['group_field'] ) ) {
90
-			$this->group       = $args['group_field'];
89
+		if ( ! empty( $args[ 'group_field' ] ) ) {
90
+			$this->group       = $args[ 'group_field' ];
91 91
 			$this->object_id   = $this->group->object_id;
92 92
 			$this->object_type = $this->group->object_type;
93 93
 			$this->cmb_id      = $this->group->cmb_id;
94 94
 		} else {
95
-			$this->object_id   = isset( $args['object_id'] ) && '_' !== $args['object_id'] ? $args['object_id'] : 0;
96
-			$this->object_type = isset( $args['object_type'] ) ? $args['object_type'] : 'post';
95
+			$this->object_id   = isset( $args[ 'object_id' ] ) && '_' !== $args[ 'object_id' ] ? $args[ 'object_id' ] : 0;
96
+			$this->object_type = isset( $args[ 'object_type' ] ) ? $args[ 'object_type' ] : 'post';
97 97
 
98
-			if ( isset( $args['cmb_id'] ) ) {
99
-				$this->cmb_id = $args['cmb_id'];
98
+			if ( isset( $args[ 'cmb_id' ] ) ) {
99
+				$this->cmb_id = $args[ 'cmb_id' ];
100 100
 			}
101 101
 		}
102 102
 
103
-		$this->args = $this->_set_field_defaults( $args['field_args'], $args );
103
+		$this->args = $this->_set_field_defaults( $args[ 'field_args' ], $args );
104 104
 
105 105
 		if ( $this->object_id ) {
106 106
 			$this->value = $this->get_data();
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * @return mixed             Value of field argument
116 116
 	 */
117 117
 	public function __call( $name, $arguments ) {
118
-		$key = isset( $arguments[0] ) ? $arguments[0] : false;
118
+		$key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false;
119 119
 		return $this->args( $name, $key );
120 120
 	}
121 121
 
@@ -186,9 +186,9 @@  discard block
 block discarded – undo
186 186
 	 */
187 187
 	public function get_data( $field_id = '', $args = array() ) {
188 188
 		if ( $field_id ) {
189
-			$args['field_id'] = $field_id;
189
+			$args[ 'field_id' ] = $field_id;
190 190
 		} else if ( $this->group ) {
191
-			$args['field_id'] = $this->group->id();
191
+			$args[ 'field_id' ] = $this->group->id();
192 192
 		}
193 193
 
194 194
 		$a = $this->data_args( $args );
@@ -229,13 +229,13 @@  discard block
 block discarded – undo
229 229
 		 *
230 230
 		 * @since 2.0.0
231 231
 		 */
232
-		$data = apply_filters( "cmb2_override_{$a['field_id']}_meta_value", $data, $this->object_id, $a, $this );
232
+		$data = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_value", $data, $this->object_id, $a, $this );
233 233
 
234 234
 		// If no override, get value normally
235 235
 		if ( 'cmb2_field_no_override_val' === $data ) {
236
-			$data = 'options-page' === $a['type']
237
-				? cmb2_options( $a['id'] )->get( $a['field_id'] )
238
-				: get_metadata( $a['type'], $a['id'], $a['field_id'], ( $a['single'] || $a['repeat'] ) );
236
+			$data = 'options-page' === $a[ 'type' ]
237
+				? cmb2_options( $a[ 'id' ] )->get( $a[ 'field_id' ] )
238
+				: get_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], ( $a[ 'single' ] || $a[ 'repeat' ] ) );
239 239
 		}
240 240
 
241 241
 		if ( $this->group ) {
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	public function update_data( $new_value, $single = true ) {
258 258
 		$a = $this->data_args( array( 'single' => $single ) );
259 259
 
260
-		$a['value'] = $a['repeat'] ? array_values( $new_value ) : $new_value;
260
+		$a[ 'value' ] = $a[ 'repeat' ] ? array_values( $new_value ) : $new_value;
261 261
 
262 262
 		/**
263 263
 		 * Filter whether to override saving of meta value.
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 		 *
294 294
 		 * @since 2.0.0
295 295
 		 */
296
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_save", $override, $a, $this->args(), $this );
296
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_save", $override, $a, $this->args(), $this );
297 297
 
298 298
 		// If override, return that
299 299
 		if ( null !== $override ) {
@@ -301,22 +301,22 @@  discard block
 block discarded – undo
301 301
 		}
302 302
 
303 303
 		// Options page handling (or temp data store)
304
-		if ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
305
-			return cmb2_options( $a['id'] )->update( $a['field_id'], $a['value'], false, $a['single'] );
304
+		if ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
305
+			return cmb2_options( $a[ 'id' ] )->update( $a[ 'field_id' ], $a[ 'value' ], false, $a[ 'single' ] );
306 306
 		}
307 307
 
308 308
 		// Add metadata if not single
309
-		if ( ! $a['single'] ) {
310
-			return add_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'], false );
309
+		if ( ! $a[ 'single' ] ) {
310
+			return add_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ], false );
311 311
 		}
312 312
 
313 313
 		// Delete meta if we have an empty array
314
-		if ( is_array( $a['value'] ) && empty( $a['value'] ) ) {
315
-			return delete_metadata( $a['type'], $a['id'], $a['field_id'], $this->value );
314
+		if ( is_array( $a[ 'value' ] ) && empty( $a[ 'value' ] ) ) {
315
+			return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $this->value );
316 316
 		}
317 317
 
318 318
 		// Update metadata
319
-		return update_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'] );
319
+		return update_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ] );
320 320
 	}
321 321
 
322 322
 	/**
@@ -366,19 +366,19 @@  discard block
 block discarded – undo
366 366
 		 * @param array $field_args All field arguments
367 367
 		 * @param CMB2_Field object $field This field object
368 368
 		 */
369
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_remove", $override, $a, $this->args(), $this );
369
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_remove", $override, $a, $this->args(), $this );
370 370
 
371 371
 		// If no override, remove as usual
372 372
 		if ( null !== $override ) {
373 373
 			return $override;
374 374
 		}
375 375
 		// Option page handling
376
-		elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
377
-			return cmb2_options( $a['id'] )->remove( $a['field_id'] );
376
+		elseif ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
377
+			return cmb2_options( $a[ 'id' ] )->remove( $a[ 'field_id' ] );
378 378
 		}
379 379
 
380 380
 		// Remove metadata
381
-		return delete_metadata( $a['type'], $a['id'], $a['field_id'], $old );
381
+		return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $old );
382 382
 	}
383 383
 
384 384
 	/**
@@ -829,7 +829,7 @@  discard block
 block discarded – undo
829 829
 
830 830
 		foreach ( $conditional_classes as $class => $condition ) {
831 831
 			if ( $condition ) {
832
-				$classes[] = $class;
832
+				$classes[ ] = $class;
833 833
 			}
834 834
 		}
835 835
 
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
 
842 842
 
843 843
 		if ( $added_classes ) {
844
-			$classes[] = esc_attr( $added_classes );
844
+			$classes[ ] = esc_attr( $added_classes );
845 845
 		}
846 846
 
847 847
 		/**
@@ -941,10 +941,10 @@  discard block
 block discarded – undo
941 941
 	public function string( $text_key, $fallback ) {
942 942
 		// If null, populate with our field strings values.
943 943
 		if ( null === $this->strings ) {
944
-			$this->strings = (array) $this->args['text'];
944
+			$this->strings = (array) $this->args[ 'text' ];
945 945
 
946
-			if ( is_callable( $this->args['text_cb'] ) ) {
947
-				$strings = call_user_func( $this->args['text_cb'], $this );
946
+			if ( is_callable( $this->args[ 'text_cb' ] ) ) {
947
+				$strings = call_user_func( $this->args[ 'text_cb' ], $this );
948 948
 
949 949
 				if ( $strings && is_array( $strings ) ) {
950 950
 					$this->strings += $strings;
@@ -978,10 +978,10 @@  discard block
 block discarded – undo
978 978
 			return $this->field_options;
979 979
 		}
980 980
 
981
-		$this->field_options = (array) $this->args['options'];
981
+		$this->field_options = (array) $this->args[ 'options' ];
982 982
 
983
-		if ( is_callable( $this->args['options_cb'] ) ) {
984
-			$options = call_user_func( $this->args['options_cb'], $this );
983
+		if ( is_callable( $this->args[ 'options_cb' ] ) ) {
984
+			$options = call_user_func( $this->args[ 'options_cb' ], $this );
985 985
 
986 986
 			if ( $options && is_array( $options ) ) {
987 987
 				$this->field_options = $options + $this->field_options;
@@ -1003,17 +1003,17 @@  discard block
 block discarded – undo
1003 1003
 	 * @return mixed  Default field value
1004 1004
 	 */
1005 1005
 	public function get_default() {
1006
-		if ( null !== $this->args['default'] ) {
1007
-			return $this->args['default'];
1006
+		if ( null !== $this->args[ 'default' ] ) {
1007
+			return $this->args[ 'default' ];
1008 1008
 		}
1009 1009
 
1010
-		$param = is_callable( $this->args['default_cb'] ) ? 'default_cb' : 'default';
1010
+		$param = is_callable( $this->args[ 'default_cb' ] ) ? 'default_cb' : 'default';
1011 1011
 		$default = $this->get_param_callback_result( $param );
1012 1012
 
1013 1013
 		// Allow a filter override of the default value
1014
-		$this->args['default'] = apply_filters( 'cmb2_default_filter', $default, $this );
1014
+		$this->args[ 'default' ] = apply_filters( 'cmb2_default_filter', $default, $this );
1015 1015
 
1016
-		return $this->args['default'];
1016
+		return $this->args[ 'default' ];
1017 1017
 	}
1018 1018
 
1019 1019
 	/**
@@ -1051,18 +1051,18 @@  discard block
 block discarded – undo
1051 1051
 			'classes_cb'        => '',
1052 1052
 			'select_all_button' => true,
1053 1053
 			'multiple'          => false,
1054
-			'repeatable'        => isset( $args['type'] ) && 'group' == $args['type'],
1054
+			'repeatable'        => isset( $args[ 'type' ] ) && 'group' == $args[ 'type' ],
1055 1055
 			'inline'            => false,
1056 1056
 			'on_front'          => true,
1057 1057
 			'show_names'        => true,
1058 1058
 			'save_field'        => true, // Will not save if false
1059 1059
 			'date_format'       => 'm\/d\/Y',
1060 1060
 			'time_format'       => 'h:i A',
1061
-			'description'       => isset( $args['desc'] ) ? $args['desc'] : '',
1062
-			'preview_size'      => 'file' == $args['type'] ? array( 350, 350 ) : array( 50, 50 ),
1061
+			'description'       => isset( $args[ 'desc' ] ) ? $args[ 'desc' ] : '',
1062
+			'preview_size'      => 'file' == $args[ 'type' ] ? array( 350, 350 ) : array( 50, 50 ),
1063 1063
 			'render_row_cb'     => array( $this, 'render_field_callback' ),
1064 1064
 			'display_cb'        => array( $this, 'display_value_callback' ),
1065
-			'label_cb'          => 'title' != $args['type'] ? array( $this, 'label' ) : '',
1065
+			'label_cb'          => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '',
1066 1066
 			'column'            => false,
1067 1067
 		) );
1068 1068
 
@@ -1070,73 +1070,73 @@  discard block
 block discarded – undo
1070 1070
 		 * Deprecated usage.
1071 1071
 		 */
1072 1072
 
1073
-		if ( isset( $args['row_classes'] ) ) {
1073
+		if ( isset( $args[ 'row_classes' ] ) ) {
1074 1074
 
1075 1075
 			// row_classes param could be a callback
1076
-			if ( is_callable( $args['row_classes'] ) ) {
1077
-				$args['classes_cb'] = $args['row_classes'];
1078
-				$args['classes'] = null;
1076
+			if ( is_callable( $args[ 'row_classes' ] ) ) {
1077
+				$args[ 'classes_cb' ] = $args[ 'row_classes' ];
1078
+				$args[ 'classes' ] = null;
1079 1079
 			} else {
1080
-				$args['classes'] = $args['row_classes'];
1080
+				$args[ 'classes' ] = $args[ 'row_classes' ];
1081 1081
 			}
1082 1082
 
1083
-			unset( $args['row_classes'] );
1083
+			unset( $args[ 'row_classes' ] );
1084 1084
 		}
1085 1085
 
1086 1086
 		// default param can be passed a callback as well
1087
-		if ( is_callable( $args['default'] ) ) {
1088
-			$args['default_cb'] = $args['default'];
1089
-			$args['default'] = null;
1087
+		if ( is_callable( $args[ 'default' ] ) ) {
1088
+			$args[ 'default_cb' ] = $args[ 'default' ];
1089
+			$args[ 'default' ] = null;
1090 1090
 		}
1091 1091
 
1092 1092
 		/*
1093 1093
 		 * END deprecated usage.
1094 1094
 		 */
1095 1095
 
1096
-		$args['repeatable'] = $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
1097
-		$args['inline']     = $args['inline'] || false !== stripos( $args['type'], '_inline' );
1096
+		$args[ 'repeatable' ] = $args[ 'repeatable' ] && ! $this->repeatable_exception( $args[ 'type' ] );
1097
+		$args[ 'inline' ]     = $args[ 'inline' ] || false !== stripos( $args[ 'type' ], '_inline' );
1098 1098
 
1099 1099
 		// options param can be passed a callback as well
1100
-		if ( is_callable( $args['options'] ) ) {
1101
-			$args['options_cb'] = $args['options'];
1102
-			$args['options'] = array();
1100
+		if ( is_callable( $args[ 'options' ] ) ) {
1101
+			$args[ 'options_cb' ] = $args[ 'options' ];
1102
+			$args[ 'options' ] = array();
1103 1103
 		}
1104 1104
 
1105
-		$args['options']    = 'group' == $args['type'] ? wp_parse_args( $args['options'], array(
1105
+		$args[ 'options' ] = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array(
1106 1106
 			'add_button'    => esc_html__( 'Add Group', 'cmb2' ),
1107 1107
 			'remove_button' => esc_html__( 'Remove Group', 'cmb2' ),
1108
-		) ) : $args['options'];
1108
+		) ) : $args[ 'options' ];
1109 1109
 
1110
-		$args['_id']        = $args['id'];
1111
-		$args['_name']      = $args['id'];
1110
+		$args[ '_id' ]        = $args[ 'id' ];
1111
+		$args[ '_name' ]      = $args[ 'id' ];
1112 1112
 
1113 1113
 		if ( $this->group ) {
1114 1114
 
1115
-			$args['id']    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args['id'];
1116
-			$args['_name'] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args['_name'] . ']';
1115
+			$args[ 'id' ]    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args[ 'id' ];
1116
+			$args[ '_name' ] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args[ '_name' ] . ']';
1117 1117
 		}
1118 1118
 
1119
-		if ( 'wysiwyg' == $args['type'] ) {
1120
-			$args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) );
1121
-			$args['options']['textarea_name'] = $args['_name'];
1119
+		if ( 'wysiwyg' == $args[ 'type' ] ) {
1120
+			$args[ 'id' ] = strtolower( str_ireplace( '-', '_', $args[ 'id' ] ) );
1121
+			$args[ 'options' ][ 'textarea_name' ] = $args[ '_name' ];
1122 1122
 		}
1123 1123
 
1124 1124
 		$option_types = apply_filters( 'cmb2_all_or_nothing_types', array( 'select', 'radio', 'radio_inline', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_radio_inline' ), $this );
1125 1125
 
1126
-		if ( in_array( $args['type'], $option_types, true ) ) {
1126
+		if ( in_array( $args[ 'type' ], $option_types, true ) ) {
1127 1127
 
1128
-			$args['show_option_none'] = isset( $args['show_option_none'] ) ? $args['show_option_none'] : null;
1129
-			$args['show_option_none'] = true === $args['show_option_none'] ? esc_html__( 'None', 'cmb2' ) : $args['show_option_none'];
1128
+			$args[ 'show_option_none' ] = isset( $args[ 'show_option_none' ] ) ? $args[ 'show_option_none' ] : null;
1129
+			$args[ 'show_option_none' ] = true === $args[ 'show_option_none' ] ? esc_html__( 'None', 'cmb2' ) : $args[ 'show_option_none' ];
1130 1130
 
1131
-			if ( null === $args['show_option_none'] ) {
1132
-				$off_by_default = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true );
1133
-				$args['show_option_none'] = $off_by_default ? false : esc_html__( 'None', 'cmb2' );
1131
+			if ( null === $args[ 'show_option_none' ] ) {
1132
+				$off_by_default = in_array( $args[ 'type' ], array( 'select', 'radio', 'radio_inline' ), true );
1133
+				$args[ 'show_option_none' ] = $off_by_default ? false : esc_html__( 'None', 'cmb2' );
1134 1134
 			}
1135 1135
 
1136 1136
 		}
1137 1137
 
1138
-		$args['has_supporting_data'] = in_array(
1139
-			$args['type'],
1138
+		$args[ 'has_supporting_data' ] = in_array(
1139
+			$args[ 'type' ],
1140 1140
 			array(
1141 1141
 				// CMB2_Sanitize::_save_file_id_value()/CMB2_Sanitize::_get_group_file_value_array()
1142 1142
 				'file',
@@ -1159,10 +1159,10 @@  discard block
 block discarded – undo
1159 1159
 	protected function get_default_args( $field_args, $field_group = null ) {
1160 1160
 		$args = parent::get_default_args( array(), $this->group );
1161 1161
 
1162
-		if ( isset( $field_args['field_args'] ) ) {
1162
+		if ( isset( $field_args[ 'field_args' ] ) ) {
1163 1163
 			$args = wp_parse_args( $field_args, $args );
1164 1164
 		} else {
1165
-			$args['field_args'] = wp_parse_args( $field_args, $this->args );
1165
+			$args[ 'field_args' ] = wp_parse_args( $field_args, $this->args );
1166 1166
 		}
1167 1167
 
1168 1168
 		return $args;
Please login to merge, or discard this patch.
includes/CMB2_Types.php 1 patch
Spacing   +5 added lines, -5 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
 	}
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	 * @return string               String of attributes for form element
219 219
 	 */
220 220
 	public function concat_attrs( $attrs, $attr_exclude = array() ) {
221
-		$attr_exclude[] = 'rendered';
221
+		$attr_exclude[ ] = 'rendered';
222 222
 		$attributes = '';
223 223
 		foreach ( $attrs as $attr => $val ) {
224 224
 			$excluded = in_array( $attr, (array) $attr_exclude, true );
@@ -405,8 +405,8 @@  discard block
 block discarded – undo
405 405
 			'class' => 'cmb2-hidden',
406 406
 		);
407 407
 		if ( $this->field->group ) {
408
-			$args['data-groupid'] = $this->field->group->id();
409
-			$args['data-iterator'] = $this->iterator;
408
+			$args[ 'data-groupid' ] = $this->field->group->id();
409
+			$args[ 'data-iterator' ] = $this->iterator;
410 410
 		}
411 411
 		return $this->input( $args );
412 412
 	}
Please login to merge, or discard this patch.