gravityview / GravityView

future/includes/class-gv-renderer-entry.php

Spacing +4 added lines, -4 removed lines

@@ -58,16 +58,16 @@
 		if ( $view->joins ) {
 			$form_ids = array();
 			foreach ( $view->joins as $join ) {
-				$form_ids[] = $join->join->ID;
-				$form_ids[] = $join->join_on->ID;
+				$form_ids[ ] = $join->join->ID;
+				$form_ids[ ] = $join->join_on->ID;
 			}
 			foreach ( $entry->entries as $e ) {
-				if ( ! in_array( $e['form_id'], $form_ids ) ) {
+				if ( ! in_array( $e[ 'form_id' ], $form_ids ) ) {
 					gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $e->ID, 'view_id' => $view->ID ) );
 					return null;
 				}
 			}
-		} else if ( $view->form && $view->form->ID != $entry['form_id'] ) {
+		} else if ( $view->form && $view->form->ID != $entry[ 'form_id' ] ) {
 			gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $entry->ID, 'view_id' => $view->ID ) );
 			return null;
 		}

future/includes/class-gv-entry-multi.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 			if ( ! $entry instanceof Entry ) {
 				continue;
 			}
-			$_entry->entries[ $entry['form_id'] ]  = &$entry;
+			$_entry->entries[ $entry[ 'form_id' ] ] = &$entry;
 		}
 		return $_entry;
 	}
@@ -65,7 +65,7 @@ 
 
 			foreach ( $this->entries as $entry ) {
 				$entry = $entry->as_entry();
-				$_entry['_multi'][ $entry['form_id'] ] = $entry;
+				$_entry[ '_multi' ][ $entry[ 'form_id' ] ] = $entry;
 			}
 		}
 
@@ -87,7 +87,7 @@ 
 	public function get_permalink( \GV\View $view = null, \GV\Request $request = null, $track_directory = true ) {
 		$slugs = array();
 		add_filter( 'gravityview/entry/slug', $callback = function( $slug ) use ( &$slugs ) {
-			$slugs[] = $slug;
+			$slugs[ ] = $slug;
 			return implode( ',', $slugs );
 		}, 10, 1 );
 

future/includes/class-gv-request.php

Braces +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
 				}
 
 				$entry = Multi_Entry::from_entries( array_filter( $multientry ) );
-			}  else {
+			} else {
 				/**
 				 * A regular one.
 				 */

Spacing +10 added lines, -10 removed lines

@@ -45,7 +45,7 @@ 
 	 */
 	public static function is_add_oembed_preview() {
 		/** The preview request is a parse-embed AJAX call without a type set. */
-		return ( self::is_ajax() && ! empty( $_POST['action'] ) && $_POST['action'] == 'parse-embed' && ! isset( $_POST['type'] ) );
+		return ( self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 * @return boolean
 	 */
 	public static function is_rest() {
-		return ! empty( $GLOBALS['wp']->query_vars['rest_route'] );
+		return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] );
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 						return false;
 					}
 
-					if ( ! in_array( $e['form_id'], $valid_forms ) ) {
+					if ( ! in_array( $e[ 'form_id' ], $valid_forms ) ) {
 						return false;
 					}
 
@@ -141,7 +141,7 @@ 
 				}
 
 				$entry = Multi_Entry::from_entries( array_filter( $multientry ) );
-			}  else {
+			} else {
 				/**
 				 * A regular one.
 				 */
@@ -196,15 +196,15 @@ 
 			$get = $_GET;
 		}
 
-		unset( $get['mode'] );
+		unset( $get[ 'mode' ] );
 
 		$get = array_filter( $get, 'gravityview_is_not_empty_string' );
 
