gravityview / GravityView

includes/fields/class-gravityview-field-is-fulfilled.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	 *
 	 * @param mixed $value The value in.
 	 *
-	 * @return mixed The value out.
+	 * @return string The value out.
 	 */
 	public function get_value( $value ) {
 		return $this->get_string_from_value( $value );

Spacing +5 added lines, -5 removed lines

@@ -60,7 +60,7 @@ 
 	public function get_content( $output, $entry = array(), $field_settings = array(), $field = array() ) {
 
 		/** Overridden by a template. */
-		if( ! empty( $field['field_path'] ) ) { return $output; }
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
 
 		return $this->get_string_from_value( $output );
 	}
@@ -92,11 +92,11 @@ 
 		switch ( intval( $value ) ) {
 			case self::NOT_FULFILLED:
 			default:
-				$return = __('Not Fulfilled', 'gravityview');
+				$return = __( 'Not Fulfilled', 'gravityview' );
 				break;
 
 			case self::FULFILLED:
-				$return = __('Fulfilled', 'gravityview');
+				$return = __( 'Fulfilled', 'gravityview' );
 				break;
 		}
 
@@ -116,13 +116,13 @@ 
 	 *
 	 * @return string Original text if {is_fulfilled} isn't found. Otherwise, "Not Fulfilled" or "Fulfilled"
 	 */
-	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
+	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
 		$return = $text;
 
 		foreach ( $matches as $match ) {
 
-			$full_tag = $match[0];
+			$full_tag = $match[ 0 ];
 
 			$fulfilled = \GV\Utils::get( $entry, 'is_fulfilled' );
 

includes/fields/class-gravityview-field-payment-amount.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	 * @param \GV\Entry		$entry	The entry.
 	 * @param \GV\Request	$request The request context.
 	 *
-	 * @return mixed $value The filtered value.
+	 * @return string $value The filtered value.
 	 */
 	public function get_value( $value, $field, $view, $source, $entry, $request ) {
 		return $this->get_content( $value, $entry->as_entry(), $field->as_configuration() );

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
 	public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) {
 
 		/** Overridden by a template. */
-		if( ! empty( $field['field_path'] ) ) { return $output; }
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
 
 		$amount = \GV\Utils::get( $entry, 'payment_amount' );
 		$return = GFCommon::to_money( $amount, \GV\Utils::get( $entry, 'currency' ) );
@@ -88,14 +88,14 @@ 
 	 *
 	 * @return string Original text if {date_created} isn't found. Otherwise, replaced text.
 	 */
-	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
+	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
 		$return = $text;
 
 		foreach ( $matches as $match ) {
 
-			$full_tag = $match[0];
-			$modifier = isset( $match[1] ) ? $match[1] : false;
+			$full_tag = $match[ 0 ];
+			$modifier = isset( $match[ 1 ] ) ? $match[ 1 ] : false;
 
 			$amount = \GV\Utils::get( $entry, 'payment_amount' );
 

future/lib/EDD_SL_Plugin_Updater.php

Spacing +44 added lines, -44 removed lines

@@ -38,10 +38,10 @@ 
 		$this->api_data    = $_api_data;
 		$this->name        = plugin_basename( $_plugin_file );
 		$this->slug        = basename( $_plugin_file, '.php' );
-		$this->version     = $_api_data['version'];
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
-		$this->cache_key   = md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
+		$this->version     = $_api_data[ 'version' ];
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
+		$this->cache_key   = md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
 
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
 
@@ -133,11 +133,11 @@ 
 			return;
 		}
 
-		if( ! current_user_can( 'update_plugins' ) ) {
+		if ( ! current_user_can( 'update_plugins' ) ) {
 			return;
 		}
 
-		if( ! is_multisite() ) {
+		if ( ! is_multisite() ) {
 			return;
 		}
 
@@ -212,7 +212,7 @@ 
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
 					esc_html( $version_info->new_version ),
 					'</a>',
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
 					'</a>'
 				);
 			}
@@ -256,7 +256,7 @@ 
 			)
 		);
 
-		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
+		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
 
 		// Get the transient where we store the api request for this plugin for 24 hours
 		$edd_api_request_transient = $this->get_cached_version_info( $cache_key );
@@ -311,7 +311,7 @@ 
 
 		$verify_ssl = $this->verify_ssl();
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
-			$args['sslverify'] = $verify_ssl;
+			$args[ 'sslverify' ] = $verify_ssl;
 		}
 		return $args;
 
