Completed
Push — develop ( 4df9ef...dbeb5a )
by Zack
18:03
created
future/includes/class-gv-entry-multi.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 			if ( ! $entry instanceof Entry ) {
45 45
 				continue;
46 46
 			}
47
-			$_entry->entries[ $entry['form_id'] ]  = &$entry;
47
+			$_entry->entries[ $entry[ 'form_id' ] ] = &$entry;
48 48
 		}
49 49
 		return $_entry;
50 50
 	}
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
 			foreach ( $this->entries as $entry ) {
67 67
 				$entry = $entry->as_entry();
68
-				$_entry['_multi'][ $entry['form_id'] ] = $entry;
68
+				$_entry[ '_multi' ][ $entry[ 'form_id' ] ] = $entry;
69 69
 			}
70 70
 		}
71 71
 
Please login to merge, or discard this patch.
future/includes/class-gv-wrappers.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,8 +50,8 @@
 block discarded – undo
50 50
 		/**
51 51
 		 * By array.
52 52
 		 */
53
-		if ( is_array( $view ) && ! empty( $view['id'] ) ) {
54
-			return $this->get( $view['id'] );
53
+		if ( is_array( $view ) && ! empty( $view[ 'id' ] ) ) {
54
+			return $this->get( $view[ 'id' ] );
55 55
 		}
56 56
 
57 57
 		/**
Please login to merge, or discard this patch.
future/includes/class-gv-field-internal.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,14 +28,14 @@
 block discarded – undo
28 28
 	 * @return \GV\internal_Field|null The field implementation or null on error.
29 29
 	 */
30 30
 	public static function from_configuration( $configuration ) {
31
-		if ( empty( $configuration['id'] ) || ! is_string( $configuration['id'] ) ) {
31
+		if ( empty( $configuration[ 'id' ] ) || ! is_string( $configuration[ 'id' ] ) ) {
32 32
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
33 33
 			return null;
34 34
 		}
35 35
 
36 36
 		$field = new self();
37
-		$field->ID = $configuration['id'];
38
-		$field->type = $configuration['id'];
37
+		$field->ID = $configuration[ 'id' ];
38
+		$field->type = $configuration[ 'id' ];
39 39
 		$field->update_configuration( $configuration );
40 40
 
41 41
 		return $field;
Please login to merge, or discard this patch.
future/includes/class-gv-plugin.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	/**
85 85
 	 * @var string The REST API functionality identifier.
86 86
 	 */
87
-	const FEATURE_REST  = 'rest_api';
87
+	const FEATURE_REST = 'rest_api';
88 88
 
89 89
 	/**
90 90
 	 * Get the global instance of \GV\Plugin.
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 		include_once $this->dir( 'includes/class-frontend-views.php' );
211 211
 		include_once $this->dir( 'includes/class-gravityview-admin-bar.php' );
212 212
 		include_once $this->dir( 'includes/class-gravityview-entry-list.php' );
213
-		include_once $this->dir( 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
213
+		include_once $this->dir( 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */
214 214
 		include_once $this->dir( 'includes/class-data.php' );
215 215
 		include_once $this->dir( 'includes/class-gravityview-shortcode.php' );
216 216
 		include_once $this->dir( 'includes/class-gravityview-entry-link-shortcode.php' );
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 		}
243 243
 		if ( ! $loaded ) {
244 244
 			$locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' );
245
-			$mofile = $this->dir( 'languages' ) . '/gravityview-'. $locale .'.mo';
245
+			$mofile = $this->dir( 'languages' ) . '/gravityview-' . $locale . '.mo';
246 246
 			load_textdomain( 'gravityview', $mofile );
247 247
 		}
248 248
 	}
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	 */
376 376
 	public function is_compatible_wordpress( $version = null ) {
377 377
 
378
-		if( ! $version ) {
378
+		if ( ! $version ) {
379 379
 			$version = self::$min_wp_version;
380 380
 		}
381 381
 
@@ -416,8 +416,8 @@  discard block
 block discarded – undo
416 416
 	 * @return string The version of PHP.
417 417
 	 */
418 418
 	private function get_php_version() {
419
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ?
420
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
419
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ?
420
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
421 421
 	}
422 422
 
423 423
 	/**
@@ -428,8 +428,8 @@  discard block
 block discarded – undo
428 428
 	 * @return string The version of WordPress.
429 429
 	 */
430 430
 	private function get_wordpress_version() {
431
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ?
432
-			$GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version'];
431
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ?
432
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ];
433 433
 	}
434 434
 
435 435
 	/**
@@ -440,13 +440,13 @@  discard block
 block discarded – undo
440 440
 	 * @return string|null The version of Gravity Forms or null if inactive.
441 441
 	 */
442 442
 	private function get_gravityforms_version() {
443
-		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) {
443
+		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) {
444 444
 			gravityview()->log->error( 'Gravity Forms is inactive or not installed.' );
445 445
 			return null;
446 446
 		}
447 447
 
448
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ?
449
-			$GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version;
448
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ?
449
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version;
450 450
 	}
451 451
 
452 452
 	/**
@@ -502,9 +502,9 @@  discard block
 block discarded – undo
502 502
 		$tables = array();
503 503
 
504 504
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
505
-			$tables []= \GFFormsModel::get_entry_meta_table_name();
505
+			$tables [ ] = \GFFormsModel::get_entry_meta_table_name();
506 506
 		}
507
-		$tables []= \GFFormsModel::get_lead_meta_table_name();
507
+		$tables [ ] = \GFFormsModel::get_lead_meta_table_name();
508 508
 
509 509
 		foreach ( $tables as $meta_table ) {
510 510
 			$sql = "
@@ -522,13 +522,13 @@  discard block
 block discarded – undo
522 522
 		$tables = array();
523 523
 
524 524
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
525
-			$tables[] = \GFFormsModel::get_entry_notes_table_name();
525
+			$tables[ ] = \GFFormsModel::get_entry_notes_table_name();
526 526
 		}
527 527
 
528
-		$tables[] = \GFFormsModel::get_lead_notes_table_name();
528
+		$tables[ ] = \GFFormsModel::get_lead_notes_table_name();
529 529
 
530
-		$disapproved = __('Disapproved the Entry for GravityView', 'gravityview');
531
-		$approved = __('Approved the Entry for GravityView', 'gravityview');
530
+		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
531
+		$approved = __( 'Approved the Entry for GravityView', 'gravityview' );
532 532
 
533 533
 		$suppress = $wpdb->suppress_errors();
534 534
 		foreach ( $tables as $notes_table ) {
Please login to merge, or discard this patch.
future/includes/class-gv-settings-view.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 		) );
267 267
 
268 268
 		if ( version_compare( \GFCommon::$version, '2.3-beta-4', '>=' ) ) {
269
-			$default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' );
269
+			$default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' );
270 270
 		}
271 271
 
272 272
 		/**
@@ -286,8 +286,8 @@  discard block
 block discarded – undo
286 286
 		// By default, we only want the key => value pairing, not the whole array.
287 287
 		if ( ! $detailed ) {
288 288
 			$defaults = array();
289
-			foreach( $default_settings as $key => $value ) {
290
-				$defaults[ $key ] = $value['value'];
289
+			foreach ( $default_settings as $key => $value ) {
290
+				$defaults[ $key ] = $value[ 'value' ];
291 291
 			}
292 292
 			return $defaults;
293 293
 
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 				// If the $group argument is set for the method,
299 299
 				// ignore any settings that aren't in that group.
300 300
 				if ( ! empty( $group ) && is_string( $group ) ) {
301
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
301
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
302 302
 						unset( $default_settings[ $key ] );
303 303
 					}
304 304
 				}
Please login to merge, or discard this patch.
future/includes/class-gv-collection-entry.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -104,11 +104,11 @@  discard block
 block discarded – undo
104 104
 
105 105
 		/** Call all lazy callbacks. */
106 106
 		foreach ( $this->callbacks as $callback ) {
107
-			if ( $callback[0] != 'count' ) {
107
+			if ( $callback[ 0 ] != 'count' ) {
108 108
 				continue;
109 109
 			}
110 110
 
111
-			$total += $callback[1]( $this->filters );
111
+			$total += $callback[ 1 ]( $this->filters );
112 112
 		}
113 113
 
114 114
 		if ( ! $total ) {
@@ -185,11 +185,11 @@  discard block
 block discarded – undo
185 185
 
186 186
 		/** Call all lazy callbacks. */
187 187
 		foreach ( $this->callbacks as $i => $callback ) {
188
-			if ( $callback[0] != 'fetch' ) {
188
+			if ( $callback[ 0 ] != 'fetch' ) {
189 189
 				continue;
190 190
 			}
191 191
 
192
-			$this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) );
192
+			$this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) );
193 193
 		}
