gravityview / GravityView

future/includes/class-gv-extension.php

Doc Comments +2 added lines, -2 removed lines

@@ -207,7 +207,7 @@ 
 	 * - Checks PHP version numbers
 	 * - Sets self::$is_compatible[__CLASS__] to boolean value
 	 *
-	 * @return boolean Is the extension supported?
+	 * @return boolean|null Is the extension supported?
 	 */
 	protected function is_extension_supported() {
 
@@ -329,7 +329,7 @@ 
 	/**
 	 * Add a notice to be displayed in the admin.
 	 *
-	 * @param array $notice Array with `class` and `message` keys. The message is not escaped.
+	 * @param string $notice Array with `class` and `message` keys. The message is not escaped.
 	 *
 	 * @return void
 	 */

Braces +1 added lines, -1 removed lines

@@ -291,7 +291,7 @@
 	public function settings() {
 
 		// If doing ajax, get outta here
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) ) {
 			return;
 		}
 

Indentation +7 added lines, -7 removed lines

@@ -305,13 +305,13 @@
 			$this->_remote_update_url,
 			$this->_path,
 			array(
-            	'version'	=> $this->_version, // current version number
-            	'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
-	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
-            	'author' 	=> strip_tags( $this->_author )  // author of this plugin
-          	)
-        );
+				'version'	=> $this->_version, // current version number
+				'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
+				'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
+				'item_name' => $this->_title,  // name of this plugin
+				'author' 	=> strip_tags( $this->_author )  // author of this plugin
+		  	)
+		);
 	}
 
 	/**

Spacing +17 added lines, -17 removed lines

@@ -180,13 +180,13 @@ 
 		$tab = wp_parse_args( $tab_settings, $tab_defaults );
 
 		// Force the screen to be GravityView
-		$tab['screen'] = 'gravityview';
+		$tab[ 'screen' ] = 'gravityview';
 
 		if ( class_exists( 'GravityView_Metabox_Tab' ) ) {
-			$metabox = new \GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] );
+			$metabox = new \GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] );
 			\GravityView_Metabox_Tabs::add( $metabox );
 		} else {
-			add_meta_box( 'gravityview_' . $tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] );
+			add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] );
 		}
 	}
 
@@ -211,14 +211,14 @@ 
 	 */
 	protected function is_extension_supported() {
 
-		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool) self::$is_compatible );
+		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool)self::$is_compatible );
 
 		if ( ! function_exists( 'gravityview' ) ) {
 			$message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), esc_html( $this->_title ) );
-		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version , ">=" ) ) {
-			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_gravityview_version.'</tt>' );
-		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=" ) ) {
-			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_php_version.'</tt>' );
+		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version, ">=" ) ) {
+			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_gravityview_version . '</tt>' );
+		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, ">=" ) ) {
+			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_php_version . '</tt>' );
 		} else if ( ! empty( $this->_max_gravityview_version ) && false === version_compare( $this->_max_gravityview_version, Plugin::$version, ">" ) ) {
 			$message = sprintf( __( 'The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview' ), esc_html( $this->_title ) );
 		} else {
@@ -258,12 +258,12 @@ 
 
 		$locale = get_locale();
 
-		if ( function_exists('get_user_locale') && is_admin() ) {
+		if ( function_exists( 'get_user_locale' ) && is_admin() ) {
 			$locale = get_user_locale();
 		}
 
 		// Traditional WordPress plugin locale filter
-		$locale = apply_filters( 'plugin_locale',  $locale, $this->_text_domain );
+		$locale = apply_filters( 'plugin_locale', $locale, $this->_text_domain );
 
 		$mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
 
@@ -291,7 +291,7 @@ 
 	public function settings() {
 
 		// If doing ajax, get outta here
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST( 'action' ) ) ) {
 			return;
 		}
 
@@ -308,7 +308,7 @@ 
             	'version'	=> $this->_version, // current version number
             	'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
 	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
+            	'item_name' => $this->_title, // name of this plugin
             	'author' 	=> strip_tags( $this->_author )  // author of this plugin
           	)
         );
@@ -337,16 +337,16 @@ 
 	 */
 	public static function add_notice( $notice = array() ) {
 
-		if ( is_array( $notice ) && empty( $notice['message'] ) ) {
+		if ( is_array( $notice ) && empty( $notice[ 'message' ] ) ) {
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
 			return;
 		} else if ( is_string( $notice ) ) {
 			$notice = array( 'message' => $notice );
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
 
-		self::$admin_notices []= $notice;
+		self::$admin_notices [ ] = $notice;
 	}
 
 	/**
@@ -360,8 +360,8 @@ 
 		}
 
 		foreach ( self::$admin_notices as $key => $notice ) {
-			echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">';
-			echo wpautop( $notice['message'] );
+			echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">';
+			echo wpautop( $notice[ 'message' ] );
 			echo '<div class="clear"></div>';
 			echo '</div>';
 		}

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

Doc Comments +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	 * @param \GV\GF_Form $form The Gravity Form form.
 	 * @param int $field_id The Gravity Form field ID for the $form.
 	 *
-	 * @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 by_id( $form, $field_id ) {
 

Spacing +4 added lines, -4 removed lines

@@ -27,17 +27,17 @@ 
 	 * @return \GV\GF_Field|null The field implementation or null on error.
 	 */
 	public static function from_configuration( $configuration ) {
-		if ( empty( $configuration['id'] ) || ! is_numeric( $configuration['id'] ) ) {
+		if ( empty( $configuration[ 'id' ] ) || ! is_numeric( $configuration[ 'id' ] ) ) {
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
 			return null;
 		}
 
-		if ( empty( $configuration['form_id'] ) || ! $form = \GV\GF_Form::by_id( $configuration['form_id'] )  ) {
+		if ( empty( $configuration[ 'form_id' ] ) || ! $form = \GV\GF_Form::by_id( $configuration[ 'form_id' ] ) ) {
 			gravityview()->log->error( 'Invalid configuration[form_id] supplied.' );
 			return null;
 		}
 
-		$field = self::by_id( $form, $configuration['id'] );
+		$field = self::by_id( $form, $configuration[ 'id' ] );
 
 		if ( ! $field ) {
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
@@ -111,7 +111,7 @@ 
 
 		/** This is a complex Gravity Forms input. */
 		if ( $input = \GFFormsModel::get_input( $this->field, $this->ID ) ) {
-			$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
+			$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
 		} else {
 			/** This is a field with one label. */
 			$label = $this->field->get_field_label( true, $this->label );

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-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 );
 								}
 							}