@@ -334,24 +334,24 @@ 
 
 		$data = array_merge( $this->api_data, $_data );
 
-		if ( $data['slug'] != $this->slug ) {
+		if ( $data[ 'slug' ] != $this->slug ) {
 			return;
 		}
 
-		if( $this->api_url == trailingslashit (home_url() ) ) {
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
 			return false; // Don't allow a plugin to ping itself
 		}
 
 		$api_params = array(
 			'edd_action' => 'get_version',
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
-			'slug'       => $data['slug'],
-			'author'     => $data['author'],
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
+			'slug'       => $data[ 'slug' ],
+			'author'     => $data[ 'author' ],
 			'url'        => home_url(),
-			'beta'       => ! empty( $data['beta'] ),
+			'beta'       => ! empty( $data[ 'beta' ] ),
 		);
 
 		$verify_ssl = $this->verify_ssl();
@@ -371,9 +371,9 @@ 
 			$request->banners = maybe_unserialize( $request->banners );
 		}
 
-		if( ! empty( $request->sections ) ) {
-			foreach( $request->sections as $key => $section ) {
-				$request->$key = (array) $section;
+		if ( ! empty( $request->sections ) ) {
+			foreach ( $request->sections as $key => $section ) {
+				$request->$key = (array)$section;
 			}
 		}
 
@@ -384,37 +384,37 @@ 
 
 		global $edd_plugin_data;
 
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
 			return;
 		}
 
-		if( empty( $_REQUEST['plugin'] ) ) {
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
 			return;
 		}
 
-		if( empty( $_REQUEST['slug'] ) ) {
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
 			return;
 		}
 
-		if( ! current_user_can( 'update_plugins' ) ) {
+		if ( ! current_user_can( 'update_plugins' ) ) {
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
 		}
 
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
-		$beta         = ! empty( $data['beta'] ) ? true : false;
-		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' );
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
+		$beta         = ! empty( $data[ 'beta' ] ) ? true : false;
+		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' );
 		$version_info = $this->get_cached_version_info( $cache_key );
 
-		if( false === $version_info ) {
+		if ( false === $version_info ) {
 
 			$api_params = array(
 				'edd_action' => 'get_version',
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
-				'slug'       => $_REQUEST['slug'],
-				'author'     => $data['author'],
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
+				'slug'       => $_REQUEST[ 'slug' ],
+				'author'     => $data[ 'author' ],
 				'url'        => home_url(),
-				'beta'       => ! empty( $data['beta'] )
+				'beta'       => ! empty( $data[ 'beta' ] )
 			);
 
 			$verify_ssl = $this->verify_ssl();
@@ -431,9 +431,9 @@ 
 				$version_info = false;
 			}
 
-			if( ! empty( $version_info ) ) {
-				foreach( $version_info->sections as $key => $section ) {
-					$version_info->$key = (array) $section;
+			if ( ! empty( $version_info ) ) {
+				foreach ( $version_info->sections as $key => $section ) {
+					$version_info->$key = (array)$section;
 				}
 			}
 
@@ -441,8 +441,8 @@ 
 
 		}
 
-		if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
-			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>';
+		if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) {
+			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>';
 		}
 
 		exit;
@@ -450,23 +450,23 @@ 
 
 	public function get_cached_version_info( $cache_key = '' ) {
 
-		if( empty( $cache_key ) ) {
+		if ( empty( $cache_key ) ) {
 			$cache_key = $this->cache_key;
 		}
 
 		$cache = get_option( $cache_key );
 
-		if( empty( $cache['timeout'] ) || current_time( 'timestamp' ) > $cache['timeout'] ) {
+		if ( empty( $cache[ 'timeout' ] ) || current_time( 'timestamp' ) > $cache[ 'timeout' ] ) {
 			return false; // Cache is expired
 		}
 
-		return json_decode( $cache['value'] );
+		return json_decode( $cache[ 'value' ] );
 
 	}
 
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
 
-		if( empty( $cache_key ) ) {
+		if ( empty( $cache_key ) ) {
 			$cache_key = $this->cache_key;
 		}
 
@@ -486,7 +486,7 @@ 
 	 * @return bool
 	 */
 	private function verify_ssl() {
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
 	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -2,7 +2,9 @@
 namespace GV;
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Allows plugins to use their own update API.

Doc Comments +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	 * @uses api_request()
 	 *
 	 * @param array   $_transient_data Update array build by WordPress.
-	 * @return array Modified update array with custom plugin data.
+	 * @return \stdClass Modified update array with custom plugin data.
 	 */
 	public function check_update( $_transient_data ) {
 

future/loader.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 			printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' );
 			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;" />' );
 			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' ),
-				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION , "</h3>\n\n", $version );
+				'<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION, "</h3>\n\n", $version );
 			printf( '</body>' );
 		}
 
@@ -34,7 +34,7 @@ 
 }
 
 /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */
-if ( version_compare( phpversion(), '5.3.0' , '<' ) ) {
+if ( version_compare( phpversion(), '5.3.0', '<' ) ) {
 	require GRAVITYVIEW_DIR . 'future/_stubs.php';
 
 /** All looks fine. */

future/includes/class-gv-view.php

Indentation -1 removed lines

@@ -62,7 +62,6 @@
 	 *
 	 * Internal static cache for gets, and whatnot.
 	 * This is not persistent, resets across requests.
-
 	 * @internal
 	 */
 	private static $cache = array();

Braces +4 added lines, -3 removed lines

@@ -209,7 +209,7 @@ 
 		$slug = apply_filters( 'gravityview_slug', 'view' );
 		$rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );
 
-		add_filter( 'query_vars', function( $query_vars ) { 
+		add_filter( 'query_vars', function( $query_vars ) {
 			$query_vars[] = 'csv';
 			return $query_vars;
 		} );
@@ -254,8 +254,9 @@ 
 		 * Check permissions.
 		 */
 		while ( $error = $view->can_render( null, $request ) ) {
-			if ( ! is_wp_error( $error ) )
-				break;
+			if ( ! is_wp_error( $error ) ) {
+							break;
+			}
 
 			switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
 				case 'post_password_required':

Doc Comments +1 added lines

@@ -795,6 +795,7 @@
 	 * Retrieve the entries for the current view and request.
 	 *
 	 * @param \GV\Request The request. Unused for now.
+	 * @param Request $request
 	 *
 	 * @return \GV\Entry_Collection The entries.
 	 */

Spacing +60 added lines, -61 removed lines

@@ -125,7 +125,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -227,11 +227,11 @@ 
 		$rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );
 
 		add_filter( 'query_vars', function( $query_vars ) { 
-			$query_vars[] = 'csv';
+			$query_vars[ ] = 'csv';
 			return $query_vars;
 		} );
 
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) {
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) {
 			call_user_func_array( 'add_rewrite_rule', $rule );
 		}
 	}
@@ -300,13 +300,13 @@ 
 			return $content;
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		/**
 		 * Editing a single entry.
 		 */
 		if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -317,7 +317,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -340,7 +340,7 @@ 
 
 			foreach ( $entryset as $e ) {
 
-				if ( 'active' !== $e['status'] ) {
+				if ( 'active' !== $e[ 'status' ] ) {
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -351,7 +351,7 @@ 
 				}
 
 				if ( $show_only_approved && ! $is_admin_and_can_view ) {
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
 						return __( 'You are not allowed to view this content.', 'gravityview' );
 					}
@@ -526,7 +526,7 @@ 
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column );
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column );
 
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
 		}
 
 		return $joins;
@@ -621,13 +621,13 @@ 
 			}
 
 			foreach ( $_fields as $field ) {
-				if ( ! empty( $field['unions'] ) ) {
-					foreach ( $field['unions'] as $form_id => $field_id ) {
+				if ( ! empty( $field[ 'unions' ] ) ) {
+					foreach ( $field[ 'unions' ] as $form_id => $field_id ) {
 						if ( ! isset( $unions[ $form_id ] ) ) {
 							$unions[ $form_id ] = array();
 						}
 
-						$unions[ $form_id ][ $field['id'] ] =
+						$unions[ $form_id ][ $field[ 'id' ] ] =
 							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 );
 					}
 				}
@@ -676,7 +676,7 @@ 
 		if ( ! $view->form ) {
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
 				'view_id' => $view->ID,
-				'form_id' => $view->_gravityview_form_id ? : 0,
+				'form_id' => $view->_gravityview_form_id ?: 0,
 			) );
 		}
 
@@ -913,11 +913,11 @@ 
 			 * Remove multiple sorting before calling legacy filters.
 			 * This allows us to fake it till we make it.
 			 */
-			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
+			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
 				$has_multisort = true;
-				$parameters['sort_field'] = reset( $parameters['sort_field'] );
-				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
-					$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
+				$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
+				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
+					$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
 				}
 			}
 
@@ -925,40 +925,39 @@ 
 			 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
 			 */
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID );
-			$parameters['context_view_id'] = $this->ID;
+			$parameters[ 'context_view_id' ] = $this->ID;
 			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
 
 			if ( $request instanceof REST\Request ) {
 				$atts = $this->settings->as_atts();
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
-						'paging' => array( 'page_size' => $atts['page_size'] ),
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
 					) );