-		if( $has_field_key = $this->_has_field_key( $get ) ) {
+		if ( $has_field_key = $this->_has_field_key( $get ) ) {
 			return true;
 		}
 
-		return isset( $get['gv_search'] ) || isset( $get['gv_start'] ) || isset( $get['gv_end'] ) || isset( $get['gv_by'] ) || isset( $get['gv_id'] );
+		return isset( $get[ 'gv_search' ] ) || isset( $get[ 'gv_start' ] ) || isset( $get[ 'gv_end' ] ) || isset( $get[ 'gv_by' ] ) || isset( $get[ 'gv_id' ] );
 	}
 
 	/**
@@ -227,13 +227,13 @@ 
 
 		$meta = array();
 		foreach ( $fields as $field ) {
-			if( empty( $field->_gf_field_class_name ) ) {
-				$meta[] = preg_quote( $field->name );
+			if ( empty( $field->_gf_field_class_name ) ) {
+				$meta[ ] = preg_quote( $field->name );
 			}
 		}
 
 		foreach ( $get as $key => $value ) {
-			if ( preg_match('/^filter_(([0-9_]+)|'. implode( '|', $meta ) .')$/sm', $key ) ) {
+			if ( preg_match( '/^filter_(([0-9_]+)|' . implode( '|', $meta ) . ')$/sm', $key ) ) {
 				$has_field_key = true;
 				break;
 			}

Indentation +4 added lines, -4 removed lines

@@ -170,10 +170,10 @@
 	 */
 	public function is_edit_entry( $form_id = 0 ) {
 		/**
-		* @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
-		* The Edit Entry functionality overrides this value.
-		* @param boolean $is_edit_entry
-		*/
+		 * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
+		 * The Edit Entry functionality overrides this value.
+		 * @param boolean $is_edit_entry
+		 */
 		if ( ( $entry = $this->is_entry( $form_id ) ) && apply_filters( 'gravityview_is_edit_entry', false ) ) {
 			if ( $entry->is_multi() ) {
 				return array_pop( $entry->entries );

future/includes/class-gv-template-field.php

Spacing +38 added lines, -38 removed lines

@@ -92,7 +92,7 @@ 
 	}
 
 	public function __destruct() {
-		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback );;
+		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback ); ;
 	}
 
 	/**
@@ -175,55 +175,55 @@ 
 
 			if ( $is_view && $post ) {
 				if ( $field_type ) {
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
-					$specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
-					$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
-					$inputType &&  $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
+					$specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
 				}
 
-				$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
-				$specifics []= sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
-				$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
-				$specifics []= sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
+				$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
+				$specifics [ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
 			}
 			
 			/** Field-specific */
 			if ( $field_id && $form_id ) {
 
 				if ( $field_id ) {
-					$specifics []= sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
-					$specifics []= sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
+					$specifics [ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
+					$specifics [ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
 				}
 
 				if ( $field_type ) {
-					$specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
-					$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
-
-					$specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
-					$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
-
-					$specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
-					$inputType && $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
-					$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $field_type );
-					$inputType && $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $inputType );
+					$specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
+
+					$specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
+
+					$specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
+					$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type );
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType );
 				}
 			}
 
 			if ( $form_id ) {
 				/** Generic field templates */
-				$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
-				$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
+				$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
+				$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
 
-				$specifics []= sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
-				$specifics []= sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
+				$specifics [ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
+				$specifics [ ] = sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
 			}
 
 			/**
@@ -231,12 +231,12 @@ 
 			 * Ignore some types that conflict.
 			 */
 			if ( ! in_array( $field_type, array( 'notes' ) ) ) {
-				$specifics []= sprintf( '%s.php', $field_type );
-				$specifics []= sprintf( 'fields/%s.php', $field_type );
+				$specifics [ ] = sprintf( '%s.php', $field_type );
+				$specifics [ ] = sprintf( 'fields/%s.php', $field_type );
 			}
 
-			$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
-			$specifics []= sprintf( '%sfield.php', $slug_dir );
+			$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
+			$specifics [ ] = sprintf( '%sfield.php', $slug_dir );
 
 			return array_merge( $specifics, $templates );
 		};
@@ -267,7 +267,7 @@ 
 			/** Prevent any PHP warnings that may be generated. */
 			ob_start();
 
-			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry['currency'], false, 'html' );
+			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry[ 'currency' ], false, 'html' );
 
 			if ( $errors = ob_get_clean() ) {
 				gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) );

Doc Comments +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 	 * Why? See https://github.com/gravityview/GravityView/issues/1024
 	 *
 	 * @param \GV\Field_Template $template The template instance.
