Completed
Pull Request — develop (#1425)
by Gennady
07:12
created
includes/fields/class-gravityview-field-payment-amount.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 	 * @param \GV\Entry		$entry	The entry.
70 70
 	 * @param \GV\Request	$request The request context.
71 71
 	 *
72
-	 * @return mixed $value The filtered value.
72
+	 * @return string $value The filtered value.
73 73
 	 */
74 74
 	public function get_value( $value, $field, $view, $source, $entry, $request ) {
75 75
 		return $this->get_content( $value, $entry->as_entry(), $field->as_configuration() );
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) {
50 50
 
51 51
 		/** Overridden by a template. */
52
-		if( ! empty( $field['field_path'] ) ) { return $output; }
52
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
53 53
 
54 54
 		$amount = \GV\Utils::get( $entry, 'payment_amount' );
55 55
 		$return = GFCommon::to_money( $amount, \GV\Utils::get( $entry, 'currency' ) );
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
 	 *
89 89
 	 * @return string Original text if {date_created} isn't found. Otherwise, replaced text.
90 90
 	 */
91
-	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
91
+	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
92 92
 
93 93
 		$return = $text;
94 94
 
95 95
 		foreach ( $matches as $match ) {
96 96
 
97
-			$full_tag = $match[0];
98
-			$modifier = isset( $match[1] ) ? $match[1] : false;
97
+			$full_tag = $match[ 0 ];
98
+			$modifier = isset( $match[ 1 ] ) ? $match[ 1 ] : false;
99 99
 
100 100
 			$amount = \GV\Utils::get( $entry, 'payment_amount' );
101 101
 
Please login to merge, or discard this patch.
future/lib/EDD_SL_Plugin_Updater.php 3 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,9 @@
 block discarded – undo
2 2
 namespace GV;
3 3
 
4 4
 // Exit if accessed directly
5
-if ( ! defined( 'ABSPATH' ) ) exit;
5
+if ( ! defined( 'ABSPATH' ) ) {
6
+	exit;
7
+}
6 8
 
7 9
 /**
8 10
  * Allows plugins to use their own update API.
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
 	 * @uses api_request()
79 79
 	 *
80 80
 	 * @param array   $_transient_data Update array build by WordPress.
81
-	 * @return array Modified update array with custom plugin data.
81
+	 * @return \stdClass Modified update array with custom plugin data.
82 82
 	 */
83 83
 	public function check_update( $_transient_data ) {
84 84
 
Please login to merge, or discard this patch.
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -40,10 +40,10 @@  discard block
 block discarded – undo
40 40
 		$this->api_data    = $_api_data;
41 41
 		$this->name        = plugin_basename( $_plugin_file );
42 42
 		$this->slug        = basename( $_plugin_file, '.php' );
43
-		$this->version     = $_api_data['version'];
44
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
45
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
46
-		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
43
+		$this->version     = $_api_data[ 'version' ];
44
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
45
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
46
+		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
47 47
 
48 48
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
49 49
 
@@ -147,11 +147,11 @@  discard block
 block discarded – undo
147 147
 			return;
148 148
 		}
149 149
 
150
-		if( ! current_user_can( 'update_plugins' ) ) {
150
+		if ( ! current_user_can( 'update_plugins' ) ) {
151 151
 			return;
152 152
 		}
153 153
 
154
-		if( ! is_multisite() ) {
154
+		if ( ! is_multisite() ) {
155 155
 			return;
156 156
 		}
157 157
 
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
248 248
 					esc_html( $version_info->new_version ),
249 249
 					'</a>',
250
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
250
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
251 251
 					'</a>'
252 252
 				);
253 253
 			}
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 			)
293 293
 		);
294 294
 
295
-		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
295
+		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
296 296
 
297 297
 		// Get the transient where we store the api request for this plugin for 24 hours
298 298
 		$edd_api_request_transient = $this->get_cached_version_info( $cache_key );
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 			$_data->contributors = $this->convert_object_to_array( $_data->contributors );
334 334
 		}
335 335
 
336
-		if( ! isset( $_data->plugin ) ) {
336
+		if ( ! isset( $_data->plugin ) ) {
337 337
 			$_data->plugin = $this->name;
338 338
 		}
339 339
 
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 
373 373
 		$verify_ssl = $this->verify_ssl();
374 374
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
375
-			$args['sslverify'] = $verify_ssl;
375
+			$args[ 'sslverify' ] = $verify_ssl;
376 376
 		}
377 377
 		return $args;