194 194
 
195 195
 		$this->fetched = $this->count();
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 			return;
346 346
 		}
347 347
 
348
-		$this->callbacks []= array( $type, $callback );
348
+		$this->callbacks [ ] = array( $type, $callback );
349 349
 	}
350 350
 
351 351
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-entry.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 			/** Must be an embed of some sort. */
122 122
 			if ( is_object( $post ) && is_numeric( $post->ID ) ) {
123 123
 				$permalink = get_permalink( $post->ID );
124
-				$args['gvid'] = $view->ID;
124
+				$args[ 'gvid' ] = $view->ID;
125 125
 			}
126 126
 		}
127 127
 		
@@ -149,21 +149,21 @@  discard block
 block discarded – undo
149 149
 			 */
150 150
 			$link_parts = explode( '?', $permalink );
151 151
 
152
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
152
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
153 153
 
154
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
154
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
155 155
 		} else {
156 156
 			$args[ $entry_endpoint_name ] = $entry_slug;
157 157
 		}
158 158
 
159 159
 		if ( $track_directory ) {
160
-			if ( ! empty( $_GET['pagenum'] ) ) {
161
-				$args['pagenum'] = intval( $_GET['pagenum'] );
160
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
161
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
162 162
 			}
163 163
 
164 164
 			if ( $sort = Utils::_GET( 'sort' ) ) {
165
-				$args['sort'] = $sort;
166
-				$args['dir'] = Utils::_GET( 'dir' );
165
+				$args[ 'sort' ] = $sort;
166
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
167 167
 			}
168 168
 		}
