gravityview / GravityView

future/includes/class-gv-form-gravityforms.php

Doc Comments +1 added lines, -3 removed lines

@@ -132,10 +132,8 @@
 	/**
 	 * Get a \GV\Field by Form and Field ID for this data source.
 	 *
-	 * @param \GV\GF_Form $form The Gravity Form form ID.
-	 * @param int $field_id The Gravity Form field ID for the $form_id.
 	 *
-	 * @return \GV\Field|null The requested field or null if not found.
+	 * @return null|GF_Field The requested field or null if not found.
 	 */
 	public static function get_field( /** varargs */ ) {
 		$args = func_get_args();

Spacing +9 added lines, -9 removed lines

@@ -55,7 +55,7 @@ 
 		$self = new self();
 		$self->form = $form;
 
-		$self->ID = intval( $self->form['id'] );
+		$self->ID = intval( $self->form[ 'id' ] );
 
 		return $self;
 	}
@@ -70,13 +70,13 @@ 
 	 * @return \GV\GF_Form|null An instance of this form or null if not found.
 	 */
 	public static function from_form( $form ) {
-		if ( empty( $form['id'] ) ) {
+		if ( empty( $form[ 'id' ] ) ) {
 			return null;
 		}
 
 		$self = new self();
 		$self->form = $form;
-		$self->ID = $self->form['id'];
+		$self->ID = $self->form[ 'id' ];
 
 		return $self;
 	}
@@ -119,11 +119,11 @@ 
 
 			/** The offset and limit */
 			if ( ! empty( $offset->limit ) ) {
-				$paging['page_size'] = $offset->limit;
+				$paging[ 'page_size' ] = $offset->limit;
 			}
 
 			if ( ! empty( $offset->offset ) ) {
-				$paging['offset'] = $offset->offset;
+				$paging[ 'offset' ] = $offset->offset;
 			}
 
 			foreach ( \GFAPI::get_entries( $form->ID, $search_criteria, $sorting, $paging ) as $entry ) {
@@ -180,8 +180,8 @@ 
 	 */
 	public function get_fields() {
 		$fields = array();
-		foreach ( $this['fields'] as $field ) {
-			foreach ( empty( $field['inputs'] ) ? array( $field['id'] ) : wp_list_pluck( $field['inputs'], 'id' ) as $id ) {
+		foreach ( $this[ 'fields' ] as $field ) {
+			foreach ( empty( $field[ 'inputs' ] ) ? array( $field[ 'id' ] ) : wp_list_pluck( $field[ 'inputs' ], 'id' ) as $id ) {
 				if ( is_numeric( $id ) ) {
 					$fields[ $id ] = self::get_field( $this, $id );
 				} else {
@@ -218,7 +218,7 @@ 
 	 * @return bool Whether the offset exists or not.
 	 */
 	public function offsetExists( $offset ) {
-		return isset( $this->form[$offset] );
+		return isset( $this->form[ $offset ] );
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 * @return mixed The value of the requested form data.
 	 */
 	public function offsetGet( $offset ) {
-		return $this->form[$offset];
+		return $this->form[ $offset ];
 	}
 
 	/**

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

Doc Comments +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 *
 	 * @param \GV\Field $field The field to be ouput.
 	 *
-	 * @return string|false The field output or false if "hide_empty" is set.
+	 * @return null|string The field output or false if "hide_empty" is set.
 	 */
 	public function the_field( \GV\Field $field ) {
 		$renderer = new Field_Renderer();

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	public function the_field( \GV\Field $field ) {
 		$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();
 
 		return $renderer->render( $field, $this->view, $source, $this->entry->from_field( $field ), $this->request );
 	}
@@ -63,7 +63,7 @@ 
 		foreach ( $fields->all() as $field ) {
 			$context = Template_Context::from_template( $this, compact( 'field' ) );
 
-			$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 ) {

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

Doc Comments -1 removed lines

@@ -63,7 +63,6 @@
 	 * Initializer.
 	 *
 	 * @param \GV\View $view The View connected to this template.
-	 * @param \GV\Entry_Collection $entries A collection of entries for this view.
 	 * @param \GV\Request $request The request context.
 	 */
 	public function __construct( Entry $entry, View $view, Request $request ) {

Spacing +9 added lines, -9 removed lines

@@ -113,18 +113,18 @@
 		global $post;
 
 		if ( ! $this->request->is_view() && $post ) {
-			$specifics []= sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
-			$specifics []= sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
-			$specifics []= sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
-			$specifics []= sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
+			$specifics [ ] = sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
 		}
 
-		$specifics []= sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
-		$specifics []= sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
-		$specifics []= sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
-		$specifics []= sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
 
-		$specifics []= sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
+		$specifics [ ] = sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
 
 		return array_merge( $specifics, $templates );
 	}

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

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 * @param \GV\Field $field The Field.
 	 * @param \GV\Request $request The request.
 	 *
-	 * @return void
+	 * @return string|null
 	 */
 	public function __construct( \GV\View $view, \GV\Entry $entry = null, \GV\Field $field = null, \GV\Request $request = null ) {
 		add_filter( $this->filter_prefix . '_get_template_part', array( $this, 'add_id_specific_templates' ), 10, 3 );

Spacing +16 added lines, -16 removed lines

@@ -98,15 +98,15 @@ 
 		$additional = array();
 
 		// form-19-table-body.php
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
 
 		// view-3-table-body.php
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
 
 		global $post;
 		if ( $post ) {
 			// page-19-table-body.php
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
 		}
 
 		// Combine with existing table-body.php and table.php
@@ -130,7 +130,7 @@ 
 		ob_start();
 
 		$request = new Mock_Request();
-		$request->returns['is_view'] = $this->view;
+		$request->returns[ 'is_view' ] = $this->view;
 
 		/**
 		 * You got one shot. One opportunity. To render all the widgets you have ever wanted.
@@ -144,17 +144,17 @@ 
 		foreach ( array( 'gravityview_before', 'gravityview_after' ) as $hook ) {
 			/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
 			if ( is_array( $wp_filter[ $hook ] ) ) {
-				if ( ! empty( $wp_filter[ $hook ][10] ) ) {
-					foreach ( $wp_filter[ $hook ][10] as $function_key => $callback ) {
+				if ( ! empty( $wp_filter[ $hook ][ 10 ] ) ) {
+					foreach ( $wp_filter[ $hook ][ 10 ] as $function_key => $callback ) {
 						if ( strpos( $function_key, 'render_widget_hooks' ) ) {
-							unset( $wp_filter[ $hook ][10][ $function_key ] );
+							unset( $wp_filter[ $hook ][ 10 ][ $function_key ] );
 						}
 					}
 				}
 			} else {
-				foreach ( $wp_filter[ $hook ]->callbacks[10] as $function_key => $callback ) {
+				foreach ( $wp_filter[ $hook ]->callbacks[ 10 ] as $function_key => $callback ) {
 					if ( strpos( $function_key, 'render_widget_hooks' ) ) {
-						unset( $wp_filter[ $hook ]->callbacks[10][ $function_key ] );
+						unset( $wp_filter[ $hook ]->callbacks[ 10 ][ $function_key ] );
 					}
 				}
 			}
@@ -165,7 +165,7 @@ 
 		 */
 		if ( $this->entry ) {
 
-			$request->returns['is_entry'] = $this->entry;
+			$request->returns[ 'is_entry' ] = $this->entry;
 
 			global $post;
 
@@ -199,11 +199,11 @@ 
 			 * This allows us to fake it till we make it.
 			 */
 			$parameters = $this->view->settings->as_atts();
-			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' ] );
 				}
 			}
 
@@ -222,8 +222,8 @@ 
 					'fields' => $this->view->fields->by_visible( $this->view ),
 					'in_the_loop' => true,
 				), empty( $parameters ) ? array() : array(
-					'paging' => $parameters['paging'],
-					'sorting' => $parameters['sorting'],
+					'paging' => $parameters[ 'paging' ],
+					'sorting' => $parameters[ 'sorting' ],
 				), $post ? array(
 					'post' => $post,
 				) : array() ) );

includes/class-frontend-views.php

Doc Comments +3 added lines, -4 removed lines

@@ -227,7 +227,7 @@ 
 	 *
 	 *
 	 *
-	 * @param null $view_id
+	 * @param string $view_id
 	 */
 	public function set_context_view_id( $view_id = null ) {
 		$multiple_views = $this->getGvOutputData() && $this->getGvOutputData()->has_multiple_views();
@@ -865,7 +865,7 @@ 
 	 *
 	 * @uses  gravityview_get_entries()
 	 * @access public
-	 * @param array $args\n
+	 * @param array $args
 	 *   - $id - View id
 	 *   - $page_size - Page
 	 *   - $sort_field - form field id to sort
@@ -994,7 +994,6 @@ 
 	 * @since 1.19.5
 	 *
 	 * @param $args
-	 * @param int $form_id
 	 */
 	public static function get_search_criteria_paging( $args ) {
 
@@ -1416,7 +1415,7 @@ 
 	/**
 	 * Checks if field (column) is sortable
 	 *
-	 * @param string $field Field settings
+	 * @param string $field_id Field settings
 	 * @param array $form Gravity Forms form array
 	 *
 	 * @since 1.7

Braces +3 added lines, -3 removed lines

@@ -450,7 +450,7 @@ 
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $title;
 		}
 
@@ -1127,7 +1127,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1207,7 +1207,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;

Spacing +93 added lines, -93 removed lines

@@ -85,9 +85,9 @@ 
 	private function __construct() {}
 
 	private function initialize() {
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
 		add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 );
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
 
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -236,12 +236,12 @@ 
 
 			$this->context_view_id = $view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $multiple_views ) {
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
 			 */
-			$this->context_view_id = $_GET['gvid'];
+			$this->context_view_id = $_GET[ 'gvid' ];
 
 		} elseif ( ! $multiple_views ) {
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
@@ -278,25 +278,25 @@ 
 		global $wp_rewrite;
 
 		$is_front_page = ( $query->is_home || $query->is_page );
-		$show_on_front = ( 'page' === get_option('show_on_front') );
-		$front_page_id = get_option('page_on_front');
+		$show_on_front = ( 'page' === get_option( 'show_on_front' ) );
+		$front_page_id = get_option( 'page_on_front' );
 
-		if (  $is_front_page && $show_on_front && $front_page_id ) {
+		if ( $is_front_page && $show_on_front && $front_page_id ) {
 
 			// Force to be an array, potentially a query string ( entry=16 )
 			$_query = wp_parse_args( $query->query );
 
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) {
-				unset( $_query['pagename'] );
+			if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) {
+				unset( $_query[ 'pagename' ] );
 			}
 
 			// this is where will break from core wordpress
 			/** @internal Don't use this filter; it will be unnecessary soon - it's just a patch for specific use case */
 			$ignore = apply_filters( 'gravityview/internal/ignored_endpoints', array( 'preview', 'page', 'paged', 'cpage' ), $query );
 			$endpoints = \GV\Utils::get( $wp_rewrite, 'endpoints' );
-			foreach ( (array) $endpoints as $endpoint ) {
-				$ignore[] = $endpoint[1];
+			foreach ( (array)$endpoints as $endpoint ) {
+				$ignore[ ] = $endpoint[ 1 ];
 			}
 			unset( $endpoints );
 
@@ -306,21 +306,21 @@ 
 			// - The query includes keys that are associated with registered endpoints. `entry`, for example.
 			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) {
 
-				$qv =& $query->query_vars;
+				$qv = & $query->query_vars;
 
 				// Prevent redirect when on the single entry endpoint
-				if( self::is_single_entry() ) {
+				if ( self::is_single_entry() ) {
 					add_filter( 'redirect_canonical', '__return_false' );
 				}
 
 				$query->is_page = true;
 				$query->is_home = false;
-				$qv['page_id']  = $front_page_id;
+				$qv[ 'page_id' ]  = $front_page_id;
 
 				// Correct <!--nextpage--> for page_on_front
-				if ( ! empty( $qv['paged'] ) ) {
-					$qv['page'] = $qv['paged'];
-					unset( $qv['paged'] );
+				if ( ! empty( $qv[ 'paged' ] ) ) {
+					$qv[ 'page' ] = $qv[ 'paged' ];
+					unset( $qv[ 'paged' ] );
 				}
 			}
 
@@ -350,7 +350,7 @@ 
 
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
 
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
 		$this->setPostId( $post_id );
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -386,7 +386,7 @@ 
 
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
 
-		if( 'post' === $search_method ) {
+		if ( 'post' === $search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -443,20 +443,20 @@ 
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
 		 * @param array $entry Current entry
 		 */
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
+		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry );
 
 		if ( ! $apply_outside_loop ) {
 			return $title;
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $title;
 		}
 
 		// Don't modify the title for anything other than the current view/post.
 		// This is true for embedded shortcodes and Views.
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
 			return $title;
 		}
 
@@ -472,9 +472,9 @@ 
 			foreach ( $views as $view_id => $view_data ) {
 
 				$entry_form_id = \GV\Utils::get( $entry, 'form_id' );
-				$view_form_id = $view_data['form_id'];
+				$view_form_id = $view_data[ 'form_id' ];
 
-				if ( (int) $view_form_id === (int) $entry_form_id ) {
+				if ( (int)$view_form_id === (int)$entry_form_id ) {
 					$view_meta = $view_data;
 					break;
 				}
@@ -482,12 +482,12 @@ 
 		}
 
 		/** Deprecated stuff in the future. See the branch above. */
-		if ( ! empty( $view_meta['atts']['single_title'] ) ) {
+		if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) {
 
-			$title = $view_meta['atts']['single_title'];
+			$title = $view_meta[ 'atts' ][ 'single_title' ];
 
 			// We are allowing HTML in the fields, so no escaping the output
-			$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
+			$title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry );
 
 			$title = do_shortcode( $title );
 		}
@@ -557,7 +557,7 @@ 
 
 		$context = GravityView_View::getInstance()->getContext();
 
-		switch( $context ) {
+		switch ( $context ) {
 			case 'directory':
 				$tab = __( 'Multiple Entries', 'gravityview' );
 				break;
@@ -571,12 +571,12 @@ 
 		}
 
 
-		$title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
+		$title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
 		$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) );
-		$action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab );
+		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
 
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
 
 		echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id );
@@ -624,7 +624,7 @@ 
 		$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID );
 		$embed_only = $view->settings->get( 'embed_only' );
 
-		if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
+		if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
 			return __( 'You are not allowed to view this content.', 'gravityview' );
 		}
 
@@ -671,7 +671,7 @@ 
 				$datetime_format = 'Y-m-d H:i:s';
 				$search_is_outside_view_bounds = false;
 
-				if( ! empty( $search_criteria[ $key ] ) ) {
+				if ( ! empty( $search_criteria[ $key ] ) ) {
 
 					$search_date = strtotime( $search_criteria[ $key ] );
 
@@ -699,14 +699,14 @@ 
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
 
 					// Then we override the search and re-set the start date
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
 				}
 			}
 		}
 
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
 				gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) );
 			}
 		}
@@ -725,19 +725,19 @@ 
 	public static function process_search_only_approved( $args, $search_criteria ) {
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' );
 			return $search_criteria;
 		}
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => GravityView_Entry_Approval::meta_key,
 				'value' => GravityView_Entry_Approval_Status::APPROVED
 			);
 
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
 
 			gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) );
 		}