378 378
 
@@ -400,9 +400,9 @@  discard block
 block discarded – undo
400 400
 		if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) {
401 401
 			$test_url_parts = parse_url( $this->api_url );
402 402
 
403
-			$scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme']     : 'http';
404
-			$host   = ! empty( $test_url_parts['host'] )   ? $test_url_parts['host']       : '';
405
-			$port   = ! empty( $test_url_parts['port'] )   ? ':' . $test_url_parts['port'] : '';
403
+			$scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http';
404
+			$host   = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : '';
405
+			$port   = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : '';
406 406
 
407 407
 			if ( empty( $host ) ) {
408 408
 				$edd_plugin_url_available[ $store_hash ] = false;
@@ -419,27 +419,27 @@  discard block
 block discarded – undo
419 419
 
420 420
 		$data = array_merge( $this->api_data, $_data );
421 421
 
422
-		if ( $data['slug'] != $this->slug ) {
422
+		if ( $data[ 'slug' ] != $this->slug ) {
423 423
 			return;
424 424
 		}
425 425
 
426
-		if( $this->api_url == trailingslashit ( home_url() ) ) {
426
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
427 427
 			return false; // Don't allow a plugin to ping itself
428 428
 		}
429 429
 
430 430
 		$api_params = array(
431 431
 			'edd_action' => 'get_version',
432
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
433
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
434
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
435
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
436
-			'slug'       => $data['slug'],
437
-			'author'     => $data['author'],
432
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
433
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
434
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
435
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
436
+			'slug'       => $data[ 'slug' ],
437
+			'author'     => $data[ 'author' ],
438 438
 			'url'        => home_url(),
439
-			'beta'       => ! empty( $data['beta'] ),
439
+			'beta'       => ! empty( $data[ 'beta' ] ),
440 440
 		);
441 441
 
442
-		$request    = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
442
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
443 443
 
444 444
 		if ( ! is_wp_error( $request ) ) {
445 445
 			$request = json_decode( wp_remote_retrieve_body( $request ) );
@@ -459,9 +459,9 @@  discard block
 block discarded – undo
459 459
 			$request->icons = maybe_unserialize( $request->icons );
460 460
 		}
461 461
 
462
-		if( ! empty( $request->sections ) ) {
463
-			foreach( $request->sections as $key => $section ) {
464
-				$request->$key = (array) $section;
462
+		if ( ! empty( $request->sections ) ) {
463
+			foreach ( $request->sections as $key => $section ) {
464
+				$request->$key = (array)$section;
465 465
 			}
466 466
 		}
467 467
 
@@ -472,37 +472,37 @@  discard block
 block discarded – undo
472 472
 
473 473
 		global $edd_plugin_data;
474 474
 
475
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
475
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
476 476
 			return;
477 477
 		}
478 478
 
479
-		if( empty( $_REQUEST['plugin'] ) ) {
479
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
480 480
 			return;
481 481
 		}
482 482
 
483
-		if( empty( $_REQUEST['slug'] ) ) {
483
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
484 484
 			return;
485 485
 		}
486 486
 
487
-		if( ! current_user_can( 'update_plugins' ) ) {
487
+		if ( ! current_user_can( 'update_plugins' ) ) {
488 488
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
489 489
 		}
490 490
 
491
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
492
-		$beta         = ! empty( $data['beta'] ) ? true : false;
493
-		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' );
491
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
492
+		$beta         = ! empty( $data[ 'beta' ] ) ? true : false;
493
+		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' );
494 494
 		$version_info = $this->get_cached_version_info( $cache_key );
495 495
 
496
-		if( false === $version_info ) {
496
+		if ( false === $version_info ) {
497 497
 
498 498
 			$api_params = array(
499 499
 				'edd_action' => 'get_version',
500
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
501
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
502
-				'slug'       => $_REQUEST['slug'],
503
-				'author'     => $data['author'],
500
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
501
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
502
+				'slug'       => $_REQUEST[ 'slug' ],
503
+				'author'     => $data[ 'author' ],
504 504
 				'url'        => home_url(),
505
-				'beta'       => ! empty( $data['beta'] )
505
+				'beta'       => ! empty( $data[ 'beta' ] )
506 506
 			);
507 507
 
508 508
 			$verify_ssl = $this->verify_ssl();
@@ -519,9 +519,9 @@  discard block
 block discarded – undo
519 519
 				$version_info = false;
520 520
 			}
521 521
 
522
-			if( ! empty( $version_info ) ) {
523
-				foreach( $version_info->sections as $key => $section ) {
524
-					$version_info->$key = (array) $section;
522
+			if ( ! empty( $version_info ) ) {
523
+				foreach ( $version_info->sections as $key => $section ) {
524
+					$version_info->$key = (array)$section;
525 525
 				}
526 526
 			}
527 527
 
@@ -529,8 +529,8 @@  discard block
 block discarded – undo
529 529
 
530 530
 		}
531 531
 
532
-		if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
533
-			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>';
532
+		if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) {
533
+			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>';
534 534
 		}
535 535
 
536 536
 		exit;
@@ -538,29 +538,29 @@  discard block
 block discarded – undo
538 538
 
539 539
 	public function get_cached_version_info( $cache_key = '' ) {
540 540
 
541
-		if( empty( $cache_key ) ) {
541
+		if ( empty( $cache_key ) ) {
542 542
 			$cache_key = $this->cache_key;
543 543
 		}
544 544
 
545 545
 		$cache = get_option( $cache_key );
546 546
 
547
-		if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
547
+		if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) {
548 548
 			return false; // Cache is expired
549 549
 		}
550 550
 
551 551
 		// We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point.
552
-		$cache['value'] = json_decode( $cache['value'] );
553
-		if ( ! empty( $cache['value']->icons ) ) {
554
-			$cache['value']->icons = (array) $cache['value']->icons;
552
+		$cache[ 'value' ] = json_decode( $cache[ 'value' ] );
553
+		if ( ! empty( $cache[ 'value' ]->icons ) ) {
554
+			$cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons;
555 555
 		}
556 556
 
557
-		return $cache['value'];
557
+		return $cache[ 'value' ];
558 558
 
559 559
 	}
560 560
 
561 561
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
562 562
 
563
-		if( empty( $cache_key ) ) {
563
+		if ( empty( $cache_key ) ) {
564 564
 			$cache_key = $this->cache_key;
565 565
 		}
566 566
 
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 	 * @return bool
581 581
 	 */
582 582
 	private function verify_ssl() {
583
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
583
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
584 584
 	}
585 585
 
586 586
 }
Please login to merge, or discard this patch.
future/loader.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 			printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' );
26 26
 			printf( '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" alt="The GravityView Astronaut Says:" style="float: left; height: 60px; margin-right : 10px;" />' );
27 27
 			printf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ),
28
-				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION , "</h3>\n\n", $version );
28
+				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION, "</h3>\n\n", $version );
29 29
 			printf( '</body>' );
30 30
 		}
31 31
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 }
35 35
 
36 36
 /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
37
-if ( version_compare( phpversion(), '5.3.0' , '<' ) ) {
37
+if ( version_compare( phpversion(), '5.3.0', '<' ) ) {
38 38
 	require GRAVITYVIEW_DIR . 'future/_stubs.php';
39 39
 
40 40
 /** All looks fine. */
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 */
77 77
 	public static function remove() {
78 78
 		$shortcode = new static();
79
-		unset( self::$shortcodes[$shortcode->name] );
79
+		unset( self::$shortcodes[ $shortcode->name ] );
80 80
 		remove_shortcode( $shortcode->name );
81 81
 	}
82 82
 
@@ -108,14 +108,14 @@  discard block
 block discarded – undo
108 108
 		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
109 109
 
110 110
 		foreach ( $matches as $shortcode ) {
111
-			$shortcode_name = $shortcode[2];
111
+			$shortcode_name = $shortcode[ 2 ];
112 112
 
113
-			$shortcode_atts = shortcode_parse_atts( $shortcode[3] );
114
-			$shortcode_content = $shortcode[5];
113
+			$shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] );
114
+			$shortcode_content = $shortcode[ 5 ];
115 115
 
116 116
 			/** This is a registered GravityView shortcode. */
117
-			if ( !empty( self::$shortcodes[$shortcode_name] ) ) {
118
-				$shortcode = clone self::$shortcodes[$shortcode_name];
117
+			if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) {
118
+				$shortcode = clone self::$shortcodes[ $shortcode_name ];
119 119
 			} else {
120 120
 				/** This is some generic shortcode. */
121 121
 				$shortcode = new self;
Please login to merge, or discard this patch.
future/includes/class-gv-view.php 4 patches
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,6 @@
 block discarded – undo
62 62
 	 *
63 63
 	 * Internal static cache for gets, and whatnot.
64 64
 	 * This is not persistent, resets across requests.
65
-
66 65
 	 * @internal
67 66
 	 */
68 67
 	private static $cache = array();
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -230,8 +230,9 @@
 block discarded – undo
230 230
 		 * Check permissions.
231 231
 		 */
232 232
 		while ( $error = $view->can_render( null, $request ) ) {
233
-			if ( ! is_wp_error( $error ) )
234
-				break;
233
+			if ( ! is_wp_error( $error ) ) {
234
+							break;
235
+			}
235 236
 
236 237
 			switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
237 238
 				case 'post_password_required':
Please login to merge, or discard this patch.
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -795,6 +795,7 @@
 block discarded – undo
795 795
 	 * Retrieve the entries for the current view and request.
796 796
 	 *
797 797
 	 * @param \GV\Request The request. Unused for now.
798
+	 * @param Request $request
798 799
 	 *
799 800
 	 * @return \GV\Entry_Collection The entries.
800 801
 	 */
Please login to merge, or discard this patch.
Spacing   +38 added lines, -39 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$supports = array( 'title', 'revisions' );
126 126
 
127 127
 		if ( $is_hierarchical ) {
128
-			$supports[] = 'page-attributes';
128
+			$supports[ ] = 'page-attributes';
129 129
 		}
130 130
 
131 131
 		/**
@@ -227,11 +227,11 @@  discard block
 block discarded – undo
227 227
 		$rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );
228 228
 
229 229
 		add_filter( 'query_vars', function( $query_vars ) {
230
-			$query_vars[] = 'csv';
230
+			$query_vars[ ] = 'csv';
231 231
 			return $query_vars;
232 232
 		} );
233 233
 
234
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) {
234
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) {
235 235
 			call_user_func_array( 'add_rewrite_rule', $rule );
236 236
 		}
237 237
 	}
@@ -308,13 +308,13 @@  discard block
 block discarded – undo
308 308
 			return $content;
309 309
 		}
310 310
 
311
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
311
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
312 312
 
313 313
 		/**
314 314
 		 * Editing a single entry.
315 315
 		 */
316 316
 		if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) {
317
-			if ( $entry['status'] != 'active' ) {
317
+			if ( $entry[ 'status' ] != 'active' ) {
318 318
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
319 319
 				return __( 'You are not allowed to view this content.', 'gravityview' );
320 320
 			}
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 			}
326 326
 
327 327
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
328
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
328
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
329 329
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
330 330
 					return __( 'You are not allowed to view this content.', 'gravityview' );
331 331
 				}
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 
349 349
 			foreach ( $entryset as $e ) {
350 350
 
351
-				if ( 'active' !== $e['status'] ) {
351
+				if ( 'active' !== $e[ 'status' ] ) {
352 352
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
353 353
 					return __( 'You are not allowed to view this content.', 'gravityview' );
354 354
 				}
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 				}
360 360
 
361 361
 				if ( $show_only_approved && ! $is_admin_and_can_view ) {
362
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
362
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
363 363
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
364 364
 						return __( 'You are not allowed to view this content.', 'gravityview' );
365 365
 					}
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column );
535 535
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column );
536 536
 
537
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
537
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
538 538
 		}
539 539
 
540 540
 		return $joins;
@@ -624,13 +624,13 @@  discard block
 block discarded – undo
624 624
 			}
625 625
 
626 626
 			foreach ( $_fields as $field ) {
627
-				if ( ! empty( $field['unions'] ) ) {
628
-					foreach ( $field['unions'] as $form_id => $field_id ) {
627
+				if ( ! empty( $field[ 'unions' ] ) ) {
628
+					foreach ( $field[ 'unions' ] as $form_id => $field_id ) {
629 629
 						if ( ! isset( $unions[ $form_id ] ) ) {
630 630
 							$unions[ $form_id ] = array();
631 631
 						}
632 632
 
633
-						$unions[ $form_id ][ $field['id'] ] =
633
+						$unions[ $form_id ][ $field[ 'id' ] ] =
634 634
 							is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id );
635 635
 					}
636 636
 				}
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
 		if ( ! $view->form ) {
686 686
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
687 687
 				'view_id' => $view->ID,
688
-				'form_id' => $view->_gravityview_form_id ? : 0,
688
+				'form_id' => $view->_gravityview_form_id ?: 0,
689 689
 			) );
690 690
 		}
691 691
 
@@ -925,10 +925,10 @@  discard block
 block discarded – undo
925 925
 			 * Remove multiple sorting before calling legacy filters.
926 926
 			 * This allows us to fake it till we make it.
927 927
 			 */
928
-			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
929
-				$parameters['sort_field'] = reset( $parameters['sort_field'] );
930
-				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
931
-					$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
928
+			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
929
+				$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
930
+				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
931
+					$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
932 932
 				}