-				$parameters['paging'] = $paging_parameters['paging'];
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
 			}
 
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
 
 			/**
 			 * Cleanup duplicate field_filter parameters to simplify the query.
 			 */
 			$unique_field_filters = array();
-			foreach ( $parameters['search_criteria']['field_filters'] as $key => $filter ) {
+			foreach ( $parameters[ 'search_criteria' ][ 'field_filters' ] as $key => $filter ) {
 				if ( 'mode' === $key ) {
-					$unique_field_filters['mode'] = $filter;
+					$unique_field_filters[ 'mode' ] = $filter;
 				} else if ( ! in_array( $filter, $unique_field_filters ) ) {
-					$unique_field_filters[] = $filter;
+					$unique_field_filters[ ] = $filter;
 				}
 			}
-			$parameters['search_criteria']['field_filters'] = $unique_field_filters;
+			$parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters;
 
-			if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) {
+			if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) {
 				gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' );
 			}
 
 			if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) {
 				$query_class = $this->get_query_class();
-				$query = new $query_class( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
+				$query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
 
 				/**
 				 * Apply multisort.
@@ -991,8 +990,8 @@ 
 					}
 				}
 
-				$query->limit( $parameters['paging']['page_size'] )
-					->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
+					->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
 
 				/**
 				 * Any joins?
@@ -1015,7 +1014,7 @@ 
 
 							$query_parameters = $query->_introspect();
 
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 						}
 
 						/**
@@ -1049,7 +1048,7 @@ 
 						}
 
 						$q = $query->_introspect();
-						$query->where( \GF_Query_Condition::_and( $q['where'], $condition ) );
+						$query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) );
 
 						if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
 
@@ -1074,7 +1073,7 @@ 
 
 							$query_parameters = $query->_introspect();
 
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 						}
 					}
 				
@@ -1098,7 +1097,7 @@ 
 							$conditions = array();
 
 							foreach ( $condition->expressions as $_condition ) {
-								$conditions[] = $recurse( $_condition, $fields, $recurse );
+								$conditions[ ] = $recurse( $_condition, $fields, $recurse );
 							}
 
 							return call_user_func_array(
@@ -1127,10 +1126,10 @@ 
 						$q = new $query_class( $form_id );
 
 						// Copy the WHERE clauses but substitute the field_ids to the respective ones
-						$q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) );
+						$q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) );
 
 						// Copy the ORDER clause and substitute the field_ids to the respective ones
-						foreach ( $query_parameters['order'] as $order ) {
+						foreach ( $query_parameters[ 'order' ] as $order ) {
 							list( $column, $_order ) = $order;
 
 							if ( $column && $column instanceof \GF_Query_Column ) {
@@ -1144,15 +1143,15 @@ 
 
 						add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) {
 							// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
+							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
 							// Record the SQL
-							$unions_sql[] = array(
+							$unions_sql[ ] = array(
 								// Remove columns, we'll rebuild them
 								'select'  => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ),
-								'from'    => $sql['from'],
-								'join'    => $sql['join'],
-								'where'   => $sql['where'],
+								'from'    => $sql[ 'from' ],
+								'join'    => $sql[ 'join' ],
+								'where'   => $sql[ 'where' ],
 								// Remove order and limit
 							);
 
@@ -1169,11 +1168,11 @@ 
 
 					add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) {
 						// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-						$sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
+						$sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
 						// Remove columns, we'll rebuild them
-						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match );
-						$sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] );
+						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match );
+						$sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] );
 
 						$unions = array();
 
@@ -1184,30 +1183,30 @@ 
 						};
 
 						// Add all the order columns into the selects, so we can order by the whole union group
-						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches );
+						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches );
 						
 						$columns = array(
-							sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) )
+							sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) )
 						);
 
 						foreach ( array_slice( $order_matches, 1 ) as $match ) {
-							$columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) );
+							$columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) );
 
 							// Rewrite the order columns to the shared aliases
-							$sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] );
+							$sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] );
 						}
 
 						$columns = array_unique( $columns );
 
 						// Add the columns to every UNION
 						foreach ( $unions_sql as $union_sql ) {
-							$union_sql['select'] .= implode( ', ', $columns );
-							$unions []= implode( ' ', $union_sql );
+							$union_sql[ 'select' ] .= implode( ', ', $columns );
+							$unions [ ] = implode( ' ', $union_sql );
 						}
 
 						// Add the columns to the main SELECT, but only grab the entry id column
-						$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns );
-						$sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order'];
+						$sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns );
+						$sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ];
 
 						return $sql;
 					} );
@@ -1248,15 +1247,15 @@ 
 				} );
 			} else {
 				$entries = $this->form->entries
-					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
+					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
 					->offset( $this->settings->get( 'offset' ) )
-					->limit( $parameters['paging']['page_size'] )
+					->limit( $parameters[ 'paging' ][ 'page_size' ] )
 					->page( $page );
 
-				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
+				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
 					$field = new \GV\Field();
-					$field->ID = $parameters['sorting']['key'];
-					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+					$field->ID = $parameters[ 'sorting' ][ 'key' ];
+					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
 					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
 				}
 			}
@@ -1327,7 +1326,7 @@ 
 		$allowed = $headers = array();
 
 		foreach ( $view->fields->by_position( "directory_*" )->by_visible()->all() as $id => $field ) {
-			$allowed[] = $field;
+			$allowed[ ] = $field;
 		}
 
 		$renderer = new Field_Renderer();
@@ -1349,17 +1348,17 @@ 
 			} );
 
 			foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
-				$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
+				$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
 			}
 
 			foreach ( $allowed as $field ) {
 				$source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source();
 
-				$return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
+				$return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
 
 				if ( ! $headers_done ) {
 					$label = $field->get_label( $view, $source, $entry );
-					$headers[] = $label ? $label : $field->ID;
+					$headers[ ] = $label ? $label : $field->ID;
 				}
 			}
 

future/includes/class-gv-template-entry-legacy.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 		global $post;
 
 		if ( $post ) {
-			$context['post'] = $post;
+			$context[ 'post' ] = $post;
 		}
 
 		\GV\Mocks\Legacy_Context::push( $context );

future/includes/class-gv-core.php

Spacing +4 added lines, -4 removed lines

@@ -113,14 +113,14 @@
 
 		/** Require critical legacy core files. @todo Deprecate */
 		require_once $this->plugin->dir( 'includes/helper-functions.php' );
-		require_once $this->plugin->dir( 'includes/class-common.php');
-		require_once $this->plugin->dir( 'includes/connector-functions.php');
+		require_once $this->plugin->dir( 'includes/class-common.php' );
+		require_once $this->plugin->dir( 'includes/connector-functions.php' );
 		require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' );
 		require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' );
 		require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' );
 		require_once $this->plugin->dir( 'includes/class-admin.php' );
-		require_once $this->plugin->dir( 'includes/class-post-types.php');
-		require_once $this->plugin->dir( 'includes/class-cache.php');
+		require_once $this->plugin->dir( 'includes/class-post-types.php' );
+		require_once $this->plugin->dir( 'includes/class-cache.php' );
 
 		/**
 		 * GravityView extensions and widgets.

future/includes/class-gv-collection-entry-sort.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 		if ( $this->field ) {
 			return array(
 				'key' => $this->field->ID,
-				'direction' => $this->direction ? : self::ASC,
+				'direction' => $this->direction ?: self::ASC,
 				'is_numeric' => self::ALPHA ? true : false,
 			);
 		}

future/includes/class-gv-wrappers.php

Spacing +2 added lines, -2 removed lines

@@ -50,8 +50,8 @@
 		/**
 		 * By array.
 		 */
-		if ( is_array( $view ) && ! empty( $view['id'] ) ) {
-			return $this->get( $view['id'] );
+		if ( is_array( $view ) && ! empty( $view[ 'id' ] ) ) {
+			return $this->get( $view[ 'id' ] );
 		}
 
 		/**