Completed
Push — trunk ( d2dcae...9f07b9 )
by Justin
07:51
created
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'    => __( 'Add Group', 'cmb2' ),
1107 1107
 			'remove_button' => __( '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'] ? __( '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' ] ? __( '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 : __( '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 : __( '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.