933 933
 			}
934 934
 
@@ -937,31 +937,30 @@  discard block
 block discarded – undo
937 937
 			 */
938 938
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID );
939 939
 
940
-			$parameters['context_view_id'] = $this->ID;
940
+			$parameters[ 'context_view_id' ] = $this->ID;
941 941
 			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
942 942
 
943 943
 			if ( ! is_array( $parameters ) ) {
944 944
 				$parameters = array();
945 945
 			}
946 946
 
947
-			if ( ! is_array( $parameters['search_criteria'] ) ) {
948
-				$parameters['search_criteria'] = array();
947
+			if ( ! is_array( $parameters[ 'search_criteria' ] ) ) {
948
+				$parameters[ 'search_criteria' ] = array();
949 949
 			}
950 950
 
951
-			if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) {
952
-				$parameters['search_criteria']['field_filters'] = array();
951
+			if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) {
952
+				$parameters[ 'search_criteria' ][ 'field_filters' ] = array();
953 953
 			}
954 954
 
955 955
 			if ( $request instanceof REST\Request ) {
956 956
 				$atts = $this->settings->as_atts();
957 957
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
958
-						'paging' => array( 'page_size' => $atts['page_size'] ),
958
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
959 959
 					) );
960
-				$parameters['paging'] = $paging_parameters['paging'];
960
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
961 961
 			}