169 169
 
Please login to merge, or discard this patch.
future/includes/rest/class-gv-rest-views-route.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 			'total' => wp_count_posts( 'gravityview' )->publish,
64 64
 		);
65 65
 		foreach ( $items as $item ) {
66
-			$data['views'][] = $this->prepare_view_for_response( $item, $request );
66
+			$data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request );
67 67
 		}
68 68
 
69 69
 		return new \WP_REST_Response( $data, 200 );
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 		$url = $request->get_url_params();
84 84
 
85
-		$view_id = intval( $url['id'] );
85
+		$view_id = intval( $url[ 'id' ] );
86 86
 
87 87
 		$item = get_post( $view_id );
88 88
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 		// Only output the fields that should be displayed.
112 112
 		$allowed = array();
113 113
 		foreach ( $view->fields->by_position( "{$context}_*" )->by_visible()->all() as $field ) {
114
-			$allowed[] = $field->ID;
114
+			$allowed[ ] = $field->ID;
115 115
 		}
116 116
 
117 117
 		/**
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 	public function get_sub_items( $request ) {
157 157
 
158 158
 		$url     = $request->get_url_params();
159
-		$view_id = intval( $url['id'] );
159
+		$view_id = intval( $url[ 'id' ] );
160 160
 		$format  = \GV\Utils::get( $url, 'format', 'json' );
161 161
 
162 162
 		$view = \GV\View::by_id( $view_id );
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 
200 200
 		$data = array( 'entries' => $entries->all(), 'total' => $entries->total() );
201 201
 
202
-		foreach ( $data['entries'] as &$entry ) {
202
+		foreach ( $data[ 'entries' ] as &$entry ) {
203 203
 			$entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' );
204 204
 		}
205 205
 
@@ -218,8 +218,8 @@  discard block
 block discarded – undo
218 218
 	 */
