gravityview / GravityView

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

Indentation +220 added lines, -220 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -13,7 +13,7 @@ 
  * @see https://github.com/GaryJones/Gamajo-Template-Loader
  */
 if (!class_exists('\GV\Gamajo_Template_Loader')) {
-    require gravityview()->plugin->dir('future/lib/class-gamajo-template-loader.php');
+	require gravityview()->plugin->dir('future/lib/class-gamajo-template-loader.php');
 }
 
 /**
@@ -23,222 +23,222 @@ 
  */
 class Legacy_Override_Template extends \GV\Gamajo_Template_Loader
 {
-    /**
-     * Prefix for filter names.
-     *
-     * @var string
-     */
-    protected $filter_prefix = 'gravityview';
-
-    /**
-     * Directory name where custom templates for this plugin should be found in the theme.
-     *
-     * @var string
-     */
-    protected $theme_template_directory = 'gravityview';
-
-    /**
-     * @var \GV\View The view we're working with.
-     */
-    private $view;
-
-    /**
-     * @var \GV\Entry The entry we're working with.
-     */
-    private $entry;
-
-    /**
-     * Catch deprecated template loads.
-     *
-     * @param \GV\View    $view    The View.
-     * @param \GV\Entry   $entry   The Entry.
-     * @param \GV\Field   $field   The Field.
-     * @param \GV\Request $request The request.
-     *
-     * @return void
-     */
-    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', [$this, 'add_id_specific_templates'], 10, 3);
-
-        $this->view = $view;
-        $this->entry = $entry;
-
-        $this->plugin_directory = gravityview()->plugin->dir();
-        $this->plugin_template_directory = 'templates/deprecated/';
-    }
-
-    public function __destruct()
-    {
-        remove_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates']);
-    }
-
-    /**
-     * @inheritdoc
-     *
-     * @see Gamajo_Template_Loader::locate_template()
-     *
-     * @return null|string NULL: Template not found; String: path to template
-     */
-    public function locate_template($template_names, $load = false, $require_once = false)
-    {
-        return parent::locate_template($template_names, false, false);
-    }
-
-    /**
-     * Enable overrides of GravityView templates on a granular basis.
-     *
-     * The loading order is:
-     *
-     * - view-[View ID]-table-footer.php
-     * - form-[Form ID]-table-footer.php
-     * - page-[ID of post or page where view is embedded]-table-footer.php
-     * - table-footer.php
-     *
-     * @see  Gamajo_Template_Loader::get_template_file_names() Where the filter is
-     *
-     * @param array  $templates Existing list of templates.
-     * @param string $slug      Name of the template base, example: `table`, `list`, `datatables`, `map`
-     * @param string $name      Name of the template part, example: `body`, `footer`, `head`, `single`
-     *
-     * @return array $templates Modified template array, merged with existing $templates values
-     */
-    public function add_id_specific_templates($templates, $slug, $name)
-    {
-        $additional = [];
-
-        // form-19-table-body.php
-        $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);
-
-        global $post;
-        if ($post) {
-            // page-19-table-body.php
-            $additional[] = sprintf('page-%d-%s-%s.php', $post->ID, $slug, $name);
-        }
-
-        // Combine with existing table-body.php and table.php
-        $templates = array_merge($additional, $templates);
-
-        return $templates;
-    }
-
-    /**
-     * Setup legacy rendering.
-     *
-     * @param string $slug The slug.
-     *
-     * @return string The output.
-     */
-    public function render($slug)
-    {
-        add_action('gravityview/template/after', $view_id_output = function ($context) {
-            printf('<input type="hidden" class="gravityview-view-id" value="%d">', $context->view->ID);
-        });
-
-        ob_start();
-
-        $request = new Mock_Request();
-        $request->returns['is_view'] = $this->view;
-
-        /**
-         * You got one shot. One opportunity. To render all the widgets you have ever wanted.
-         *
-         * Since we're overriding the singleton we need to remove the widget actions since they can only
-         *  be called once in a request (did_action/do_action mutex).
-         *
-         * Oh, and Mom's spaghetti.
-         */
-        global $wp_filter;
-        foreach (['gravityview_before', 'gravityview_after'] as $hook) {
-            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]);
-                }
-            }
-        }
-
-        /**
-         * Single entry view.
-         */
-        if ($this->entry) {
-            $request->returns['is_entry'] = $this->entry;
-
-            global $post;
-
-            $entries = new Entry_Collection();
-            $entries->add($this->entry);
-
-            \GV\Mocks\Legacy_Context::push([
-                'view'        => $this->view,
-                'entry'       => $this->entry,
-                'entries'     => $entries,
-                'request'     => $request,
-                'fields'      => $this->view->fields->by_visible($this->view),
-                'in_the_loop' => true,
-            ]);
-
-            \GravityView_View::getInstance()->setTemplatePartSlug($slug);
-            \GravityView_View::getInstance()->setTemplatePartName('single');
-
-            \GravityView_View::getInstance()->_include($this->get_template_part($slug, 'single'));
-
-            Mocks\Legacy_Context::pop();
-
-        /**
-         * Directory view.
-         */
-        } else {
-            $entries = $this->view->get_entries($request);
-
-            /**
-             * Remove multiple sorting before calling legacy filters.
-             * 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'])) {
-                $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 = \GravityView_frontend::get_view_entries_parameters($parameters, $this->view->form->ID);
-
-            global $post;
-
-            add_action('gravityview_before', [\GravityView_View::getInstance(), 'render_widget_hooks']);
-            add_action('gravityview_after', [\GravityView_View::getInstance(), 'render_widget_hooks']);
-
-            foreach (['header', 'body', 'footer'] as $part) {
-                \GV\Mocks\Legacy_Context::push(array_merge([
-                    'view'        => $this->view,
-                    'entries'     => $entries,
-                    'request'     => $request,
-                    'fields'      => $this->view->fields->by_visible($this->view),
-                    'in_the_loop' => true,
-                ], empty($parameters) ? [] : [
-                    'paging'  => $parameters['paging'],
-                    'sorting' => $parameters['sorting'],
-                ], $post ? [
-                    'post' => $post,
-                ] : []));
-
-                \GravityView_View::getInstance()->setTemplatePartSlug($slug);
-
-                \GravityView_View::getInstance()->setTemplatePartName($part);
-
-                \GravityView_View::getInstance()->_include($this->get_template_part($slug, $part));
-
-                Mocks\Legacy_Context::pop();
-            }
-        }
-
-        remove_action('gravityview/template/after', $view_id_output);
-
-        return ob_get_clean();
-    }
+	/**
+	 * Prefix for filter names.
+	 *
+	 * @var string
+	 */
+	protected $filter_prefix = 'gravityview';
+
+	/**
+	 * Directory name where custom templates for this plugin should be found in the theme.
+	 *
+	 * @var string
+	 */
+	protected $theme_template_directory = 'gravityview';
+
+	/**
+	 * @var \GV\View The view we're working with.
+	 */
+	private $view;
+
+	/**
+	 * @var \GV\Entry The entry we're working with.
+	 */
+	private $entry;
+
+	/**
+	 * Catch deprecated template loads.
+	 *
+	 * @param \GV\View    $view    The View.
+	 * @param \GV\Entry   $entry   The Entry.
+	 * @param \GV\Field   $field   The Field.
+	 * @param \GV\Request $request The request.
+	 *
+	 * @return void
+	 */
+	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', [$this, 'add_id_specific_templates'], 10, 3);
+
+		$this->view = $view;
+		$this->entry = $entry;
+
+		$this->plugin_directory = gravityview()->plugin->dir();
+		$this->plugin_template_directory = 'templates/deprecated/';
+	}
+
+	public function __destruct()
+	{
+		remove_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates']);
+	}
+
+	/**
+	 * @inheritdoc
+	 *
+	 * @see Gamajo_Template_Loader::locate_template()
+	 *
+	 * @return null|string NULL: Template not found; String: path to template
+	 */
+	public function locate_template($template_names, $load = false, $require_once = false)
+	{
+		return parent::locate_template($template_names, false, false);
+	}
+
+	/**
+	 * Enable overrides of GravityView templates on a granular basis.
+	 *
+	 * The loading order is:
+	 *
+	 * - view-[View ID]-table-footer.php
+	 * - form-[Form ID]-table-footer.php
+	 * - page-[ID of post or page where view is embedded]-table-footer.php
+	 * - table-footer.php
+	 *
+	 * @see  Gamajo_Template_Loader::get_template_file_names() Where the filter is
+	 *
+	 * @param array  $templates Existing list of templates.
+	 * @param string $slug      Name of the template base, example: `table`, `list`, `datatables`, `map`
+	 * @param string $name      Name of the template part, example: `body`, `footer`, `head`, `single`
+	 *
+	 * @return array $templates Modified template array, merged with existing $templates values
+	 */
+	public function add_id_specific_templates($templates, $slug, $name)
+	{
+		$additional = [];
+
+		// form-19-table-body.php
+		$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);
+
+		global $post;
+		if ($post) {
+			// page-19-table-body.php
+			$additional[] = sprintf('page-%d-%s-%s.php', $post->ID, $slug, $name);
+		}
+
+		// Combine with existing table-body.php and table.php
+		$templates = array_merge($additional, $templates);
+
+		return $templates;
+	}
+
+	/**
+	 * Setup legacy rendering.
+	 *
+	 * @param string $slug The slug.
+	 *
+	 * @return string The output.
+	 */
+	public function render($slug)
+	{
+		add_action('gravityview/template/after', $view_id_output = function ($context) {
+			printf('<input type="hidden" class="gravityview-view-id" value="%d">', $context->view->ID);
+		});
+
+		ob_start();
+
+		$request = new Mock_Request();
+		$request->returns['is_view'] = $this->view;
+
+		/**
+		 * You got one shot. One opportunity. To render all the widgets you have ever wanted.
+		 *
+		 * Since we're overriding the singleton we need to remove the widget actions since they can only
+		 *  be called once in a request (did_action/do_action mutex).
+		 *
+		 * Oh, and Mom's spaghetti.
+		 */
+		global $wp_filter;
+		foreach (['gravityview_before', 'gravityview_after'] as $hook) {
+			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]);
+				}
+			}
+		}
+
+		/**
+		 * Single entry view.
+		 */
+		if ($this->entry) {
+			$request->returns['is_entry'] = $this->entry;
+
+			global $post;
+
+			$entries = new Entry_Collection();
+			$entries->add($this->entry);
+
+			\GV\Mocks\Legacy_Context::push([
+				'view'        => $this->view,
+				'entry'       => $this->entry,
+				'entries'     => $entries,
+				'request'     => $request,
+				'fields'      => $this->view->fields->by_visible($this->view),
+				'in_the_loop' => true,
+			]);
+
+			\GravityView_View::getInstance()->setTemplatePartSlug($slug);
+			\GravityView_View::getInstance()->setTemplatePartName('single');
+
+			\GravityView_View::getInstance()->_include($this->get_template_part($slug, 'single'));
+
+			Mocks\Legacy_Context::pop();
+
+		/**
+		 * Directory view.
+		 */
+		} else {
+			$entries = $this->view->get_entries($request);
+
+			/**
+			 * Remove multiple sorting before calling legacy filters.
+			 * 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'])) {
+				$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 = \GravityView_frontend::get_view_entries_parameters($parameters, $this->view->form->ID);
+
+			global $post;
+
+			add_action('gravityview_before', [\GravityView_View::getInstance(), 'render_widget_hooks']);
+			add_action('gravityview_after', [\GravityView_View::getInstance(), 'render_widget_hooks']);
+
+			foreach (['header', 'body', 'footer'] as $part) {
+				\GV\Mocks\Legacy_Context::push(array_merge([
+					'view'        => $this->view,
+					'entries'     => $entries,
+					'request'     => $request,
+					'fields'      => $this->view->fields->by_visible($this->view),
+					'in_the_loop' => true,
+				], empty($parameters) ? [] : [
+					'paging'  => $parameters['paging'],
+					'sorting' => $parameters['sorting'],
+				], $post ? [
+					'post' => $post,
+				] : []));
+
+				\GravityView_View::getInstance()->setTemplatePartSlug($slug);
+
+				\GravityView_View::getInstance()->setTemplatePartName($part);
+
+				\GravityView_View::getInstance()->_include($this->get_template_part($slug, $part));
+
+				Mocks\Legacy_Context::pop();
+			}
+		}
+
+		remove_action('gravityview/template/after', $view_id_output);
+
+		return ob_get_clean();
+	}
 }

Spacing +51 added lines, -51 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -12,8 +12,8 @@ 
  *
  * @see https://github.com/GaryJones/Gamajo-Template-Loader
  */
-if (!class_exists('\GV\Gamajo_Template_Loader')) {
-    require gravityview()->plugin->dir('future/lib/class-gamajo-template-loader.php');
+if ( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
+    require gravityview()->plugin->dir( 'future/lib/class-gamajo-template-loader.php' );
 }
 
 /**
@@ -57,9 +57,9 @@ 
      *
      * @return void
      */
-    public function __construct(\GV\View $view, \GV\Entry $entry = null, \GV\Field $field = null, \GV\Request $request = 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', [$this, 'add_id_specific_templates'], 10, 3);
+        add_filter( $this->filter_prefix . '_get_template_part', [ $this, 'add_id_specific_templates' ], 10, 3 );
 
         $this->view = $view;
         $this->entry = $entry;
@@ -70,7 +70,7 @@ 
 
     public function __destruct()
     {
-        remove_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates']);
+        remove_filter( $this->filter_prefix . '_get_template_part', [ $this, 'add_id_specific_templates' ] );
     }
 
     /**
@@ -80,9 +80,9 @@ 
      *
      * @return null|string NULL: Template not found; String: path to template
      */
-    public function locate_template($template_names, $load = false, $require_once = false)
+    public function locate_template( $template_names, $load = false, $require_once = false )
     {
-        return parent::locate_template($template_names, false, false);
+        return parent::locate_template( $template_names, false, false );
     }
 
     /**
@@ -103,24 +103,24 @@ 
      *
      * @return array $templates Modified template array, merged with existing $templates values
      */
-    public function add_id_specific_templates($templates, $slug, $name)
+    public function add_id_specific_templates( $templates, $slug, $name )
     {
-        $additional = [];
+        $additional = [ ];
 
         // 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) {
+        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
-        $templates = array_merge($additional, $templates);
+        $templates = array_merge( $additional, $templates );
 
         return $templates;
     }
@@ -132,16 +132,16 @@ 
      *
      * @return string The output.
      */
-    public function render($slug)
+    public function render( $slug )
     {
-        add_action('gravityview/template/after', $view_id_output = function ($context) {
-            printf('<input type="hidden" class="gravityview-view-id" value="%d">', $context->view->ID);
+        add_action( 'gravityview/template/after', $view_id_output = function( $context ) {
+            printf( '<input type="hidden" class="gravityview-view-id" value="%d">', $context->view->ID );
         });
 
         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.
@@ -152,10 +152,10 @@ 
          * Oh, and Mom's spaghetti.
          */
         global $wp_filter;
-        foreach (['gravityview_before', 'gravityview_after'] as $hook) {
-            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]);
+        foreach ( [ 'gravityview_before', 'gravityview_after' ] as $hook ) {
+            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 ] );
                 }
             }
         }
@@ -163,27 +163,27 @@ 
         /**
          * Single entry view.
          */
-        if ($this->entry) {
-            $request->returns['is_entry'] = $this->entry;
+        if ( $this->entry ) {
+            $request->returns[ 'is_entry' ] = $this->entry;
 
             global $post;
 
             $entries = new Entry_Collection();
-            $entries->add($this->entry);
+            $entries->add( $this->entry );
 
-            \GV\Mocks\Legacy_Context::push([
+            \GV\Mocks\Legacy_Context::push( [
                 'view'        => $this->view,
                 'entry'       => $this->entry,
                 'entries'     => $entries,
                 'request'     => $request,
-                'fields'      => $this->view->fields->by_visible($this->view),
+                'fields'      => $this->view->fields->by_visible( $this->view ),
                 'in_the_loop' => true,
-            ]);
+            ] );
 
-            \GravityView_View::getInstance()->setTemplatePartSlug($slug);
-            \GravityView_View::getInstance()->setTemplatePartName('single');
+            \GravityView_View::getInstance()->setTemplatePartSlug( $slug );
+            \GravityView_View::getInstance()->setTemplatePartName( 'single' );
 
-            \GravityView_View::getInstance()->_include($this->get_template_part($slug, 'single'));
+            \GravityView_View::getInstance()->_include( $this->get_template_part( $slug, 'single' ) );
 
             Mocks\Legacy_Context::pop();
 
@@ -191,53 +191,53 @@ 
          * Directory view.
          */
         } else {
-            $entries = $this->view->get_entries($request);
+            $entries = $this->view->get_entries( $request );
 
             /**
              * Remove multiple sorting before calling legacy filters.
              * 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' ] );
                 }
             }
 
-            $parameters = \GravityView_frontend::get_view_entries_parameters($parameters, $this->view->form->ID);
+            $parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->view->form->ID );
 
             global $post;
 
-            add_action('gravityview_before', [\GravityView_View::getInstance(), 'render_widget_hooks']);
-            add_action('gravityview_after', [\GravityView_View::getInstance(), 'render_widget_hooks']);
+            add_action( 'gravityview_before', [ \GravityView_View::getInstance(), 'render_widget_hooks' ] );
+            add_action( 'gravityview_after', [ \GravityView_View::getInstance(), 'render_widget_hooks' ] );
 
-            foreach (['header', 'body', 'footer'] as $part) {
-                \GV\Mocks\Legacy_Context::push(array_merge([
+            foreach ( [ 'header', 'body', 'footer' ] as $part ) {
+                \GV\Mocks\Legacy_Context::push( array_merge( [
                     'view'        => $this->view,
                     'entries'     => $entries,
                     'request'     => $request,
-                    'fields'      => $this->view->fields->by_visible($this->view),
+                    'fields'      => $this->view->fields->by_visible( $this->view ),
                     'in_the_loop' => true,
-                ], empty($parameters) ? [] : [
-                    'paging'  => $parameters['paging'],
-                    'sorting' => $parameters['sorting'],
+                ], empty( $parameters ) ? [ ] : [
+                    'paging'  => $parameters[ 'paging' ],
+                    'sorting' => $parameters[ 'sorting' ],
                 ], $post ? [
                     'post' => $post,
-                ] : []));
+                ] : [ ] ) );
 
-                \GravityView_View::getInstance()->setTemplatePartSlug($slug);
+                \GravityView_View::getInstance()->setTemplatePartSlug( $slug );
 
-                \GravityView_View::getInstance()->setTemplatePartName($part);
+                \GravityView_View::getInstance()->setTemplatePartName( $part );
 
-                \GravityView_View::getInstance()->_include($this->get_template_part($slug, $part));
+                \GravityView_View::getInstance()->_include( $this->get_template_part( $slug, $part ) );
 
                 Mocks\Legacy_Context::pop();
             }
         }
 
-        remove_action('gravityview/template/after', $view_id_output);
+        remove_action( 'gravityview/template/after', $view_id_output );
 
         return ob_get_clean();
     }

Braces +5 added lines, -10 removed lines

@@ -57,8 +57,7 @@ 
      *
      * @return void
      */
-    public function __construct(\GV\View $view, \GV\Entry $entry = null, \GV\Field $field = null, \GV\Request $request = 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', [$this, 'add_id_specific_templates'], 10, 3);
 
         $this->view = $view;
@@ -68,8 +67,7 @@ 
         $this->plugin_template_directory = 'templates/deprecated/';
     }
 
-    public function __destruct()
-    {
+    public function __destruct() {
         remove_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates']);
     }
 
@@ -80,8 +78,7 @@ 
      *
      * @return null|string NULL: Template not found; String: path to template
      */
-    public function locate_template($template_names, $load = false, $require_once = false)
-    {
+    public function locate_template($template_names, $load = false, $require_once = false) {
         return parent::locate_template($template_names, false, false);
     }
 
@@ -103,8 +100,7 @@ 
      *
      * @return array $templates Modified template array, merged with existing $templates values
      */
-    public function add_id_specific_templates($templates, $slug, $name)
-    {
+    public function add_id_specific_templates($templates, $slug, $name) {
         $additional = [];
 
         // form-19-table-body.php
@@ -132,8 +128,7 @@ 
      *
      * @return string The output.
      */
-    public function render($slug)
-    {
+    public function render($slug) {
         add_action('gravityview/template/after', $view_id_output = function ($context) {
             printf('<input type="hidden" class="gravityview-view-id" value="%d">', $context->view->ID);
         });

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

Indentation +50 added lines, -50 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,59 +14,59 @@ 
  */
 class Field_Renderer extends Renderer
 {
-    /**
-     * Renders a \GV\Field instance.
-     *
-     * @param \GV\Field   $request The field.
-     * @param \GV\View    $view    The view for this context if applicable.
-     * @param \GV\Source  $source  The source (form) for this context if applicable.
-     * @param \GV\Entry   $entry   The entry for this context if applicable.
-     * @param \GV\Request $request The request for this context if applicable.
-     * @param string      $class   The field template class. Default: \GV\Field_HTML_Template'.
-     *
-     * @api
-     *
-     * @since 2.0
-     * @since 2.1 Added Field Template class $class parameter
-     *
-     * @return string The rendered Field
-     */
-    public function render(Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null, $class = '\GV\Field_HTML_Template')
-    {
-        if (is_null($request)) {
-            $request = &gravityview()->request;
-        }
+	/**
+	 * Renders a \GV\Field instance.
+	 *
+	 * @param \GV\Field   $request The field.
+	 * @param \GV\View    $view    The view for this context if applicable.
+	 * @param \GV\Source  $source  The source (form) for this context if applicable.
+	 * @param \GV\Entry   $entry   The entry for this context if applicable.
+	 * @param \GV\Request $request The request for this context if applicable.
+	 * @param string      $class   The field template class. Default: \GV\Field_HTML_Template'.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 * @since 2.1 Added Field Template class $class parameter
+	 *
+	 * @return string The rendered Field
+	 */
+	public function render(Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null, $class = '\GV\Field_HTML_Template')
+	{
+		if (is_null($request)) {
+			$request = &gravityview()->request;
+		}
 
-        if (!$request->is_renderable()) {
-            gravityview()->log->error('Renderer unable to render View in {request_class} context', ['request_class' => get_class($request)]);
+		if (!$request->is_renderable()) {
+			gravityview()->log->error('Renderer unable to render View in {request_class} context', ['request_class' => get_class($request)]);
 
-            return null;
-        }
+			return null;
+		}
 
-        /**
-         * @filter `gravityview/template/field/class` Filter the template class that is about to be used to render the view.
-         *
-         * @since 2.0
-         *
-         * @param string      $class   The chosen class - Default: \GV\Field_HTML_Template.
-         * @param \GV\Field   $field   The field about to be rendered.
-         * @param \GV\View    $view    The view in this context, if applicable.
-         * @param \GV\Source  $source  The source (form) in this context, if applicable.
-         * @param \GV\Entry   $entry   The entry in this context, if applicable.
-         * @param \GV\Request $request The request in this context, if applicable.
-         */
-        $class = apply_filters('gravityview/template/field/class', $class, $field, $view, $source, $entry, $request);
-        if (!$class || !class_exists($class)) {
-            gravityview()->log->error('{template_class} not found', ['template_class' => $class]);
+		/**
+		 * @filter `gravityview/template/field/class` Filter the template class that is about to be used to render the view.
+		 *
+		 * @since 2.0
+		 *
+		 * @param string      $class   The chosen class - Default: \GV\Field_HTML_Template.
+		 * @param \GV\Field   $field   The field about to be rendered.
+		 * @param \GV\View    $view    The view in this context, if applicable.
+		 * @param \GV\Source  $source  The source (form) in this context, if applicable.
+		 * @param \GV\Entry   $entry   The entry in this context, if applicable.
+		 * @param \GV\Request $request The request in this context, if applicable.
+		 */
+		$class = apply_filters('gravityview/template/field/class', $class, $field, $view, $source, $entry, $request);
+		if (!$class || !class_exists($class)) {
+			gravityview()->log->error('{template_class} not found', ['template_class' => $class]);
 
-            return null;
-        }
+			return null;
+		}
 
-        /** @var \GV\Field_Template $class */
-        $renderer = new $class($field, $view, $source, $entry, $request);
-        ob_start();
-        $renderer->render();
+		/** @var \GV\Field_Template $class */
+		$renderer = new $class($field, $view, $source, $entry, $request);
+		ob_start();
+		$renderer->render();
 
-        return ob_get_clean();
-    }
+		return ob_get_clean();
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -31,14 +31,14 @@ 
      *
      * @return string The rendered Field
      */
-    public function render(Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null, $class = '\GV\Field_HTML_Template')
+    public function render( Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null, $class = '\GV\Field_HTML_Template' )
     {
-        if (is_null($request)) {
+        if ( is_null( $request ) ) {
             $request = &gravityview()->request;
         }
 
-        if (!$request->is_renderable()) {
-            gravityview()->log->error('Renderer unable to render View in {request_class} context', ['request_class' => get_class($request)]);
+        if ( ! $request->is_renderable() ) {
+            gravityview()->log->error( 'Renderer unable to render View in {request_class} context', [ 'request_class' => get_class( $request ) ] );
 
             return null;
         }
@@ -55,15 +55,15 @@ 
          * @param \GV\Entry   $entry   The entry in this context, if applicable.
          * @param \GV\Request $request The request in this context, if applicable.
          */
-        $class = apply_filters('gravityview/template/field/class', $class, $field, $view, $source, $entry, $request);
-        if (!$class || !class_exists($class)) {
-            gravityview()->log->error('{template_class} not found', ['template_class' => $class]);
+        $class = apply_filters( 'gravityview/template/field/class', $class, $field, $view, $source, $entry, $request );
+        if ( ! $class || ! class_exists( $class ) ) {
+            gravityview()->log->error( '{template_class} not found', [ 'template_class' => $class ] );
 
             return null;
         }
 
         /** @var \GV\Field_Template $class */
-        $renderer = new $class($field, $view, $source, $entry, $request);
+        $renderer = new $class( $field, $view, $source, $entry, $request );
         ob_start();
         $renderer->render();
 

Braces +2 added lines, -4 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Houses some preliminary \GV\Field rendering functionality.
  */
-class Field_Renderer extends Renderer
-{
+class Field_Renderer extends Renderer {
     /**
      * Renders a \GV\Field instance.
      *
@@ -31,8 +30,7 @@ 
      *
      * @return string The rendered Field
      */
-    public function render(Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null, $class = '\GV\Field_HTML_Template')
-    {
+    public function render(Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null, $class = '\GV\Field_HTML_Template') {
         if (is_null($request)) {
             $request = &gravityview()->request;
         }

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

Indentation +119 added lines, -119 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,122 +14,122 @@ 
  */
 class Internal_Field extends Field
 {
-    /**
-     * @var \GravityView_Field|false The backing GravityView field (old). False if none exists.
-     */
-    public $field;
-
-    /**
-     * Create self from a configuration array.
-     *
-     * @param array $configuration The configuration array.
-     *
-     * @see \GV\Field::as_configuration()
-     *
-     * @internal
-     *
-     * @since 2.0
-     *
-     * @return \GV\Internal_Field|null The field implementation or null on error.
-     */
-    public static function from_configuration($configuration)
-    {
-        if (empty($configuration['id']) || !is_string($configuration['id'])) {
-            gravityview()->log->error('Invalid configuration[id] supplied.');
-
-            return null;
-        }
-
-        $field = self::by_id($configuration['id']);
-
-        $field->update_configuration($configuration);
-
-        return $field;
-    }
-
-    /**
-     * Get a \GV\GF_Field from an internal Gravity Forms field ID.
-     *
-     * @param int $field_id The internal Gravity Forms field ID.
-     *
-     * @return \GV\Internal_Field|null The requested field or null if not found.
-     */
-    public static function by_id($field_id)
-    {
-        $field = new self();
-        $field->ID = $field_id;
-        $field->type = $field->ID;
-
-        /**
-         * Retrieve the internal backing field (old for now).
-         *
-         * @todo switch to future subclasses
-         */
-        $field->field = \GravityView_Fields::get_instance($field_id);
-
-        return $field;
-    }
-
-    /**
-     * Retrieve the label for this field.
-     *
-     * @param \GV\View    $view    The view for this context if applicable.
-     * @param \GV\Source  $source  The source (form) for this context if applicable.
-     * @param \GV\Entry   $entry   The entry for this context if applicable.
-     * @param \GV\Request $request The request for this context if applicable.
-     *
-     * @return string The label for this field.
-     */
-    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
-        if (!$this->show_label) {
-            return '';
-        }
-
-        if ($label = parent::get_label($view, $source, $entry, $request)) {
-            return $label;
-        }
-
-        if ($this->label) {
-            return $this->label;
-        }
-
-        return $this->field ? $this->field->label : '';
-    }
-
-    /**
-     * Retrieve the value for this field.
-     *
-     * Requires the \GV\Entry in this implementation.
-     *
-     * @param \GV\View    $view    The view for this context if applicable.
-     * @param \GV\Source  $source  The source (form) for this context if applicable.
-     * @param \GV\Entry   $entry   The entry for this context if applicable.
-     * @param \GV\Request $request The request for this context if applicable.
-     *
-     * @return mixed The value for this field.
-     */
-    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
-        if (!$entry || !is_a($entry, '\GV\Entry')) {
-            gravityview()->log->error('$entry is not a valid \GV\Entry instance');
-
-            return null;
-        }
-
-        /**
-         * @todo Implement in subclasses, once available.
-         *
-         * For example the "content" field will be empty here. It's
-         *  value is actually currently retrieved inside ...
-         *
-         * *drumroll*
-         *
-         * A TEMPLATE :)
-         */
-        $value = Utils::get($entry->as_entry(), $this->ID);
-
-        /** Apply parent filters. */
-        return $this->get_value_filters($value, $view, $source, $entry, $request);
-    }
+	/**
+	 * @var \GravityView_Field|false The backing GravityView field (old). False if none exists.
+	 */
+	public $field;
+
+	/**
+	 * Create self from a configuration array.
+	 *
+	 * @param array $configuration The configuration array.
+	 *
+	 * @see \GV\Field::as_configuration()
+	 *
+	 * @internal
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\Internal_Field|null The field implementation or null on error.
+	 */
+	public static function from_configuration($configuration)
+	{
+		if (empty($configuration['id']) || !is_string($configuration['id'])) {
+			gravityview()->log->error('Invalid configuration[id] supplied.');
+
+			return null;
+		}
+
+		$field = self::by_id($configuration['id']);
+
+		$field->update_configuration($configuration);
+
+		return $field;
+	}
+
+	/**
+	 * Get a \GV\GF_Field from an internal Gravity Forms field ID.
+	 *
+	 * @param int $field_id The internal Gravity Forms field ID.
+	 *
+	 * @return \GV\Internal_Field|null The requested field or null if not found.
+	 */
+	public static function by_id($field_id)
+	{
+		$field = new self();
+		$field->ID = $field_id;
+		$field->type = $field->ID;
+
+		/**
+		 * Retrieve the internal backing field (old for now).
+		 *
+		 * @todo switch to future subclasses
+		 */
+		$field->field = \GravityView_Fields::get_instance($field_id);
+
+		return $field;
+	}
+
+	/**
+	 * Retrieve the label for this field.
+	 *
+	 * @param \GV\View    $view    The view for this context if applicable.
+	 * @param \GV\Source  $source  The source (form) for this context if applicable.
+	 * @param \GV\Entry   $entry   The entry for this context if applicable.
+	 * @param \GV\Request $request The request for this context if applicable.
+	 *
+	 * @return string The label for this field.
+	 */
+	public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+	{
+		if (!$this->show_label) {
+			return '';
+		}
+
+		if ($label = parent::get_label($view, $source, $entry, $request)) {
+			return $label;
+		}
+
+		if ($this->label) {
+			return $this->label;
+		}
+
+		return $this->field ? $this->field->label : '';
+	}
+
+	/**
+	 * Retrieve the value for this field.
+	 *
+	 * Requires the \GV\Entry in this implementation.
+	 *
+	 * @param \GV\View    $view    The view for this context if applicable.
+	 * @param \GV\Source  $source  The source (form) for this context if applicable.
+	 * @param \GV\Entry   $entry   The entry for this context if applicable.
+	 * @param \GV\Request $request The request for this context if applicable.
+	 *
+	 * @return mixed The value for this field.
+	 */
+	public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+	{
+		if (!$entry || !is_a($entry, '\GV\Entry')) {
+			gravityview()->log->error('$entry is not a valid \GV\Entry instance');
+
+			return null;
+		}
+
+		/**
+		 * @todo Implement in subclasses, once available.
+		 *
+		 * For example the "content" field will be empty here. It's
+		 *  value is actually currently retrieved inside ...
+		 *
+		 * *drumroll*
+		 *
+		 * A TEMPLATE :)
+		 */
+		$value = Utils::get($entry->as_entry(), $this->ID);
+
+		/** Apply parent filters. */
+		return $this->get_value_filters($value, $view, $source, $entry, $request);
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -32,17 +32,17 @@ 
      *
      * @return \GV\Internal_Field|null The field implementation or null on error.
      */
-    public static function from_configuration($configuration)
+    public static function from_configuration( $configuration )
     {
-        if (empty($configuration['id']) || !is_string($configuration['id'])) {
-            gravityview()->log->error('Invalid configuration[id] supplied.');
+        if ( empty( $configuration[ 'id' ] ) || ! is_string( $configuration[ 'id' ] ) ) {
+            gravityview()->log->error( 'Invalid configuration[id] supplied.' );
 
             return null;
         }
 
-        $field = self::by_id($configuration['id']);
+        $field = self::by_id( $configuration[ 'id' ] );
 
-        $field->update_configuration($configuration);
+        $field->update_configuration( $configuration );
 
         return $field;
     }
@@ -54,7 +54,7 @@ 
      *
      * @return \GV\Internal_Field|null The requested field or null if not found.
      */
-    public static function by_id($field_id)
+    public static function by_id( $field_id )
     {
         $field = new self();
         $field->ID = $field_id;
@@ -65,7 +65,7 @@ 
          *
          * @todo switch to future subclasses
          */
-        $field->field = \GravityView_Fields::get_instance($field_id);
+        $field->field = \GravityView_Fields::get_instance( $field_id );
 
         return $field;
     }
@@ -80,17 +80,17 @@ 
      *
      * @return string The label for this field.
      */
-    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+    public function get_label( View $view = null, Source $source = null, Entry $entry = null, Request $request = null )
     {
-        if (!$this->show_label) {
+        if ( ! $this->show_label ) {
             return '';
         }
 
-        if ($label = parent::get_label($view, $source, $entry, $request)) {
+        if ( $label = parent::get_label( $view, $source, $entry, $request ) ) {
             return $label;
         }
 
-        if ($this->label) {
+        if ( $this->label ) {
             return $this->label;
         }
 
@@ -109,10 +109,10 @@ 
      *
      * @return mixed The value for this field.
      */
-    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+    public function get_value( View $view = null, Source $source = null, Entry $entry = null, Request $request = null )
     {
-        if (!$entry || !is_a($entry, '\GV\Entry')) {
-            gravityview()->log->error('$entry is not a valid \GV\Entry instance');
+        if ( ! $entry || ! is_a( $entry, '\GV\Entry' ) ) {
+            gravityview()->log->error( '$entry is not a valid \GV\Entry instance' );
 
             return null;
         }
@@ -127,9 +127,9 @@ 
          *
          * A TEMPLATE :)
          */
-        $value = Utils::get($entry->as_entry(), $this->ID);
+        $value = Utils::get( $entry->as_entry(), $this->ID );
 
         /** Apply parent filters. */
-        return $this->get_value_filters($value, $view, $source, $entry, $request);
+        return $this->get_value_filters( $value, $view, $source, $entry, $request );
     }
 }

Braces +5 added lines, -10 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Used for custom content fields, etc.
  */
-class Internal_Field extends Field
-{
+class Internal_Field extends Field {
     /**
      * @var \GravityView_Field|false The backing GravityView field (old). False if none exists.
      */
@@ -32,8 +31,7 @@ 
      *
      * @return \GV\Internal_Field|null The field implementation or null on error.
      */
-    public static function from_configuration($configuration)
-    {
+    public static function from_configuration($configuration) {
         if (empty($configuration['id']) || !is_string($configuration['id'])) {
             gravityview()->log->error('Invalid configuration[id] supplied.');
 
@@ -54,8 +52,7 @@ 
      *
      * @return \GV\Internal_Field|null The requested field or null if not found.
      */
-    public static function by_id($field_id)
-    {
+    public static function by_id($field_id) {
         $field = new self();
         $field->ID = $field_id;
         $field->type = $field->ID;
@@ -80,8 +77,7 @@ 
      *
      * @return string The label for this field.
      */
-    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
+    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null) {
         if (!$this->show_label) {
             return '';
         }
@@ -109,8 +105,7 @@ 
      *
      * @return mixed The value for this field.
      */
-    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
+    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null) {
         if (!$entry || !is_a($entry, '\GV\Entry')) {
             gravityview()->log->error('$entry is not a valid \GV\Entry instance');
 

future/includes/class-gv-field.php

Indentation +410 added lines, -410 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,413 +14,413 @@ 
  */
 class Field
 {
-    /**
-     * @var array The custom View configuration for this field.
-     *
-     * Everything else is in the properties.
-     */
-    private $configuration = [];
-
-    /**
-     * @var string The field position in the view.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $position = '';
-
-    /**
-     * @var string UID for this field.
-     *
-     * A unique relation identifier between this field and a view.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $UID = '';
-
-    /**
-     * @var string The form field ID for this field.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $ID = '';
-
-    /**
-     * @var string The form label for this field.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $label = '';
-
-    /**
-     * @var string The custom label for this field.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $custom_label = '';
-
-    /**
-     * @var bool Whether to show the label or not for this field.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $show_label = true;
-
-    /**
-     * @var string The custom class for this field.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $custom_class = '';
-
-    /**
-     * @var string The capability required to view this field.
-     *
-     * If empty, anyone can view it, including non-logged in users.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $cap = '';
-
-    /**
-     * @var bool Show as a link to entry.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $show_as_link = false;
-
-    /**
-     * @var bool Filter this field from searching.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $search_filter = false;
-
-    /**
-     * Return an array of the old format as used by callers of `GVCommon:get_directory_fields()` for example.
-     *
-     *  		'id' => string '9' (length=1)
-     *  		'label' => string 'Screenshots' (length=11)
-     *			'show_label' => string '1' (length=1)
-     *			'custom_label' => string '' (length=0)
-     *			'custom_class' => string 'gv-gallery' (length=10)
-     * 			'only_loggedin' => string '0' (length=1)
-     *			'only_loggedin_cap' => string 'read' (length=4)
-     *			'search_filter' => string '0'
-     *			'show_as_link' => string '0'
-     *
-     *			+ whatever else specific field types may have
-     *
-     * @internal
-     *
-     * @since 2.0
-     *
-     * @return array
-     */
-    public function as_configuration()
-    {
-        return array_merge([
-            'id'                => $this->ID,
-            'label'             => $this->label,
-            'show_label'        => $this->show_label ? '1' : '0',
-            'custom_label'      => $this->custom_label,
-            'custom_class'      => $this->custom_class,
-            'only_loggedin'     => $this->cap ? '1' : '0',
-            'only_loggedin_cap' => $this->cap,
-            'search_filter'     => $this->search_filter ? '1' : '0',
-            'show_as_link'      => $this->show_as_link ? '1' : '0',
-        ], $this->configuration);
-    }
-
-    /**
-     * An alias for \GV\Source::get_field().
-     *
-     * @see \GV\Source::get_field()
-     *
-     * @param string $source A \GV\Source class as string this field is tied to.
-     * @param array  $args   The arguments required for the backend to fetch the field (usually just the ID).
-     *
-     * @return \GV\Field|null A \GV\Field instance or null if not found.
-     */
-    final public static function get($source, $args)
-    {
-        if (!is_string($source) || !class_exists($source)) {
-            gravityview()->log->error('{source} class not found', ['source' => $source]);
-
-            return null;
-        }
-
-        if (!method_exists($source, 'get_field')) {
-            gravityview()->log->error('{source} does not appear to be a valid \GV\Source subclass (get_field method missing)', ['source' => $source]);
-
-            return null;
-        }
-
-        return call_user_func_array([$source, 'get_field'], is_array($args) ? $args : [$args]);
-    }
-
-    /**
-     * Create self from a configuration array.
-     *
-     * @param array $configuration The configuration array.
-     *
-     * @see \GV\Field::as_configuration()
-     *
-     * @internal
-     *
-     * @since 2.0
-     *
-     * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
-     */
-    public static function from_configuration($configuration)
-    {
-        if (empty($configuration['id'])) {
-            $field = new self();
-            gravityview()->log->error('Trying to get field from configuration without a field ID.', ['data' => $configuration]);
-            $field->update_configuration($configuration);
-
-            return $field;
-        }
-
-        /** Prevent infinte loops here from unimplemented children. */
-        if (version_compare(phpversion(), '5.4', '>=')) {
-            $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
-        } else {
-            $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-        }
-        $trace = $trace[1];
-        if ($trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__) {
-            $field = new self();
-            gravityview()->log->error('Infinite loop protection tripped. Returning default class here.');
-            $field->update_configuration($configuration);
-
-            return $field;
-        }
-
-        /** @var \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */
-        $field_class = is_numeric($configuration['id']) ? '\GV\GF_Field' : '\GV\Internal_Field';
-
-        /**
-         * @filter `gravityview/field/class` Filter the field class about to be created from the configuration.
-         *
-         * @param string $field_class   The field class about to be used.
-         * @param array  $configuration The configuration as per \GV\Field::as_configuration()
-         */
-        $field_class = apply_filters('gravityview/field/class', $field_class, $configuration);
-
-        if (!class_exists($field_class) || !method_exists($field_class, 'from_configuration')) {
-            $field = new self();
-            gravityview()->log->error('Class {field_class}::from_configuration does not exist.', ['field_class' => $field_class]);
-            $field->update_configuration($configuration);
-
-            return $field;
-        }
-
-        $field = $field_class::from_configuration($configuration);
-
-        if (!$field) {
-            $field = new self();
-            gravityview()->log->error('Could not configure {field_class} with given configuration.', ['field_class' => __CLASS__, 'data' => $configuration]);
-            $field->update_configuration($configuration);
-        }
-
-        return $field;
-    }
-
-    /**
-     * Update configuration.
-     *
-     * @param array $configuration The configuration array.
-     *
-     * @see \GV\Field::as_configuration()
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function update_configuration($configuration)
-    {
-        $configuration = wp_parse_args($configuration, $this->as_configuration());
-
-        if ($this->ID != $configuration['id']) {
-            /** Smelling trouble here... */
-            gravityview()->log->warning('ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', ['field_class', __CLASS__]);
-        }
-
-        $this->ID = $configuration['id'];
-        $this->label = $configuration['label'];
-        $this->show_label = $configuration['show_label'] == '1';
-        $this->custom_label = $configuration['custom_label'];
-        $this->custom_class = $configuration['custom_class'];
-        $this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
-        $this->search_filter = $configuration['search_filter'] == '1';
-        $this->show_as_link = $configuration['show_as_link'] == '1';
-
-        /** Shared among all field types (sort of). */
-        $shared_configuration_keys = [
-            'id', 'label', 'show_label', 'custom_label', 'custom_class',
-            'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
-        ];
-
-        /** Everything else goes into the properties for now. @todo subclasses! */
-        foreach ($configuration as $key => $value) {
-            if (!in_array($key, $shared_configuration_keys)) {
-                $this->configuration[$key] = $value;
-            }
-        }
-    }
-
-    /**
-     * Retrieve the label for this field.
-     *
-     * @param \GV\View    $view    The view for this context if applicable.
-     * @param \GV\Source  $source  The source (form) for this context if applicable.
-     * @param \GV\Entry   $entry   The entry for this context if applicable.
-     * @param \GV\Request $request The request for this context if applicable.
-     *
-     * @return string The label for this field. Nothing here.
-     */
-    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
-        if (!$this->show_label) {
-            return '';
-        }
-
-        /** A custom label is available. */
-        if (!empty($this->custom_label)) {
-            return \GravityView_API::replace_variables($this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null);
-        }
-
-        return '';
-    }
-
-    /**
-     * Retrieve the value for this field.
-     *
-     * Returns null in this implementation (or, rather, lack thereof).
-     *
-     * @param \GV\View    $view    The view for this context if applicable.
-     * @param \GV\Source  $source  The source (form) for this context if applicable.
-     * @param \GV\Entry   $entry   The entry for this context if applicable.
-     * @param \GV\Request $request The request for this context if applicable.
-     *
-     * @return mixed The value for this field.
-     */
-    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
-        return $this->get_value_filters(null, $view, $source, $entry, $request);
-    }
-
-    /**
-     * Apply all the required filters after get_value() was called.
-     *
-     * @param mixed       $value   The value that will be filtered.
-     * @param \GV\View    $view    The view for this context if applicable.
-     * @param \GV\Source  $source  The source (form) for this context if applicable.
-     * @param \GV\Entry   $entry   The entry for this context if applicable.
-     * @param \GV\Request $request The request for this context if applicable.
-     *
-     * This is in its own function since \GV\Field subclasses have to call it.
-     */
-    protected function get_value_filters($value, View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
-        if ($this->type) {
-            /**
-             * @filter `gravityview/field/$type/value` Override the displayed value here.
-             *
-             * @param string $value The value.
-             * @param \GV\Field The field we're doing this for.
-             * @param \GV\View    $view    The view for this context if applicable.
-             * @param \GV\Source  $source  The source (form) for this context if applicable.
-             * @param \GV\Entry   $entry   The entry for this context if applicable.
-             * @param \GV\Request $request The request for this context if applicable.
-             */
-            $value = apply_filters("gravityview/field/{$this->type}/value", $value, $this, $view, $source, $entry, $request);
-        }
-
-        /**
-         * @filter `gravityview/field/value` Override the displayed value here.
-         *
-         * @param string $value The value.
-         * @param \GV\Field The field we're doing this for.
-         * @param \GV\View    $view    The view for this context if applicable.
-         * @param \GV\Source  $source  The source (form) for this context if applicable.
-         * @param \GV\Entry   $entry   The entry for this context if applicable.
-         * @param \GV\Request $request The request for this context if applicable.
-         */
-        return apply_filters('gravityview/field/value', $value, $this, $view, $source, $entry, $request);
-    }
-
-    /**
-     * Whether or not this field is visible.
-     *
-     * @param \GV\View|null Is visible where exactly?
-     *
-     * @since develop
-     *
-     * @return bool
-     */
-    public function is_visible($view = null)
-    {
-        /**
-         * @filter `gravityview/field/is_visible` Should this field be visible?
-         *
-         * @param bool      $visible Visible or not, defaults to the set field capability requirement if defined.
-         * @param \GV\Field $field   The field we're looking at.
-         * @param \GV\View|null A context view. Since @develop
-         */
-        return apply_filters('gravityview/field/is_visible', (!$this->cap || \GVCommon::has_cap($this->cap)), $this, $view);
-    }
-
-    /**
-     * Get one of the extra configuration keys via property accessors.
-     *
-     * @param string $key The key to get.
-     *
-     * @return mixed|null The value for the given configuration key, null if doesn't exist.
-     */
-    public function __get($key)
-    {
-        switch ($key) {
-            default:
-                if (isset($this->configuration[$key])) {
-                    return $this->configuration[$key];
-                }
-        }
-
-        return null;
-    }
-
-    /**
-     * Is this set?
-     *
-     * @param string $key The key to get.
-     *
-     * @return bool Whether this $key is set or not.
-     */
-    public function __isset($key)
-    {
-        switch ($key) {
-            default:
-                return isset($this->configuration[$key]);
-        }
-    }
+	/**
+	 * @var array The custom View configuration for this field.
+	 *
+	 * Everything else is in the properties.
+	 */
+	private $configuration = [];
+
+	/**
+	 * @var string The field position in the view.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $position = '';
+
+	/**
+	 * @var string UID for this field.
+	 *
+	 * A unique relation identifier between this field and a view.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $UID = '';
+
+	/**
+	 * @var string The form field ID for this field.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $ID = '';
+
+	/**
+	 * @var string The form label for this field.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $label = '';
+
+	/**
+	 * @var string The custom label for this field.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $custom_label = '';
+
+	/**
+	 * @var bool Whether to show the label or not for this field.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $show_label = true;
+
+	/**
+	 * @var string The custom class for this field.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $custom_class = '';
+
+	/**
+	 * @var string The capability required to view this field.
+	 *
+	 * If empty, anyone can view it, including non-logged in users.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $cap = '';
+
+	/**
+	 * @var bool Show as a link to entry.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $show_as_link = false;
+
+	/**
+	 * @var bool Filter this field from searching.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $search_filter = false;
+
+	/**
+	 * Return an array of the old format as used by callers of `GVCommon:get_directory_fields()` for example.
+	 *
+	 *  		'id' => string '9' (length=1)
+	 *  		'label' => string 'Screenshots' (length=11)
+	 *			'show_label' => string '1' (length=1)
+	 *			'custom_label' => string '' (length=0)
+	 *			'custom_class' => string 'gv-gallery' (length=10)
+	 * 			'only_loggedin' => string '0' (length=1)
+	 *			'only_loggedin_cap' => string 'read' (length=4)
+	 *			'search_filter' => string '0'
+	 *			'show_as_link' => string '0'
+	 *
+	 *			+ whatever else specific field types may have
+	 *
+	 * @internal
+	 *
+	 * @since 2.0
+	 *
+	 * @return array
+	 */
+	public function as_configuration()
+	{
+		return array_merge([
+			'id'                => $this->ID,
+			'label'             => $this->label,
+			'show_label'        => $this->show_label ? '1' : '0',
+			'custom_label'      => $this->custom_label,
+			'custom_class'      => $this->custom_class,
+			'only_loggedin'     => $this->cap ? '1' : '0',
+			'only_loggedin_cap' => $this->cap,
+			'search_filter'     => $this->search_filter ? '1' : '0',
+			'show_as_link'      => $this->show_as_link ? '1' : '0',
+		], $this->configuration);
+	}
+
+	/**
+	 * An alias for \GV\Source::get_field().
+	 *
+	 * @see \GV\Source::get_field()
+	 *
+	 * @param string $source A \GV\Source class as string this field is tied to.
+	 * @param array  $args   The arguments required for the backend to fetch the field (usually just the ID).
+	 *
+	 * @return \GV\Field|null A \GV\Field instance or null if not found.
+	 */
+	final public static function get($source, $args)
+	{
+		if (!is_string($source) || !class_exists($source)) {
+			gravityview()->log->error('{source} class not found', ['source' => $source]);
+
+			return null;
+		}
+
+		if (!method_exists($source, 'get_field')) {
+			gravityview()->log->error('{source} does not appear to be a valid \GV\Source subclass (get_field method missing)', ['source' => $source]);
+
+			return null;
+		}
+
+		return call_user_func_array([$source, 'get_field'], is_array($args) ? $args : [$args]);
+	}
+
+	/**
+	 * Create self from a configuration array.
+	 *
+	 * @param array $configuration The configuration array.
+	 *
+	 * @see \GV\Field::as_configuration()
+	 *
+	 * @internal
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
+	 */
+	public static function from_configuration($configuration)
+	{
+		if (empty($configuration['id'])) {
+			$field = new self();
+			gravityview()->log->error('Trying to get field from configuration without a field ID.', ['data' => $configuration]);
+			$field->update_configuration($configuration);
+
+			return $field;
+		}
+
+		/** Prevent infinte loops here from unimplemented children. */
+		if (version_compare(phpversion(), '5.4', '>=')) {
+			$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+		} else {
+			$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+		}
+		$trace = $trace[1];
+		if ($trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__) {
+			$field = new self();
+			gravityview()->log->error('Infinite loop protection tripped. Returning default class here.');
+			$field->update_configuration($configuration);
+
+			return $field;
+		}
+
+		/** @var \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */
+		$field_class = is_numeric($configuration['id']) ? '\GV\GF_Field' : '\GV\Internal_Field';
+
+		/**
+		 * @filter `gravityview/field/class` Filter the field class about to be created from the configuration.
+		 *
+		 * @param string $field_class   The field class about to be used.
+		 * @param array  $configuration The configuration as per \GV\Field::as_configuration()
+		 */
+		$field_class = apply_filters('gravityview/field/class', $field_class, $configuration);
+
+		if (!class_exists($field_class) || !method_exists($field_class, 'from_configuration')) {
+			$field = new self();
+			gravityview()->log->error('Class {field_class}::from_configuration does not exist.', ['field_class' => $field_class]);
+			$field->update_configuration($configuration);
+
+			return $field;
+		}
+
+		$field = $field_class::from_configuration($configuration);
+
+		if (!$field) {
+			$field = new self();
+			gravityview()->log->error('Could not configure {field_class} with given configuration.', ['field_class' => __CLASS__, 'data' => $configuration]);
+			$field->update_configuration($configuration);
+		}
+
+		return $field;
+	}
+
+	/**
+	 * Update configuration.
+	 *
+	 * @param array $configuration The configuration array.
+	 *
+	 * @see \GV\Field::as_configuration()
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function update_configuration($configuration)
+	{
+		$configuration = wp_parse_args($configuration, $this->as_configuration());
+
+		if ($this->ID != $configuration['id']) {
+			/** Smelling trouble here... */
+			gravityview()->log->warning('ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', ['field_class', __CLASS__]);
+		}
+
+		$this->ID = $configuration['id'];
+		$this->label = $configuration['label'];
+		$this->show_label = $configuration['show_label'] == '1';
+		$this->custom_label = $configuration['custom_label'];
+		$this->custom_class = $configuration['custom_class'];
+		$this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
+		$this->search_filter = $configuration['search_filter'] == '1';
+		$this->show_as_link = $configuration['show_as_link'] == '1';
+
+		/** Shared among all field types (sort of). */
+		$shared_configuration_keys = [
+			'id', 'label', 'show_label', 'custom_label', 'custom_class',
+			'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
+		];
+
+		/** Everything else goes into the properties for now. @todo subclasses! */
+		foreach ($configuration as $key => $value) {
+			if (!in_array($key, $shared_configuration_keys)) {
+				$this->configuration[$key] = $value;
+			}
+		}
+	}
+
+	/**
+	 * Retrieve the label for this field.
+	 *
+	 * @param \GV\View    $view    The view for this context if applicable.
+	 * @param \GV\Source  $source  The source (form) for this context if applicable.
+	 * @param \GV\Entry   $entry   The entry for this context if applicable.
+	 * @param \GV\Request $request The request for this context if applicable.
+	 *
+	 * @return string The label for this field. Nothing here.
+	 */
+	public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+	{
+		if (!$this->show_label) {
+			return '';
+		}
+
+		/** A custom label is available. */
+		if (!empty($this->custom_label)) {
+			return \GravityView_API::replace_variables($this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null);
+		}
+
+		return '';
+	}
+
+	/**
+	 * Retrieve the value for this field.
+	 *
+	 * Returns null in this implementation (or, rather, lack thereof).
+	 *
+	 * @param \GV\View    $view    The view for this context if applicable.
+	 * @param \GV\Source  $source  The source (form) for this context if applicable.
+	 * @param \GV\Entry   $entry   The entry for this context if applicable.
+	 * @param \GV\Request $request The request for this context if applicable.
+	 *
+	 * @return mixed The value for this field.
+	 */
+	public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+	{
+		return $this->get_value_filters(null, $view, $source, $entry, $request);
+	}
+
+	/**
+	 * Apply all the required filters after get_value() was called.
+	 *
+	 * @param mixed       $value   The value that will be filtered.
+	 * @param \GV\View    $view    The view for this context if applicable.
+	 * @param \GV\Source  $source  The source (form) for this context if applicable.
+	 * @param \GV\Entry   $entry   The entry for this context if applicable.
+	 * @param \GV\Request $request The request for this context if applicable.
+	 *
+	 * This is in its own function since \GV\Field subclasses have to call it.
+	 */
+	protected function get_value_filters($value, View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+	{
+		if ($this->type) {
+			/**
+			 * @filter `gravityview/field/$type/value` Override the displayed value here.
+			 *
+			 * @param string $value The value.
+			 * @param \GV\Field The field we're doing this for.
+			 * @param \GV\View    $view    The view for this context if applicable.
+			 * @param \GV\Source  $source  The source (form) for this context if applicable.
+			 * @param \GV\Entry   $entry   The entry for this context if applicable.
+			 * @param \GV\Request $request The request for this context if applicable.
+			 */
+			$value = apply_filters("gravityview/field/{$this->type}/value", $value, $this, $view, $source, $entry, $request);
+		}
+
+		/**
+		 * @filter `gravityview/field/value` Override the displayed value here.
+		 *
+		 * @param string $value The value.
+		 * @param \GV\Field The field we're doing this for.
+		 * @param \GV\View    $view    The view for this context if applicable.
+		 * @param \GV\Source  $source  The source (form) for this context if applicable.
+		 * @param \GV\Entry   $entry   The entry for this context if applicable.
+		 * @param \GV\Request $request The request for this context if applicable.
+		 */
+		return apply_filters('gravityview/field/value', $value, $this, $view, $source, $entry, $request);
+	}
+
+	/**
+	 * Whether or not this field is visible.
+	 *
+	 * @param \GV\View|null Is visible where exactly?
+	 *
+	 * @since develop
+	 *
+	 * @return bool
+	 */
+	public function is_visible($view = null)
+	{
+		/**
+		 * @filter `gravityview/field/is_visible` Should this field be visible?
+		 *
+		 * @param bool      $visible Visible or not, defaults to the set field capability requirement if defined.
+		 * @param \GV\Field $field   The field we're looking at.
+		 * @param \GV\View|null A context view. Since @develop
+		 */
+		return apply_filters('gravityview/field/is_visible', (!$this->cap || \GVCommon::has_cap($this->cap)), $this, $view);
+	}
+
+	/**
+	 * Get one of the extra configuration keys via property accessors.
+	 *
+	 * @param string $key The key to get.
+	 *
+	 * @return mixed|null The value for the given configuration key, null if doesn't exist.
+	 */
+	public function __get($key)
+	{
+		switch ($key) {
+			default:
+				if (isset($this->configuration[$key])) {
+					return $this->configuration[$key];
+				}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Is this set?
+	 *
+	 * @param string $key The key to get.
+	 *
+	 * @return bool Whether this $key is set or not.
+	 */
+	public function __isset($key)
+	{
+		switch ($key) {
+			default:
+				return isset($this->configuration[$key]);
+		}
+	}
 }

Spacing +64 added lines, -64 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -19,7 +19,7 @@ 
      *
      * Everything else is in the properties.
      */
-    private $configuration = [];
+    private $configuration = [ ];
 
     /**
      * @var string The field position in the view.
@@ -138,7 +138,7 @@ 
      */
     public function as_configuration()
     {
-        return array_merge([
+        return array_merge( [
             'id'                => $this->ID,
             'label'             => $this->label,
             'show_label'        => $this->show_label ? '1' : '0',
@@ -148,7 +148,7 @@ 
             'only_loggedin_cap' => $this->cap,
             'search_filter'     => $this->search_filter ? '1' : '0',
             'show_as_link'      => $this->show_as_link ? '1' : '0',
-        ], $this->configuration);
+        ], $this->configuration );
     }
 
     /**
@@ -161,21 +161,21 @@ 
      *
      * @return \GV\Field|null A \GV\Field instance or null if not found.
      */
-    final public static function get($source, $args)
+    final public static function get( $source, $args )
     {
-        if (!is_string($source) || !class_exists($source)) {
-            gravityview()->log->error('{source} class not found', ['source' => $source]);
+        if ( ! is_string( $source ) || ! class_exists( $source ) ) {
+            gravityview()->log->error( '{source} class not found', [ 'source' => $source ] );
 
             return null;
         }
 
-        if (!method_exists($source, 'get_field')) {
-            gravityview()->log->error('{source} does not appear to be a valid \GV\Source subclass (get_field method missing)', ['source' => $source]);
+        if ( ! method_exists( $source, 'get_field' ) ) {
+            gravityview()->log->error( '{source} does not appear to be a valid \GV\Source subclass (get_field method missing)', [ 'source' => $source ] );
 
             return null;
         }
 
-        return call_user_func_array([$source, 'get_field'], is_array($args) ? $args : [$args]);
+        return call_user_func_array( [ $source, 'get_field' ], is_array( $args ) ? $args : [ $args ] );
     }
 
     /**
@@ -191,33 +191,33 @@ 
      *
      * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
      */
-    public static function from_configuration($configuration)
+    public static function from_configuration( $configuration )
     {
-        if (empty($configuration['id'])) {
+        if ( empty( $configuration[ 'id' ] ) ) {
             $field = new self();
-            gravityview()->log->error('Trying to get field from configuration without a field ID.', ['data' => $configuration]);
-            $field->update_configuration($configuration);
+            gravityview()->log->error( 'Trying to get field from configuration without a field ID.', [ 'data' => $configuration ] );
+            $field->update_configuration( $configuration );
 
             return $field;
         }
 
         /** Prevent infinte loops here from unimplemented children. */
-        if (version_compare(phpversion(), '5.4', '>=')) {
-            $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+        if ( version_compare( phpversion(), '5.4', '>=' ) ) {
+            $trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 2 );
         } else {
-            $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+            $trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
         }
-        $trace = $trace[1];
-        if ($trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__) {
+        $trace = $trace[ 1 ];
+        if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) {
             $field = new self();
-            gravityview()->log->error('Infinite loop protection tripped. Returning default class here.');
-            $field->update_configuration($configuration);
+            gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' );
+            $field->update_configuration( $configuration );
 
             return $field;
         }
 
         /** @var \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */
-        $field_class = is_numeric($configuration['id']) ? '\GV\GF_Field' : '\GV\Internal_Field';
+        $field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
 
         /**
          * @filter `gravityview/field/class` Filter the field class about to be created from the configuration.
@@ -225,22 +225,22 @@ 
          * @param string $field_class   The field class about to be used.
          * @param array  $configuration The configuration as per \GV\Field::as_configuration()
          */
-        $field_class = apply_filters('gravityview/field/class', $field_class, $configuration);
+        $field_class = apply_filters( 'gravityview/field/class', $field_class, $configuration );
 
-        if (!class_exists($field_class) || !method_exists($field_class, 'from_configuration')) {
+        if ( ! class_exists( $field_class ) || ! method_exists( $field_class, 'from_configuration' ) ) {
             $field = new self();
-            gravityview()->log->error('Class {field_class}::from_configuration does not exist.', ['field_class' => $field_class]);
-            $field->update_configuration($configuration);
+            gravityview()->log->error( 'Class {field_class}::from_configuration does not exist.', [ 'field_class' => $field_class ] );
+            $field->update_configuration( $configuration );
 
             return $field;
         }
 
-        $field = $field_class::from_configuration($configuration);
+        $field = $field_class::from_configuration( $configuration );
 
-        if (!$field) {
+        if ( ! $field ) {
             $field = new self();
-            gravityview()->log->error('Could not configure {field_class} with given configuration.', ['field_class' => __CLASS__, 'data' => $configuration]);
-            $field->update_configuration($configuration);
+            gravityview()->log->error( 'Could not configure {field_class} with given configuration.', [ 'field_class' => __CLASS__, 'data' => $configuration ] );
+            $field->update_configuration( $configuration );
         }
 
         return $field;
@@ -256,23 +256,23 @@ 
      *
      * @return void
      */
-    public function update_configuration($configuration)
+    public function update_configuration( $configuration )
     {
-        $configuration = wp_parse_args($configuration, $this->as_configuration());
+        $configuration = wp_parse_args( $configuration, $this->as_configuration() );
 
-        if ($this->ID != $configuration['id']) {
+        if ( $this->ID != $configuration[ 'id' ] ) {
             /** Smelling trouble here... */
-            gravityview()->log->warning('ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', ['field_class', __CLASS__]);
+            gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', [ 'field_class', __CLASS__ ] );
         }
 
-        $this->ID = $configuration['id'];
-        $this->label = $configuration['label'];
-        $this->show_label = $configuration['show_label'] == '1';
-        $this->custom_label = $configuration['custom_label'];
-        $this->custom_class = $configuration['custom_class'];
-        $this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
-        $this->search_filter = $configuration['search_filter'] == '1';
-        $this->show_as_link = $configuration['show_as_link'] == '1';
+        $this->ID = $configuration[ 'id' ];
+        $this->label = $configuration[ 'label' ];
+        $this->show_label = $configuration[ 'show_label' ] == '1';
+        $this->custom_label = $configuration[ 'custom_label' ];
+        $this->custom_class = $configuration[ 'custom_class' ];
+        $this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : '';
+        $this->search_filter = $configuration[ 'search_filter' ] == '1';
+        $this->show_as_link = $configuration[ 'show_as_link' ] == '1';
 
         /** Shared among all field types (sort of). */
         $shared_configuration_keys = [
@@ -281,9 +281,9 @@ 
         ];
 
         /** Everything else goes into the properties for now. @todo subclasses! */
-        foreach ($configuration as $key => $value) {
-            if (!in_array($key, $shared_configuration_keys)) {
-                $this->configuration[$key] = $value;
+        foreach ( $configuration as $key => $value ) {
+            if ( ! in_array( $key, $shared_configuration_keys ) ) {
+                $this->configuration[ $key ] = $value;
             }
         }
     }
@@ -298,15 +298,15 @@ 
      *
      * @return string The label for this field. Nothing here.
      */
-    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+    public function get_label( View $view = null, Source $source = null, Entry $entry = null, Request $request = null )
     {
-        if (!$this->show_label) {
+        if ( ! $this->show_label ) {
             return '';
         }
 
         /** A custom label is available. */
-        if (!empty($this->custom_label)) {
-            return \GravityView_API::replace_variables($this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null);
+        if ( ! empty( $this->custom_label ) ) {
+            return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null );
         }
 
         return '';
@@ -324,9 +324,9 @@ 
      *
      * @return mixed The value for this field.
      */
-    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+    public function get_value( View $view = null, Source $source = null, Entry $entry = null, Request $request = null )
     {
-        return $this->get_value_filters(null, $view, $source, $entry, $request);
+        return $this->get_value_filters( null, $view, $source, $entry, $request );
     }
 
     /**
@@ -340,9 +340,9 @@ 
      *
      * This is in its own function since \GV\Field subclasses have to call it.
      */
-    protected function get_value_filters($value, View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+    protected function get_value_filters( $value, View $view = null, Source $source = null, Entry $entry = null, Request $request = null )
     {
-        if ($this->type) {
+        if ( $this->type ) {
             /**
              * @filter `gravityview/field/$type/value` Override the displayed value here.
              *
@@ -353,7 +353,7 @@ 
              * @param \GV\Entry   $entry   The entry for this context if applicable.
              * @param \GV\Request $request The request for this context if applicable.
              */
-            $value = apply_filters("gravityview/field/{$this->type}/value", $value, $this, $view, $source, $entry, $request);
+            $value = apply_filters( "gravityview/field/{$this->type}/value", $value, $this, $view, $source, $entry, $request );
         }
 
         /**
@@ -366,7 +366,7 @@ 
          * @param \GV\Entry   $entry   The entry for this context if applicable.
          * @param \GV\Request $request The request for this context if applicable.
          */
-        return apply_filters('gravityview/field/value', $value, $this, $view, $source, $entry, $request);
+        return apply_filters( 'gravityview/field/value', $value, $this, $view, $source, $entry, $request );
     }
 
     /**
@@ -378,7 +378,7 @@ 
      *
      * @return bool
      */
-    public function is_visible($view = null)
+    public function is_visible( $view = null )
     {
         /**
          * @filter `gravityview/field/is_visible` Should this field be visible?
@@ -387,7 +387,7 @@ 
          * @param \GV\Field $field   The field we're looking at.
          * @param \GV\View|null A context view. Since @develop
          */
-        return apply_filters('gravityview/field/is_visible', (!$this->cap || \GVCommon::has_cap($this->cap)), $this, $view);
+        return apply_filters( 'gravityview/field/is_visible', ( ! $this->cap || \GVCommon::has_cap( $this->cap ) ), $this, $view );
     }
 
     /**
@@ -397,12 +397,12 @@ 
      *
      * @return mixed|null The value for the given configuration key, null if doesn't exist.
      */
-    public function __get($key)
+    public function __get( $key )
     {
-        switch ($key) {
+        switch ( $key ) {
             default:
-                if (isset($this->configuration[$key])) {
-                    return $this->configuration[$key];
+                if ( isset( $this->configuration[ $key ] ) ) {
+                    return $this->configuration[ $key ];
                 }
         }
 
@@ -416,11 +416,11 @@ 
      *
      * @return bool Whether this $key is set or not.
      */
-    public function __isset($key)
+    public function __isset( $key )
     {
-        switch ($key) {
+        switch ( $key ) {
             default:
-                return isset($this->configuration[$key]);
+                return isset( $this->configuration[ $key ] );
         }
     }
 }

Braces +11 added lines, -22 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Houses all base Field functionality.
  */
-class Field
-{
+class Field {
     /**
      * @var array The custom View configuration for this field.
      *
@@ -136,8 +135,7 @@ 
      *
      * @return array
      */
-    public function as_configuration()
-    {
+    public function as_configuration() {
         return array_merge([
             'id'                => $this->ID,
             'label'             => $this->label,
@@ -161,8 +159,7 @@ 
      *
      * @return \GV\Field|null A \GV\Field instance or null if not found.
      */
-    final public static function get($source, $args)
-    {
+    final public static function get($source, $args) {
         if (!is_string($source) || !class_exists($source)) {
             gravityview()->log->error('{source} class not found', ['source' => $source]);
 
@@ -191,8 +188,7 @@ 
      *
      * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
      */
-    public static function from_configuration($configuration)
-    {
+    public static function from_configuration($configuration) {
         if (empty($configuration['id'])) {
             $field = new self();
             gravityview()->log->error('Trying to get field from configuration without a field ID.', ['data' => $configuration]);
@@ -256,8 +252,7 @@ 
      *
      * @return void
      */
-    public function update_configuration($configuration)
-    {
+    public function update_configuration($configuration) {
         $configuration = wp_parse_args($configuration, $this->as_configuration());
 
         if ($this->ID != $configuration['id']) {
@@ -298,8 +293,7 @@ 
      *
      * @return string The label for this field. Nothing here.
      */
-    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
+    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null) {
         if (!$this->show_label) {
             return '';
         }
@@ -324,8 +318,7 @@ 
      *
      * @return mixed The value for this field.
      */
-    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
+    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null) {
         return $this->get_value_filters(null, $view, $source, $entry, $request);
     }
 
@@ -340,8 +333,7 @@ 
      *
      * This is in its own function since \GV\Field subclasses have to call it.
      */
-    protected function get_value_filters($value, View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
+    protected function get_value_filters($value, View $view = null, Source $source = null, Entry $entry = null, Request $request = null) {
         if ($this->type) {
             /**
              * @filter `gravityview/field/$type/value` Override the displayed value here.
@@ -378,8 +370,7 @@ 
      *
      * @return bool
      */
-    public function is_visible($view = null)
-    {
+    public function is_visible($view = null) {
         /**
          * @filter `gravityview/field/is_visible` Should this field be visible?
          *
@@ -397,8 +388,7 @@ 
      *
      * @return mixed|null The value for the given configuration key, null if doesn't exist.
      */
-    public function __get($key)
-    {
+    public function __get($key) {
         switch ($key) {
             default:
                 if (isset($this->configuration[$key])) {
@@ -416,8 +406,7 @@ 
      *
      * @return bool Whether this $key is set or not.
      */
-    public function __isset($key)
-    {
+    public function __isset($key) {
         switch ($key) {
             default:
                 return isset($this->configuration[$key]);

future/includes/class-gv-view.php

Indentation +1690 added lines, -1690 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -17,1693 +17,1693 @@ 
  */
 class View implements \ArrayAccess
 {
-    /**
-     * @var \WP_Post The backing post instance.
-     */
-    private $post;
-
-    /**
-     * @var \GV\View_Settings The settings.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $settings;
-
-    /**
-     * @var \GV\Widget_Collection The widets attached here.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $widgets;
-
-    /**
-     * @var \GV\GF_Form|\GV\Form The backing form for this view.
-     *
-     * Contains the form that is sourced for entries in this view.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $form;
-
-    /**
-     * @var \GV\Field_Collection The fields for this view.
-     *
-     * Contains all the fields that are attached to this view.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public $fields;
-
-    /**
-     * @var array
-     *
-     * Internal static cache for gets, and whatnot.
-     * This is not persistent, resets across requests.
-     *
-     * @internal
-     */
-    private static $cache = [];
-
-    /**
-     * @var \GV\Join[] The joins for all sources in this view.
-     *
-     * @api
-     *
-     * @since 2.0.1
-     */
-    public $joins = [];
-
-    /**
-     * @var \GV\Field[][] The unions for all sources in this view.
-     *                    An array of fields grouped by form_id keyed by
-     *                    main field_id:
-     *
-     *                    array(
-     *                        $form_id => array(
-     *                            $field_id => $field,
-     *                            $field_id => $field,
-     *                        )
-     *                    )
-     *
-     * @api
-     *
-     * @since 2.2.2
-     */
-    public $unions = [];
-
-    /**
-     * The constructor.
-     */
-    public function __construct()
-    {
-        $this->settings = new View_Settings();
-        $this->fields = new Field_Collection();
-        $this->widgets = new Widget_Collection();
-    }
-
-    /**
-     * Register the gravityview WordPress Custom Post Type.
-     *
-     * @internal
-     *
-     * @return void
-     */
-    public static function register_post_type()
-    {
-
-        /** Register only once */
-        if (post_type_exists('gravityview')) {
-            return;
-        }
-
-        /**
-         * @filter `gravityview_is_hierarchical` Make GravityView Views hierarchical by returning TRUE
-         * This will allow for Views to be nested with Parents and also allows for menu order to be set in the Page Attributes metabox
-         *
-         * @since 1.13
-         *
-         * @param bool $is_hierarchical Default: false
-         */
-        $is_hierarchical = (bool) apply_filters('gravityview_is_hierarchical', false);
-
-        $supports = ['title', 'revisions'];
-
-        if ($is_hierarchical) {
-            $supports[] = 'page-attributes';
-        }
-
-        /**
-         * @filter  `gravityview_post_type_supports` Modify post type support values for `gravityview` post type
-         *
-         * @see add_post_type_support()
-         * @since 1.15.2
-         *
-         * @param array $supports        Array of features associated with a functional area of the edit screen. Default: 'title', 'revisions'. If $is_hierarchical, also 'page-attributes'
-         * @param bool  $is_hierarchical Do Views support parent/child relationships? See `gravityview_is_hierarchical` filter.
-         */
-        $supports = apply_filters('gravityview_post_type_support', $supports, $is_hierarchical);
-
-        /** Register Custom Post Type - gravityview */
-        $labels = [
-            'name'                   => _x('Views', 'Post Type General Name', 'gravityview'),
-            'singular_name'          => _x('View', 'Post Type Singular Name', 'gravityview'),
-            'menu_name'              => _x('Views', 'Menu name', 'gravityview'),
-            'parent_item_colon'      => __('Parent View:', 'gravityview'),
-            'all_items'              => __('All Views', 'gravityview'),
-            'view_item'              => _x('View', 'View Item', 'gravityview'),
-            'add_new_item'           => __('Add New View', 'gravityview'),
-            'add_new'                => __('New View', 'gravityview'),
-            'edit_item'              => __('Edit View', 'gravityview'),
-            'update_item'            => __('Update View', 'gravityview'),
-            'search_items'           => __('Search Views', 'gravityview'),
-            'not_found'              => \GravityView_Admin::no_views_text(),
-            'not_found_in_trash'     => __('No Views found in Trash', 'gravityview'),
-            'filter_items_list'      => __('Filter Views list', 'gravityview'),
-            'items_list_navigation'  => __('Views list navigation', 'gravityview'),
-            'items_list'             => __('Views list', 'gravityview'),
-            'view_items'             => __('See Views', 'gravityview'),
-            'attributes'             => __('View Attributes', 'gravityview'),
-            'item_updated'           => __('View updated.', 'gravityview'),
-            'item_published'         => __('View published.', 'gravityview'),
-            'item_reverted_to_draft' => __('View reverted to draft.', 'gravityview'),
-            'item_scheduled'         => __('View scheduled.', 'gravityview'),
-        ];
-
-        $args = [
-            'label'               => __('view', 'gravityview'),
-            'description'         => __('Create views based on a Gravity Forms form', 'gravityview'),
-            'labels'              => $labels,
-            'supports'            => $supports,
-            'hierarchical'        => $is_hierarchical,
-            /**
-             * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
-             *
-             * @see https://codex.wordpress.org/Function_Reference/register_post_type#public
-             * @since 1.15.2
-             *
-             * @param bool `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded via shortcode. Default: `true`
-             * @param int $view_id The ID of the View currently being requested. `0` for general setting
-             */
-            'public'              => apply_filters('gravityview_direct_access', gravityview()->plugin->is_compatible(), 0),
-            'show_ui'             => gravityview()->plugin->is_compatible(),
-            'show_in_menu'        => gravityview()->plugin->is_compatible(),
-            'show_in_nav_menus'   => true,
-            'show_in_admin_bar'   => true,
-            'menu_position'       => 17,
-            'menu_icon'           => '',
-            'can_export'          => true,
-            /**
-             * @filter `gravityview_has_archive` Enable Custom Post Type archive?
-             *
-             * @since 1.7.3
-             *
-             * @param bool False: don't have frontend archive; True: yes, have archive. Default: false
-             */
-            'has_archive'         => apply_filters('gravityview_has_archive', false),
-            'exclude_from_search' => true,
-            'rewrite'             => [
-                /**
-                 * @filter `gravityview_slug` Modify the url part for a View.
-                 *
-                 * @see https://docs.gravityview.co/article/62-changing-the-view-slug
-                 *
-                 * @param string $slug The slug shown in the URL
-                 */
-                'slug' => apply_filters('gravityview_slug', 'view'),
-
-                /**
-                 * @filter `gravityview/post_type/with_front` Should the permalink structure
-                 *  be prepended with the front base.
-                 *  (example: if your permalink structure is /blog/, then your links will be: false->/view/, true->/blog/view/).
-                 *  Defaults to true.
-                 *
-                 * @see https://codex.wordpress.org/Function_Reference/register_post_type
-                 * @since 2.0
-                 *
-                 * @param bool $with_front
-                 */
-                'with_front' => apply_filters('gravityview/post_type/with_front', true),
-            ],
-            'capability_type'     => 'gravityview',
-            'map_meta_cap'        => true,
-        ];
-
-        register_post_type('gravityview', $args);
-    }
-
-    /**
-     * Add extra rewrite endpoints.
-     *
-     * @return void
-     */
-    public static function add_rewrite_endpoint()
-    {
-        /**
-         * CSV.
-         */
-        global $wp_rewrite;
-
-        $slug = apply_filters('gravityview_slug', 'view');
-        $slug = ('/' !== $wp_rewrite->front) ? sprintf('%s/%s', trim($wp_rewrite->front, '/'), $slug) : $slug;
-        $csv_rule = [sprintf('%s/([^/]+)/csv/?', $slug), 'index.php?gravityview=$matches[1]&csv=1', 'top'];
-        $tsv_rule = [sprintf('%s/([^/]+)/tsv/?', $slug), 'index.php?gravityview=$matches[1]&tsv=1', 'top'];
-
-        add_filter('query_vars', function ($query_vars) {
-            $query_vars[] = 'csv';
-            $query_vars[] = 'tsv';
-
-            return $query_vars;
-        });
-
-        if (!isset($wp_rewrite->extra_rules_top[$csv_rule[0]])) {
-            call_user_func_array('add_rewrite_rule', $csv_rule);
-            call_user_func_array('add_rewrite_rule', $tsv_rule);
-        }
-    }
-
-    /**
-     * A renderer filter for the View post type content.
-     *
-     * @param string $content Should be empty, as we don't store anything there.
-     *
-     * @return string $content The view content as output by the renderers.
-     */
-    public static function content($content)
-    {
-        $request = gravityview()->request;
-
-        // Plugins may run through the content in the header. WP SEO does this for its OpenGraph functionality.
-        if (!defined('DOING_GRAVITYVIEW_TESTS')) {
-            if (!did_action('loop_start')) {
-                gravityview()->log->debug('Not processing yet: loop_start hasn\'t run yet. Current action: {action}', ['action' => current_filter()]);
-
-                return $content;
-            }
-
-            //	We don't want this filter to run infinite loop on any post content fields
-            remove_filter('the_content', [__CLASS__, __METHOD__]);
-        }
-
-        /**
-         * This is not a View. Bail.
-         *
-         * Shortcodes and oEmbeds and whatnot will be handled
-         *  elsewhere.
-         */
-        if (!$view = $request->is_view()) {
-            return $content;
-        }
-
-        /**
-         * Check permissions.
-         */
-        while ($error = $view->can_render(null, $request)) {
-            if (!is_wp_error($error)) {
-                break;
-            }
-
-            switch (str_replace('gravityview/', '', $error->get_error_code())) {
-                case 'post_password_required':
-                    return get_the_password_form($view->ID);
-                case 'no_form_attached':
-
-                    gravityview()->log->error('View #{view_id} cannot render: {error_code} {error_message}', ['error_code' => $error->get_error_code(), 'error_message' => $error->get_error_message()]);
-
-                    /**
-                     * This View has no data source. There's nothing to show really.
-                     * ...apart from a nice message if the user can do anything about it.
-                     */
-                    if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
-                        $title = sprintf(__('This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false)));
-
-                        $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;" />', esc_attr__('Data Source', 'gravityview'), esc_url(plugins_url('assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE)));
-
-                        return \GVCommon::generate_notice('<h3>'.$title.'</h3>'.wpautop($message.$image), 'notice');
-                    }
-                    break;
-                case 'in_trash':
-
-                    if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
-                        $notice = sprintf(__('This View is in the Trash. You can <a href="%s">restore the View here</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false)));
-
-                        return \GVCommon::generate_notice('<h3>'.$notice.'</h3>', 'notice', ['edit_gravityviews', 'edit_gravityview'], $view->ID);
-                    }
-
-                    return ''; // Do not show
-                    break;
-                case 'no_direct_access':
-                case 'embed_only':
-                case 'not_public':
-                default:
-                    gravityview()->log->notice('View #{view_id} cannot render: {error_code} {error_message}', ['error_code' => $error->get_error_code(), 'error_message' => $error->get_error_message()]);
-
-                    return __('You are not allowed to view this content.', 'gravityview');
-            }
-
-            return $content;
-        }
-
-        $is_admin_and_can_view = $view->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID);
-
-        /**
-         * Editing a single entry.
-         */
-        if ($entry = $request->is_edit_entry($view->form ? $view->form->ID : 0)) {
-            if ($entry['status'] != 'active') {
-                gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $entry->ID]);
-
-                return __('You are not allowed to view this content.', 'gravityview');
-            }
-
-            if (apply_filters('gravityview_custom_entry_slug', false) && $entry->slug != get_query_var(\GV\Entry::get_endpoint_name())) {
-                gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $entry->ID]);
-
-                return __('You are not allowed to view this content.', 'gravityview');
-            }
-
-            if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
-                if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($entry->ID, \GravityView_Entry_Approval::meta_key))) {
-                    gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $entry->ID]);
-
-                    return __('You are not allowed to view this content.', 'gravityview');
-                }
-            }
-
-            $renderer = new Edit_Entry_Renderer();
-
-            return $renderer->render($entry, $view, $request);
-
-        /**
-         * Viewing a single entry.
-         */
-        } elseif ($entry = $request->is_entry($view->form ? $view->form->ID : 0)) {
-            $entryset = $entry->is_multi() ? $entry->entries : [$entry];
-
-            $custom_slug = apply_filters('gravityview_custom_entry_slug', false);
-            $ids = explode(',', get_query_var(\GV\Entry::get_endpoint_name()));
-
-            $show_only_approved = $view->settings->get('show_only_approved');
-
-            foreach ($entryset as $e) {
-                if ('active' !== $e['status']) {
-                    gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $e->ID]);
-
-                    return __('You are not allowed to view this content.', 'gravityview');
-                }
-
-                if ($custom_slug && !in_array($e->slug, $ids)) {
-                    gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $e->ID]);
-
-                    return __('You are not allowed to view this content.', 'gravityview');
-                }
-
-                if ($show_only_approved && !$is_admin_and_can_view) {
-                    if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($e->ID, \GravityView_Entry_Approval::meta_key))) {
-                        gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $e->ID]);
-
-                        return __('You are not allowed to view this content.', 'gravityview');
-                    }
-                }
-
-                $error = \GVCommon::check_entry_display($e->as_entry(), $view);
-
-                if (is_wp_error($error)) {
-                    gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing: {message}', ['entry_id' => $e->ID, 'message' => $error->get_error_message()]);
-
-                    return __('You are not allowed to view this content.', 'gravityview');
-                }
-            }
-
-            $renderer = new Entry_Renderer();
-
-            return $renderer->render($entry, $view, $request);
-        }
-
-        /**
-         * Plain old View.
-         */
-        $renderer = new View_Renderer();
-
-        return $renderer->render($view, $request);
-    }
-
-    /**
-     * Checks whether this view can be accessed or not.
-     *
-     * @param string[]    $context The context we're asking for access from.
-     *                             Can any and as many of one of:
-     *                             edit      An edit context.
-     *                             single    A single context.
-     *                             cpt       The custom post type single page accessed.
-     *                             shortcode Embedded as a shortcode.
-     *                             oembed    Embedded as an oEmbed.
-     *                             rest      A REST call.
-     * @param \GV\Request $request The request
-     *
-     * @return bool|\WP_Error An error if this View shouldn't be rendered here.
-     */
-    public function can_render($context = null, $request = null)
-    {
-        if (!$request) {
-            $request = gravityview()->request;
-        }
-
-        if (!is_array($context)) {
-            $context = [];
-        }
-
-        /**
-         * @filter `gravityview/view/can_render` Whether the view can be rendered or not.
-         *
-         * @param bool|\WP_Error $result  The result. Default: null.
-         * @param \GV\View       $view    The view.
-         * @param string[]       $context See \GV\View::can_render
-         * @param \GV\Request    $request The request.
-         */
-        if (!is_null($result = apply_filters('gravityview/view/can_render', null, $this, $context, $request))) {
-            return $result;
-        }
-
-        if (in_array('rest', $context)) {
-            // REST
-            if (gravityview()->plugin->settings->get('rest_api') === '1' && $this->settings->get('rest_disable') === '1') {
-                return new \WP_Error('gravityview/rest_disabled');
-            } elseif (gravityview()->plugin->settings->get('rest_api') !== '1' && $this->settings->get('rest_enable') !== '1') {
-                return new \WP_Error('gravityview/rest_disabled');
-            }
-        }
-
-        if (in_array('csv', $context)) {
-            if ($this->settings->get('csv_enable') !== '1') {
-                return new \WP_Error('gravityview/csv_disabled', 'The CSV endpoint is not enabled for this View');
-            }
-        }
-
-        /**
-         * This View is password protected. Nothing to do here.
-         */
-        if (post_password_required($this->ID)) {
-            gravityview()->log->notice('Post password is required for View #{view_id}', ['view_id' => $this->ID]);
-
-            return new \WP_Error('gravityview/post_password_required');
-        }
-
-        if (!$this->form) {
-            gravityview()->log->notice('View #{id} has no form attached to it.', ['id' => $this->ID]);
-
-            return new \WP_Error('gravityview/no_form_attached');
-        }
-
-        if (!in_array('shortcode', $context)) {
-            /**
-             * Is this View directly accessible via a post URL?
-             *
-             * @see https://codex.wordpress.org/Function_Reference/register_post_type#public
-             */
-
-            /**
-             * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
-             *
-             * @deprecated
-             *
-             * @param bool `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded. Default: `true`
-             * @param int $view_id The ID of the View currently being requested. `0` for general setting
-             */
-            $direct_access = apply_filters('gravityview_direct_access', true, $this->ID);
-
-            /**
-             * @filter `gravityview/request/output/direct` Should this View be directly accessbile?
-             *
-             * @since 2.0
-             *
-             * @param bool Accessible or not. Default: accessbile.
-             * @param \GV\View    $view    The View we're trying to directly render here.
-             * @param \GV\Request $request The current request.
-             */
-            if (!apply_filters('gravityview/view/output/direct', $direct_access, $this, $request)) {
-                return new \WP_Error('gravityview/no_direct_access');
-            }
-
-            /**
-             * Is this View an embed-only View? If so, don't allow rendering here,
-             *  as this is a direct request.
-             */
-            if ($this->settings->get('embed_only') && !\GVCommon::has_cap('read_private_gravityviews')) {
-                return new \WP_Error('gravityview/embed_only');
-            }
-        }
-
-        /** Private, pending, draft, etc. */
-        $public_states = get_post_stati(['public' => true]);
-        if (!in_array($this->post_status, $public_states) && !\GVCommon::has_cap('read_gravityview', $this->ID)) {
-            gravityview()->log->notice('The current user cannot access this View #{view_id}', ['view_id' => $this->ID]);
-
-            return new \WP_Error('gravityview/not_public');
-        }
-
-        return true;
-    }
-
-    /**
-     * Get joins associated with a view.
-     *
-     * @param \WP_Post $post GravityView CPT to get joins for
-     *
-     * @api
-     *
-     * @since 2.0.11
-     *
-     * @return \GV\Join[] Array of \GV\Join instances
-     */
-    public static function get_joins($post)
-    {
-        $joins = [];
-
-        if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
-            gravityview()->log->info('Cannot get joined forms; joins feature not supported.');
-
-            return $joins;
-        }
-
-        if (!$post || 'gravityview' !== get_post_type($post)) {
-            gravityview()->log->error('Only "gravityview" post types can be \GV\View instances.');
-
-            return $joins;
-        }
-
-        $joins_meta = get_post_meta($post->ID, '_gravityview_form_joins', true);
-
-        if (empty($joins_meta)) {
-            return $joins;
-        }
-
-        foreach ($joins_meta as $meta) {
-            if (!is_array($meta) || count($meta) != 4) {
-                continue;
-            }
-
-            list($join, $join_column, $join_on, $join_on_column) = $meta;
-
-            $join = GF_Form::by_id($join);
-            $join_on = GF_Form::by_id($join_on);
-
-            $join_column = is_numeric($join_column) ? GF_Field::by_id($join, $join_column) : Internal_Field::by_id($join_column);
-            $join_on_column = is_numeric($join_on_column) ? GF_Field::by_id($join_on, $join_on_column) : Internal_Field::by_id($join_on_column);
-
-            $joins[] = new Join($join, $join_column, $join_on, $join_on_column);
-        }
-
-        return $joins;
-    }
-
-    /**
-     * Get joined forms associated with a view
-     * In no particular order.
-     *
-     * @since 2.0.11
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @param int $post_id ID of the View
-     *
-     * @return \GV\GF_Form[] Array of \GV\GF_Form instances
-     */
-    public static function get_joined_forms($post_id)
-    {
-        $forms = [];
-
-        if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
-            gravityview()->log->info('Cannot get joined forms; joins feature not supported.');
-
-            return $forms;
-        }
-
-        if (!$post_id || !gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
-            return $forms;
-        }
-
-        if (empty($post_id)) {
-            gravityview()->log->error('Cannot get joined forms; $post_id was empty');
-
-            return $forms;
-        }
-
-        $joins_meta = get_post_meta($post_id, '_gravityview_form_joins', true);
-
-        if (empty($joins_meta)) {
-            return $forms;
-        }
-
-        foreach ($joins_meta  as $meta) {
-            if (!is_array($meta) || count($meta) != 4) {
-                continue;
-            }
-
-            list($join, $join_column, $join_on, $join_on_column) = $meta;
-
-            if ($form = GF_Form::by_id($join_on)) {
-                $forms[$join_on] = $form;
-            }
-
-            if ($form = GF_Form::by_id($join)) {
-                $forms[$join] = $form;
-            }
-        }
-
-        return $forms;
-    }
-
-    /**
-     * Get unions associated with a view.
-     *
-     * @param \WP_Post $post GravityView CPT to get unions for
-     *
-     * @api
-     *
-     * @since 2.2.2
-     *
-     * @return \GV\Field[][] Array of unions (see self::$unions)
-     */
-    public static function get_unions($post)
-    {
-        $unions = [];
-
-        if (!$post || 'gravityview' !== get_post_type($post)) {
-            gravityview()->log->error('Only "gravityview" post types can be \GV\View instances.');
-
-            return $unions;
-        }
-
-        $fields = get_post_meta($post->ID, '_gravityview_directory_fields', true);
-
-        if (empty($fields)) {
-            return $unions;
-        }
-
-        foreach ($fields as $location => $_fields) {
-            if (strpos($location, 'directory_') !== 0) {
-                continue;
-            }
-
-            foreach ($_fields as $field) {
-                if (!empty($field['unions'])) {
-                    foreach ($field['unions'] as $form_id => $field_id) {
-                        if (!isset($unions[$form_id])) {
-                            $unions[$form_id] = [];
-                        }
-
-                        $unions[$form_id][$field['id']] =
-                            is_numeric($field_id) ? \GV\GF_Field::by_id(\GV\GF_Form::by_id($form_id), $field_id) : \GV\Internal_Field::by_id($field_id);
-                    }
-                }
-            }
-
-            break;
-        }
-
-        if ($unions) {
-            if (!gravityview()->plugin->supports(Plugin::FEATURE_UNIONS)) {
-                gravityview()->log->error('Cannot get unions; unions feature not supported.');
-            }
-        }
-
-        // @todo We'll probably need to backfill null unions
-
-        return $unions;
-    }
-
-    /**
-     * Construct a \GV\View instance from a \WP_Post.
-     *
-     * @param \WP_Post $post The \WP_Post instance to wrap.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\View|null An instance around this \WP_Post if valid, null otherwise.
-     */
-    public static function from_post($post)
-    {
-        if (!$post || 'gravityview' !== get_post_type($post)) {
-            gravityview()->log->error('Only gravityview post types can be \GV\View instances.');
-
-            return null;
-        }
-
-        if ($view = Utils::get(self::$cache, "View::from_post:{$post->ID}")) {
-            /**
-             * @filter `gravityview/view/get` Override View.
-             *
-             * @param \GV\View $view The View instance pointer.
-             *
-             * @since 2.1
-             */
-            do_action_ref_array('gravityview/view/get', [&$view]);
-
-            return $view;
-        }
-
-        $view = new self();
-        $view->post = $post;
-
-        /** Get connected form. */
-        $view->form = GF_Form::by_id($view->_gravityview_form_id);
-        if (!$view->form) {
-            gravityview()->log->error('View #{view_id} tried attaching non-existent Form #{form_id} to it.', [
-                'view_id' => $view->ID,
-                'form_id' => $view->_gravityview_form_id ?: 0,
-            ]);
-        }
-
-        $view->joins = $view::get_joins($post);
-
-        $view->unions = $view::get_unions($post);
-
-        /**
-         * @filter `gravityview/configuration/fields` Filter the View fields' configuration array.
-         *
-         * @since 1.6.5
-         * @deprecated Use `gravityview/view/configuration/fields` or `gravityview/view/fields` filters.
-         *
-         * @param $fields array Multi-array of fields with first level being the field zones.
-         * @param $view_id int The View the fields are being pulled for.
-         */
-        $configuration = apply_filters('gravityview/configuration/fields', (array) $view->_gravityview_directory_fields, $view->ID);
-
-        /**
-         * @filter `gravityview/view/configuration/fields` Filter the View fields' configuration array.
-         *
-         * @since 2.0
-         *
-         * @param array    $fields Multi-array of fields with first level being the field zones.
-         * @param \GV\View $view   The View the fields are being pulled for.
-         */
-        $configuration = apply_filters('gravityview/view/configuration/fields', $configuration, $view);
-
-        /**
-         * @filter `gravityview/view/fields` Filter the Field Collection for this View.
-         *
-         * @since 2.0
-         *
-         * @param \GV\Field_Collection $fields A collection of fields.
-         * @param \GV\View             $view   The View the fields are being pulled for.
-         */
-        $view->fields = apply_filters('gravityview/view/fields', Field_Collection::from_configuration($configuration), $view);
-
-        /**
-         * @filter `gravityview/view/configuration/widgets` Filter the View widgets' configuration array.
-         *
-         * @since 2.0
-         *
-         * @param array    $fields Multi-array of widgets with first level being the field zones.
-         * @param \GV\View $view   The View the widgets are being pulled for.
-         */
-        $configuration = apply_filters('gravityview/view/configuration/widgets', (array) $view->_gravityview_directory_widgets, $view);
-
-        /**
-         * @filter `gravityview/view/widgets` Filter the Widget Collection for this View.
-         *
-         * @since 2.0
-         *
-         * @param \GV\Widget_Collection $widgets A collection of widgets.
-         * @param \GV\View              $view    The View the widgets are being pulled for.
-         */
-        $view->widgets = apply_filters('gravityview/view/widgets', Widget_Collection::from_configuration($configuration), $view);
-
-        /** View configuration. */
-        $view->settings->update(gravityview_get_template_settings($view->ID));
-
-        /** Add the template name into the settings. */
-        $view->settings->update(['template' => gravityview_get_template_id($view->ID)]);
-
-        /** View basics. */
-        $view->settings->update([
-            'id' => $view->ID,
-        ]);
-
-        self::$cache["View::from_post:{$post->ID}"] = &$view;
-
-        /**
-         * @filter `gravityview/view/get` Override View.
-         *
-         * @param \GV\View $view The View instance pointer.
-         *
-         * @since 2.1
-         */
-        do_action_ref_array('gravityview/view/get', [&$view]);
-
-        return $view;
-    }
-
-    /**
-     * Flush the view cache.
-     *
-     * @param int $view_id The View to reset cache for. Optional. Default: resets everything.
-     *
-     * @internal
-     */
-    public static function _flush_cache($view_id = null)
-    {
-        if ($view_id) {
-            unset(self::$cache["View::from_post:$view_id"]);
-
-            return;
-        }
-        self::$cache = [];
-    }
-
-    /**
-     * Construct a \GV\View instance from a post ID.
-     *
-     * @param int|string $post_id The post ID.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\View|null An instance around this \WP_Post or null if not found.
-     */
-    public static function by_id($post_id)
-    {
-        if (!$post_id || !$post = get_post($post_id)) {
-            return null;
-        }
-
-        return self::from_post($post);
-    }
-
-    /**
-     * Determines if a view exists to begin with.
-     *
-     * @param int|\WP_Post|null $view The WordPress post ID, a \WP_Post object or null for global $post;
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return bool Whether the post exists or not.
-     */
-    public static function exists($view)
-    {
-        return get_post_type($view) == 'gravityview';
-    }
-
-    /**
-     * ArrayAccess compatibility layer with GravityView_View_Data::$views.
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return bool Whether the offset exists or not, limited to GravityView_View_Data::$views element keys.
-     */
-    public function offsetExists($offset)
-    {
-        $data_keys = ['id', 'view_id', 'form_id', 'template_id', 'atts', 'fields', 'widgets', 'form'];
-
-        return in_array($offset, $data_keys);
-    }
-
-    /**
-     * ArrayAccess compatibility layer with GravityView_View_Data::$views.
-     *
-     * Maps the old keys to the new data;
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return mixed The value of the requested view data key limited to GravityView_View_Data::$views element keys. If offset not found, return null.
-     */
-    public function offsetGet($offset)
-    {
-        gravityview()->log->notice('This is a \GV\View object should not be accessed as an array.');
-
-        if (!isset($this[$offset])) {
-            return null;
-        }
-
-        switch ($offset) {
-            case 'id':
-            case 'view_id':
-                return $this->ID;
-            case 'form':
-                return $this->form;
-            case 'form_id':
-                return $this->form ? $this->form->ID : null;
-            case 'atts':
-                return $this->settings->as_atts();
-            case 'template_id':
-                return $this->settings->get('template');
-            case 'widgets':
-                return $this->widgets->as_configuration();
-        }
-
-        return null;
-    }
-
-    /**
-     * ArrayAccess compatibility layer with GravityView_View_Data::$views.
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        gravityview()->log->error('The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.');
-    }
-
-    /**
-     * ArrayAccess compatibility layer with GravityView_View_Data::$views.
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        gravityview()->log->error('The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.');
-    }
-
-    /**
-     * Be compatible with the old data object.
-     *
-     * Some external code expects an array (doing things like foreach on this, or array_keys)
-     *  so let's return an array in the old format for such cases. Do not use unless using
-     *  for back-compatibility.
-     *
-     * @internal
-     *
-     * @deprecated
-     * @since 2.0
-     *
-     * @return array
-     */
-    public function as_data()
-    {
-        return [
-            'id'          => $this->ID,
-            'view_id'     => $this->ID,
-            'form_id'     => $this->form ? $this->form->ID : null,
-            'form'        => $this->form ? gravityview_get_form($this->form->ID) : null,
-            'atts'        => $this->settings->as_atts(),
-            'fields'      => $this->fields->by_visible($this)->as_configuration(),
-            'template_id' => $this->settings->get('template'),
-            'widgets'     => $this->widgets->as_configuration(),
-        ];
-    }
-
-    /**
-     * Retrieve the entries for the current view and request.
-     *
-     * @param \GV\Request The request. Unused for now.
-     *
-     * @return \GV\Entry_Collection The entries.
-     */
-    public function get_entries($request = null)
-    {
-        $entries = new \GV\Entry_Collection();
-
-        if (!$this->form) {
-            // Documented below.
-            return apply_filters('gravityview/view/entries', $entries, $this, $request);
-        }
-
-        $parameters = $this->settings->as_atts();
-
-        /**
-         * Remove multiple sorting before calling legacy filters.
-         * This allows us to fake it till we make it.
-         */
-        if (!empty($parameters['sort_field']) && is_array($parameters['sort_field'])) {
-            $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']);
-            }
-        }
-
-        /**
-         * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
-         */
-        $parameters = \GravityView_frontend::get_view_entries_parameters($parameters, $this->form->ID);
-
-        $parameters['context_view_id'] = $this->ID;
-        $parameters = \GVCommon::calculate_get_entries_criteria($parameters, $this->form->ID);
-
-        if (!is_array($parameters)) {
-            $parameters = [];
-        }
-
-        if (!is_array($parameters['search_criteria'])) {
-            $parameters['search_criteria'] = [];
-        }
-
-        if ((!isset($parameters['search_criteria']['field_filters'])) || (!is_array($parameters['search_criteria']['field_filters']))) {
-            $parameters['search_criteria']['field_filters'] = [];
-        }
-
-        if ($request instanceof REST\Request) {
-            $atts = $this->settings->as_atts();
-            $paging_parameters = wp_parse_args($request->get_paging(), [
-                'paging' => ['page_size' => $atts['page_size']],
-            ]);
-            $parameters['paging'] = $paging_parameters['paging'];
-        }
-
-        $page = Utils::get($parameters['paging'], 'current_page') ?: ((($parameters['paging']['offset'] - $this->settings->get('offset')) / \GV\Utils::get($parameters, 'paging/page_size', 25)) + 1);
-
-        /**
-         * Cleanup duplicate field_filter parameters to simplify the query.
-         */
-        $unique_field_filters = [];
-        foreach (Utils::get($parameters, 'search_criteria/field_filters', []) as $key => $filter) {
-            if ('mode' === $key) {
-                $unique_field_filters['mode'] = $filter;
-            } elseif (!in_array($filter, $unique_field_filters)) {
-                $unique_field_filters[] = $filter;
-            }
-        }
-        $parameters['search_criteria']['field_filters'] = $unique_field_filters;
-
-        if (!empty($parameters['search_criteria']['field_filters'])) {
-            gravityview()->log->notice('search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.');
-        }
-
-        if (gravityview()->plugin->supports(Plugin::FEATURE_GFQUERY)) {
-            $query_class = $this->get_query_class();
-
-            /** @var \GF_Query $query */
-            $query = new $query_class($this->form->ID, $parameters['search_criteria'], Utils::get($parameters, 'sorting'));
-
-            /**
-             * Apply multisort.
-             */
-            if (!empty($has_multisort)) {
-                $atts = $this->settings->as_atts();
-
-                $view_setting_sort_field_ids = \GV\Utils::get($atts, 'sort_field', []);
-                $view_setting_sort_directions = \GV\Utils::get($atts, 'sort_direction', []);
-
-                $has_sort_query_param = !empty($_GET['sort']) && is_array($_GET['sort']);
-
-                if ($has_sort_query_param) {
-                    $has_sort_query_param = array_filter(array_values($_GET['sort']));
-                }
-
-                if ($this->settings->get('sort_columns') && $has_sort_query_param) {
-                    $sort_field_ids = array_keys($_GET['sort']);
-                    $sort_directions = array_values($_GET['sort']);
-                } else {
-                    $sort_field_ids = $view_setting_sort_field_ids;
-                    $sort_directions = $view_setting_sort_directions;
-                }
-
-                $skip_first = false;
-
-                foreach ((array) $sort_field_ids as $key => $sort_field_id) {
-                    if (!$skip_first && !$has_sort_query_param) {
-                        $skip_first = true; // Skip the first one, it's already in the query
-                        continue;
-                    }
-
-                    $sort_field_id = \GravityView_frontend::_override_sorting_id_by_field_type($sort_field_id, $this->form->ID);
-                    $sort_direction = strtoupper(\GV\Utils::get($sort_directions, $key, 'ASC'));
-
-                    if (!empty($sort_field_id)) {
-                        $order = new \GF_Query_Column($sort_field_id, $this->form->ID);
-                        if ('id' !== $sort_field_id && \GVCommon::is_field_numeric($this->form->ID, $sort_field_id)) {
-                            $order = \GF_Query_Call::CAST($order, defined('GF_Query::TYPE_DECIMAL') ? \GF_Query::TYPE_DECIMAL : \GF_Query::TYPE_SIGNED);
-                        }
-
-                        $query->order($order, $sort_direction);
-                    }
-                }
-            }
-
-            /**
-             * Merge time subfield sorts.
-             */
-            add_filter('gform_gf_query_sql', $gf_query_timesort_sql_callback = function ($sql) use (&$query) {
-                $q = $query->_introspect();
-                $orders = [];
-
-                $merged_time = false;
-
-                foreach ($q['order'] as $oid => $order) {
-                    $column = null;
-
-                    if ($order[0] instanceof \GF_Query_Column) {
-                        $column = $order[0];
-                    } elseif ($order[0] instanceof \GF_Query_Call) {
-                        if (count($order[0]->columns) != 1 || !$order[0]->columns[0] instanceof \GF_Query_Column) {
-                            $orders[$oid] = $order;
-                            continue; // Need something that resembles a single sort
-                        }
-                        $column = $order[0]->columns[0];
-                    }
-
-                    if (!$column || (!$field = \GFAPI::get_field($column->source, $column->field_id)) || $field->type !== 'time') {
-                        $orders[$oid] = $order;
-                        continue; // Not a time field
-                    }
-
-                    if (!class_exists('\GV\Mocks\GF_Query_Call_TIMESORT')) {
-                        require_once gravityview()->plugin->dir('future/_mocks.timesort.php');
-                    }
-
-                    $orders[$oid] = [
-                        new \GV\Mocks\GF_Query_Call_TIMESORT('timesort', [$column, $sql]),
-                        $order[1], // Mock it!
-                    ];
-
-                    $merged_time = true;
-                }
-
-                if ($merged_time) {
-                    /**
-                     * ORDER again.
-                     */
-                    if (!empty($orders) && $_orders = $query->_order_generate($orders)) {
-                        $sql['order'] = 'ORDER BY '.implode(', ', $_orders);
-                    }
-                }
-
-                return $sql;
-            });
-
-            $query->limit($parameters['paging']['page_size'])
-                ->offset((($page - 1) * $parameters['paging']['page_size']) + $this->settings->get('offset'));
-
-            /**
-             * Any joins?
-             */
-            if (gravityview()->plugin->supports(Plugin::FEATURE_JOINS) && count($this->joins)) {
-                $is_admin_and_can_view = $this->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $this->ID);
-
-                foreach ($this->joins as $join) {
-                    $query = $join->as_query_join($query);
-
-                    if ($this->settings->get('multiple_forms_disable_null_joins')) {
-
-                        // Disable NULL outputs
-                        $condition = new \GF_Query_Condition(
-                            new \GF_Query_Column($join->join_on_column->ID, $join->join_on->ID),
-                            \GF_Query_Condition::NEQ,
-                            new \GF_Query_Literal('')
-                        );
-
-                        $query_parameters = $query->_introspect();
-
-                        $query->where(\GF_Query_Condition::_and($query_parameters['where'], $condition));
-                    }
-
-                    /**
-                     * This is a temporary stub filter, until GF_Query supports NULL conditions.
-                     * Do not use! This filter will be removed.
-                     */
-                    if (defined('GF_Query_Condition::NULL')) {
-                        $is_null_condition_native = true;
-                    } else {
-                        $is_null_condition_class = apply_filters('gravityview/query/is_null_condition', null);
-                        $is_null_condition_native = false;
-                    }
-
-                    // Filter to active entries only
-                    $condition = new \GF_Query_Condition(
-                        new \GF_Query_Column('status', $join->join_on->ID),
-                        \GF_Query_Condition::EQ,
-                        new \GF_Query_Literal('active')
-                    );
-
-                    if ($is_null_condition_native) {
-                        $condition = \GF_Query_Condition::_or($condition, new \GF_Query_Condition(
-                            new \GF_Query_Column('status', $join->join_on->ID),
-                            \GF_Query_Condition::IS,
-                            \GF_Query_Condition::NULL
-                        ));
-                    } elseif (!is_null($is_null_condition_class)) {
-                        $condition = \GF_Query_Condition::_or($condition, new $is_null_condition_class(
-                            new \GF_Query_Column('status', $join->join_on->ID)
-                        ));
-                    }
-
-                    $q = $query->_introspect();
-                    $query->where(\GF_Query_Condition::_and($q['where'], $condition));
-
-                    if ($this->settings->get('show_only_approved') && !$is_admin_and_can_view) {
-
-                        // Show only approved joined entries
-                        $condition = new \GF_Query_Condition(
-                            new \GF_Query_Column(\GravityView_Entry_Approval::meta_key, $join->join_on->ID),
-                            \GF_Query_Condition::EQ,
-                            new \GF_Query_Literal(\GravityView_Entry_Approval_Status::APPROVED)
-                        );
-
-                        if ($is_null_condition_native) {
-                            $condition = \GF_Query_Condition::_or($condition, new \GF_Query_Condition(
-                                new \GF_Query_Column(\GravityView_Entry_Approval::meta_key, $join->join_on->ID),
-                                \GF_Query_Condition::IS,
-                                \GF_Query_Condition::NULL
-                            ));
-                        } elseif (!is_null($is_null_condition_class)) {
-                            $condition = \GF_Query_Condition::_or($condition, new $is_null_condition_class(
-                                new \GF_Query_Column(\GravityView_Entry_Approval::meta_key, $join->join_on->ID)
-                            ));
-                        }
-
-                        $query_parameters = $query->_introspect();
-
-                        $query->where(\GF_Query_Condition::_and($query_parameters['where'], $condition));
-                    }
-                }
-
-                /**
-                 * Unions?
-                 */
-            } elseif (gravityview()->plugin->supports(Plugin::FEATURE_UNIONS) && count($this->unions)) {
-                $query_parameters = $query->_introspect();
-
-                $unions_sql = [];
-
-                /**
-                 * @param \GF_Query_Condition $condition
-                 * @param array               $fields
-                 * @param $recurse
-                 *
-                 * @return \GF_Query_Condition
-                 */
-                $where_union_substitute = function ($condition, $fields, $recurse) {
-                    if ($condition->expressions) {
-                        $conditions = [];
-
-                        foreach ($condition->expressions as $_condition) {
-                            $conditions[] = $recurse($_condition, $fields, $recurse);
-                        }
-
-                        return call_user_func_array(
-                            ['\GF_Query_Condition', $condition->operator == 'AND' ? '_and' : '_or'],
-                            $conditions
-                        );
-                    }
-
-                    if (!($condition->left && $condition->left instanceof \GF_Query_Column) || (!$condition->left->is_entry_column() && !$condition->left->is_meta_column())) {
-                        return new \GF_Query_Condition(
-                            new \GF_Query_Column($fields[$condition->left->field_id]->ID),
-                            $condition->operator,
-                            $condition->right
-                        );
-                    }
-
-                    return $condition;
-                };
-
-                foreach ($this->unions as $form_id => $fields) {
-
-                    // Build a new query for every unioned form
-                    $query_class = $this->get_query_class();
-
-                    /** @var \GF_Query|\GF_Patched_Query $q */
-                    $q = new $query_class($form_id);
-
-                    // Copy the WHERE clauses but substitute the field_ids to the respective ones
-                    $q->where($where_union_substitute($query_parameters['where'], $fields, $where_union_substitute));
-
-                    // Copy the ORDER clause and substitute the field_ids to the respective ones
-                    foreach ($query_parameters['order'] as $order) {
-                        list($column, $_order) = $order;
-
-                        if ($column && $column instanceof \GF_Query_Column) {
-                            if (!$column->is_entry_column() && !$column->is_meta_column()) {
-                                $column = new \GF_Query_Column($fields[$column->field_id]->ID);
-                            }
-
-                            $q->order($column, $_order);
-                        }
-                    }
-
-                    add_filter('gform_gf_query_sql', $gf_query_sql_callback = function ($sql) use (&$unions_sql) {
-                        // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-                        $select = 'UNION ALL '.str_replace('SQL_CALC_FOUND_ROWS ', '', $sql['select']);
-
-                        // Record the SQL
-                        $unions_sql[] = [
-                            // Remove columns, we'll rebuild them
-                            'select'  => preg_replace('#DISTINCT (.*)#', 'DISTINCT ', $select),
-                            'from'    => $sql['from'],
-                            'join'    => $sql['join'],
-                            'where'   => $sql['where'],
-                            // Remove order and limit
-                        ];
-
-                        // Return empty query, no need to call the database
-                        return [];
-                    });
-
-                    do_action_ref_array('gravityview/view/query', [&$q, $this, $request]);
-
-                    $q->get(); // Launch
-
-                    remove_filter('gform_gf_query_sql', $gf_query_sql_callback);
-                }
-
-                add_filter('gform_gf_query_sql', $gf_query_sql_callback = function ($sql) use ($unions_sql) {
-                    // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-                    $sql['select'] = str_replace('SQL_CALC_FOUND_ROWS ', '', $sql['select']);
-
-                    // Remove columns, we'll rebuild them
-                    preg_match('#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match);
-                    $sql['select'] = preg_replace('#DISTINCT (.*)#', 'DISTINCT ', $sql['select']);
-
-                    $unions = [];
-
-                    // Transform selected columns to shared alias names
-                    $column_to_alias = function ($column) {
-                        $column = str_replace('`', '', $column);
-
-                        return '`'.str_replace('.', '_', $column).'`';
-                    };
-
-                    // Add all the order columns into the selects, so we can order by the whole union group
-                    preg_match_all('#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches);
-
-                    $columns = [
-                        sprintf('%s AS %s', $select_match[1], $column_to_alias($select_match[1])),
-                    ];
-
-                    foreach (array_slice($order_matches, 1) as $match) {
-                        $columns[] = sprintf('%s AS %s', $match[0], $column_to_alias($match[0]));
-
-                        // Rewrite the order columns to the shared aliases
-                        $sql['order'] = str_replace($match[0], $column_to_alias($match[0]), $sql['order']);
-                    }
-
-                    $columns = array_unique($columns);
-
-                    // Add the columns to every UNION
-                    foreach ($unions_sql as $union_sql) {
-                        $union_sql['select'] .= implode(', ', $columns);
-                        $unions[] = implode(' ', $union_sql);
-                    }
-
-                    // Add the columns to the main SELECT, but only grab the entry id column
-                    $sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM ('.$sql['select'].implode(', ', $columns);
-                    $sql['order'] = implode(' ', $unions).') AS u '.$sql['order'];
-
-                    return $sql;
-                });
-            }
-
-            /**
-             * @action `gravityview/view/query` Override the \GF_Query before the get() call.
-             *
-             * @param \GF_Query   $query   The current query object reference
-             * @param \GV\View    $this    The current view object
-             * @param \GV\Request $request The request object
-             */
-            do_action_ref_array('gravityview/view/query', [&$query, $this, $request]);
-
-            gravityview()->log->debug('GF_Query parameters: ', ['data' => Utils::gf_query_debug($query)]);
-
-            /**
-             * Map from Gravity Forms entries arrays to an Entry_Collection.
-             */
-            if (count($this->joins)) {
-                foreach ($query->get() as $entry) {
-                    $entries->add(
-                        Multi_Entry::from_entries(array_map('\GV\GF_Entry::from_entry', $entry))
-                    );
-                }
-            } else {
-                array_map([$entries, 'add'], array_map('\GV\GF_Entry::from_entry', $query->get()));
-            }
-
-            if (isset($gf_query_sql_callback)) {
-                remove_action('gform_gf_query_sql', $gf_query_sql_callback);
-            }
-
-            if (isset($gf_query_timesort_sql_callback)) {
-                remove_action('gform_gf_query_sql', $gf_query_timesort_sql_callback);
-            }
-
-            /**
-             * Add total count callback.
-             */
-            $entries->add_count_callback(function () use ($query) {
-                return $query->total_found;
-            });
-        } else {
-            $entries = $this->form->entries
-                ->filter(\GV\GF_Entry_Filter::from_search_criteria($parameters['search_criteria']))
-                ->offset($this->settings->get('offset'))
-                ->limit($parameters['paging']['page_size'])
-                ->page($page);
-
-            if (!empty($parameters['sorting']) && is_array($parameters['sorting'] && !isset($parameters['sorting']['key']))) {
-                // Pluck off multisort arrays
-                $parameters['sorting'] = $parameters['sorting'][0];
-            }
-
-            if (!empty($parameters['sorting']) && !empty($parameters['sorting']['key'])) {
-                $field = new \GV\Field();
-                $field->ID = $parameters['sorting']['key'];
-                $direction = strtolower($parameters['sorting']['direction']) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
-                $entries = $entries->sort(new \GV\Entry_Sort($field, $direction));
-            }
-        }
-
-        /**
-         * @filter `gravityview/view/entries` Modify the entry fetching filters, sorts, offsets, limits.
-         *
-         * @param \GV\Entry_Collection $entries The entries for this view.
-         * @param \GV\View             $view    The view.
-         * @param \GV\Request          $request The request.
-         */
-        return apply_filters('gravityview/view/entries', $entries, $this, $request);
-    }
-
-    /**
-     * Last chance to configure the output.
-     *
-     * Used for CSV output, for example.
-     *
-     * @return void
-     */
-    public static function template_redirect()
-    {
-        $is_csv = get_query_var('csv');
-        $is_tsv = get_query_var('tsv');
-
-        /**
-         * CSV output.
-         */
-        if (!$is_csv && !$is_tsv) {
-            return;
-        }
-
-        $view = gravityview()->request->is_view();
-
-        if (!$view) {
-            return;
-        }
-
-        $error_csv = $view->can_render(['csv']);
-
-        if (is_wp_error($error_csv)) {
-            gravityview()->log->error('Not rendering CSV or TSV: '.$error_csv->get_error_message());
-
-            return;
-        }
-
-        $file_type = $is_csv ? 'csv' : 'tsv';
-
-        /**
-         * @filter `gravityview/output/{csv|tsv}/filename` Modify the name of the generated CSV or TSV file. Name will be sanitized using sanitize_file_name() before output.
-         *
-         * @see sanitize_file_name()
-         * @since 2.1
-         *
-         * @param string   $filename File name used when downloading a CSV or TSV. Default is "{View title}.csv" or "{View title}.tsv"
-         * @param \GV\View $view     Current View being rendered
-         */
-        $filename = apply_filters('gravityview/output/'.$file_type.'/filename', get_the_title($view->post), $view);
-
-        if (!defined('DOING_GRAVITYVIEW_TESTS')) {
-            header(sprintf('Content-Disposition: attachment;filename="%s.'.$file_type.'"', sanitize_file_name($filename)));
-            header('Content-Transfer-Encoding: binary');
-            header('Content-Type: text/'.$file_type);
-        }
-
-        ob_start();
-        $csv_or_tsv = fopen('php://output', 'w');
-
-        /**
-         * Add da' BOM if GF uses it.
-         *
-         * @see GFExport::start_export()
-         */
-        if (apply_filters('gform_include_bom_export_entries', true, $view->form ? $view->form->form : null)) {
-            fputs($csv_or_tsv, "\xef\xbb\xbf");
-        }
-
-        if ($view->settings->get('csv_nolimit')) {
-            $view->settings->update(['page_size' => -1]);
-        }
-
-        $entries = $view->get_entries();
-
-        $headers_done = false;
-        $allowed = $headers = [];
-
-        foreach ($view->fields->by_position('directory_*')->by_visible($view)->all() as $id => $field) {
-            $allowed[] = $field;
-        }
-
-        $renderer = new Field_Renderer();
-
-        foreach ($entries->all() as $entry) {
-            $return = [];
-
-            /**
-             * @filter `gravityview/csv/entry/fields` Allowlist more entry fields by ID that are output in CSV requests.
-             *
-             * @param array     $allowed The allowed ones, default by_visible, by_position( "context_*" ), i.e. as set in the View.
-             * @param \GV\View  $view    The view.
-             * @param \GV\Entry $entry   WordPress representation of the item.
-             */
-            $allowed_field_ids = apply_filters('gravityview/csv/entry/fields', wp_list_pluck($allowed, 'ID'), $view, $entry);
-
-            $allowed = array_filter($allowed, function ($field) use ($allowed_field_ids) {
-                return in_array($field->ID, $allowed_field_ids, true);
-            });
-
-            foreach (array_diff($allowed_field_ids, wp_list_pluck($allowed, 'ID')) as $field_id) {
-                $allowed[] = is_numeric($field_id) ? \GV\GF_Field::by_id($view->form, $field_id) : \GV\Internal_Field::by_id($field_id);
-            }
-
-            foreach ($allowed as $field) {
-                $source = is_numeric($field->ID) ? $view->form : new \GV\Internal_Source();
-
-                $return[] = $renderer->render($field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template');
-
-                if (!$headers_done) {
-                    $label = $field->get_label($view, $source, $entry);
-                    $headers[] = $label ? $label : $field->ID;
-                }
-            }
-
-            // If not "tsv" then use comma
-            $delimiter = ('tsv' === $file_type) ? "\t" : ',';
-
-            if (!$headers_done) {
-                $headers_done = fputcsv($csv_or_tsv, array_map(['\GV\Utils', 'strip_excel_formulas'], array_values($headers)), $delimiter);
-            }
-
-            fputcsv($csv_or_tsv, array_map(['\GV\Utils', 'strip_excel_formulas'], $return), $delimiter);
-        }
-
-        fflush($csv_or_tsv);
-
-        echo rtrim(ob_get_clean());
-
-        if (!defined('DOING_GRAVITYVIEW_TESTS')) {
-            exit;
-        }
-    }
-
-    /**
-     * Return the query class for this View.
-     *
-     * @return string The class name.
-     */
-    public function get_query_class()
-    {
-        /**
-         * @filter `gravityview/query/class`
-         *
-         * @param string The query class. Default: GF_Query.
-         * @param \GV\View $this The View.
-         */
-        $query_class = apply_filters('gravityview/query/class', '\GF_Query', $this);
-
-        return $query_class;
-    }
-
-    /**
-     * Restrict View access to specific capabilities.
-     *
-     * Hooked into `map_meta_cap` WordPress filter.
-     *
-     * @since develop
-     *
-     * @param $caps    array  The output capabilities.
-     * @param $cap     string The cap that is being checked.
-     * @param $user_id int    The User ID.
-     * @param $args    array  Additional arguments to the capability.
-     *
-     * @return array The resulting capabilities.
-     */
-    public static function restrict($caps, $cap, $user_id, $args)
-    {
-        /**
-         * @filter `gravityview/security/require_unfiltered_html` Bypass restrictions on Views that require `unfiltered_html`.
-         *
-         * @param bool
-         *
-         * @since develop
-         *
-         * @param string $cap     The capability requested.
-         * @param int    $user_id The user ID.
-         * @param array  $args    Any additional args to map_meta_cap
-         */
-        if (!apply_filters('gravityview/security/require_unfiltered_html', true, $cap, $user_id)) {
-            return $caps;
-        }
-
-        switch ($cap) {
-            case 'edit_gravityview':
-            case 'edit_gravityviews':
-            case 'edit_others_gravityviews':
-            case 'edit_private_gravityviews':
-            case 'edit_published_gravityviews':
-                if (!user_can($user_id, 'unfiltered_html')) {
-                    if (!user_can($user_id, 'gravityview_full_access')) {
-                        return ['do_not_allow'];
-                    }
-                }
-
-                return $caps;
-            case 'edit_post':
-                if ('gravityview' === get_post_type(array_pop($args))) {
-                    return self::restrict($caps, 'edit_gravityview', $user_id, $args);
-                }
-        }
-
-        return $caps;
-    }
-
-    public function __get($key)
-    {
-        if ($this->post) {
-            $raw_post = $this->post->filter('raw');
-
-            return $raw_post->{$key};
-        }
-
-        return isset($this->{$key}) ? $this->{$key} : null;
-    }
-
-    /**
-     * Return associated WP post.
-     *
-     * @since 2.13.2
-     *
-     * @return \WP_Post|null
-     */
-    public function get_post()
-    {
-        return $this->post ? $this->post : null;
-    }
+	/**
+	 * @var \WP_Post The backing post instance.
+	 */
+	private $post;
+
+	/**
+	 * @var \GV\View_Settings The settings.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $settings;
+
+	/**
+	 * @var \GV\Widget_Collection The widets attached here.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $widgets;
+
+	/**
+	 * @var \GV\GF_Form|\GV\Form The backing form for this view.
+	 *
+	 * Contains the form that is sourced for entries in this view.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $form;
+
+	/**
+	 * @var \GV\Field_Collection The fields for this view.
+	 *
+	 * Contains all the fields that are attached to this view.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public $fields;
+
+	/**
+	 * @var array
+	 *
+	 * Internal static cache for gets, and whatnot.
+	 * This is not persistent, resets across requests.
+	 *
+	 * @internal
+	 */
+	private static $cache = [];
+
+	/**
+	 * @var \GV\Join[] The joins for all sources in this view.
+	 *
+	 * @api
+	 *
+	 * @since 2.0.1
+	 */
+	public $joins = [];
+
+	/**
+	 * @var \GV\Field[][] The unions for all sources in this view.
+	 *                    An array of fields grouped by form_id keyed by
+	 *                    main field_id:
+	 *
+	 *                    array(
+	 *                        $form_id => array(
+	 *                            $field_id => $field,
+	 *                            $field_id => $field,
+	 *                        )
+	 *                    )
+	 *
+	 * @api
+	 *
+	 * @since 2.2.2
+	 */
+	public $unions = [];
+
+	/**
+	 * The constructor.
+	 */
+	public function __construct()
+	{
+		$this->settings = new View_Settings();
+		$this->fields = new Field_Collection();
+		$this->widgets = new Widget_Collection();
+	}
+
+	/**
+	 * Register the gravityview WordPress Custom Post Type.
+	 *
+	 * @internal
+	 *
+	 * @return void
+	 */
+	public static function register_post_type()
+	{
+
+		/** Register only once */
+		if (post_type_exists('gravityview')) {
+			return;
+		}
+
+		/**
+		 * @filter `gravityview_is_hierarchical` Make GravityView Views hierarchical by returning TRUE
+		 * This will allow for Views to be nested with Parents and also allows for menu order to be set in the Page Attributes metabox
+		 *
+		 * @since 1.13
+		 *
+		 * @param bool $is_hierarchical Default: false
+		 */
+		$is_hierarchical = (bool) apply_filters('gravityview_is_hierarchical', false);
+
+		$supports = ['title', 'revisions'];
+
+		if ($is_hierarchical) {
+			$supports[] = 'page-attributes';
+		}
+
+		/**
+		 * @filter  `gravityview_post_type_supports` Modify post type support values for `gravityview` post type
+		 *
+		 * @see add_post_type_support()
+		 * @since 1.15.2
+		 *
+		 * @param array $supports        Array of features associated with a functional area of the edit screen. Default: 'title', 'revisions'. If $is_hierarchical, also 'page-attributes'
+		 * @param bool  $is_hierarchical Do Views support parent/child relationships? See `gravityview_is_hierarchical` filter.
+		 */
+		$supports = apply_filters('gravityview_post_type_support', $supports, $is_hierarchical);
+
+		/** Register Custom Post Type - gravityview */
+		$labels = [
+			'name'                   => _x('Views', 'Post Type General Name', 'gravityview'),
+			'singular_name'          => _x('View', 'Post Type Singular Name', 'gravityview'),
+			'menu_name'              => _x('Views', 'Menu name', 'gravityview'),
+			'parent_item_colon'      => __('Parent View:', 'gravityview'),
+			'all_items'              => __('All Views', 'gravityview'),
+			'view_item'              => _x('View', 'View Item', 'gravityview'),
+			'add_new_item'           => __('Add New View', 'gravityview'),
+			'add_new'                => __('New View', 'gravityview'),
+			'edit_item'              => __('Edit View', 'gravityview'),
+			'update_item'            => __('Update View', 'gravityview'),
+			'search_items'           => __('Search Views', 'gravityview'),
+			'not_found'              => \GravityView_Admin::no_views_text(),
+			'not_found_in_trash'     => __('No Views found in Trash', 'gravityview'),
+			'filter_items_list'      => __('Filter Views list', 'gravityview'),
+			'items_list_navigation'  => __('Views list navigation', 'gravityview'),
+			'items_list'             => __('Views list', 'gravityview'),
+			'view_items'             => __('See Views', 'gravityview'),
+			'attributes'             => __('View Attributes', 'gravityview'),
+			'item_updated'           => __('View updated.', 'gravityview'),
+			'item_published'         => __('View published.', 'gravityview'),
+			'item_reverted_to_draft' => __('View reverted to draft.', 'gravityview'),
+			'item_scheduled'         => __('View scheduled.', 'gravityview'),
+		];
+
+		$args = [
+			'label'               => __('view', 'gravityview'),
+			'description'         => __('Create views based on a Gravity Forms form', 'gravityview'),
+			'labels'              => $labels,
+			'supports'            => $supports,
+			'hierarchical'        => $is_hierarchical,
+			/**
+			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
+			 *
+			 * @see https://codex.wordpress.org/Function_Reference/register_post_type#public
+			 * @since 1.15.2
+			 *
+			 * @param bool `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded via shortcode. Default: `true`
+			 * @param int $view_id The ID of the View currently being requested. `0` for general setting
+			 */
+			'public'              => apply_filters('gravityview_direct_access', gravityview()->plugin->is_compatible(), 0),
+			'show_ui'             => gravityview()->plugin->is_compatible(),
+			'show_in_menu'        => gravityview()->plugin->is_compatible(),
+			'show_in_nav_menus'   => true,
+			'show_in_admin_bar'   => true,
+			'menu_position'       => 17,
+			'menu_icon'           => '',
+			'can_export'          => true,
+			/**
+			 * @filter `gravityview_has_archive` Enable Custom Post Type archive?
+			 *
+			 * @since 1.7.3
+			 *
+			 * @param bool False: don't have frontend archive; True: yes, have archive. Default: false
+			 */
+			'has_archive'         => apply_filters('gravityview_has_archive', false),
+			'exclude_from_search' => true,
+			'rewrite'             => [
+				/**
+				 * @filter `gravityview_slug` Modify the url part for a View.
+				 *
+				 * @see https://docs.gravityview.co/article/62-changing-the-view-slug
+				 *
+				 * @param string $slug The slug shown in the URL
+				 */
+				'slug' => apply_filters('gravityview_slug', 'view'),
+
+				/**
+				 * @filter `gravityview/post_type/with_front` Should the permalink structure
+				 *  be prepended with the front base.
+				 *  (example: if your permalink structure is /blog/, then your links will be: false->/view/, true->/blog/view/).
+				 *  Defaults to true.
+				 *
+				 * @see https://codex.wordpress.org/Function_Reference/register_post_type
+				 * @since 2.0
+				 *
+				 * @param bool $with_front
+				 */
+				'with_front' => apply_filters('gravityview/post_type/with_front', true),
+			],
+			'capability_type'     => 'gravityview',
+			'map_meta_cap'        => true,
+		];
+
+		register_post_type('gravityview', $args);
+	}
+
+	/**
+	 * Add extra rewrite endpoints.
+	 *
+	 * @return void
+	 */
+	public static function add_rewrite_endpoint()
+	{
+		/**
+		 * CSV.
+		 */
+		global $wp_rewrite;
+
+		$slug = apply_filters('gravityview_slug', 'view');
+		$slug = ('/' !== $wp_rewrite->front) ? sprintf('%s/%s', trim($wp_rewrite->front, '/'), $slug) : $slug;
+		$csv_rule = [sprintf('%s/([^/]+)/csv/?', $slug), 'index.php?gravityview=$matches[1]&csv=1', 'top'];
+		$tsv_rule = [sprintf('%s/([^/]+)/tsv/?', $slug), 'index.php?gravityview=$matches[1]&tsv=1', 'top'];
+
+		add_filter('query_vars', function ($query_vars) {
+			$query_vars[] = 'csv';
+			$query_vars[] = 'tsv';
+
+			return $query_vars;
+		});
+
+		if (!isset($wp_rewrite->extra_rules_top[$csv_rule[0]])) {
+			call_user_func_array('add_rewrite_rule', $csv_rule);
+			call_user_func_array('add_rewrite_rule', $tsv_rule);
+		}
+	}
+
+	/**
+	 * A renderer filter for the View post type content.
+	 *
+	 * @param string $content Should be empty, as we don't store anything there.
+	 *
+	 * @return string $content The view content as output by the renderers.
+	 */
+	public static function content($content)
+	{
+		$request = gravityview()->request;
+
+		// Plugins may run through the content in the header. WP SEO does this for its OpenGraph functionality.
+		if (!defined('DOING_GRAVITYVIEW_TESTS')) {
+			if (!did_action('loop_start')) {
+				gravityview()->log->debug('Not processing yet: loop_start hasn\'t run yet. Current action: {action}', ['action' => current_filter()]);
+
+				return $content;
+			}
+
+			//	We don't want this filter to run infinite loop on any post content fields
+			remove_filter('the_content', [__CLASS__, __METHOD__]);
+		}
+
+		/**
+		 * This is not a View. Bail.
+		 *
+		 * Shortcodes and oEmbeds and whatnot will be handled
+		 *  elsewhere.
+		 */
+		if (!$view = $request->is_view()) {
+			return $content;
+		}
+
+		/**
+		 * Check permissions.
+		 */
+		while ($error = $view->can_render(null, $request)) {
+			if (!is_wp_error($error)) {
+				break;
+			}
+
+			switch (str_replace('gravityview/', '', $error->get_error_code())) {
+				case 'post_password_required':
+					return get_the_password_form($view->ID);
+				case 'no_form_attached':
+
+					gravityview()->log->error('View #{view_id} cannot render: {error_code} {error_message}', ['error_code' => $error->get_error_code(), 'error_message' => $error->get_error_message()]);
+
+					/**
+					 * This View has no data source. There's nothing to show really.
+					 * ...apart from a nice message if the user can do anything about it.
+					 */
+					if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
+						$title = sprintf(__('This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false)));
+
+						$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;" />', esc_attr__('Data Source', 'gravityview'), esc_url(plugins_url('assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE)));
+
+						return \GVCommon::generate_notice('<h3>'.$title.'</h3>'.wpautop($message.$image), 'notice');
+					}
+					break;
+				case 'in_trash':
+
+					if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
+						$notice = sprintf(__('This View is in the Trash. You can <a href="%s">restore the View here</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false)));
+
+						return \GVCommon::generate_notice('<h3>'.$notice.'</h3>', 'notice', ['edit_gravityviews', 'edit_gravityview'], $view->ID);
+					}
+
+					return ''; // Do not show
+					break;
+				case 'no_direct_access':
+				case 'embed_only':
+				case 'not_public':
+				default:
+					gravityview()->log->notice('View #{view_id} cannot render: {error_code} {error_message}', ['error_code' => $error->get_error_code(), 'error_message' => $error->get_error_message()]);
+
+					return __('You are not allowed to view this content.', 'gravityview');
+			}
+
+			return $content;
+		}
+
+		$is_admin_and_can_view = $view->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID);
+
+		/**
+		 * Editing a single entry.
+		 */
+		if ($entry = $request->is_edit_entry($view->form ? $view->form->ID : 0)) {
+			if ($entry['status'] != 'active') {
+				gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $entry->ID]);
+
+				return __('You are not allowed to view this content.', 'gravityview');
+			}
+
+			if (apply_filters('gravityview_custom_entry_slug', false) && $entry->slug != get_query_var(\GV\Entry::get_endpoint_name())) {
+				gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $entry->ID]);
+
+				return __('You are not allowed to view this content.', 'gravityview');
+			}
+
+			if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
+				if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($entry->ID, \GravityView_Entry_Approval::meta_key))) {
+					gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $entry->ID]);
+
+					return __('You are not allowed to view this content.', 'gravityview');
+				}
+			}
+
+			$renderer = new Edit_Entry_Renderer();
+
+			return $renderer->render($entry, $view, $request);
+
+		/**
+		 * Viewing a single entry.
+		 */
+		} elseif ($entry = $request->is_entry($view->form ? $view->form->ID : 0)) {
+			$entryset = $entry->is_multi() ? $entry->entries : [$entry];
+
+			$custom_slug = apply_filters('gravityview_custom_entry_slug', false);
+			$ids = explode(',', get_query_var(\GV\Entry::get_endpoint_name()));
+
+			$show_only_approved = $view->settings->get('show_only_approved');
+
+			foreach ($entryset as $e) {
+				if ('active' !== $e['status']) {
+					gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $e->ID]);
+
+					return __('You are not allowed to view this content.', 'gravityview');
+				}
+
+				if ($custom_slug && !in_array($e->slug, $ids)) {
+					gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $e->ID]);
+
+					return __('You are not allowed to view this content.', 'gravityview');
+				}
+
+				if ($show_only_approved && !$is_admin_and_can_view) {
+					if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($e->ID, \GravityView_Entry_Approval::meta_key))) {
+						gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $e->ID]);
+
+						return __('You are not allowed to view this content.', 'gravityview');
+					}
+				}
+
+				$error = \GVCommon::check_entry_display($e->as_entry(), $view);
+
+				if (is_wp_error($error)) {
+					gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing: {message}', ['entry_id' => $e->ID, 'message' => $error->get_error_message()]);
+
+					return __('You are not allowed to view this content.', 'gravityview');
+				}
+			}
+
+			$renderer = new Entry_Renderer();
+
+			return $renderer->render($entry, $view, $request);
+		}
+
+		/**
+		 * Plain old View.
+		 */
+		$renderer = new View_Renderer();
+
+		return $renderer->render($view, $request);
+	}
+
+	/**
+	 * Checks whether this view can be accessed or not.
+	 *
+	 * @param string[]    $context The context we're asking for access from.
+	 *                             Can any and as many of one of:
+	 *                             edit      An edit context.
+	 *                             single    A single context.
+	 *                             cpt       The custom post type single page accessed.
+	 *                             shortcode Embedded as a shortcode.
+	 *                             oembed    Embedded as an oEmbed.
+	 *                             rest      A REST call.
+	 * @param \GV\Request $request The request
+	 *
+	 * @return bool|\WP_Error An error if this View shouldn't be rendered here.
+	 */
+	public function can_render($context = null, $request = null)
+	{
+		if (!$request) {
+			$request = gravityview()->request;
+		}
+
+		if (!is_array($context)) {
+			$context = [];
+		}
+
+		/**
+		 * @filter `gravityview/view/can_render` Whether the view can be rendered or not.
+		 *
+		 * @param bool|\WP_Error $result  The result. Default: null.
+		 * @param \GV\View       $view    The view.
+		 * @param string[]       $context See \GV\View::can_render
+		 * @param \GV\Request    $request The request.
+		 */
+		if (!is_null($result = apply_filters('gravityview/view/can_render', null, $this, $context, $request))) {
+			return $result;
+		}
+
+		if (in_array('rest', $context)) {
+			// REST
+			if (gravityview()->plugin->settings->get('rest_api') === '1' && $this->settings->get('rest_disable') === '1') {
+				return new \WP_Error('gravityview/rest_disabled');
+			} elseif (gravityview()->plugin->settings->get('rest_api') !== '1' && $this->settings->get('rest_enable') !== '1') {
+				return new \WP_Error('gravityview/rest_disabled');
+			}
+		}
+
+		if (in_array('csv', $context)) {
+			if ($this->settings->get('csv_enable') !== '1') {
+				return new \WP_Error('gravityview/csv_disabled', 'The CSV endpoint is not enabled for this View');
+			}
+		}
+
+		/**
+		 * This View is password protected. Nothing to do here.
+		 */
+		if (post_password_required($this->ID)) {
+			gravityview()->log->notice('Post password is required for View #{view_id}', ['view_id' => $this->ID]);
+
+			return new \WP_Error('gravityview/post_password_required');
+		}
+
+		if (!$this->form) {
+			gravityview()->log->notice('View #{id} has no form attached to it.', ['id' => $this->ID]);
+
+			return new \WP_Error('gravityview/no_form_attached');
+		}
+
+		if (!in_array('shortcode', $context)) {
+			/**
+			 * Is this View directly accessible via a post URL?
+			 *
+			 * @see https://codex.wordpress.org/Function_Reference/register_post_type#public
+			 */
+
+			/**
+			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
+			 *
+			 * @deprecated
+			 *
+			 * @param bool `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded. Default: `true`
+			 * @param int $view_id The ID of the View currently being requested. `0` for general setting
+			 */
+			$direct_access = apply_filters('gravityview_direct_access', true, $this->ID);
+
+			/**
+			 * @filter `gravityview/request/output/direct` Should this View be directly accessbile?
+			 *
+			 * @since 2.0
+			 *
+			 * @param bool Accessible or not. Default: accessbile.
+			 * @param \GV\View    $view    The View we're trying to directly render here.
+			 * @param \GV\Request $request The current request.
+			 */
+			if (!apply_filters('gravityview/view/output/direct', $direct_access, $this, $request)) {
+				return new \WP_Error('gravityview/no_direct_access');
+			}
+
+			/**
+			 * Is this View an embed-only View? If so, don't allow rendering here,
+			 *  as this is a direct request.
+			 */
+			if ($this->settings->get('embed_only') && !\GVCommon::has_cap('read_private_gravityviews')) {
+				return new \WP_Error('gravityview/embed_only');
+			}
+		}
+
+		/** Private, pending, draft, etc. */
+		$public_states = get_post_stati(['public' => true]);
+		if (!in_array($this->post_status, $public_states) && !\GVCommon::has_cap('read_gravityview', $this->ID)) {
+			gravityview()->log->notice('The current user cannot access this View #{view_id}', ['view_id' => $this->ID]);
+
+			return new \WP_Error('gravityview/not_public');
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get joins associated with a view.
+	 *
+	 * @param \WP_Post $post GravityView CPT to get joins for
+	 *
+	 * @api
+	 *
+	 * @since 2.0.11
+	 *
+	 * @return \GV\Join[] Array of \GV\Join instances
+	 */
+	public static function get_joins($post)
+	{
+		$joins = [];
+
+		if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
+			gravityview()->log->info('Cannot get joined forms; joins feature not supported.');
+
+			return $joins;
+		}
+
+		if (!$post || 'gravityview' !== get_post_type($post)) {
+			gravityview()->log->error('Only "gravityview" post types can be \GV\View instances.');
+
+			return $joins;
+		}
+
+		$joins_meta = get_post_meta($post->ID, '_gravityview_form_joins', true);
+
+		if (empty($joins_meta)) {
+			return $joins;
+		}
+
+		foreach ($joins_meta as $meta) {
+			if (!is_array($meta) || count($meta) != 4) {
+				continue;
+			}
+
+			list($join, $join_column, $join_on, $join_on_column) = $meta;
+
+			$join = GF_Form::by_id($join);
+			$join_on = GF_Form::by_id($join_on);
+
+			$join_column = is_numeric($join_column) ? GF_Field::by_id($join, $join_column) : Internal_Field::by_id($join_column);
+			$join_on_column = is_numeric($join_on_column) ? GF_Field::by_id($join_on, $join_on_column) : Internal_Field::by_id($join_on_column);
+
+			$joins[] = new Join($join, $join_column, $join_on, $join_on_column);
+		}
+
+		return $joins;
+	}
+
+	/**
+	 * Get joined forms associated with a view
+	 * In no particular order.
+	 *
+	 * @since 2.0.11
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @param int $post_id ID of the View
+	 *
+	 * @return \GV\GF_Form[] Array of \GV\GF_Form instances
+	 */
+	public static function get_joined_forms($post_id)
+	{
+		$forms = [];
+
+		if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
+			gravityview()->log->info('Cannot get joined forms; joins feature not supported.');
+
+			return $forms;
+		}
+
+		if (!$post_id || !gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
+			return $forms;
+		}
+
+		if (empty($post_id)) {
+			gravityview()->log->error('Cannot get joined forms; $post_id was empty');
+
+			return $forms;
+		}
+
+		$joins_meta = get_post_meta($post_id, '_gravityview_form_joins', true);
+
+		if (empty($joins_meta)) {
+			return $forms;
+		}
+
+		foreach ($joins_meta  as $meta) {
+			if (!is_array($meta) || count($meta) != 4) {
+				continue;
+			}
+
+			list($join, $join_column, $join_on, $join_on_column) = $meta;
+
+			if ($form = GF_Form::by_id($join_on)) {
+				$forms[$join_on] = $form;
+			}
+
+			if ($form = GF_Form::by_id($join)) {
+				$forms[$join] = $form;
+			}
+		}
+
+		return $forms;
+	}
+
+	/**
+	 * Get unions associated with a view.
+	 *
+	 * @param \WP_Post $post GravityView CPT to get unions for
+	 *
+	 * @api
+	 *
+	 * @since 2.2.2
+	 *
+	 * @return \GV\Field[][] Array of unions (see self::$unions)
+	 */
+	public static function get_unions($post)
+	{
+		$unions = [];
+
+		if (!$post || 'gravityview' !== get_post_type($post)) {
+			gravityview()->log->error('Only "gravityview" post types can be \GV\View instances.');
+
+			return $unions;
+		}
+
+		$fields = get_post_meta($post->ID, '_gravityview_directory_fields', true);
+
+		if (empty($fields)) {
+			return $unions;
+		}
+
+		foreach ($fields as $location => $_fields) {
+			if (strpos($location, 'directory_') !== 0) {
+				continue;
+			}
+
+			foreach ($_fields as $field) {
+				if (!empty($field['unions'])) {
+					foreach ($field['unions'] as $form_id => $field_id) {
+						if (!isset($unions[$form_id])) {
+							$unions[$form_id] = [];
+						}
+
+						$unions[$form_id][$field['id']] =
+							is_numeric($field_id) ? \GV\GF_Field::by_id(\GV\GF_Form::by_id($form_id), $field_id) : \GV\Internal_Field::by_id($field_id);
+					}
+				}
+			}
+
+			break;
+		}
+
+		if ($unions) {
+			if (!gravityview()->plugin->supports(Plugin::FEATURE_UNIONS)) {
+				gravityview()->log->error('Cannot get unions; unions feature not supported.');
+			}
+		}
+
+		// @todo We'll probably need to backfill null unions
+
+		return $unions;
+	}
+
+	/**
+	 * Construct a \GV\View instance from a \WP_Post.
+	 *
+	 * @param \WP_Post $post The \WP_Post instance to wrap.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\View|null An instance around this \WP_Post if valid, null otherwise.
+	 */
+	public static function from_post($post)
+	{
+		if (!$post || 'gravityview' !== get_post_type($post)) {
+			gravityview()->log->error('Only gravityview post types can be \GV\View instances.');
+
+			return null;
+		}
+
+		if ($view = Utils::get(self::$cache, "View::from_post:{$post->ID}")) {
+			/**
+			 * @filter `gravityview/view/get` Override View.
+			 *
+			 * @param \GV\View $view The View instance pointer.
+			 *
+			 * @since 2.1
+			 */
+			do_action_ref_array('gravityview/view/get', [&$view]);
+
+			return $view;
+		}
+
+		$view = new self();
+		$view->post = $post;
+
+		/** Get connected form. */
+		$view->form = GF_Form::by_id($view->_gravityview_form_id);
+		if (!$view->form) {
+			gravityview()->log->error('View #{view_id} tried attaching non-existent Form #{form_id} to it.', [
+				'view_id' => $view->ID,
+				'form_id' => $view->_gravityview_form_id ?: 0,
+			]);
+		}
+
+		$view->joins = $view::get_joins($post);
+
+		$view->unions = $view::get_unions($post);
+
+		/**
+		 * @filter `gravityview/configuration/fields` Filter the View fields' configuration array.
+		 *
+		 * @since 1.6.5
+		 * @deprecated Use `gravityview/view/configuration/fields` or `gravityview/view/fields` filters.
+		 *
+		 * @param $fields array Multi-array of fields with first level being the field zones.
+		 * @param $view_id int The View the fields are being pulled for.
+		 */
+		$configuration = apply_filters('gravityview/configuration/fields', (array) $view->_gravityview_directory_fields, $view->ID);
+
+		/**
+		 * @filter `gravityview/view/configuration/fields` Filter the View fields' configuration array.
+		 *
+		 * @since 2.0
+		 *
+		 * @param array    $fields Multi-array of fields with first level being the field zones.
+		 * @param \GV\View $view   The View the fields are being pulled for.
+		 */
+		$configuration = apply_filters('gravityview/view/configuration/fields', $configuration, $view);
+
+		/**
+		 * @filter `gravityview/view/fields` Filter the Field Collection for this View.
+		 *
+		 * @since 2.0
+		 *
+		 * @param \GV\Field_Collection $fields A collection of fields.
+		 * @param \GV\View             $view   The View the fields are being pulled for.
+		 */
+		$view->fields = apply_filters('gravityview/view/fields', Field_Collection::from_configuration($configuration), $view);
+
+		/**
+		 * @filter `gravityview/view/configuration/widgets` Filter the View widgets' configuration array.
+		 *
+		 * @since 2.0
+		 *
+		 * @param array    $fields Multi-array of widgets with first level being the field zones.
+		 * @param \GV\View $view   The View the widgets are being pulled for.
+		 */
+		$configuration = apply_filters('gravityview/view/configuration/widgets', (array) $view->_gravityview_directory_widgets, $view);
+
+		/**
+		 * @filter `gravityview/view/widgets` Filter the Widget Collection for this View.
+		 *
+		 * @since 2.0
+		 *
+		 * @param \GV\Widget_Collection $widgets A collection of widgets.
+		 * @param \GV\View              $view    The View the widgets are being pulled for.
+		 */
+		$view->widgets = apply_filters('gravityview/view/widgets', Widget_Collection::from_configuration($configuration), $view);
+
+		/** View configuration. */
+		$view->settings->update(gravityview_get_template_settings($view->ID));
+
+		/** Add the template name into the settings. */
+		$view->settings->update(['template' => gravityview_get_template_id($view->ID)]);
+
+		/** View basics. */
+		$view->settings->update([
+			'id' => $view->ID,
+		]);
+
+		self::$cache["View::from_post:{$post->ID}"] = &$view;
+
+		/**
+		 * @filter `gravityview/view/get` Override View.
+		 *
+		 * @param \GV\View $view The View instance pointer.
+		 *
+		 * @since 2.1
+		 */
+		do_action_ref_array('gravityview/view/get', [&$view]);
+
+		return $view;
+	}
+
+	/**
+	 * Flush the view cache.
+	 *
+	 * @param int $view_id The View to reset cache for. Optional. Default: resets everything.
+	 *
+	 * @internal
+	 */
+	public static function _flush_cache($view_id = null)
+	{
+		if ($view_id) {
+			unset(self::$cache["View::from_post:$view_id"]);
+
+			return;
+		}
+		self::$cache = [];
+	}
+
+	/**
+	 * Construct a \GV\View instance from a post ID.
+	 *
+	 * @param int|string $post_id The post ID.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\View|null An instance around this \WP_Post or null if not found.
+	 */
+	public static function by_id($post_id)
+	{
+		if (!$post_id || !$post = get_post($post_id)) {
+			return null;
+		}
+
+		return self::from_post($post);
+	}
+
+	/**
+	 * Determines if a view exists to begin with.
+	 *
+	 * @param int|\WP_Post|null $view The WordPress post ID, a \WP_Post object or null for global $post;
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return bool Whether the post exists or not.
+	 */
+	public static function exists($view)
+	{
+		return get_post_type($view) == 'gravityview';
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with GravityView_View_Data::$views.
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return bool Whether the offset exists or not, limited to GravityView_View_Data::$views element keys.
+	 */
+	public function offsetExists($offset)
+	{
+		$data_keys = ['id', 'view_id', 'form_id', 'template_id', 'atts', 'fields', 'widgets', 'form'];
+
+		return in_array($offset, $data_keys);
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with GravityView_View_Data::$views.
+	 *
+	 * Maps the old keys to the new data;
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return mixed The value of the requested view data key limited to GravityView_View_Data::$views element keys. If offset not found, return null.
+	 */
+	public function offsetGet($offset)
+	{
+		gravityview()->log->notice('This is a \GV\View object should not be accessed as an array.');
+
+		if (!isset($this[$offset])) {
+			return null;
+		}
+
+		switch ($offset) {
+			case 'id':
+			case 'view_id':
+				return $this->ID;
+			case 'form':
+				return $this->form;
+			case 'form_id':
+				return $this->form ? $this->form->ID : null;
+			case 'atts':
+				return $this->settings->as_atts();
+			case 'template_id':
+				return $this->settings->get('template');
+			case 'widgets':
+				return $this->widgets->as_configuration();
+		}
+
+		return null;
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with GravityView_View_Data::$views.
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function offsetSet($offset, $value)
+	{
+		gravityview()->log->error('The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.');
+	}
+
+	/**
+	 * ArrayAccess compatibility layer with GravityView_View_Data::$views.
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		gravityview()->log->error('The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.');
+	}
+
+	/**
+	 * Be compatible with the old data object.
+	 *
+	 * Some external code expects an array (doing things like foreach on this, or array_keys)
+	 *  so let's return an array in the old format for such cases. Do not use unless using
+	 *  for back-compatibility.
+	 *
+	 * @internal
+	 *
+	 * @deprecated
+	 * @since 2.0
+	 *
+	 * @return array
+	 */
+	public function as_data()
+	{
+		return [
+			'id'          => $this->ID,
+			'view_id'     => $this->ID,
+			'form_id'     => $this->form ? $this->form->ID : null,
+			'form'        => $this->form ? gravityview_get_form($this->form->ID) : null,
+			'atts'        => $this->settings->as_atts(),
+			'fields'      => $this->fields->by_visible($this)->as_configuration(),
+			'template_id' => $this->settings->get('template'),
+			'widgets'     => $this->widgets->as_configuration(),
+		];
+	}
+
+	/**
+	 * Retrieve the entries for the current view and request.
+	 *
+	 * @param \GV\Request The request. Unused for now.
+	 *
+	 * @return \GV\Entry_Collection The entries.
+	 */
+	public function get_entries($request = null)
+	{
+		$entries = new \GV\Entry_Collection();
+
+		if (!$this->form) {
+			// Documented below.
+			return apply_filters('gravityview/view/entries', $entries, $this, $request);
+		}
+
+		$parameters = $this->settings->as_atts();
+
+		/**
+		 * Remove multiple sorting before calling legacy filters.
+		 * This allows us to fake it till we make it.
+		 */
+		if (!empty($parameters['sort_field']) && is_array($parameters['sort_field'])) {
+			$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']);
+			}
+		}
+
+		/**
+		 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
+		 */
+		$parameters = \GravityView_frontend::get_view_entries_parameters($parameters, $this->form->ID);
+
+		$parameters['context_view_id'] = $this->ID;
+		$parameters = \GVCommon::calculate_get_entries_criteria($parameters, $this->form->ID);
+
+		if (!is_array($parameters)) {
+			$parameters = [];
+		}
+
+		if (!is_array($parameters['search_criteria'])) {
+			$parameters['search_criteria'] = [];
+		}
+
+		if ((!isset($parameters['search_criteria']['field_filters'])) || (!is_array($parameters['search_criteria']['field_filters']))) {
+			$parameters['search_criteria']['field_filters'] = [];
+		}
+
+		if ($request instanceof REST\Request) {
+			$atts = $this->settings->as_atts();
+			$paging_parameters = wp_parse_args($request->get_paging(), [
+				'paging' => ['page_size' => $atts['page_size']],
+			]);
+			$parameters['paging'] = $paging_parameters['paging'];
+		}
+
+		$page = Utils::get($parameters['paging'], 'current_page') ?: ((($parameters['paging']['offset'] - $this->settings->get('offset')) / \GV\Utils::get($parameters, 'paging/page_size', 25)) + 1);
+
+		/**
+		 * Cleanup duplicate field_filter parameters to simplify the query.
+		 */
+		$unique_field_filters = [];
+		foreach (Utils::get($parameters, 'search_criteria/field_filters', []) as $key => $filter) {
+			if ('mode' === $key) {
+				$unique_field_filters['mode'] = $filter;
+			} elseif (!in_array($filter, $unique_field_filters)) {
+				$unique_field_filters[] = $filter;
+			}
+		}
+		$parameters['search_criteria']['field_filters'] = $unique_field_filters;
+
+		if (!empty($parameters['search_criteria']['field_filters'])) {
+			gravityview()->log->notice('search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.');
+		}
+
+		if (gravityview()->plugin->supports(Plugin::FEATURE_GFQUERY)) {
+			$query_class = $this->get_query_class();
+
+			/** @var \GF_Query $query */
+			$query = new $query_class($this->form->ID, $parameters['search_criteria'], Utils::get($parameters, 'sorting'));
+
+			/**
+			 * Apply multisort.
+			 */
+			if (!empty($has_multisort)) {
+				$atts = $this->settings->as_atts();
+
+				$view_setting_sort_field_ids = \GV\Utils::get($atts, 'sort_field', []);
+				$view_setting_sort_directions = \GV\Utils::get($atts, 'sort_direction', []);
+
+				$has_sort_query_param = !empty($_GET['sort']) && is_array($_GET['sort']);
+
+				if ($has_sort_query_param) {
+					$has_sort_query_param = array_filter(array_values($_GET['sort']));
+				}
+
+				if ($this->settings->get('sort_columns') && $has_sort_query_param) {
+					$sort_field_ids = array_keys($_GET['sort']);
+					$sort_directions = array_values($_GET['sort']);
+				} else {
+					$sort_field_ids = $view_setting_sort_field_ids;
+					$sort_directions = $view_setting_sort_directions;
+				}
+
+				$skip_first = false;
+
+				foreach ((array) $sort_field_ids as $key => $sort_field_id) {
+					if (!$skip_first && !$has_sort_query_param) {
+						$skip_first = true; // Skip the first one, it's already in the query
+						continue;
+					}
+
+					$sort_field_id = \GravityView_frontend::_override_sorting_id_by_field_type($sort_field_id, $this->form->ID);
+					$sort_direction = strtoupper(\GV\Utils::get($sort_directions, $key, 'ASC'));
+
+					if (!empty($sort_field_id)) {
+						$order = new \GF_Query_Column($sort_field_id, $this->form->ID);
+						if ('id' !== $sort_field_id && \GVCommon::is_field_numeric($this->form->ID, $sort_field_id)) {
+							$order = \GF_Query_Call::CAST($order, defined('GF_Query::TYPE_DECIMAL') ? \GF_Query::TYPE_DECIMAL : \GF_Query::TYPE_SIGNED);
+						}
+
+						$query->order($order, $sort_direction);
+					}
+				}
+			}
+
+			/**
+			 * Merge time subfield sorts.
+			 */
+			add_filter('gform_gf_query_sql', $gf_query_timesort_sql_callback = function ($sql) use (&$query) {
+				$q = $query->_introspect();
+				$orders = [];
+
+				$merged_time = false;
+
+				foreach ($q['order'] as $oid => $order) {
+					$column = null;
+
+					if ($order[0] instanceof \GF_Query_Column) {
+						$column = $order[0];
+					} elseif ($order[0] instanceof \GF_Query_Call) {
+						if (count($order[0]->columns) != 1 || !$order[0]->columns[0] instanceof \GF_Query_Column) {
+							$orders[$oid] = $order;
+							continue; // Need something that resembles a single sort
+						}
+						$column = $order[0]->columns[0];
+					}
+
+					if (!$column || (!$field = \GFAPI::get_field($column->source, $column->field_id)) || $field->type !== 'time') {
+						$orders[$oid] = $order;
+						continue; // Not a time field
+					}
+
+					if (!class_exists('\GV\Mocks\GF_Query_Call_TIMESORT')) {
+						require_once gravityview()->plugin->dir('future/_mocks.timesort.php');
+					}
+
+					$orders[$oid] = [
+						new \GV\Mocks\GF_Query_Call_TIMESORT('timesort', [$column, $sql]),
+						$order[1], // Mock it!
+					];
+
+					$merged_time = true;
+				}
+
+				if ($merged_time) {
+					/**
+					 * ORDER again.
+					 */
+					if (!empty($orders) && $_orders = $query->_order_generate($orders)) {
+						$sql['order'] = 'ORDER BY '.implode(', ', $_orders);
+					}
+				}
+
+				return $sql;
+			});
+
+			$query->limit($parameters['paging']['page_size'])
+				->offset((($page - 1) * $parameters['paging']['page_size']) + $this->settings->get('offset'));
+
+			/**
+			 * Any joins?
+			 */
+			if (gravityview()->plugin->supports(Plugin::FEATURE_JOINS) && count($this->joins)) {
+				$is_admin_and_can_view = $this->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $this->ID);
+
+				foreach ($this->joins as $join) {
+					$query = $join->as_query_join($query);
+
+					if ($this->settings->get('multiple_forms_disable_null_joins')) {
+
+						// Disable NULL outputs
+						$condition = new \GF_Query_Condition(
+							new \GF_Query_Column($join->join_on_column->ID, $join->join_on->ID),
+							\GF_Query_Condition::NEQ,
+							new \GF_Query_Literal('')
+						);
+
+						$query_parameters = $query->_introspect();
+
+						$query->where(\GF_Query_Condition::_and($query_parameters['where'], $condition));
+					}
+
+					/**
+					 * This is a temporary stub filter, until GF_Query supports NULL conditions.
+					 * Do not use! This filter will be removed.
+					 */
+					if (defined('GF_Query_Condition::NULL')) {
+						$is_null_condition_native = true;
+					} else {
+						$is_null_condition_class = apply_filters('gravityview/query/is_null_condition', null);
+						$is_null_condition_native = false;
+					}
+
+					// Filter to active entries only
+					$condition = new \GF_Query_Condition(
+						new \GF_Query_Column('status', $join->join_on->ID),
+						\GF_Query_Condition::EQ,
+						new \GF_Query_Literal('active')
+					);
+
+					if ($is_null_condition_native) {
+						$condition = \GF_Query_Condition::_or($condition, new \GF_Query_Condition(
+							new \GF_Query_Column('status', $join->join_on->ID),
+							\GF_Query_Condition::IS,
+							\GF_Query_Condition::NULL
+						));
+					} elseif (!is_null($is_null_condition_class)) {
+						$condition = \GF_Query_Condition::_or($condition, new $is_null_condition_class(
+							new \GF_Query_Column('status', $join->join_on->ID)
+						));
+					}
+
+					$q = $query->_introspect();
+					$query->where(\GF_Query_Condition::_and($q['where'], $condition));
+
+					if ($this->settings->get('show_only_approved') && !$is_admin_and_can_view) {
+
+						// Show only approved joined entries
+						$condition = new \GF_Query_Condition(
+							new \GF_Query_Column(\GravityView_Entry_Approval::meta_key, $join->join_on->ID),
+							\GF_Query_Condition::EQ,
+							new \GF_Query_Literal(\GravityView_Entry_Approval_Status::APPROVED)
+						);
+
+						if ($is_null_condition_native) {
+							$condition = \GF_Query_Condition::_or($condition, new \GF_Query_Condition(
+								new \GF_Query_Column(\GravityView_Entry_Approval::meta_key, $join->join_on->ID),
+								\GF_Query_Condition::IS,
+								\GF_Query_Condition::NULL
+							));
+						} elseif (!is_null($is_null_condition_class)) {
+							$condition = \GF_Query_Condition::_or($condition, new $is_null_condition_class(
+								new \GF_Query_Column(\GravityView_Entry_Approval::meta_key, $join->join_on->ID)
+							));
+						}
+
+						$query_parameters = $query->_introspect();
+
+						$query->where(\GF_Query_Condition::_and($query_parameters['where'], $condition));
+					}
+				}
+
+				/**
+				 * Unions?
+				 */
+			} elseif (gravityview()->plugin->supports(Plugin::FEATURE_UNIONS) && count($this->unions)) {
+				$query_parameters = $query->_introspect();
+
+				$unions_sql = [];
+
+				/**
+				 * @param \GF_Query_Condition $condition
+				 * @param array               $fields
+				 * @param $recurse
+				 *
+				 * @return \GF_Query_Condition
+				 */
+				$where_union_substitute = function ($condition, $fields, $recurse) {
+					if ($condition->expressions) {
+						$conditions = [];
+
+						foreach ($condition->expressions as $_condition) {
+							$conditions[] = $recurse($_condition, $fields, $recurse);
+						}
+
+						return call_user_func_array(
+							['\GF_Query_Condition', $condition->operator == 'AND' ? '_and' : '_or'],
+							$conditions
+						);
+					}
+
+					if (!($condition->left && $condition->left instanceof \GF_Query_Column) || (!$condition->left->is_entry_column() && !$condition->left->is_meta_column())) {
+						return new \GF_Query_Condition(
+							new \GF_Query_Column($fields[$condition->left->field_id]->ID),
+							$condition->operator,
+							$condition->right
+						);
+					}
+
+					return $condition;
+				};
+
+				foreach ($this->unions as $form_id => $fields) {
+
+					// Build a new query for every unioned form
+					$query_class = $this->get_query_class();
+
+					/** @var \GF_Query|\GF_Patched_Query $q */
+					$q = new $query_class($form_id);
+
+					// Copy the WHERE clauses but substitute the field_ids to the respective ones
+					$q->where($where_union_substitute($query_parameters['where'], $fields, $where_union_substitute));
+
+					// Copy the ORDER clause and substitute the field_ids to the respective ones
+					foreach ($query_parameters['order'] as $order) {
+						list($column, $_order) = $order;
+
+						if ($column && $column instanceof \GF_Query_Column) {
+							if (!$column->is_entry_column() && !$column->is_meta_column()) {
+								$column = new \GF_Query_Column($fields[$column->field_id]->ID);
+							}
+
+							$q->order($column, $_order);
+						}
+					}
+
+					add_filter('gform_gf_query_sql', $gf_query_sql_callback = function ($sql) use (&$unions_sql) {
+						// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
+						$select = 'UNION ALL '.str_replace('SQL_CALC_FOUND_ROWS ', '', $sql['select']);
+
+						// Record the SQL
+						$unions_sql[] = [
+							// Remove columns, we'll rebuild them
+							'select'  => preg_replace('#DISTINCT (.*)#', 'DISTINCT ', $select),
+							'from'    => $sql['from'],
+							'join'    => $sql['join'],
+							'where'   => $sql['where'],
+							// Remove order and limit
+						];
+
+						// Return empty query, no need to call the database
+						return [];
+					});
+
+					do_action_ref_array('gravityview/view/query', [&$q, $this, $request]);
+
+					$q->get(); // Launch
+
+					remove_filter('gform_gf_query_sql', $gf_query_sql_callback);
+				}
+
+				add_filter('gform_gf_query_sql', $gf_query_sql_callback = function ($sql) use ($unions_sql) {
+					// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
+					$sql['select'] = str_replace('SQL_CALC_FOUND_ROWS ', '', $sql['select']);
+
+					// Remove columns, we'll rebuild them
+					preg_match('#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match);
+					$sql['select'] = preg_replace('#DISTINCT (.*)#', 'DISTINCT ', $sql['select']);
+
+					$unions = [];
+
+					// Transform selected columns to shared alias names
+					$column_to_alias = function ($column) {
+						$column = str_replace('`', '', $column);
+
+						return '`'.str_replace('.', '_', $column).'`';
+					};
+
+					// Add all the order columns into the selects, so we can order by the whole union group
+					preg_match_all('#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches);
+
+					$columns = [
+						sprintf('%s AS %s', $select_match[1], $column_to_alias($select_match[1])),
+					];
+
+					foreach (array_slice($order_matches, 1) as $match) {
+						$columns[] = sprintf('%s AS %s', $match[0], $column_to_alias($match[0]));
+
+						// Rewrite the order columns to the shared aliases
+						$sql['order'] = str_replace($match[0], $column_to_alias($match[0]), $sql['order']);
+					}
+
+					$columns = array_unique($columns);
+
+					// Add the columns to every UNION
+					foreach ($unions_sql as $union_sql) {
+						$union_sql['select'] .= implode(', ', $columns);
+						$unions[] = implode(' ', $union_sql);
+					}
+
+					// Add the columns to the main SELECT, but only grab the entry id column
+					$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM ('.$sql['select'].implode(', ', $columns);
+					$sql['order'] = implode(' ', $unions).') AS u '.$sql['order'];
+
+					return $sql;
+				});
+			}
+
+			/**
+			 * @action `gravityview/view/query` Override the \GF_Query before the get() call.
+			 *
+			 * @param \GF_Query   $query   The current query object reference
+			 * @param \GV\View    $this    The current view object
+			 * @param \GV\Request $request The request object
+			 */
+			do_action_ref_array('gravityview/view/query', [&$query, $this, $request]);
+
+			gravityview()->log->debug('GF_Query parameters: ', ['data' => Utils::gf_query_debug($query)]);
+
+			/**
+			 * Map from Gravity Forms entries arrays to an Entry_Collection.
+			 */
+			if (count($this->joins)) {
+				foreach ($query->get() as $entry) {
+					$entries->add(
+						Multi_Entry::from_entries(array_map('\GV\GF_Entry::from_entry', $entry))
+					);
+				}
+			} else {
+				array_map([$entries, 'add'], array_map('\GV\GF_Entry::from_entry', $query->get()));
+			}
+
+			if (isset($gf_query_sql_callback)) {
+				remove_action('gform_gf_query_sql', $gf_query_sql_callback);
+			}
+
+			if (isset($gf_query_timesort_sql_callback)) {
+				remove_action('gform_gf_query_sql', $gf_query_timesort_sql_callback);
+			}
+
+			/**
+			 * Add total count callback.
+			 */
+			$entries->add_count_callback(function () use ($query) {
+				return $query->total_found;
+			});
+		} else {
+			$entries = $this->form->entries
+				->filter(\GV\GF_Entry_Filter::from_search_criteria($parameters['search_criteria']))
+				->offset($this->settings->get('offset'))
+				->limit($parameters['paging']['page_size'])
+				->page($page);
+
+			if (!empty($parameters['sorting']) && is_array($parameters['sorting'] && !isset($parameters['sorting']['key']))) {
+				// Pluck off multisort arrays
+				$parameters['sorting'] = $parameters['sorting'][0];
+			}
+
+			if (!empty($parameters['sorting']) && !empty($parameters['sorting']['key'])) {
+				$field = new \GV\Field();
+				$field->ID = $parameters['sorting']['key'];
+				$direction = strtolower($parameters['sorting']['direction']) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+				$entries = $entries->sort(new \GV\Entry_Sort($field, $direction));
+			}
+		}
+
+		/**
+		 * @filter `gravityview/view/entries` Modify the entry fetching filters, sorts, offsets, limits.
+		 *
+		 * @param \GV\Entry_Collection $entries The entries for this view.
+		 * @param \GV\View             $view    The view.
+		 * @param \GV\Request          $request The request.
+		 */
+		return apply_filters('gravityview/view/entries', $entries, $this, $request);
+	}
+
+	/**
+	 * Last chance to configure the output.
+	 *
+	 * Used for CSV output, for example.
+	 *
+	 * @return void
+	 */
+	public static function template_redirect()
+	{
+		$is_csv = get_query_var('csv');
+		$is_tsv = get_query_var('tsv');
+
+		/**
+		 * CSV output.
+		 */
+		if (!$is_csv && !$is_tsv) {
+			return;
+		}
+
+		$view = gravityview()->request->is_view();
+
+		if (!$view) {
+			return;
+		}
+
+		$error_csv = $view->can_render(['csv']);
+
+		if (is_wp_error($error_csv)) {
+			gravityview()->log->error('Not rendering CSV or TSV: '.$error_csv->get_error_message());
+
+			return;
+		}
+
+		$file_type = $is_csv ? 'csv' : 'tsv';
+
+		/**
+		 * @filter `gravityview/output/{csv|tsv}/filename` Modify the name of the generated CSV or TSV file. Name will be sanitized using sanitize_file_name() before output.
+		 *
+		 * @see sanitize_file_name()
+		 * @since 2.1
+		 *
+		 * @param string   $filename File name used when downloading a CSV or TSV. Default is "{View title}.csv" or "{View title}.tsv"
+		 * @param \GV\View $view     Current View being rendered
+		 */
+		$filename = apply_filters('gravityview/output/'.$file_type.'/filename', get_the_title($view->post), $view);
+
+		if (!defined('DOING_GRAVITYVIEW_TESTS')) {
+			header(sprintf('Content-Disposition: attachment;filename="%s.'.$file_type.'"', sanitize_file_name($filename)));
+			header('Content-Transfer-Encoding: binary');
+			header('Content-Type: text/'.$file_type);
+		}
+
+		ob_start();
+		$csv_or_tsv = fopen('php://output', 'w');
+
+		/**
+		 * Add da' BOM if GF uses it.
+		 *
+		 * @see GFExport::start_export()
+		 */
+		if (apply_filters('gform_include_bom_export_entries', true, $view->form ? $view->form->form : null)) {
+			fputs($csv_or_tsv, "\xef\xbb\xbf");
+		}
+
+		if ($view->settings->get('csv_nolimit')) {
+			$view->settings->update(['page_size' => -1]);
+		}
+
+		$entries = $view->get_entries();
+
+		$headers_done = false;
+		$allowed = $headers = [];
+
+		foreach ($view->fields->by_position('directory_*')->by_visible($view)->all() as $id => $field) {
+			$allowed[] = $field;
+		}
+
+		$renderer = new Field_Renderer();
+
+		foreach ($entries->all() as $entry) {
+			$return = [];
+
+			/**
+			 * @filter `gravityview/csv/entry/fields` Allowlist more entry fields by ID that are output in CSV requests.
+			 *
+			 * @param array     $allowed The allowed ones, default by_visible, by_position( "context_*" ), i.e. as set in the View.
+			 * @param \GV\View  $view    The view.
+			 * @param \GV\Entry $entry   WordPress representation of the item.
+			 */
+			$allowed_field_ids = apply_filters('gravityview/csv/entry/fields', wp_list_pluck($allowed, 'ID'), $view, $entry);
+
+			$allowed = array_filter($allowed, function ($field) use ($allowed_field_ids) {
+				return in_array($field->ID, $allowed_field_ids, true);
+			});
+
+			foreach (array_diff($allowed_field_ids, wp_list_pluck($allowed, 'ID')) as $field_id) {
+				$allowed[] = is_numeric($field_id) ? \GV\GF_Field::by_id($view->form, $field_id) : \GV\Internal_Field::by_id($field_id);
+			}
+
+			foreach ($allowed as $field) {
+				$source = is_numeric($field->ID) ? $view->form : new \GV\Internal_Source();
+
+				$return[] = $renderer->render($field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template');
+
+				if (!$headers_done) {
+					$label = $field->get_label($view, $source, $entry);
+					$headers[] = $label ? $label : $field->ID;
+				}
+			}
+
+			// If not "tsv" then use comma
+			$delimiter = ('tsv' === $file_type) ? "\t" : ',';
+
+			if (!$headers_done) {
+				$headers_done = fputcsv($csv_or_tsv, array_map(['\GV\Utils', 'strip_excel_formulas'], array_values($headers)), $delimiter);
+			}
+
+			fputcsv($csv_or_tsv, array_map(['\GV\Utils', 'strip_excel_formulas'], $return), $delimiter);
+		}
+
+		fflush($csv_or_tsv);
+
+		echo rtrim(ob_get_clean());
+
+		if (!defined('DOING_GRAVITYVIEW_TESTS')) {
+			exit;
+		}
+	}
+
+	/**
+	 * Return the query class for this View.
+	 *
+	 * @return string The class name.
+	 */
+	public function get_query_class()
+	{
+		/**
+		 * @filter `gravityview/query/class`
+		 *
+		 * @param string The query class. Default: GF_Query.
+		 * @param \GV\View $this The View.
+		 */
+		$query_class = apply_filters('gravityview/query/class', '\GF_Query', $this);
+
+		return $query_class;
+	}
+
+	/**
+	 * Restrict View access to specific capabilities.
+	 *
+	 * Hooked into `map_meta_cap` WordPress filter.
+	 *
+	 * @since develop
+	 *
+	 * @param $caps    array  The output capabilities.
+	 * @param $cap     string The cap that is being checked.
+	 * @param $user_id int    The User ID.
+	 * @param $args    array  Additional arguments to the capability.
+	 *
+	 * @return array The resulting capabilities.
+	 */
+	public static function restrict($caps, $cap, $user_id, $args)
+	{
+		/**
+		 * @filter `gravityview/security/require_unfiltered_html` Bypass restrictions on Views that require `unfiltered_html`.
+		 *
+		 * @param bool
+		 *
+		 * @since develop
+		 *
+		 * @param string $cap     The capability requested.
+		 * @param int    $user_id The user ID.
+		 * @param array  $args    Any additional args to map_meta_cap
+		 */
+		if (!apply_filters('gravityview/security/require_unfiltered_html', true, $cap, $user_id)) {
+			return $caps;
+		}
+
+		switch ($cap) {
+			case 'edit_gravityview':
+			case 'edit_gravityviews':
+			case 'edit_others_gravityviews':
+			case 'edit_private_gravityviews':
+			case 'edit_published_gravityviews':
+				if (!user_can($user_id, 'unfiltered_html')) {
+					if (!user_can($user_id, 'gravityview_full_access')) {
+						return ['do_not_allow'];
+					}
+				}
+
+				return $caps;
+			case 'edit_post':
+				if ('gravityview' === get_post_type(array_pop($args))) {
+					return self::restrict($caps, 'edit_gravityview', $user_id, $args);
+				}
+		}
+
+		return $caps;
+	}
+
+	public function __get($key)
+	{
+		if ($this->post) {
+			$raw_post = $this->post->filter('raw');
+
+			return $raw_post->{$key};
+		}
+
+		return isset($this->{$key}) ? $this->{$key} : null;
+	}
+
+	/**
+	 * Return associated WP post.
+	 *
+	 * @since 2.13.2
+	 *
+	 * @return \WP_Post|null
+	 */
+	public function get_post()
+	{
+		return $this->post ? $this->post : null;
+	}
 }

Spacing +457 added lines, -457 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -70,7 +70,7 @@ 
      *
      * @internal
      */
-    private static $cache = [];
+    private static $cache = [ ];
 
     /**
      * @var \GV\Join[] The joins for all sources in this view.
@@ -79,7 +79,7 @@ 
      *
      * @since 2.0.1
      */
-    public $joins = [];
+    public $joins = [ ];
 
     /**
      * @var \GV\Field[][] The unions for all sources in this view.
@@ -97,7 +97,7 @@ 
      *
      * @since 2.2.2
      */
-    public $unions = [];
+    public $unions = [ ];
 
     /**
      * The constructor.
@@ -120,7 +120,7 @@ 
     {
 
         /** Register only once */
-        if (post_type_exists('gravityview')) {
+        if ( post_type_exists( 'gravityview' ) ) {
             return;
         }
 
@@ -132,12 +132,12 @@ 
          *
          * @param bool $is_hierarchical Default: false
          */
-        $is_hierarchical = (bool) apply_filters('gravityview_is_hierarchical', false);
+        $is_hierarchical = (bool)apply_filters( 'gravityview_is_hierarchical', false );
 
-        $supports = ['title', 'revisions'];
+        $supports = [ 'title', 'revisions' ];
 
-        if ($is_hierarchical) {
-            $supports[] = 'page-attributes';
+        if ( $is_hierarchical ) {
+            $supports[ ] = 'page-attributes';
         }
 
         /**
@@ -149,37 +149,37 @@ 
          * @param array $supports        Array of features associated with a functional area of the edit screen. Default: 'title', 'revisions'. If $is_hierarchical, also 'page-attributes'
          * @param bool  $is_hierarchical Do Views support parent/child relationships? See `gravityview_is_hierarchical` filter.
          */
-        $supports = apply_filters('gravityview_post_type_support', $supports, $is_hierarchical);
+        $supports = apply_filters( 'gravityview_post_type_support', $supports, $is_hierarchical );
 
         /** Register Custom Post Type - gravityview */
         $labels = [
-            'name'                   => _x('Views', 'Post Type General Name', 'gravityview'),
-            'singular_name'          => _x('View', 'Post Type Singular Name', 'gravityview'),
-            'menu_name'              => _x('Views', 'Menu name', 'gravityview'),
-            'parent_item_colon'      => __('Parent View:', 'gravityview'),
-            'all_items'              => __('All Views', 'gravityview'),
-            'view_item'              => _x('View', 'View Item', 'gravityview'),
-            'add_new_item'           => __('Add New View', 'gravityview'),
-            'add_new'                => __('New View', 'gravityview'),
-            'edit_item'              => __('Edit View', 'gravityview'),
-            'update_item'            => __('Update View', 'gravityview'),
-            'search_items'           => __('Search Views', 'gravityview'),
+            'name'                   => _x( 'Views', 'Post Type General Name', 'gravityview' ),
+            'singular_name'          => _x( 'View', 'Post Type Singular Name', 'gravityview' ),
+            'menu_name'              => _x( 'Views', 'Menu name', 'gravityview' ),
+            'parent_item_colon'      => __( 'Parent View:', 'gravityview' ),
+            'all_items'              => __( 'All Views', 'gravityview' ),
+            'view_item'              => _x( 'View', 'View Item', 'gravityview' ),
+            'add_new_item'           => __( 'Add New View', 'gravityview' ),
+            'add_new'                => __( 'New View', 'gravityview' ),
+            'edit_item'              => __( 'Edit View', 'gravityview' ),
+            'update_item'            => __( 'Update View', 'gravityview' ),
+            'search_items'           => __( 'Search Views', 'gravityview' ),
             'not_found'              => \GravityView_Admin::no_views_text(),
-            'not_found_in_trash'     => __('No Views found in Trash', 'gravityview'),
-            'filter_items_list'      => __('Filter Views list', 'gravityview'),
-            'items_list_navigation'  => __('Views list navigation', 'gravityview'),
-            'items_list'             => __('Views list', 'gravityview'),
-            'view_items'             => __('See Views', 'gravityview'),
-            'attributes'             => __('View Attributes', 'gravityview'),
-            'item_updated'           => __('View updated.', 'gravityview'),
-            'item_published'         => __('View published.', 'gravityview'),
-            'item_reverted_to_draft' => __('View reverted to draft.', 'gravityview'),
-            'item_scheduled'         => __('View scheduled.', 'gravityview'),
+            'not_found_in_trash'     => __( 'No Views found in Trash', 'gravityview' ),
+            'filter_items_list'      => __( 'Filter Views list', 'gravityview' ),
+            'items_list_navigation'  => __( 'Views list navigation', 'gravityview' ),
+            'items_list'             => __( 'Views list', 'gravityview' ),
+            'view_items'             => __( 'See Views', 'gravityview' ),
+            'attributes'             => __( 'View Attributes', 'gravityview' ),
+            'item_updated'           => __( 'View updated.', 'gravityview' ),
+            'item_published'         => __( 'View published.', 'gravityview' ),
+            'item_reverted_to_draft' => __( 'View reverted to draft.', 'gravityview' ),
+            'item_scheduled'         => __( 'View scheduled.', 'gravityview' ),
         ];
 
         $args = [
-            'label'               => __('view', 'gravityview'),
-            'description'         => __('Create views based on a Gravity Forms form', 'gravityview'),
+            'label'               => __( 'view', 'gravityview' ),
+            'description'         => __( 'Create views based on a Gravity Forms form', 'gravityview' ),
             'labels'              => $labels,
             'supports'            => $supports,
             'hierarchical'        => $is_hierarchical,
@@ -192,7 +192,7 @@ 
              * @param bool `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded via shortcode. Default: `true`
              * @param int $view_id The ID of the View currently being requested. `0` for general setting
              */
-            'public'              => apply_filters('gravityview_direct_access', gravityview()->plugin->is_compatible(), 0),
+            'public'              => apply_filters( 'gravityview_direct_access', gravityview()->plugin->is_compatible(), 0 ),
             'show_ui'             => gravityview()->plugin->is_compatible(),
             'show_in_menu'        => gravityview()->plugin->is_compatible(),
             'show_in_nav_menus'   => true,
@@ -207,7 +207,7 @@ 
              *
              * @param bool False: don't have frontend archive; True: yes, have archive. Default: false
              */
-            'has_archive'         => apply_filters('gravityview_has_archive', false),
+            'has_archive'         => apply_filters( 'gravityview_has_archive', false ),
             'exclude_from_search' => true,
             'rewrite'             => [
                 /**
@@ -217,7 +217,7 @@ 
                  *
                  * @param string $slug The slug shown in the URL
                  */
-                'slug' => apply_filters('gravityview_slug', 'view'),
+                'slug' => apply_filters( 'gravityview_slug', 'view' ),
 
                 /**
                  * @filter `gravityview/post_type/with_front` Should the permalink structure
@@ -230,13 +230,13 @@ 
                  *
                  * @param bool $with_front
                  */
-                'with_front' => apply_filters('gravityview/post_type/with_front', true),
+                'with_front' => apply_filters( 'gravityview/post_type/with_front', true ),
             ],
             'capability_type'     => 'gravityview',
             'map_meta_cap'        => true,
         ];
 
-        register_post_type('gravityview', $args);
+        register_post_type( 'gravityview', $args );
     }
 
     /**
@@ -251,21 +251,21 @@ 
          */
         global $wp_rewrite;
 
-        $slug = apply_filters('gravityview_slug', 'view');
-        $slug = ('/' !== $wp_rewrite->front) ? sprintf('%s/%s', trim($wp_rewrite->front, '/'), $slug) : $slug;
-        $csv_rule = [sprintf('%s/([^/]+)/csv/?', $slug), 'index.php?gravityview=$matches[1]&csv=1', 'top'];
-        $tsv_rule = [sprintf('%s/([^/]+)/tsv/?', $slug), 'index.php?gravityview=$matches[1]&tsv=1', 'top'];
+        $slug = apply_filters( 'gravityview_slug', 'view' );
+        $slug = ( '/' !== $wp_rewrite->front ) ? sprintf( '%s/%s', trim( $wp_rewrite->front, '/' ), $slug ) : $slug;
+        $csv_rule = [ sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' ];
+        $tsv_rule = [ sprintf( '%s/([^/]+)/tsv/?', $slug ), 'index.php?gravityview=$matches[1]&tsv=1', 'top' ];
 
-        add_filter('query_vars', function ($query_vars) {
-            $query_vars[] = 'csv';
-            $query_vars[] = 'tsv';
+        add_filter( 'query_vars', function( $query_vars ) {
+            $query_vars[ ] = 'csv';
+            $query_vars[ ] = 'tsv';
 
             return $query_vars;
         });
 
-        if (!isset($wp_rewrite->extra_rules_top[$csv_rule[0]])) {
-            call_user_func_array('add_rewrite_rule', $csv_rule);
-            call_user_func_array('add_rewrite_rule', $tsv_rule);
+        if ( ! isset( $wp_rewrite->extra_rules_top[ $csv_rule[ 0 ] ] ) ) {
+            call_user_func_array( 'add_rewrite_rule', $csv_rule );
+            call_user_func_array( 'add_rewrite_rule', $tsv_rule );
         }
     }
 
@@ -276,20 +276,20 @@ 
      *
      * @return string $content The view content as output by the renderers.
      */
-    public static function content($content)
+    public static function content( $content )
     {
         $request = gravityview()->request;
 
         // Plugins may run through the content in the header. WP SEO does this for its OpenGraph functionality.
-        if (!defined('DOING_GRAVITYVIEW_TESTS')) {
-            if (!did_action('loop_start')) {
-                gravityview()->log->debug('Not processing yet: loop_start hasn\'t run yet. Current action: {action}', ['action' => current_filter()]);
+        if ( ! defined( 'DOING_GRAVITYVIEW_TESTS' ) ) {
+            if ( ! did_action( 'loop_start' ) ) {
+                gravityview()->log->debug( 'Not processing yet: loop_start hasn\'t run yet. Current action: {action}', [ 'action' => current_filter() ] );
 
                 return $content;
             }
 
             //	We don't want this filter to run infinite loop on any post content fields
-            remove_filter('the_content', [__CLASS__, __METHOD__]);
+            remove_filter( 'the_content', [ __CLASS__, __METHOD__ ] );
         }
 
         /**
@@ -298,45 +298,45 @@ 
          * Shortcodes and oEmbeds and whatnot will be handled
          *  elsewhere.
          */
-        if (!$view = $request->is_view()) {
+        if ( ! $view = $request->is_view() ) {
             return $content;
         }
 
         /**
          * Check permissions.
          */
-        while ($error = $view->can_render(null, $request)) {
-            if (!is_wp_error($error)) {
+        while ( $error = $view->can_render( null, $request ) ) {
+            if ( ! is_wp_error( $error ) ) {
                 break;
             }
 
-            switch (str_replace('gravityview/', '', $error->get_error_code())) {
+            switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) {
                 case 'post_password_required':
-                    return get_the_password_form($view->ID);
+                    return get_the_password_form( $view->ID );
                 case 'no_form_attached':
 
-                    gravityview()->log->error('View #{view_id} cannot render: {error_code} {error_message}', ['error_code' => $error->get_error_code(), 'error_message' => $error->get_error_message()]);
+                    gravityview()->log->error( 'View #{view_id} cannot render: {error_code} {error_message}', [ 'error_code' => $error->get_error_code(), 'error_message' => $error->get_error_message() ] );
 
                     /**
                      * This View has no data source. There's nothing to show really.
                      * ...apart from a nice message if the user can do anything about it.
                      */
-                    if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
-                        $title = sprintf(__('This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false)));
+                    if ( \GVCommon::has_cap( [ 'edit_gravityviews', 'edit_gravityview' ], $view->ID ) ) {
+                        $title = sprintf( __( 'This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview' ), esc_url( get_edit_post_link( $view->ID, false ) ) );
 
-                        $message = esc_html__('You can only see this message because you are able to edit this View.', 'gravityview');
+                        $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;" />', esc_attr__('Data Source', 'gravityview'), esc_url(plugins_url('assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE)));
+                        $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', esc_attr__( 'Data Source', 'gravityview' ), esc_url( plugins_url( 'assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE ) ) );
 
-                        return \GVCommon::generate_notice('<h3>'.$title.'</h3>'.wpautop($message.$image), 'notice');
+                        return \GVCommon::generate_notice( '<h3>' . $title . '</h3>' . wpautop( $message . $image ), 'notice' );
                     }
                     break;
                 case 'in_trash':
 
-                    if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
-                        $notice = sprintf(__('This View is in the Trash. You can <a href="%s">restore the View here</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false)));
+                    if ( \GVCommon::has_cap( [ 'edit_gravityviews', 'edit_gravityview' ], $view->ID ) ) {
+                        $notice = sprintf( __( 'This View is in the Trash. You can <a href="%s">restore the View here</a>.', 'gravityview' ), esc_url( get_edit_post_link( $view->ID, false ) ) );
 
-                        return \GVCommon::generate_notice('<h3>'.$notice.'</h3>', 'notice', ['edit_gravityviews', 'edit_gravityview'], $view->ID);
+                        return \GVCommon::generate_notice( '<h3>' . $notice . '</h3>', 'notice', [ 'edit_gravityviews', 'edit_gravityview' ], $view->ID );
                     }
 
                     return ''; // Do not show
@@ -345,88 +345,88 @@ 
                 case 'embed_only':
                 case 'not_public':
                 default:
-                    gravityview()->log->notice('View #{view_id} cannot render: {error_code} {error_message}', ['error_code' => $error->get_error_code(), 'error_message' => $error->get_error_message()]);
+                    gravityview()->log->notice( 'View #{view_id} cannot render: {error_code} {error_message}', [ 'error_code' => $error->get_error_code(), 'error_message' => $error->get_error_message() ] );
 
-                    return __('You are not allowed to view this content.', 'gravityview');
+                    return __( 'You are not allowed to view this content.', 'gravityview' );
             }
 
             return $content;
         }
 
-        $is_admin_and_can_view = $view->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID);
+        $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
         /**
          * Editing a single entry.
          */
-        if ($entry = $request->is_edit_entry($view->form ? $view->form->ID : 0)) {
-            if ($entry['status'] != 'active') {
-                gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $entry->ID]);
+        if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) {
+            if ( $entry[ 'status' ] != 'active' ) {
+                gravityview()->log->notice( 'Entry ID #{entry_id} is not active', [ 'entry_id' => $entry->ID ] );
 
-                return __('You are not allowed to view this content.', 'gravityview');
+                return __( 'You are not allowed to view this content.', 'gravityview' );
             }
 
-            if (apply_filters('gravityview_custom_entry_slug', false) && $entry->slug != get_query_var(\GV\Entry::get_endpoint_name())) {
-                gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $entry->ID]);
+            if ( apply_filters( 'gravityview_custom_entry_slug', false ) && $entry->slug != get_query_var( \GV\Entry::get_endpoint_name() ) ) {
+                gravityview()->log->error( 'Entry ID #{entry_id} was accessed by a bad slug', [ 'entry_id' => $entry->ID ] );
 
-                return __('You are not allowed to view this content.', 'gravityview');
+                return __( 'You are not allowed to view this content.', 'gravityview' );
             }
 
-            if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
-                if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($entry->ID, \GravityView_Entry_Approval::meta_key))) {
-                    gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $entry->ID]);
+            if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
+                if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
+                    gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', [ 'entry_id' => $entry->ID ] );
 
-                    return __('You are not allowed to view this content.', 'gravityview');
+                    return __( 'You are not allowed to view this content.', 'gravityview' );
                 }
             }
 
             $renderer = new Edit_Entry_Renderer();
 
-            return $renderer->render($entry, $view, $request);
+            return $renderer->render( $entry, $view, $request );
 
         /**
          * Viewing a single entry.
          */
-        } elseif ($entry = $request->is_entry($view->form ? $view->form->ID : 0)) {
-            $entryset = $entry->is_multi() ? $entry->entries : [$entry];
+        } elseif ( $entry = $request->is_entry( $view->form ? $view->form->ID : 0 ) ) {
+            $entryset = $entry->is_multi() ? $entry->entries : [ $entry ];
 
-            $custom_slug = apply_filters('gravityview_custom_entry_slug', false);
-            $ids = explode(',', get_query_var(\GV\Entry::get_endpoint_name()));
+            $custom_slug = apply_filters( 'gravityview_custom_entry_slug', false );
+            $ids = explode( ',', get_query_var( \GV\Entry::get_endpoint_name() ) );
 
-            $show_only_approved = $view->settings->get('show_only_approved');
+            $show_only_approved = $view->settings->get( 'show_only_approved' );
 
-            foreach ($entryset as $e) {
-                if ('active' !== $e['status']) {
-                    gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $e->ID]);
+            foreach ( $entryset as $e ) {
+                if ( 'active' !== $e[ 'status' ] ) {
+                    gravityview()->log->notice( 'Entry ID #{entry_id} is not active', [ 'entry_id' => $e->ID ] );
 
-                    return __('You are not allowed to view this content.', 'gravityview');
+                    return __( 'You are not allowed to view this content.', 'gravityview' );
                 }
 
-                if ($custom_slug && !in_array($e->slug, $ids)) {
-                    gravityview()->log->error('Entry ID #{entry_id} was accessed by a bad slug', ['entry_id' => $e->ID]);
+                if ( $custom_slug && ! in_array( $e->slug, $ids ) ) {
+                    gravityview()->log->error( 'Entry ID #{entry_id} was accessed by a bad slug', [ 'entry_id' => $e->ID ] );
 
-                    return __('You are not allowed to view this content.', 'gravityview');
+                    return __( 'You are not allowed to view this content.', 'gravityview' );
                 }
 
-                if ($show_only_approved && !$is_admin_and_can_view) {
-                    if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($e->ID, \GravityView_Entry_Approval::meta_key))) {
-                        gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $e->ID]);
+                if ( $show_only_approved && ! $is_admin_and_can_view ) {
+                    if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
+                        gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', [ 'entry_id' => $e->ID ] );
 
-                        return __('You are not allowed to view this content.', 'gravityview');
+                        return __( 'You are not allowed to view this content.', 'gravityview' );
                     }
                 }
 
-                $error = \GVCommon::check_entry_display($e->as_entry(), $view);
+                $error = \GVCommon::check_entry_display( $e->as_entry(), $view );
 
-                if (is_wp_error($error)) {
-                    gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing: {message}', ['entry_id' => $e->ID, 'message' => $error->get_error_message()]);
+                if ( is_wp_error( $error ) ) {
+                    gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing: {message}', [ 'entry_id' => $e->ID, 'message' => $error->get_error_message() ] );
 
-                    return __('You are not allowed to view this content.', 'gravityview');
+                    return __( 'You are not allowed to view this content.', 'gravityview' );
                 }
             }
 
             $renderer = new Entry_Renderer();
 
-            return $renderer->render($entry, $view, $request);
+            return $renderer->render( $entry, $view, $request );
         }
 
         /**
@@ -434,7 +434,7 @@ 
          */
         $renderer = new View_Renderer();
 
-        return $renderer->render($view, $request);
+        return $renderer->render( $view, $request );
     }
 
     /**
@@ -452,14 +452,14 @@ 
      *
      * @return bool|\WP_Error An error if this View shouldn't be rendered here.
      */
-    public function can_render($context = null, $request = null)
+    public function can_render( $context = null, $request = null )
     {
-        if (!$request) {
+        if ( ! $request ) {
             $request = gravityview()->request;
         }
 
-        if (!is_array($context)) {
-            $context = [];
+        if ( ! is_array( $context ) ) {
+            $context = [ ];
         }
 
         /**
@@ -470,41 +470,41 @@ 
          * @param string[]       $context See \GV\View::can_render
          * @param \GV\Request    $request The request.
          */
-        if (!is_null($result = apply_filters('gravityview/view/can_render', null, $this, $context, $request))) {
+        if ( ! is_null( $result = apply_filters( 'gravityview/view/can_render', null, $this, $context, $request ) ) ) {
             return $result;
         }
 
-        if (in_array('rest', $context)) {
+        if ( in_array( 'rest', $context ) ) {
             // REST
-            if (gravityview()->plugin->settings->get('rest_api') === '1' && $this->settings->get('rest_disable') === '1') {
-                return new \WP_Error('gravityview/rest_disabled');
-            } elseif (gravityview()->plugin->settings->get('rest_api') !== '1' && $this->settings->get('rest_enable') !== '1') {
-                return new \WP_Error('gravityview/rest_disabled');
+            if ( gravityview()->plugin->settings->get( 'rest_api' ) === '1' && $this->settings->get( 'rest_disable' ) === '1' ) {
+                return new \WP_Error( 'gravityview/rest_disabled' );
+            } elseif ( gravityview()->plugin->settings->get( 'rest_api' ) !== '1' && $this->settings->get( 'rest_enable' ) !== '1' ) {
+                return new \WP_Error( 'gravityview/rest_disabled' );
             }
         }
 
-        if (in_array('csv', $context)) {
-            if ($this->settings->get('csv_enable') !== '1') {
-                return new \WP_Error('gravityview/csv_disabled', 'The CSV endpoint is not enabled for this View');
+        if ( in_array( 'csv', $context ) ) {
+            if ( $this->settings->get( 'csv_enable' ) !== '1' ) {
+                return new \WP_Error( 'gravityview/csv_disabled', 'The CSV endpoint is not enabled for this View' );
             }
         }
 
         /**
          * This View is password protected. Nothing to do here.
          */
-        if (post_password_required($this->ID)) {
-            gravityview()->log->notice('Post password is required for View #{view_id}', ['view_id' => $this->ID]);
+        if ( post_password_required( $this->ID ) ) {
+            gravityview()->log->notice( 'Post password is required for View #{view_id}', [ 'view_id' => $this->ID ] );
 
-            return new \WP_Error('gravityview/post_password_required');
+            return new \WP_Error( 'gravityview/post_password_required' );
         }
 
-        if (!$this->form) {
-            gravityview()->log->notice('View #{id} has no form attached to it.', ['id' => $this->ID]);
+        if ( ! $this->form ) {
+            gravityview()->log->notice( 'View #{id} has no form attached to it.', [ 'id' => $this->ID ] );
 
-            return new \WP_Error('gravityview/no_form_attached');
+            return new \WP_Error( 'gravityview/no_form_attached' );
         }
 
-        if (!in_array('shortcode', $context)) {
+        if ( ! in_array( 'shortcode', $context ) ) {
             /**
              * Is this View directly accessible via a post URL?
              *
@@ -519,7 +519,7 @@ 
              * @param bool `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded. Default: `true`
              * @param int $view_id The ID of the View currently being requested. `0` for general setting
              */
-            $direct_access = apply_filters('gravityview_direct_access', true, $this->ID);
+            $direct_access = apply_filters( 'gravityview_direct_access', true, $this->ID );
 
             /**
              * @filter `gravityview/request/output/direct` Should this View be directly accessbile?
@@ -530,25 +530,25 @@ 
              * @param \GV\View    $view    The View we're trying to directly render here.
              * @param \GV\Request $request The current request.
              */
-            if (!apply_filters('gravityview/view/output/direct', $direct_access, $this, $request)) {
-                return new \WP_Error('gravityview/no_direct_access');
+            if ( ! apply_filters( 'gravityview/view/output/direct', $direct_access, $this, $request ) ) {
+                return new \WP_Error( 'gravityview/no_direct_access' );
             }
 
             /**
              * Is this View an embed-only View? If so, don't allow rendering here,
              *  as this is a direct request.
              */
-            if ($this->settings->get('embed_only') && !\GVCommon::has_cap('read_private_gravityviews')) {
-                return new \WP_Error('gravityview/embed_only');
+            if ( $this->settings->get( 'embed_only' ) && ! \GVCommon::has_cap( 'read_private_gravityviews' ) ) {
+                return new \WP_Error( 'gravityview/embed_only' );
             }
         }
 
         /** Private, pending, draft, etc. */
-        $public_states = get_post_stati(['public' => true]);
-        if (!in_array($this->post_status, $public_states) && !\GVCommon::has_cap('read_gravityview', $this->ID)) {
-            gravityview()->log->notice('The current user cannot access this View #{view_id}', ['view_id' => $this->ID]);
+        $public_states = get_post_stati( [ 'public' => true ] );
+        if ( ! in_array( $this->post_status, $public_states ) && ! \GVCommon::has_cap( 'read_gravityview', $this->ID ) ) {
+            gravityview()->log->notice( 'The current user cannot access this View #{view_id}', [ 'view_id' => $this->ID ] );
 
-            return new \WP_Error('gravityview/not_public');
+            return new \WP_Error( 'gravityview/not_public' );
         }
 
         return true;
@@ -565,42 +565,42 @@ 
      *
      * @return \GV\Join[] Array of \GV\Join instances
      */
-    public static function get_joins($post)
+    public static function get_joins( $post )
     {
-        $joins = [];
+        $joins = [ ];
 
-        if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
-            gravityview()->log->info('Cannot get joined forms; joins feature not supported.');
+        if ( ! gravityview()->plugin->supports( Plugin::FEATURE_JOINS ) ) {
+            gravityview()->log->info( 'Cannot get joined forms; joins feature not supported.' );
 
             return $joins;
         }
 
-        if (!$post || 'gravityview' !== get_post_type($post)) {
-            gravityview()->log->error('Only "gravityview" post types can be \GV\View instances.');
+        if ( ! $post || 'gravityview' !== get_post_type( $post ) ) {
+            gravityview()->log->error( 'Only "gravityview" post types can be \GV\View instances.' );
 
             return $joins;
         }
 
-        $joins_meta = get_post_meta($post->ID, '_gravityview_form_joins', true);
+        $joins_meta = get_post_meta( $post->ID, '_gravityview_form_joins', true );
 
-        if (empty($joins_meta)) {
+        if ( empty( $joins_meta ) ) {
             return $joins;
         }
 
-        foreach ($joins_meta as $meta) {
-            if (!is_array($meta) || count($meta) != 4) {
+        foreach ( $joins_meta as $meta ) {
+            if ( ! is_array( $meta ) || count( $meta ) != 4 ) {
                 continue;
             }
 
-            list($join, $join_column, $join_on, $join_on_column) = $meta;
+            list( $join, $join_column, $join_on, $join_on_column ) = $meta;
 
-            $join = GF_Form::by_id($join);
-            $join_on = GF_Form::by_id($join_on);
+            $join = GF_Form::by_id( $join );
+            $join_on = GF_Form::by_id( $join_on );
 
-            $join_column = is_numeric($join_column) ? GF_Field::by_id($join, $join_column) : Internal_Field::by_id($join_column);
-            $join_on_column = is_numeric($join_on_column) ? GF_Field::by_id($join_on, $join_on_column) : Internal_Field::by_id($join_on_column);
+            $join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column );
+            $join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column );
 
-            $joins[] = new Join($join, $join_column, $join_on, $join_on_column);
+            $joins[ ] = new Join( $join, $join_column, $join_on, $join_on_column );
         }
 
         return $joins;
@@ -620,45 +620,45 @@ 
      *
      * @return \GV\GF_Form[] Array of \GV\GF_Form instances
      */
-    public static function get_joined_forms($post_id)
+    public static function get_joined_forms( $post_id )
     {
-        $forms = [];
+        $forms = [ ];
 
-        if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
-            gravityview()->log->info('Cannot get joined forms; joins feature not supported.');
+        if ( ! gravityview()->plugin->supports( Plugin::FEATURE_JOINS ) ) {
+            gravityview()->log->info( 'Cannot get joined forms; joins feature not supported.' );
 
             return $forms;
         }
 
-        if (!$post_id || !gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
+        if ( ! $post_id || ! gravityview()->plugin->supports( Plugin::FEATURE_JOINS ) ) {
             return $forms;
         }
 
-        if (empty($post_id)) {
-            gravityview()->log->error('Cannot get joined forms; $post_id was empty');
+        if ( empty( $post_id ) ) {
+            gravityview()->log->error( 'Cannot get joined forms; $post_id was empty' );
 
             return $forms;
         }
 
-        $joins_meta = get_post_meta($post_id, '_gravityview_form_joins', true);
+        $joins_meta = get_post_meta( $post_id, '_gravityview_form_joins', true );
 
-        if (empty($joins_meta)) {
+        if ( empty( $joins_meta ) ) {
             return $forms;
         }
 
-        foreach ($joins_meta  as $meta) {
-            if (!is_array($meta) || count($meta) != 4) {
+        foreach ( $joins_meta  as $meta ) {
+            if ( ! is_array( $meta ) || count( $meta ) != 4 ) {
                 continue;
             }
 
-            list($join, $join_column, $join_on, $join_on_column) = $meta;
+            list( $join, $join_column, $join_on, $join_on_column ) = $meta;
 
-            if ($form = GF_Form::by_id($join_on)) {
-                $forms[$join_on] = $form;
+            if ( $form = GF_Form::by_id( $join_on ) ) {
+                $forms[ $join_on ] = $form;
             }
 
-            if ($form = GF_Form::by_id($join)) {
-                $forms[$join] = $form;
+            if ( $form = GF_Form::by_id( $join ) ) {
+                $forms[ $join ] = $form;
             }
         }
 
@@ -676,36 +676,36 @@ 
      *
      * @return \GV\Field[][] Array of unions (see self::$unions)
      */
-    public static function get_unions($post)
+    public static function get_unions( $post )
     {
-        $unions = [];
+        $unions = [ ];
 
-        if (!$post || 'gravityview' !== get_post_type($post)) {
-            gravityview()->log->error('Only "gravityview" post types can be \GV\View instances.');
+        if ( ! $post || 'gravityview' !== get_post_type( $post ) ) {
+            gravityview()->log->error( 'Only "gravityview" post types can be \GV\View instances.' );
 
             return $unions;
         }
 
-        $fields = get_post_meta($post->ID, '_gravityview_directory_fields', true);
+        $fields = get_post_meta( $post->ID, '_gravityview_directory_fields', true );
 
-        if (empty($fields)) {
+        if ( empty( $fields ) ) {
             return $unions;
         }
 
-        foreach ($fields as $location => $_fields) {
-            if (strpos($location, 'directory_') !== 0) {
+        foreach ( $fields as $location => $_fields ) {
+            if ( strpos( $location, 'directory_' ) !== 0 ) {
                 continue;
             }
 
-            foreach ($_fields as $field) {
-                if (!empty($field['unions'])) {
-                    foreach ($field['unions'] as $form_id => $field_id) {
-                        if (!isset($unions[$form_id])) {
-                            $unions[$form_id] = [];
+            foreach ( $_fields as $field ) {
+                if ( ! empty( $field[ 'unions' ] ) ) {
+                    foreach ( $field[ 'unions' ] as $form_id => $field_id ) {
+                        if ( ! isset( $unions[ $form_id ] ) ) {
+                            $unions[ $form_id ] = [ ];
                         }
 
-                        $unions[$form_id][$field['id']] =
-                            is_numeric($field_id) ? \GV\GF_Field::by_id(\GV\GF_Form::by_id($form_id), $field_id) : \GV\Internal_Field::by_id($field_id);
+                        $unions[ $form_id ][ $field[ 'id' ] ] =
+                            is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id );
                     }
                 }
             }
@@ -713,9 +713,9 @@ 
             break;
         }
 
-        if ($unions) {
-            if (!gravityview()->plugin->supports(Plugin::FEATURE_UNIONS)) {
-                gravityview()->log->error('Cannot get unions; unions feature not supported.');
+        if ( $unions ) {
+            if ( ! gravityview()->plugin->supports( Plugin::FEATURE_UNIONS ) ) {
+                gravityview()->log->error( 'Cannot get unions; unions feature not supported.' );
             }
         }
 
@@ -735,15 +735,15 @@ 
      *
      * @return \GV\View|null An instance around this \WP_Post if valid, null otherwise.
      */
-    public static function from_post($post)
+    public static function from_post( $post )
     {
-        if (!$post || 'gravityview' !== get_post_type($post)) {
-            gravityview()->log->error('Only gravityview post types can be \GV\View instances.');
+        if ( ! $post || 'gravityview' !== get_post_type( $post ) ) {
+            gravityview()->log->error( 'Only gravityview post types can be \GV\View instances.' );
 
             return null;
         }
 
-        if ($view = Utils::get(self::$cache, "View::from_post:{$post->ID}")) {
+        if ( $view = Utils::get( self::$cache, "View::from_post:{$post->ID}" ) ) {
             /**
              * @filter `gravityview/view/get` Override View.
              *
@@ -751,7 +751,7 @@ 
              *
              * @since 2.1
              */
-            do_action_ref_array('gravityview/view/get', [&$view]);
+            do_action_ref_array( 'gravityview/view/get', [ &$view ] );
 
             return $view;
         }
@@ -760,17 +760,17 @@ 
         $view->post = $post;
 
         /** Get connected form. */
-        $view->form = GF_Form::by_id($view->_gravityview_form_id);
-        if (!$view->form) {
-            gravityview()->log->error('View #{view_id} tried attaching non-existent Form #{form_id} to it.', [
+        $view->form = GF_Form::by_id( $view->_gravityview_form_id );
+        if ( ! $view->form ) {
+            gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', [
                 'view_id' => $view->ID,
                 'form_id' => $view->_gravityview_form_id ?: 0,
-            ]);
+            ] );
         }
 
-        $view->joins = $view::get_joins($post);
+        $view->joins = $view::get_joins( $post );
 
-        $view->unions = $view::get_unions($post);
+        $view->unions = $view::get_unions( $post );
 
         /**
          * @filter `gravityview/configuration/fields` Filter the View fields' configuration array.
@@ -781,7 +781,7 @@ 
          * @param $fields array Multi-array of fields with first level being the field zones.
          * @param $view_id int The View the fields are being pulled for.
          */
-        $configuration = apply_filters('gravityview/configuration/fields', (array) $view->_gravityview_directory_fields, $view->ID);
+        $configuration = apply_filters( 'gravityview/configuration/fields', (array)$view->_gravityview_directory_fields, $view->ID );
 
         /**
          * @filter `gravityview/view/configuration/fields` Filter the View fields' configuration array.
@@ -791,7 +791,7 @@ 
          * @param array    $fields Multi-array of fields with first level being the field zones.
          * @param \GV\View $view   The View the fields are being pulled for.
          */
-        $configuration = apply_filters('gravityview/view/configuration/fields', $configuration, $view);
+        $configuration = apply_filters( 'gravityview/view/configuration/fields', $configuration, $view );
 
         /**
          * @filter `gravityview/view/fields` Filter the Field Collection for this View.
@@ -801,7 +801,7 @@ 
          * @param \GV\Field_Collection $fields A collection of fields.
          * @param \GV\View             $view   The View the fields are being pulled for.
          */
-        $view->fields = apply_filters('gravityview/view/fields', Field_Collection::from_configuration($configuration), $view);
+        $view->fields = apply_filters( 'gravityview/view/fields', Field_Collection::from_configuration( $configuration ), $view );
 
         /**
          * @filter `gravityview/view/configuration/widgets` Filter the View widgets' configuration array.
@@ -811,7 +811,7 @@ 
          * @param array    $fields Multi-array of widgets with first level being the field zones.
          * @param \GV\View $view   The View the widgets are being pulled for.
          */
-        $configuration = apply_filters('gravityview/view/configuration/widgets', (array) $view->_gravityview_directory_widgets, $view);
+        $configuration = apply_filters( 'gravityview/view/configuration/widgets', (array)$view->_gravityview_directory_widgets, $view );
 
         /**
          * @filter `gravityview/view/widgets` Filter the Widget Collection for this View.
@@ -821,20 +821,20 @@ 
          * @param \GV\Widget_Collection $widgets A collection of widgets.
          * @param \GV\View              $view    The View the widgets are being pulled for.
          */
-        $view->widgets = apply_filters('gravityview/view/widgets', Widget_Collection::from_configuration($configuration), $view);
+        $view->widgets = apply_filters( 'gravityview/view/widgets', Widget_Collection::from_configuration( $configuration ), $view );
 
         /** View configuration. */
-        $view->settings->update(gravityview_get_template_settings($view->ID));
+        $view->settings->update( gravityview_get_template_settings( $view->ID ) );
 
         /** Add the template name into the settings. */
-        $view->settings->update(['template' => gravityview_get_template_id($view->ID)]);
+        $view->settings->update( [ 'template' => gravityview_get_template_id( $view->ID ) ] );
 
         /** View basics. */
-        $view->settings->update([
+        $view->settings->update( [
             'id' => $view->ID,
-        ]);
+        ] );
 
-        self::$cache["View::from_post:{$post->ID}"] = &$view;
+        self::$cache[ "View::from_post:{$post->ID}" ] = &$view;
 
         /**
          * @filter `gravityview/view/get` Override View.
@@ -843,7 +843,7 @@ 
          *
          * @since 2.1
          */
-        do_action_ref_array('gravityview/view/get', [&$view]);
+        do_action_ref_array( 'gravityview/view/get', [ &$view ] );
 
         return $view;
     }
@@ -855,14 +855,14 @@ 
      *
      * @internal
      */
-    public static function _flush_cache($view_id = null)
+    public static function _flush_cache( $view_id = null )
     {
-        if ($view_id) {
-            unset(self::$cache["View::from_post:$view_id"]);
+        if ( $view_id ) {
+            unset( self::$cache[ "View::from_post:$view_id" ] );
 
             return;
         }
-        self::$cache = [];
+        self::$cache = [ ];
     }
 
     /**
@@ -876,13 +876,13 @@ 
      *
      * @return \GV\View|null An instance around this \WP_Post or null if not found.
      */
-    public static function by_id($post_id)
+    public static function by_id( $post_id )
     {
-        if (!$post_id || !$post = get_post($post_id)) {
+        if ( ! $post_id || ! $post = get_post( $post_id ) ) {
             return null;
         }
 
-        return self::from_post($post);
+        return self::from_post( $post );
     }
 
     /**
@@ -896,9 +896,9 @@ 
      *
      * @return bool Whether the post exists or not.
      */
-    public static function exists($view)
+    public static function exists( $view )
     {
-        return get_post_type($view) == 'gravityview';
+        return get_post_type( $view ) == 'gravityview';
     }
 
     /**
@@ -911,11 +911,11 @@ 
      *
      * @return bool Whether the offset exists or not, limited to GravityView_View_Data::$views element keys.
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        $data_keys = ['id', 'view_id', 'form_id', 'template_id', 'atts', 'fields', 'widgets', 'form'];
+        $data_keys = [ 'id', 'view_id', 'form_id', 'template_id', 'atts', 'fields', 'widgets', 'form' ];
 
-        return in_array($offset, $data_keys);
+        return in_array( $offset, $data_keys );
     }
 
     /**
@@ -930,15 +930,15 @@ 
      *
      * @return mixed The value of the requested view data key limited to GravityView_View_Data::$views element keys. If offset not found, return null.
      */
-    public function offsetGet($offset)
+    public function offsetGet( $offset )
     {
-        gravityview()->log->notice('This is a \GV\View object should not be accessed as an array.');
+        gravityview()->log->notice( 'This is a \GV\View object should not be accessed as an array.' );
 
-        if (!isset($this[$offset])) {
+        if ( ! isset( $this[ $offset ] ) ) {
             return null;
         }
 
-        switch ($offset) {
+        switch ( $offset ) {
             case 'id':
             case 'view_id':
                 return $this->ID;
@@ -949,7 +949,7 @@ 
             case 'atts':
                 return $this->settings->as_atts();
             case 'template_id':
-                return $this->settings->get('template');
+                return $this->settings->get( 'template' );
             case 'widgets':
                 return $this->widgets->as_configuration();
         }
@@ -967,9 +967,9 @@ 
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet( $offset, $value )
     {
-        gravityview()->log->error('The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.');
+        gravityview()->log->error( 'The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.' );
     }
 
     /**
@@ -982,9 +982,9 @@ 
      *
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
-        gravityview()->log->error('The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.');
+        gravityview()->log->error( 'The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.' );
     }
 
     /**
@@ -1007,10 +1007,10 @@ 
             'id'          => $this->ID,
             'view_id'     => $this->ID,
             'form_id'     => $this->form ? $this->form->ID : null,
-            'form'        => $this->form ? gravityview_get_form($this->form->ID) : null,
+            'form'        => $this->form ? gravityview_get_form( $this->form->ID ) : null,
             'atts'        => $this->settings->as_atts(),
-            'fields'      => $this->fields->by_visible($this)->as_configuration(),
-            'template_id' => $this->settings->get('template'),
+            'fields'      => $this->fields->by_visible( $this )->as_configuration(),
+            'template_id' => $this->settings->get( 'template' ),
             'widgets'     => $this->widgets->as_configuration(),
         ];
     }
@@ -1022,13 +1022,13 @@ 
      *
      * @return \GV\Entry_Collection The entries.
      */
-    public function get_entries($request = null)
+    public function get_entries( $request = null )
     {
         $entries = new \GV\Entry_Collection();
 
-        if (!$this->form) {
+        if ( ! $this->form ) {
             // Documented below.
-            return apply_filters('gravityview/view/entries', $entries, $this, $request);
+            return apply_filters( 'gravityview/view/entries', $entries, $this, $request );
         }
 
         $parameters = $this->settings->as_atts();
@@ -1037,85 +1037,85 @@ 
          * Remove multiple sorting before calling legacy filters.
          * This allows us to fake it till we make it.
          */
-        if (!empty($parameters['sort_field']) && is_array($parameters['sort_field'])) {
+        if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
             $has_multisort = true;
-            $parameters['sort_field'] = reset($parameters['sort_field']);
-            if (!empty($parameters['sort_direction']) && is_array($parameters['sort_direction'])) {
-                $parameters['sort_direction'] = reset($parameters['sort_direction']);
+            $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
+            if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
+                $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
             }
         }
 
         /**
          * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
          */
-        $parameters = \GravityView_frontend::get_view_entries_parameters($parameters, $this->form->ID);
+        $parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID );
 
-        $parameters['context_view_id'] = $this->ID;
-        $parameters = \GVCommon::calculate_get_entries_criteria($parameters, $this->form->ID);
+        $parameters[ 'context_view_id' ] = $this->ID;
+        $parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
 
-        if (!is_array($parameters)) {
-            $parameters = [];
+        if ( ! is_array( $parameters ) ) {
+            $parameters = [ ];
         }
 
-        if (!is_array($parameters['search_criteria'])) {
-            $parameters['search_criteria'] = [];
+        if ( ! is_array( $parameters[ 'search_criteria' ] ) ) {
+            $parameters[ 'search_criteria' ] = [ ];
         }
 
-        if ((!isset($parameters['search_criteria']['field_filters'])) || (!is_array($parameters['search_criteria']['field_filters']))) {
-            $parameters['search_criteria']['field_filters'] = [];
+        if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) {
+            $parameters[ 'search_criteria' ][ 'field_filters' ] = [ ];
         }
 
-        if ($request instanceof REST\Request) {
+        if ( $request instanceof REST\Request ) {
             $atts = $this->settings->as_atts();
-            $paging_parameters = wp_parse_args($request->get_paging(), [
-                'paging' => ['page_size' => $atts['page_size']],
-            ]);
-            $parameters['paging'] = $paging_parameters['paging'];
+            $paging_parameters = wp_parse_args( $request->get_paging(), [
+                'paging' => [ 'page_size' => $atts[ 'page_size' ] ],
+            ] );
+            $parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
         }
 
-        $page = Utils::get($parameters['paging'], 'current_page') ?: ((($parameters['paging']['offset'] - $this->settings->get('offset')) / \GV\Utils::get($parameters, 'paging/page_size', 25)) + 1);
+        $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
 
         /**
          * Cleanup duplicate field_filter parameters to simplify the query.
          */
-        $unique_field_filters = [];
-        foreach (Utils::get($parameters, 'search_criteria/field_filters', []) as $key => $filter) {
-            if ('mode' === $key) {
-                $unique_field_filters['mode'] = $filter;
-            } elseif (!in_array($filter, $unique_field_filters)) {
-                $unique_field_filters[] = $filter;
+        $unique_field_filters = [ ];
+        foreach ( Utils::get( $parameters, 'search_criteria/field_filters', [ ] ) as $key => $filter ) {
+            if ( 'mode' === $key ) {
+                $unique_field_filters[ 'mode' ] = $filter;
+            } elseif ( ! in_array( $filter, $unique_field_filters ) ) {
+                $unique_field_filters[ ] = $filter;
             }
         }
-        $parameters['search_criteria']['field_filters'] = $unique_field_filters;
+        $parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters;
 
-        if (!empty($parameters['search_criteria']['field_filters'])) {
-            gravityview()->log->notice('search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.');
+        if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) {
+            gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' );
         }
 
-        if (gravityview()->plugin->supports(Plugin::FEATURE_GFQUERY)) {
+        if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) {
             $query_class = $this->get_query_class();
 
             /** @var \GF_Query $query */
-            $query = new $query_class($this->form->ID, $parameters['search_criteria'], Utils::get($parameters, 'sorting'));
+            $query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) );
 
             /**
              * Apply multisort.
              */
-            if (!empty($has_multisort)) {
+            if ( ! empty( $has_multisort ) ) {
                 $atts = $this->settings->as_atts();
 
-                $view_setting_sort_field_ids = \GV\Utils::get($atts, 'sort_field', []);
-                $view_setting_sort_directions = \GV\Utils::get($atts, 'sort_direction', []);
+                $view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', [ ] );
+                $view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', [ ] );
 
-                $has_sort_query_param = !empty($_GET['sort']) && is_array($_GET['sort']);
+                $has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] );
 
-                if ($has_sort_query_param) {
-                    $has_sort_query_param = array_filter(array_values($_GET['sort']));
+                if ( $has_sort_query_param ) {
+                    $has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) );
                 }
 
-                if ($this->settings->get('sort_columns') && $has_sort_query_param) {
-                    $sort_field_ids = array_keys($_GET['sort']);
-                    $sort_directions = array_values($_GET['sort']);
+                if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) {
+                    $sort_field_ids = array_keys( $_GET[ 'sort' ] );
+                    $sort_directions = array_values( $_GET[ 'sort' ] );
                 } else {
                     $sort_field_ids = $view_setting_sort_field_ids;
                     $sort_directions = $view_setting_sort_directions;
@@ -1123,22 +1123,22 @@ 
 
                 $skip_first = false;
 
-                foreach ((array) $sort_field_ids as $key => $sort_field_id) {
-                    if (!$skip_first && !$has_sort_query_param) {
+                foreach ( (array)$sort_field_ids as $key => $sort_field_id ) {
+                    if ( ! $skip_first && ! $has_sort_query_param ) {
                         $skip_first = true; // Skip the first one, it's already in the query
                         continue;
                     }
 
-                    $sort_field_id = \GravityView_frontend::_override_sorting_id_by_field_type($sort_field_id, $this->form->ID);
-                    $sort_direction = strtoupper(\GV\Utils::get($sort_directions, $key, 'ASC'));
+                    $sort_field_id = \GravityView_frontend::_override_sorting_id_by_field_type( $sort_field_id, $this->form->ID );
+                    $sort_direction = strtoupper( \GV\Utils::get( $sort_directions, $key, 'ASC' ) );
 
-                    if (!empty($sort_field_id)) {
-                        $order = new \GF_Query_Column($sort_field_id, $this->form->ID);
-                        if ('id' !== $sort_field_id && \GVCommon::is_field_numeric($this->form->ID, $sort_field_id)) {
-                            $order = \GF_Query_Call::CAST($order, defined('GF_Query::TYPE_DECIMAL') ? \GF_Query::TYPE_DECIMAL : \GF_Query::TYPE_SIGNED);
+                    if ( ! empty( $sort_field_id ) ) {
+                        $order = new \GF_Query_Column( $sort_field_id, $this->form->ID );
+                        if ( 'id' !== $sort_field_id && \GVCommon::is_field_numeric( $this->form->ID, $sort_field_id ) ) {
+                            $order = \GF_Query_Call::CAST( $order, defined( 'GF_Query::TYPE_DECIMAL' ) ? \GF_Query::TYPE_DECIMAL : \GF_Query::TYPE_SIGNED );
                         }
 
-                        $query->order($order, $sort_direction);
+                        $query->order( $order, $sort_direction );
                     }
                 }
             }
@@ -1146,147 +1146,147 @@ 
             /**
              * Merge time subfield sorts.
              */
-            add_filter('gform_gf_query_sql', $gf_query_timesort_sql_callback = function ($sql) use (&$query) {
+            add_filter( 'gform_gf_query_sql', $gf_query_timesort_sql_callback = function( $sql ) use ( &$query ) {
                 $q = $query->_introspect();
-                $orders = [];
+                $orders = [ ];
 
                 $merged_time = false;
 
-                foreach ($q['order'] as $oid => $order) {
+                foreach ( $q[ 'order' ] as $oid => $order ) {
                     $column = null;
 
-                    if ($order[0] instanceof \GF_Query_Column) {
-                        $column = $order[0];
-                    } elseif ($order[0] instanceof \GF_Query_Call) {
-                        if (count($order[0]->columns) != 1 || !$order[0]->columns[0] instanceof \GF_Query_Column) {
-                            $orders[$oid] = $order;
+                    if ( $order[ 0 ] instanceof \GF_Query_Column ) {
+                        $column = $order[ 0 ];
+                    } elseif ( $order[ 0 ] instanceof \GF_Query_Call ) {
+                        if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) {
+                            $orders[ $oid ] = $order;
                             continue; // Need something that resembles a single sort
                         }
-                        $column = $order[0]->columns[0];
+                        $column = $order[ 0 ]->columns[ 0 ];
                     }
 
-                    if (!$column || (!$field = \GFAPI::get_field($column->source, $column->field_id)) || $field->type !== 'time') {
-                        $orders[$oid] = $order;
+                    if ( ! $column || ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) {
+                        $orders[ $oid ] = $order;
                         continue; // Not a time field
                     }
 
-                    if (!class_exists('\GV\Mocks\GF_Query_Call_TIMESORT')) {
-                        require_once gravityview()->plugin->dir('future/_mocks.timesort.php');
+                    if ( ! class_exists( '\GV\Mocks\GF_Query_Call_TIMESORT' ) ) {
+                        require_once gravityview()->plugin->dir( 'future/_mocks.timesort.php' );
                     }
 
-                    $orders[$oid] = [
-                        new \GV\Mocks\GF_Query_Call_TIMESORT('timesort', [$column, $sql]),
-                        $order[1], // Mock it!
+                    $orders[ $oid ] = [
+                        new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', [ $column, $sql ] ),
+                        $order[ 1 ], // Mock it!
                     ];
 
                     $merged_time = true;
                 }
 
-                if ($merged_time) {
+                if ( $merged_time ) {
                     /**
                      * ORDER again.
                      */
-                    if (!empty($orders) && $_orders = $query->_order_generate($orders)) {
-                        $sql['order'] = 'ORDER BY '.implode(', ', $_orders);
+                    if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) {
+                        $sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders );
                     }
                 }
 
                 return $sql;
             });
 
-            $query->limit($parameters['paging']['page_size'])
-                ->offset((($page - 1) * $parameters['paging']['page_size']) + $this->settings->get('offset'));
+            $query->limit( $parameters[ 'paging' ][ 'page_size' ] )
+                ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
 
             /**
              * Any joins?
              */
-            if (gravityview()->plugin->supports(Plugin::FEATURE_JOINS) && count($this->joins)) {
-                $is_admin_and_can_view = $this->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $this->ID);
+            if ( gravityview()->plugin->supports( Plugin::FEATURE_JOINS ) && count( $this->joins ) ) {
+                $is_admin_and_can_view = $this->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $this->ID );
 
-                foreach ($this->joins as $join) {
-                    $query = $join->as_query_join($query);
+                foreach ( $this->joins as $join ) {
+                    $query = $join->as_query_join( $query );
 
-                    if ($this->settings->get('multiple_forms_disable_null_joins')) {
+                    if ( $this->settings->get( 'multiple_forms_disable_null_joins' ) ) {
 
                         // Disable NULL outputs
                         $condition = new \GF_Query_Condition(
-                            new \GF_Query_Column($join->join_on_column->ID, $join->join_on->ID),
+                            new \GF_Query_Column( $join->join_on_column->ID, $join->join_on->ID ),
                             \GF_Query_Condition::NEQ,
-                            new \GF_Query_Literal('')
+                            new \GF_Query_Literal( '' )
                         );
 
                         $query_parameters = $query->_introspect();
 
-                        $query->where(\GF_Query_Condition::_and($query_parameters['where'], $condition));
+                        $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
                     }
 
                     /**
                      * This is a temporary stub filter, until GF_Query supports NULL conditions.
                      * Do not use! This filter will be removed.
                      */
-                    if (defined('GF_Query_Condition::NULL')) {
+                    if ( defined( 'GF_Query_Condition::NULL' ) ) {
                         $is_null_condition_native = true;
                     } else {
-                        $is_null_condition_class = apply_filters('gravityview/query/is_null_condition', null);
+                        $is_null_condition_class = apply_filters( 'gravityview/query/is_null_condition', null );
                         $is_null_condition_native = false;
                     }
 
                     // Filter to active entries only
                     $condition = new \GF_Query_Condition(
-                        new \GF_Query_Column('status', $join->join_on->ID),
+                        new \GF_Query_Column( 'status', $join->join_on->ID ),
                         \GF_Query_Condition::EQ,
-                        new \GF_Query_Literal('active')
+                        new \GF_Query_Literal( 'active' )
                     );
 
-                    if ($is_null_condition_native) {
-                        $condition = \GF_Query_Condition::_or($condition, new \GF_Query_Condition(
-                            new \GF_Query_Column('status', $join->join_on->ID),
+                    if ( $is_null_condition_native ) {
+                        $condition = \GF_Query_Condition::_or( $condition, new \GF_Query_Condition(
+                            new \GF_Query_Column( 'status', $join->join_on->ID ),
                             \GF_Query_Condition::IS,
                             \GF_Query_Condition::NULL
-                        ));
-                    } elseif (!is_null($is_null_condition_class)) {
-                        $condition = \GF_Query_Condition::_or($condition, new $is_null_condition_class(
-                            new \GF_Query_Column('status', $join->join_on->ID)
-                        ));
+                        ) );
+                    } elseif ( ! is_null( $is_null_condition_class ) ) {
+                        $condition = \GF_Query_Condition::_or( $condition, new $is_null_condition_class(
+                            new \GF_Query_Column( 'status', $join->join_on->ID )
+                        ) );
                     }
 
                     $q = $query->_introspect();
-                    $query->where(\GF_Query_Condition::_and($q['where'], $condition));
+                    $query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) );
 
-                    if ($this->settings->get('show_only_approved') && !$is_admin_and_can_view) {
+                    if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
 
                         // Show only approved joined entries
                         $condition = new \GF_Query_Condition(
-                            new \GF_Query_Column(\GravityView_Entry_Approval::meta_key, $join->join_on->ID),
+                            new \GF_Query_Column( \GravityView_Entry_Approval::meta_key, $join->join_on->ID ),
                             \GF_Query_Condition::EQ,
-                            new \GF_Query_Literal(\GravityView_Entry_Approval_Status::APPROVED)
+                            new \GF_Query_Literal( \GravityView_Entry_Approval_Status::APPROVED )
                         );
 
-                        if ($is_null_condition_native) {
-                            $condition = \GF_Query_Condition::_or($condition, new \GF_Query_Condition(
-                                new \GF_Query_Column(\GravityView_Entry_Approval::meta_key, $join->join_on->ID),
+                        if ( $is_null_condition_native ) {
+                            $condition = \GF_Query_Condition::_or( $condition, new \GF_Query_Condition(
+                                new \GF_Query_Column( \GravityView_Entry_Approval::meta_key, $join->join_on->ID ),
                                 \GF_Query_Condition::IS,
                                 \GF_Query_Condition::NULL
-                            ));
-                        } elseif (!is_null($is_null_condition_class)) {
-                            $condition = \GF_Query_Condition::_or($condition, new $is_null_condition_class(
-                                new \GF_Query_Column(\GravityView_Entry_Approval::meta_key, $join->join_on->ID)
-                            ));
+                            ) );
+                        } elseif ( ! is_null( $is_null_condition_class ) ) {
+                            $condition = \GF_Query_Condition::_or( $condition, new $is_null_condition_class(
+                                new \GF_Query_Column( \GravityView_Entry_Approval::meta_key, $join->join_on->ID )
+                            ) );
                         }
 
                         $query_parameters = $query->_introspect();
 
-                        $query->where(\GF_Query_Condition::_and($query_parameters['where'], $condition));
+                        $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
                     }
                 }
 
                 /**
                  * Unions?
                  */
-            } elseif (gravityview()->plugin->supports(Plugin::FEATURE_UNIONS) && count($this->unions)) {
+            } elseif ( gravityview()->plugin->supports( Plugin::FEATURE_UNIONS ) && count( $this->unions ) ) {
                 $query_parameters = $query->_introspect();
 
-                $unions_sql = [];
+                $unions_sql = [ ];
 
                 /**
                  * @param \GF_Query_Condition $condition
@@ -1295,23 +1295,23 @@ 
                  *
                  * @return \GF_Query_Condition
                  */
-                $where_union_substitute = function ($condition, $fields, $recurse) {
-                    if ($condition->expressions) {
-                        $conditions = [];
+                $where_union_substitute = function( $condition, $fields, $recurse ) {
+                    if ( $condition->expressions ) {
+                        $conditions = [ ];
 
-                        foreach ($condition->expressions as $_condition) {
-                            $conditions[] = $recurse($_condition, $fields, $recurse);
+                        foreach ( $condition->expressions as $_condition ) {
+                            $conditions[ ] = $recurse( $_condition, $fields, $recurse );
                         }
 
                         return call_user_func_array(
-                            ['\GF_Query_Condition', $condition->operator == 'AND' ? '_and' : '_or'],
+                            [ '\GF_Query_Condition', $condition->operator == 'AND' ? '_and' : '_or' ],
                             $conditions
                         );
                     }
 
-                    if (!($condition->left && $condition->left instanceof \GF_Query_Column) || (!$condition->left->is_entry_column() && !$condition->left->is_meta_column())) {
+                    if ( ! ( $condition->left && $condition->left instanceof \GF_Query_Column ) || ( ! $condition->left->is_entry_column() && ! $condition->left->is_meta_column() ) ) {
                         return new \GF_Query_Condition(
-                            new \GF_Query_Column($fields[$condition->left->field_id]->ID),
+                            new \GF_Query_Column( $fields[ $condition->left->field_id ]->ID ),
                             $condition->operator,
                             $condition->right
                         );
@@ -1320,97 +1320,97 @@ 
                     return $condition;
                 };
 
-                foreach ($this->unions as $form_id => $fields) {
+                foreach ( $this->unions as $form_id => $fields ) {
 
                     // Build a new query for every unioned form
                     $query_class = $this->get_query_class();
 
                     /** @var \GF_Query|\GF_Patched_Query $q */
-                    $q = new $query_class($form_id);
+                    $q = new $query_class( $form_id );
 
                     // Copy the WHERE clauses but substitute the field_ids to the respective ones
-                    $q->where($where_union_substitute($query_parameters['where'], $fields, $where_union_substitute));
+                    $q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) );
 
                     // Copy the ORDER clause and substitute the field_ids to the respective ones
-                    foreach ($query_parameters['order'] as $order) {
-                        list($column, $_order) = $order;
+                    foreach ( $query_parameters[ 'order' ] as $order ) {
+                        list( $column, $_order ) = $order;
 
-                        if ($column && $column instanceof \GF_Query_Column) {
-                            if (!$column->is_entry_column() && !$column->is_meta_column()) {
-                                $column = new \GF_Query_Column($fields[$column->field_id]->ID);
+                        if ( $column && $column instanceof \GF_Query_Column ) {
+                            if ( ! $column->is_entry_column() && ! $column->is_meta_column() ) {
+                                $column = new \GF_Query_Column( $fields[ $column->field_id ]->ID );
                             }
 
-                            $q->order($column, $_order);
+                            $q->order( $column, $_order );
                         }
                     }
 
-                    add_filter('gform_gf_query_sql', $gf_query_sql_callback = function ($sql) use (&$unions_sql) {
+                    add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) {
                         // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-                        $select = 'UNION ALL '.str_replace('SQL_CALC_FOUND_ROWS ', '', $sql['select']);
+                        $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
                         // Record the SQL
-                        $unions_sql[] = [
+                        $unions_sql[ ] = [
                             // Remove columns, we'll rebuild them
-                            'select'  => preg_replace('#DISTINCT (.*)#', 'DISTINCT ', $select),
-                            'from'    => $sql['from'],
-                            'join'    => $sql['join'],
-                            'where'   => $sql['where'],
+                            'select'  => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ),
+                            'from'    => $sql[ 'from' ],
+                            'join'    => $sql[ 'join' ],
+                            'where'   => $sql[ 'where' ],
                             // Remove order and limit
                         ];
 
                         // Return empty query, no need to call the database
-                        return [];
+                        return [ ];
                     });
 
-                    do_action_ref_array('gravityview/view/query', [&$q, $this, $request]);
+                    do_action_ref_array( 'gravityview/view/query', [ &$q, $this, $request ] );
 
                     $q->get(); // Launch
 
-                    remove_filter('gform_gf_query_sql', $gf_query_sql_callback);
+                    remove_filter( 'gform_gf_query_sql', $gf_query_sql_callback );
                 }
 
-                add_filter('gform_gf_query_sql', $gf_query_sql_callback = function ($sql) use ($unions_sql) {
+                add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) {
                     // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-                    $sql['select'] = str_replace('SQL_CALC_FOUND_ROWS ', '', $sql['select']);
+                    $sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
                     // Remove columns, we'll rebuild them
-                    preg_match('#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match);
-                    $sql['select'] = preg_replace('#DISTINCT (.*)#', 'DISTINCT ', $sql['select']);
+                    preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match );
+                    $sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] );
 
-                    $unions = [];
+                    $unions = [ ];
 
                     // Transform selected columns to shared alias names
-                    $column_to_alias = function ($column) {
-                        $column = str_replace('`', '', $column);
+                    $column_to_alias = function( $column ) {
+                        $column = str_replace( '`', '', $column );
 
-                        return '`'.str_replace('.', '_', $column).'`';
+                        return '`' . str_replace( '.', '_', $column ) . '`';
                     };
 
                     // Add all the order columns into the selects, so we can order by the whole union group
-                    preg_match_all('#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches);
+                    preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches );
 
                     $columns = [
-                        sprintf('%s AS %s', $select_match[1], $column_to_alias($select_match[1])),
+                        sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) ),
                     ];
 
-                    foreach (array_slice($order_matches, 1) as $match) {
-                        $columns[] = sprintf('%s AS %s', $match[0], $column_to_alias($match[0]));
+                    foreach ( array_slice( $order_matches, 1 ) as $match ) {
+                        $columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) );
 
                         // Rewrite the order columns to the shared aliases
-                        $sql['order'] = str_replace($match[0], $column_to_alias($match[0]), $sql['order']);
+                        $sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] );
                     }
 
-                    $columns = array_unique($columns);
+                    $columns = array_unique( $columns );
 
                     // Add the columns to every UNION
-                    foreach ($unions_sql as $union_sql) {
-                        $union_sql['select'] .= implode(', ', $columns);
-                        $unions[] = implode(' ', $union_sql);
+                    foreach ( $unions_sql as $union_sql ) {
+                        $union_sql[ 'select' ] .= implode( ', ', $columns );
+                        $unions[ ] = implode( ' ', $union_sql );
                     }
 
                     // Add the columns to the main SELECT, but only grab the entry id column
-                    $sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM ('.$sql['select'].implode(', ', $columns);
-                    $sql['order'] = implode(' ', $unions).') AS u '.$sql['order'];
+                    $sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns );
+                    $sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ];
 
                     return $sql;
                 });
@@ -1423,54 +1423,54 @@ 
              * @param \GV\View    $this    The current view object
              * @param \GV\Request $request The request object
              */
-            do_action_ref_array('gravityview/view/query', [&$query, $this, $request]);
+            do_action_ref_array( 'gravityview/view/query', [ &$query, $this, $request ] );
 
-            gravityview()->log->debug('GF_Query parameters: ', ['data' => Utils::gf_query_debug($query)]);
+            gravityview()->log->debug( 'GF_Query parameters: ', [ 'data' => Utils::gf_query_debug( $query ) ] );
 
             /**
              * Map from Gravity Forms entries arrays to an Entry_Collection.
              */
-            if (count($this->joins)) {
-                foreach ($query->get() as $entry) {
+            if ( count( $this->joins ) ) {
+                foreach ( $query->get() as $entry ) {
                     $entries->add(
-                        Multi_Entry::from_entries(array_map('\GV\GF_Entry::from_entry', $entry))
+                        Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry ) )
                     );
                 }
             } else {
-                array_map([$entries, 'add'], array_map('\GV\GF_Entry::from_entry', $query->get()));
+                array_map( [ $entries, 'add' ], array_map( '\GV\GF_Entry::from_entry', $query->get() ) );
             }
 
-            if (isset($gf_query_sql_callback)) {
-                remove_action('gform_gf_query_sql', $gf_query_sql_callback);
+            if ( isset( $gf_query_sql_callback ) ) {
+                remove_action( 'gform_gf_query_sql', $gf_query_sql_callback );
             }
 
-            if (isset($gf_query_timesort_sql_callback)) {
-                remove_action('gform_gf_query_sql', $gf_query_timesort_sql_callback);
+            if ( isset( $gf_query_timesort_sql_callback ) ) {
+                remove_action( 'gform_gf_query_sql', $gf_query_timesort_sql_callback );
             }
 
             /**
              * Add total count callback.
              */
-            $entries->add_count_callback(function () use ($query) {
+            $entries->add_count_callback( function() use ( $query ) {
                 return $query->total_found;
             });
         } else {
             $entries = $this->form->entries
-                ->filter(\GV\GF_Entry_Filter::from_search_criteria($parameters['search_criteria']))
-                ->offset($this->settings->get('offset'))
-                ->limit($parameters['paging']['page_size'])
-                ->page($page);
+                ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
+                ->offset( $this->settings->get( 'offset' ) )
+                ->limit( $parameters[ 'paging' ][ 'page_size' ] )
+                ->page( $page );
 
-            if (!empty($parameters['sorting']) && is_array($parameters['sorting'] && !isset($parameters['sorting']['key']))) {
+            if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) {
                 // Pluck off multisort arrays
-                $parameters['sorting'] = $parameters['sorting'][0];
+                $parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ];
             }
 
-            if (!empty($parameters['sorting']) && !empty($parameters['sorting']['key'])) {
+            if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
                 $field = new \GV\Field();
-                $field->ID = $parameters['sorting']['key'];
-                $direction = strtolower($parameters['sorting']['direction']) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
-                $entries = $entries->sort(new \GV\Entry_Sort($field, $direction));
+                $field->ID = $parameters[ 'sorting' ][ 'key' ];
+                $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+                $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
             }
         }
 
@@ -1481,7 +1481,7 @@ 
          * @param \GV\View             $view    The view.
          * @param \GV\Request          $request The request.
          */
-        return apply_filters('gravityview/view/entries', $entries, $this, $request);
+        return apply_filters( 'gravityview/view/entries', $entries, $this, $request );
     }
 
     /**
@@ -1493,26 +1493,26 @@ 
      */
     public static function template_redirect()
     {
-        $is_csv = get_query_var('csv');
-        $is_tsv = get_query_var('tsv');
+        $is_csv = get_query_var( 'csv' );
+        $is_tsv = get_query_var( 'tsv' );
 
         /**
          * CSV output.
          */
-        if (!$is_csv && !$is_tsv) {
+        if ( ! $is_csv && ! $is_tsv ) {
             return;
         }
 
         $view = gravityview()->request->is_view();
 
-        if (!$view) {
+        if ( ! $view ) {
             return;
         }
 
-        $error_csv = $view->can_render(['csv']);
+        $error_csv = $view->can_render( [ 'csv' ] );
 
-        if (is_wp_error($error_csv)) {
-            gravityview()->log->error('Not rendering CSV or TSV: '.$error_csv->get_error_message());
+        if ( is_wp_error( $error_csv ) ) {
+            gravityview()->log->error( 'Not rendering CSV or TSV: ' . $error_csv->get_error_message() );
 
             return;
         }
@@ -1528,43 +1528,43 @@ 
          * @param string   $filename File name used when downloading a CSV or TSV. Default is "{View title}.csv" or "{View title}.tsv"
          * @param \GV\View $view     Current View being rendered
          */
-        $filename = apply_filters('gravityview/output/'.$file_type.'/filename', get_the_title($view->post), $view);
+        $filename = apply_filters( 'gravityview/output/' . $file_type . '/filename', get_the_title( $view->post ), $view );
 
-        if (!defined('DOING_GRAVITYVIEW_TESTS')) {
-            header(sprintf('Content-Disposition: attachment;filename="%s.'.$file_type.'"', sanitize_file_name($filename)));
-            header('Content-Transfer-Encoding: binary');
-            header('Content-Type: text/'.$file_type);
+        if ( ! defined( 'DOING_GRAVITYVIEW_TESTS' ) ) {
+            header( sprintf( 'Content-Disposition: attachment;filename="%s.' . $file_type . '"', sanitize_file_name( $filename ) ) );
+            header( 'Content-Transfer-Encoding: binary' );
+            header( 'Content-Type: text/' . $file_type );
         }
 
         ob_start();
-        $csv_or_tsv = fopen('php://output', 'w');
+        $csv_or_tsv = fopen( 'php://output', 'w' );
 
         /**
          * Add da' BOM if GF uses it.
          *
          * @see GFExport::start_export()
          */
-        if (apply_filters('gform_include_bom_export_entries', true, $view->form ? $view->form->form : null)) {
-            fputs($csv_or_tsv, "\xef\xbb\xbf");
+        if ( apply_filters( 'gform_include_bom_export_entries', true, $view->form ? $view->form->form : null ) ) {
+            fputs( $csv_or_tsv, "\xef\xbb\xbf" );
         }
 
-        if ($view->settings->get('csv_nolimit')) {
-            $view->settings->update(['page_size' => -1]);
+        if ( $view->settings->get( 'csv_nolimit' ) ) {
+            $view->settings->update( [ 'page_size' => -1 ] );
         }
 
         $entries = $view->get_entries();
 
         $headers_done = false;
-        $allowed = $headers = [];
+        $allowed = $headers = [ ];
 
-        foreach ($view->fields->by_position('directory_*')->by_visible($view)->all() as $id => $field) {
-            $allowed[] = $field;
+        foreach ( $view->fields->by_position( 'directory_*' )->by_visible( $view )->all() as $id => $field ) {
+            $allowed[ ] = $field;
         }
 
         $renderer = new Field_Renderer();
 
-        foreach ($entries->all() as $entry) {
-            $return = [];
+        foreach ( $entries->all() as $entry ) {
+            $return = [ ];
 
             /**
              * @filter `gravityview/csv/entry/fields` Allowlist more entry fields by ID that are output in CSV requests.
@@ -1573,42 +1573,42 @@ 
              * @param \GV\View  $view    The view.
              * @param \GV\Entry $entry   WordPress representation of the item.
              */
-            $allowed_field_ids = apply_filters('gravityview/csv/entry/fields', wp_list_pluck($allowed, 'ID'), $view, $entry);
+            $allowed_field_ids = apply_filters( 'gravityview/csv/entry/fields', wp_list_pluck( $allowed, 'ID' ), $view, $entry );
 
-            $allowed = array_filter($allowed, function ($field) use ($allowed_field_ids) {
-                return in_array($field->ID, $allowed_field_ids, true);
+            $allowed = array_filter( $allowed, function( $field ) use ( $allowed_field_ids ) {
+                return in_array( $field->ID, $allowed_field_ids, true );
             });
 
-            foreach (array_diff($allowed_field_ids, wp_list_pluck($allowed, 'ID')) as $field_id) {
-                $allowed[] = is_numeric($field_id) ? \GV\GF_Field::by_id($view->form, $field_id) : \GV\Internal_Field::by_id($field_id);
+            foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
+                $allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
             }
 
-            foreach ($allowed as $field) {
-                $source = is_numeric($field->ID) ? $view->form : new \GV\Internal_Source();
+            foreach ( $allowed as $field ) {
+                $source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source();
 
-                $return[] = $renderer->render($field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template');
+                $return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
 
-                if (!$headers_done) {
-                    $label = $field->get_label($view, $source, $entry);
-                    $headers[] = $label ? $label : $field->ID;
+                if ( ! $headers_done ) {
+                    $label = $field->get_label( $view, $source, $entry );
+                    $headers[ ] = $label ? $label : $field->ID;
                 }
             }
 
             // If not "tsv" then use comma
-            $delimiter = ('tsv' === $file_type) ? "\t" : ',';
+            $delimiter = ( 'tsv' === $file_type ) ? "\t" : ',';
 
-            if (!$headers_done) {
-                $headers_done = fputcsv($csv_or_tsv, array_map(['\GV\Utils', 'strip_excel_formulas'], array_values($headers)), $delimiter);
+            if ( ! $headers_done ) {
+                $headers_done = fputcsv( $csv_or_tsv, array_map( [ '\GV\Utils', 'strip_excel_formulas' ], array_values( $headers ) ), $delimiter );
             }
 
-            fputcsv($csv_or_tsv, array_map(['\GV\Utils', 'strip_excel_formulas'], $return), $delimiter);
+            fputcsv( $csv_or_tsv, array_map( [ '\GV\Utils', 'strip_excel_formulas' ], $return ), $delimiter );
         }
 
-        fflush($csv_or_tsv);
+        fflush( $csv_or_tsv );
 
-        echo rtrim(ob_get_clean());
+        echo rtrim( ob_get_clean() );
 
-        if (!defined('DOING_GRAVITYVIEW_TESTS')) {
+        if ( ! defined( 'DOING_GRAVITYVIEW_TESTS' ) ) {
             exit;
         }
     }
@@ -1626,7 +1626,7 @@ 
          * @param string The query class. Default: GF_Query.
          * @param \GV\View $this The View.
          */
-        $query_class = apply_filters('gravityview/query/class', '\GF_Query', $this);
+        $query_class = apply_filters( 'gravityview/query/class', '\GF_Query', $this );
 
         return $query_class;
     }
@@ -1645,7 +1645,7 @@ 
      *
      * @return array The resulting capabilities.
      */
-    public static function restrict($caps, $cap, $user_id, $args)
+    public static function restrict( $caps, $cap, $user_id, $args )
     {
         /**
          * @filter `gravityview/security/require_unfiltered_html` Bypass restrictions on Views that require `unfiltered_html`.
@@ -1658,41 +1658,41 @@ 
          * @param int    $user_id The user ID.
          * @param array  $args    Any additional args to map_meta_cap
          */
-        if (!apply_filters('gravityview/security/require_unfiltered_html', true, $cap, $user_id)) {
+        if ( ! apply_filters( 'gravityview/security/require_unfiltered_html', true, $cap, $user_id ) ) {
             return $caps;
         }
 
-        switch ($cap) {
+        switch ( $cap ) {
             case 'edit_gravityview':
             case 'edit_gravityviews':
             case 'edit_others_gravityviews':
             case 'edit_private_gravityviews':
             case 'edit_published_gravityviews':
-                if (!user_can($user_id, 'unfiltered_html')) {
-                    if (!user_can($user_id, 'gravityview_full_access')) {
-                        return ['do_not_allow'];
+                if ( ! user_can( $user_id, 'unfiltered_html' ) ) {
+                    if ( ! user_can( $user_id, 'gravityview_full_access' ) ) {
+                        return [ 'do_not_allow' ];
                     }
                 }
 
                 return $caps;
             case 'edit_post':
-                if ('gravityview' === get_post_type(array_pop($args))) {
-                    return self::restrict($caps, 'edit_gravityview', $user_id, $args);
+                if ( 'gravityview' === get_post_type( array_pop( $args ) ) ) {
+                    return self::restrict( $caps, 'edit_gravityview', $user_id, $args );
                 }
         }
 
         return $caps;
     }
 
-    public function __get($key)
+    public function __get( $key )
     {
-        if ($this->post) {
-            $raw_post = $this->post->filter('raw');
+        if ( $this->post ) {
+            $raw_post = $this->post->filter( 'raw' );
 
             return $raw_post->{$key};
         }
 
-        return isset($this->{$key}) ? $this->{$key} : null;
+        return isset( $this->{$key}) ? $this->{$key} : null;
     }
 
     /**

Braces +23 added lines, -46 removed lines

@@ -102,8 +102,7 @@ 
     /**
      * The constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->settings = new View_Settings();
         $this->fields = new Field_Collection();
         $this->widgets = new Widget_Collection();
@@ -116,8 +115,7 @@ 
      *
      * @return void
      */
-    public static function register_post_type()
-    {
+    public static function register_post_type() {
 
         /** Register only once */
         if (post_type_exists('gravityview')) {
@@ -244,8 +242,7 @@ 
      *
      * @return void
      */
-    public static function add_rewrite_endpoint()
-    {
+    public static function add_rewrite_endpoint() {
         /**
          * CSV.
          */
@@ -276,8 +273,7 @@ 
      *
      * @return string $content The view content as output by the renderers.
      */
-    public static function content($content)
-    {
+    public static function content($content) {
         $request = gravityview()->request;
 
         // Plugins may run through the content in the header. WP SEO does this for its OpenGraph functionality.
@@ -452,8 +448,7 @@ 
      *
      * @return bool|\WP_Error An error if this View shouldn't be rendered here.
      */
-    public function can_render($context = null, $request = null)
-    {
+    public function can_render($context = null, $request = null) {
         if (!$request) {
             $request = gravityview()->request;
         }
@@ -565,8 +560,7 @@ 
      *
      * @return \GV\Join[] Array of \GV\Join instances
      */
-    public static function get_joins($post)
-    {
+    public static function get_joins($post) {
         $joins = [];
 
         if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
@@ -620,8 +614,7 @@ 
      *
      * @return \GV\GF_Form[] Array of \GV\GF_Form instances
      */
-    public static function get_joined_forms($post_id)
-    {
+    public static function get_joined_forms($post_id) {
         $forms = [];
 
         if (!gravityview()->plugin->supports(Plugin::FEATURE_JOINS)) {
@@ -676,8 +669,7 @@ 
      *
      * @return \GV\Field[][] Array of unions (see self::$unions)
      */
-    public static function get_unions($post)
-    {
+    public static function get_unions($post) {
         $unions = [];
 
         if (!$post || 'gravityview' !== get_post_type($post)) {
@@ -735,8 +727,7 @@ 
      *
      * @return \GV\View|null An instance around this \WP_Post if valid, null otherwise.
      */
-    public static function from_post($post)
-    {
+    public static function from_post($post) {
         if (!$post || 'gravityview' !== get_post_type($post)) {
             gravityview()->log->error('Only gravityview post types can be \GV\View instances.');
 
@@ -855,8 +846,7 @@ 
      *
      * @internal
      */
-    public static function _flush_cache($view_id = null)
-    {
+    public static function _flush_cache($view_id = null) {
         if ($view_id) {
             unset(self::$cache["View::from_post:$view_id"]);
 
@@ -876,8 +866,7 @@ 
      *
      * @return \GV\View|null An instance around this \WP_Post or null if not found.
      */
-    public static function by_id($post_id)
-    {
+    public static function by_id($post_id) {
         if (!$post_id || !$post = get_post($post_id)) {
             return null;
         }
@@ -896,8 +885,7 @@ 
      *
      * @return bool Whether the post exists or not.
      */
-    public static function exists($view)
-    {
+    public static function exists($view) {
         return get_post_type($view) == 'gravityview';
     }
 
@@ -911,8 +899,7 @@ 
      *
      * @return bool Whether the offset exists or not, limited to GravityView_View_Data::$views element keys.
      */
-    public function offsetExists($offset)
-    {
+    public function offsetExists($offset) {
         $data_keys = ['id', 'view_id', 'form_id', 'template_id', 'atts', 'fields', 'widgets', 'form'];
 
         return in_array($offset, $data_keys);
@@ -930,8 +917,7 @@ 
      *
      * @return mixed The value of the requested view data key limited to GravityView_View_Data::$views element keys. If offset not found, return null.
      */
-    public function offsetGet($offset)
-    {
+    public function offsetGet($offset) {
         gravityview()->log->notice('This is a \GV\View object should not be accessed as an array.');
 
         if (!isset($this[$offset])) {
@@ -967,8 +953,7 @@ 
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
-    {
+    public function offsetSet($offset, $value) {
         gravityview()->log->error('The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.');
     }
 
@@ -982,8 +967,7 @@ 
      *
      * @return void
      */
-    public function offsetUnset($offset)
-    {
+    public function offsetUnset($offset) {
         gravityview()->log->error('The old view data is no longer mutable. This is a \GV\View object should not be accessed as an array.');
     }
 
@@ -1001,8 +985,7 @@ 
      *
      * @return array
      */
-    public function as_data()
-    {
+    public function as_data() {
         return [
             'id'          => $this->ID,
             'view_id'     => $this->ID,
@@ -1022,8 +1005,7 @@ 
      *
      * @return \GV\Entry_Collection The entries.
      */
-    public function get_entries($request = null)
-    {
+    public function get_entries($request = null) {
         $entries = new \GV\Entry_Collection();
 
         if (!$this->form) {
@@ -1491,8 +1473,7 @@ 
      *
      * @return void
      */
-    public static function template_redirect()
-    {
+    public static function template_redirect() {
         $is_csv = get_query_var('csv');
         $is_tsv = get_query_var('tsv');
 
@@ -1618,8 +1599,7 @@ 
      *
      * @return string The class name.
      */
-    public function get_query_class()
-    {
+    public function get_query_class() {
         /**
          * @filter `gravityview/query/class`
          *
@@ -1645,8 +1625,7 @@ 
      *
      * @return array The resulting capabilities.
      */
-    public static function restrict($caps, $cap, $user_id, $args)
-    {
+    public static function restrict($caps, $cap, $user_id, $args) {
         /**
          * @filter `gravityview/security/require_unfiltered_html` Bypass restrictions on Views that require `unfiltered_html`.
          *
@@ -1684,8 +1663,7 @@ 
         return $caps;
     }
 
-    public function __get($key)
-    {
+    public function __get($key) {
         if ($this->post) {
             $raw_post = $this->post->filter('raw');
 
@@ -1702,8 +1680,7 @@ 
      *
      * @return \WP_Post|null
      */
-    public function get_post()
-    {
+    public function get_post() {
         return $this->post ? $this->post : null;
     }
 }

future/includes/class-gv-shortcode-gventry.php

Indentation +234 added lines, -234 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,237 +12,237 @@ 
  */
 class gventry extends \GV\Shortcode
 {
-    /**
-     * {@inheritDoc}
-     */
-    public $name = 'gventry';
-
-    /**
-     * Process and output the [gventry] shortcode.
-     *
-     * @param array  $passed_atts The attributes passed.
-     * @param string $content     The content inside the shortcode.
-     * @param string $tag         The shortcode tag.
-     *
-     * @return string|null The output.
-     */
-    public function callback($atts, $content = '', $tag = '')
-    {
-        $request = gravityview()->request;
-
-        if ($request->is_admin()) {
-            return apply_filters('gravityview/shortcodes/gventry/output', '', null, null, $atts);
-        }
-
-        $atts = wp_parse_args($atts, [
-            'id'        => 0,
-            'entry_id'  => 0,
-            'view_id'   => 0,
-            'edit'      => 0,
-        ]);
-
-        $atts = gv_map_deep($atts, ['GravityView_Merge_Tags', 'replace_get_variables']);
-
-        /**
-         * @filter `gravityview/shortcodes/gventry/atts` Filter the [gventry] shortcode attributes.
-         *
-         * @param array $atts The initial attributes.
-         *
-         * @since 2.0
-         */
-        $atts = apply_filters('gravityview/shortcodes/gventry/atts', $atts);
-
-        $view = \GV\View::by_id($atts['view_id']);
-
-        if (!$view) {
-            gravityview()->log->error('View does not exist #{view_id}', ['view_id' => $atts['view_id']]);
-
-            return apply_filters('gravityview/shortcodes/gventry/output', '', null, null, $atts);
-        }
-
-        $entry_id = !empty($atts['entry_id']) ? $atts['entry_id'] : $atts['id'];
-
-        switch ($entry_id) {
-            case 'last':
-                if (class_exists('\GF_Query')) {
-                    /**
-                     * @todo Remove once we refactor the use of get_view_entries_parameters.
-                     *
-                     * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
-                     */
-                    add_filter('gravityview_get_entries', $filter = function ($parameters, $args, $form_id) {
-                        if (!empty($parameters['sorting'])) {
-                            /**
-                             * Reverse existing sorts.
-                             */
-                            $sort = &$parameters['sorting'];
-                            $sort['direction'] = $sort['direction'] == 'RAND' ?: ($sort['direction'] == 'ASC' ? 'DESC' : 'ASC');
-                        } else {
-                            /**
-                             * Otherwise, sort by date_created.
-                             */
-                            $parameters['sorting'] = [
-                                'key'        => 'id',
-                                'direction'  => 'ASC',
-                                'is_numeric' => true,
-                            ];
-                        }
-
-                        return $parameters;
-                    }, 10, 3);
-                    $entries = $view->get_entries(null);
-                    remove_filter('gravityview_get_entries', $filter);
-                } else {
-                    $entries = $view->get_entries(null);
-
-                    /** If a sort already exists, reverse it. */
-                    if ($sort = end($entries->sorts)) {
-                        $entries = $entries->sort(new \GV\Entry_Sort($sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ($sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC)), $sort->mode);
-                    } else {
-                        /** Otherwise, sort by date_created */
-                        $entries = $entries->sort(new \GV\Entry_Sort(\GV\Internal_Field::by_id('id'), \GV\Entry_Sort::ASC), \GV\Entry_Sort::NUMERIC);
-                    }
-                }
-
-                if (!$entry = $entries->first()) {
-                    return apply_filters('gravityview/shortcodes/gventry/output', '', $view, null, $atts);
-                }
-                break;
-            case 'first':
-                if (!$entry = $view->get_entries(null)->first()) {
-                    return apply_filters('gravityview/shortcodes/gventry/output', '', $view, null, $atts);
-                }
-                break;
-            default:
-                if (!$entry = \GV\GF_Entry::by_id($entry_id)) {
-                    gravityview()->log->error('Entry #{entry_id} not found', ['view_id' => $atts['view_id']]);
-
-                    return apply_filters('gravityview/shortcodes/gventry/output', '', $view, null, $atts);
-                }
-        }
-
-        if ($view->form->ID != $entry['form_id']) {
-            gravityview()->log->error('Entry does not belong to view (form mismatch)');
-
-            return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
-        }
-
-        if (post_password_required($view->ID)) {
-            gravityview()->log->notice('Post password is required for View #{view_id}', ['view_id' => $view->ID]);
-
-            return apply_filters('gravityview/shortcodes/gventry/output', get_the_password_form($view->ID), $view, $entry, $atts);
-        }
-
-        if (!$view->form) {
-            gravityview()->log->notice('View #{id} has no form attached to it.', ['id' => $view->ID]);
-
-            /**
-             * This View has no data source. There's nothing to show really.
-             * ...apart from a nice message if the user can do anything about it.
-             */
-            if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
-                $return = sprintf(__('This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false)));
-
-                return apply_filters('gravityview/shortcodes/gventry/output', $return, $view, $entry, $atts);
-            }
-
-            return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
-        }
-
-        /** Private, pending, draft, etc. */
-        $public_states = get_post_stati(['public' => true]);
-        if (!in_array($view->post_status, $public_states) && !\GVCommon::has_cap('read_gravityview', $view->ID)) {
-            gravityview()->log->notice('The current user cannot access this View #{view_id}', ['view_id' => $view->ID]);
-
-            return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
-        }
-
-        /** Unapproved entries. */
-        if ($entry['status'] != 'active') {
-            gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $entry->ID]);
-
-            return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
-        }
-
-        $is_admin_and_can_view = $view->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID);
-
-        if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
-            if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($entry->ID, \GravityView_Entry_Approval::meta_key))) {
-                gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $entry->ID]);
-
-                return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
-            }
-        }
-
-        if ($atts['edit']) {
-            /**
-             * Based on code in our unit-tests.
-             * Mocks old context, etc.
-             */
-            $loader = \GravityView_Edit_Entry::getInstance();
-            $render = $loader->instances['render'];
-
-            add_filter('gravityview/is_single_entry', '__return_true');
-
-            $form = \GFAPI::get_form($entry['form_id']);
-
-            $data = \GravityView_View_Data::getInstance($view);
-            $template = \GravityView_View::getInstance([
-                'form'    => $form,
-                'form_id' => $form['id'],
-                'view_id' => $view->ID,
-                'entries' => [$entry],
-                'atts'    => \GVCommon::get_template_settings($view->ID),
-            ]);
-
-            $_GET['edit'] = wp_create_nonce(
-                \GravityView_Edit_Entry::get_nonce_key($view->ID, $form['id'], $entry['id'])
-            );
-
-            add_filter('gravityview/edit_entry/success', $callback = function ($message) use ($view, $entry, $atts) {
-                $message = __('Entry Updated', 'gravityview');
-
-                /**
-                 * @filter `gravityview/shortcodes/gventry/edit/success` Modify the edit entry success message in [gventry].
-                 *
-                 * @since develop
-                 *
-                 * @param string    $message The message.
-                 * @param \GV\View  $view    The View.
-                 * @param \GV\Entry $entry   The entry.
-                 * @param array     $atts    The attributes.
-                 */
-                return apply_filters('gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts);
-            });
-
-            ob_start() && $render->init($data, \GV\Entry::by_id($entry['id']), $view);
-            $output = ob_get_clean(); // Render :)
-
-            remove_filter('gravityview/is_single_entry', '__return_true');
-            remove_filter('gravityview/edit_entry/success', $callback);
-        } else {
-            /** Remove the back link. */
-            add_filter('gravityview/template/links/back/url', '__return_false');
-
-            $renderer = new \GV\Entry_Renderer();
-
-            $request = new \GV\Mock_Request();
-            $request->returns['is_entry'] = $entry;
-
-            $output = $renderer->render($entry, $view, $request);
-
-            remove_filter('gravityview/template/links/back/url', '__return_false');
-        }
-
-        /**
-         * @filter `gravityview/shortcodes/gventry/output` Filter the [gventry] output.
-         *
-         * @param string         $output The output.
-         * @param \GV\View|null  $view   The View detected or null.
-         * @param \GV\Entry|null $entry  The Entry or null.
-         *
-         * @since 2.0
-         */
-        return apply_filters('gravityview/shortcodes/gventry/output', $output, $view, $entry, $atts);
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	public $name = 'gventry';
+
+	/**
+	 * Process and output the [gventry] shortcode.
+	 *
+	 * @param array  $passed_atts The attributes passed.
+	 * @param string $content     The content inside the shortcode.
+	 * @param string $tag         The shortcode tag.
+	 *
+	 * @return string|null The output.
+	 */
+	public function callback($atts, $content = '', $tag = '')
+	{
+		$request = gravityview()->request;
+
+		if ($request->is_admin()) {
+			return apply_filters('gravityview/shortcodes/gventry/output', '', null, null, $atts);
+		}
+
+		$atts = wp_parse_args($atts, [
+			'id'        => 0,
+			'entry_id'  => 0,
+			'view_id'   => 0,
+			'edit'      => 0,
+		]);
+
+		$atts = gv_map_deep($atts, ['GravityView_Merge_Tags', 'replace_get_variables']);
+
+		/**
+		 * @filter `gravityview/shortcodes/gventry/atts` Filter the [gventry] shortcode attributes.
+		 *
+		 * @param array $atts The initial attributes.
+		 *
+		 * @since 2.0
+		 */
+		$atts = apply_filters('gravityview/shortcodes/gventry/atts', $atts);
+
+		$view = \GV\View::by_id($atts['view_id']);
+
+		if (!$view) {
+			gravityview()->log->error('View does not exist #{view_id}', ['view_id' => $atts['view_id']]);
+
+			return apply_filters('gravityview/shortcodes/gventry/output', '', null, null, $atts);
+		}
+
+		$entry_id = !empty($atts['entry_id']) ? $atts['entry_id'] : $atts['id'];
+
+		switch ($entry_id) {
+			case 'last':
+				if (class_exists('\GF_Query')) {
+					/**
+					 * @todo Remove once we refactor the use of get_view_entries_parameters.
+					 *
+					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
+					 */
+					add_filter('gravityview_get_entries', $filter = function ($parameters, $args, $form_id) {
+						if (!empty($parameters['sorting'])) {
+							/**
+							 * Reverse existing sorts.
+							 */
+							$sort = &$parameters['sorting'];
+							$sort['direction'] = $sort['direction'] == 'RAND' ?: ($sort['direction'] == 'ASC' ? 'DESC' : 'ASC');
+						} else {
+							/**
+							 * Otherwise, sort by date_created.
+							 */
+							$parameters['sorting'] = [
+								'key'        => 'id',
+								'direction'  => 'ASC',
+								'is_numeric' => true,
+							];
+						}
+
+						return $parameters;
+					}, 10, 3);
+					$entries = $view->get_entries(null);
+					remove_filter('gravityview_get_entries', $filter);
+				} else {
+					$entries = $view->get_entries(null);
+
+					/** If a sort already exists, reverse it. */
+					if ($sort = end($entries->sorts)) {
+						$entries = $entries->sort(new \GV\Entry_Sort($sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ($sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC)), $sort->mode);
+					} else {
+						/** Otherwise, sort by date_created */
+						$entries = $entries->sort(new \GV\Entry_Sort(\GV\Internal_Field::by_id('id'), \GV\Entry_Sort::ASC), \GV\Entry_Sort::NUMERIC);
+					}
+				}
+
+				if (!$entry = $entries->first()) {
+					return apply_filters('gravityview/shortcodes/gventry/output', '', $view, null, $atts);
+				}
+				break;
+			case 'first':
+				if (!$entry = $view->get_entries(null)->first()) {
+					return apply_filters('gravityview/shortcodes/gventry/output', '', $view, null, $atts);
+				}
+				break;
+			default:
+				if (!$entry = \GV\GF_Entry::by_id($entry_id)) {
+					gravityview()->log->error('Entry #{entry_id} not found', ['view_id' => $atts['view_id']]);
+
+					return apply_filters('gravityview/shortcodes/gventry/output', '', $view, null, $atts);
+				}
+		}
+
+		if ($view->form->ID != $entry['form_id']) {
+			gravityview()->log->error('Entry does not belong to view (form mismatch)');
+
+			return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
+		}
+
+		if (post_password_required($view->ID)) {
+			gravityview()->log->notice('Post password is required for View #{view_id}', ['view_id' => $view->ID]);
+
+			return apply_filters('gravityview/shortcodes/gventry/output', get_the_password_form($view->ID), $view, $entry, $atts);
+		}
+
+		if (!$view->form) {
+			gravityview()->log->notice('View #{id} has no form attached to it.', ['id' => $view->ID]);
+
+			/**
+			 * This View has no data source. There's nothing to show really.
+			 * ...apart from a nice message if the user can do anything about it.
+			 */
+			if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
+				$return = sprintf(__('This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false)));
+
+				return apply_filters('gravityview/shortcodes/gventry/output', $return, $view, $entry, $atts);
+			}
+
+			return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
+		}
+
+		/** Private, pending, draft, etc. */
+		$public_states = get_post_stati(['public' => true]);
+		if (!in_array($view->post_status, $public_states) && !\GVCommon::has_cap('read_gravityview', $view->ID)) {
+			gravityview()->log->notice('The current user cannot access this View #{view_id}', ['view_id' => $view->ID]);
+
+			return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
+		}
+
+		/** Unapproved entries. */
+		if ($entry['status'] != 'active') {
+			gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $entry->ID]);
+
+			return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
+		}
+
+		$is_admin_and_can_view = $view->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID);
+
+		if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
+			if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($entry->ID, \GravityView_Entry_Approval::meta_key))) {
+				gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $entry->ID]);
+
+				return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
+			}
+		}
+
+		if ($atts['edit']) {
+			/**
+			 * Based on code in our unit-tests.
+			 * Mocks old context, etc.
+			 */
+			$loader = \GravityView_Edit_Entry::getInstance();
+			$render = $loader->instances['render'];
+
+			add_filter('gravityview/is_single_entry', '__return_true');
+
+			$form = \GFAPI::get_form($entry['form_id']);
+
+			$data = \GravityView_View_Data::getInstance($view);
+			$template = \GravityView_View::getInstance([
+				'form'    => $form,
+				'form_id' => $form['id'],
+				'view_id' => $view->ID,
+				'entries' => [$entry],
+				'atts'    => \GVCommon::get_template_settings($view->ID),
+			]);
+
+			$_GET['edit'] = wp_create_nonce(
+				\GravityView_Edit_Entry::get_nonce_key($view->ID, $form['id'], $entry['id'])
+			);
+
+			add_filter('gravityview/edit_entry/success', $callback = function ($message) use ($view, $entry, $atts) {
+				$message = __('Entry Updated', 'gravityview');
+
+				/**
+				 * @filter `gravityview/shortcodes/gventry/edit/success` Modify the edit entry success message in [gventry].
+				 *
+				 * @since develop
+				 *
+				 * @param string    $message The message.
+				 * @param \GV\View  $view    The View.
+				 * @param \GV\Entry $entry   The entry.
+				 * @param array     $atts    The attributes.
+				 */
+				return apply_filters('gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts);
+			});
+
+			ob_start() && $render->init($data, \GV\Entry::by_id($entry['id']), $view);
+			$output = ob_get_clean(); // Render :)
+
+			remove_filter('gravityview/is_single_entry', '__return_true');
+			remove_filter('gravityview/edit_entry/success', $callback);
+		} else {
+			/** Remove the back link. */
+			add_filter('gravityview/template/links/back/url', '__return_false');
+
+			$renderer = new \GV\Entry_Renderer();
+
+			$request = new \GV\Mock_Request();
+			$request->returns['is_entry'] = $entry;
+
+			$output = $renderer->render($entry, $view, $request);
+
+			remove_filter('gravityview/template/links/back/url', '__return_false');
+		}
+
+		/**
+		 * @filter `gravityview/shortcodes/gventry/output` Filter the [gventry] output.
+		 *
+		 * @param string         $output The output.
+		 * @param \GV\View|null  $view   The View detected or null.
+		 * @param \GV\Entry|null $entry  The Entry or null.
+		 *
+		 * @since 2.0
+		 */
+		return apply_filters('gravityview/shortcodes/gventry/output', $output, $view, $entry, $atts);
+	}
 }

Spacing +81 added lines, -81 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV\Shortcodes;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -26,22 +26,22 @@ 
      *
      * @return string|null The output.
      */
-    public function callback($atts, $content = '', $tag = '')
+    public function callback( $atts, $content = '', $tag = '' )
     {
         $request = gravityview()->request;
 
-        if ($request->is_admin()) {
-            return apply_filters('gravityview/shortcodes/gventry/output', '', null, null, $atts);
+        if ( $request->is_admin() ) {
+            return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
         }
 
-        $atts = wp_parse_args($atts, [
+        $atts = wp_parse_args( $atts, [
             'id'        => 0,
             'entry_id'  => 0,
             'view_id'   => 0,
             'edit'      => 0,
-        ]);
+        ] );
 
-        $atts = gv_map_deep($atts, ['GravityView_Merge_Tags', 'replace_get_variables']);
+        $atts = gv_map_deep( $atts, [ 'GravityView_Merge_Tags', 'replace_get_variables' ] );
 
         /**
          * @filter `gravityview/shortcodes/gventry/atts` Filter the [gventry] shortcode attributes.
@@ -50,38 +50,38 @@ 
          *
          * @since 2.0
          */
-        $atts = apply_filters('gravityview/shortcodes/gventry/atts', $atts);
+        $atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
 
-        $view = \GV\View::by_id($atts['view_id']);
+        $view = \GV\View::by_id( $atts[ 'view_id' ] );
 
-        if (!$view) {
-            gravityview()->log->error('View does not exist #{view_id}', ['view_id' => $atts['view_id']]);
+        if ( ! $view ) {
+            gravityview()->log->error( 'View does not exist #{view_id}', [ 'view_id' => $atts[ 'view_id' ] ] );
 
-            return apply_filters('gravityview/shortcodes/gventry/output', '', null, null, $atts);
+            return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
         }
 
-        $entry_id = !empty($atts['entry_id']) ? $atts['entry_id'] : $atts['id'];
+        $entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
 
-        switch ($entry_id) {
+        switch ( $entry_id ) {
             case 'last':
-                if (class_exists('\GF_Query')) {
+                if ( class_exists( '\GF_Query' ) ) {
                     /**
                      * @todo Remove once we refactor the use of get_view_entries_parameters.
                      *
                      * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
                      */
-                    add_filter('gravityview_get_entries', $filter = function ($parameters, $args, $form_id) {
-                        if (!empty($parameters['sorting'])) {
+                    add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
+                        if ( ! empty( $parameters[ 'sorting' ] ) ) {
                             /**
                              * Reverse existing sorts.
                              */
-                            $sort = &$parameters['sorting'];
-                            $sort['direction'] = $sort['direction'] == 'RAND' ?: ($sort['direction'] == 'ASC' ? 'DESC' : 'ASC');
+                            $sort = &$parameters[ 'sorting' ];
+                            $sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
                         } else {
                             /**
                              * Otherwise, sort by date_created.
                              */
-                            $parameters['sorting'] = [
+                            $parameters[ 'sorting' ] = [
                                 'key'        => 'id',
                                 'direction'  => 'ASC',
                                 'is_numeric' => true,
@@ -89,118 +89,118 @@ 
                         }
 
                         return $parameters;
-                    }, 10, 3);
-                    $entries = $view->get_entries(null);
-                    remove_filter('gravityview_get_entries', $filter);
+                    }, 10, 3 );
+                    $entries = $view->get_entries( null );
+                    remove_filter( 'gravityview_get_entries', $filter );
                 } else {
-                    $entries = $view->get_entries(null);
+                    $entries = $view->get_entries( null );
 
                     /** If a sort already exists, reverse it. */
-                    if ($sort = end($entries->sorts)) {
-                        $entries = $entries->sort(new \GV\Entry_Sort($sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ($sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC)), $sort->mode);
+                    if ( $sort = end( $entries->sorts ) ) {
+                        $entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
                     } else {
                         /** Otherwise, sort by date_created */
-                        $entries = $entries->sort(new \GV\Entry_Sort(\GV\Internal_Field::by_id('id'), \GV\Entry_Sort::ASC), \GV\Entry_Sort::NUMERIC);
+                        $entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
                     }
                 }
 
-                if (!$entry = $entries->first()) {
-                    return apply_filters('gravityview/shortcodes/gventry/output', '', $view, null, $atts);
+                if ( ! $entry = $entries->first() ) {
+                    return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
                 }
                 break;
             case 'first':
-                if (!$entry = $view->get_entries(null)->first()) {
-                    return apply_filters('gravityview/shortcodes/gventry/output', '', $view, null, $atts);
+                if ( ! $entry = $view->get_entries( null )->first() ) {
+                    return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
                 }
                 break;
             default:
-                if (!$entry = \GV\GF_Entry::by_id($entry_id)) {
-                    gravityview()->log->error('Entry #{entry_id} not found', ['view_id' => $atts['view_id']]);
+                if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
+                    gravityview()->log->error( 'Entry #{entry_id} not found', [ 'view_id' => $atts[ 'view_id' ] ] );
 
-                    return apply_filters('gravityview/shortcodes/gventry/output', '', $view, null, $atts);
+                    return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
                 }
         }
 
-        if ($view->form->ID != $entry['form_id']) {
-            gravityview()->log->error('Entry does not belong to view (form mismatch)');
+        if ( $view->form->ID != $entry[ 'form_id' ] ) {
+            gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
 
-            return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
+            return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
         }
 
-        if (post_password_required($view->ID)) {
-            gravityview()->log->notice('Post password is required for View #{view_id}', ['view_id' => $view->ID]);
+        if ( post_password_required( $view->ID ) ) {
+            gravityview()->log->notice( 'Post password is required for View #{view_id}', [ 'view_id' => $view->ID ] );
 
-            return apply_filters('gravityview/shortcodes/gventry/output', get_the_password_form($view->ID), $view, $entry, $atts);
+            return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
         }
 
-        if (!$view->form) {
-            gravityview()->log->notice('View #{id} has no form attached to it.', ['id' => $view->ID]);
+        if ( ! $view->form ) {
+            gravityview()->log->notice( 'View #{id} has no form attached to it.', [ 'id' => $view->ID ] );
 
             /**
              * This View has no data source. There's nothing to show really.
              * ...apart from a nice message if the user can do anything about it.
              */
-            if (\GVCommon::has_cap(['edit_gravityviews', 'edit_gravityview'], $view->ID)) {
-                $return = sprintf(__('This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview'), esc_url(get_edit_post_link($view->ID, false)));
+            if ( \GVCommon::has_cap( [ 'edit_gravityviews', 'edit_gravityview' ], $view->ID ) ) {
+                $return = sprintf( __( 'This View is not configured properly. Start by <a href="%s">selecting a form</a>.', 'gravityview' ), esc_url( get_edit_post_link( $view->ID, false ) ) );
 
-                return apply_filters('gravityview/shortcodes/gventry/output', $return, $view, $entry, $atts);
+                return apply_filters( 'gravityview/shortcodes/gventry/output', $return, $view, $entry, $atts );
             }
 
-            return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
+            return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
         }
 
         /** Private, pending, draft, etc. */
-        $public_states = get_post_stati(['public' => true]);
-        if (!in_array($view->post_status, $public_states) && !\GVCommon::has_cap('read_gravityview', $view->ID)) {
-            gravityview()->log->notice('The current user cannot access this View #{view_id}', ['view_id' => $view->ID]);
+        $public_states = get_post_stati( [ 'public' => true ] );
+        if ( ! in_array( $view->post_status, $public_states ) && ! \GVCommon::has_cap( 'read_gravityview', $view->ID ) ) {
+            gravityview()->log->notice( 'The current user cannot access this View #{view_id}', [ 'view_id' => $view->ID ] );
 
-            return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
+            return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
         }
 
         /** Unapproved entries. */
-        if ($entry['status'] != 'active') {
-            gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $entry->ID]);
+        if ( $entry[ 'status' ] != 'active' ) {
+            gravityview()->log->notice( 'Entry ID #{entry_id} is not active', [ 'entry_id' => $entry->ID ] );
 
-            return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
+            return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
         }
 
-        $is_admin_and_can_view = $view->settings->get('admin_show_all_statuses') && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID);
+        $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
-        if ($view->settings->get('show_only_approved') && !$is_admin_and_can_view) {
-            if (!\GravityView_Entry_Approval_Status::is_approved(gform_get_meta($entry->ID, \GravityView_Entry_Approval::meta_key))) {
-                gravityview()->log->error('Entry ID #{entry_id} is not approved for viewing', ['entry_id' => $entry->ID]);
+        if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
+            if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
+                gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', [ 'entry_id' => $entry->ID ] );
 
-                return apply_filters('gravityview/shortcodes/gventry/output', '', $view, $entry, $atts);
+                return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
             }
         }
 
-        if ($atts['edit']) {
+        if ( $atts[ 'edit' ] ) {
             /**
              * Based on code in our unit-tests.
              * Mocks old context, etc.
              */
             $loader = \GravityView_Edit_Entry::getInstance();
-            $render = $loader->instances['render'];
+            $render = $loader->instances[ 'render' ];
 
-            add_filter('gravityview/is_single_entry', '__return_true');
+            add_filter( 'gravityview/is_single_entry', '__return_true' );
 
-            $form = \GFAPI::get_form($entry['form_id']);
+            $form = \GFAPI::get_form( $entry[ 'form_id' ] );
 
-            $data = \GravityView_View_Data::getInstance($view);
-            $template = \GravityView_View::getInstance([
+            $data = \GravityView_View_Data::getInstance( $view );
+            $template = \GravityView_View::getInstance( [
                 'form'    => $form,
-                'form_id' => $form['id'],
+                'form_id' => $form[ 'id' ],
                 'view_id' => $view->ID,
-                'entries' => [$entry],
-                'atts'    => \GVCommon::get_template_settings($view->ID),
-            ]);
+                'entries' => [ $entry ],
+                'atts'    => \GVCommon::get_template_settings( $view->ID ),
+            ] );
 
-            $_GET['edit'] = wp_create_nonce(
-                \GravityView_Edit_Entry::get_nonce_key($view->ID, $form['id'], $entry['id'])
+            $_GET[ 'edit' ] = wp_create_nonce(
+                \GravityView_Edit_Entry::get_nonce_key( $view->ID, $form[ 'id' ], $entry[ 'id' ] )
             );
 
-            add_filter('gravityview/edit_entry/success', $callback = function ($message) use ($view, $entry, $atts) {
-                $message = __('Entry Updated', 'gravityview');
+            add_filter( 'gravityview/edit_entry/success', $callback = function( $message ) use ( $view, $entry, $atts ) {
+                $message = __( 'Entry Updated', 'gravityview' );
 
                 /**
                  * @filter `gravityview/shortcodes/gventry/edit/success` Modify the edit entry success message in [gventry].
@@ -212,26 +212,26 @@ 
                  * @param \GV\Entry $entry   The entry.
                  * @param array     $atts    The attributes.
                  */
-                return apply_filters('gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts);
+                return apply_filters( 'gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts );
             });
 
-            ob_start() && $render->init($data, \GV\Entry::by_id($entry['id']), $view);
+            ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view );
             $output = ob_get_clean(); // Render :)
 
-            remove_filter('gravityview/is_single_entry', '__return_true');
-            remove_filter('gravityview/edit_entry/success', $callback);
+            remove_filter( 'gravityview/is_single_entry', '__return_true' );
+            remove_filter( 'gravityview/edit_entry/success', $callback );
         } else {
             /** Remove the back link. */
-            add_filter('gravityview/template/links/back/url', '__return_false');
+            add_filter( 'gravityview/template/links/back/url', '__return_false' );
 
             $renderer = new \GV\Entry_Renderer();
 
             $request = new \GV\Mock_Request();
-            $request->returns['is_entry'] = $entry;
+            $request->returns[ 'is_entry' ] = $entry;
 
-            $output = $renderer->render($entry, $view, $request);
+            $output = $renderer->render( $entry, $view, $request );
 
-            remove_filter('gravityview/template/links/back/url', '__return_false');
+            remove_filter( 'gravityview/template/links/back/url', '__return_false' );
         }
 
         /**
@@ -243,6 +243,6 @@ 
          *
          * @since 2.0
          */
-        return apply_filters('gravityview/shortcodes/gventry/output', $output, $view, $entry, $atts);
+        return apply_filters( 'gravityview/shortcodes/gventry/output', $output, $view, $entry, $atts );
     }
 }

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
      *
      * @return string|null The output.
      */
-    public function callback($atts, $content = '', $tag = '')
-    {
+    public function callback($atts, $content = '', $tag = '') {
         $request = gravityview()->request;
 
         if ($request->is_admin()) {

future/includes/class-gv-settings.php

Indentation +85 added lines, -85 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,94 +12,94 @@ 
  */
 class Settings
 {
-    /**
-     * @var array Main storage for key-values in this collection.
-     */
-    private $settings = [];
+	/**
+	 * @var array Main storage for key-values in this collection.
+	 */
+	private $settings = [];
 
-    /**
-     * Create with new.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @param array $settings Initial settings. Default: none.
-     *
-     * @return \GV\Settings
-     */
-    public function __construct($settings = [])
-    {
-        if (is_array($settings) && !empty($settings)) {
-            $this->update($settings);
-        }
-    }
+	/**
+	 * Create with new.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @param array $settings Initial settings. Default: none.
+	 *
+	 * @return \GV\Settings
+	 */
+	public function __construct($settings = [])
+	{
+		if (is_array($settings) && !empty($settings)) {
+			$this->update($settings);
+		}
+	}
 
-    /**
-     * Mass update values from the allowed ones.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @param array $settings An array of settings to update.
-     *
-     * @return \GV\Settings self chain.
-     */
-    public function update($settings)
-    {
-        foreach ($settings as $key => $value) {
-            $this->set($key, $value);
-        }
+	/**
+	 * Mass update values from the allowed ones.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @param array $settings An array of settings to update.
+	 *
+	 * @return \GV\Settings self chain.
+	 */
+	public function update($settings)
+	{
+		foreach ($settings as $key => $value) {
+			$this->set($key, $value);
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Set a setting.
-     *
-     * @param mixed $key   The key the value should be added under.
-     * @param mixed $value The value to be added to the key.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function set($key, $value)
-    {
-        $this->settings[$key] = $value;
-    }
+	/**
+	 * Set a setting.
+	 *
+	 * @param mixed $key   The key the value should be added under.
+	 * @param mixed $value The value to be added to the key.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function set($key, $value)
+	{
+		$this->settings[$key] = $value;
+	}
 
-    /**
-     * Set an setting.
-     *
-     * @param mixed $key     The key in this setting to retrieve.
-     * @param mixed $default A default in case the key is not set.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return mixed|null
-     */
-    public function get($key, $default = null)
-    {
-        return Utils::get($this->settings, $key, $default);
-    }
+	/**
+	 * Set an setting.
+	 *
+	 * @param mixed $key     The key in this setting to retrieve.
+	 * @param mixed $default A default in case the key is not set.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return mixed|null
+	 */
+	public function get($key, $default = null)
+	{
+		return Utils::get($this->settings, $key, $default);
+	}
 
-    /**
-     * Returns all the objects in this collection as an an array.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return array The objects in this collection.
-     */
-    public function all()
-    {
-        return $this->settings;
-    }
+	/**
+	 * Returns all the objects in this collection as an an array.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return array The objects in this collection.
+	 */
+	public function all()
+	{
+		return $this->settings;
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -15,7 +15,7 @@ 
     /**
      * @var array Main storage for key-values in this collection.
      */
-    private $settings = [];
+    private $settings = [ ];
 
     /**
      * Create with new.
@@ -28,10 +28,10 @@ 
      *
      * @return \GV\Settings
      */
-    public function __construct($settings = [])
+    public function __construct( $settings = [ ] )
     {
-        if (is_array($settings) && !empty($settings)) {
-            $this->update($settings);
+        if ( is_array( $settings ) && ! empty( $settings ) ) {
+            $this->update( $settings );
         }
     }
 
@@ -46,10 +46,10 @@ 
      *
      * @return \GV\Settings self chain.
      */
-    public function update($settings)
+    public function update( $settings )
     {
-        foreach ($settings as $key => $value) {
-            $this->set($key, $value);
+        foreach ( $settings as $key => $value ) {
+            $this->set( $key, $value );
         }
 
         return $this;
@@ -67,9 +67,9 @@ 
      *
      * @return void
      */
-    public function set($key, $value)
+    public function set( $key, $value )
     {
-        $this->settings[$key] = $value;
+        $this->settings[ $key ] = $value;
     }
 
     /**
@@ -84,9 +84,9 @@ 
      *
      * @return mixed|null
      */
-    public function get($key, $default = null)
+    public function get( $key, $default = null )
     {
-        return Utils::get($this->settings, $key, $default);
+        return Utils::get( $this->settings, $key, $default );
     }
 
     /**

Braces +6 added lines, -12 removed lines

@@ -10,8 +10,7 @@ 
 /**
  * A generic Settings base class.
  */
-class Settings
-{
+class Settings {
     /**
      * @var array Main storage for key-values in this collection.
      */
@@ -28,8 +27,7 @@ 
      *
      * @return \GV\Settings
      */
-    public function __construct($settings = [])
-    {
+    public function __construct($settings = []) {
         if (is_array($settings) && !empty($settings)) {
             $this->update($settings);
         }
@@ -46,8 +44,7 @@ 
      *
      * @return \GV\Settings self chain.
      */
-    public function update($settings)
-    {
+    public function update($settings) {
         foreach ($settings as $key => $value) {
             $this->set($key, $value);
         }
@@ -67,8 +64,7 @@ 
      *
      * @return void
      */
-    public function set($key, $value)
-    {
+    public function set($key, $value) {
         $this->settings[$key] = $value;
     }
 
@@ -84,8 +80,7 @@ 
      *
      * @return mixed|null
      */
-    public function get($key, $default = null)
-    {
+    public function get($key, $default = null) {
         return Utils::get($this->settings, $key, $default);
     }
 
@@ -98,8 +93,7 @@ 
      *
      * @return array The objects in this collection.
      */
-    public function all()
-    {
+    public function all() {
         return $this->settings;
     }
 }

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

Indentation +41 added lines, -41 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,47 +12,47 @@ 
  */
 class Form_Collection extends Collection
 {
-    /**
-     * Add a \GV\Form to this collection.
-     *
-     * @param \GV\Form $form The form to add to the internal array.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function add($form)
-    {
-        if (!$form instanceof Form) {
-            gravityview()->log->error('Form_Collections can only contain objects of type \GV\Form.');
+	/**
+	 * Add a \GV\Form to this collection.
+	 *
+	 * @param \GV\Form $form The form to add to the internal array.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function add($form)
+	{
+		if (!$form instanceof Form) {
+			gravityview()->log->error('Form_Collections can only contain objects of type \GV\Form.');
 
-            return;
-        }
-        parent::add($form);
-    }
+			return;
+		}
+		parent::add($form);
+	}
 
-    /**
-     * Get a \GV\Form from this list.
-     *
-     * @param int    $form_id The ID of the form to get.
-     * @param string $backend The form backend identifier, allows for multiple form backends in the future. Unused until then.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\Form|null The \GV\Form with the $form_id as the ID, or null if not found.
-     */
-    public function get($form_id, $backend = 'gravityforms')
-    {
-        foreach ($this->all() as $form) {
-            if ($form->ID == $form_id) {
-                return $form;
-            }
-        }
+	/**
+	 * Get a \GV\Form from this list.
+	 *
+	 * @param int    $form_id The ID of the form to get.
+	 * @param string $backend The form backend identifier, allows for multiple form backends in the future. Unused until then.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\Form|null The \GV\Form with the $form_id as the ID, or null if not found.
+	 */
+	public function get($form_id, $backend = 'gravityforms')
+	{
+		foreach ($this->all() as $form) {
+			if ($form->ID == $form_id) {
+				return $form;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -23,14 +23,14 @@ 
      *
      * @return void
      */
-    public function add($form)
+    public function add( $form )
     {
-        if (!$form instanceof Form) {
-            gravityview()->log->error('Form_Collections can only contain objects of type \GV\Form.');
+        if ( ! $form instanceof Form ) {
+            gravityview()->log->error( 'Form_Collections can only contain objects of type \GV\Form.' );
 
             return;
         }
-        parent::add($form);
+        parent::add( $form );
     }
 
     /**
@@ -45,10 +45,10 @@ 
      *
      * @return \GV\Form|null The \GV\Form with the $form_id as the ID, or null if not found.
      */
-    public function get($form_id, $backend = 'gravityforms')
+    public function get( $form_id, $backend = 'gravityforms' )
     {
-        foreach ($this->all() as $form) {
-            if ($form->ID == $form_id) {
+        foreach ( $this->all() as $form ) {
+            if ( $form->ID == $form_id ) {
                 return $form;
             }
         }

Braces +3 added lines, -6 removed lines

@@ -10,8 +10,7 @@ 
 /**
  * A collection of \GV\Form objects.
  */
-class Form_Collection extends Collection
-{
+class Form_Collection extends Collection {
     /**
      * Add a \GV\Form to this collection.
      *
@@ -23,8 +22,7 @@ 
      *
      * @return void
      */
-    public function add($form)
-    {
+    public function add($form) {
         if (!$form instanceof Form) {
             gravityview()->log->error('Form_Collections can only contain objects of type \GV\Form.');
 
@@ -45,8 +43,7 @@ 
      *
      * @return \GV\Form|null The \GV\Form with the $form_id as the ID, or null if not found.
      */
-    public function get($form_id, $backend = 'gravityforms')
-    {
+    public function get($form_id, $backend = 'gravityforms') {
         foreach ($this->all() as $form) {
             if ($form->ID == $form_id) {
                 return $form;

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

Indentation +288 added lines, -288 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,291 +14,291 @@ 
  */
 class View_List_Template extends View_Template
 {
-    /**
-     * @var string The template slug to be loaded (like "table", "list")
-     */
-    public static $slug = 'list';
-
-    /**
-     * Output the field in the list view.
-     *
-     * @param \GV\Field $field  The field to output.
-     * @param \GV\Entry $entry  The entry.
-     * @param array     $extras Extra stuff, like wpautop, etc.
-     *
-     * @return string
-     */
-    public function the_field(\GV\Field $field, \GV\Entry $entry, $extras = null)
-    {
-        $form = $this->view->form;
-
-        if (isset($this->view->unions[$entry['form_id']])) {
-            if (isset($this->view->unions[$entry['form_id']][$field->ID])) {
-                $field = $this->view->unions[$entry['form_id']][$field->ID];
-            } elseif (!$field instanceof Internal_Field) {
-                $field = Internal_Field::from_configuration(['id' => 'custom']);
-            }
-        }
-
-        if ($entry->is_multi()) {
-            if (!$single_entry = $entry->from_field($field)) {
-                return;
-            }
-            $form = GF_Form::by_id($field->form_id);
-        }
-
-        /**
-         * Push legacy entry context.
-         */
-        \GV\Mocks\Legacy_Context::load([
-            'entry' => $entry,
-            'form'  => $form,
-        ]);
-
-        $context = Template_Context::from_template($this, compact('field', 'entry'));
-
-        $renderer = new Field_Renderer();
-        $source = is_numeric($field->ID) ? $form : new Internal_Source();
-
-        $value = $renderer->render($field, $this->view, $source, $entry, $this->request);
-
-        /**
-         * @deprecated Here for back-compatibility.
-         */
-        $label = apply_filters('gravityview_render_after_label', $field->get_label($this->view, $form, $entry), $field->as_configuration());
-        $label = apply_filters('gravityview/template/field_label', $label, $field->as_configuration(), $form->form ? $form->form : null, null);
-
-        /**
-         * @filter `gravityview/template/field/label` Override the field label.
-         *
-         * @since 2.0
-         *
-         * @param string               $label   The label to override.
-         * @param \GV\Template_Context $context The context.
-         */
-        $label = apply_filters('gravityview/template/field/label', $label, $context);
-
-        /**
-         * @filter `gravityview/template/table/entry/hide_empty`
-         *
-         * @param bool Should the row be hidden if the value is empty? Default: don't hide.
-         * @param \GV\Template_Context $context The context ;) Love it, cherish it. And don't you dare modify it!
-         */
-        $hide_empty = apply_filters('gravityview/render/hide-empty-zone', Utils::get($extras, 'hide_empty', $this->view->settings->get('hide_empty', false)), $context);
-
-        if (is_numeric($field->ID)) {
-            $extras['field'] = $field->as_configuration();
-        }
-
-        $extras['entry'] = $entry->as_entry();
-        $extras['hide_empty'] = $hide_empty;
-        $extras['label'] = $label;
-        $extras['value'] = $value;
-
-        return \gravityview_field_output($extras, $context);
-    }
-
-    /**
-     * Return an array of variables ready to be extracted.
-     *
-     * @param string|array $zones The field zones to grab.
-     *
-     * @return array An array ready to be extract()ed in the form of
-     *               $zone => \GV\Field_Collection
-     *               has_$zone => int
-     */
-    public function extract_zone_vars($zones)
-    {
-        if (!is_array($zones)) {
-            $zones = [$zones];
-        }
-
-        $vars = [];
-        foreach ($zones as $zone) {
-            $zone_var = str_replace('-', '_', $zone);
-            $vars[$zone_var] = $this->view->fields->by_position('directory_list-'.$zone)->by_visible($this->view);
-            $vars["has_$zone_var"] = $vars[$zone_var]->count();
-        }
-
-        return $vars;
-    }
-
-    /**
-     * `gravityview_entry_class` and `gravityview/template/list/entry/class` filters.
-     *
-     * Modify of the class of a row.
-     *
-     * @param string    $class The class.
-     * @param \GV\Entry $entry The entry.
-     * @param \GV\Template_Context The context.
-     *
-     * @return string The classes.
-     */
-    public static function entry_class($class, $entry, $context)
-    {
-        /**
-         * @filter `gravityview_entry_class` Modify the class applied to the entry row.
-         *
-         * @param string            $class Existing class.
-         * @param array             $entry Current entry being displayed
-         * @param \GravityView_View $this  Current GravityView_View object
-         *
-         * @deprecated Use `gravityview/template/list/entry/class`
-         *
-         * @return string The modified class.
-         */
-        $class = apply_filters('gravityview_entry_class', $class, $entry->as_entry(), \GravityView_View::getInstance());
-
-        /**
-         * @filter `gravityview/template/list/entry/class` Modify the class aplied to the entry row.
-         *
-         * @param string $class The existing class.
-         * @param \GV\Template_Context The context.
-         *
-         * @return string The modified class.
-         */
-        return apply_filters('gravityview/template/list/entry/class', $class, Template_Context::from_template($context->template, compact('entry')));
-    }
-
-    /**
-     * `gravityview_list_body_before` and `gravityview/template/list/body/before` actions.
-     *
-     * Output inside the `tbody` of the list.
-     *
-     * @param $context \GV\Template_Context The 2.0 context.
-     *
-     * @return void
-     */
-    public static function body_before($context)
-    {
-        /**
-         * @action `gravityview/template/list/body/before` Output inside the `tbody` of the list.
-         *
-         * @since 2.0
-         *
-         * @param \GV\Template_Context $context The template context.
-         */
-        do_action('gravityview/template/list/body/before', $context);
-
-        /**
-         * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
-         *
-         * @deprecated Use `gravityview/template/list/body/before`
-         * @since 1.0.7
-         *
-         * @param \GravityView_View $gravityview_view Current GravityView_View object.
-         */
-        do_action('gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */);
-    }
-
-    /**
-     * `gravityview_list_body_after` and `gravityview/template/list/body/after` actions.
-     *
-     * Output inside the `tbody` of the list.
-     *
-     * @param $context \GV\Template_Context The 2.0 context.
-     *
-     * @return void
-     */
-    public static function body_after($context)
-    {
-        /**
-         * @action `gravityview/template/list/body/after` Output inside the `tbody` of the list at the end.
-         *
-         * @since 2.0
-         *
-         * @param \GV\Template_Context $context The template context.
-         */
-        do_action('gravityview/template/list/body/after', $context);
-
-        /**
-         * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
-         *
-         * @deprecated Use `gravityview/template/list/body/after`
-         * @since 1.0.7
-         *
-         * @param \GravityView_View $gravityview_view Current GravityView_View object.
-         */
-        do_action('gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */);
-    }
-
-    /**
-     * `gravityview_list_entry_before` and `gravityview/template/list/entry/before` actions.
-     * `gravityview_list_entry_title_before` and `gravityview/template/list/entry/title/before` actions.
-     * `gravityview_list_entry_content_before` and `gravityview/template/list/entry/content/before` actions.
-     * `gravityview_list_entry_footer_before` and `gravityview/template/list/entry/footer/before` actions.
-     *
-     * Output inside the `entry` of the list.
-     *
-     * @param \GV\Entry            $entry   The entry.
-     * @param \GV\Template_Context $context The 2.0 context.
-     * @param string               $zone    The list zone (footer, image, title, etc.).
-     *
-     * @return void
-     */
-    public static function entry_before($entry, $context, $zone = '')
-    {
-        $zone = str_replace('//', '/', "/$zone/");
-
-        /**
-         * @action `gravityview/template/list/entry/$zone/before` Output inside the `entry` of the list at the end.
-         *
-         * @since 2.0
-         *
-         * @param \GV\Template_Context $context The template context.
-         */
-        do_action(sprintf('gravityview/template/list/entry%sbefore', $zone), Template_Context::from_template($context->template, compact('entry')));
-
-        $zone = str_replace('/', '_', $zone);
-
-        /**
-         * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
-         *
-         * @deprecated Use `gravityview/template/list/entry/$zone/before`
-         * @since 1.0.7
-         *
-         * @param \GravityView_View $gravityview_view Current GravityView_View object.
-         */
-        do_action(sprintf('gravityview_list_entry%sbefore', $zone), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */);
-    }
-
-    /**
-     * `gravityview_list_entry_after` and `gravityview/template/list/entry/after` actions.
-     * `gravityview_list_entry_title_after` and `gravityview/template/list/entry/title/after` actions.
-     * `gravityview_list_entry_content_after` and `gravityview/template/list/entry/content/after` actions.
-     * `gravityview_list_entry_footer_after` and `gravityview/template/list/entry/footer/after` actions.
-     *
-     * Output inside the `entry` of the list.
-     *
-     * @param \GV\Entry            $entry   The entry.
-     * @param \GV\Template_Context $context The 2.0 context.
-     * @param string               $zone    The list zone (footer, image, title, etc.).
-     *
-     * @return void
-     */
-    public static function entry_after($entry, $context, $zone = '')
-    {
-        $zone = str_replace('//', '/', "/$zone/");
-
-        /**
-         * @action `gravityview/template/list/entry/$zone/after` Output inside the `entry` of the list at the end.
-         *
-         * @since 2.0
-         *
-         * @param \GV\Template_Context $context The template context.
-         */
-        do_action(sprintf('gravityview/template/list/entry%safter', $zone), Template_Context::from_template($context->template, compact('entry')));
-
-        $zone = str_replace('/', '_', $zone);
-
-        /**
-         * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
-         *
-         * @deprecated Use `gravityview/template/list/entry/after`
-         * @since 1.0.7
-         *
-         * @param \GravityView_View $gravityview_view Current GravityView_View object.
-         */
-        do_action(sprintf('gravityview_list_entry%safter', $zone), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */);
-    }
+	/**
+	 * @var string The template slug to be loaded (like "table", "list")
+	 */
+	public static $slug = 'list';
+
+	/**
+	 * Output the field in the list view.
+	 *
+	 * @param \GV\Field $field  The field to output.
+	 * @param \GV\Entry $entry  The entry.
+	 * @param array     $extras Extra stuff, like wpautop, etc.
+	 *
+	 * @return string
+	 */
+	public function the_field(\GV\Field $field, \GV\Entry $entry, $extras = null)
+	{
+		$form = $this->view->form;
+
+		if (isset($this->view->unions[$entry['form_id']])) {
+			if (isset($this->view->unions[$entry['form_id']][$field->ID])) {
+				$field = $this->view->unions[$entry['form_id']][$field->ID];
+			} elseif (!$field instanceof Internal_Field) {
+				$field = Internal_Field::from_configuration(['id' => 'custom']);
+			}
+		}
+
+		if ($entry->is_multi()) {
+			if (!$single_entry = $entry->from_field($field)) {
+				return;
+			}
+			$form = GF_Form::by_id($field->form_id);
+		}
+
+		/**
+		 * Push legacy entry context.
+		 */
+		\GV\Mocks\Legacy_Context::load([
+			'entry' => $entry,
+			'form'  => $form,
+		]);
+
+		$context = Template_Context::from_template($this, compact('field', 'entry'));
+
+		$renderer = new Field_Renderer();
+		$source = is_numeric($field->ID) ? $form : new Internal_Source();
+
+		$value = $renderer->render($field, $this->view, $source, $entry, $this->request);
+
+		/**
+		 * @deprecated Here for back-compatibility.
+		 */
+		$label = apply_filters('gravityview_render_after_label', $field->get_label($this->view, $form, $entry), $field->as_configuration());
+		$label = apply_filters('gravityview/template/field_label', $label, $field->as_configuration(), $form->form ? $form->form : null, null);
+
+		/**
+		 * @filter `gravityview/template/field/label` Override the field label.
+		 *
+		 * @since 2.0
+		 *
+		 * @param string               $label   The label to override.
+		 * @param \GV\Template_Context $context The context.
+		 */
+		$label = apply_filters('gravityview/template/field/label', $label, $context);
+
+		/**
+		 * @filter `gravityview/template/table/entry/hide_empty`
+		 *
+		 * @param bool Should the row be hidden if the value is empty? Default: don't hide.
+		 * @param \GV\Template_Context $context The context ;) Love it, cherish it. And don't you dare modify it!
+		 */
+		$hide_empty = apply_filters('gravityview/render/hide-empty-zone', Utils::get($extras, 'hide_empty', $this->view->settings->get('hide_empty', false)), $context);
+
+		if (is_numeric($field->ID)) {
+			$extras['field'] = $field->as_configuration();
+		}
+
+		$extras['entry'] = $entry->as_entry();
+		$extras['hide_empty'] = $hide_empty;
+		$extras['label'] = $label;
+		$extras['value'] = $value;
+
+		return \gravityview_field_output($extras, $context);
+	}
+
+	/**
+	 * Return an array of variables ready to be extracted.
+	 *
+	 * @param string|array $zones The field zones to grab.
+	 *
+	 * @return array An array ready to be extract()ed in the form of
+	 *               $zone => \GV\Field_Collection
+	 *               has_$zone => int
+	 */
+	public function extract_zone_vars($zones)
+	{
+		if (!is_array($zones)) {
+			$zones = [$zones];
+		}
+
+		$vars = [];
+		foreach ($zones as $zone) {
+			$zone_var = str_replace('-', '_', $zone);
+			$vars[$zone_var] = $this->view->fields->by_position('directory_list-'.$zone)->by_visible($this->view);
+			$vars["has_$zone_var"] = $vars[$zone_var]->count();
+		}
+
+		return $vars;
+	}
+
+	/**
+	 * `gravityview_entry_class` and `gravityview/template/list/entry/class` filters.
+	 *
+	 * Modify of the class of a row.
+	 *
+	 * @param string    $class The class.
+	 * @param \GV\Entry $entry The entry.
+	 * @param \GV\Template_Context The context.
+	 *
+	 * @return string The classes.
+	 */
+	public static function entry_class($class, $entry, $context)
+	{
+		/**
+		 * @filter `gravityview_entry_class` Modify the class applied to the entry row.
+		 *
+		 * @param string            $class Existing class.
+		 * @param array             $entry Current entry being displayed
+		 * @param \GravityView_View $this  Current GravityView_View object
+		 *
+		 * @deprecated Use `gravityview/template/list/entry/class`
+		 *
+		 * @return string The modified class.
+		 */
+		$class = apply_filters('gravityview_entry_class', $class, $entry->as_entry(), \GravityView_View::getInstance());
+
+		/**
+		 * @filter `gravityview/template/list/entry/class` Modify the class aplied to the entry row.
+		 *
+		 * @param string $class The existing class.
+		 * @param \GV\Template_Context The context.
+		 *
+		 * @return string The modified class.
+		 */
+		return apply_filters('gravityview/template/list/entry/class', $class, Template_Context::from_template($context->template, compact('entry')));
+	}
+
+	/**
+	 * `gravityview_list_body_before` and `gravityview/template/list/body/before` actions.
+	 *
+	 * Output inside the `tbody` of the list.
+	 *
+	 * @param $context \GV\Template_Context The 2.0 context.
+	 *
+	 * @return void
+	 */
+	public static function body_before($context)
+	{
+		/**
+		 * @action `gravityview/template/list/body/before` Output inside the `tbody` of the list.
+		 *
+		 * @since 2.0
+		 *
+		 * @param \GV\Template_Context $context The template context.
+		 */
+		do_action('gravityview/template/list/body/before', $context);
+
+		/**
+		 * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
+		 *
+		 * @deprecated Use `gravityview/template/list/body/before`
+		 * @since 1.0.7
+		 *
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
+		do_action('gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */);
+	}
+
+	/**
+	 * `gravityview_list_body_after` and `gravityview/template/list/body/after` actions.
+	 *
+	 * Output inside the `tbody` of the list.
+	 *
+	 * @param $context \GV\Template_Context The 2.0 context.
+	 *
+	 * @return void
+	 */
+	public static function body_after($context)
+	{
+		/**
+		 * @action `gravityview/template/list/body/after` Output inside the `tbody` of the list at the end.
+		 *
+		 * @since 2.0
+		 *
+		 * @param \GV\Template_Context $context The template context.
+		 */
+		do_action('gravityview/template/list/body/after', $context);
+
+		/**
+		 * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
+		 *
+		 * @deprecated Use `gravityview/template/list/body/after`
+		 * @since 1.0.7
+		 *
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
+		do_action('gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */);
+	}
+
+	/**
+	 * `gravityview_list_entry_before` and `gravityview/template/list/entry/before` actions.
+	 * `gravityview_list_entry_title_before` and `gravityview/template/list/entry/title/before` actions.
+	 * `gravityview_list_entry_content_before` and `gravityview/template/list/entry/content/before` actions.
+	 * `gravityview_list_entry_footer_before` and `gravityview/template/list/entry/footer/before` actions.
+	 *
+	 * Output inside the `entry` of the list.
+	 *
+	 * @param \GV\Entry            $entry   The entry.
+	 * @param \GV\Template_Context $context The 2.0 context.
+	 * @param string               $zone    The list zone (footer, image, title, etc.).
+	 *
+	 * @return void
+	 */
+	public static function entry_before($entry, $context, $zone = '')
+	{
+		$zone = str_replace('//', '/', "/$zone/");
+
+		/**
+		 * @action `gravityview/template/list/entry/$zone/before` Output inside the `entry` of the list at the end.
+		 *
+		 * @since 2.0
+		 *
+		 * @param \GV\Template_Context $context The template context.
+		 */
+		do_action(sprintf('gravityview/template/list/entry%sbefore', $zone), Template_Context::from_template($context->template, compact('entry')));
+
+		$zone = str_replace('/', '_', $zone);
+
+		/**
+		 * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
+		 *
+		 * @deprecated Use `gravityview/template/list/entry/$zone/before`
+		 * @since 1.0.7
+		 *
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
+		do_action(sprintf('gravityview_list_entry%sbefore', $zone), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */);
+	}
+
+	/**
+	 * `gravityview_list_entry_after` and `gravityview/template/list/entry/after` actions.
+	 * `gravityview_list_entry_title_after` and `gravityview/template/list/entry/title/after` actions.
+	 * `gravityview_list_entry_content_after` and `gravityview/template/list/entry/content/after` actions.
+	 * `gravityview_list_entry_footer_after` and `gravityview/template/list/entry/footer/after` actions.
+	 *
+	 * Output inside the `entry` of the list.
+	 *
+	 * @param \GV\Entry            $entry   The entry.
+	 * @param \GV\Template_Context $context The 2.0 context.
+	 * @param string               $zone    The list zone (footer, image, title, etc.).
+	 *
+	 * @return void
+	 */
+	public static function entry_after($entry, $context, $zone = '')
+	{
+		$zone = str_replace('//', '/', "/$zone/");
+
+		/**
+		 * @action `gravityview/template/list/entry/$zone/after` Output inside the `entry` of the list at the end.
+		 *
+		 * @since 2.0
+		 *
+		 * @param \GV\Template_Context $context The template context.
+		 */
+		do_action(sprintf('gravityview/template/list/entry%safter', $zone), Template_Context::from_template($context->template, compact('entry')));
+
+		$zone = str_replace('/', '_', $zone);
+
+		/**
+		 * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
+		 *
+		 * @deprecated Use `gravityview/template/list/entry/after`
+		 * @since 1.0.7
+		 *
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
+		do_action(sprintf('gravityview_list_entry%safter', $zone), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */);
+	}
 }

Spacing +53 added lines, -53 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -28,45 +28,45 @@ 
      *
      * @return string
      */
-    public function the_field(\GV\Field $field, \GV\Entry $entry, $extras = null)
+    public function the_field( \GV\Field $field, \GV\Entry $entry, $extras = null )
     {
         $form = $this->view->form;
 
-        if (isset($this->view->unions[$entry['form_id']])) {
-            if (isset($this->view->unions[$entry['form_id']][$field->ID])) {
-                $field = $this->view->unions[$entry['form_id']][$field->ID];
-            } elseif (!$field instanceof Internal_Field) {
-                $field = Internal_Field::from_configuration(['id' => 'custom']);
+        if ( isset( $this->view->unions[ $entry[ 'form_id' ] ] ) ) {
+            if ( isset( $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ] ) ) {
+                $field = $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ];
+            } elseif ( ! $field instanceof Internal_Field ) {
+                $field = Internal_Field::from_configuration( [ 'id' => 'custom' ] );
             }
         }
 
-        if ($entry->is_multi()) {
-            if (!$single_entry = $entry->from_field($field)) {
+        if ( $entry->is_multi() ) {
+            if ( ! $single_entry = $entry->from_field( $field ) ) {
                 return;
             }
-            $form = GF_Form::by_id($field->form_id);
+            $form = GF_Form::by_id( $field->form_id );
         }
 
         /**
          * Push legacy entry context.
          */
-        \GV\Mocks\Legacy_Context::load([
+        \GV\Mocks\Legacy_Context::load( [
             'entry' => $entry,
             'form'  => $form,
-        ]);
+        ] );
 
-        $context = Template_Context::from_template($this, compact('field', 'entry'));
+        $context = Template_Context::from_template( $this, compact( 'field', 'entry' ) );
 
         $renderer = new Field_Renderer();
-        $source = is_numeric($field->ID) ? $form : new Internal_Source();
+        $source = is_numeric( $field->ID ) ? $form : new Internal_Source();
 
-        $value = $renderer->render($field, $this->view, $source, $entry, $this->request);
+        $value = $renderer->render( $field, $this->view, $source, $entry, $this->request );
 
         /**
          * @deprecated Here for back-compatibility.
          */
-        $label = apply_filters('gravityview_render_after_label', $field->get_label($this->view, $form, $entry), $field->as_configuration());
-        $label = apply_filters('gravityview/template/field_label', $label, $field->as_configuration(), $form->form ? $form->form : null, null);
+        $label = apply_filters( 'gravityview_render_after_label', $field->get_label( $this->view, $form, $entry ), $field->as_configuration() );
+        $label = apply_filters( 'gravityview/template/field_label', $label, $field->as_configuration(), $form->form ? $form->form : null, null );
 
         /**
          * @filter `gravityview/template/field/label` Override the field label.
@@ -76,7 +76,7 @@ 
          * @param string               $label   The label to override.
          * @param \GV\Template_Context $context The context.
          */
-        $label = apply_filters('gravityview/template/field/label', $label, $context);
+        $label = apply_filters( 'gravityview/template/field/label', $label, $context );
 
         /**
          * @filter `gravityview/template/table/entry/hide_empty`
@@ -84,18 +84,18 @@ 
          * @param bool Should the row be hidden if the value is empty? Default: don't hide.
          * @param \GV\Template_Context $context The context ;) Love it, cherish it. And don't you dare modify it!
          */
-        $hide_empty = apply_filters('gravityview/render/hide-empty-zone', Utils::get($extras, 'hide_empty', $this->view->settings->get('hide_empty', false)), $context);
+        $hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
 
-        if (is_numeric($field->ID)) {
-            $extras['field'] = $field->as_configuration();
+        if ( is_numeric( $field->ID ) ) {
+            $extras[ 'field' ] = $field->as_configuration();
         }
 
-        $extras['entry'] = $entry->as_entry();
-        $extras['hide_empty'] = $hide_empty;
-        $extras['label'] = $label;
-        $extras['value'] = $value;
+        $extras[ 'entry' ] = $entry->as_entry();
+        $extras[ 'hide_empty' ] = $hide_empty;
+        $extras[ 'label' ] = $label;
+        $extras[ 'value' ] = $value;
 
-        return \gravityview_field_output($extras, $context);
+        return \gravityview_field_output( $extras, $context );
     }
 
     /**
@@ -107,17 +107,17 @@ 
      *               $zone => \GV\Field_Collection
      *               has_$zone => int
      */
-    public function extract_zone_vars($zones)
+    public function extract_zone_vars( $zones )
     {
-        if (!is_array($zones)) {
-            $zones = [$zones];
+        if ( ! is_array( $zones ) ) {
+            $zones = [ $zones ];
         }
 
-        $vars = [];
-        foreach ($zones as $zone) {
-            $zone_var = str_replace('-', '_', $zone);
-            $vars[$zone_var] = $this->view->fields->by_position('directory_list-'.$zone)->by_visible($this->view);
-            $vars["has_$zone_var"] = $vars[$zone_var]->count();
+        $vars = [ ];
+        foreach ( $zones as $zone ) {
+            $zone_var = str_replace( '-', '_', $zone );
+            $vars[ $zone_var ] = $this->view->fields->by_position( 'directory_list-' . $zone )->by_visible( $this->view );
+            $vars[ "has_$zone_var" ] = $vars[ $zone_var ]->count();
         }
 
         return $vars;
@@ -134,7 +134,7 @@ 
      *
      * @return string The classes.
      */
-    public static function entry_class($class, $entry, $context)
+    public static function entry_class( $class, $entry, $context )
     {
         /**
          * @filter `gravityview_entry_class` Modify the class applied to the entry row.
@@ -147,7 +147,7 @@ 
          *
          * @return string The modified class.
          */
-        $class = apply_filters('gravityview_entry_class', $class, $entry->as_entry(), \GravityView_View::getInstance());
+        $class = apply_filters( 'gravityview_entry_class', $class, $entry->as_entry(), \GravityView_View::getInstance() );
 
         /**
          * @filter `gravityview/template/list/entry/class` Modify the class aplied to the entry row.
@@ -157,7 +157,7 @@ 
          *
          * @return string The modified class.
          */
-        return apply_filters('gravityview/template/list/entry/class', $class, Template_Context::from_template($context->template, compact('entry')));
+        return apply_filters( 'gravityview/template/list/entry/class', $class, Template_Context::from_template( $context->template, compact( 'entry' ) ) );
     }
 
     /**
@@ -169,7 +169,7 @@ 
      *
      * @return void
      */
-    public static function body_before($context)
+    public static function body_before( $context )
     {
         /**
          * @action `gravityview/template/list/body/before` Output inside the `tbody` of the list.
@@ -178,7 +178,7 @@ 
          *
          * @param \GV\Template_Context $context The template context.
          */
-        do_action('gravityview/template/list/body/before', $context);
+        do_action( 'gravityview/template/list/body/before', $context );
 
         /**
          * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
@@ -188,7 +188,7 @@ 
          *
          * @param \GravityView_View $gravityview_view Current GravityView_View object.
          */
-        do_action('gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */);
+        do_action( 'gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */ );
     }
 
     /**
@@ -200,7 +200,7 @@ 
      *
      * @return void
      */
-    public static function body_after($context)
+    public static function body_after( $context )
     {
         /**
          * @action `gravityview/template/list/body/after` Output inside the `tbody` of the list at the end.
@@ -209,7 +209,7 @@ 
          *
          * @param \GV\Template_Context $context The template context.
          */
-        do_action('gravityview/template/list/body/after', $context);
+        do_action( 'gravityview/template/list/body/after', $context );
 
         /**
          * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
@@ -219,7 +219,7 @@ 
          *
          * @param \GravityView_View $gravityview_view Current GravityView_View object.
          */
-        do_action('gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */);
+        do_action( 'gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */ );
     }
 
     /**
@@ -236,9 +236,9 @@ 
      *
      * @return void
      */
-    public static function entry_before($entry, $context, $zone = '')
+    public static function entry_before( $entry, $context, $zone = '' )
     {
-        $zone = str_replace('//', '/', "/$zone/");
+        $zone = str_replace( '//', '/', "/$zone/" );
 
         /**
          * @action `gravityview/template/list/entry/$zone/before` Output inside the `entry` of the list at the end.
@@ -247,9 +247,9 @@ 
          *
          * @param \GV\Template_Context $context The template context.
          */
-        do_action(sprintf('gravityview/template/list/entry%sbefore', $zone), Template_Context::from_template($context->template, compact('entry')));
+        do_action( sprintf( 'gravityview/template/list/entry%sbefore', $zone ), Template_Context::from_template( $context->template, compact( 'entry' ) ) );
 
-        $zone = str_replace('/', '_', $zone);
+        $zone = str_replace( '/', '_', $zone );
 
         /**
          * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
@@ -259,7 +259,7 @@ 
          *
          * @param \GravityView_View $gravityview_view Current GravityView_View object.
          */
-        do_action(sprintf('gravityview_list_entry%sbefore', $zone), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */);
+        do_action( sprintf( 'gravityview_list_entry%sbefore', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
     }
 
     /**
@@ -276,9 +276,9 @@ 
      *
      * @return void
      */
-    public static function entry_after($entry, $context, $zone = '')
+    public static function entry_after( $entry, $context, $zone = '' )
     {
-        $zone = str_replace('//', '/', "/$zone/");
+        $zone = str_replace( '//', '/', "/$zone/" );
 
         /**
          * @action `gravityview/template/list/entry/$zone/after` Output inside the `entry` of the list at the end.
@@ -287,9 +287,9 @@ 
          *
          * @param \GV\Template_Context $context The template context.
          */
-        do_action(sprintf('gravityview/template/list/entry%safter', $zone), Template_Context::from_template($context->template, compact('entry')));
+        do_action( sprintf( 'gravityview/template/list/entry%safter', $zone ), Template_Context::from_template( $context->template, compact( 'entry' ) ) );
 
-        $zone = str_replace('/', '_', $zone);
+        $zone = str_replace( '/', '_', $zone );
 
         /**
          * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
@@ -299,6 +299,6 @@ 
          *
          * @param \GravityView_View $gravityview_view Current GravityView_View object.
          */
-        do_action(sprintf('gravityview_list_entry%safter', $zone), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */);
+        do_action( sprintf( 'gravityview_list_entry%safter', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
     }
 }

Braces +8 added lines, -16 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Renders a \GV\View and a \GV\Entry_Collection via a \GV\View_Renderer.
  */
-class View_List_Template extends View_Template
-{
+class View_List_Template extends View_Template {
     /**
      * @var string The template slug to be loaded (like "table", "list")
      */
@@ -28,8 +27,7 @@ 
      *
      * @return string
      */
-    public function the_field(\GV\Field $field, \GV\Entry $entry, $extras = null)
-    {
+    public function the_field(\GV\Field $field, \GV\Entry $entry, $extras = null) {
         $form = $this->view->form;
 
         if (isset($this->view->unions[$entry['form_id']])) {
@@ -107,8 +105,7 @@ 
      *               $zone => \GV\Field_Collection
      *               has_$zone => int
      */
-    public function extract_zone_vars($zones)
-    {
+    public function extract_zone_vars($zones) {
         if (!is_array($zones)) {
             $zones = [$zones];
         }
@@ -134,8 +131,7 @@ 
      *
      * @return string The classes.
      */
-    public static function entry_class($class, $entry, $context)
-    {
+    public static function entry_class($class, $entry, $context) {
         /**
          * @filter `gravityview_entry_class` Modify the class applied to the entry row.
          *
@@ -169,8 +165,7 @@ 
      *
      * @return void
      */
-    public static function body_before($context)
-    {
+    public static function body_before($context) {
         /**
          * @action `gravityview/template/list/body/before` Output inside the `tbody` of the list.
          *
@@ -200,8 +195,7 @@ 
      *
      * @return void
      */
-    public static function body_after($context)
-    {
+    public static function body_after($context) {
         /**
          * @action `gravityview/template/list/body/after` Output inside the `tbody` of the list at the end.
          *
@@ -236,8 +230,7 @@ 
      *
      * @return void
      */
-    public static function entry_before($entry, $context, $zone = '')
-    {
+    public static function entry_before($entry, $context, $zone = '') {
         $zone = str_replace('//', '/', "/$zone/");
 
         /**
@@ -276,8 +269,7 @@ 
      *
      * @return void
      */
-    public static function entry_after($entry, $context, $zone = '')
-    {
+    public static function entry_after($entry, $context, $zone = '') {
         $zone = str_replace('//', '/', "/$zone/");
 
         /**