Completed
Pull Request — develop (#1523)
by Zack
19:02
created
includes/widgets/class-gravityview-widget-gravityforms.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 	 *
74 74
 	 * @param array $allowlist Array of widgets to show before a search is performed, if the setting is enabled.
75 75
 	 *
76
-	 * @return array
76
+	 * @return string[]
77 77
 	 */
78 78
 	function add_to_allowlist( $allowlist ) {
79 79
 
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 	function __construct() {
15 15
 
16
-		$this->widget_description = __('Display a Gravity Forms form.', 'gravityview' );
16
+		$this->widget_description = __( 'Display a Gravity Forms form.', 'gravityview' );
17 17
 
18 18
 		$default_values = array(
19 19
 			'header' => 1,
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
 		add_filter( 'gravityview/widget/hide_until_searched/whitelist', array( $this, 'add_to_allowlist' ) );
56 56
 
57
-		parent::__construct( __( 'Gravity Forms', 'gravityview' ) , 'gravityforms', $default_values, $settings );
57
+		parent::__construct( __( 'Gravity Forms', 'gravityview' ), 'gravityforms', $default_values, $settings );
58 58
 	}
59 59
 
60 60
 	/**
@@ -81,13 +81,13 @@  discard block
 block discarded – undo
81 81
 		 * gravityview_get_forms() is currently running too early as widgets_init runs before init and
82 82
 		 * when most Gravity Forms plugins register their own fields like GP Terms of Service.
83 83
 		 */
84
-		if( $doing_ajax || ( \GV\Admin_Request::is_admin() && ! GFForms::is_gravity_page() ) ) {
84
+		if ( $doing_ajax || ( \GV\Admin_Request::is_admin() && ! GFForms::is_gravity_page() ) ) {
85 85
 
86 86
 			// check for available gravity forms
87 87
 			$forms = gravityview_get_forms();
88 88
 
89 89
 			foreach ( $forms as $form ) {
90
-				$choices[ $form['id'] ] = $form['title'];
90
+				$choices[ $form[ 'id' ] ] = $form[ 'title' ];
91 91
 			}
92 92
 		}
93 93
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 */
104 104
 	function add_to_allowlist( $allowlist ) {
105 105
 
106
-		$allowlist[] = 'gravityforms';
106
+		$allowlist[ ] = 'gravityforms';
107 107
 
108 108
 		return $allowlist;
109 109
 	}
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	 * @param string $content
114 114
 	 * @param string $context
115 115
 	 */
116
-	public function render_frontend( $widget_args, $content = '', $context = '') {
116
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
117 117
 
118 118
 		if ( ! $this->pre_render_frontend() ) {
119 119
 			return;
Please login to merge, or discard this patch.
includes/widgets/register-gravityview-widgets.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -16,17 +16,17 @@
 block discarded – undo
16 16
  */
17 17
 function gravityview_register_gravityview_widgets() {
18 18
 
19
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
19
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
20 20
 
21
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' );
22
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' );
23
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-size.php' );
24
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' );
25
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-gravityforms.php' );
26
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' );
21
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' );
22
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' );
23
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-size.php' );
24
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' );
25
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-gravityforms.php' );
26
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' );
27 27
 
28
-	if( class_exists('GFPolls') ) {
29
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' );
28
+	if ( class_exists( 'GFPolls' ) ) {
29
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' );
30 30
 	}
31 31
 
32 32
 }
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-flow.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
 		parent::add_hooks();
35 35
 
36
-		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown'), 10, 2 );
36
+		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown' ), 10, 2 );
37 37
 
38 38
 		add_filter( 'gravityview/admin/available_fields', array( $this, 'maybe_add_non_default_fields' ), 10, 3 );
39 39
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 * @return void
54 54
 	 */
55 55
 	public function clear_cache_after_workflow( $form, $entry_id, $step_id, $starting_step_id ) {
56
-		do_action( 'gravityview_clear_form_cache', $form['id'] );
56
+		do_action( 'gravityview_clear_form_cache', $form[ 'id' ] );
57 57
 	}
58 58
 
59 59
 	/**
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	public static function get_status_options( $form_id = 0, $status_key = 'workflow_final_status' ) {
72 72
 
73
-		if( empty( $form_id ) ) {
73
+		if ( empty( $form_id ) ) {
74 74
 			$form_id = GravityView_View::getInstance()->getFormId();
75 75
 		}
76 76
 
77 77
 		$entry_meta = gravity_flow()->get_entry_meta( array(), $form_id );
78 78
 
79
-		return (array) \GV\Utils::get( $entry_meta, $status_key . '/filter/choices' );
79
+		return (array)\GV\Utils::get( $entry_meta, $status_key . '/filter/choices' );
80 80
 	}
81 81
 
82 82
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
 		$workflow_steps = $GFlow->get_steps();
100 100
 
101
-		if( $workflow_steps ) {
101
+		if ( $workflow_steps ) {
102 102
 
103 103
 			foreach ( $workflow_steps as $step ) {
104 104
 
@@ -110,12 +110,12 @@  discard block
 block discarded – undo
110 110
 				);
111 111
 			}
112 112
 
113
-			$fields['workflow_step'] = array(
113
+			$fields[ 'workflow_step' ] = array(
114 114
 				'label' => esc_html__( 'Workflow Step', 'gravityview' ),
115 115
 				'type'  => 'select',
116 116
 			);
117 117
 
118
-			$fields['workflow_final_status'] = array(
118
+			$fields[ 'workflow_final_status' ] = array(
119 119
 				'label' => esc_html__( 'Workflow Status', 'gravityview' ),
120 120
 				'type'  => 'select',
121 121
 			);
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		if ( ( $insert_at = array_search( 'workflow_final_status', wp_list_pluck( $fields, 'key' ) ) ) !== false ) {
132 132
 			$fields_end = array_splice( $fields, $insert_at + 1 );
133 133
 
134
-			$fields[] = array(
134
+			$fields[ ] = array(
135 135
 				'text' => __( 'Workflow Current Status Timestamp', 'gravityview' ),
136 136
 				'operators' => array( '>', '<' ),
137 137
 				'placeholder' => 'yyyy-mm-dd',
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 				$keys_end = array_splice( $keys, $insert_at + 1 );
158 158
 				$values_end = array_splice( $values, $insert_at + 1 );
159 159
 
160
-				$keys[] = 'workflow_current_status_timestamp';
161
-				$values[] = array(
160
+				$keys[ ] = 'workflow_current_status_timestamp';
161
+				$values[ ] = array(
162 162
 					'label' => __( 'Workflow Current Status Timestamp', 'gravityview' ),
163 163
 					'type' => 'workflow_current_status_timestamp',
164 164
 				);
Please login to merge, or discard this patch.
future/lib/EDD_SL_Plugin_Updater.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
 	 * @uses api_request()
98 98
 	 *
99 99
 	 * @param array   $_transient_data Update array build by WordPress.
100
-	 * @return array Modified update array with custom plugin data.
100
+	 * @return stdClass Modified update array with custom plugin data.
101 101
 	 */
102 102
 	public function check_update( $_transient_data ) {
103 103
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,9 @@
 block discarded – undo
10 10
  */
11 11
 
12 12
 // Exit if accessed directly
13
-if ( ! defined( 'ABSPATH' ) ) exit;
13
+if ( ! defined( 'ABSPATH' ) ) {
14
+	exit;
15
+}
14 16
 
15 17
 /**
16 18
  * Allows plugins to use their own update API.
Please login to merge, or discard this patch.
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -48,10 +48,10 @@  discard block
 block discarded – undo
48 48
 		$this->api_data    = $_api_data;
49 49
 		$this->name        = plugin_basename( $_plugin_file );
50 50
 		$this->slug        = basename( $_plugin_file, '.php' );
51
-		$this->version     = $_api_data['version'];
52
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
53
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
54
-		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
51
+		$this->version     = $_api_data[ 'version' ];
52
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
53
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
54
+		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
55 55
 
56 56
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
57 57
 
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 			return;
171 171
 		}
172 172
 
173
-		if( ! current_user_can( 'update_plugins' ) ) {
173
+		if ( ! current_user_can( 'update_plugins' ) ) {
174 174
 			return;
175 175
 		}
176 176
 
177
-		if( ! is_multisite() ) {
177
+		if ( ! is_multisite() ) {
178 178
 			return;
179 179
 		}
180 180
 
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
282 282
 					esc_html( $version_info->new_version ),
283 283
 					'</a>',
284
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
284
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
285 285
 					'</a>'
286 286
 				);
287 287
 			}
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
 			$_data->contributors = $this->convert_object_to_array( $_data->contributors );
366 366
 		}
367 367
 
368
-		if( ! isset( $_data->plugin ) ) {
368
+		if ( ! isset( $_data->plugin ) ) {
369 369
 			$_data->plugin = $this->name;
370 370
 		}
371 371
 
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
 
405 405
 		$verify_ssl = $this->verify_ssl();
406 406
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
407
-			$args['sslverify'] = $verify_ssl;
407
+			$args[ 'sslverify' ] = $verify_ssl;
408 408
 		}
409 409
 		return $args;
410 410
 
@@ -432,9 +432,9 @@  discard block
 block discarded – undo
432 432
 		if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) {
433 433
 			$test_url_parts = parse_url( $this->api_url );
434 434
 
435
-			$scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme']     : 'http';
436
-			$host   = ! empty( $test_url_parts['host'] )   ? $test_url_parts['host']       : '';
437
-			$port   = ! empty( $test_url_parts['port'] )   ? ':' . $test_url_parts['port'] : '';
435
+			$scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http';
436
+			$host   = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : '';
437
+			$port   = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : '';
438 438
 
439 439
 			if ( empty( $host ) ) {
440 440
 				$edd_plugin_url_available[ $store_hash ] = false;
@@ -451,27 +451,27 @@  discard block
 block discarded – undo
451 451
 
452 452
 		$data = array_merge( $this->api_data, $_data );
453 453
 
454
-		if ( $data['slug'] != $this->slug ) {
454
+		if ( $data[ 'slug' ] != $this->slug ) {
455 455
 			return;
456 456
 		}
457 457
 
458
-		if( $this->api_url == trailingslashit ( home_url() ) ) {
458
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
459 459
 			return false; // Don't allow a plugin to ping itself
460 460
 		}
461 461
 
462 462
 		$api_params = array(
463 463
 			'edd_action' => 'get_version',
464
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
465
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
466
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
467
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
468
-			'slug'       => $data['slug'],
469
-			'author'     => $data['author'],
464
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
465
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
466
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
467
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
468
+			'slug'       => $data[ 'slug' ],
469
+			'author'     => $data[ 'author' ],
470 470
 			'url'        => home_url(),
471
-			'beta'       => ! empty( $data['beta'] ),
471
+			'beta'       => ! empty( $data[ 'beta' ] ),
472 472
 		);
473 473
 
474
-		$request    = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
474
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
475 475
 
476 476
 		if ( ! is_wp_error( $request ) ) {
477 477
 			$request = json_decode( wp_remote_retrieve_body( $request ) );
@@ -491,9 +491,9 @@  discard block
 block discarded – undo
491 491
 			$request->icons = maybe_unserialize( $request->icons );
492 492
 		}
493 493
 
494
-		if( ! empty( $request->sections ) ) {
495
-			foreach( $request->sections as $key => $section ) {
496
-				$request->$key = (array) $section;
494
+		if ( ! empty( $request->sections ) ) {
495
+			foreach ( $request->sections as $key => $section ) {
496
+				$request->$key = (array)$section;
497 497
 			}
498 498
 		}
499 499
 
@@ -507,35 +507,35 @@  discard block
 block discarded – undo
507 507
 
508 508
 		global $edd_plugin_data;
509 509
 
510
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
510
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
511 511
 			return;
512 512
 		}
513 513
 
514
-		if( empty( $_REQUEST['plugin'] ) ) {
514
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
515 515
 			return;
516 516
 		}
517 517
 
518
-		if( empty( $_REQUEST['slug'] ) ) {
518
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
519 519
 			return;
520 520
 		}
521 521
 
522
-		if( ! current_user_can( 'update_plugins' ) ) {
522
+		if ( ! current_user_can( 'update_plugins' ) ) {
523 523
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
524 524
 		}
525 525
 
526
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
526
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
527 527
 		$version_info = $this->get_cached_version_info();
528 528
 
529
-		if( false === $version_info ) {
529
+		if ( false === $version_info ) {
530 530
 
531 531
 			$api_params = array(
532 532
 				'edd_action' => 'get_version',
533
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
534
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
535
-				'slug'       => $_REQUEST['slug'],
536
-				'author'     => $data['author'],
533
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
534
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
535
+				'slug'       => $_REQUEST[ 'slug' ],
536
+				'author'     => $data[ 'author' ],
537 537
 				'url'        => home_url(),
538
-				'beta'       => ! empty( $data['beta'] )
538
+				'beta'       => ! empty( $data[ 'beta' ] )
539 539
 			);
540 540
 
541 541
 			$verify_ssl = $this->verify_ssl();
@@ -551,22 +551,22 @@  discard block
 block discarded – undo
551 551
 				$version_info = false;
552 552
 			}
553 553
 
554
-			if( ! empty( $version_info ) ) {
555
-				foreach( $version_info->sections as $key => $section ) {
556
-					$version_info->$key = (array) $section;
554
+			if ( ! empty( $version_info ) ) {
555
+				foreach ( $version_info->sections as $key => $section ) {
556
+					$version_info->$key = (array)$section;
557 557
 				}
558 558
 			}
559 559
 
560 560
 			$this->set_version_info_cache( $version_info );
561 561
 
562 562
 			// Delete the unneeded option
563
-			delete_option( md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $this->beta . '_version_info' ) );
563
+			delete_option( md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $this->beta . '_version_info' ) );
564 564
 		}
565 565
 
566 566
 		if ( isset( $version_info->sections ) ) {
567 567
 			$sections = $this->convert_object_to_array( $version_info->sections );
568
-			if ( ! empty( $sections['changelog'] ) ) {
569
-				echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections['changelog'] ) . '</div>';
568
+			if ( ! empty( $sections[ 'changelog' ] ) ) {
569
+				echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections[ 'changelog' ] ) . '</div>';
570 570
 			}
571 571
 		}
572 572
 
@@ -581,25 +581,25 @@  discard block
 block discarded – undo
581 581
 	 */
582 582
 	public function get_cached_version_info( $cache_key = '' ) {
583 583
 
584
-		if( empty( $cache_key ) ) {
584
+		if ( empty( $cache_key ) ) {
585 585
 			$cache_key = $this->cache_key;
586 586
 		}
587 587
 
588 588
 		$cache = get_option( $cache_key );
589 589
 
590
-		if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
590
+		if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) {
591 591
 			return false; // Cache is expired
592 592
 		}
593 593
 
594 594
 		// We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point.
595
-		$cache['value'] = json_decode( $cache['value'] );
596
-		if ( ! empty( $cache['value']->icons ) ) {
597
-			$cache['value']->icons = (array) $cache['value']->icons;
595
+		$cache[ 'value' ] = json_decode( $cache[ 'value' ] );
596
+		if ( ! empty( $cache[ 'value' ]->icons ) ) {
597
+			$cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons;
598 598
 		} else {
599
-			$cache['value']->icons = array();
599
+			$cache[ 'value' ]->icons = array();
600 600
 		}
601 601
 
602
-		return $cache['value'];
602
+		return $cache[ 'value' ];
603 603
 
604 604
 	}
605 605
 
@@ -611,7 +611,7 @@  discard block
 block discarded – undo
611 611
 	 */
612 612
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
613 613
 
614
-		if( empty( $cache_key ) ) {
614
+		if ( empty( $cache_key ) ) {
615 615
 			$cache_key = $this->cache_key;
616 616
 		}
617 617
 
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 		update_option( $cache_key, $data, 'no' );
624 624
 
625 625
 		// Delete the duplicate option
626
-		delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ) );
626
+		delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ) );
627 627
 	}
628 628
 
629 629
 	/**
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
 	 * @return bool
634 634
 	 */
635 635
 	private function verify_ssl() {
636
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
636
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
637 637
 	}
638 638
 
639 639
 }
Please login to merge, or discard this patch.
includes/load-plugin-and-theme-hooks.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@
 block discarded – undo
21 21
 $plugin_hooks_files = glob( $include_path . 'class-gravityview-plugin-hooks-*.php' );
22 22
 
23 23
 // Load all plugin files automatically
24
-foreach ( (array) $plugin_hooks_files as $plugin_hooks_file ) {
24
+foreach ( (array)$plugin_hooks_files as $plugin_hooks_file ) {
25 25
 	include $plugin_hooks_file;
26 26
 }
27 27
 
28 28
 $theme_hooks_files = glob( $include_path . 'class-gravityview-theme-hooks-*.php' );
29 29
 
30 30
 // Load all theme files automatically
31
-foreach ( (array) $theme_hooks_files as $theme_hooks_file ) {
31
+foreach ( (array)$theme_hooks_files as $theme_hooks_file ) {
32 32
 	include $theme_hooks_file;
33 33
 }
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 		add_filter( 'icl_ls_languages', array( $this, 'wpml_ls_filter' ) );
66 66
 
67
-		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link') );
67
+		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link' ) );
68 68
 	}
69 69
 
70 70
 	/**
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	function filter_gravityview_back_link( $link ) {
85 85
 		global $wpml_url_filters;
86 86
 
87
-		if( $wpml_url_filters ) {
87
+		if ( $wpml_url_filters ) {
88 88
 			$link = $wpml_url_filters->permalink_filter( $link, GravityView_frontend::getInstance()->getPostId() );
89 89
 		}
90 90
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	private function remove_url_hooks() {
102 102
 		global $wpml_url_filters;
103 103
 
104
-		if( ! $wpml_url_filters ) {
104
+		if ( ! $wpml_url_filters ) {
105 105
 			return;
106 106
 		}
107 107
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	private function add_url_hooks() {
130 130
 		global $wpml_url_filters;
131 131
 
132
-		if( ! $wpml_url_filters ) {
132
+		if ( ! $wpml_url_filters ) {
133 133
 			return;
134 134
 		}
135 135
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 					break;
227 227
 			}
228 228
 
229
-			$languages[ $lang_code ]['url'] = $entry_link;
229
+			$languages[ $lang_code ][ 'url' ] = $entry_link;
230 230
 		}
231 231
 
232 232
 		$this->add_url_hooks();
Please login to merge, or discard this patch.
future/includes/class-gv-settings-addon.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@
 block discarded – undo
140 140
 	 *
141 141
 	 * @param array $items Styles to exclude from no-conflict
142 142
 	 *
143
-	 * @return array
143
+	 * @return string[]
144 144
 	 */
145 145
 	public function register_no_conflict( $items ) {
146 146
 
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -421,7 +421,7 @@
 block discarded – undo
421 421
     </header>
422 422
     <div class="gform-settings-panel__content" style="padding: 0 1rem 1.25rem">
423 423
 
424
-HTML;
424
+html;
425 425
 		} else {
426 426
 			echo '<div class="gv-uninstall-form-wrapper" style="font-size: 110%; padding: 15px 0;">';
427 427
 		}
Please login to merge, or discard this patch.
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 		$setting_tabs = parent::get_app_settings_tabs();
119 119
 
120 120
 		foreach ( $setting_tabs as &$tab ) {
121
-			if ( 'uninstall' !== $tab['name'] ) {
121
+			if ( 'uninstall' !== $tab[ 'name' ] ) {
122 122
 				continue;
123 123
 			}
124 124
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 			}
130 130
 
131 131
 			// Add trash can icon to resemble the look and feel of the GF Settings page
132
-			$tab['icon'] = 'dashicons-trash';
132
+			$tab[ 'icon' ] = 'dashicons-trash';
133 133
 		}
134 134
 
135 135
 		return array_filter( $setting_tabs );
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
 	 */
145 145
 	public function register_no_conflict( $items ) {
146 146
 
147
-		$items[] = 'gform_settings';
148
-		$items[] = 'gv-admin-edd-license';
147
+		$items[ ] = 'gform_settings';
148
+		$items[ ] = 'gv-admin-edd-license';
149 149
 
150 150
 		return $items;
151 151
 	}
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 
197 197
 		$href = add_query_arg( array( 'post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall' ), admin_url( 'edit.php' ) );
198 198
 
199
-		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ). '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
199
+		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ) . '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
200 200
 
201 201
 		$html .= $uninstall_button;
202 202
 
@@ -215,10 +215,10 @@  discard block
 block discarded – undo
215 215
 	 */
216 216
 	public function settings_save( $field, $echo = true ) {
217 217
 
218
-		$field['type']  = 'submit';
219
-		$field['name']  = 'gform-settings-save';
220
-		$field['class'] = 'button button-primary primary button-hero';
221
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
218
+		$field[ 'type' ]  = 'submit';
219
+		$field[ 'name' ]  = 'gform-settings-save';
220
+		$field[ 'class' ] = 'button button-primary primary button-hero';
221
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
222 222
 
223 223
 		$html = $this->as_html( $field, false );
224 224
 
@@ -240,8 +240,8 @@  discard block
 block discarded – undo
240 240
 	 */
241 241
 	public function modify_app_settings_menu_title( $setting_tabs ) {
242 242
 
243
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
244
-		$setting_tabs[0]['icon']  = 'dashicons-admin-settings';
243
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
244
+		$setting_tabs[ 0 ][ 'icon' ]  = 'dashicons-admin-settings';
245 245
 
246 246
 		return $setting_tabs;
247 247
 	}
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 					$i = 0;
490 490
 					while ( $i < 11 ) {
491 491
 						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
492
-						$i ++;
492
+						$i++;
493 493
 					}
494 494
 					?>
495 495
 				</ul>
@@ -693,14 +693,14 @@  discard block
 block discarded – undo
693 693
 	 */
694 694
 	public function as_html( $field, $echo = true ) {
695 695
 
696
-		$field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit', 'reset', 'button' ) ) ) ? $field['type'] : 'submit';
696
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
697 697
 
698 698
 		$attributes    = $this->get_field_attributes( $field );
699 699
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
700
-		$value         = $this->get( $field['name'], $default_value );
700
+		$value         = $this->get( $field[ 'name' ], $default_value );
701 701
 
702
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary primary gfbutton';
703
-		$name                = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
702
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary primary gfbutton';
703
+		$name                = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
704 704
 
705 705
 		if ( empty( $value ) ) {
706 706
 			$value = __( 'Update Settings', 'gravityview' );
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
709 709
 		$attributes = $this->get_field_attributes( $field );
710 710
 
711 711
 		$html = '<input
712
-                    type="' . $field['type'] . '"
712
+                    type="' . $field[ 'type' ] . '"
713 713
                     name="' . esc_attr( $name ) . '"
714 714
                     value="' . $value . '" ' .
715 715
 				implode( ' ', $attributes ) .
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
 	 */
744 744
 	public function is_save_postback() {
745 745
 
746
-		return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] );
746
+		return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] );
747 747
 	}
748 748
 
749 749
 	/**
@@ -855,7 +855,7 @@  discard block
 block discarded – undo
855 855
 
856 856
 		$scripts = parent::scripts();
857 857
 
858
-		$scripts[] = array(
858
+		$scripts[ ] = array(
859 859
 				'handle'  => 'gform_tooltip_init',
860 860
 				'enqueue' => array(
861 861
 						array(
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
876 876
 
877 877
 		$styles = parent::styles();
878 878
 
879
-		$styles[] = array(
879
+		$styles[ ] = array(
880 880
 				'handle'  => 'gravityview_settings',
881 881
 				'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
882 882
 				'version' => Plugin::$version,
@@ -967,7 +967,7 @@  discard block
 block discarded – undo
967 967
 						'name'          => 'support-email',
968 968
 						'type'          => 'text',
969 969
 						'validate'      => 'email',
970
-						'default_value' => $default_settings['support-email'],
970
+						'default_value' => $default_settings[ 'support-email' ],
971 971
 						'label'         => __( 'Support Email', 'gravityview' ),
972 972
 						'description'   => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
973 973
 						'class'         => 'code regular-text',
@@ -979,7 +979,7 @@  discard block
 block discarded – undo
979 979
 						'name'          => 'support_port',
980 980
 						'type'          => 'radio',
981 981
 						'label'         => __( 'Show Support Port?', 'gravityview' ),
982
-						'default_value' => $default_settings['support_port'],
982
+						'default_value' => $default_settings[ 'support_port' ],
983 983
 						'horizontal'    => 1,
984 984
 						'choices'       => array(
985 985
 								array(
@@ -998,7 +998,7 @@  discard block
 block discarded – undo
998 998
 						'name'          => 'no-conflict-mode',
999 999
 						'type'          => 'radio',
1000 1000
 						'label'         => __( 'No-Conflict Mode', 'gravityview' ),
1001
-						'default_value' => $default_settings['no-conflict-mode'],
1001
+						'default_value' => $default_settings[ 'no-conflict-mode' ],
1002 1002
 						'horizontal'    => 1,
1003 1003
 						'choices'       => array(
1004 1004
 								array(
@@ -1020,7 +1020,7 @@  discard block
 block discarded – undo
1020 1020
 								'name'          => 'rest_api',
1021 1021
 								'type'          => 'radio',
1022 1022
 								'label'         => __( 'REST API', 'gravityview' ),
1023
-								'default_value' => $default_settings['rest_api'],
1023
+								'default_value' => $default_settings[ 'rest_api' ],
1024 1024
 								'horizontal'    => 1,
1025 1025
 								'choices'       => array(
1026 1026
 										array(
@@ -1039,7 +1039,7 @@  discard block
 block discarded – undo
1039 1039
 					'name' => 'powered_by',
1040 1040
 					'type' => 'checkbox',
1041 1041
 					'label' => __( 'Display "Powered By" Link', 'gravityview' ),
1042
-					'default_value' => $default_settings['powered_by'],
1042
+					'default_value' => $default_settings[ 'powered_by' ],
1043 1043
 					'choices' => array(
1044 1044
 						array(
1045 1045
 							'label' => esc_html__( 'Display a "Powered by GravityView" link', 'gravityview' ),
@@ -1064,7 +1064,7 @@  discard block
 block discarded – undo
1064 1064
 						'name'          => 'beta',
1065 1065
 						'type'          => 'checkbox',
1066 1066
 						'label'         => __( 'Become a Beta Tester', 'gravityview' ),
1067
-						'default_value' => $default_settings['beta'],
1067
+						'default_value' => $default_settings[ 'beta' ],
1068 1068
 						'horizontal'    => 1,
1069 1069
 						'choices'       => array(
1070 1070
 								array(
@@ -1098,17 +1098,17 @@  discard block
 block discarded – undo
1098 1098
 		 * @since 1.7.4
1099 1099
 		 */
1100 1100
 		foreach ( $fields as &$field ) {
1101
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
1102
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
1103
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
1104
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
1101
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
1102
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
1103
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
1104
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
1105 1105
 
1106 1106
 			if ( $disabled_attribute ) {
1107
-				$field['disabled'] = $disabled_attribute;
1107
+				$field[ 'disabled' ] = $disabled_attribute;
1108 1108
 			}
1109 1109
 
1110
-			if ( empty( $field['disabled'] ) ) {
1111
-				unset( $field['disabled'] );
1110
+			if ( empty( $field[ 'disabled' ] ) ) {
1111
+				unset( $field[ 'disabled' ] );
1112 1112
 			}
1113 1113
 		}
1114 1114
 
@@ -1120,23 +1120,23 @@  discard block
 block discarded – undo
1120 1120
 					'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ),
1121 1121
 					'type' => 'edd_license',
1122 1122
 					'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
1123
-					'default_value' => $default_settings['license_key'],
1123
+					'default_value' => $default_settings[ 'license_key' ],
1124 1124
 					'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
1125 1125
 			),
1126 1126
 			array(
1127 1127
 					'name' => 'license_key_response',
1128
-					'default_value' => $default_settings['license_key_response'],
1128
+					'default_value' => $default_settings[ 'license_key_response' ],
1129 1129
 					'type' => 'hidden',
1130 1130
 			),
1131 1131
 			array(
1132 1132
 					'name' => 'license_key_status',
1133
-					'default_value' => $default_settings['license_key_status'],
1133
+					'default_value' => $default_settings[ 'license_key_status' ],
1134 1134
 					'type' => 'hidden',
1135 1135
 			),
1136 1136
 		);
1137 1137
 
1138 1138
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1139
-			$license_fields[0] = array_merge( $license_fields[0], array(
1139
+			$license_fields[ 0 ] = array_merge( $license_fields[ 0 ], array(
1140 1140
 				'disabled' => true,
1141 1141
 				'title'    => __( 'The license key is defined by your site\'s configuration file.', 'gravityview' ),
1142 1142
 			) );
@@ -1147,7 +1147,7 @@  discard block
 block discarded – undo
1147 1147
 
1148 1148
 		if ( \gravityview()->plugin->is_GF_25() ) {
1149 1149
 
1150
-			$sections[] = array(
1150
+			$sections[ ] = array(
1151 1151
 					'title'       => __( 'GravityView License', 'gravityview' ),
1152 1152
 					'class'       => 'gform-settings-panel--full gv-settings-panel--license',
1153 1153
 					'description' => $version_info,
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 			) );
1166 1166
 		}
1167 1167
 
1168
-		$sections[] = array(
1168
+		$sections[ ] = array(
1169 1169
 			'title' => ( gravityview()->plugin->is_GF_25() ? __( 'GravityView Settings', 'gravityview' ) : null ),
1170 1170
 			'class' => 'gform-settings-panel--full gv-settings-panel--core',
1171 1171
 			'fields'      => $fields,
@@ -1189,8 +1189,8 @@  discard block
 block discarded – undo
1189 1189
 
1190 1190
 			if ( $disabled_attribute ) {
1191 1191
 				foreach ( $extension_sections as &$section ) {
1192
-					foreach ( $section['fields'] as &$field ) {
1193
-						$field['disabled'] = $disabled_attribute;
1192
+					foreach ( $section[ 'fields' ] as &$field ) {
1193
+						$field[ 'disabled' ] = $disabled_attribute;
1194 1194
 					}
1195 1195
 				}
1196 1196
 			}
@@ -1256,7 +1256,7 @@  discard block
 block discarded – undo
1256 1256
 	public function settings_edd_license( $field, $echo = true ) {
1257 1257
 
1258 1258
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1259
-			$field['input_type'] = 'password';
1259
+			$field[ 'input_type' ] = 'password';
1260 1260
 		}
1261 1261
 
1262 1262
 		$text = $this->settings_text( $field, false );
@@ -1308,7 +1308,7 @@  discard block
 block discarded – undo
1308 1308
 
1309 1309
 		?>
1310 1310
 
1311
-		<tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
1311
+		<tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
1312 1312
 			<td colspan="2">
1313 1313
 				<?php $this->single_setting( $field ); ?>
1314 1314
 			</td>
@@ -1334,8 +1334,8 @@  discard block
 block discarded – undo
1334 1334
 	 */
1335 1335
 	public function single_setting_row( $field ) {
1336 1336
 
1337
-		$field['gv_description'] = Utils::get( $field, 'description' );
1338
-		$field['description']    = Utils::get( $field, 'subtitle' );
1337
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
1338
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
1339 1339
 		parent::single_setting_row( $field );
1340 1340
 	}
1341 1341
 
@@ -1396,8 +1396,8 @@  discard block
 block discarded – undo
1396 1396
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
1397 1397
 		if ( ! $added_message && ( $local_key !== $response_key ) ) {
1398 1398
 
1399
-			unset( $posted_settings['license_key_response'] );
1400
-			unset( $posted_settings['license_key_status'] );
1399
+			unset( $posted_settings[ 'license_key_response' ] );
1400
+			unset( $posted_settings[ 'license_key_status' ] );
1401 1401
 
1402 1402
 			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1403 1403
 
Please login to merge, or discard this patch.
future/includes/class-gv-plugin.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -505,8 +505,8 @@  discard block
 block discarded – undo
505 505
 	 */
506 506
 	private function get_php_version() {
507 507
 
508
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ?
509
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
508
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ?
509
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
510 510
 	}
511 511
 
512 512
 	/**
@@ -518,8 +518,8 @@  discard block
 block discarded – undo
518 518
 	 */
519 519
 	private function get_wordpress_version() {
520 520
 
521
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ?
522
-			$GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version'];
521
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ?
522
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ];
523 523
 	}
524 524
 
525 525
 	/**
@@ -531,14 +531,14 @@  discard block
 block discarded – undo
531 531
 	 */
532 532
 	private function get_gravityforms_version() {
533 533
 
534
-		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) {
534
+		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) {
535 535
 			gravityview()->log->error( 'Gravity Forms is inactive or not installed.' );
536 536
 
537 537
 			return null;
538 538
 		}
539 539
 
540
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ?
541
-			$GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version;
540
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ?
541
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version;
542 542
 	}
543 543
 
544 544
 	/**
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
 		$items = get_posts( array(
585 585
 			'post_type'   => 'gravityview',
586 586
 			'post_status' => 'any',
587
-			'numberposts' => - 1,
587
+			'numberposts' => -1,
588 588
 			'fields'      => 'ids',
589 589
 		) );
590 590
 
@@ -598,9 +598,9 @@  discard block
 block discarded – undo
598 598
 		$tables = array();
599 599
 
600 600
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
601
-			$tables [] = \GFFormsModel::get_entry_meta_table_name();
601
+			$tables [ ] = \GFFormsModel::get_entry_meta_table_name();
602 602
 		} elseif ( ! $this->is_GF_25() ) {
603
-			$tables [] = \GFFormsModel::get_lead_meta_table_name();
603
+			$tables [ ] = \GFFormsModel::get_lead_meta_table_name();
604 604
 		}
605 605
 
606 606
 		foreach ( $tables as $meta_table ) {
@@ -619,9 +619,9 @@  discard block
 block discarded – undo
619 619
 		$tables = array();
620 620
 
621 621
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
622
-			$tables[] = \GFFormsModel::get_entry_notes_table_name();
622
+			$tables[ ] = \GFFormsModel::get_entry_notes_table_name();
623 623
 		} elseif ( ! $this->is_GF_25() ) {
624
-			$tables[] = \GFFormsModel::get_lead_notes_table_name();
624
+			$tables[ ] = \GFFormsModel::get_lead_notes_table_name();
625 625
 		}
626 626
 
627 627
 		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
Please login to merge, or discard this patch.
includes/admin/class.render.settings.php 1 patch
Spacing   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
 		$is_table_layout = preg_match( '/table/ism', $template_id );
32 32
 
33
-		if( 'field' === $field_type ) {
33
+		if ( 'field' === $field_type ) {
34 34
 
35 35
 			// Default options - fields
36 36
 			$field_options = array(
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 				'custom_class' => array(
50 50
 					'type' => 'text',
51 51
 					'label' => __( 'Custom CSS Class:', 'gravityview' ),
52
-					'desc' => __( 'This class will be added to the field container', 'gravityview'),
52
+					'desc' => __( 'This class will be added to the field container', 'gravityview' ),
53 53
 					'value' => '',
54 54
 					'merge_tags' => true,
55 55
 					'tooltip' => 'gv_css_merge_tags',
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 			);
71 71
 
72 72
 			// Match Table as well as DataTables
73
-			if( $is_table_layout && 'directory' === $context ) {
74
-				$field_options['width'] = array(
73
+			if ( $is_table_layout && 'directory' === $context ) {
74
+				$field_options[ 'width' ] = array(
75 75
 					'type' => 'number',
76
-					'label' => __('Percent Width', 'gravityview'),
77
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
76
+					'label' => __( 'Percent Width', 'gravityview' ),
77
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
78 78
 					'class' => 'code widefat',
79 79
 					'value' => '',
80 80
 				);
@@ -129,8 +129,8 @@  discard block
 block discarded – undo
129 129
 			'manage_options' => __( 'Administrator', 'gravityview' ),
130 130
 		);
131 131
 
132
-		if( is_multisite() ) {
133
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
132
+		if ( is_multisite() ) {
133
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
134 134
 		}
135 135
 
136 136
 		/**
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
144 144
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
145 145
 		 */
146
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
146
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
147 147
 
148 148
 		return $select_cap_choices;
149 149
 	}
@@ -170,27 +170,27 @@  discard block
 block discarded – undo
170 170
 	 */
171 171
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
172 172
 
173
-		if( empty( $uniqid ) ) {
173
+		if ( empty( $uniqid ) ) {
174 174
 			//generate a unique field id
175
-			$uniqid = uniqid('', false);
175
+			$uniqid = uniqid( '', false );
176 176
 		}
177 177
 
178 178
 		// get field/widget options
179 179
 		$options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id );
180 180
 
181 181
 		// two different post arrays, depending of the field type
182
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
182
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
183 183
 
184 184
 		// build output
185 185
 		$output = '';
186
-		$output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
187
-		$output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
186
+		$output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
187
+		$output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
188 188
 		if ( $form_id ) {
189
-			$output .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
189
+			$output .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
190 190
 		}
191 191
 
192 192
 		// If there are no options, return what we got.
193
-		if(empty($options)) {
193
+		if ( empty( $options ) ) {
194 194
 
195 195
 			// This is here for checking if the output is empty in render_label()
196 196
 			$output .= '<!-- No Options -->';
@@ -198,33 +198,33 @@  discard block
 block discarded – undo
198 198
 			return $output;
199 199
 		}
200 200
 
201
-		$output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">';
201
+		$output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">';
202 202
 
203 203
 		/**
204 204
 		 * @since 1.8
205 205
 		 */
206
-		if( !empty( $item['subtitle'] ) ) {
207
-			$output .= '<div class="subtitle">' . $item['subtitle'] . '</div>';
206
+		if ( ! empty( $item[ 'subtitle' ] ) ) {
207
+			$output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>';
208 208
 		}
209 209
 
210
-		foreach( $options as $key => $option ) {
210
+		foreach ( $options as $key => $option ) {
211 211
 
212 212
 			$value = isset( $current[ $key ] ) ? $current[ $key ] : NULL;
213 213
 
214
-			$field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value);
214
+			$field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value );
215 215
 
216 216
 			// The setting is empty
217
-			if( empty( $field_output ) ) {
217
+			if ( empty( $field_output ) ) {
218 218
 				continue;
219 219
 			}
220 220
 
221
-			switch( $option['type'] ) {
221
+			switch ( $option[ 'type' ] ) {
222 222
 				// Hide hidden fields
223 223
 				case 'hidden':
224
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>';
224
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
225 225
 					break;
226 226
 				default:
227
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>';
227
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>';
228 228
 			}
229 229
 		}
230 230
 
@@ -253,17 +253,17 @@  discard block
 block discarded – undo
253 253
 		 * @deprecated setting index 'default' was replaced by 'value'
254 254
 		 * @see GravityView_FieldType::get_field_defaults
255 255
 		 */
256
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
257
-			$option['value'] = $option['default'];
258
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
256
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
257
+			$option[ 'value' ] = $option[ 'default' ];
258
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
259 259
 		}
260 260
 
261 261
 		// prepare to render option field type
262
-		if( isset( $option['type'] ) ) {
262
+		if ( isset( $option[ 'type' ] ) ) {
263 263
 
264 264
 			$type_class = self::load_type_class( $option );
265 265
 
266
-			if( class_exists( $type_class ) ) {
266
+			if ( class_exists( $type_class ) ) {
267 267
 
268 268
 				/** @type GravityView_FieldType $render_type */
269 269
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 				 * @param[in,out] string $output field class name
281 281
 				 * @param[in] array $option  option field data
282 282
 				 */
283
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
283
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
284 284
 			}
285 285
 
286 286
 		} // isset option[type]
@@ -315,27 +315,27 @@  discard block
 block discarded – undo
315 315
 		 * @deprecated setting index 'name' was replaced by 'label'
316 316
 		 * @see GravityView_FieldType::get_field_defaults
317 317
 		 */
318
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
319
-			$setting['label'] = $setting['name'];
320
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
318
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
319
+			$setting[ 'label' ] = $setting[ 'name' ];
320
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
321 321
 		}
322 322
 
323 323
 		$name = esc_attr( sprintf( $name, $key ) );
324
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
325
-		$setting['tooltip'] = 'gv_' . $key;
324
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
325
+		$setting[ 'tooltip' ] = 'gv_' . $key;
326 326
 
327 327
 		// Use default if current setting isn't set.
328
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
328
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
329 329
 
330 330
 		// default setting type = text
331
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
331
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
332 332
 
333 333
 		// merge tags
334
-		if( !isset( $setting['merge_tags'] ) ) {
335
-			if( $setting['type'] === 'text' ) {
336
-				$setting['merge_tags'] = true;
334
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
335
+			if ( $setting[ 'type' ] === 'text' ) {
336
+				$setting[ 'merge_tags' ] = true;
337 337
 			} else {
338
-				$setting['merge_tags'] = false;
338
+				$setting[ 'merge_tags' ] = false;
339 339
 			}
340 340
 		}
341 341
 
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 
344 344
 		// render the setting
345 345
 		$type_class = self::load_type_class( $setting );
346
-		if( class_exists( $type_class ) ) {
346
+		if ( class_exists( $type_class ) ) {
347 347
 			/** @type GravityView_FieldType $render_type */
348 348
 			$render_type = new $type_class( $name, $setting, $curr_value );
349 349
 			ob_start();
@@ -352,25 +352,25 @@  discard block
 block discarded – undo
352 352
 		}
353 353
 
354 354
 		// Check if setting is specific for a template
355
-		if( !empty( $setting['show_in_template'] ) ) {
356
-			if( !is_array( $setting['show_in_template'] ) ) {
357
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
355
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
356
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
357
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
358 358
 			}
359
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
359
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
360 360
 		} else {
361 361
 			$show_if = '';
362 362
 		}
363 363
 
364
-		if( ! empty( $setting['requires'] ) ) {
365
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
364
+		if ( ! empty( $setting[ 'requires' ] ) ) {
365
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
366 366
 		}
367 367
 
368
-		if( ! empty( $setting['requires_not'] ) ) {
369
-			$show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] );
368
+		if ( ! empty( $setting[ 'requires_not' ] ) ) {
369
+			$show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] );
370 370
 		}
371 371
 
372 372
 		// output
373
-		echo '<tr style="vertical-align: top;" '. $show_if .'>' . $output . '</tr>';
373
+		echo '<tr style="vertical-align: top;" ' . $show_if . '>' . $output . '</tr>';
374 374
 
375 375
 	}
376 376
 
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 	 */
383 383
 	public static function load_type_class( $field = NULL ) {
384 384
 
385
-		if( empty( $field['type'] ) ) {
385
+		if ( empty( $field[ 'type' ] ) ) {
386 386
 			return NULL;
387 387
 		}
388 388
 
@@ -391,9 +391,9 @@  discard block
 block discarded – undo
391 391
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
392 392
 		 * @param array $field   field data
393 393
 		 */
394
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
394
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
395 395
 
396
-		if( class_exists( $type_class ) ) {
396
+		if ( class_exists( $type_class ) ) {
397 397
 			return $type_class;
398 398
 		}
399 399
 
@@ -402,9 +402,9 @@  discard block
 block discarded – undo
402 402
 		 * @param string  $field_type_include_path field class file path
403 403
 		 * @param array $field  field data
404 404
 		 */
405
-		$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
405
+		$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
406 406
 
407
-		if( $class_file && file_exists( $class_file ) ) {
407
+		if ( $class_file && file_exists( $class_file ) ) {
408 408
 			require_once( $class_file );
409 409
 		}
410 410
 
@@ -426,8 +426,8 @@  discard block
 block discarded – undo
426 426
 
427 427
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
428 428
 
429
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
430
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
429
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
430
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
431 431
 
432 432
 		return $output;
433 433
 	}
@@ -447,22 +447,22 @@  discard block
 block discarded – undo
447 447
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
448 448
 
449 449
 		// Show the merge tags if the field is a list view
450
-		$is_list = ( preg_match( '/_list-/ism', $name ));
450
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
451 451
 
452 452
 		// Or is a single entry view
453
-		$is_single = ( preg_match( '/single_/ism', $name ));
453
+		$is_single = ( preg_match( '/single_/ism', $name ) );
454 454
 		$show = ( $is_single || $is_list );
455 455
 
456 456
 		$class = '';
457 457
 		// and $add_merge_tags is not false
458
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
458
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
459 459
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
460 460
 		}
461 461
 
462
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
463
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
462
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
463
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
464 464
 
465
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
465
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
466 466
 	}
467 467
 
468 468
 	/**
@@ -479,21 +479,21 @@  discard block
 block discarded – undo
479 479
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
480 480
 
481 481
 		// Show the merge tags if the field is a list view
482
-		$is_list = ( preg_match( '/_list-/ism', $name ));
482
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
483 483
 
484 484
 		// Or is a single entry view
485
-		$is_single = ( preg_match( '/single_/ism', $name ));
485
+		$is_single = ( preg_match( '/single_/ism', $name ) );
486 486
 		$show = ( $is_single || $is_list );
487 487
 
488 488
 		$class = '';
489 489
 		// and $add_merge_tags is not false
490
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
490
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
491 491
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
492 492
 		}
493 493
 
494
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
494
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
495 495
 
496
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
496
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
497 497
 	}
498 498
 
499 499
 	/**
@@ -509,9 +509,9 @@  discard block
 block discarded – undo
509 509
 
510 510
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
511 511
 
512
-		$output = '<select name="'. $name .'" id="'. $id .'">';
513
-		foreach( $choices as $value => $label ) {
514
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
512
+		$output = '<select name="' . $name . '" id="' . $id . '">';
513
+		foreach ( $choices as $value => $label ) {
514
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
515 515
 		}
516 516
 		$output .= '</select>';
517 517
 
Please login to merge, or discard this patch.