962 962
 
963
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
964
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
963
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
965 964
 
966 965
 			/**
967 966
 			 * Cleanup duplicate field_filter parameters to simplify the query.
@@ -969,28 +968,28 @@  discard block
 block discarded – undo
969 968
 			$unique_field_filters = array();
970 969
 			foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) as $key => $filter ) {
971 970
 				if ( 'mode' === $key ) {
972
-					$unique_field_filters['mode'] = $filter;
971
+					$unique_field_filters[ 'mode' ] = $filter;
973 972
 				} else if ( ! in_array( $filter, $unique_field_filters ) ) {
974
-					$unique_field_filters[] = $filter;
973
+					$unique_field_filters[ ] = $filter;
975 974
 				}
976 975
 			}
977
-			$parameters['search_criteria']['field_filters'] = $unique_field_filters;
976
+			$parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters;
978 977
 
979
-			if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) {
978
+			if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) {
980 979
 				gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' );
981 980
 			}
982 981
 
983 982
 			$entries = $this->form->get_entries( $this )
984
-				->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
983
+				->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
985 984
 				->offset( $this->settings->get( 'offset' ) )
986
-				->limit( $parameters['paging']['page_size'] )
985
+				->limit( $parameters[ 'paging' ][ 'page_size' ] )
987 986
 				->page( $page );
988 987
 
989 988
 
990
-			if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
989
+			if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
991 990
 				$field = new \GV\Field();
992
-				$field->ID = $parameters['sorting']['key'];
993
-				$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
991
+				$field->ID = $parameters[ 'sorting' ][ 'key' ];
992
+				$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
994 993
 				$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
995 994
 			}
996 995
 		}
@@ -1064,7 +1063,7 @@  discard block
 block discarded – undo
1064 1063
 		$allowed = $headers = array();
1065 1064
 
1066 1065
 		foreach ( $view->fields->by_position( "directory_*" )->by_visible( $view )->all() as $id => $field ) {
1067
-			$allowed[] = $field;
1066
+			$allowed[ ] = $field;
1068 1067
 		}
1069 1068
 
1070 1069
 		$renderer = new Field_Renderer();
@@ -1086,17 +1085,17 @@  discard block
 block discarded – undo
1086 1085
 			} );
1087 1086
 
1088 1087
 			foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
1089
-				$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
1088
+				$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
1090 1089
 			}
1091 1090
 
1092 1091
 			foreach ( $allowed as $field ) {
1093 1092
 				$source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source();
1094 1093
 
1095
-				$return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
1094
+				$return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
1096 1095
 
1097 1096
 				if ( ! $headers_done ) {
1098 1097
 					$label = $field->get_label( $view, $source, $entry );
1099
-					$headers[] = $label ? $label : $field->ID;
1098
+					$headers[ ] = $label ? $label : $field->ID;
1100 1099
 				}
1101 1100
 			}
1102 1101
 
Please login to merge, or discard this patch.
future/includes/class-gv-widget.php 3 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -163,14 +163,14 @@
 block discarded – undo
163 163
 		return $settings;
164 164
 	}
165 165
 
166
-    /**
166
+	/**
167 167
 	 * Get the Widget ID.
168 168
 	 *
169
-     * @return string The Widget ID.
170
-     */
171
-    public function get_widget_id() {
172
-        return $this->widget_id;
173
-    }
169
+	 * @return string The Widget ID.
170
+	 */
171
+	public function get_widget_id() {
172
+		return $this->widget_id;
173
+	}
174 174
 