-	 * @return callable The callback bound to `get_template_part`. See `\GV\Field_Template::__construct`
+	 * @return \Closure The callback bound to `get_template_part`. See `\GV\Field_Template::__construct`
 	 */
 	public static function add_id_specific_templates( $template ) {
 

includes/load-plugin-and-theme-hooks.php

Spacing +1 added lines, -1 removed lines

@@ -24,6 +24,6 @@
 $plugin_theme_hooks_files = glob( $include_path . 'class-gravityview-{plugin,theme}-hooks-*.php', $glob_flags );
 
 // Load all plugin and theme files automatically
-foreach ( (array) $plugin_theme_hooks_files as $gv_hooks_filename ) {
+foreach ( (array)$plugin_theme_hooks_files as $gv_hooks_filename ) {
 	include $gv_hooks_filename;
 }
\ No newline at end of file

includes/widgets/poll/class-gravityview-widget-poll.php

Spacing +23 added lines, -23 removed lines

@@ -22,8 +22,8 @@ 
 	function __construct() {
 
 		$this->widget_id = 'poll';
-		$this->widget_description = __('Displays the results of Poll Fields that exist in the form.', 'gravityview' );
-		$this->widget_subtitle = sprintf( _x('Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' );
+		$this->widget_description = __( 'Displays the results of Poll Fields that exist in the form.', 'gravityview' );
+		$this->widget_subtitle = sprintf( _x( 'Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' );
 
 		$default_values = array(
 			'header' => 1,
@@ -32,27 +32,27 @@ 
 
 		$settings = array(
 			'percentages' => array(
-				'label' => __('Display Percentages', 'gravityview'),
+				'label' => __( 'Display Percentages', 'gravityview' ),
 				'type' => 'checkbox',
 				'value' => true,
 				'tooltip' => __( 'Display results percentages as part of results? Supported values are: true, false. Defaults to "true".', 'gravityview' ),
 			),
 			'counts' => array(
-				'label' => __('Display Counts', 'gravityview'),
+				'label' => __( 'Display Counts', 'gravityview' ),
 				'type' => 'checkbox',
 				'value' => true,
 				'tooltip' => __( 'Display number of times each choice has been selected when displaying results? Supported values are: true, false. Defaults to "true".', 'gravityview' ),
 			),
 			'style' => array(
 				'type' => 'select',
-				'label' => __('Style', 'gravityview'),
+				'label' => __( 'Style', 'gravityview' ),
 				'tooltip' => __( 'The Polls Add-On currently supports 4 built in styles: red, green, orange, blue. Defaults to "green".', 'gravityview' ),
 				'value' => 'green',
 				'choices' => array(
-					'green' => __('Green', 'gravityview'),
-					'blue' => __('Blue', 'gravityview'),
-					'red' => __('Red', 'gravityview'),
-					'orange' => __('Orange', 'gravityview'),
+					'green' => __( 'Green', 'gravityview' ),
+					'blue' => __( 'Blue', 'gravityview' ),
+					'red' => __( 'Red', 'gravityview' ),
+					'orange' => __( 'Orange', 'gravityview' ),
 				),
 			),
 		);
@@ -62,7 +62,7 @@ 
 			add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 		}
 
-		parent::__construct( __( 'Poll Results', 'gravityview' ) , null, $default_values, $settings );
+		parent::__construct( __( 'Poll Results', 'gravityview' ), null, $default_values, $settings );
 	}
 
 	/**
@@ -89,11 +89,11 @@ 
 
 		$GFPolls = GFPolls::get_instance();
 
-		wp_enqueue_script('gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array('jquery'), $GFPolls->_version);
+		wp_enqueue_script( 'gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array( 'jquery' ), $GFPolls->_version );
 
 		$GFPolls->localize_scripts();
 
-		wp_enqueue_style('gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version);
+		wp_enqueue_style( 'gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version );
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function pre_render_frontend() {
 
-		if( ! class_exists('GFPolls') ) {
+		if ( ! class_exists( 'GFPolls' ) ) {
 
 			gravityview()->log->error( 'Poll Widget not displayed; the Poll Addon is not loaded' );
 
@@ -112,10 +112,10 @@ 
 
 		$view = gravityview()->views->get();
 
-		$poll_fields = array( $view->form->form['id'] => GFCommon::get_fields_by_type( $view->form, array( 'poll' ) ) );
+		$poll_fields = array( $view->form->form[ 'id' ] => GFCommon::get_fields_by_type( $view->form, array( 'poll' ) ) );
 
 		foreach ( $view->joins as $join ) {
-			$poll_fields[ $join->join_on->form['id'] ] = GFCommon::get_fields_by_type( $join->join_on->form, array( 'poll' ) );
+			$poll_fields[ $join->join_on->form[ 'id' ] ] = GFCommon::get_fields_by_type( $join->join_on->form, array( 'poll' ) );
 		}
 
 		$poll_fields = array_filter( $poll_fields );
@@ -167,12 +167,12 @@ 
 	 */
 	public function render_frontend( $widget_args, $content = '', $context = '' ) {
 
-		if( ! $this->pre_render_frontend() ) {
+		if ( ! $this->pre_render_frontend() ) {
 			return;
 		}
 
 		// Make sure the class is loaded in DataTables
-		if( !class_exists( 'GFFormDisplay' ) ) {
+		if ( ! class_exists( 'GFFormDisplay' ) ) {
 			include_once( GFCommon::get_base_path() . '/form_display.php' );
 		}
 
@@ -180,14 +180,14 @@ 
 
 		$settings = $this->get_frontend_settings( $widget_args );
 
-		$percentages = empty( $settings['percentages'] ) ? 'false' : 'true';
+		$percentages = empty( $settings[ 'percentages' ] ) ? 'false' : 'true';
 
-		$counts = empty( $settings['counts'] ) ? 'false' : 'true';
+		$counts = empty( $settings[ 'counts' ] ) ? 'false' : 'true';
 
-		if( !empty( $settings['field'] ) ) {
-			$merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings['field'], $settings['style'], $percentages, $counts );
+		if ( ! empty( $settings[ 'field' ] ) ) {
+			$merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings[ 'field' ], $settings[ 'style' ], $percentages, $counts );
 		} else {
-			$merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings['style'], $percentages, $counts );
+			$merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings[ 'style' ], $percentages, $counts );
 		}
 
 		$gravityview_view = GravityView_View::getInstance();
@@ -197,7 +197,7 @@ 
 		$gravityview_view->poll_settings = $settings;
 		$gravityview_view->poll_fields = $this->poll_fields;
 
-		$gravityview_view->render('widget', 'poll', false );
+		$gravityview_view->render( 'widget', 'poll', false );
 
 		unset( $gravityview_view->poll_merge_tag, $gravityview_view->poll_settings, $gravityview_view->poll_form, $gravityview_view->poll_fields );
 	}

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

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 	 * @return string
 	 */
 	public function the_field( \GV\Field $field, $extras = null ) {
-		$form = \GV\GF_Form::by_id( $field->form_id ) ? : $this->view->form;
+		$form = \GV\GF_Form::by_id( $field->form_id ) ?: $this->view->form;
 		$entry = $this->entry->from_field( $field );
 
 		if ( ! $entry ) {
@@ -34,7 +34,7 @@ 
 		}
 
 		$renderer = new Field_Renderer();
-		$source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ? : $this->view->form ) : new Internal_Source();
+		$source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ?: $this->view->form ) : new Internal_Source();
 		
 		$value = $renderer->render( $field, $this->view, $source, $entry, $this->request );
 		
@@ -62,13 +62,13 @@ 
 		$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
 
 		if ( is_numeric( $field->ID ) ) {
-			$extras['field'] = $field->as_configuration();
+			$extras[ 'field' ] = $field->as_configuration();
 		}
 
-		$extras['entry'] = $this->entry->as_entry();
-		$extras['hide_empty'] = $hide_empty;
-		$extras['label'] = $label;
-		$extras['value'] = $value;
+		$extras[ 'entry' ] = $this->entry->as_entry();
+		$extras[ 'hide_empty' ] = $hide_empty;
+		$extras[ 'label' ] = $label;
+		$extras[ 'value' ] = $value;
 
 		return \gravityview_field_output( $extras, $context );
 	}

future/includes/class-gv-plugin.php

Spacing +19 added lines, -19 removed lines

@@ -89,7 +89,7 @@ 
 	/**
 	 * @var string The REST API functionality identifier.
 	 */
-	const FEATURE_REST  = 'rest_api';
+	const FEATURE_REST = 'rest_api';
 
 	/**
 	 * Get the global instance of \GV\Plugin.
@@ -215,7 +215,7 @@ 
 		include_once $this->dir( 'includes/class-frontend-views.php' );
 		include_once $this->dir( 'includes/class-gravityview-admin-bar.php' );
 		include_once $this->dir( 'includes/class-gravityview-entry-list.php' );
-		include_once $this->dir( 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
+		include_once $this->dir( 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */
 		include_once $this->dir( 'includes/class-data.php' );
 		include_once $this->dir( 'includes/class-gravityview-shortcode.php' );
 		include_once $this->dir( 'includes/class-gravityview-entry-link-shortcode.php' );
@@ -269,11 +269,11 @@ 
 
 		// Pre-4.6 loading
 		// TODO: Remove when GV minimum version is WordPress 4.6.0
-		$locale = apply_filters( 'plugin_locale', ( ( function_exists('get_user_locale') && is_admin() ) ? get_user_locale() : get_locale() ), 'gravityview' );
+		$locale = apply_filters( 'plugin_locale', ( ( function_exists( 'get_user_locale' ) && is_admin() ) ? get_user_locale() : get_locale() ), 'gravityview' );
 
-		$loaded = load_textdomain( 'gravityview', sprintf( '%s/%s-%s.mo', $this->dir('languages'), $domain, $locale ) );
+		$loaded = load_textdomain( 'gravityview', sprintf( '%s/%s-%s.mo', $this->dir( 'languages' ), $domain, $locale ) );
 
-		if( $loaded ) {
+		if ( $loaded ) {
 			return;
 		}
 
@@ -424,7 +424,7 @@ 
 	 */
 	public function is_compatible_wordpress( $version = null ) {
 
-		if( ! $version ) {
+		if ( ! $version ) {
 			$version = self::$min_wp_version;
 		}
 
@@ -465,8 +465,8 @@ 
 	 * @return string The version of PHP.
 	 */
 	private function get_php_version() {
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
 	}
 
 	/**
@@ -477,8 +477,8 @@ 
 	 * @return string The version of WordPress.
 	 */
 	private function get_wordpress_version() {
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version'];
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ];
 	}
 
 	/**
@@ -489,13 +489,13 @@ 
 	 * @return string|null The version of Gravity Forms or null if inactive.
 	 */
 	private function get_gravityforms_version() {
-		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) {
+		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) {
 			gravityview()->log->error( 'Gravity Forms is inactive or not installed.' );
 			return null;
 		}
 
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ?
-			$GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version;
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ?
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version;
 	}
 
 	/**
@@ -552,9 +552,9 @@ 
 		$tables = array();
 
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
-			$tables []= \GFFormsModel::get_entry_meta_table_name();
+			$tables [ ] = \GFFormsModel::get_entry_meta_table_name();
 		}
-		$tables []= \GFFormsModel::get_lead_meta_table_name();
+		$tables [ ] = \GFFormsModel::get_lead_meta_table_name();
 
 		foreach ( $tables as $meta_table ) {
 			$sql = "
@@ -572,13 +572,13 @@ 
 		$tables = array();
 
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
-			$tables[] = \GFFormsModel::get_entry_notes_table_name();
+			$tables[ ] = \GFFormsModel::get_entry_notes_table_name();
 		}
 
-		$tables[] = \GFFormsModel::get_lead_notes_table_name();
+		$tables[ ] = \GFFormsModel::get_lead_notes_table_name();
 
-		$disapproved = __('Disapproved the Entry for GravityView', 'gravityview');
-		$approved = __('Approved the Entry for GravityView', 'gravityview');
+		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
+		$approved = __( 'Approved the Entry for GravityView', 'gravityview' );
 
 		$suppress = $wpdb->suppress_errors();
 		foreach ( $tables as $notes_table ) {

future/includes/rest/class-gv-rest-views-route.php

Spacing +25 added lines, -25 removed lines

@@ -63,7 +63,7 @@ 
 			'total' => wp_count_posts( 'gravityview' )->publish,
 		);
 		foreach ( $items as $item ) {
-			$data['views'][] = $this->prepare_view_for_response( $item, $request );
+			$data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request );
 		}
 
 		return new \WP_REST_Response( $data, 200 );
@@ -82,7 +82,7 @@ 
 
 		$url = $request->get_url_params();
 
-		$view_id = intval( $url['id'] );
+		$view_id = intval( $url[ 'id' ] );
 
 		$item = get_post( $view_id );
 
@@ -114,7 +114,7 @@ 
 		// Only output the fields that should be displayed.
 		$allowed = array();
 		foreach ( $view->fields->by_position( "{$context}_*" )->by_visible()->all() as $field ) {
-			$allowed[] = $field;
+			$allowed[ ] = $field;
 		}
 
 		/**
@@ -133,7 +133,7 @@ 
 
 		// Tack on additional fields if needed
 		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 );
 		}
 
 		$r = new Request( $request );
@@ -201,10 +201,10 @@ 
 	public function get_sub_items( $request ) {
 
 		$url     = $request->get_url_params();
-		$view_id = intval( $url['id'] );
+		$view_id = intval( $url[ 'id' ] );
 		$format  = \GV\Utils::get( $url, 'format', 'json' );
 
-		if( $post_id = $request->get_param('post_id') ) {
+		if ( $post_id = $request->get_param( 'post_id' ) ) {
 			global $post;
 
 			$post = get_post( $post_id );
@@ -302,7 +302,7 @@ 
 
 		$data = array( 'entries' => $entries->all(), 'total' => $entries->total() );
 
-		foreach ( $data['entries'] as &$entry ) {
+		foreach ( $data[ 'entries' ] as &$entry ) {
 			$entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' );
 		}
 
@@ -321,8 +321,8 @@ 
 	 */
 	public function get_sub_item( $request ) {
 		$url      = $request->get_url_params();
-		$view_id  = intval( $url['id'] );
-		$entry_id = intval( $url['s_id'] );
+		$view_id  = intval( $url[ 'id' ] );
+		$entry_id = intval( $url[ 's_id' ] );
 		$format   = \GV\Utils::get( $url, 'format', 'json' );
 
 		$view  = \GV\View::by_id( $view_id );
@@ -357,32 +357,32 @@ 
 		// Add all the WP_Post data
 		$view_post = $view_post->to_array();
 
-		unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] );
+		unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] );
 
 		$return = wp_parse_args( $item, $view_post );
 