219 219
 	public function get_sub_item( $request ) {
220 220
 		$url      = $request->get_url_params();
221
-		$view_id  = intval( $url['id'] );
222
-		$entry_id = intval( $url['s_id'] );
221
+		$view_id  = intval( $url[ 'id' ] );
222
+		$entry_id = intval( $url[ 's_id' ] );
223 223
 		$format   = \GV\Utils::get( $url, 'format', 'json' );
224 224
 
225 225
 		$view  = \GV\View::by_id( $view_id );
@@ -254,32 +254,32 @@  discard block
 block discarded – undo
254 254
 		// Add all the WP_Post data
255 255
 		$view_post = $view_post->to_array();
256 256
 
257
-		unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] );
257
+		unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] );
258 258
 
259 259
 		$return = wp_parse_args( $item, $view_post );
260 260
 
261
-		$return['title'] = $return['post_title'];
261
+		$return[ 'title' ] = $return[ 'post_title' ];
262 262
 
263
-		$return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array();
264
-		unset( $return['atts'], $return['view_id'] );
263
+		$return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array();
264
+		unset( $return[ 'atts' ], $return[ 'view_id' ] );
265 265
 
266
-		$return['search_criteria'] = array(
266
+		$return[ 'search_criteria' ] = array(
267 267
 			'page_size' => rgars( $return, 'settings/page_size' ),
268 268
 			'sort_field' => rgars( $return, 'settings/sort_field' ),
269 269
 			'sort_direction' => rgars( $return, 'settings/sort_direction' ),
270 270
 			'offset' => rgars( $return, 'settings/offset' ),
271 271
 		);
272 272
 
273
-		unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] );
273
+		unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] );
274 274
 
275 275
 		// Redact for non-logged ins
276 276
 		if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) {
277
-			unset( $return['settings'] );
278
-			unset( $return['search_criteria'] );
277
+			unset( $return[ 'settings' ] );
278
+			unset( $return[ 'search_criteria' ] );
279 279
 		}
280 280
 		
281 281
 		if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) {
282
-			unset( $return['form'] );
282
+			unset( $return[ 'form' ] );
283 283
 		}
284 284
 
285 285
 		return $return;
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 			$view_id = func_get_arg( 1 ); // $view_id override
291 291
 		} else {
292 292
 			$url     = $request->get_url_params();
293
-			$view_id = intval( $url['id'] );
293
+			$view_id = intval( $url[ 'id' ] );
294 294
 		}
295 295
 
296 296
 		if ( ! $view = \GV\View::by_id( $view_id ) ) {
@@ -343,8 +343,8 @@  discard block
 block discarded – undo
343 343
 		}
344 344
 
345 345
 		$url     = $request->get_url_params();
346
-		$view_id = intval( $url['id'] );
347
-		$entry_id = intval( $url['s_id'] );
346
+		$view_id = intval( $url[ 'id' ] );
347
+		$entry_id = intval( $url[ 's_id' ] );
348 348
 
349 349
 		$view = \GV\View::by_id( $view_id );
350 350
 
@@ -352,11 +352,11 @@  discard block
 block discarded – undo
352 352
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
353 353
 		}
354 354
 
355
-		if ( $entry['form_id'] != $view->form->ID ) {
355
+		if ( $entry[ 'form_id' ] != $view->form->ID ) {
356 356
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
357 357
 		}
358 358
 
359
-		if ( $entry['status'] != 'active' ) {
359
+		if ( $entry[ 'status' ] != 'active' ) {
360 360
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
361 361
 		}
362 362
 
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
 		}
366 366
 
367 367
 		if ( $view->settings->get( 'show_only_approved' ) ) {
368
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
368
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
369 369
 				return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
370 370
 			}
371 371
 		}
Please login to merge, or discard this patch.
future/includes/rest/class-gv-rest-route.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 				'args'     => $this->create_sub_item_args()
122 122
 			),
123 123
 		) );
124
-		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ) , array(
124
+		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ), array(
125 125
 			array(
126 126
 				'methods'         => \WP_REST_Server::READABLE,
127 127
 				'callback'        => array( $this, 'get_sub_item' ),
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 	 * @return WP_REST_Response
371 371
 	 */
372 372
 	protected function not_implemented(  ) {
373
-		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' )  );
373
+		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' ) );
374 374
 		return new \WP_REST_Response( $error, 501 );
375 375
 	}
376 376
 
Please login to merge, or discard this patch.