gravityview / GravityView

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

Indentation +166 added lines, -166 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,169 +12,169 @@ 
  */
 class Widget_Collection extends Collection
 {
-    /**
-     * Add a \GV\Widet to this collection.
-     *
-     * @param \GV\Widget $widget The widget to add to the internal array.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function add($widget)
-    {
-        if (!$widget instanceof Widget) {
-            gravityview()->log->error('Widget_Collections can only contain objects of type \GV\Widget.');
-
-            return;
-        }
-        parent::add($widget);
-    }
-
-    /**
-     * Get a \GV\Widget from this list by UID.
-     *
-     * @param int $widget_uid The UID of the widget in the collection to get.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\Widget|null The \GV\Widget with the $widget_uid as the UID, or null if not found.
-     */
-    public function get($widget_uid)
-    {
-        foreach ($this->all() as $widget) {
-            if ($widget->UID == $widget_uid) {
-                return $widget;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get a copy of this \GV\Widget_Collection filtered by position.
-     *
-     * @param string $position The position to get the widgets for.
-     *                         Can be a wildcard *
-     *
-     * @api
-     *
-     * @since
-     *
-     * @return \GV\Widget_Collection A filtered collection of \GV\Widget, filtered by position.
-     */
-    public function by_position($position)
-    {
-        $widgets = new self();
-
-        $search = implode('.*', array_map('preg_quote', explode('*', $position)));
-
-        foreach ($this->all() as $widget) {
-            if (preg_match("#^{$search}$#", $widget->position)) {
-                $widgets->add($widget);
-            }
-        }
-
-        return $widgets;
-    }
-
-    /**
-     * Get a copy of this \GV\Widget_Collection filtered by ID.
-     *
-     * @param string $id The IDs to get the widgets for.
-     *
-     * @api
-     *
-     * @since
-     *
-     * @return \GV\Widget_Collection A filtered collection of \GV\Widget, filtered by ID.
-     */
-    public function by_id($id)
-    {
-        $widgets = new self();
-
-        foreach ($this->all() as $widget) {
-            if ($id == $widget->get_widget_id()) {
-                $widgets->add($widget);
-            }
-        }
-
-        return $widgets;
-    }
-
-    /**
-     * Parse a configuration array into a Widget_Collection.
-     *
-     * @param array $configuration The configuration, structured like so:
-     *
-     * array(
-     *
-     * 	[other zones]
-     *
-     * 	'footer_right' => array(
-     *
-     *   	[other widgets]
-     *
-     *  	'5372653f25d44' => array(
-     *
-     *			@see \GV\Widget::as_configuration() for structure
-     *  	)
-     *
-     * 		[other widgets]
-     *  )
-     *
-     * 	[other zones]
-     * )
-     *
-     * @return \GV\Widget_Collection A collection of widgets.
-     */
-    public static function from_configuration($configuration)
-    {
-        $widgets = new self();
-        foreach ($configuration as $position => $_widgets) {
-            if (empty($_widgets) || !is_array($_widgets)) {
-                continue;
-            }
-
-            foreach ($_widgets as $uid => $_configuration) {
-                if (!$widget = Widget::from_configuration($_configuration)) {
-                    continue;
-                }
-
-                $widget->UID = $uid;
-                $widget->position = $position;
-
-                $widgets->add($widget);
-            }
-        }
-
-        return $widgets;
-    }
-
-    /**
-     * Return a configuration array for this widget collection.
-     *
-     * @return array See \GV\Widget_Collection::from_configuration() for structure.
-     */
-    public function as_configuration()
-    {
-        $configuration = [];
-
-        /**
-         * @var \GV\Widget $widget
-         */
-        foreach ($this->all() as $widget) {
-            if (empty($configuration[$widget->position])) {
-                $configuration[$widget->position] = [];
-            }
-
-            $configuration[$widget->position][$widget->UID] = $widget->as_configuration();
-        }
-
-        return $configuration;
-    }
+	/**
+	 * Add a \GV\Widet to this collection.
+	 *
+	 * @param \GV\Widget $widget The widget to add to the internal array.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function add($widget)
+	{
+		if (!$widget instanceof Widget) {
+			gravityview()->log->error('Widget_Collections can only contain objects of type \GV\Widget.');
+
+			return;
+		}
+		parent::add($widget);
+	}
+
+	/**
+	 * Get a \GV\Widget from this list by UID.
+	 *
+	 * @param int $widget_uid The UID of the widget in the collection to get.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\Widget|null The \GV\Widget with the $widget_uid as the UID, or null if not found.
+	 */
+	public function get($widget_uid)
+	{
+		foreach ($this->all() as $widget) {
+			if ($widget->UID == $widget_uid) {
+				return $widget;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get a copy of this \GV\Widget_Collection filtered by position.
+	 *
+	 * @param string $position The position to get the widgets for.
+	 *                         Can be a wildcard *
+	 *
+	 * @api
+	 *
+	 * @since
+	 *
+	 * @return \GV\Widget_Collection A filtered collection of \GV\Widget, filtered by position.
+	 */
+	public function by_position($position)
+	{
+		$widgets = new self();
+
+		$search = implode('.*', array_map('preg_quote', explode('*', $position)));
+
+		foreach ($this->all() as $widget) {
+			if (preg_match("#^{$search}$#", $widget->position)) {
+				$widgets->add($widget);
+			}
+		}
+
+		return $widgets;
+	}
+
+	/**
+	 * Get a copy of this \GV\Widget_Collection filtered by ID.
+	 *
+	 * @param string $id The IDs to get the widgets for.
+	 *
+	 * @api
+	 *
+	 * @since
+	 *
+	 * @return \GV\Widget_Collection A filtered collection of \GV\Widget, filtered by ID.
+	 */
+	public function by_id($id)
+	{
+		$widgets = new self();
+
+		foreach ($this->all() as $widget) {
+			if ($id == $widget->get_widget_id()) {
+				$widgets->add($widget);
+			}
+		}
+
+		return $widgets;
+	}
+
+	/**
+	 * Parse a configuration array into a Widget_Collection.
+	 *
+	 * @param array $configuration The configuration, structured like so:
+	 *
+	 * array(
+	 *
+	 * 	[other zones]
+	 *
+	 * 	'footer_right' => array(
+	 *
+	 *   	[other widgets]
+	 *
+	 *  	'5372653f25d44' => array(
+	 *
+	 *			@see \GV\Widget::as_configuration() for structure
+	 *  	)
+	 *
+	 * 		[other widgets]
+	 *  )
+	 *
+	 * 	[other zones]
+	 * )
+	 *
+	 * @return \GV\Widget_Collection A collection of widgets.
+	 */
+	public static function from_configuration($configuration)
+	{
+		$widgets = new self();
+		foreach ($configuration as $position => $_widgets) {
+			if (empty($_widgets) || !is_array($_widgets)) {
+				continue;
+			}
+
+			foreach ($_widgets as $uid => $_configuration) {
+				if (!$widget = Widget::from_configuration($_configuration)) {
+					continue;
+				}
+
+				$widget->UID = $uid;
+				$widget->position = $position;
+
+				$widgets->add($widget);
+			}
+		}
+
+		return $widgets;
+	}
+
+	/**
+	 * Return a configuration array for this widget collection.
+	 *
+	 * @return array See \GV\Widget_Collection::from_configuration() for structure.
+	 */
+	public function as_configuration()
+	{
+		$configuration = [];
+
+		/**
+		 * @var \GV\Widget $widget
+		 */
+		foreach ($this->all() as $widget) {
+			if (empty($configuration[$widget->position])) {
+				$configuration[$widget->position] = [];
+			}
+
+			$configuration[$widget->position][$widget->UID] = $widget->as_configuration();
+		}
+
+		return $configuration;
+	}
 }

Spacing +28 added lines, -28 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($widget)
+    public function add( $widget )
     {
-        if (!$widget instanceof Widget) {
-            gravityview()->log->error('Widget_Collections can only contain objects of type \GV\Widget.');
+        if ( ! $widget instanceof Widget ) {
+            gravityview()->log->error( 'Widget_Collections can only contain objects of type \GV\Widget.' );
 
             return;
         }
-        parent::add($widget);
+        parent::add( $widget );
     }
 
     /**
@@ -44,10 +44,10 @@ 
      *
      * @return \GV\Widget|null The \GV\Widget with the $widget_uid as the UID, or null if not found.
      */
-    public function get($widget_uid)
+    public function get( $widget_uid )
     {
-        foreach ($this->all() as $widget) {
-            if ($widget->UID == $widget_uid) {
+        foreach ( $this->all() as $widget ) {
+            if ( $widget->UID == $widget_uid ) {
                 return $widget;
             }
         }
@@ -67,15 +67,15 @@ 
      *
      * @return \GV\Widget_Collection A filtered collection of \GV\Widget, filtered by position.
      */
-    public function by_position($position)
+    public function by_position( $position )
     {
         $widgets = new self();
 
-        $search = implode('.*', array_map('preg_quote', explode('*', $position)));
+        $search = implode( '.*', array_map( 'preg_quote', explode( '*', $position ) ) );
 
-        foreach ($this->all() as $widget) {
-            if (preg_match("#^{$search}$#", $widget->position)) {
-                $widgets->add($widget);
+        foreach ( $this->all() as $widget ) {
+            if ( preg_match( "#^{$search}$#", $widget->position ) ) {
+                $widgets->add( $widget );
             }
         }
 
@@ -93,13 +93,13 @@ 
      *
      * @return \GV\Widget_Collection A filtered collection of \GV\Widget, filtered by ID.
      */
-    public function by_id($id)
+    public function by_id( $id )
     {
         $widgets = new self();
 
-        foreach ($this->all() as $widget) {
-            if ($id == $widget->get_widget_id()) {
-                $widgets->add($widget);
+        foreach ( $this->all() as $widget ) {
+            if ( $id == $widget->get_widget_id() ) {
+                $widgets->add( $widget );
             }
         }
 
@@ -132,23 +132,23 @@ 
      *
      * @return \GV\Widget_Collection A collection of widgets.
      */
-    public static function from_configuration($configuration)
+    public static function from_configuration( $configuration )
     {
         $widgets = new self();
-        foreach ($configuration as $position => $_widgets) {
-            if (empty($_widgets) || !is_array($_widgets)) {
+        foreach ( $configuration as $position => $_widgets ) {
+            if ( empty( $_widgets ) || ! is_array( $_widgets ) ) {
                 continue;
             }
 
-            foreach ($_widgets as $uid => $_configuration) {
-                if (!$widget = Widget::from_configuration($_configuration)) {
+            foreach ( $_widgets as $uid => $_configuration ) {
+                if ( ! $widget = Widget::from_configuration( $_configuration ) ) {
                     continue;
                 }
 
                 $widget->UID = $uid;
                 $widget->position = $position;
 
-                $widgets->add($widget);
+                $widgets->add( $widget );
             }
         }
 
@@ -162,17 +162,17 @@ 
      */
     public function as_configuration()
     {
-        $configuration = [];
+        $configuration = [ ];
 
         /**
          * @var \GV\Widget $widget
          */
-        foreach ($this->all() as $widget) {
-            if (empty($configuration[$widget->position])) {
-                $configuration[$widget->position] = [];
+        foreach ( $this->all() as $widget ) {
+            if ( empty( $configuration[ $widget->position ] ) ) {
+                $configuration[ $widget->position ] = [ ];
             }
 
-            $configuration[$widget->position][$widget->UID] = $widget->as_configuration();
+            $configuration[ $widget->position ][ $widget->UID ] = $widget->as_configuration();
         }
 
         return $configuration;

Braces +7 added lines, -14 removed lines

@@ -10,8 +10,7 @@ 
 /**
  * A collection of \GV\Widget objects.
  */
-class Widget_Collection extends Collection
-{
+class Widget_Collection extends Collection {
     /**
      * Add a \GV\Widet to this collection.
      *
@@ -23,8 +22,7 @@ 
      *
      * @return void
      */
-    public function add($widget)
-    {
+    public function add($widget) {
         if (!$widget instanceof Widget) {
             gravityview()->log->error('Widget_Collections can only contain objects of type \GV\Widget.');
 
@@ -44,8 +42,7 @@ 
      *
      * @return \GV\Widget|null The \GV\Widget with the $widget_uid as the UID, or null if not found.
      */
-    public function get($widget_uid)
-    {
+    public function get($widget_uid) {
         foreach ($this->all() as $widget) {
             if ($widget->UID == $widget_uid) {
                 return $widget;
@@ -67,8 +64,7 @@ 
      *
      * @return \GV\Widget_Collection A filtered collection of \GV\Widget, filtered by position.
      */
-    public function by_position($position)
-    {
+    public function by_position($position) {
         $widgets = new self();
 
         $search = implode('.*', array_map('preg_quote', explode('*', $position)));
@@ -93,8 +89,7 @@ 
      *
      * @return \GV\Widget_Collection A filtered collection of \GV\Widget, filtered by ID.
      */
-    public function by_id($id)
-    {
+    public function by_id($id) {
         $widgets = new self();
 
         foreach ($this->all() as $widget) {
@@ -132,8 +127,7 @@ 
      *
      * @return \GV\Widget_Collection A collection of widgets.
      */
-    public static function from_configuration($configuration)
-    {
+    public static function from_configuration($configuration) {
         $widgets = new self();
         foreach ($configuration as $position => $_widgets) {
             if (empty($_widgets) || !is_array($_widgets)) {
@@ -160,8 +154,7 @@ 
      *
      * @return array See \GV\Widget_Collection::from_configuration() for structure.
      */
-    public function as_configuration()
-    {
+    public function as_configuration() {
         $configuration = [];
 
         /**

future/includes/class-gv-request-frontend.php

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 

Braces +1 added lines, -2 removed lines

@@ -10,6 +10,5 @@
 /**
  * The default frontend Request class.
  */
-class Frontend_Request extends Request
-{
+class Frontend_Request extends Request {
 }

future/includes/class-gv-logger-wp-action.php

Indentation +52 added lines, -52 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,59 +14,59 @@ 
  */
 class WP_Action_Logger extends Logger
 {
-    /**
-     * Logs with an arbitrary level using `do_action` and our
-     *  old action handlers.
-     *
-     * $context['data'] will be passed to the action.
-     *
-     * @param mixed  $level   The log level.
-     * @param string $message The message to log.
-     * @param array  $context The context.
-     *
-     * @return void
-     */
-    protected function log($level, $message, $context)
-    {
-        $php_version = (!empty($GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'])) ?
-            $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
+	/**
+	 * Logs with an arbitrary level using `do_action` and our
+	 *  old action handlers.
+	 *
+	 * $context['data'] will be passed to the action.
+	 *
+	 * @param mixed  $level   The log level.
+	 * @param string $message The message to log.
+	 * @param array  $context The context.
+	 *
+	 * @return void
+	 */
+	protected function log($level, $message, $context)
+	{
+		$php_version = (!empty($GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'])) ?
+			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
 
-        if (version_compare($php_version, '5.4', '>=')) {
-            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
-            $location = $this->interpolate('{class}{type}{function}', $backtrace[2]);
-            $message = $this->interpolate("[$level, $location] $message", $context);
-        } else {
-            $message = "[$level] $message";
-        }
+		if (version_compare($php_version, '5.4', '>=')) {
+			$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
+			$location = $this->interpolate('{class}{type}{function}', $backtrace[2]);
+			$message = $this->interpolate("[$level, $location] $message", $context);
+		} else {
+			$message = "[$level] $message";
+		}
 
-        switch ($level) {
-            case LogLevel::EMERGENCY:
-            case LogLevel::ALERT:
-            case LogLevel::CRITICAL:
-            case LogLevel::ERROR:
-                $action = 'error';
-                break;
-            case LogLevel::WARNING:
-            case LogLevel::NOTICE:
-            case LogLevel::INFO:
-            case LogLevel::DEBUG:
-                $action = 'debug';
-                break;
-        }
+		switch ($level) {
+			case LogLevel::EMERGENCY:
+			case LogLevel::ALERT:
+			case LogLevel::CRITICAL:
+			case LogLevel::ERROR:
+				$action = 'error';
+				break;
+			case LogLevel::WARNING:
+			case LogLevel::NOTICE:
+			case LogLevel::INFO:
+			case LogLevel::DEBUG:
+				$action = 'debug';
+				break;
+		}
 
-        if (defined('DOING_GRAVITYVIEW_TESTS')) {
-            /** Let's make this testable! */
-            do_action(
-                sprintf('gravityview_log_%s_test', $action),
-                $this->interpolate($message, $context),
-                empty($context['data']) ? [] : $context['data']
-            );
-        }
+		if (defined('DOING_GRAVITYVIEW_TESTS')) {
+			/** Let's make this testable! */
+			do_action(
+				sprintf('gravityview_log_%s_test', $action),
+				$this->interpolate($message, $context),
+				empty($context['data']) ? [] : $context['data']
+			);
+		}
 
-        do_action(
-            sprintf('gravityview_log_%s', $action),
-            $this->interpolate($message, $context),
-            empty($context['data']) ? [] : $context['data']
-        );
-    }
+		do_action(
+			sprintf('gravityview_log_%s', $action),
+			$this->interpolate($message, $context),
+			empty($context['data']) ? [] : $context['data']
+		);
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -26,20 +26,20 @@ 
      *
      * @return void
      */
-    protected function log($level, $message, $context)
+    protected function log( $level, $message, $context )
     {
-        $php_version = (!empty($GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'])) ?
-            $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
+        $php_version = ( ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ) ?
+            $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
 
-        if (version_compare($php_version, '5.4', '>=')) {
-            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
-            $location = $this->interpolate('{class}{type}{function}', $backtrace[2]);
-            $message = $this->interpolate("[$level, $location] $message", $context);
+        if ( version_compare( $php_version, '5.4', '>=' ) ) {
+            $backtrace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 3 );
+            $location = $this->interpolate( '{class}{type}{function}', $backtrace[ 2 ] );
+            $message = $this->interpolate( "[$level, $location] $message", $context );
         } else {
             $message = "[$level] $message";
         }
 
-        switch ($level) {
+        switch ( $level ) {
             case LogLevel::EMERGENCY:
             case LogLevel::ALERT:
             case LogLevel::CRITICAL:
@@ -54,19 +54,19 @@ 
                 break;
         }
 
-        if (defined('DOING_GRAVITYVIEW_TESTS')) {
+        if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) ) {
             /** Let's make this testable! */
             do_action(
-                sprintf('gravityview_log_%s_test', $action),
-                $this->interpolate($message, $context),
-                empty($context['data']) ? [] : $context['data']
+                sprintf( 'gravityview_log_%s_test', $action ),
+                $this->interpolate( $message, $context ),
+                empty( $context[ 'data' ] ) ? [ ] : $context[ 'data' ]
             );
         }
 
         do_action(
-            sprintf('gravityview_log_%s', $action),
-            $this->interpolate($message, $context),
-            empty($context['data']) ? [] : $context['data']
+            sprintf( 'gravityview_log_%s', $action ),
+            $this->interpolate( $message, $context ),
+            empty( $context[ 'data' ] ) ? [ ] : $context[ 'data' ]
         );
     }
 }

Braces +2 added lines, -4 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Uses the old logging stuff for now.
  */
-class WP_Action_Logger extends Logger
-{
+class WP_Action_Logger extends Logger {
     /**
      * Logs with an arbitrary level using `do_action` and our
      *  old action handlers.
@@ -26,8 +25,7 @@ 
      *
      * @return void
      */
-    protected function log($level, $message, $context)
-    {
+    protected function log($level, $message, $context) {
         $php_version = (!empty($GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'])) ?
             $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
 

future/includes/class-gv-logger.php

Indentation +133 added lines, -133 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,14 +12,14 @@ 
  */
 class LogLevel
 {
-    const EMERGENCY = 'emergency';
-    const ALERT = 'alert';
-    const CRITICAL = 'critical';
-    const ERROR = 'error';
-    const WARNING = 'warning';
-    const NOTICE = 'notice';
-    const INFO = 'info';
-    const DEBUG = 'debug';
+	const EMERGENCY = 'emergency';
+	const ALERT = 'alert';
+	const CRITICAL = 'critical';
+	const ERROR = 'error';
+	const WARNING = 'warning';
+	const NOTICE = 'notice';
+	const INFO = 'info';
+	const DEBUG = 'debug';
 }
 
 /**
@@ -32,139 +32,139 @@ 
  */
 abstract class Logger /** @todo extends Psr\Log\AbstractLogger */
 {
-    /**
-     * System is unusable.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function emergency($message, array $context = [])
-    {
-        $this->log(LogLevel::EMERGENCY, $message, $context);
-    }
+	/**
+	 * System is unusable.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return void
+	 */
+	public function emergency($message, array $context = [])
+	{
+		$this->log(LogLevel::EMERGENCY, $message, $context);
+	}
 
-    /**
-     * Action must be taken immediately.
-     *
-     * Example: Entire website down, database unavailable, etc. This should
-     * trigger the SMS alerts and wake you up.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function alert($message, array $context = [])
-    {
-        $this->log(LogLevel::ALERT, $message, $context);
-    }
+	/**
+	 * Action must be taken immediately.
+	 *
+	 * Example: Entire website down, database unavailable, etc. This should
+	 * trigger the SMS alerts and wake you up.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return void
+	 */
+	public function alert($message, array $context = [])
+	{
+		$this->log(LogLevel::ALERT, $message, $context);
+	}
 
-    /**
-     * Critical conditions.
-     *
-     * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function critical($message, array $context = [])
-    {
-        $this->log(LogLevel::CRITICAL, $message, $context);
-    }
+	/**
+	 * Critical conditions.
+	 *
+	 * Example: Application component unavailable, unexpected exception.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return void
+	 */
+	public function critical($message, array $context = [])
+	{
+		$this->log(LogLevel::CRITICAL, $message, $context);
+	}
 
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function error($message, array $context = [])
-    {
-        $this->log(LogLevel::ERROR, $message, $context);
-    }
+	/**
+	 * Runtime errors that do not require immediate action but should typically
+	 * be logged and monitored.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return void
+	 */
+	public function error($message, array $context = [])
+	{
+		$this->log(LogLevel::ERROR, $message, $context);
+	}
 
-    /**
-     * Exceptional occurrences that are not errors.
-     *
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
-     * that are not necessarily wrong.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function warning($message, array $context = [])
-    {
-        $this->log(LogLevel::WARNING, $message, $context);
-    }
+	/**
+	 * Exceptional occurrences that are not errors.
+	 *
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
+	 * that are not necessarily wrong.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return void
+	 */
+	public function warning($message, array $context = [])
+	{
+		$this->log(LogLevel::WARNING, $message, $context);
+	}
 
-    /**
-     * Normal but significant events.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function notice($message, array $context = [])
-    {
-        $this->log(LogLevel::NOTICE, $message, $context);
-    }
+	/**
+	 * Normal but significant events.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return void
+	 */
+	public function notice($message, array $context = [])
+	{
+		$this->log(LogLevel::NOTICE, $message, $context);
+	}
 
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function info($message, array $context = [])
-    {
-        $this->log(LogLevel::INFO, $message, $context);
-    }
+	/**
+	 * Interesting events.
+	 *
+	 * Example: User logs in, SQL logs.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return void
+	 */
+	public function info($message, array $context = [])
+	{
+		$this->log(LogLevel::INFO, $message, $context);
+	}
 
-    /**
-     * Detailed debug information.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function debug($message, array $context = [])
-    {
-        $this->log(LogLevel::DEBUG, $message, $context);
-    }
+	/**
+	 * Detailed debug information.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return void
+	 */
+	public function debug($message, array $context = [])
+	{
+		$this->log(LogLevel::DEBUG, $message, $context);
+	}
 
-    /**
-     * Bake the context into { } placeholders in the message.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return string The baked message;
-     */
-    protected function interpolate($message, $context)
-    {
-        foreach ($context as $key => $val) {
-            if (strpos($message, "{{$key}}") !== false) {
-                $message = str_replace("{{$key}}", $val, $message);
-            }
-        }
+	/**
+	 * Bake the context into { } placeholders in the message.
+	 *
+	 * @param string $message
+	 * @param array  $context
+	 *
+	 * @return string The baked message;
+	 */
+	protected function interpolate($message, $context)
+	{
+		foreach ($context as $key => $val) {
+			if (strpos($message, "{{$key}}") !== false) {
+				$message = str_replace("{{$key}}", $val, $message);
+			}
+		}
 
-        return $message;
-    }
+		return $message;
+	}
 }
 
 /** Load implementations. */

Spacing +22 added lines, -22 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -40,9 +40,9 @@ 
      *
      * @return void
      */
-    public function emergency($message, array $context = [])
+    public function emergency( $message, array $context = [ ] )
     {
-        $this->log(LogLevel::EMERGENCY, $message, $context);
+        $this->log( LogLevel::EMERGENCY, $message, $context );
     }
 
     /**
@@ -56,9 +56,9 @@ 
      *
      * @return void
      */
-    public function alert($message, array $context = [])
+    public function alert( $message, array $context = [ ] )
     {
-        $this->log(LogLevel::ALERT, $message, $context);
+        $this->log( LogLevel::ALERT, $message, $context );
     }
 
     /**
@@ -71,9 +71,9 @@ 
      *
      * @return void
      */
-    public function critical($message, array $context = [])
+    public function critical( $message, array $context = [ ] )
     {
-        $this->log(LogLevel::CRITICAL, $message, $context);
+        $this->log( LogLevel::CRITICAL, $message, $context );
     }
 
     /**
@@ -85,9 +85,9 @@ 
      *
      * @return void
      */
-    public function error($message, array $context = [])
+    public function error( $message, array $context = [ ] )
     {
-        $this->log(LogLevel::ERROR, $message, $context);
+        $this->log( LogLevel::ERROR, $message, $context );
     }
 
     /**
@@ -101,9 +101,9 @@ 
      *
      * @return void
      */
-    public function warning($message, array $context = [])
+    public function warning( $message, array $context = [ ] )
     {
-        $this->log(LogLevel::WARNING, $message, $context);
+        $this->log( LogLevel::WARNING, $message, $context );
     }
 
     /**
@@ -114,9 +114,9 @@ 
      *
      * @return void
      */
-    public function notice($message, array $context = [])
+    public function notice( $message, array $context = [ ] )
     {
-        $this->log(LogLevel::NOTICE, $message, $context);
+        $this->log( LogLevel::NOTICE, $message, $context );
     }
 
     /**
@@ -129,9 +129,9 @@ 
      *
      * @return void
      */
-    public function info($message, array $context = [])
+    public function info( $message, array $context = [ ] )
     {
-        $this->log(LogLevel::INFO, $message, $context);
+        $this->log( LogLevel::INFO, $message, $context );
     }
 
     /**
@@ -142,9 +142,9 @@ 
      *
      * @return void
      */
-    public function debug($message, array $context = [])
+    public function debug( $message, array $context = [ ] )
     {
-        $this->log(LogLevel::DEBUG, $message, $context);
+        $this->log( LogLevel::DEBUG, $message, $context );
     }
 
     /**
@@ -155,11 +155,11 @@ 
      *
      * @return string The baked message;
      */
-    protected function interpolate($message, $context)
+    protected function interpolate( $message, $context )
     {
-        foreach ($context as $key => $val) {
-            if (strpos($message, "{{$key}}") !== false) {
-                $message = str_replace("{{$key}}", $val, $message);
+        foreach ( $context as $key => $val ) {
+            if ( strpos( $message, "{{$key}}" ) !== false ) {
+                $message = str_replace( "{{$key}}", $val, $message );
             }
         }
 
@@ -168,4 +168,4 @@ 
 }
 
 /** Load implementations. */
-require gravityview()->plugin->dir('future/includes/class-gv-logger-wp-action.php');
+require gravityview()->plugin->dir( 'future/includes/class-gv-logger-wp-action.php' );

Braces +11 added lines, -22 removed lines

@@ -10,8 +10,7 @@ 
 /**
  * Describes log levels.
  */
-class LogLevel
-{
+class LogLevel {
     const EMERGENCY = 'emergency';
     const ALERT = 'alert';
     const CRITICAL = 'critical';
@@ -30,8 +29,7 @@ 
  * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
  * @see https://github.com/php-fig/log/blob/master/Psr/Log/AbstractLogger.php
  */
-abstract class Logger /** @todo extends Psr\Log\AbstractLogger */
-{
+abstract class Logger /** @todo extends Psr\Log\AbstractLogger */ {
     /**
      * System is unusable.
      *
@@ -40,8 +38,7 @@ 
      *
      * @return void
      */
-    public function emergency($message, array $context = [])
-    {
+    public function emergency($message, array $context = []) {
         $this->log(LogLevel::EMERGENCY, $message, $context);
     }
 
@@ -56,8 +53,7 @@ 
      *
      * @return void
      */
-    public function alert($message, array $context = [])
-    {
+    public function alert($message, array $context = []) {
         $this->log(LogLevel::ALERT, $message, $context);
     }
 
@@ -71,8 +67,7 @@ 
      *
      * @return void
      */
-    public function critical($message, array $context = [])
-    {
+    public function critical($message, array $context = []) {
         $this->log(LogLevel::CRITICAL, $message, $context);
     }
 
@@ -85,8 +80,7 @@ 
      *
      * @return void
      */
-    public function error($message, array $context = [])
-    {
+    public function error($message, array $context = []) {
         $this->log(LogLevel::ERROR, $message, $context);
     }
 
@@ -101,8 +95,7 @@ 
      *
      * @return void
      */
-    public function warning($message, array $context = [])
-    {
+    public function warning($message, array $context = []) {
         $this->log(LogLevel::WARNING, $message, $context);
     }
 
@@ -114,8 +107,7 @@ 
      *
      * @return void
      */
-    public function notice($message, array $context = [])
-    {
+    public function notice($message, array $context = []) {
         $this->log(LogLevel::NOTICE, $message, $context);
     }
 
@@ -129,8 +121,7 @@ 
      *
      * @return void
      */
-    public function info($message, array $context = [])
-    {
+    public function info($message, array $context = []) {
         $this->log(LogLevel::INFO, $message, $context);
     }
 
@@ -142,8 +133,7 @@ 
      *
      * @return void
      */
-    public function debug($message, array $context = [])
-    {
+    public function debug($message, array $context = []) {
         $this->log(LogLevel::DEBUG, $message, $context);
     }
 
@@ -155,8 +145,7 @@ 
      *
      * @return string The baked message;
      */
-    protected function interpolate($message, $context)
-    {
+    protected function interpolate($message, $context) {
         foreach ($context as $key => $val) {
             if (strpos($message, "{{$key}}") !== false) {
                 $message = str_replace("{{$key}}", $val, $message);

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

Indentation +29 added lines, -29 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,36 +14,36 @@ 
  */
 class Edit_Entry_Renderer extends Entry_Renderer
 {
-    /**
-     * Renders a an editable \GV\Entry instance.
-     *
-     * @param \GV\Entry   $entry   The Entry instance to render.
-     * @param \GV\View    $view    The View connected to the entry.
-     * @param \GV\Request $request The request context we're currently in. Default: `gravityview()->request`
-     *
-     * @todo Just a wrapper around the old code. Cheating. Needs rewrite :)
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return string The rendered Entry edit screen.
-     */
-    public function render(Entry $entry, View $view, Request $request = null)
-    {
-        $entries = new \GV\Entry_Collection();
-        $entries->add($entry);
+	/**
+	 * Renders a an editable \GV\Entry instance.
+	 *
+	 * @param \GV\Entry   $entry   The Entry instance to render.
+	 * @param \GV\View    $view    The View connected to the entry.
+	 * @param \GV\Request $request The request context we're currently in. Default: `gravityview()->request`
+	 *
+	 * @todo Just a wrapper around the old code. Cheating. Needs rewrite :)
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return string The rendered Entry edit screen.
+	 */
+	public function render(Entry $entry, View $view, Request $request = null)
+	{
+		$entries = new \GV\Entry_Collection();
+		$entries->add($entry);
 
-        \GV\Mocks\Legacy_Context::push([
-            'view'    => $view,
-            'entries' => $entries,
-        ]);
+		\GV\Mocks\Legacy_Context::push([
+			'view'    => $view,
+			'entries' => $entries,
+		]);
 
-        ob_start();
-        do_action('gravityview_edit_entry', null, $entry, $view, $request);
+		ob_start();
+		do_action('gravityview_edit_entry', null, $entry, $view, $request);
 
-        \GV\Mocks\Legacy_Context::pop();
+		\GV\Mocks\Legacy_Context::pop();
 
-        return ob_get_clean();
-    }
+		return ob_get_clean();
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -29,18 +29,18 @@ 
      *
      * @return string The rendered Entry edit screen.
      */
-    public function render(Entry $entry, View $view, Request $request = null)
+    public function render( Entry $entry, View $view, Request $request = null )
     {
         $entries = new \GV\Entry_Collection();
-        $entries->add($entry);
+        $entries->add( $entry );
 
-        \GV\Mocks\Legacy_Context::push([
+        \GV\Mocks\Legacy_Context::push( [
             'view'    => $view,
             'entries' => $entries,
-        ]);
+        ] );
 
         ob_start();
-        do_action('gravityview_edit_entry', null, $entry, $view, $request);
+        do_action( 'gravityview_edit_entry', null, $entry, $view, $request );
 
         \GV\Mocks\Legacy_Context::pop();
 

Braces +2 added lines, -4 removed lines

@@ -12,8 +12,7 @@ 
  *
  * The edit entry renderer.
  */
-class Edit_Entry_Renderer extends Entry_Renderer
-{
+class Edit_Entry_Renderer extends Entry_Renderer {
     /**
      * Renders a an editable \GV\Entry instance.
      *
@@ -29,8 +28,7 @@ 
      *
      * @return string The rendered Entry edit screen.
      */
-    public function render(Entry $entry, View $view, Request $request = null)
-    {
+    public function render(Entry $entry, View $view, Request $request = null) {
         $entries = new \GV\Entry_Collection();
         $entries->add($entry);
 

future/includes/class-gv-context.php

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 

Braces +1 added lines, -2 removed lines

@@ -10,6 +10,5 @@
 /**
  * A generic Context base class.
  */
-abstract class Context
-{
+abstract class Context {
 }

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

Indentation +484 added lines, -484 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,488 +23,488 @@ 
  */
 abstract class Field_Template extends Template
 {
-    /**
-     * Prefix for filter names.
-     *
-     * @var string
-     */
-    protected $filter_prefix = 'gravityview/template/fields';
-
-    /**
-     * Directory name where custom templates for this plugin should be found in the theme.
-     *
-     * @var string
-     */
-    protected $theme_template_directory = 'gravityview/fields/';
-
-    /**
-     * Directory name where the default templates for this plugin are found.
-     *
-     * @var string
-     */
-    protected $plugin_template_directory = 'templates/fields/';
-
-    /**
-     * @var \GV\Field The field connected to this template.
-     */
-    public $field;
-
-    /**
-     * @var \GV\View The view context.
-     */
-    public $view;
-
-    /**
-     * @var \GV\Source The source context.
-     */
-    public $source;
-
-    /**
-     * @var \GV\Entry The entry context.
-     */
-    public $entry;
-
-    /**
-     * @var \GV\Request The request context.
-     */
-    public $request;
-
-    /**
-     * @var string The template slug to be loaded (like "table", "list")
-     */
-    public static $slug;
-
-    /**
-     * Initializer.
-     *
-     * @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.
-     */
-    public function __construct(Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
-        $this->field = $field;
-        $this->view = $view;
-        $this->source = $source;
-        $this->entry = $entry;
-        $this->request = $request;
-
-        /** Add granular overrides. */
-        add_filter($this->filter_prefix.'_get_template_part', $this->_add_id_specific_templates_callback = self::add_id_specific_templates($this), 10, 3);
-
-        parent::__construct();
-    }
-
-    public function __destruct()
-    {
-        remove_filter($this->filter_prefix.'_get_template_part', $this->_add_id_specific_templates_callback);
-    }
-
-    /**
-     * Enable granular template overrides based on current post, view, form, field types, etc.
-     *
-     * Why? See https://github.com/gravityview/GravityView/issues/1024
-     *
-     * @param \GV\Field_Template $template The template instance.
-     *
-     * @return callable The callback bound to `get_template_part`. See `\GV\Field_Template::__construct`
-     */
-    public static function add_id_specific_templates($template)
-    {
-        $inputType = null;
-        $field_type = null;
-        $field_id = null;
-        $view_id = null;
-        $form_id = null;
-        $is_view = $template->request && $template->request->is_view();
-
-        if ($template->field) {
-            $inputType = $template->field->inputType;
-            $field_type = $template->field->type;
-            $field_id = $template->field->ID;
-        }
-
-        if ($template->view) {
-            $view_id = $template->view->ID;
-            $form_id = $template->view->form ? $template->view->form->ID : null;
-        }
-
-        $class = get_class($template);
-
-        /**
-         * Enable granular template overrides based on current post, view, form, field types, etc.
-         *
-         * The hierarchy is as follows:
-         *
-         * - post-[ID of post of page where view is embedded]-view-[View ID]-field-[Field type]-html.php
-         * - post-[ID of post of page where view is embedded]-view-[View ID]-field-[Field inputType]-html.php
-         * - post-[ID of post of page where view is embedded]-view-[View ID]-field-html.php
-         * - post-[ID of post of page where view is embedded]-field-[Field type]-html.php
-         * - post-[ID of post of page where view is embedded]-field-[Field inputType]-html.php
-         * - post-[ID of post of page where view is embedded]-field-html.php
-         * - post-[ID of post of page where view is embedded]-view-[View ID]-field-[Field type].php
-         * - post-[ID of post of page where view is embedded]-view-[View ID]-field-[Field inputType].php
-         * - post-[ID of post of page where view is embedded]-view-[View ID]-field.php
-         * - post-[ID of post of page where view is embedded]-field-[Field type].php
-         * - post-[ID of post of page where view is embedded]-field-[Field inputType].php
-         * - post-[ID of post of page where view is embedded]-field.php
-         * - form-[Form ID]-field-[Field ID]-html.php
-         * - form-[Form ID]-field-[Field ID].php
-         * - form-[Form ID]-field-[Field type]-html.php
-         * - form-[Form ID]-field-[Field inputType]-html.php
-         * - form-[Form ID]-field-[Field type].php
-         * - form-[Form ID]-field-[Field inputType].php
-         * - view-[View ID]-field-[Field type]-html.php
-         * - view-[View ID]-field-[Field inputType]-html.php
-         * - view-[View ID]-field-[Field type].php
-         * - view-[View ID]-field-[Field inputType].php
-         * - field-[Field type]-html.php
-         * - field-[Field inputType]-html.php
-         * - field-[Field type].php
-         * - field-[Field inputType].php
-         * - field-html.php
-         * - field.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: `html`, `json`, `xml`
-         * @param string $name      Name of the template part.
-         *
-         * @return array $templates Modified template array, merged with existing $templates values
-         */
-        return function ($templates, $slug, $name) use ($class, $inputType, $field_type, $view_id, $is_view, $form_id, $field_id) {
-            $specifics = [];
-
-            list($slug_dir, $slug_name) = $class::split_slug($slug, $name);
-
-            global $post;
-
-            if ($is_view && $post) {
-                if ($field_type) {
-                    $specifics[] = sprintf('%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name);
-                    $inputType && $specifics[] = sprintf('%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name);
-                    $specifics[] = sprintf('%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type);
-                    $inputType && $specifics[] = sprintf('%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType);
-                    $specifics[] = sprintf('%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name);
-                    $inputType && $specifics[] = sprintf('%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name);
-                    $specifics[] = sprintf('%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type);
-                    $inputType && $specifics[] = sprintf('%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType);
-                }
-
-                $specifics[] = sprintf('%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name);
-                $specifics[] = sprintf('%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id);
-                $specifics[] = sprintf('%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name);
-                $specifics[] = sprintf('%spost-%d-field.php', $slug_dir, $post->ID);
-            }
-
-            /** Field-specific */
-            if ($field_id && $form_id) {
-                if ($field_id) {
-                    $specifics[] = sprintf('%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name);
-                    $specifics[] = sprintf('%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id);
-
-                    if ($view_id) {
-                        $specifics[] = sprintf('%sview-%d-field-%d.php', $slug_dir, $view_id, $field_id);
-                    }
-                }
-
-                if ($field_type) {
-                    $specifics[] = sprintf('%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name);
-                    $inputType && $specifics[] = sprintf('%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name);
-                    $specifics[] = sprintf('%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type);
-                    $inputType && $specifics[] = sprintf('%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType);
-
-                    $specifics[] = sprintf('%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name);
-                    $inputType && $specifics[] = sprintf('%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name);
-                    $specifics[] = sprintf('%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type);
-                    $inputType && $specifics[] = sprintf('%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType);
-
-                    $specifics[] = sprintf('%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name);
-                    $inputType && $specifics[] = sprintf('%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name);
-                    $specifics[] = sprintf('%sfield-%s.php', $slug_dir, $field_type);
-                    $inputType && $specifics[] = sprintf('%sfield-%s.php', $slug_dir, $inputType);
-                }
-            }
-
-            if ($form_id) {
-                /** Generic field templates */
-                $specifics[] = sprintf('%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name);
-                $specifics[] = sprintf('%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name);
-
-                $specifics[] = sprintf('%sview-%d-field.php', $slug_dir, $view_id);
-                $specifics[] = sprintf('%sform-%d-field.php', $slug_dir, $form_id);
-            }
-
-            /**
-             * Legacy.
-             * Ignore some types that conflict.
-             */
-            if (!in_array($field_type, ['notes'])) {
-                $specifics[] = sprintf('%s.php', $field_type);
-                $specifics[] = sprintf('fields/%s.php', $field_type);
-            }
-
-            $specifics[] = sprintf('%sfield-%s.php', $slug_dir, $slug_name);
-            $specifics[] = sprintf('%sfield.php', $slug_dir);
-
-            return array_merge($specifics, $templates);
-        };
-    }
-
-    /**
-     * Output some HTML.
-     *
-     * @todo Move to \GV\Field_HTML_Template, but call filters here?
-     *
-     * @return void
-     */
-    public function render()
-    {
-        if (!$entry = $this->entry->from_field($this->field)) {
-            gravityview()->log->error('Entry is invalid for field. Returning empty.');
-
-            return;
-        }
-
-        /** Retrieve the value. */
-        $display_value = $value = $this->field->get_value($this->view, $this->source, $entry);
-
-        $source = $this->source;
-        $source_backend = $source ? $source::$backend : null;
-
-        \GV\Mocks\Legacy_Context::load([
-            'field' => $this->field,
-        ]);
-
-        /** Alter the display value according to Gravity Forms. */
-        if (\GV\Source::BACKEND_GRAVITYFORMS === $source_backend && !$this->field instanceof Internal_Field) {
-
-            /** Prevent any PHP warnings that may be generated. */
-            ob_start();
-
-            $display_value = \GFCommon::get_lead_field_display($this->field->field, $value, $entry['currency'], false, 'html');
-
-            if ($errors = ob_get_clean()) {
-                gravityview()->log->error('Errors when calling GFCommon::get_lead_field_display()', ['data' => $errors]);
-            }
-
-            // `gform_entry_field_value` expects a GF_Field, but $this->field->field can be NULL
-            if (!$this->field->field instanceof GF_Field) {
-                $gf_field = \GF_Fields::create($this->field->field);
-            }
-
-            /** Call the Gravity Forms field value filter. */
-            $display_value = apply_filters('gform_entry_field_value', $display_value, $gf_field, $entry->as_entry(), $this->source->form);
-
-            unset($gf_field);
-
-            /** Replace merge tags for admin-only fields. */
-            if (!empty($this->field->field->adminOnly)) {
-                $display_value = \GravityView_API::replace_variables($display_value, $this->form->form, $entry->as_entry(), false, false);
-            }
-        }
-
-        $context = Template_Context::from_template($this, compact('display_value', 'value'));
-
-        /**
-         * Make various pieces of data available to the template
-         *  under the $gravityview scoped variable.
-         *
-         * @filter `gravityview/template/field/context`
-         *
-         * @param \GV\Template_Context $context The context for this template.
-         *
-         * @since 2.0
-         */
-        $this->push_template_data(apply_filters('gravityview/template/field/context', $context), 'gravityview');
-
-        /** Bake the template. */
-        ob_start();
-        $this->located_template = $this->get_template_part(static::$slug);
-        $output = ob_get_clean();
-
-        if (empty($output)) {
-            /**
-             * @filter `gravityview_empty_value` What to display when a field is empty
-             *
-             * @deprecated Use the `gravityview/field/value/empty` filter instead
-             *
-             * @param string $value (empty string)
-             */
-            $output = apply_filters('gravityview_empty_value', $output);
-
-            /**
-             * @filter `gravityview/field/value/empty` What to display when this field is empty.
-             *
-             * @param string $value The value to display (Default: empty string)
-             * @param \GV\Template_Context The template context this is being called from.
-             */
-            $output = apply_filters('gravityview/field/value/empty', $output, Template_Context::from_template($this));
-
-            $context = Template_Context::from_template($this, compact('display_value', 'value'));
-        }
-
-        gravityview()->log->info('Field template for field #{field_id} loaded: {located_template}', ['field_id' => $this->field->ID, 'located_template' => $this->located_template]);
-
-        $this->pop_template_data('gravityview');
-
-        /** A compatibility array that's required by some of the deprecated filters. */
-        $field_compat = [
-            'form'           => $source_backend == \GV\Source::BACKEND_GRAVITYFORMS ? $this->source->form : ($this->view->form ? $this->view->form->form : null),
-            'field_id'       => $this->field->ID,
-            'field'          => $this->field->field,
-            'field_settings' => $this->field->as_configuration(),
-            'value'          => $value,
-            'display_value'  => $display_value,
-            'format'         => 'html',
-            'entry'          => $entry->as_entry(),
-            'field_type'     => $this->field->type,
-            'field_path'     => $this->located_template,
-        ];
-
-        /**
-         * Wrap output in a link, if enabled in the field settings.
-         *
-         * @todo Cleanup
-         *
-         * @param string               $output  HTML value output
-         * @param \GV\Template_Context $context
-         *
-         * @return mixed|string|void
-         */
-        $pre_link_compat_callback = function ($output, $context) use ($field_compat) {
-            $field = $context->field;
-
-            /**
-             * @filter `gravityview_field_entry_value_{$field_type}_pre_link` Modify the field value output for a field type before Show As Link setting is applied. Example: `gravityview_field_entry_value_number_pre_link`
-             *
-             * @since 1.16
-             *
-             * @param string $output         HTML value output
-             * @param array  $entry          The GF entry array
-             * @param array  $field_settings Settings for the particular GV field
-             * @param array  $field          Field array, as fetched from GravityView_View::getCurrentField()
-             *
-             * @deprecated Use the `gravityview/field/{$field_type}/output` or `gravityview/field/output` filters instead.
-             */
-            $output = apply_filters("gravityview_field_entry_value_{$field->type}_pre_link", $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
-
-            $output = apply_filters('gravityview_field_entry_value_pre_link', $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
-
-            /**
-             * Link to the single entry by wrapping the output in an anchor tag.
-             *
-             * Fields can override this by modifying the field data variable inside the field. See /templates/fields/post_image.php for an example.
-             */
-            if (!empty($field->show_as_link) && !\gv_empty($output, false, false)) {
-                $link_atts = empty($field->new_window) ? [] : ['target' => '_blank'];
-
-                $permalink = $context->entry->get_permalink($context->view, $context->request);
-                $output = \gravityview_get_link($permalink, $output, $link_atts);
-
-                /**
-                 * @filter `gravityview_field_entry_link` Modify the link HTML
-                 *
-                 * @param string $link           HTML output of the link
-                 * @param string $href           URL of the link
-                 * @param array  $entry          The GF entry array
-                 * @param array  $field_settings Settings for the particular GV field
-                 *
-                 * @deprecated Use `gravityview/template/field/entry_link`
-                 */
-                $output = apply_filters('gravityview_field_entry_link', $output, $permalink, $context->entry->as_entry(), $field->as_configuration());
-
-                /**
-                 * @filter `gravityview/template/field/entry_link` Modify the link HTML
-                 *
-                 * @since 2.0
-                 *
-                 * @param string               $link    HTML output of the link
-                 * @param string               $href    URL of the link
-                 * @param \GV\Template_Context $context The context
-                 */
-                $output = apply_filters('gravityview/template/field/entry_link', $output, $permalink, $context);
-            }
-
-            return $output;
-        };
-
-        // TODO Cleanup
-        $post_link_compat_callback = function ($output, $context) use ($field_compat) {
-            $field = $context->field;
-
-            /**
-             * @filter `gravityview_field_entry_value_{$field_type}` Modify the field value output for a field type. Example: `gravityview_field_entry_value_number`
-             *
-             * @since 1.6
-             *
-             * @param string $output         HTML value output
-             * @param array  $entry          The GF entry array
-             * @param array  $field_settings Settings for the particular GV field
-             * @param array  $field          Current field being displayed
-             *
-             * @deprecated Use the `gravityview/field/{$field_type}/output` or `gravityview/field/output` filters instead.
-             */
-            $output = apply_filters("gravityview_field_entry_value_{$field->type}", $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
-
-            /**
-             * @filter `gravityview_field_entry_value` Modify the field value output for all field types
-             *
-             * @param string $output         HTML value output
-             * @param array  $entry          The GF entry array
-             * @param array  $field_settings Settings for the particular GV field
-             * @param array  $field_data     {@since 1.6}
-             *
-             * @deprecated Use the `gravityview/field/{$field_type}/output` or `gravityview/field/output` filters instead.
-             */
-            $output = apply_filters('gravityview_field_entry_value', $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
-
-            /**
-             * @filter `gravityview/template/field/{$field_type}/output` Modify the field output for a field type.
-             *
-             * @since 2.0
-             *
-             * @param string $output The current output.
-             * @param \GV\Template_Context The template context this is being called from.
-             */
-            return apply_filters("gravityview/template/field/{$field->type}/output", $output, $context);
-        };
-
-        /**
-         * Okay, what's this whole pre/post_link compat deal, huh?
-         *
-         * Well, the `gravityview_field_entry_value_{$field_type}_pre_link` filter
-         *  is expected to be applied before the value is turned into an entry link.
-         *
-         * And then `gravityview_field_entry_value_{$field_type}` and `gravityview_field_entry_value`
-         *  are called afterwards.
-         *
-         * So we're going to use filter priorities to make sure this happens inline with
-         *  our new filters, in the correct sequence. Pre-link called with priority 5 and
-         *  post-link called with priority 9. Then everything else.
-         *
-         * If a new code wants to alter the value before it is hyperlinked (hyperlinkified?),
-         *  it should hook into a priority between -inf. and 8. Afterwards: 10 to +inf.
-         */
-        add_filter('gravityview/template/field/output', $pre_link_compat_callback, 5, 2);
-        add_filter('gravityview/template/field/output', $post_link_compat_callback, 9, 2);
-
-        /**
-         * @filter `gravityview/template/field/output` Modify the field output for a field.
-         *
-         * @since 2.0
-         *
-         * @param string $output The current output.
-         * @param \GV\Template_Context The template this is being called from.
-         */
-        echo apply_filters('gravityview/template/field/output', $output, $context);
-
-        remove_filter('gravityview/template/field/output', $pre_link_compat_callback, 5);
-        remove_filter('gravityview/template/field/output', $post_link_compat_callback, 9);
-    }
+	/**
+	 * Prefix for filter names.
+	 *
+	 * @var string
+	 */
+	protected $filter_prefix = 'gravityview/template/fields';
+
+	/**
+	 * Directory name where custom templates for this plugin should be found in the theme.
+	 *
+	 * @var string
+	 */
+	protected $theme_template_directory = 'gravityview/fields/';
+
+	/**
+	 * Directory name where the default templates for this plugin are found.
+	 *
+	 * @var string
+	 */
+	protected $plugin_template_directory = 'templates/fields/';
+
+	/**
+	 * @var \GV\Field The field connected to this template.
+	 */
+	public $field;
+
+	/**
+	 * @var \GV\View The view context.
+	 */
+	public $view;
+
+	/**
+	 * @var \GV\Source The source context.
+	 */
+	public $source;
+
+	/**
+	 * @var \GV\Entry The entry context.
+	 */
+	public $entry;
+
+	/**
+	 * @var \GV\Request The request context.
+	 */
+	public $request;
+
+	/**
+	 * @var string The template slug to be loaded (like "table", "list")
+	 */
+	public static $slug;
+
+	/**
+	 * Initializer.
+	 *
+	 * @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.
+	 */
+	public function __construct(Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+	{
+		$this->field = $field;
+		$this->view = $view;
+		$this->source = $source;
+		$this->entry = $entry;
+		$this->request = $request;
+
+		/** Add granular overrides. */
+		add_filter($this->filter_prefix.'_get_template_part', $this->_add_id_specific_templates_callback = self::add_id_specific_templates($this), 10, 3);
+
+		parent::__construct();
+	}
+
+	public function __destruct()
+	{
+		remove_filter($this->filter_prefix.'_get_template_part', $this->_add_id_specific_templates_callback);
+	}
+
+	/**
+	 * Enable granular template overrides based on current post, view, form, field types, etc.
+	 *
+	 * Why? See https://github.com/gravityview/GravityView/issues/1024
+	 *
+	 * @param \GV\Field_Template $template The template instance.
+	 *
+	 * @return callable The callback bound to `get_template_part`. See `\GV\Field_Template::__construct`
+	 */
+	public static function add_id_specific_templates($template)
+	{
+		$inputType = null;
+		$field_type = null;
+		$field_id = null;
+		$view_id = null;
+		$form_id = null;
+		$is_view = $template->request && $template->request->is_view();
+
+		if ($template->field) {
+			$inputType = $template->field->inputType;
+			$field_type = $template->field->type;
+			$field_id = $template->field->ID;
+		}
+
+		if ($template->view) {
+			$view_id = $template->view->ID;
+			$form_id = $template->view->form ? $template->view->form->ID : null;
+		}
+
+		$class = get_class($template);
+
+		/**
+		 * Enable granular template overrides based on current post, view, form, field types, etc.
+		 *
+		 * The hierarchy is as follows:
+		 *
+		 * - post-[ID of post of page where view is embedded]-view-[View ID]-field-[Field type]-html.php
+		 * - post-[ID of post of page where view is embedded]-view-[View ID]-field-[Field inputType]-html.php
+		 * - post-[ID of post of page where view is embedded]-view-[View ID]-field-html.php
+		 * - post-[ID of post of page where view is embedded]-field-[Field type]-html.php
+		 * - post-[ID of post of page where view is embedded]-field-[Field inputType]-html.php
+		 * - post-[ID of post of page where view is embedded]-field-html.php
+		 * - post-[ID of post of page where view is embedded]-view-[View ID]-field-[Field type].php
+		 * - post-[ID of post of page where view is embedded]-view-[View ID]-field-[Field inputType].php
+		 * - post-[ID of post of page where view is embedded]-view-[View ID]-field.php
+		 * - post-[ID of post of page where view is embedded]-field-[Field type].php
+		 * - post-[ID of post of page where view is embedded]-field-[Field inputType].php
+		 * - post-[ID of post of page where view is embedded]-field.php
+		 * - form-[Form ID]-field-[Field ID]-html.php
+		 * - form-[Form ID]-field-[Field ID].php
+		 * - form-[Form ID]-field-[Field type]-html.php
+		 * - form-[Form ID]-field-[Field inputType]-html.php
+		 * - form-[Form ID]-field-[Field type].php
+		 * - form-[Form ID]-field-[Field inputType].php
+		 * - view-[View ID]-field-[Field type]-html.php
+		 * - view-[View ID]-field-[Field inputType]-html.php
+		 * - view-[View ID]-field-[Field type].php
+		 * - view-[View ID]-field-[Field inputType].php
+		 * - field-[Field type]-html.php
+		 * - field-[Field inputType]-html.php
+		 * - field-[Field type].php
+		 * - field-[Field inputType].php
+		 * - field-html.php
+		 * - field.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: `html`, `json`, `xml`
+		 * @param string $name      Name of the template part.
+		 *
+		 * @return array $templates Modified template array, merged with existing $templates values
+		 */
+		return function ($templates, $slug, $name) use ($class, $inputType, $field_type, $view_id, $is_view, $form_id, $field_id) {
+			$specifics = [];
+
+			list($slug_dir, $slug_name) = $class::split_slug($slug, $name);
+
+			global $post;
+
+			if ($is_view && $post) {
+				if ($field_type) {
+					$specifics[] = sprintf('%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name);
+					$inputType && $specifics[] = sprintf('%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name);
+					$specifics[] = sprintf('%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type);
+					$inputType && $specifics[] = sprintf('%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType);
+					$specifics[] = sprintf('%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name);
+					$inputType && $specifics[] = sprintf('%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name);
+					$specifics[] = sprintf('%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type);
+					$inputType && $specifics[] = sprintf('%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType);
+				}
+
+				$specifics[] = sprintf('%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name);
+				$specifics[] = sprintf('%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id);
+				$specifics[] = sprintf('%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name);
+				$specifics[] = sprintf('%spost-%d-field.php', $slug_dir, $post->ID);
+			}
+
+			/** Field-specific */
+			if ($field_id && $form_id) {
+				if ($field_id) {
+					$specifics[] = sprintf('%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name);
+					$specifics[] = sprintf('%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id);
+
+					if ($view_id) {
+						$specifics[] = sprintf('%sview-%d-field-%d.php', $slug_dir, $view_id, $field_id);
+					}
+				}
+
+				if ($field_type) {
+					$specifics[] = sprintf('%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name);
+					$inputType && $specifics[] = sprintf('%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name);
+					$specifics[] = sprintf('%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type);
+					$inputType && $specifics[] = sprintf('%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType);
+
+					$specifics[] = sprintf('%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name);
+					$inputType && $specifics[] = sprintf('%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name);
+					$specifics[] = sprintf('%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type);
+					$inputType && $specifics[] = sprintf('%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType);
+
+					$specifics[] = sprintf('%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name);
+					$inputType && $specifics[] = sprintf('%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name);
+					$specifics[] = sprintf('%sfield-%s.php', $slug_dir, $field_type);
+					$inputType && $specifics[] = sprintf('%sfield-%s.php', $slug_dir, $inputType);
+				}
+			}
+
+			if ($form_id) {
+				/** Generic field templates */
+				$specifics[] = sprintf('%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name);
+				$specifics[] = sprintf('%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name);
+
+				$specifics[] = sprintf('%sview-%d-field.php', $slug_dir, $view_id);
+				$specifics[] = sprintf('%sform-%d-field.php', $slug_dir, $form_id);
+			}
+
+			/**
+			 * Legacy.
+			 * Ignore some types that conflict.
+			 */
+			if (!in_array($field_type, ['notes'])) {
+				$specifics[] = sprintf('%s.php', $field_type);
+				$specifics[] = sprintf('fields/%s.php', $field_type);
+			}
+
+			$specifics[] = sprintf('%sfield-%s.php', $slug_dir, $slug_name);
+			$specifics[] = sprintf('%sfield.php', $slug_dir);
+
+			return array_merge($specifics, $templates);
+		};
+	}
+
+	/**
+	 * Output some HTML.
+	 *
+	 * @todo Move to \GV\Field_HTML_Template, but call filters here?
+	 *
+	 * @return void
+	 */
+	public function render()
+	{
+		if (!$entry = $this->entry->from_field($this->field)) {
+			gravityview()->log->error('Entry is invalid for field. Returning empty.');
+
+			return;
+		}
+
+		/** Retrieve the value. */
+		$display_value = $value = $this->field->get_value($this->view, $this->source, $entry);
+
+		$source = $this->source;
+		$source_backend = $source ? $source::$backend : null;
+
+		\GV\Mocks\Legacy_Context::load([
+			'field' => $this->field,
+		]);
+
+		/** Alter the display value according to Gravity Forms. */
+		if (\GV\Source::BACKEND_GRAVITYFORMS === $source_backend && !$this->field instanceof Internal_Field) {
+
+			/** Prevent any PHP warnings that may be generated. */
+			ob_start();
+
+			$display_value = \GFCommon::get_lead_field_display($this->field->field, $value, $entry['currency'], false, 'html');
+
+			if ($errors = ob_get_clean()) {
+				gravityview()->log->error('Errors when calling GFCommon::get_lead_field_display()', ['data' => $errors]);
+			}
+
+			// `gform_entry_field_value` expects a GF_Field, but $this->field->field can be NULL
+			if (!$this->field->field instanceof GF_Field) {
+				$gf_field = \GF_Fields::create($this->field->field);
+			}
+
+			/** Call the Gravity Forms field value filter. */
+			$display_value = apply_filters('gform_entry_field_value', $display_value, $gf_field, $entry->as_entry(), $this->source->form);
+
+			unset($gf_field);
+
+			/** Replace merge tags for admin-only fields. */
+			if (!empty($this->field->field->adminOnly)) {
+				$display_value = \GravityView_API::replace_variables($display_value, $this->form->form, $entry->as_entry(), false, false);
+			}
+		}
+
+		$context = Template_Context::from_template($this, compact('display_value', 'value'));
+
+		/**
+		 * Make various pieces of data available to the template
+		 *  under the $gravityview scoped variable.
+		 *
+		 * @filter `gravityview/template/field/context`
+		 *
+		 * @param \GV\Template_Context $context The context for this template.
+		 *
+		 * @since 2.0
+		 */
+		$this->push_template_data(apply_filters('gravityview/template/field/context', $context), 'gravityview');
+
+		/** Bake the template. */
+		ob_start();
+		$this->located_template = $this->get_template_part(static::$slug);
+		$output = ob_get_clean();
+
+		if (empty($output)) {
+			/**
+			 * @filter `gravityview_empty_value` What to display when a field is empty
+			 *
+			 * @deprecated Use the `gravityview/field/value/empty` filter instead
+			 *
+			 * @param string $value (empty string)
+			 */
+			$output = apply_filters('gravityview_empty_value', $output);
+
+			/**
+			 * @filter `gravityview/field/value/empty` What to display when this field is empty.
+			 *
+			 * @param string $value The value to display (Default: empty string)
+			 * @param \GV\Template_Context The template context this is being called from.
+			 */
+			$output = apply_filters('gravityview/field/value/empty', $output, Template_Context::from_template($this));
+
+			$context = Template_Context::from_template($this, compact('display_value', 'value'));
+		}
+
+		gravityview()->log->info('Field template for field #{field_id} loaded: {located_template}', ['field_id' => $this->field->ID, 'located_template' => $this->located_template]);
+
+		$this->pop_template_data('gravityview');
+
+		/** A compatibility array that's required by some of the deprecated filters. */
+		$field_compat = [
+			'form'           => $source_backend == \GV\Source::BACKEND_GRAVITYFORMS ? $this->source->form : ($this->view->form ? $this->view->form->form : null),
+			'field_id'       => $this->field->ID,
+			'field'          => $this->field->field,
+			'field_settings' => $this->field->as_configuration(),
+			'value'          => $value,
+			'display_value'  => $display_value,
+			'format'         => 'html',
+			'entry'          => $entry->as_entry(),
+			'field_type'     => $this->field->type,
+			'field_path'     => $this->located_template,
+		];
+
+		/**
+		 * Wrap output in a link, if enabled in the field settings.
+		 *
+		 * @todo Cleanup
+		 *
+		 * @param string               $output  HTML value output
+		 * @param \GV\Template_Context $context
+		 *
+		 * @return mixed|string|void
+		 */
+		$pre_link_compat_callback = function ($output, $context) use ($field_compat) {
+			$field = $context->field;
+
+			/**
+			 * @filter `gravityview_field_entry_value_{$field_type}_pre_link` Modify the field value output for a field type before Show As Link setting is applied. Example: `gravityview_field_entry_value_number_pre_link`
+			 *
+			 * @since 1.16
+			 *
+			 * @param string $output         HTML value output
+			 * @param array  $entry          The GF entry array
+			 * @param array  $field_settings Settings for the particular GV field
+			 * @param array  $field          Field array, as fetched from GravityView_View::getCurrentField()
+			 *
+			 * @deprecated Use the `gravityview/field/{$field_type}/output` or `gravityview/field/output` filters instead.
+			 */
+			$output = apply_filters("gravityview_field_entry_value_{$field->type}_pre_link", $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
+
+			$output = apply_filters('gravityview_field_entry_value_pre_link', $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
+
+			/**
+			 * Link to the single entry by wrapping the output in an anchor tag.
+			 *
+			 * Fields can override this by modifying the field data variable inside the field. See /templates/fields/post_image.php for an example.
+			 */
+			if (!empty($field->show_as_link) && !\gv_empty($output, false, false)) {
+				$link_atts = empty($field->new_window) ? [] : ['target' => '_blank'];
+
+				$permalink = $context->entry->get_permalink($context->view, $context->request);
+				$output = \gravityview_get_link($permalink, $output, $link_atts);
+
+				/**
+				 * @filter `gravityview_field_entry_link` Modify the link HTML
+				 *
+				 * @param string $link           HTML output of the link
+				 * @param string $href           URL of the link
+				 * @param array  $entry          The GF entry array
+				 * @param array  $field_settings Settings for the particular GV field
+				 *
+				 * @deprecated Use `gravityview/template/field/entry_link`
+				 */
+				$output = apply_filters('gravityview_field_entry_link', $output, $permalink, $context->entry->as_entry(), $field->as_configuration());
+
+				/**
+				 * @filter `gravityview/template/field/entry_link` Modify the link HTML
+				 *
+				 * @since 2.0
+				 *
+				 * @param string               $link    HTML output of the link
+				 * @param string               $href    URL of the link
+				 * @param \GV\Template_Context $context The context
+				 */
+				$output = apply_filters('gravityview/template/field/entry_link', $output, $permalink, $context);
+			}
+
+			return $output;
+		};
+
+		// TODO Cleanup
+		$post_link_compat_callback = function ($output, $context) use ($field_compat) {
+			$field = $context->field;
+
+			/**
+			 * @filter `gravityview_field_entry_value_{$field_type}` Modify the field value output for a field type. Example: `gravityview_field_entry_value_number`
+			 *
+			 * @since 1.6
+			 *
+			 * @param string $output         HTML value output
+			 * @param array  $entry          The GF entry array
+			 * @param array  $field_settings Settings for the particular GV field
+			 * @param array  $field          Current field being displayed
+			 *
+			 * @deprecated Use the `gravityview/field/{$field_type}/output` or `gravityview/field/output` filters instead.
+			 */
+			$output = apply_filters("gravityview_field_entry_value_{$field->type}", $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
+
+			/**
+			 * @filter `gravityview_field_entry_value` Modify the field value output for all field types
+			 *
+			 * @param string $output         HTML value output
+			 * @param array  $entry          The GF entry array
+			 * @param array  $field_settings Settings for the particular GV field
+			 * @param array  $field_data     {@since 1.6}
+			 *
+			 * @deprecated Use the `gravityview/field/{$field_type}/output` or `gravityview/field/output` filters instead.
+			 */
+			$output = apply_filters('gravityview_field_entry_value', $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
+
+			/**
+			 * @filter `gravityview/template/field/{$field_type}/output` Modify the field output for a field type.
+			 *
+			 * @since 2.0
+			 *
+			 * @param string $output The current output.
+			 * @param \GV\Template_Context The template context this is being called from.
+			 */
+			return apply_filters("gravityview/template/field/{$field->type}/output", $output, $context);
+		};
+
+		/**
+		 * Okay, what's this whole pre/post_link compat deal, huh?
+		 *
+		 * Well, the `gravityview_field_entry_value_{$field_type}_pre_link` filter
+		 *  is expected to be applied before the value is turned into an entry link.
+		 *
+		 * And then `gravityview_field_entry_value_{$field_type}` and `gravityview_field_entry_value`
+		 *  are called afterwards.
+		 *
+		 * So we're going to use filter priorities to make sure this happens inline with
+		 *  our new filters, in the correct sequence. Pre-link called with priority 5 and
+		 *  post-link called with priority 9. Then everything else.
+		 *
+		 * If a new code wants to alter the value before it is hyperlinked (hyperlinkified?),
+		 *  it should hook into a priority between -inf. and 8. Afterwards: 10 to +inf.
+		 */
+		add_filter('gravityview/template/field/output', $pre_link_compat_callback, 5, 2);
+		add_filter('gravityview/template/field/output', $post_link_compat_callback, 9, 2);
+
+		/**
+		 * @filter `gravityview/template/field/output` Modify the field output for a field.
+		 *
+		 * @since 2.0
+		 *
+		 * @param string $output The current output.
+		 * @param \GV\Template_Context The template this is being called from.
+		 */
+		echo apply_filters('gravityview/template/field/output', $output, $context);
+
+		remove_filter('gravityview/template/field/output', $pre_link_compat_callback, 5);
+		remove_filter('gravityview/template/field/output', $post_link_compat_callback, 9);
+	}
 }
 
 /** Load implementations. */

Spacing +104 added lines, -104 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' );
 }
 
 /**
@@ -83,7 +83,7 @@ 
      * @param \GV\Entry   $entry   The entry in this context, if applicable.
      * @param \GV\Request $request The request in this context, if applicable.
      */
-    public function __construct(Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+    public function __construct( Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null )
     {
         $this->field = $field;
         $this->view = $view;
@@ -92,14 +92,14 @@ 
         $this->request = $request;
 
         /** Add granular overrides. */
-        add_filter($this->filter_prefix.'_get_template_part', $this->_add_id_specific_templates_callback = self::add_id_specific_templates($this), 10, 3);
+        add_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback = self::add_id_specific_templates( $this ), 10, 3 );
 
         parent::__construct();
     }
 
     public function __destruct()
     {
-        remove_filter($this->filter_prefix.'_get_template_part', $this->_add_id_specific_templates_callback);
+        remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback );
     }
 
     /**
@@ -111,7 +111,7 @@ 
      *
      * @return callable The callback bound to `get_template_part`. See `\GV\Field_Template::__construct`
      */
-    public static function add_id_specific_templates($template)
+    public static function add_id_specific_templates( $template )
     {
         $inputType = null;
         $field_type = null;
@@ -120,18 +120,18 @@ 
         $form_id = null;
         $is_view = $template->request && $template->request->is_view();
 
-        if ($template->field) {
+        if ( $template->field ) {
             $inputType = $template->field->inputType;
             $field_type = $template->field->type;
             $field_id = $template->field->ID;
         }
 
-        if ($template->view) {
+        if ( $template->view ) {
             $view_id = $template->view->ID;
             $form_id = $template->view->form ? $template->view->form->ID : null;
         }
 
-        $class = get_class($template);
+        $class = get_class( $template );
 
         /**
          * Enable granular template overrides based on current post, view, form, field types, etc.
@@ -175,82 +175,82 @@ 
          *
          * @return array $templates Modified template array, merged with existing $templates values
          */
-        return function ($templates, $slug, $name) use ($class, $inputType, $field_type, $view_id, $is_view, $form_id, $field_id) {
-            $specifics = [];
+        return function( $templates, $slug, $name ) use ( $class, $inputType, $field_type, $view_id, $is_view, $form_id, $field_id ) {
+            $specifics = [ ];
 
-            list($slug_dir, $slug_name) = $class::split_slug($slug, $name);
+            list( $slug_dir, $slug_name ) = $class::split_slug( $slug, $name );
 
             global $post;
 
-            if ($is_view && $post) {
-                if ($field_type) {
-                    $specifics[] = sprintf('%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name);
-                    $inputType && $specifics[] = sprintf('%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name);
-                    $specifics[] = sprintf('%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type);
-                    $inputType && $specifics[] = sprintf('%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType);
-                    $specifics[] = sprintf('%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name);
-                    $inputType && $specifics[] = sprintf('%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name);
-                    $specifics[] = sprintf('%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type);
-                    $inputType && $specifics[] = sprintf('%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType);
+            if ( $is_view && $post ) {
+                if ( $field_type ) {
+                    $specifics[ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
+                    $inputType && $specifics[ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
+                    $specifics[ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
+                    $inputType && $specifics[ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
+                    $specifics[ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
+                    $inputType && $specifics[ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
+                    $specifics[ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
+                    $inputType && $specifics[ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
                 }
 
-                $specifics[] = sprintf('%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name);
-                $specifics[] = sprintf('%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id);
-                $specifics[] = sprintf('%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name);
-                $specifics[] = sprintf('%spost-%d-field.php', $slug_dir, $post->ID);
+                $specifics[ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
+                $specifics[ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
+                $specifics[ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
+                $specifics[ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
             }
 
             /** Field-specific */
-            if ($field_id && $form_id) {
-                if ($field_id) {
-                    $specifics[] = sprintf('%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name);
-                    $specifics[] = sprintf('%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id);
+            if ( $field_id && $form_id ) {
+                if ( $field_id ) {
+                    $specifics[ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
+                    $specifics[ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
 
-                    if ($view_id) {
-                        $specifics[] = sprintf('%sview-%d-field-%d.php', $slug_dir, $view_id, $field_id);
+                    if ( $view_id ) {
+                        $specifics[ ] = sprintf( '%sview-%d-field-%d.php', $slug_dir, $view_id, $field_id );
                     }
                 }
 
-                if ($field_type) {
-                    $specifics[] = sprintf('%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name);
-                    $inputType && $specifics[] = sprintf('%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name);
-                    $specifics[] = sprintf('%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type);
-                    $inputType && $specifics[] = sprintf('%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType);
-
-                    $specifics[] = sprintf('%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name);
-                    $inputType && $specifics[] = sprintf('%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name);
-                    $specifics[] = sprintf('%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type);
-                    $inputType && $specifics[] = sprintf('%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType);
-
-                    $specifics[] = sprintf('%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name);
-                    $inputType && $specifics[] = sprintf('%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name);
-                    $specifics[] = sprintf('%sfield-%s.php', $slug_dir, $field_type);
-                    $inputType && $specifics[] = sprintf('%sfield-%s.php', $slug_dir, $inputType);
+                if ( $field_type ) {
+                    $specifics[ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
+                    $inputType && $specifics[ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
+                    $specifics[ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
+                    $inputType && $specifics[ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
+
+                    $specifics[ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
+                    $inputType && $specifics[ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
+                    $specifics[ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
+                    $inputType && $specifics[ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
+
+                    $specifics[ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
+                    $inputType && $specifics[ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
+                    $specifics[ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type );
+                    $inputType && $specifics[ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType );
                 }
             }
 
-            if ($form_id) {
+            if ( $form_id ) {
                 /** Generic field templates */
-                $specifics[] = sprintf('%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name);
-                $specifics[] = sprintf('%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name);
+                $specifics[ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
+                $specifics[ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
 
-                $specifics[] = sprintf('%sview-%d-field.php', $slug_dir, $view_id);
-                $specifics[] = sprintf('%sform-%d-field.php', $slug_dir, $form_id);
+                $specifics[ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
+                $specifics[ ] = sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
             }
 
             /**
              * Legacy.
              * Ignore some types that conflict.
              */
-            if (!in_array($field_type, ['notes'])) {
-                $specifics[] = sprintf('%s.php', $field_type);
-                $specifics[] = sprintf('fields/%s.php', $field_type);
+            if ( ! in_array( $field_type, [ 'notes' ] ) ) {
+                $specifics[ ] = sprintf( '%s.php', $field_type );
+                $specifics[ ] = sprintf( 'fields/%s.php', $field_type );
             }
 
-            $specifics[] = sprintf('%sfield-%s.php', $slug_dir, $slug_name);
-            $specifics[] = sprintf('%sfield.php', $slug_dir);
+            $specifics[ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
+            $specifics[ ] = sprintf( '%sfield.php', $slug_dir );
 
-            return array_merge($specifics, $templates);
+            return array_merge( $specifics, $templates );
         };
     }
 
@@ -263,51 +263,51 @@ 
      */
     public function render()
     {
-        if (!$entry = $this->entry->from_field($this->field)) {
-            gravityview()->log->error('Entry is invalid for field. Returning empty.');
+        if ( ! $entry = $this->entry->from_field( $this->field ) ) {
+            gravityview()->log->error( 'Entry is invalid for field. Returning empty.' );
 
             return;
         }
 
         /** Retrieve the value. */
-        $display_value = $value = $this->field->get_value($this->view, $this->source, $entry);
+        $display_value = $value = $this->field->get_value( $this->view, $this->source, $entry );
 
         $source = $this->source;
         $source_backend = $source ? $source::$backend : null;
 
-        \GV\Mocks\Legacy_Context::load([
+        \GV\Mocks\Legacy_Context::load( [
             'field' => $this->field,
-        ]);
+        ] );
 
         /** Alter the display value according to Gravity Forms. */
-        if (\GV\Source::BACKEND_GRAVITYFORMS === $source_backend && !$this->field instanceof Internal_Field) {
+        if ( \GV\Source::BACKEND_GRAVITYFORMS === $source_backend && ! $this->field instanceof Internal_Field ) {
 
             /** Prevent any PHP warnings that may be generated. */
             ob_start();
 
-            $display_value = \GFCommon::get_lead_field_display($this->field->field, $value, $entry['currency'], false, 'html');
+            $display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry[ 'currency' ], false, 'html' );
 
-            if ($errors = ob_get_clean()) {
-                gravityview()->log->error('Errors when calling GFCommon::get_lead_field_display()', ['data' => $errors]);
+            if ( $errors = ob_get_clean() ) {
+                gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', [ 'data' => $errors ] );
             }
 
             // `gform_entry_field_value` expects a GF_Field, but $this->field->field can be NULL
-            if (!$this->field->field instanceof GF_Field) {
-                $gf_field = \GF_Fields::create($this->field->field);
+            if ( ! $this->field->field instanceof GF_Field ) {
+                $gf_field = \GF_Fields::create( $this->field->field );
             }
 
             /** Call the Gravity Forms field value filter. */
-            $display_value = apply_filters('gform_entry_field_value', $display_value, $gf_field, $entry->as_entry(), $this->source->form);
+            $display_value = apply_filters( 'gform_entry_field_value', $display_value, $gf_field, $entry->as_entry(), $this->source->form );
 
-            unset($gf_field);
+            unset( $gf_field );
 
             /** Replace merge tags for admin-only fields. */
-            if (!empty($this->field->field->adminOnly)) {
-                $display_value = \GravityView_API::replace_variables($display_value, $this->form->form, $entry->as_entry(), false, false);
+            if ( ! empty( $this->field->field->adminOnly ) ) {
+                $display_value = \GravityView_API::replace_variables( $display_value, $this->form->form, $entry->as_entry(), false, false );
             }
         }
 
-        $context = Template_Context::from_template($this, compact('display_value', 'value'));
+        $context = Template_Context::from_template( $this, compact( 'display_value', 'value' ) );
 
         /**
          * Make various pieces of data available to the template
@@ -319,14 +319,14 @@ 
          *
          * @since 2.0
          */
-        $this->push_template_data(apply_filters('gravityview/template/field/context', $context), 'gravityview');
+        $this->push_template_data( apply_filters( 'gravityview/template/field/context', $context ), 'gravityview' );
 
         /** Bake the template. */
         ob_start();
-        $this->located_template = $this->get_template_part(static::$slug);
+        $this->located_template = $this->get_template_part( static::$slug );
         $output = ob_get_clean();
 
-        if (empty($output)) {
+        if ( empty( $output ) ) {
             /**
              * @filter `gravityview_empty_value` What to display when a field is empty
              *
@@ -334,7 +334,7 @@ 
              *
              * @param string $value (empty string)
              */
-            $output = apply_filters('gravityview_empty_value', $output);
+            $output = apply_filters( 'gravityview_empty_value', $output );
 
             /**
              * @filter `gravityview/field/value/empty` What to display when this field is empty.
@@ -342,18 +342,18 @@ 
              * @param string $value The value to display (Default: empty string)
              * @param \GV\Template_Context The template context this is being called from.
              */
-            $output = apply_filters('gravityview/field/value/empty', $output, Template_Context::from_template($this));
+            $output = apply_filters( 'gravityview/field/value/empty', $output, Template_Context::from_template( $this ) );
 
-            $context = Template_Context::from_template($this, compact('display_value', 'value'));
+            $context = Template_Context::from_template( $this, compact( 'display_value', 'value' ) );
         }
 
-        gravityview()->log->info('Field template for field #{field_id} loaded: {located_template}', ['field_id' => $this->field->ID, 'located_template' => $this->located_template]);
+        gravityview()->log->info( 'Field template for field #{field_id} loaded: {located_template}', [ 'field_id' => $this->field->ID, 'located_template' => $this->located_template ] );
 
-        $this->pop_template_data('gravityview');
+        $this->pop_template_data( 'gravityview' );
 
         /** A compatibility array that's required by some of the deprecated filters. */
         $field_compat = [
-            'form'           => $source_backend == \GV\Source::BACKEND_GRAVITYFORMS ? $this->source->form : ($this->view->form ? $this->view->form->form : null),
+            'form'           => $source_backend == \GV\Source::BACKEND_GRAVITYFORMS ? $this->source->form : ( $this->view->form ? $this->view->form->form : null ),
             'field_id'       => $this->field->ID,
             'field'          => $this->field->field,
             'field_settings' => $this->field->as_configuration(),
@@ -375,7 +375,7 @@ 
          *
          * @return mixed|string|void
          */
-        $pre_link_compat_callback = function ($output, $context) use ($field_compat) {
+        $pre_link_compat_callback = function( $output, $context ) use ( $field_compat ) {
             $field = $context->field;
 
             /**
@@ -390,20 +390,20 @@ 
              *
              * @deprecated Use the `gravityview/field/{$field_type}/output` or `gravityview/field/output` filters instead.
              */
-            $output = apply_filters("gravityview_field_entry_value_{$field->type}_pre_link", $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
+            $output = apply_filters( "gravityview_field_entry_value_{$field->type}_pre_link", $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat );
 
-            $output = apply_filters('gravityview_field_entry_value_pre_link', $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
+            $output = apply_filters( 'gravityview_field_entry_value_pre_link', $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat );
 
             /**
              * Link to the single entry by wrapping the output in an anchor tag.
              *
              * Fields can override this by modifying the field data variable inside the field. See /templates/fields/post_image.php for an example.
              */
-            if (!empty($field->show_as_link) && !\gv_empty($output, false, false)) {
-                $link_atts = empty($field->new_window) ? [] : ['target' => '_blank'];
+            if ( ! empty( $field->show_as_link ) && ! \gv_empty( $output, false, false ) ) {
+                $link_atts = empty( $field->new_window ) ? [ ] : [ 'target' => '_blank' ];
 
-                $permalink = $context->entry->get_permalink($context->view, $context->request);
-                $output = \gravityview_get_link($permalink, $output, $link_atts);
+                $permalink = $context->entry->get_permalink( $context->view, $context->request );
+                $output = \gravityview_get_link( $permalink, $output, $link_atts );
 
                 /**
                  * @filter `gravityview_field_entry_link` Modify the link HTML
@@ -415,7 +415,7 @@ 
                  *
                  * @deprecated Use `gravityview/template/field/entry_link`
                  */
-                $output = apply_filters('gravityview_field_entry_link', $output, $permalink, $context->entry->as_entry(), $field->as_configuration());
+                $output = apply_filters( 'gravityview_field_entry_link', $output, $permalink, $context->entry->as_entry(), $field->as_configuration() );
 
                 /**
                  * @filter `gravityview/template/field/entry_link` Modify the link HTML
@@ -426,14 +426,14 @@ 
                  * @param string               $href    URL of the link
                  * @param \GV\Template_Context $context The context
                  */
-                $output = apply_filters('gravityview/template/field/entry_link', $output, $permalink, $context);
+                $output = apply_filters( 'gravityview/template/field/entry_link', $output, $permalink, $context );
             }
 
             return $output;
         };
 
         // TODO Cleanup
-        $post_link_compat_callback = function ($output, $context) use ($field_compat) {
+        $post_link_compat_callback = function( $output, $context ) use ( $field_compat ) {
             $field = $context->field;
 
             /**
@@ -448,7 +448,7 @@ 
              *
              * @deprecated Use the `gravityview/field/{$field_type}/output` or `gravityview/field/output` filters instead.
              */
-            $output = apply_filters("gravityview_field_entry_value_{$field->type}", $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
+            $output = apply_filters( "gravityview_field_entry_value_{$field->type}", $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat );
 
             /**
              * @filter `gravityview_field_entry_value` Modify the field value output for all field types
@@ -460,7 +460,7 @@ 
              *
              * @deprecated Use the `gravityview/field/{$field_type}/output` or `gravityview/field/output` filters instead.
              */
-            $output = apply_filters('gravityview_field_entry_value', $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat);
+            $output = apply_filters( 'gravityview_field_entry_value', $output, $context->entry->as_entry(), $field->as_configuration(), $field_compat );
 
             /**
              * @filter `gravityview/template/field/{$field_type}/output` Modify the field output for a field type.
@@ -470,7 +470,7 @@ 
              * @param string $output The current output.
              * @param \GV\Template_Context The template context this is being called from.
              */
-            return apply_filters("gravityview/template/field/{$field->type}/output", $output, $context);
+            return apply_filters( "gravityview/template/field/{$field->type}/output", $output, $context );
         };
 
         /**
@@ -489,8 +489,8 @@ 
          * If a new code wants to alter the value before it is hyperlinked (hyperlinkified?),
          *  it should hook into a priority between -inf. and 8. Afterwards: 10 to +inf.
          */
-        add_filter('gravityview/template/field/output', $pre_link_compat_callback, 5, 2);
-        add_filter('gravityview/template/field/output', $post_link_compat_callback, 9, 2);
+        add_filter( 'gravityview/template/field/output', $pre_link_compat_callback, 5, 2 );
+        add_filter( 'gravityview/template/field/output', $post_link_compat_callback, 9, 2 );
 
         /**
          * @filter `gravityview/template/field/output` Modify the field output for a field.
@@ -500,13 +500,13 @@ 
          * @param string $output The current output.
          * @param \GV\Template_Context The template this is being called from.
          */
-        echo apply_filters('gravityview/template/field/output', $output, $context);
+        echo apply_filters( 'gravityview/template/field/output', $output, $context );
 
-        remove_filter('gravityview/template/field/output', $pre_link_compat_callback, 5);
-        remove_filter('gravityview/template/field/output', $post_link_compat_callback, 9);
+        remove_filter( 'gravityview/template/field/output', $pre_link_compat_callback, 5 );
+        remove_filter( 'gravityview/template/field/output', $post_link_compat_callback, 9 );
     }
 }
 
 /** Load implementations. */
-require gravityview()->plugin->dir('future/includes/class-gv-template-field-html.php');
-require gravityview()->plugin->dir('future/includes/class-gv-template-field-csv.php');
+require gravityview()->plugin->dir( 'future/includes/class-gv-template-field-html.php' );
+require gravityview()->plugin->dir( 'future/includes/class-gv-template-field-csv.php' );

Braces +5 added lines, -10 removed lines

@@ -21,8 +21,7 @@ 
  *
  * Attached to a \GV\Field and used by a \GV\Field_Renderer.
  */
-abstract class Field_Template extends Template
-{
+abstract class Field_Template extends Template {
     /**
      * Prefix for filter names.
      *
@@ -83,8 +82,7 @@ 
      * @param \GV\Entry   $entry   The entry in this context, if applicable.
      * @param \GV\Request $request The request in this context, if applicable.
      */
-    public function __construct(Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
+    public function __construct(Field $field, View $view = null, Source $source = null, Entry $entry = null, Request $request = null) {
         $this->field = $field;
         $this->view = $view;
         $this->source = $source;
@@ -97,8 +95,7 @@ 
         parent::__construct();
     }
 
-    public function __destruct()
-    {
+    public function __destruct() {
         remove_filter($this->filter_prefix.'_get_template_part', $this->_add_id_specific_templates_callback);
     }
 
@@ -111,8 +108,7 @@ 
      *
      * @return callable The callback bound to `get_template_part`. See `\GV\Field_Template::__construct`
      */
-    public static function add_id_specific_templates($template)
-    {
+    public static function add_id_specific_templates($template) {
         $inputType = null;
         $field_type = null;
         $field_id = null;
@@ -261,8 +257,7 @@ 
      *
      * @return void
      */
-    public function render()
-    {
+    public function render() {
         if (!$entry = $this->entry->from_field($this->field)) {
             gravityview()->log->error('Entry is invalid for field. Returning empty.');
 

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

Indentation +192 added lines, -192 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,195 +12,195 @@ 
  */
 class View_Collection extends Collection
 {
-    /**
-     * @inheritDoc
-     *
-     * @return View[]
-     */
-    public function all()
-    {
-        return parent::all();
-    }
-
-    /**
-     * Add a \GV\View to this collection.
-     *
-     * @param \GV\View $view The view to add to the internal array.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return void
-     */
-    public function add($view)
-    {
-        if (!$view instanceof View) {
-            gravityview()->log->error('View_Collections can only contain objects of type \GV\View.');
-
-            return;
-        }
-
-        parent::add($view);
-    }
-
-    /**
-     * Get a \GV\View from this list.
-     *
-     * @param int $view_id The ID of the view to get.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\View|null The \GV\View with the $view_id as the ID, or null if not found.
-     */
-    public function get($view_id)
-    {
-        foreach ($this->all() as $view) {
-            if ($view->ID == $view_id) {
-                return $view;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Check whether \GV\View with an ID is already here.
-     *
-     * @param int $view_id The ID of the view to check.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return bool Whether it exists or not.
-     */
-    public function contains($view_id)
-    {
-        return !is_null($this->get($view_id));
-    }
-
-    /**
-     * Get a list of \GV\View objects inside the supplied \WP_Post.
-     *
-     * The post can be a gravityview post, which is the simplest case.
-     * The post can contain gravityview shortcodes as well.
-     * The post meta can contain gravityview shortcodes.
-     *
-     * @param \WP_Post $post The \WP_Post object to look into.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\View_Collection A \GV\View_Collection instance containing the views inside the supplied \WP_Post.
-     */
-    public static function from_post(\WP_Post $post)
-    {
-        $views = new self();
-
-        $post_type = get_post_type($post);
-
-        if ('gravityview' === $post_type) {
-            /** A straight up gravityview post. */
-            $views->add(View::from_post($post));
-        } else {
-            $views->merge(self::from_content($post->post_content));
-
-            /**
-             * @filter `gravityview/view_collection/from_post/meta_keys` Define meta keys to parse to check for GravityView shortcode content.
-             *
-             * This is useful when using themes that store content that may contain shortcodes in custom post meta.
-             *
-             * @since 2.0
-             * @since 2.0.7 Added $views parameter, passed by reference
-             *
-             * @param array               $meta_keys Array of key values to check. If empty, do not check. Default: empty array
-             * @param \WP_Post            $post      The post that is being checked
-             * @param \GV\View_Collection $views     The current View Collection object, passed as reference
-             */
-            $meta_keys = apply_filters_ref_array('gravityview/view_collection/from_post/meta_keys', [[], $post, &$views]);
-
-            /**
-             * @filter `gravityview/data/parse/meta_keys`
-             *
-             * @deprecated
-             * @see The `gravityview/view_collection/from_post/meta_keys` filter.
-             */
-            $meta_keys = (array) apply_filters_deprecated('gravityview/data/parse/meta_keys', [$meta_keys, $post->ID], '2.0.7', 'gravityview/view_collection/from_post/meta_keys');
-
-            /** What about inside post meta values? */
-            foreach ($meta_keys as $meta_key) {
-                $views = self::merge_deep($views, $post->{$meta_key});
-            }
-        }
-
-        return $views;
-    }
-
-    /**
-     * Process meta values when stored singular (string) or multiple (array). Supports nested arrays and JSON strings.
-     *
-     * @since 2.1
-     *
-     * @param \GV\View_Collection $views      Existing View Collection to merge with
-     * @param string|array        $meta_value Value to parse. Normally the value of $post->{$meta_key}.
-     *
-     * @return \GV\View_Collection $views View Collection containing any additional Views found
-     */
-    private static function merge_deep($views, $meta_value)
-    {
-        $meta_value = gv_maybe_json_decode($meta_value, true);
-
-        if (is_array($meta_value)) {
-            foreach ($meta_value as $index => $item) {
-                $meta_value[$index] = self::merge_deep($views, $item);
-            }
-        }
-
-        if (is_string($meta_value)) {
-            $views->merge(self::from_content($meta_value));
-        }
-
-        return $views;
-    }
-
-    /**
-     * Get a list of detected \GV\View objects inside the supplied content.
-     *
-     * The content can have a shortcode, this is the simplest case.
-     *
-     * @param string $content The content to look into.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return \GV\View_Collection A \GV\View_Collection instance containing the views inside the supplied \WP_Post.
-     */
-    public static function from_content($content)
-    {
-        $views = new self();
-
-        /** Let's find us some [gravityview] shortcodes perhaps. */
-        foreach (Shortcode::parse($content) as $shortcode) {
-            if ($shortcode->name != 'gravityview' || empty($shortcode->atts['id'])) {
-                continue;
-            }
-
-            if (is_numeric($shortcode->atts['id'])) {
-                $view = View::by_id($shortcode->atts['id']);
-                if (!$view) {
-                    continue;
-                }
-
-                $view->settings->update($shortcode->atts);
-                $views->add($view);
-            }
-        }
-
-        return $views;
-    }
+	/**
+	 * @inheritDoc
+	 *
+	 * @return View[]
+	 */
+	public function all()
+	{
+		return parent::all();
+	}
+
+	/**
+	 * Add a \GV\View to this collection.
+	 *
+	 * @param \GV\View $view The view to add to the internal array.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return void
+	 */
+	public function add($view)
+	{
+		if (!$view instanceof View) {
+			gravityview()->log->error('View_Collections can only contain objects of type \GV\View.');
+
+			return;
+		}
+
+		parent::add($view);
+	}
+
+	/**
+	 * Get a \GV\View from this list.
+	 *
+	 * @param int $view_id The ID of the view to get.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\View|null The \GV\View with the $view_id as the ID, or null if not found.
+	 */
+	public function get($view_id)
+	{
+		foreach ($this->all() as $view) {
+			if ($view->ID == $view_id) {
+				return $view;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Check whether \GV\View with an ID is already here.
+	 *
+	 * @param int $view_id The ID of the view to check.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return bool Whether it exists or not.
+	 */
+	public function contains($view_id)
+	{
+		return !is_null($this->get($view_id));
+	}
+
+	/**
+	 * Get a list of \GV\View objects inside the supplied \WP_Post.
+	 *
+	 * The post can be a gravityview post, which is the simplest case.
+	 * The post can contain gravityview shortcodes as well.
+	 * The post meta can contain gravityview shortcodes.
+	 *
+	 * @param \WP_Post $post The \WP_Post object to look into.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\View_Collection A \GV\View_Collection instance containing the views inside the supplied \WP_Post.
+	 */
+	public static function from_post(\WP_Post $post)
+	{
+		$views = new self();
+
+		$post_type = get_post_type($post);
+
+		if ('gravityview' === $post_type) {
+			/** A straight up gravityview post. */
+			$views->add(View::from_post($post));
+		} else {
+			$views->merge(self::from_content($post->post_content));
+
+			/**
+			 * @filter `gravityview/view_collection/from_post/meta_keys` Define meta keys to parse to check for GravityView shortcode content.
+			 *
+			 * This is useful when using themes that store content that may contain shortcodes in custom post meta.
+			 *
+			 * @since 2.0
+			 * @since 2.0.7 Added $views parameter, passed by reference
+			 *
+			 * @param array               $meta_keys Array of key values to check. If empty, do not check. Default: empty array
+			 * @param \WP_Post            $post      The post that is being checked
+			 * @param \GV\View_Collection $views     The current View Collection object, passed as reference
+			 */
+			$meta_keys = apply_filters_ref_array('gravityview/view_collection/from_post/meta_keys', [[], $post, &$views]);
+
+			/**
+			 * @filter `gravityview/data/parse/meta_keys`
+			 *
+			 * @deprecated
+			 * @see The `gravityview/view_collection/from_post/meta_keys` filter.
+			 */
+			$meta_keys = (array) apply_filters_deprecated('gravityview/data/parse/meta_keys', [$meta_keys, $post->ID], '2.0.7', 'gravityview/view_collection/from_post/meta_keys');
+
+			/** What about inside post meta values? */
+			foreach ($meta_keys as $meta_key) {
+				$views = self::merge_deep($views, $post->{$meta_key});
+			}
+		}
+
+		return $views;
+	}
+
+	/**
+	 * Process meta values when stored singular (string) or multiple (array). Supports nested arrays and JSON strings.
+	 *
+	 * @since 2.1
+	 *
+	 * @param \GV\View_Collection $views      Existing View Collection to merge with
+	 * @param string|array        $meta_value Value to parse. Normally the value of $post->{$meta_key}.
+	 *
+	 * @return \GV\View_Collection $views View Collection containing any additional Views found
+	 */
+	private static function merge_deep($views, $meta_value)
+	{
+		$meta_value = gv_maybe_json_decode($meta_value, true);
+
+		if (is_array($meta_value)) {
+			foreach ($meta_value as $index => $item) {
+				$meta_value[$index] = self::merge_deep($views, $item);
+			}
+		}
+
+		if (is_string($meta_value)) {
+			$views->merge(self::from_content($meta_value));
+		}
+
+		return $views;
+	}
+
+	/**
+	 * Get a list of detected \GV\View objects inside the supplied content.
+	 *
+	 * The content can have a shortcode, this is the simplest case.
+	 *
+	 * @param string $content The content to look into.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\View_Collection A \GV\View_Collection instance containing the views inside the supplied \WP_Post.
+	 */
+	public static function from_content($content)
+	{
+		$views = new self();
+
+		/** Let's find us some [gravityview] shortcodes perhaps. */
+		foreach (Shortcode::parse($content) as $shortcode) {
+			if ($shortcode->name != 'gravityview' || empty($shortcode->atts['id'])) {
+				continue;
+			}
+
+			if (is_numeric($shortcode->atts['id'])) {
+				$view = View::by_id($shortcode->atts['id']);
+				if (!$view) {
+					continue;
+				}
+
+				$view->settings->update($shortcode->atts);
+				$views->add($view);
+			}
+		}
+
+		return $views;
+	}
 }

Spacing +34 added lines, -34 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -33,15 +33,15 @@ 
      *
      * @return void
      */
-    public function add($view)
+    public function add( $view )
     {
-        if (!$view instanceof View) {
-            gravityview()->log->error('View_Collections can only contain objects of type \GV\View.');
+        if ( ! $view instanceof View ) {
+            gravityview()->log->error( 'View_Collections can only contain objects of type \GV\View.' );
 
             return;
         }
 
-        parent::add($view);
+        parent::add( $view );
     }
 
     /**
@@ -55,10 +55,10 @@ 
      *
      * @return \GV\View|null The \GV\View with the $view_id as the ID, or null if not found.
      */
-    public function get($view_id)
+    public function get( $view_id )
     {
-        foreach ($this->all() as $view) {
-            if ($view->ID == $view_id) {
+        foreach ( $this->all() as $view ) {
+            if ( $view->ID == $view_id ) {
                 return $view;
             }
         }
@@ -77,9 +77,9 @@ 
      *
      * @return bool Whether it exists or not.
      */
-    public function contains($view_id)
+    public function contains( $view_id )
     {
-        return !is_null($this->get($view_id));
+        return ! is_null( $this->get( $view_id ) );
     }
 
     /**
@@ -97,17 +97,17 @@ 
      *
      * @return \GV\View_Collection A \GV\View_Collection instance containing the views inside the supplied \WP_Post.
      */
-    public static function from_post(\WP_Post $post)
+    public static function from_post( \WP_Post $post )
     {
         $views = new self();
 
-        $post_type = get_post_type($post);
+        $post_type = get_post_type( $post );
 
-        if ('gravityview' === $post_type) {
+        if ( 'gravityview' === $post_type ) {
             /** A straight up gravityview post. */
-            $views->add(View::from_post($post));
+            $views->add( View::from_post( $post ) );
         } else {
-            $views->merge(self::from_content($post->post_content));
+            $views->merge( self::from_content( $post->post_content ) );
 
             /**
              * @filter `gravityview/view_collection/from_post/meta_keys` Define meta keys to parse to check for GravityView shortcode content.
@@ -121,7 +121,7 @@ 
              * @param \WP_Post            $post      The post that is being checked
              * @param \GV\View_Collection $views     The current View Collection object, passed as reference
              */
-            $meta_keys = apply_filters_ref_array('gravityview/view_collection/from_post/meta_keys', [[], $post, &$views]);
+            $meta_keys = apply_filters_ref_array( 'gravityview/view_collection/from_post/meta_keys', [ [ ], $post, &$views ] );
 
             /**
              * @filter `gravityview/data/parse/meta_keys`
@@ -129,11 +129,11 @@ 
              * @deprecated
              * @see The `gravityview/view_collection/from_post/meta_keys` filter.
              */
-            $meta_keys = (array) apply_filters_deprecated('gravityview/data/parse/meta_keys', [$meta_keys, $post->ID], '2.0.7', 'gravityview/view_collection/from_post/meta_keys');
+            $meta_keys = (array)apply_filters_deprecated( 'gravityview/data/parse/meta_keys', [ $meta_keys, $post->ID ], '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
 
             /** What about inside post meta values? */
-            foreach ($meta_keys as $meta_key) {
-                $views = self::merge_deep($views, $post->{$meta_key});
+            foreach ( $meta_keys as $meta_key ) {
+                $views = self::merge_deep( $views, $post->{$meta_key});
             }
         }
 
@@ -150,18 +150,18 @@ 
      *
      * @return \GV\View_Collection $views View Collection containing any additional Views found
      */
-    private static function merge_deep($views, $meta_value)
+    private static function merge_deep( $views, $meta_value )
     {
-        $meta_value = gv_maybe_json_decode($meta_value, true);
+        $meta_value = gv_maybe_json_decode( $meta_value, true );
 
-        if (is_array($meta_value)) {
-            foreach ($meta_value as $index => $item) {
-                $meta_value[$index] = self::merge_deep($views, $item);
+        if ( is_array( $meta_value ) ) {
+            foreach ( $meta_value as $index => $item ) {
+                $meta_value[ $index ] = self::merge_deep( $views, $item );
             }
         }
 
-        if (is_string($meta_value)) {
-            $views->merge(self::from_content($meta_value));
+        if ( is_string( $meta_value ) ) {
+            $views->merge( self::from_content( $meta_value ) );
         }
 
         return $views;
@@ -180,24 +180,24 @@ 
      *
      * @return \GV\View_Collection A \GV\View_Collection instance containing the views inside the supplied \WP_Post.
      */
-    public static function from_content($content)
+    public static function from_content( $content )
     {
         $views = new self();
 
         /** Let's find us some [gravityview] shortcodes perhaps. */
-        foreach (Shortcode::parse($content) as $shortcode) {
-            if ($shortcode->name != 'gravityview' || empty($shortcode->atts['id'])) {
+        foreach ( Shortcode::parse( $content ) as $shortcode ) {
+            if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts[ 'id' ] ) ) {
                 continue;
             }
 
-            if (is_numeric($shortcode->atts['id'])) {
-                $view = View::by_id($shortcode->atts['id']);
-                if (!$view) {
+            if ( is_numeric( $shortcode->atts[ 'id' ] ) ) {
+                $view = View::by_id( $shortcode->atts[ 'id' ] );
+                if ( ! $view ) {
                     continue;
                 }
 
-                $view->settings->update($shortcode->atts);
-                $views->add($view);
+                $view->settings->update( $shortcode->atts );
+                $views->add( $view );
             }
         }
 

Braces +8 added lines, -16 removed lines

@@ -10,15 +10,13 @@ 
 /**
  * A collection of \GV\View objects.
  */
-class View_Collection extends Collection
-{
+class View_Collection extends Collection {
     /**
      * @inheritDoc
      *
      * @return View[]
      */
-    public function all()
-    {
+    public function all() {
         return parent::all();
     }
 
@@ -33,8 +31,7 @@ 
      *
      * @return void
      */
-    public function add($view)
-    {
+    public function add($view) {
         if (!$view instanceof View) {
             gravityview()->log->error('View_Collections can only contain objects of type \GV\View.');
 
@@ -55,8 +52,7 @@ 
      *
      * @return \GV\View|null The \GV\View with the $view_id as the ID, or null if not found.
      */
-    public function get($view_id)
-    {
+    public function get($view_id) {
         foreach ($this->all() as $view) {
             if ($view->ID == $view_id) {
                 return $view;
@@ -77,8 +73,7 @@ 
      *
      * @return bool Whether it exists or not.
      */
-    public function contains($view_id)
-    {
+    public function contains($view_id) {
         return !is_null($this->get($view_id));
     }
 
@@ -97,8 +92,7 @@ 
      *
      * @return \GV\View_Collection A \GV\View_Collection instance containing the views inside the supplied \WP_Post.
      */
-    public static function from_post(\WP_Post $post)
-    {
+    public static function from_post(\WP_Post $post) {
         $views = new self();
 
         $post_type = get_post_type($post);
@@ -150,8 +144,7 @@ 
      *
      * @return \GV\View_Collection $views View Collection containing any additional Views found
      */
-    private static function merge_deep($views, $meta_value)
-    {
+    private static function merge_deep($views, $meta_value) {
         $meta_value = gv_maybe_json_decode($meta_value, true);
 
         if (is_array($meta_value)) {
@@ -180,8 +173,7 @@ 
      *
      * @return \GV\View_Collection A \GV\View_Collection instance containing the views inside the supplied \WP_Post.
      */
-    public static function from_content($content)
-    {
+    public static function from_content($content) {
         $views = new self();
 
         /** Let's find us some [gravityview] shortcodes perhaps. */

future/includes/class-gv-oembed.php

Indentation +331 added lines, -331 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,179 +12,179 @@ 
  */
 class oEmbed
 {
-    public static $provider_url = '';
-
-    /**
-     * Initialize.
-     *
-     * Register the oEmbed handler and the provider.
-     * Fire off the provider handler if detected.
-     *
-     * @return void
-     */
-    public static function init()
-    {
-        self::$provider_url = add_query_arg('gv_oembed_provider', '1', site_url());
-
-        wp_embed_register_handler('gravityview_entry', self::get_entry_regex(), [__CLASS__, 'render'], 20000);
-        wp_oembed_add_provider(self::get_entry_regex(), self::$provider_url, true);
-
-        if (!empty($_GET['gv_oembed_provider']) && !empty($_GET['url'])) {
-            add_action('template_redirect', [__CLASS__, 'render_provider_request']);
-        }
-
-        add_action('pre_oembed_result', [__CLASS__, 'pre_oembed_result'], 11, 3);
-    }
-
-    /**
-     * Output a response as a provider for an entry oEmbed URL.
-     *
-     * For now we only output the JSON format and don't care about the size (width, height).
-     * Our only current use-case is for it to provide output to the Add Media / From URL box
-     *  in WordPress 4.8.
-     *
-     * @return void
-     */
-    public static function render_provider_request()
-    {
-        if (!empty($_GET['url'])) {
-            $url = $_GET['url'];
-        } else {
-            header('HTTP/1.0 404 Not Found');
-            exit;
-        }
-
-        /** Parse the URL to an entry and a view */
-        preg_match(self::get_entry_regex(), $url, $matches);
-        $result = self::parse_matches($matches, $url);
-        if (!$result || count($result) != 2) {
-            header('HTTP/1.0 404 Not Found');
-            exit;
-        }
-
-        list($view, $entry) = $result;
-
-        echo json_encode([
-            'version'       => '1.0',
-            'provider_name' => 'gravityview',
-            'provider_url'  => self::$provider_url,
-            'html'          => self::render_preview_notice().self::render_frontend($view, $entry),
-        ]);
-        exit;
-    }
-
-    /**
-     * Output the embed HTML.
-     *
-     * @param array  $matches The regex matches from the provided regex when calling wp_embed_register_handler()
-     * @param array  $attr    Embed attributes.
-     * @param string $url     The original URL that was matched by the regex.
-     * @param array  $rawattr The original unmodified attributes.
-     *
-     * @return string The embed HTML.
-     */
-    public static function render($matches, $attr, $url, $rawattr)
-    {
-        $result = self::parse_matches($matches, $url);
-
-        if (!$result || count($result) != 2) {
-            gravityview()->log->notice('View or entry could not be parsed in oEmbed url {url}', ['url' => $url, 'matches' => $matches]);
-
-            return __('You are not allowed to view this content.', 'gravityview');
-        }
-
-        list($view, $entry) = $result;
-
-        if (Request::is_ajax() && !Request::is_add_oembed_preview()) {
-            /** Render a nice placeholder in the Visual mode. */
-            return self::render_admin($view, $entry);
-        } elseif (Request::is_add_oembed_preview()) {
-            /** Prepend a preview notice in Add Media / From URL screen */
-            return self::render_preview_notice().self::render_frontend($view, $entry);
-        }
-
-        return self::render_frontend($view, $entry);
-    }
-
-    /**
-     * Parse oEmbed regex matches and return View and Entry.
-     *
-     * @param array  $matches The regex matches.
-     * @param string $url     The URL of the embed.
-     *
-     * @return array (\GV\View, \GV\Entry)
-     */
-    private static function parse_matches($matches, $url)
-    {
-        // If not using permalinks, re-assign values for matching groups
-        if (!empty($matches['entry_slug2'])) {
-            $matches['is_cpt'] = $matches['is_cpt2'];
-            $matches['slug'] = $matches['slug2'];
-            $matches['entry_slug'] = $matches['entry_slug2'];
-            unset($matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2']);
-        }
-
-        if (empty($matches['entry_slug'])) {
-            gravityview()->log->error('Entry slug not parsed by regex.', ['data' => $matches]);
-
-            return null;
-        } else {
-            $entry_id = $matches['entry_slug'];
-        }
-
-        if (!$entry = \GV\GF_Entry::by_id($entry_id)) {
-            gravityview()->log->error('Invalid entry ID {entry_id}', ['entry_id' => $entry_id]);
-
-            return null;
-        }
-
-        $view = null;
-
-        if ($view_id = url_to_postid($url)) {
-            $view = \GV\View::by_id($view_id);
-        }
-
-        // Maybe it failed to find a GravityView CPT
-        if (!$view) {
-
-            // If the slug doesn't work, maybe using Plain permalinks and not the slug, only ID
-            if (is_numeric($matches['slug'])) {
-                $view = \GV\View::by_id($matches['slug']);
-            }
-
-            if (!$view) {
-                $view = \GV\View::from_post(get_page_by_path($matches['slug'], OBJECT, 'gravityview'));
-            }
-        }
-
-        if (!$view) {
-            gravityview()->log->error('Could not detect View from URL {url}', ['url' => $url, 'data' => $matches]);
-
-            return null;
-        }
-
-        return [$view, $entry];
-    }
-
-    /**
-     * Display a nice placeholder in the admin for the entry.
-     *
-     * @param \GV\View  $view  The View.
-     * @param \GV\Entry $entry The Entry.
-     *
-     * @return string A placeholder, with Mr. Floaty :)
-     */
-    private static function render_admin($view, $entry)
-    {
-
-        // Floaty the astronaut
-        $image = \GravityView_Admin::get_floaty();
-
-        $embed_heading = sprintf(esc_html__('Embed Entry %d', 'gravityview'), $entry->ID);
-
-        $embed_text = sprintf(esc_html__('This entry will be displayed as it is configured in View %d', 'gravityview'), $view->ID);
-
-        return '
+	public static $provider_url = '';
+
+	/**
+	 * Initialize.
+	 *
+	 * Register the oEmbed handler and the provider.
+	 * Fire off the provider handler if detected.
+	 *
+	 * @return void
+	 */
+	public static function init()
+	{
+		self::$provider_url = add_query_arg('gv_oembed_provider', '1', site_url());
+
+		wp_embed_register_handler('gravityview_entry', self::get_entry_regex(), [__CLASS__, 'render'], 20000);
+		wp_oembed_add_provider(self::get_entry_regex(), self::$provider_url, true);
+
+		if (!empty($_GET['gv_oembed_provider']) && !empty($_GET['url'])) {
+			add_action('template_redirect', [__CLASS__, 'render_provider_request']);
+		}
+
+		add_action('pre_oembed_result', [__CLASS__, 'pre_oembed_result'], 11, 3);
+	}
+
+	/**
+	 * Output a response as a provider for an entry oEmbed URL.
+	 *
+	 * For now we only output the JSON format and don't care about the size (width, height).
+	 * Our only current use-case is for it to provide output to the Add Media / From URL box
+	 *  in WordPress 4.8.
+	 *
+	 * @return void
+	 */
+	public static function render_provider_request()
+	{
+		if (!empty($_GET['url'])) {
+			$url = $_GET['url'];
+		} else {
+			header('HTTP/1.0 404 Not Found');
+			exit;
+		}
+
+		/** Parse the URL to an entry and a view */
+		preg_match(self::get_entry_regex(), $url, $matches);
+		$result = self::parse_matches($matches, $url);
+		if (!$result || count($result) != 2) {
+			header('HTTP/1.0 404 Not Found');
+			exit;
+		}
+
+		list($view, $entry) = $result;
+
+		echo json_encode([
+			'version'       => '1.0',
+			'provider_name' => 'gravityview',
+			'provider_url'  => self::$provider_url,
+			'html'          => self::render_preview_notice().self::render_frontend($view, $entry),
+		]);
+		exit;
+	}
+
+	/**
+	 * Output the embed HTML.
+	 *
+	 * @param array  $matches The regex matches from the provided regex when calling wp_embed_register_handler()
+	 * @param array  $attr    Embed attributes.
+	 * @param string $url     The original URL that was matched by the regex.
+	 * @param array  $rawattr The original unmodified attributes.
+	 *
+	 * @return string The embed HTML.
+	 */
+	public static function render($matches, $attr, $url, $rawattr)
+	{
+		$result = self::parse_matches($matches, $url);
+
+		if (!$result || count($result) != 2) {
+			gravityview()->log->notice('View or entry could not be parsed in oEmbed url {url}', ['url' => $url, 'matches' => $matches]);
+
+			return __('You are not allowed to view this content.', 'gravityview');
+		}
+
+		list($view, $entry) = $result;
+
+		if (Request::is_ajax() && !Request::is_add_oembed_preview()) {
+			/** Render a nice placeholder in the Visual mode. */
+			return self::render_admin($view, $entry);
+		} elseif (Request::is_add_oembed_preview()) {
+			/** Prepend a preview notice in Add Media / From URL screen */
+			return self::render_preview_notice().self::render_frontend($view, $entry);
+		}
+
+		return self::render_frontend($view, $entry);
+	}
+
+	/**
+	 * Parse oEmbed regex matches and return View and Entry.
+	 *
+	 * @param array  $matches The regex matches.
+	 * @param string $url     The URL of the embed.
+	 *
+	 * @return array (\GV\View, \GV\Entry)
+	 */
+	private static function parse_matches($matches, $url)
+	{
+		// If not using permalinks, re-assign values for matching groups
+		if (!empty($matches['entry_slug2'])) {
+			$matches['is_cpt'] = $matches['is_cpt2'];
+			$matches['slug'] = $matches['slug2'];
+			$matches['entry_slug'] = $matches['entry_slug2'];
+			unset($matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2']);
+		}
+
+		if (empty($matches['entry_slug'])) {
+			gravityview()->log->error('Entry slug not parsed by regex.', ['data' => $matches]);
+
+			return null;
+		} else {
+			$entry_id = $matches['entry_slug'];
+		}
+
+		if (!$entry = \GV\GF_Entry::by_id($entry_id)) {
+			gravityview()->log->error('Invalid entry ID {entry_id}', ['entry_id' => $entry_id]);
+
+			return null;
+		}
+
+		$view = null;
+
+		if ($view_id = url_to_postid($url)) {
+			$view = \GV\View::by_id($view_id);
+		}
+
+		// Maybe it failed to find a GravityView CPT
+		if (!$view) {
+
+			// If the slug doesn't work, maybe using Plain permalinks and not the slug, only ID
+			if (is_numeric($matches['slug'])) {
+				$view = \GV\View::by_id($matches['slug']);
+			}
+
+			if (!$view) {
+				$view = \GV\View::from_post(get_page_by_path($matches['slug'], OBJECT, 'gravityview'));
+			}
+		}
+
+		if (!$view) {
+			gravityview()->log->error('Could not detect View from URL {url}', ['url' => $url, 'data' => $matches]);
+
+			return null;
+		}
+
+		return [$view, $entry];
+	}
+
+	/**
+	 * Display a nice placeholder in the admin for the entry.
+	 *
+	 * @param \GV\View  $view  The View.
+	 * @param \GV\Entry $entry The Entry.
+	 *
+	 * @return string A placeholder, with Mr. Floaty :)
+	 */
+	private static function render_admin($view, $entry)
+	{
+
+		// Floaty the astronaut
+		$image = \GravityView_Admin::get_floaty();
+
+		$embed_heading = sprintf(esc_html__('Embed Entry %d', 'gravityview'), $entry->ID);
+
+		$embed_text = sprintf(esc_html__('This entry will be displayed as it is configured in View %d', 'gravityview'), $view->ID);
+
+		return '
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
 			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3>
 			<p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">
@@ -192,161 +192,161 @@ 
 			</p>
 			<br style="clear: both;">
 		</div>';
-    }
-
-    /**
-     * Generate a warning to users when previewing oEmbed in the Add Media modal.
-     *
-     * @return string HTML notice
-     */
-    private static function render_preview_notice()
-    {
-        $floaty = \GravityView_Admin::get_floaty();
-        $title = esc_html__('This will look better when it is embedded.', 'gravityview');
-        $message = esc_html__('Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
-
-        return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
-    }
-
-    /**
-     * Render the entry as an oEmbed.
-     *
-     * @param \GV\View  $view  The View.
-     * @param \GV\Entry $entry The Entry.
-     *
-     * @return string The rendered oEmbed.
-     */
-    private static function render_frontend($view, $entry)
-    {
-        /** 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 __('You are not allowed to view this content.', 'gravityview');
-        }
-
-        if ($entry && 'active' !== $entry['status']) {
-            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 ($view->settings->get('show_only_approved')) {
-            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');
-            }
-        }
-
-        /**
-         * When this is embedded inside a view we should not display the widgets.
-         */
-        $request = gravityview()->request;
-        $is_reembedded = false; // Assume not embedded unless detected otherwise.
-        if (in_array(get_class($request), ['GV\Frontend_Request', 'GV\Mock_Request'])) {
-            if (($_view = $request->is_view()) && $_view->ID !== $view->ID) {
-                $is_reembedded = true;
-            }
-        }
-
-        /**
-         * Remove Widgets on a nested embedded View.
-         * Also, don't show widgets if we're embedding an entry.
-         */
-        if ($is_reembedded || $entry) {
-            $view->widgets = new \GV\Widget_Collection();
-        }
-
-        if ($request->is_edit_entry()) {
-            /**
-             * Based on code in our unit-tests.
-             * Mocks old context, etc.
-             */
-            $loader = \GravityView_Edit_Entry::getInstance();
-            $render = $loader->instances['render'];
-
-            $form = \GFAPI::get_form($entry['form_id']);
-
-            // @todo We really need to rewrite Edit Entry soon
-            \GravityView_View::$instance = null;
-            \GravityView_View_Data::$instance = null;
-
-            $data = \GravityView_View_Data::getInstance(get_post($view->ID));
-            $template = \GravityView_View::getInstance([
-                'form'    => $form,
-                'form_id' => $form['id'],
-                'view_id' => $view->ID,
-                'entries' => [$entry->as_entry()],
-                'atts'    => \GVCommon::get_template_settings($view->ID),
-            ]);
-
-            ob_start() && $render->init($data, \GV\Entry::by_id($entry['id']), $view);
-            $output = ob_get_clean(); // Render :)
-        } else {
-            /** Remove the back link. */
-            add_filter('gravityview/template/links/back/url', '__return_false');
-
-            $renderer = new \GV\Entry_Renderer();
-            $output = $renderer->render($entry, $view, gravityview()->request);
-            $output = sprintf('<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-%d">%s</div>', $entry->ID, $output);
-
-            remove_filter('gravityview/template/links/back/url', '__return_false');
-        }
-
-        return $output;
-    }
-
-    /**
-     * Generate the Regular expression that matches embedded entries.
-     *
-     * Generates different regex if using permalinks and if not using permalinks
-     *
-     * @return string Regex code
-     */
-    private static function get_entry_regex()
-    {
-        $entry_var_name = \GV\Entry::get_endpoint_name();
-
-        /**
-         * @filter `gravityview_slug` Modify the url part for a View. [Read the doc](https://docs.gravityview.co/article/62-changing-the-view-slug)
-         *
-         * @param string $rewrite_slug The slug shown in the URL
-         */
-        $rewrite_slug = apply_filters('gravityview_slug', 'view');
-
-        // Only support embeds for current site
-        $prefix = trailingslashit(home_url());
-
-        // Using permalinks
-        $using_permalinks = $prefix."(?P<is_cpt>{$rewrite_slug})?/?(?P<slug>.+?)/{$entry_var_name}/(?P<entry_slug>.+?)/?\$";
-
-        // Not using permalinks
-        $not_using_permalinks = $prefix."(?:index.php)?\?(?P<is_cpt2>[^=]+)=(?P<slug2>[^&]+)&entry=(?P<entry_slug2>[^&]+)\$";
-
-        // Catch either
-        $match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
-
-        return '#'.$match_regex.'#i';
-    }
-
-    /**
-     * Internal oEmbed output, shortcircuit without proxying to the provider.
-     */
-    public static function pre_oembed_result($result, $url, $args)
-    {
-        if (!preg_match(self::get_entry_regex(), $url, $matches)) {
-            return $result;
-        }
-
-        $view_entry = self::parse_matches($matches, $url);
-        if (!$view_entry || count($view_entry) != 2) {
-            return $result;
-        }
-
-        list($view, $entry) = $view_entry;
-
-        return self::render_frontend($view, $entry);
-    }
+	}
+
+	/**
+	 * Generate a warning to users when previewing oEmbed in the Add Media modal.
+	 *
+	 * @return string HTML notice
+	 */
+	private static function render_preview_notice()
+	{
+		$floaty = \GravityView_Admin::get_floaty();
+		$title = esc_html__('This will look better when it is embedded.', 'gravityview');
+		$message = esc_html__('Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
+
+		return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
+	}
+
+	/**
+	 * Render the entry as an oEmbed.
+	 *
+	 * @param \GV\View  $view  The View.
+	 * @param \GV\Entry $entry The Entry.
+	 *
+	 * @return string The rendered oEmbed.
+	 */
+	private static function render_frontend($view, $entry)
+	{
+		/** 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 __('You are not allowed to view this content.', 'gravityview');
+		}
+
+		if ($entry && 'active' !== $entry['status']) {
+			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 ($view->settings->get('show_only_approved')) {
+			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');
+			}
+		}
+
+		/**
+		 * When this is embedded inside a view we should not display the widgets.
+		 */
+		$request = gravityview()->request;
+		$is_reembedded = false; // Assume not embedded unless detected otherwise.
+		if (in_array(get_class($request), ['GV\Frontend_Request', 'GV\Mock_Request'])) {
+			if (($_view = $request->is_view()) && $_view->ID !== $view->ID) {
+				$is_reembedded = true;
+			}
+		}
+
+		/**
+		 * Remove Widgets on a nested embedded View.
+		 * Also, don't show widgets if we're embedding an entry.
+		 */
+		if ($is_reembedded || $entry) {
+			$view->widgets = new \GV\Widget_Collection();
+		}
+
+		if ($request->is_edit_entry()) {
+			/**
+			 * Based on code in our unit-tests.
+			 * Mocks old context, etc.
+			 */
+			$loader = \GravityView_Edit_Entry::getInstance();
+			$render = $loader->instances['render'];
+
+			$form = \GFAPI::get_form($entry['form_id']);
+
+			// @todo We really need to rewrite Edit Entry soon
+			\GravityView_View::$instance = null;
+			\GravityView_View_Data::$instance = null;
+
+			$data = \GravityView_View_Data::getInstance(get_post($view->ID));
+			$template = \GravityView_View::getInstance([
+				'form'    => $form,
+				'form_id' => $form['id'],
+				'view_id' => $view->ID,
+				'entries' => [$entry->as_entry()],
+				'atts'    => \GVCommon::get_template_settings($view->ID),
+			]);
+
+			ob_start() && $render->init($data, \GV\Entry::by_id($entry['id']), $view);
+			$output = ob_get_clean(); // Render :)
+		} else {
+			/** Remove the back link. */
+			add_filter('gravityview/template/links/back/url', '__return_false');
+
+			$renderer = new \GV\Entry_Renderer();
+			$output = $renderer->render($entry, $view, gravityview()->request);
+			$output = sprintf('<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-%d">%s</div>', $entry->ID, $output);
+
+			remove_filter('gravityview/template/links/back/url', '__return_false');
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Generate the Regular expression that matches embedded entries.
+	 *
+	 * Generates different regex if using permalinks and if not using permalinks
+	 *
+	 * @return string Regex code
+	 */
+	private static function get_entry_regex()
+	{
+		$entry_var_name = \GV\Entry::get_endpoint_name();
+
+		/**
+		 * @filter `gravityview_slug` Modify the url part for a View. [Read the doc](https://docs.gravityview.co/article/62-changing-the-view-slug)
+		 *
+		 * @param string $rewrite_slug The slug shown in the URL
+		 */
+		$rewrite_slug = apply_filters('gravityview_slug', 'view');
+
+		// Only support embeds for current site
+		$prefix = trailingslashit(home_url());
+
+		// Using permalinks
+		$using_permalinks = $prefix."(?P<is_cpt>{$rewrite_slug})?/?(?P<slug>.+?)/{$entry_var_name}/(?P<entry_slug>.+?)/?\$";
+
+		// Not using permalinks
+		$not_using_permalinks = $prefix."(?:index.php)?\?(?P<is_cpt2>[^=]+)=(?P<slug2>[^&]+)&entry=(?P<entry_slug2>[^&]+)\$";
+
+		// Catch either
+		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
+
+		return '#'.$match_regex.'#i';
+	}
+
+	/**
+	 * Internal oEmbed output, shortcircuit without proxying to the provider.
+	 */
+	public static function pre_oembed_result($result, $url, $args)
+	{
+		if (!preg_match(self::get_entry_regex(), $url, $matches)) {
+			return $result;
+		}
+
+		$view_entry = self::parse_matches($matches, $url);
+		if (!$view_entry || count($view_entry) != 2) {
+			return $result;
+		}
+
+		list($view, $entry) = $view_entry;
+
+		return self::render_frontend($view, $entry);
+	}
 }

Spacing +98 added lines, -98 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -24,16 +24,16 @@ 
      */
     public static function init()
     {
-        self::$provider_url = add_query_arg('gv_oembed_provider', '1', site_url());
+        self::$provider_url = add_query_arg( 'gv_oembed_provider', '1', site_url() );
 
-        wp_embed_register_handler('gravityview_entry', self::get_entry_regex(), [__CLASS__, 'render'], 20000);
-        wp_oembed_add_provider(self::get_entry_regex(), self::$provider_url, true);
+        wp_embed_register_handler( 'gravityview_entry', self::get_entry_regex(), [ __CLASS__, 'render' ], 20000 );
+        wp_oembed_add_provider( self::get_entry_regex(), self::$provider_url, true );
 
-        if (!empty($_GET['gv_oembed_provider']) && !empty($_GET['url'])) {
-            add_action('template_redirect', [__CLASS__, 'render_provider_request']);
+        if ( ! empty( $_GET[ 'gv_oembed_provider' ] ) && ! empty( $_GET[ 'url' ] ) ) {
+            add_action( 'template_redirect', [ __CLASS__, 'render_provider_request' ] );
         }
 
-        add_action('pre_oembed_result', [__CLASS__, 'pre_oembed_result'], 11, 3);
+        add_action( 'pre_oembed_result', [ __CLASS__, 'pre_oembed_result' ], 11, 3 );
     }
 
     /**
@@ -47,29 +47,29 @@ 
      */
     public static function render_provider_request()
     {
-        if (!empty($_GET['url'])) {
-            $url = $_GET['url'];
+        if ( ! empty( $_GET[ 'url' ] ) ) {
+            $url = $_GET[ 'url' ];
         } else {
-            header('HTTP/1.0 404 Not Found');
+            header( 'HTTP/1.0 404 Not Found' );
             exit;
         }
 
         /** Parse the URL to an entry and a view */
-        preg_match(self::get_entry_regex(), $url, $matches);
-        $result = self::parse_matches($matches, $url);
-        if (!$result || count($result) != 2) {
-            header('HTTP/1.0 404 Not Found');
+        preg_match( self::get_entry_regex(), $url, $matches );
+        $result = self::parse_matches( $matches, $url );
+        if ( ! $result || count( $result ) != 2 ) {
+            header( 'HTTP/1.0 404 Not Found' );
             exit;
         }
 
-        list($view, $entry) = $result;
+        list( $view, $entry ) = $result;
 
-        echo json_encode([
+        echo json_encode( [
             'version'       => '1.0',
             'provider_name' => 'gravityview',
             'provider_url'  => self::$provider_url,
-            'html'          => self::render_preview_notice().self::render_frontend($view, $entry),
-        ]);
+            'html'          => self::render_preview_notice() . self::render_frontend( $view, $entry ),
+        ] );
         exit;
     }
 
@@ -83,27 +83,27 @@ 
      *
      * @return string The embed HTML.
      */
-    public static function render($matches, $attr, $url, $rawattr)
+    public static function render( $matches, $attr, $url, $rawattr )
     {
-        $result = self::parse_matches($matches, $url);
+        $result = self::parse_matches( $matches, $url );
 
-        if (!$result || count($result) != 2) {
-            gravityview()->log->notice('View or entry could not be parsed in oEmbed url {url}', ['url' => $url, 'matches' => $matches]);
+        if ( ! $result || count( $result ) != 2 ) {
+            gravityview()->log->notice( 'View or entry could not be parsed in oEmbed url {url}', [ 'url' => $url, 'matches' => $matches ] );
 
-            return __('You are not allowed to view this content.', 'gravityview');
+            return __( 'You are not allowed to view this content.', 'gravityview' );
         }
 
-        list($view, $entry) = $result;
+        list( $view, $entry ) = $result;
 
-        if (Request::is_ajax() && !Request::is_add_oembed_preview()) {
+        if ( Request::is_ajax() && ! Request::is_add_oembed_preview() ) {
             /** Render a nice placeholder in the Visual mode. */
-            return self::render_admin($view, $entry);
-        } elseif (Request::is_add_oembed_preview()) {
+            return self::render_admin( $view, $entry );
+        } elseif ( Request::is_add_oembed_preview() ) {
             /** Prepend a preview notice in Add Media / From URL screen */
-            return self::render_preview_notice().self::render_frontend($view, $entry);
+            return self::render_preview_notice() . self::render_frontend( $view, $entry );
         }
 
-        return self::render_frontend($view, $entry);
+        return self::render_frontend( $view, $entry );
     }
 
     /**
@@ -114,56 +114,56 @@ 
      *
      * @return array (\GV\View, \GV\Entry)
      */
-    private static function parse_matches($matches, $url)
+    private static function parse_matches( $matches, $url )
     {
         // If not using permalinks, re-assign values for matching groups
-        if (!empty($matches['entry_slug2'])) {
-            $matches['is_cpt'] = $matches['is_cpt2'];
-            $matches['slug'] = $matches['slug2'];
-            $matches['entry_slug'] = $matches['entry_slug2'];
-            unset($matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2']);
+        if ( ! empty( $matches[ 'entry_slug2' ] ) ) {
+            $matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ];
+            $matches[ 'slug' ] = $matches[ 'slug2' ];
+            $matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ];
+            unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] );
         }
 
-        if (empty($matches['entry_slug'])) {
-            gravityview()->log->error('Entry slug not parsed by regex.', ['data' => $matches]);
+        if ( empty( $matches[ 'entry_slug' ] ) ) {
+            gravityview()->log->error( 'Entry slug not parsed by regex.', [ 'data' => $matches ] );
 
             return null;
         } else {
-            $entry_id = $matches['entry_slug'];
+            $entry_id = $matches[ 'entry_slug' ];
         }
 
-        if (!$entry = \GV\GF_Entry::by_id($entry_id)) {
-            gravityview()->log->error('Invalid entry ID {entry_id}', ['entry_id' => $entry_id]);
+        if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
+            gravityview()->log->error( 'Invalid entry ID {entry_id}', [ 'entry_id' => $entry_id ] );
 
             return null;
         }
 
         $view = null;
 
-        if ($view_id = url_to_postid($url)) {
-            $view = \GV\View::by_id($view_id);
+        if ( $view_id = url_to_postid( $url ) ) {
+            $view = \GV\View::by_id( $view_id );
         }
 
         // Maybe it failed to find a GravityView CPT
-        if (!$view) {
+        if ( ! $view ) {
 
             // If the slug doesn't work, maybe using Plain permalinks and not the slug, only ID
-            if (is_numeric($matches['slug'])) {
-                $view = \GV\View::by_id($matches['slug']);
+            if ( is_numeric( $matches[ 'slug' ] ) ) {
+                $view = \GV\View::by_id( $matches[ 'slug' ] );
             }
 
-            if (!$view) {
-                $view = \GV\View::from_post(get_page_by_path($matches['slug'], OBJECT, 'gravityview'));
+            if ( ! $view ) {
+                $view = \GV\View::from_post( get_page_by_path( $matches[ 'slug' ], OBJECT, 'gravityview' ) );
             }
         }
 
-        if (!$view) {
-            gravityview()->log->error('Could not detect View from URL {url}', ['url' => $url, 'data' => $matches]);
+        if ( ! $view ) {
+            gravityview()->log->error( 'Could not detect View from URL {url}', [ 'url' => $url, 'data' => $matches ] );
 
             return null;
         }
 
-        return [$view, $entry];
+        return [ $view, $entry ];
     }
 
     /**
@@ -174,21 +174,21 @@ 
      *
      * @return string A placeholder, with Mr. Floaty :)
      */
-    private static function render_admin($view, $entry)
+    private static function render_admin( $view, $entry )
     {
 
         // Floaty the astronaut
         $image = \GravityView_Admin::get_floaty();
 
-        $embed_heading = sprintf(esc_html__('Embed Entry %d', 'gravityview'), $entry->ID);
+        $embed_heading = sprintf( esc_html__( 'Embed Entry %d', 'gravityview' ), $entry->ID );
 
-        $embed_text = sprintf(esc_html__('This entry will be displayed as it is configured in View %d', 'gravityview'), $view->ID);
+        $embed_text = sprintf( esc_html__( 'This entry will be displayed as it is configured in View %d', 'gravityview' ), $view->ID );
 
         return '
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
-			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3>
+			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3>
 			<p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">
-				'.$embed_text.'
+				'.$embed_text . '
 			</p>
 			<br style="clear: both;">
 		</div>';
@@ -202,10 +202,10 @@ 
     private static function render_preview_notice()
     {
         $floaty = \GravityView_Admin::get_floaty();
-        $title = esc_html__('This will look better when it is embedded.', 'gravityview');
-        $message = esc_html__('Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
+        $title = esc_html__( 'This will look better when it is embedded.', 'gravityview' );
+        $message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' );
 
-        return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
+        return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>';
     }
 
     /**
@@ -216,27 +216,27 @@ 
      *
      * @return string The rendered oEmbed.
      */
-    private static function render_frontend($view, $entry)
+    private static function render_frontend( $view, $entry )
     {
         /** 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 __('You are not allowed to view this content.', 'gravityview');
+            return __( 'You are not allowed to view this content.', 'gravityview' );
         }
 
-        if ($entry && 'active' !== $entry['status']) {
-            gravityview()->log->notice('Entry ID #{entry_id} is not active', ['entry_id' => $entry->ID]);
+        if ( $entry && 'active' !== $entry[ 'status' ] ) {
+            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 ($view->settings->get('show_only_approved')) {
-            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' ) ) {
+            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' );
             }
         }
 
@@ -245,8 +245,8 @@ 
          */
         $request = gravityview()->request;
         $is_reembedded = false; // Assume not embedded unless detected otherwise.
-        if (in_array(get_class($request), ['GV\Frontend_Request', 'GV\Mock_Request'])) {
-            if (($_view = $request->is_view()) && $_view->ID !== $view->ID) {
+        if ( in_array( get_class( $request ), [ 'GV\Frontend_Request', 'GV\Mock_Request' ] ) ) {
+            if ( ( $_view = $request->is_view() ) && $_view->ID !== $view->ID ) {
                 $is_reembedded = true;
             }
         }
@@ -255,44 +255,44 @@ 
          * Remove Widgets on a nested embedded View.
          * Also, don't show widgets if we're embedding an entry.
          */
-        if ($is_reembedded || $entry) {
+        if ( $is_reembedded || $entry ) {
             $view->widgets = new \GV\Widget_Collection();
         }
 
-        if ($request->is_edit_entry()) {
+        if ( $request->is_edit_entry() ) {
             /**
              * Based on code in our unit-tests.
              * Mocks old context, etc.
              */
             $loader = \GravityView_Edit_Entry::getInstance();
-            $render = $loader->instances['render'];
+            $render = $loader->instances[ 'render' ];
 
-            $form = \GFAPI::get_form($entry['form_id']);
+            $form = \GFAPI::get_form( $entry[ 'form_id' ] );
 
             // @todo We really need to rewrite Edit Entry soon
             \GravityView_View::$instance = null;
             \GravityView_View_Data::$instance = null;
 
-            $data = \GravityView_View_Data::getInstance(get_post($view->ID));
-            $template = \GravityView_View::getInstance([
+            $data = \GravityView_View_Data::getInstance( get_post( $view->ID ) );
+            $template = \GravityView_View::getInstance( [
                 'form'    => $form,
-                'form_id' => $form['id'],
+                'form_id' => $form[ 'id' ],
                 'view_id' => $view->ID,
-                'entries' => [$entry->as_entry()],
-                'atts'    => \GVCommon::get_template_settings($view->ID),
-            ]);
+                'entries' => [ $entry->as_entry() ],
+                'atts'    => \GVCommon::get_template_settings( $view->ID ),
+            ] );
 
-            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 :)
         } 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();
-            $output = $renderer->render($entry, $view, gravityview()->request);
-            $output = sprintf('<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-%d">%s</div>', $entry->ID, $output);
+            $output = $renderer->render( $entry, $view, gravityview()->request );
+            $output = sprintf( '<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-%d">%s</div>', $entry->ID, $output );
 
-            remove_filter('gravityview/template/links/back/url', '__return_false');
+            remove_filter( 'gravityview/template/links/back/url', '__return_false' );
         }
 
         return $output;
@@ -314,39 +314,39 @@ 
          *
          * @param string $rewrite_slug The slug shown in the URL
          */
-        $rewrite_slug = apply_filters('gravityview_slug', 'view');
+        $rewrite_slug = apply_filters( 'gravityview_slug', 'view' );
 
         // Only support embeds for current site
-        $prefix = trailingslashit(home_url());
+        $prefix = trailingslashit( home_url() );
 
         // Using permalinks
-        $using_permalinks = $prefix."(?P<is_cpt>{$rewrite_slug})?/?(?P<slug>.+?)/{$entry_var_name}/(?P<entry_slug>.+?)/?\$";
+        $using_permalinks = $prefix . "(?P<is_cpt>{$rewrite_slug})?/?(?P<slug>.+?)/{$entry_var_name}/(?P<entry_slug>.+?)/?\$";
 
         // Not using permalinks
-        $not_using_permalinks = $prefix."(?:index.php)?\?(?P<is_cpt2>[^=]+)=(?P<slug2>[^&]+)&entry=(?P<entry_slug2>[^&]+)\$";
+        $not_using_permalinks = $prefix . "(?:index.php)?\?(?P<is_cpt2>[^=]+)=(?P<slug2>[^&]+)&entry=(?P<entry_slug2>[^&]+)\$";
 
         // Catch either
         $match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
 
-        return '#'.$match_regex.'#i';
+        return '#' . $match_regex . '#i';
     }
 
     /**
      * Internal oEmbed output, shortcircuit without proxying to the provider.
      */
-    public static function pre_oembed_result($result, $url, $args)
+    public static function pre_oembed_result( $result, $url, $args )
     {
-        if (!preg_match(self::get_entry_regex(), $url, $matches)) {
+        if ( ! preg_match( self::get_entry_regex(), $url, $matches ) ) {
             return $result;
         }
 
-        $view_entry = self::parse_matches($matches, $url);
-        if (!$view_entry || count($view_entry) != 2) {
+        $view_entry = self::parse_matches( $matches, $url );
+        if ( ! $view_entry || count( $view_entry ) != 2 ) {
             return $result;
         }
 
-        list($view, $entry) = $view_entry;
+        list( $view, $entry ) = $view_entry;
 
-        return self::render_frontend($view, $entry);
+        return self::render_frontend( $view, $entry );
     }
 }

Braces +10 added lines, -20 removed lines

@@ -10,8 +10,7 @@ 
 /**
  * oEmbed functionality for GravityView.
  */
-class oEmbed
-{
+class oEmbed {
     public static $provider_url = '';
 
     /**
@@ -22,8 +21,7 @@ 
      *
      * @return void
      */
-    public static function init()
-    {
+    public static function init() {
         self::$provider_url = add_query_arg('gv_oembed_provider', '1', site_url());
 
         wp_embed_register_handler('gravityview_entry', self::get_entry_regex(), [__CLASS__, 'render'], 20000);
@@ -45,8 +43,7 @@ 
      *
      * @return void
      */
-    public static function render_provider_request()
-    {
+    public static function render_provider_request() {
         if (!empty($_GET['url'])) {
             $url = $_GET['url'];
         } else {
@@ -83,8 +80,7 @@ 
      *
      * @return string The embed HTML.
      */
-    public static function render($matches, $attr, $url, $rawattr)
-    {
+    public static function render($matches, $attr, $url, $rawattr) {
         $result = self::parse_matches($matches, $url);
 
         if (!$result || count($result) != 2) {
@@ -114,8 +110,7 @@ 
      *
      * @return array (\GV\View, \GV\Entry)
      */
-    private static function parse_matches($matches, $url)
-    {
+    private static function parse_matches($matches, $url) {
         // If not using permalinks, re-assign values for matching groups
         if (!empty($matches['entry_slug2'])) {
             $matches['is_cpt'] = $matches['is_cpt2'];
@@ -174,8 +169,7 @@ 
      *
      * @return string A placeholder, with Mr. Floaty :)
      */
-    private static function render_admin($view, $entry)
-    {
+    private static function render_admin($view, $entry) {
 
         // Floaty the astronaut
         $image = \GravityView_Admin::get_floaty();
@@ -199,8 +193,7 @@ 
      *
      * @return string HTML notice
      */
-    private static function render_preview_notice()
-    {
+    private static function render_preview_notice() {
         $floaty = \GravityView_Admin::get_floaty();
         $title = esc_html__('This will look better when it is embedded.', 'gravityview');
         $message = esc_html__('Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
@@ -216,8 +209,7 @@ 
      *
      * @return string The rendered oEmbed.
      */
-    private static function render_frontend($view, $entry)
-    {
+    private static function render_frontend($view, $entry) {
         /** 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)) {
@@ -305,8 +297,7 @@ 
      *
      * @return string Regex code
      */
-    private static function get_entry_regex()
-    {
+    private static function get_entry_regex() {
         $entry_var_name = \GV\Entry::get_endpoint_name();
 
         /**
@@ -334,8 +325,7 @@ 
     /**
      * Internal oEmbed output, shortcircuit without proxying to the provider.
      */
-    public static function pre_oembed_result($result, $url, $args)
-    {
+    public static function pre_oembed_result($result, $url, $args) {
         if (!preg_match(self::get_entry_regex(), $url, $matches)) {
             return $result;
         }