-		$return['title'] = $return['post_title'];
+		$return[ 'title' ] = $return[ 'post_title' ];
 
-		$return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array();
-		unset( $return['atts'], $return['view_id'] );
+		$return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array();
+		unset( $return[ 'atts' ], $return[ 'view_id' ] );
 
-		$return['search_criteria'] = array(
+		$return[ 'search_criteria' ] = array(
 			'page_size' => rgars( $return, 'settings/page_size' ),
 			'sort_field' => rgars( $return, 'settings/sort_field' ),
 			'sort_direction' => rgars( $return, 'settings/sort_direction' ),
 			'offset' => rgars( $return, 'settings/offset' ),
 		);
 
-		unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] );
+		unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] );
 
 		// Redact for non-logged ins
 		if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) {
-			unset( $return['settings'] );
-			unset( $return['search_criteria'] );
+			unset( $return[ 'settings' ] );
+			unset( $return[ 'search_criteria' ] );
 		}
 		
 		if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) {
-			unset( $return['form'] );
+			unset( $return[ 'form' ] );
 		}
 
 		return $return;
@@ -398,7 +398,7 @@ 
 			$view_id = func_get_arg( 1 ); // $view_id override
 		} else {
 			$url     = $request->get_url_params();
-			$view_id = intval( $url['id'] );
+			$view_id = intval( $url[ 'id' ] );
 		}
 
 		if ( ! $view = \GV\View::by_id( $view_id ) ) {
@@ -444,8 +444,8 @@ 
 		}
 
 		$url     = $request->get_url_params();
-		$view_id = intval( $url['id'] );
-		$entry_id = intval( $url['s_id'] );
+		$view_id = intval( $url[ 'id' ] );
+		$entry_id = intval( $url[ 's_id' ] );
 
 		$view = \GV\View::by_id( $view_id );
 
@@ -453,11 +453,11 @@ 
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		if ( $entry['form_id'] != $view->form->ID ) {
+		if ( $entry[ 'form_id' ] != $view->form->ID ) {
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		if ( $entry['status'] != 'active' ) {
+		if ( $entry[ 'status' ] != 'active' ) {
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
@@ -465,10 +465,10 @@ 
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		$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 );
 
 		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 ) ) ) {
 				return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 			}
 		}