175 175
 	/**
176 176
 	 * Get the widget settings
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
152 152
 
153 153
 		if ( $enable_custom_class ) {
154
-			$settings['custom_class'] = array(
154
+			$settings[ 'custom_class' ] = array(
155 155
 				'type' => 'text',
156 156
 				'label' => __( 'Custom CSS Class:', 'gravityview' ),
157 157
 				'desc' => __( 'This class will be added to the widget container', 'gravityview' ),
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
 	 */
204 204
 	public static function get_default_widget_areas() {
205 205
 		$default_areas = array(
206
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
207
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ) , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ) , 'subtitle' => '' ) ) ),
206
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
207
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
208 208
 		);
209 209
 
210 210
 		/**
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 		}
235 235
 
236 236
 		$widgets[ $this->get_widget_id() ] = array(
237
-			'label' => $this->widget_label ,
237
+			'label' => $this->widget_label,
238 238
 			'description' => $this->widget_description,
239 239
 			'subtitle' => $this->widget_subtitle,
240 240
 			'class' => get_called_class(),
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 	 */
256 256
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
257 257
 		if ( $this->get_widget_id() === $widget ) {
258
-			if( $settings = $this->get_settings() ) {
258
+			if ( $settings = $this->get_settings() ) {
259 259
 				$options = array_merge( $options, $settings );
260 260
 			}
261 261
 		}
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 			return;
307 307
 		}
