Completed
Pull Request — trunk (#541)
by Justin
13:08
created
example-functions.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	$cmb_demo = new_cmb2_box( array(
79 79
 		'id'            => $prefix . 'metabox',
80 80
 		'title'         => __( 'Test Metabox', 'cmb2' ),
81
-		'object_types'  => array( 'page', ), // Post type
81
+		'object_types'  => array( 'page',), // Post type
82 82
 		// 'show_on_cb' => 'yourprefix_show_if_front_page', // function should return a bool value
83 83
 		// 'context'    => 'normal',
84 84
 		// 'priority'   => 'high',
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 		'desc'    => __( 'field description (optional)', 'cmb2' ),
330 330
 		'id'      => $prefix . 'wysiwyg',
331 331
 		'type'    => 'wysiwyg',
332
-		'options' => array( 'textarea_rows' => 5, ),
332
+		'options' => array( 'textarea_rows' => 5,),
333 333
 	) );
334 334
 
335 335
 	$cmb_demo->add_field( array(
@@ -381,11 +381,11 @@  discard block
 block discarded – undo
381 381
 	$cmb_about_page = new_cmb2_box( array(
382 382
 		'id'           => $prefix . 'metabox',
383 383
 		'title'        => __( 'About Page Metabox', 'cmb2' ),
384
-		'object_types' => array( 'page', ), // Post type
384
+		'object_types' => array( 'page',), // Post type
385 385
 		'context'      => 'normal',
386 386
 		'priority'     => 'high',
387 387
 		'show_names'   => true, // Show field names on the left
388
-		'show_on'      => array( 'id' => array( 2, ) ), // Specific post IDs to display this metabox
388
+		'show_on'      => array( 'id' => array( 2,) ), // Specific post IDs to display this metabox
389 389
 	) );
390 390
 
391 391
 	$cmb_about_page->add_field( array(
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 	$cmb_group = new_cmb2_box( array(
411 411
 		'id'           => $prefix . 'metabox',
412 412
 		'title'        => __( 'Repeating Field Group', 'cmb2' ),
413
-		'object_types' => array( 'page', ),
413
+		'object_types' => array( 'page',),
414 414
 	) );
415 415
 
416 416
 	// $group_field_id is the field id string, so in this case: $prefix . 'demo'
Please login to merge, or discard this patch.
includes/CMB2_JS.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,17 +51,17 @@
 block discarded – undo
51 51
 		$dependencies = apply_filters( 'cmb2_script_dependencies', self::$dependencies );
52 52
 
53 53
 		// if colorpicker
54
-		if ( ! is_admin() && isset( $dependencies['wp-color-picker'] ) ) {
54
+		if ( ! is_admin() && isset( $dependencies[ 'wp-color-picker' ] ) ) {
55 55
 			self::colorpicker_frontend();
56 56
 		}
57 57
 
58 58
 		// if file/file_list
59
-		if ( isset( $dependencies['media-editor'] ) ) {
59
+		if ( isset( $dependencies[ 'media-editor' ] ) ) {
60 60
 			wp_enqueue_media();
61 61
 		}
62 62
 
63 63
 		// if timepicker
64
-		if ( isset( $dependencies['jquery-ui-datetimepicker'] ) ) {
64
+		if ( isset( $dependencies[ 'jquery-ui-datetimepicker' ] ) ) {
65 65
 			wp_register_script( 'jquery-ui-datetimepicker', cmb2_utils()->url( 'js/jquery-ui-timepicker-addon.min.js' ), array( 'jquery-ui-slider' ), CMB2_VERSION );
66 66
 		}
67 67
 
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/CMB2_Hookup_Base.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
 			return;
55 55
 		}
56 56
 
57
-		self::$hooks_completed[] = $key;
57
+		self::$hooks_completed[ ] = $key;
58 58
 		add_filter( $action, $hook, $priority, $accepted_args );
59 59
 	}
60 60
 
Please login to merge, or discard this patch.
includes/CMB2_REST.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -120,18 +120,18 @@  discard block
 block discarded – undo
120 120
 
121 121
 	protected function declare_read_write_fields() {
122 122
 		foreach ( $this->cmb->prop( 'fields' ) as $field ) {
123
-			$show_in_rest = isset( $field['show_in_rest'] ) ? $field['show_in_rest'] : null;
123
+			$show_in_rest = isset( $field[ 'show_in_rest' ] ) ? $field[ 'show_in_rest' ] : null;
124 124
 
125 125
 			if ( false === $show_in_rest ) {
126 126
 				continue;
127 127
 			}
128 128
 
129 129
 			if ( $this->can_read( $show_in_rest ) ) {
130
-				$this->read_fields[] = $field['id'];
130
+				$this->read_fields[ ] = $field[ 'id' ];
131 131
 			}
132 132
 
133 133
 			if ( $this->can_write( $show_in_rest ) ) {
134
-				$this->write_fields[] = $field['id'];
134
+				$this->write_fields[ ] = $field[ 'id' ];
135 135
 			}
136 136
 
137 137
 		}
@@ -159,14 +159,14 @@  discard block
 block discarded – undo
159 159
 	 */
160 160
 	public static function get_restable_field_values( $object, $field_id, $request ) {
161 161
 		$values = array();
162
-		if ( ! isset( $object['id'] ) ) {
162
+		if ( ! isset( $object[ 'id' ] ) ) {
163 163
 			return;
164 164
 		}
165 165
 
166 166
 		foreach ( self::$boxes as $cmb_id => $rest_box ) {
167 167
 			foreach ( $rest_box->read_fields as $field_id ) {
168 168
 				$field = $rest_box->cmb->get_field( $field_id );
169
-				$field->object_id = $object['id'];
169
+				$field->object_id = $object[ 'id' ];
170 170
 
171 171
 				// TODO: test other object types (users, comments, etc)
172 172
 				if ( isset( $object->type ) ) {
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
 				continue;
206 206
 			}
207 207
 
208
-			$rest_box->cmb->object_id( $data['object_id'] );
209
-			$rest_box->cmb->object_type( $data['object_type'] );
208
+			$rest_box->cmb->object_id( $data[ 'object_id' ] );
209
+			$rest_box->cmb->object_type( $data[ 'object_type' ] );
210 210
 
211 211
 			// TODO: Test since refactor.
212 212
 			$updated[ $cmb_id ] = $rest_box->sanitize_box_values( $values );
@@ -304,8 +304,8 @@  discard block
 block discarded – undo
304 304
 		} elseif ( isset( $object->comment_ID ) ) {
305 305
 			$object_id   = intval( $object->comment_ID );
306 306
 			$object_type = 'comment';
307
-		} elseif ( is_array( $object ) && isset( $object['term_id'] ) ) {
308
-			$object_id   = intval( $object['term_id'] );
307
+		} elseif ( is_array( $object ) && isset( $object[ 'term_id' ] ) ) {
308
+			$object_id   = intval( $object[ 'term_id' ] );
309 309
 			$object_type = 'term';
310 310
 		} elseif ( isset( $object->term_id ) ) {
311 311
 			$object_id   = intval( $object->term_id );
Please login to merge, or discard this patch.
includes/CMB2_REST_Controller.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * @return array $data
129 129
 	 */
130 130
 	public function prepare_item_for_response( $data, $request = null ) {
131
-		$data = $this->filter_response_by_context( $data, $this->request['context'] );
131
+		$data = $this->filter_response_by_context( $data, $this->request[ 'context' ] );
132 132
 
133 133
 		/**
134 134
 		 * Filter the prepared CMB2 item response.
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
170 170
 
171 171
 	public function initiate_request( $request, $request_type ) {
172 172
 		$this->request = $request;
173
-		$this->request['context'] = isset( $this->request['context'] ) && ! empty( $this->request['context'] )
174
-			? $this->request['context']
173
+		$this->request[ 'context' ] = isset( $this->request[ 'context' ] ) && ! empty( $this->request[ 'context' ] )
174
+			? $this->request[ 'context' ]
175 175
 			: 'view';
176 176
 
177
-		if ( isset( $_REQUEST['object_id'] ) ) {
178
-			$this->object_id = absint( $_REQUEST['object_id'] );
177
+		if ( isset( $_REQUEST[ 'object_id' ] ) ) {
178
+			$this->object_id = absint( $_REQUEST[ 'object_id' ] );
179 179
 		}
180 180
 
181
-		if ( isset( $_REQUEST['object_type'] ) ) {
182
-			$this->object_type = absint( $_REQUEST['object_type'] );
181
+		if ( isset( $_REQUEST[ 'object_type' ] ) ) {
182
+			$this->object_type = absint( $_REQUEST[ 'object_type' ] );
183 183
 		}
184 184
 
185 185
 		self::$request_type = self::$request_type ? self::$request_type : $request_type;
Please login to merge, or discard this patch.
includes/CMB2_REST_Controller_Boxes.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		foreach ( CMB2_REST::$boxes as $this->rest_box ) {
71 71
 			if ( $this->rest_box->rest_read ) {
72 72
 				$rest_box = $this->get_rest_box();
73
-				$boxes_data[ $this->rest_box->cmb->cmb_id ] = $this->server->response_to_data( $rest_box, isset( $_GET['_embed'] ) );
73
+				$boxes_data[ $this->rest_box->cmb->cmb_id ] = $this->server->response_to_data( $rest_box, isset( $_GET[ '_embed' ] ) );
74 74
 			}
75 75
 		}
76 76
 
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 
111 111
 		$boxes_data = $cmb->meta_box;
112 112
 
113
-		if ( isset( $_REQUEST['_rendered'] ) && '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
114
-			$boxes_data['form_open'] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
115
-			$boxes_data['form_close'] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
113
+		if ( isset( $_REQUEST[ '_rendered' ] ) && '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
114
+			$boxes_data[ 'form_open' ] = $this->get_cb_results( array( $cmb, 'render_form_open' ) );
115
+			$boxes_data[ 'form_close' ] = $this->get_cb_results( array( $cmb, 'render_form_close' ) );
116 116
 
117 117
 			global $wp_scripts, $wp_styles;
118 118
 			$before_css = $wp_styles->queue;
@@ -120,15 +120,15 @@  discard block
 block discarded – undo
120 120
 
121 121
 			CMB2_JS::enqueue();
122 122
 
123
-			$boxes_data['js_dependencies'] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
124
-			$boxes_data['css_dependencies'] = array_values( array_diff( $wp_styles->queue, $before_css ) );
123
+			$boxes_data[ 'js_dependencies' ] = array_values( array_diff( $wp_scripts->queue, $before_js ) );
124
+			$boxes_data[ 'css_dependencies' ] = array_values( array_diff( $wp_styles->queue, $before_css ) );
125 125
 		}
126 126
 
127 127
 		// TODO: look into 'embed' parameter.
128 128
 		// http://demo.wp-api.org/wp-json/wp/v2/posts?_embed
129
-		unset( $boxes_data['fields'] );
129
+		unset( $boxes_data[ 'fields' ] );
130 130
 		// Handle callable properties.
131
-		unset( $boxes_data['show_on_cb'] );
131
+		unset( $boxes_data[ 'show_on_cb' ] );
132 132
 
133 133
 		$response = rest_ensure_response( $boxes_data );
134 134
 
Please login to merge, or discard this patch.
includes/CMB2_REST_Controller_Fields.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -67,11 +67,11 @@  discard block
 block discarded – undo
67 67
 
68 68
 		$fields = array();
69 69
 		foreach ( $this->rest_box->cmb->prop( 'fields', array() ) as $field ) {
70
-			$field_id = $field['id'];
70
+			$field_id = $field[ 'id' ];
71 71
 			$rest_field = $this->get_rest_field( $field_id );
72 72
 
73 73
 			if ( ! is_wp_error( $rest_field ) ) {
74
-				$fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $_GET['_embed'] ) );
74
+				$fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $_GET[ '_embed' ] ) );
75 75
 			} else {
76 76
 				$fields[ $field_id ] = array( 'error' => $rest_field->get_error_message() );
77 77
 			}
@@ -165,11 +165,11 @@  discard block
 block discarded – undo
165 165
 			}
166 166
 		}
167 167
 
168
-		if ( isset( $_REQUEST['_rendered'] ) ) {
169
-			$field_data['rendered'] = $rendered;
168
+		if ( isset( $_REQUEST[ '_rendered' ] ) ) {
169
+			$field_data[ 'rendered' ] = $rendered;
170 170
 		}
171 171
 
172
-		$field_data['value'] = $field->get_data();
172
+		$field_data[ 'value' ] = $field->get_data();
173 173
 
174 174
 		return $field_data;
175 175
 	}
@@ -190,14 +190,14 @@  discard block
 block discarded – undo
190 190
 		);
191 191
 
192 192
 		// TODO ?
193
-		error_log( '$this->request[context]: '. print_r( $this->request['context'], true ) );
194
-		error_log( 'CMB2_REST_Controller::get_intial_route(): '. print_r( CMB2_REST_Controller::get_intial_route(), true ) );
195
-		error_log( '$match: '. print_r( 'box_read' === CMB2_REST_Controller::get_intial_request_type(), true ) );
193
+		error_log( '$this->request[context]: ' . print_r( $this->request[ 'context' ], true ) );
194
+		error_log( 'CMB2_REST_Controller::get_intial_route(): ' . print_r( CMB2_REST_Controller::get_intial_route(), true ) );
195
+		error_log( '$match: ' . print_r( 'box_read' === CMB2_REST_Controller::get_intial_request_type(), true ) );
196 196
 
197 197
 
198 198
 		// Don't embed boxes when looking at boxes route.
199 199
 		if ( '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) {
200
-			$links['up']['embeddable'] = true;
200
+			$links[ 'up' ][ 'embeddable' ] = true;
201 201
 		}
202 202
 
203 203
 		return $links;
Please login to merge, or discard this patch.