@@ -764,18 +764,18 @@ 
 	 */
 	public static function is_entry_approved( $entry, $args = array() ) {
 
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
 			return true;
 		}
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' );
 			return true;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
 
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
 	}
@@ -799,7 +799,7 @@ 
 		 * Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`.
 		 */
 		$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) );
-		$search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() );
+		$search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() );
 
 		/**
 		 * @filter `gravityview_fe_search_criteria` Modify the search criteria
@@ -819,29 +819,29 @@ 
 		gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) );
 
 		// implicity search
-		if ( ! empty( $args['search_value'] ) ) {
+		if ( ! empty( $args[ 'search_value' ] ) ) {
 
 			// Search operator options. Options: `is` or `contains`
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
 				'operator' => $operator,
 			);
 
 			// Lock search mode to "all" with implicit presearch filter.
-			$search_criteria['field_filters']['mode'] = 'all';
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all';
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) );
 		}
 
 		// Handle setting date range
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) );
 		}
 
@@ -852,7 +852,7 @@ 
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
 		 */
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
 
 		return $search_criteria;
 	}
@@ -965,7 +965,7 @@ 
 			'search_criteria' => $search_criteria,
 			'sorting' => self::updateViewSorting( $args, $form_id ),
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
 		);
 
 		/**
@@ -990,7 +990,7 @@ 
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
+		$parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
 
 		gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) );
 
@@ -1015,17 +1015,17 @@ 
 		$default_page_size = apply_filters( 'gravityview_default_page_size', 25 );
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size;
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size;
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
+		$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
 		$offset = ( $curr_page - 1 ) * $page_size;
 
-		if ( ! empty( $args['offset'] ) ) {
-			$offset += intval( $args['offset'] );
+		if ( ! empty( $args[ 'offset' ] ) ) {
+			$offset += intval( $args[ 'offset' ] );
 		}
 
 		$paging = array(
@@ -1050,11 +1050,11 @@ 
 	public static function updateViewSorting( $args, $form_id ) {
 		$sorting = array();
 
-		$has_values = isset( $_GET['sort'] );
+		$has_values = isset( $_GET[ 'sort' ] );
 
-		if ( $has_values && is_array( $_GET['sort'] ) ) {
-			$sorts = array_keys( $_GET['sort'] );
-			$dirs  = array_values( $_GET['sort'] );
+		if ( $has_values && is_array( $_GET[ 'sort' ] ) ) {
+			$sorts = array_keys( $_GET[ 'sort' ] );
+			$dirs  = array_values( $_GET[ 'sort' ] );
 
 			if ( $has_values = array_filter( $dirs ) ) {
 				$sort_field_id = end( $sorts );
@@ -1063,11 +1063,11 @@ 
 		}
 
 		if ( ! isset( $sort_field_id ) ) {
-			$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' );
+			$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' );
 		}
 
 		if ( ! isset( $sort_direction ) ) {
-			$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' );
+			$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' );
 		}
 
 		if ( is_array( $sort_field_id ) ) {
@@ -1099,10 +1099,10 @@ 
 				$form = GFAPI::get_form( $form_id );
 
 				// Get the first GF_Field field ID, set as the key for entry randomization
-				if ( ! empty( $form['fields'] ) ) {
+				if ( ! empty( $form[ 'fields' ] ) ) {
 
 					/** @var GF_Field $field */
-					foreach ( $form['fields'] as $field ) {
+					foreach ( $form[ 'fields' ] as $field ) {
 						if ( ! is_a( $field, 'GF_Field' ) ) {
 							continue;
 						}
@@ -1147,7 +1147,7 @@ 
 		if ( is_array( $sort_field_id ) ) {
 			$modified_ids = array();
 			foreach ( $sort_field_id as $_sort_field_id ) {
-				$modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
+				$modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
 			}
 			return $modified_ids;
 		}
@@ -1156,11 +1156,11 @@ 
 
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
 
-		if( ! $sort_field ) {
+		if ( ! $sort_field ) {
 			return $sort_field_id;
 		}
 
-		switch ( $sort_field['type'] ) {
+		switch ( $sort_field[ 'type' ] ) {
 
 			case 'address':
 				// Sorting by full address
@@ -1177,7 +1177,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch ( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1250,7 +1250,7 @@ 
 		if ( ! class_exists( '\GV\Entry' ) ) {
 
 			// Not using gravityview()->log->error(), since that may not exist yet either!
-			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary()  );
+			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() );
 
 			return null;
 		}
@@ -1267,7 +1267,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;
@@ -1289,7 +1289,7 @@ 
 			$views = $this->getGvOutputData()->get_views();
 
 			foreach ( $views as $view_id => $data ) {
-				$view = \GV\View::by_id( $data['id'] );
+				$view = \GV\View::by_id( $data[ 'id' ] );
 				$view_id = $view->ID;
 				$template_id = gravityview_get_template_id( $view->ID );
 				$data = $view->as_data();
@@ -1298,7 +1298,7 @@ 
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
 				 * @since 1.15
 				 */
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 					continue;
 				}
 
@@ -1331,7 +1331,7 @@ 
 					 * @param \GV\View The View.
 					 */
 					apply_filters( 'gravityview_lightbox_script', $js_dependency, $view );
-					$js_dependencies[] = $js_dependency;
+					$js_dependencies[ ] = $js_dependency;
 
 					if ( ! empty( $wp_filter[ 'gravity_view_lightbox_style' ] ) ) {
 						gravityview()->log->warning( 'gravity_view_lightbox_style filter is deprecated use gravityview_lightbox_style instead' );
@@ -1351,7 +1351,7 @@ 
 					 * @param \GV\View The View.
 					 */
 					$css_dependency = apply_filters( 'gravityview_lightbox_style', $css_dependency, $view );
-					$css_dependencies[] = $css_dependency;
+					$css_dependencies[ ] = $css_dependency;
 				}
 
 				/**
@@ -1359,19 +1359,19 @@ 
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
 				 * @since 1.15
 				 */
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
-					$css_dependencies[] = 'dashicons';
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
+					$css_dependencies[ ] = 'dashicons';
 				}
 
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
 
 				wp_enqueue_script( 'gravityview-fe-view' );
 
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
 				}
 
@@ -1434,7 +1434,7 @@ 
 	public static function add_style( $template_id ) {
 
 		if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) {
-			gravityview()->log->debug(  'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
+			gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
 			wp_enqueue_style( 'gravityview_style_' . $template_id );
 		} elseif ( empty( $template_id ) ) {
 			gravityview()->log->error( 'Cannot add template style; template_id is empty' );
@@ -1465,11 +1465,11 @@ 
 		 * Not a table-based template; don't add sort icons
 		 * @since 1.12
 		 */
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
 			return $label;
 		}
 
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
 			return $label;
 		}
 
@@ -1477,29 +1477,29 @@ 
 
 		$class = 'gv-sort';
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
 
 		$sort_args = array(
-			'sort' => $field['id'],
+			'sort' => $field[ 'id' ],
 			'dir' => 'asc',
 		);
 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
 			//toggle sorting direction.
-			if ( 'asc' === $sorting['direction'] ) {
-				$sort_args['dir'] = 'desc';
+			if ( 'asc' === $sorting[ 'direction' ] ) {
+				$sort_args[ 'dir' ] = 'desc';
 				$class .= ' gv-icon-sort-desc';
 			} else {
-				$sort_args['dir'] = 'asc';
+				$sort_args[ 'dir' ] = 'asc';
 				$class .= ' gv-icon-sort-asc';
 			}
 		} else {
 			$class .= ' gv-icon-caret-up-down';
 		}
 
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
 
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
 
 	}
 
@@ -1517,7 +1517,7 @@ 
 
 		$field_type = $field_id;
 
-		if( is_numeric( $field_id ) ) {
+		if ( is_numeric( $field_id ) ) {
 			$field = GFFormsModel::get_field( $form, $field_id );
 			$field_type = $field ? $field->type : $field_id;
 		}
@@ -1540,7 +1540,7 @@ 
 			return false;
 		}
 
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
 
 	}
 

includes/class-gravityview-merge-tags.php

Doc Comments +2 added lines, -2 removed lines

@@ -184,7 +184,7 @@ 
 	 * @param GF_Field|false $field
 	 * @param string $value
 	 *
-	 * @return mixed|string
+	 * @return string
 	 */
 	private static function maybe_urlencode( $field = false, $value = '' ) {
 
@@ -349,7 +349,7 @@ 
 	 * @param bool $url_encode Whether to URL-encode output
 	 * @param bool $esc_html Whether to apply `esc_html()` to output
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public static function replace_gv_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 

Indentation +4 added lines, -4 removed lines

@@ -52,14 +52,14 @@ 
 		// matching regex => the value is the method to call to replace the value.
 		$gv_modifiers = array(
 			'maxwords:(\d+)' => 'modifier_maxwords', /** @see modifier_maxwords */
-		    'timestamp' => 'modifier_timestamp', /** @see modifier_timestamp */
+			'timestamp' => 'modifier_timestamp', /** @see modifier_timestamp */
 			'explode' => 'modifier_explode', /** @see modifier_explode */
 
 			/** @see modifier_strings */
 			'urlencode' => 'modifier_strings',
 			'wpautop' => 'modifier_strings',
-		    'esc_html' => 'modifier_strings',
-		    'sanitize_html_class' => 'modifier_strings',
+			'esc_html' => 'modifier_strings',
+			'sanitize_html_class' => 'modifier_strings',
 			'sanitize_title' => 'modifier_strings',
 			'strtolower' => 'modifier_strings',
 			'strtoupper' => 'modifier_strings',
@@ -457,7 +457,7 @@ 
 
 		$atts = array(
 			'format' => self::get_format_from_modifiers( $exploded, false ),
-		    'human' => in_array( 'human', $exploded ), // {date_created:human}
+			'human' => in_array( 'human', $exploded ), // {date_created:human}
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}

Spacing +24 added lines, -24 removed lines

@@ -78,12 +78,12 @@ 
 
 			$non_gv_modifiers = array_diff( $modifiers, array_keys( $gv_modifiers ) );
 
-			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false);
+			$return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false );
 		}
 
 		foreach ( $modifiers as $passed_modifier ) {
 
-			foreach( $gv_modifiers as $gv_modifier => $method ) {
+			foreach ( $gv_modifiers as $gv_modifier => $method ) {
 
 				// Uses ^ to only match the first modifier, to enforce same order as passed by GF
 				preg_match( '/^' . $gv_modifier . '/ism', $passed_modifier, $matches );
@@ -132,7 +132,7 @@ 
 	 */
 	private static function modifier_timestamp( $raw_value, $matches ) {
 
-		if( empty( $matches[0] ) ) {
+		if ( empty( $matches[ 0 ] ) ) {
 			return $raw_value;
 		}
 
@@ -161,11 +161,11 @@ 
 	 */
 	private static function modifier_maxwords( $raw_value, $matches, $field = null ) {
 
-		if( ! is_string( $raw_value ) || empty( $matches[1] ) || ! function_exists( 'wp_trim_words' ) ) {
+		if ( ! is_string( $raw_value ) || empty( $matches[ 1 ] ) || ! function_exists( 'wp_trim_words' ) ) {
 			return $raw_value;
 		}
 
-		$max = intval( $matches[1] );
+		$max = intval( $matches[ 1 ] );
 
 		$more_placeholder = '[GVMORE]';
 
@@ -234,7 +234,7 @@ 
 	private static function modifier_explode( $raw_value, $matches, $value, $field = null ) {
 
 		// For JSON-encoded arrays
-		if( $json_array = json_decode( $raw_value, true ) ) {
+		if ( $json_array = json_decode( $raw_value, true ) ) {
 			return implode( ' ', $json_array );
 		}
 
@@ -255,13 +255,13 @@ 
 	 */
 	private static function modifier_strings( $raw_value, $matches, $value = '', $field = null ) {
 
-		if( empty( $matches[0] ) ) {
+		if ( empty( $matches[ 0 ] ) ) {
 			return $raw_value;
 		}
 
 		$return = $raw_value;
 
-		switch( $matches[0] ) {
+		switch ( $matches[ 0 ] ) {
 			case 'urlencode':
 				$return = urlencode( $raw_value );
 				break;
@@ -343,9 +343,9 @@ 
 		 * @internal Fixed $form['title'] in Gravity Forms
 		 * @see      https://github.com/gravityforms/gravityforms/pull/27/files
 		 */
-		$form['title']  = isset( $form['title'] ) ? $form['title'] : '';
-		$form['id']     = isset( $form['id'] ) ? $form['id'] : '';
-		$form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array();
+		$form[ 'title' ]  = isset( $form[ 'title' ] ) ? $form[ 'title' ] : '';
+		$form[ 'id' ]     = isset( $form[ 'id' ] ) ? $form[ 'id' ] : '';
+		$form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array();
 
 		return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html, $nl2br, $format, $aux_data );
 	}
@@ -406,7 +406,7 @@ 
 		// Is there is {gv_entry_link} or {gv_entry_link:[post id]} or {gv_entry_link:[post id]:[action]} merge tag?
 		preg_match_all( "/{gv_entry_link(?:\:(\d+)\:?(.*?))?}/ism", $original_text, $matches, PREG_SET_ORDER );
 
-		if( empty( $matches ) ) {
+		if ( empty( $matches ) ) {
 			return $original_text;
 		}
 
@@ -427,18 +427,18 @@ 
 		 * }
 		 */
 		foreach ( $matches as $match ) {
-			$full_tag = $match[0];
+			$full_tag = $match[ 0 ];
 
 			$link_args = array(
 				'return' => 'url',
-				'entry_id' => $entry['id'],
+				'entry_id' => $entry[ 'id' ],
 				'post_id' => \GV\Utils::get( $match, 1, null ),
 				'action' => \GV\Utils::get( $match, 2, 'read' ),
 			);
 
 			$entry_link = $Shortcode->read_shortcode( $link_args, null, 'gv_entry_link_merge_tag' );
 
-			if( $url_encode ) {
+			if ( $url_encode ) {
 				$entry_link = urlencode( $entry_link );
 			}
 
@@ -475,7 +475,7 @@ 
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
-			'time' => in_array( 'time', $exploded ),  // {date_created:time}
+			'time' => in_array( 'time', $exploded ), // {date_created:time}
 		);
 
 		$formatted_date = GVCommon::format_date( $date_created, $atts );
@@ -552,8 +552,8 @@ 
 			return $original_text;
 		}
 
-		foreach ( (array) $matches as $match ) {
-			$full_tag = $match[0];
+		foreach ( (array)$matches as $match ) {
+			$full_tag = $match[ 0 ];
 			$modifier = \GV\Utils::get( $match, 2, 'permalink' );
 
 			$replacement = false;
@@ -571,7 +571,7 @@ 
 					$replacement = esc_html( $replacement );
 				}
 
-				if( $url_encode ) {
+				if ( $url_encode ) {
 					$replacement = urlencode( $replacement );
 				}
 
@@ -611,14 +611,14 @@ 
 		preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER );
 
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
-		if( empty( $matches ) ) {
+		if ( empty( $matches ) ) {
 			return $text;
 		}
 
 		foreach ( $matches as $match ) {
 
-			$full_tag = $match[0];
-			$property = $match[1];
+			$full_tag = $match[ 0 ];
+			$property = $match[ 1 ];
 
 			$value = stripslashes_deep( \GV\Utils::_GET( $property ) );
 
@@ -642,7 +642,7 @@ 
 			 * @since 1.15
 			 * @param bool $esc_html Whether to esc_html() the value. Default: `true`
 			 */
-			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true );
+			$esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true );
 
 			$value = $esc_html ? esc_html( $value ) : $value;
 
@@ -653,7 +653,7 @@ 
 			 * @param[in] array $form Gravity Forms form array
 			 * @param[in] array $entry Entry array
 			 */
-			$value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
+			$value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
 
 			$text = str_replace( $full_tag, $value, $text );
 		}

includes/class-gv-license-handler.php

Doc Comments -1 removed lines

@@ -9,7 +9,6 @@
  */
 class GV_License_Handler extends \GV\License_Handler {
 	/**
-	 * @param \GV\Addon_Settings $GFAddOn
 	 *
 	 * @deprecated Use \GV\License_Handler::get instead
 	 *

includes/class-template.php

Doc Comments +4 added lines

@@ -219,6 +219,9 @@ 
 
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public function getCurrentFieldSetting( $key ) {
 		$settings = $this->getCurrentField('field_settings');
 
@@ -725,6 +728,7 @@ 
 	 *
 	 * @inheritdoc
 	 * @see Gamajo_Template_Loader::locate_template()
+	 * @param string $template_names
 	 * @return null|string NULL: Template not found; String: path to template
 	 */
 	function locate_template( $template_names, $load = false, $require_once = true ) {

Indentation +24 added lines, -24 removed lines

@@ -328,34 +328,34 @@ 
 	}
 
 	/**
-     * Get the fields for a specific context
-     *
-     * @since 1.19.2
-     *
+	 * Get the fields for a specific context
+	 *
+	 * @since 1.19.2
+	 *
 	 * @param string $context [Optional] "directory", "single", or "edit"
 	 *
 	 * @return array Array of GravityView field layout configurations
 	 */
 	public function getContextFields( $context = '' ) {
 
-	    if( '' === $context ) {
-	        $context = $this->getContext();
-        }
+		if( '' === $context ) {
+			$context = $this->getContext();
+		}
 
 		$fields = $this->getFields();
 
-        foreach ( (array) $fields as $key => $context_fields ) {
+		foreach ( (array) $fields as $key => $context_fields ) {
 
-            // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
-            $matches = explode( '_', $key );
+			// Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
+			$matches = explode( '_', $key );
 
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
-                return $context_fields;
-            }
-        }
+			if( isset( $matches[0] ) && $matches[0] === $context ) {
+				return $context_fields;
+			}
+		}
 
 		return array();
-    }
+	}
 
 	/**
 	 * @param array $fields
@@ -448,10 +448,10 @@ 
 	 */
 	public function getPaging() {
 
-	    $default_params = array(
-            'offset' => 0,
-            'page_size' => 20,
-        );
+		$default_params = array(
+			'offset' => 0,
+			'page_size' => 20,
+		);
 
 		return wp_parse_args( $this->paging, $default_params );
 	}
@@ -508,10 +508,10 @@ 
 	public function getSorting() {
 
 		$defaults_params = array(
-            'sort_field' => 'date_created',
-            'sort_direction' => 'ASC',
-            'is_numeric' => false,
-        );
+			'sort_field' => 'date_created',
+			'sort_direction' => 'ASC',
+			'is_numeric' => false,
+		);
 
 		return wp_parse_args( $this->sorting, $defaults_params );
 	}
@@ -837,7 +837,7 @@ 
 	 */
 	public function render_widget_hooks( $view_id_or_context ) {
 
-	    /**
+		/**
 		 * @deprecated Numeric argument is deprecated. Pass a \GV\Template_Context instead.
 		 */
 		if ( is_numeric( $view_id_or_context ) ) {

Spacing +50 added lines, -50 removed lines

@@ -16,7 +16,7 @@ 
 	die;
 }
 
-if( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
+if ( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
 	require( GRAVITYVIEW_DIR . 'future/lib/class-gamajo-template-loader.php' );
 }
 
@@ -157,8 +157,8 @@ 
 			'atts'	  => NULL,
 		) );
 
-		foreach ($atts as $key => $value) {
-			if( is_null( $value ) ) {
+		foreach ( $atts as $key => $value ) {
+			if ( is_null( $value ) ) {
 				continue;
 			}
 			$this->{$key} = $value;
@@ -188,7 +188,7 @@ 
 	 */
 	static function getInstance( $passed_post = NULL ) {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self( $passed_post );
 		}
 
@@ -201,8 +201,8 @@ 
 	 */
 	public function getCurrentField( $key = NULL ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->_current_field[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->_current_field[ $key ] ) ) {
 				return $this->_current_field[ $key ];
 			}
 			return NULL;
@@ -213,16 +213,16 @@ 
 
 	public function setCurrentFieldSetting( $key, $value ) {
 
-		if( !empty( $this->_current_field ) ) {
-			$this->_current_field['field_settings'][ $key ] = $value;
+		if ( ! empty( $this->_current_field ) ) {
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
 		}
 
 	}
 
 	public function getCurrentFieldSetting( $key ) {
-		$settings = $this->getCurrentField('field_settings');
+		$settings = $this->getCurrentField( 'field_settings' );
 
-		if( $settings && !empty( $settings[ $key ] ) ) {
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
 			return $settings[ $key ];
 		}
 
@@ -253,8 +253,8 @@ 
 	 */
 	public function getAtts( $key = NULL ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->atts[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->atts[ $key ] ) ) {
 				return $this->atts[ $key ];
 			}
 			return NULL;
@@ -320,7 +320,7 @@ 
 
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
 
-		if( $fields && !empty( $key ) ) {
+		if ( $fields && ! empty( $key ) ) {
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
 		}
 
@@ -338,18 +338,18 @@ 
 	 */
 	public function getContextFields( $context = '' ) {
 
-	    if( '' === $context ) {
+	    if ( '' === $context ) {
 	        $context = $this->getContext();
         }
 
 		$fields = $this->getFields();
 
-        foreach ( (array) $fields as $key => $context_fields ) {
+        foreach ( (array)$fields as $key => $context_fields ) {
 
             // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
             $matches = explode( '_', $key );
 
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
+            if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) {
                 return $context_fields;
             }
         }
@@ -370,8 +370,8 @@ 
 	 */
 	public function getField( $key ) {
 
-		if( !empty( $key ) ) {
-			if( isset( $this->fields[ $key ] ) ) {
+		if ( ! empty( $key ) ) {
+			if ( isset( $this->fields[ $key ] ) ) {
 				return $this->fields[ $key ];
 			}
 		}
@@ -477,8 +477,8 @@ 
 	public function getPaginationCounts() {
 
 		$paging = $this->getPaging();
-		$offset = $paging['offset'];
-		$page_size = $paging['page_size'];
+		$offset = $paging[ 'offset' ];
+		$page_size = $paging[ 'page_size' ];
 		$total = $this->getTotalEntries();
 
 		if ( empty( $total ) ) {
@@ -499,7 +499,7 @@ 
 		 */
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
 
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
 	}
 
 	/**
@@ -595,16 +595,16 @@ 
 	 */
 	public function getCurrentEntry() {
 
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
 			$entries = $this->getEntries();
-			$entry = $entries[0];
+			$entry = $entries[ 0 ];
 		} else {
 			$entry = $this->_current_entry;
 		}
 
 		/** @since 1.16 Fixes DataTables empty entry issue */
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
-			$entry = $this->_current_field['entry'];
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
+			$entry = $this->_current_field[ 'entry' ];
 		}
 
 		return $entry;
@@ -644,7 +644,7 @@ 
 	public function renderZone( $zone = '', $atts = array(), $echo = true ) {
 
 		if ( empty( $zone ) ) {
-			gravityview()->log->error( 'No zone defined.');
+			gravityview()->log->error( 'No zone defined.' );
 			return NULL;
 		}
 
@@ -653,16 +653,16 @@ 
 			'context' => $this->getContext(),
 			'entry' => $this->getCurrentEntry(),
 			'form' => $this->getForm(),
-			'hide_empty' => $this->getAtts('hide_empty'),
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
 		);
 
 		$final_atts = wp_parse_args( $atts, $defaults );
 
 		$output = '';
 
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
 
-		$fields = $this->getField( $final_atts['zone_id'] );
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
 
 		// Backward compatibility
 		if ( 'table' === $this->getTemplatePartSlug() ) {
@@ -672,19 +672,19 @@ 
 			 * @param \GravityView_View $this
 			 * @deprecated Use `gravityview/template/table/fields`
 			 */
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
 		}
 
 		if ( empty( $fields ) ) {
 
-			gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts['zone_id'] ) );
+			gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts[ 'zone_id' ] ) );
 
 			return NULL;
 		}
 
 		$field_output = '';
 		foreach ( $fields as $field ) {
-			$final_atts['field'] = $field;
+			$final_atts[ 'field' ] = $field;
 
 			$field_output .= gravityview_field_output( $final_atts );
 		}
@@ -701,17 +701,17 @@ 
 			return NULL;
 		}
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
 		}
 
 		$output .= $field_output;
 
-		if( !empty( $final_atts['wrapper_class'] ) ) {
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
 			$output .= '</div>';
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -729,7 +729,7 @@ 
 	 */
 	function locate_template( $template_names, $load = false, $require_once = true ) {
 
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
 
 			$located = $this->located_templates[ $template_names ];
 
@@ -738,7 +738,7 @@ 
 			// Set $load to always false so we handle it here.
 			$located = parent::locate_template( $template_names, false, $require_once );
 
-			if( is_string( $template_names ) ) {
+			if ( is_string( $template_names ) ) {
 				$this->located_templates[ $template_names ] = $located;
 			}
 		}
@@ -756,7 +756,7 @@ 
 	 * @return mixed|null    The stored data.
 	 */
 	public function __get( $name ) {
-		if( isset( $this->{$name} ) ) {
+		if ( isset( $this->{$name} ) ) {
 			return $this->{$name};
 		} else {
 			return NULL;
@@ -785,17 +785,17 @@ 
 		$additional = array();
 
 		// form-19-table-body.php
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
 
-		if( $view_id = $this->getViewId() ) {
+		if ( $view_id = $this->getViewId() ) {
 			// view-3-table-body.php
-			$additional[] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
+			$additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
 		}
 
-		if( $this->getPostId() ) {
+		if ( $this->getPostId() ) {
 
 			// page-19-table-body.php
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
 		}
 
 		// Combine with existing table-body.php and table.php
@@ -817,7 +817,7 @@ 
 
 		gravityview()->log->debug( 'Rendering Template File: {path}', array( 'path' => $template_file ) );
 
-		if( !empty( $template_file) ) {
+		if ( ! empty( $template_file ) ) {
 
 			if ( $require_once ) {
 				require_once( $template_file );
@@ -892,7 +892,7 @@ 
 
 		// Prevent being called twice
 		if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) {
-			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) );
+			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) );
 			return;
 		}
 
@@ -914,7 +914,7 @@ 
 		 * @param string $zone Current widget zone, either `header` or `footer`
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
 		 */
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
 
 		$css_class = gravityview_sanitize_html_class( $css_class );
 
@@ -922,15 +922,15 @@ 
 		?>
 		<div class="<?php echo $css_class; ?>">
 			<?php
-			foreach( $rows as $row ) {
-				foreach( $row as $col => $areas ) {
+			foreach ( $rows as $row ) {
+				foreach ( $row as $col => $areas ) {
 					$column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left";
 				?>
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 						<?php
 						if ( ! empty( $areas ) ) {
 							foreach ( $areas as $area ) {
-								foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) {
+								foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) {
 									do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context );
 								}
 							}

includes/fields/class-gravityview-field-fileupload.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,6 @@ 
 	 * Trick the GF fileupload field to render with the proper HTML ID to enable the plupload JS to work properly
 	 *
 	 * @param array               $form  The Form Object currently being processed.
-	 * @param string|array        $value The field value. From default/dynamic population, $_POST, or a resumed incomplete submission.
 	 * @param null|array          $entry Null or the Entry Object currently being edited.
 	 * @param GF_Field_FileUpload $field Gravity Forms field
 	 *
@@ -74,6 +73,7 @@ 
 	 *
 	 * @since 2.0
 	 * @param \GV\Template_Context The context.
+	 * @param GV\Template_Context $context
 	 *
 	 * @return array           Array of file output, with `file_path` and `html` keys (see comments above)
 	 */

Spacing +22 added lines, -22 removed lines

@@ -24,21 +24,21 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		unset( $field_options['search_filter'] );
+		unset( $field_options[ 'search_filter' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$add_options['link_to_file'] = array(
+		$add_options[ 'link_to_file' ] = array(
 			'type' => 'checkbox',
 			'label' => __( 'Display as a Link:', 'gravityview' ),
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
 			'value' => false,
 			'merge_tags' => false,
 		);
 
-		$add_options['image_width'] = array(
+		$add_options[ 'image_width' ] = array(
 			'type' => 'text',
 			'label' => __( 'Custom Width:', 'gravityview' ),
 			'desc' => __( 'Override the default image width (250).', 'gravityview' ),
@@ -127,14 +127,14 @@ 
 			$base_id = null;
 
 			$is_single = gravityview_get_context() === 'single';
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
 			$field_compat = $gravityview_view->getCurrentField();
 		}
 
 		$output_arr = array();
 
 		// Get an array of file paths for the field.
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
 
 		// The $value JSON was probably truncated; let's check lead_detail_long.
 		if ( ! is_array( $file_paths ) ) {
@@ -153,7 +153,7 @@ 
 			$rendered = null;
 
 			// If the site is HTTPS, use HTTPS
-			if ( function_exists('set_url_scheme') ) {
+			if ( function_exists( 'set_url_scheme' ) ) {
 				$file_path = set_url_scheme( $file_path );
 			}
 
@@ -164,8 +164,8 @@ 
 			$file_path_info = pathinfo( $file_path );
 
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
-			$basename = $file_path_info['basename'];
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
+			$basename = $file_path_info[ 'basename' ];
 
 			// Get the secure download URL
 			$is_secure = false;
@@ -202,7 +202,7 @@ 
 					 */
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
 					), $context );
 
 					/**
@@ -238,7 +238,7 @@ 
 					 */
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
 					), $context );
 
 					/**
@@ -271,13 +271,13 @@ 
 				$width = \GV\Utils::get( $field_settings, 'image_width', 250 );
 				$image_atts = array(
 					'src'   => $file_path,
-					'class' => 'gv-image gv-field-id-' . $field_settings['id'],
-					'alt'   => $field_settings['label'],
-					'width' => ( $is_single ? null : ( $width ? $width: 250 ) )
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
+					'alt'   => $field_settings[ 'label' ],
+					'width' => ( $is_single ? null : ( $width ? $width : 250 ) )
 				);
 
 				if ( $is_secure ) {
-					$image_atts['validate_src'] = false;
+					$image_atts[ 'validate_src' ] = false;
 				}
 
 				/**
@@ -307,7 +307,7 @@ 
 				 */
 				$override_security = apply_filters( 'gravityview/fields/fileupload/allow_insecure_lightbox', false, $file_path, $field_settings, $context );
 
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) && ( ! $is_secure || $override_security ) ) {
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) && ( ! $is_secure || $override_security ) ) {
 					$lightbox_link_atts = array(
 						'rel'   => sprintf( "%s-%s", $gv_class, $entry_slug ),
 						'class' => 'thickbox',
@@ -316,7 +316,7 @@ 
 					$lightbox_link_atts = apply_filters( 'gravityview/fields/fileupload/link_atts', $lightbox_link_atts, $field_compat, $context );
 
 					if ( $override_security ) {
-						$image_atts['src'] = $insecure_file_path;
+						$image_atts[ 'src' ] = $insecure_file_path;
 						$image = new GravityView_Image( $image_atts );
 						$file_path = $insecure_file_path;
 						// :( a kitten died somewhere
@@ -328,7 +328,7 @@ 
 				}
 
 				// Show as link should render the image regardless.
-				if ( ! empty( $field_settings['show_as_link'] ) ) {
+				if ( ! empty( $field_settings[ 'show_as_link' ] ) ) {
 					$text = $rendered;
 				}
 			}
@@ -345,7 +345,7 @@ 
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
 
 			// Output textualized content where
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) {
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) {
 				/**
 				 * Modify the link text (defaults to the file name)
 				 *
@@ -358,7 +358,7 @@ 
 				 */
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context );
 
-				if ( empty( $field_settings['show_as_link'] ) ) {
+				if ( empty( $field_settings[ 'show_as_link' ] ) ) {
 					/**
 					 * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field
 					 * @param array|string $link_atts Array or attributes string
@@ -374,7 +374,7 @@ 
 				$content = empty( $rendered ) ? $text : $rendered;
 			}
 
-			$output_arr[] = array(
+			$output_arr[ ] = array(
 				'file_path' => $file_path,
 				'content' => $content
 			);