308 308
 
309
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
309
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
310 310
 	}
311 311
 
312 312
 	/**
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -393,7 +393,7 @@
 block discarded – undo
393 393
 	 * @internal
394 394
 	 * @since 2.0
395 395
 	 *
396
-	 * @return \GV\Widget|null The widget implementation from configuration or none.
396
+	 * @return Widget The widget implementation from configuration or none.
397 397
 	 */
398 398
 	public static function from_configuration( $configuration ) {
399 399
 		$registered_widgets = self::registered();
Please login to merge, or discard this patch.
future/includes/class-gv-template-entry-legacy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 		global $post;
35 35
 
36 36
 		if ( $post ) {
37
-			$context['post'] = $post;
37
+			$context[ 'post' ] = $post;
38 38
 		}
39 39
 
40 40
 		\GV\Mocks\Legacy_Context::push( $context );
Please login to merge, or discard this patch.
future/includes/class-gv-core.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -113,14 +113,14 @@
 block discarded – undo
113 113
 
114 114
 		/** Require critical legacy core files. @todo Deprecate */
115 115
 		require_once $this->plugin->dir( 'includes/helper-functions.php' );
116
-		require_once $this->plugin->dir( 'includes/class-common.php');
117
-		require_once $this->plugin->dir( 'includes/connector-functions.php');
116
+		require_once $this->plugin->dir( 'includes/class-common.php' );
117
+		require_once $this->plugin->dir( 'includes/connector-functions.php' );
118 118
 		require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' );
119 119
 		require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' );
120 120
 		require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' );
121 121
 		require_once $this->plugin->dir( 'includes/class-admin.php' );
122
-		require_once $this->plugin->dir( 'includes/class-post-types.php');
123
-		require_once $this->plugin->dir( 'includes/class-cache.php');
122
+		require_once $this->plugin->dir( 'includes/class-post-types.php' );
123
+		require_once $this->plugin->dir( 'includes/class-cache.php' );
124 124
 
125 125
 		/**
126 126
 		 * GravityView extensions and widgets.
Please login to merge, or discard this patch.
future/includes/class-gv-collection-entry-sort.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
 		if ( $this->field ) {
79 79
 			return array(
80 80
 				'key' => $this->field->ID,
81
-				'direction' => $this->direction ? : self::ASC,
81
+				'direction' => $this->direction ?: self::ASC,
82 82
 				'is_numeric' => self::ALPHA ? true : false,
83 83
 			);
84 84
 		}
Please login to merge, or discard this patch.