gravityview / GravityView

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

Indentation +335 added lines, -335 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,338 +12,338 @@ 
  */
 class gvlogic extends \GV\Shortcode
 {
-    /**
-     * {@inheritDoc}
-     */
-    public $name = 'gvlogic';
-
-    /**
-     * {@inheritDoc}
-     */
-    public static function add($name = null)
-    {
-        parent::add(); // Me, myself and...
-
-        /**
-         * ...some aliases.
-         */
-        parent::add('gvlogic2');
-        parent::add('gvlogic3'); // This level of nesting is not supported by GravityView support...but go for it!
-        parent::add('gvlogicelse');
-    }
-
-    /**
-     * Process and output the [gvfield] shortcode.
-     *
-     * @param array  $atts    The attributes passed.
-     * @param string $content The content inside the shortcode.
-     * @param string $tag     The tag.
-     *
-     * @return string The output.
-     */
-    public function callback($atts, $content = '', $tag = '')
-    {
-        $request = gravityview()->request;
-
-        if ($request->is_admin()) {
-            return apply_filters('gravityview/shortcodes/gvlogic/output', '', $atts);
-        }
-
-        $atts = $this->parse_atts($atts, $content, $tag);
-
-        $content = \GravityView_Merge_Tags::replace_get_variables($content);
-        $atts = gv_map_deep($atts, ['\GravityView_Merge_Tags', 'replace_get_variables']);
-
-        // An invalid operation
-        if (is_null(\GV\Utils::get($atts, 'logged_in', null)) && false === \GV\Utils::get($atts, 'if', false)) {
-            gravityview()->log->error('$atts->if/logged_in is empty.', ['data' => $atts]);
-
-            return apply_filters('gravityview/shortcodes/gvlogic/output', '', $atts);
-        }
-
-        $authed = $this->authorized($atts);
-        $operator = $this->get_operator($atts);
-        $value = $this->get_value($atts);
-
-        if (false === $operator && is_null($value)) {
-            if (false !== $atts['if']) { // Only-if test
-                $match = $authed && !in_array(strtolower($atts['if']), ['', '0', 'false', 'no']);
-            } else {
-                $match = $authed; // Just login test
-            }
-
-            $output = $this->get_output($match, $atts, $content);
-        } else { // Regular test
-
-            $output = $content;
-
-            // Allow checking against multiple values at once
-            $and_values = explode('&&', $value);
-            $or_values = explode('||', $value);
-
-            // Cannot combine AND and OR
-            if (sizeof($and_values) > 1) {
-
-                // Need to match all AND
-                foreach ($and_values as $and_value) {
-                    $match = $authed && \GVCommon::matches_operation($atts['if'], $and_value, $operator);
-                    if (!$match) {
-                        break;
-                    }
-                }
-            } elseif (sizeof($or_values) > 1) {
-
-                // Only need to match a single OR
-                foreach ($or_values as $or_value) {
-                    $match = \GVCommon::matches_operation($atts['if'], $or_value, $operator);
-
-                    // Negate the negative operators
-                    if (($authed && $match) || ($authed && (!$match && in_array($operator, ['isnot', 'not_contains', 'not_in'])))) {
-                        break;
-                    }
-                }
-            } else {
-                $match = $authed && \GVCommon::matches_operation($atts['if'], $value, $operator);
-            }
-
-            $output = $this->get_output($match, $atts, $output);
-        }
-
-        // Output and get recursive!
-        $output = do_shortcode($output);
-        $output = \GFCommon::replace_variables($output, [], [], false, true, false);
-
-        return apply_filters('gravityview/shortcodes/gvlogic/output', $output, $atts);
-    }
-
-    /**
-     * Are we authorized to follow the if path?
-     *
-     * @param array $atts The attributes.
-     *
-     * @return bool Yes, or no.
-     */
-    private function authorized($atts)
-    {
-        $needs_login = \GV\Utils::get($atts, 'logged_in', null);
-
-        if (is_null($needs_login)) {
-            return true; // No auth requirements have been set
-        }
-
-        return !$needs_login ^ is_user_logged_in(); // XNOR
-    }
-
-    /**
-     * Fetch the operator.
-     *
-     * @param array $atts The attributes.
-     *
-     * @return bool|string The operator.
-     */
-    private function get_operator($atts)
-    {
-        $valid_ops = $this->get_operators(false);
-
-        foreach ($atts as $op => $value) {
-            if (in_array($op, ['if', 'else'])) {
-                continue;
-            }
-
-            if (in_array($op, $valid_ops, true)) {
-                return $op;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Fetch the value.
-     *
-     * @param array $atts The attributes.
-     *
-     * @return null|string The value.
-     */
-    private function get_value($atts)
-    {
-        $valid_ops = $this->get_operators(false);
-
-        foreach ($atts as $op => $value) {
-            if (in_array($op, ['if', 'else'])) {
-                continue;
-            }
-
-            if (in_array($op, $valid_ops, true)) {
-                return $value;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get the output content.
-     *
-     * @param bool   $match   if or else?
-     * @param array  $atts    The attributes.
-     * @param string $content The content.
-     *
-     * @return string The output.
-     */
-    private function get_output($match, $atts, $content)
-    {
-        if (!$match && !empty($atts['else'])) {
-            return $atts['else']; // Attributized else is easy :)
-        }
-
-        $if = '';
-        $else = '';
-
-        $opens = 0; // inner opens
-        $found = false; // found split position
-
-        while ($content) { // scan
-
-            if (!preg_match('#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches)) {
-                if (!$found) { // We're still iffing.
-                    $if .= $content;
-                } else { // We are elsing
-                    $else .= $content;
-                }
-                break; // No more shortcodes
-            }
-
-            list($_, $before_shortcode, $shortcode, $_, $after_shortcode) = $matches;
-
-            if (!$found) { // We're still iffing.
-                $if .= $before_shortcode;
-            } else { // We are elsing
-                $else .= $before_shortcode;
-            }
-
-            if (0 === strpos($shortcode, '[else]') && 0 === $opens) {
-                // This is the else we need!
-                $found = true;
-                if ($match) {
-                    break; // We just need the if on a match, no need to analyze further
-                }
-            } elseif ($match && 0 === strpos($shortcode, '[else if') && 0 === $opens) {
-                $found = true; // We found a match, do not process further
-                break;
-            } else {
-                // Increment inner tracking counters
-                if (0 === strpos($shortcode, '[gvlogic')) {
-                    $opens++;
-                }
-
-                if (0 === strpos($shortcode, '[/gvlogic')) {
-                    $opens--;
-                }
-
-                // Tack on the shortcode
-                if (!$found) { // We're still iffing.
-                    $if .= $shortcode;
-                } else { // We are elsing
-                    $else .= $shortcode;
-                }
-            }
-
-            $content = $after_shortcode;
-        }
-
-        gravityview()->log->debug('[gvlogic] output parsing:', [
-            'data' => [
-                'if'   => $if,
-                'else' => $else,
-            ],
-        ]);
-
-        if (!$match) {
-            while (($position = strpos($if, '[else if=')) !== false) {
-                // Try to match one of the elseif's
-                $sentinel = wp_generate_password(32, false);
-                $if = substr($if, $position); // ...by replacing it with a gvlogic shortcode
-                // ..and executing it!
-                $result = do_shortcode(preg_replace('#\[else if#', '[gvlogic if', $if, 1)."[else]{$sentinel}[/gvlogic]");
-                if ($result !== $sentinel) {
-                    // We have an elseif match!
-                    return $result;
-                }
-                $if = substr($if, 1); // Move over to get the next elseif match.. and repeat
-            }
-        }
-
-        return $match ? $if : $else;
-    }
-
-    /**
-     * Get array of supported operators.
-     *
-     * @param bool $with_values
-     *
-     * @return array
-     */
-    private function get_operators($with_values = false)
-    {
-        $operators = [
-            'is', 'isnot', 'contains', 'starts_with', 'ends_with',
-            'greater_than', 'less_than', 'in', 'not_in',
-            'contains', 'equals', 'greater_than_or_is', 'greater_than_or_equals',
-            'less_than_or_is', 'less_than_or_equals', 'not_contains',
-        ];
-
-        if ($with_values) {
-            return array_combine(
-                $operators,
-                array_fill(0, count($operators), '')
-            );
-        }
-
-        return $operators;
-    }
-
-    /**
-     * Process the attributes passed to the shortcode. Make sure they're valid.
-     *
-     * @return array Array of attributes parsed for the shortcode
-     */
-    private function parse_atts($atts, $content, $tag)
-    {
-        $supplied_atts = !empty($atts) ? $atts : [];
-
-        $atts = shortcode_atts([
-            'if'        => null,
-            'else'      => null,
-            'logged_in' => null,
-        ] + $this->get_operators(true), $atts, $tag);
-
-        // Only keep the passed attributes after making sure that they're valid pairs
-        $atts = array_intersect_key($supplied_atts, $atts);
-
-        // Strip whitespace if it's not default false
-        if (isset($atts['if']) && is_string($atts['if'])) {
-            $atts['if'] = trim($atts['if']);
-        } else {
-            $atts['if'] = false;
-        }
-
-        if (isset($atts['logged_in'])) {
-            // Truthy
-            if (in_array(strtolower($atts['logged_in']), ['0', 'false', 'no'])) {
-                $atts['logged_in'] = false;
-            } else {
-                $atts['logged_in'] = true;
-            }
-        }
-
-        /**
-         * @filter `gravityview/gvlogic/atts` The logic attributes.
-         *
-         * @since 2.5
-         *
-         * @param array $atts The logic attributes.
-         */
-        return apply_filters('gravityview/gvlogic/atts', $atts);
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	public $name = 'gvlogic';
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public static function add($name = null)
+	{
+		parent::add(); // Me, myself and...
+
+		/**
+		 * ...some aliases.
+		 */
+		parent::add('gvlogic2');
+		parent::add('gvlogic3'); // This level of nesting is not supported by GravityView support...but go for it!
+		parent::add('gvlogicelse');
+	}
+
+	/**
+	 * Process and output the [gvfield] shortcode.
+	 *
+	 * @param array  $atts    The attributes passed.
+	 * @param string $content The content inside the shortcode.
+	 * @param string $tag     The tag.
+	 *
+	 * @return string The output.
+	 */
+	public function callback($atts, $content = '', $tag = '')
+	{
+		$request = gravityview()->request;
+
+		if ($request->is_admin()) {
+			return apply_filters('gravityview/shortcodes/gvlogic/output', '', $atts);
+		}
+
+		$atts = $this->parse_atts($atts, $content, $tag);
+
+		$content = \GravityView_Merge_Tags::replace_get_variables($content);
+		$atts = gv_map_deep($atts, ['\GravityView_Merge_Tags', 'replace_get_variables']);
+
+		// An invalid operation
+		if (is_null(\GV\Utils::get($atts, 'logged_in', null)) && false === \GV\Utils::get($atts, 'if', false)) {
+			gravityview()->log->error('$atts->if/logged_in is empty.', ['data' => $atts]);
+
+			return apply_filters('gravityview/shortcodes/gvlogic/output', '', $atts);
+		}
+
+		$authed = $this->authorized($atts);
+		$operator = $this->get_operator($atts);
+		$value = $this->get_value($atts);
+
+		if (false === $operator && is_null($value)) {
+			if (false !== $atts['if']) { // Only-if test
+				$match = $authed && !in_array(strtolower($atts['if']), ['', '0', 'false', 'no']);
+			} else {
+				$match = $authed; // Just login test
+			}
+
+			$output = $this->get_output($match, $atts, $content);
+		} else { // Regular test
+
+			$output = $content;
+
+			// Allow checking against multiple values at once
+			$and_values = explode('&&', $value);
+			$or_values = explode('||', $value);
+
+			// Cannot combine AND and OR
+			if (sizeof($and_values) > 1) {
+
+				// Need to match all AND
+				foreach ($and_values as $and_value) {
+					$match = $authed && \GVCommon::matches_operation($atts['if'], $and_value, $operator);
+					if (!$match) {
+						break;
+					}
+				}
+			} elseif (sizeof($or_values) > 1) {
+
+				// Only need to match a single OR
+				foreach ($or_values as $or_value) {
+					$match = \GVCommon::matches_operation($atts['if'], $or_value, $operator);
+
+					// Negate the negative operators
+					if (($authed && $match) || ($authed && (!$match && in_array($operator, ['isnot', 'not_contains', 'not_in'])))) {
+						break;
+					}
+				}
+			} else {
+				$match = $authed && \GVCommon::matches_operation($atts['if'], $value, $operator);
+			}
+
+			$output = $this->get_output($match, $atts, $output);
+		}
+
+		// Output and get recursive!
+		$output = do_shortcode($output);
+		$output = \GFCommon::replace_variables($output, [], [], false, true, false);
+
+		return apply_filters('gravityview/shortcodes/gvlogic/output', $output, $atts);
+	}
+
+	/**
+	 * Are we authorized to follow the if path?
+	 *
+	 * @param array $atts The attributes.
+	 *
+	 * @return bool Yes, or no.
+	 */
+	private function authorized($atts)
+	{
+		$needs_login = \GV\Utils::get($atts, 'logged_in', null);
+
+		if (is_null($needs_login)) {
+			return true; // No auth requirements have been set
+		}
+
+		return !$needs_login ^ is_user_logged_in(); // XNOR
+	}
+
+	/**
+	 * Fetch the operator.
+	 *
+	 * @param array $atts The attributes.
+	 *
+	 * @return bool|string The operator.
+	 */
+	private function get_operator($atts)
+	{
+		$valid_ops = $this->get_operators(false);
+
+		foreach ($atts as $op => $value) {
+			if (in_array($op, ['if', 'else'])) {
+				continue;
+			}
+
+			if (in_array($op, $valid_ops, true)) {
+				return $op;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Fetch the value.
+	 *
+	 * @param array $atts The attributes.
+	 *
+	 * @return null|string The value.
+	 */
+	private function get_value($atts)
+	{
+		$valid_ops = $this->get_operators(false);
+
+		foreach ($atts as $op => $value) {
+			if (in_array($op, ['if', 'else'])) {
+				continue;
+			}
+
+			if (in_array($op, $valid_ops, true)) {
+				return $value;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get the output content.
+	 *
+	 * @param bool   $match   if or else?
+	 * @param array  $atts    The attributes.
+	 * @param string $content The content.
+	 *
+	 * @return string The output.
+	 */
+	private function get_output($match, $atts, $content)
+	{
+		if (!$match && !empty($atts['else'])) {
+			return $atts['else']; // Attributized else is easy :)
+		}
+
+		$if = '';
+		$else = '';
+
+		$opens = 0; // inner opens
+		$found = false; // found split position
+
+		while ($content) { // scan
+
+			if (!preg_match('#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches)) {
+				if (!$found) { // We're still iffing.
+					$if .= $content;
+				} else { // We are elsing
+					$else .= $content;
+				}
+				break; // No more shortcodes
+			}
+
+			list($_, $before_shortcode, $shortcode, $_, $after_shortcode) = $matches;
+
+			if (!$found) { // We're still iffing.
+				$if .= $before_shortcode;
+			} else { // We are elsing
+				$else .= $before_shortcode;
+			}
+
+			if (0 === strpos($shortcode, '[else]') && 0 === $opens) {
+				// This is the else we need!
+				$found = true;
+				if ($match) {
+					break; // We just need the if on a match, no need to analyze further
+				}
+			} elseif ($match && 0 === strpos($shortcode, '[else if') && 0 === $opens) {
+				$found = true; // We found a match, do not process further
+				break;
+			} else {
+				// Increment inner tracking counters
+				if (0 === strpos($shortcode, '[gvlogic')) {
+					$opens++;
+				}
+
+				if (0 === strpos($shortcode, '[/gvlogic')) {
+					$opens--;
+				}
+
+				// Tack on the shortcode
+				if (!$found) { // We're still iffing.
+					$if .= $shortcode;
+				} else { // We are elsing
+					$else .= $shortcode;
+				}
+			}
+
+			$content = $after_shortcode;
+		}
+
+		gravityview()->log->debug('[gvlogic] output parsing:', [
+			'data' => [
+				'if'   => $if,
+				'else' => $else,
+			],
+		]);
+
+		if (!$match) {
+			while (($position = strpos($if, '[else if=')) !== false) {
+				// Try to match one of the elseif's
+				$sentinel = wp_generate_password(32, false);
+				$if = substr($if, $position); // ...by replacing it with a gvlogic shortcode
+				// ..and executing it!
+				$result = do_shortcode(preg_replace('#\[else if#', '[gvlogic if', $if, 1)."[else]{$sentinel}[/gvlogic]");
+				if ($result !== $sentinel) {
+					// We have an elseif match!
+					return $result;
+				}
+				$if = substr($if, 1); // Move over to get the next elseif match.. and repeat
+			}
+		}
+
+		return $match ? $if : $else;
+	}
+
+	/**
+	 * Get array of supported operators.
+	 *
+	 * @param bool $with_values
+	 *
+	 * @return array
+	 */
+	private function get_operators($with_values = false)
+	{
+		$operators = [
+			'is', 'isnot', 'contains', 'starts_with', 'ends_with',
+			'greater_than', 'less_than', 'in', 'not_in',
+			'contains', 'equals', 'greater_than_or_is', 'greater_than_or_equals',
+			'less_than_or_is', 'less_than_or_equals', 'not_contains',
+		];
+
+		if ($with_values) {
+			return array_combine(
+				$operators,
+				array_fill(0, count($operators), '')
+			);
+		}
+
+		return $operators;
+	}
+
+	/**
+	 * Process the attributes passed to the shortcode. Make sure they're valid.
+	 *
+	 * @return array Array of attributes parsed for the shortcode
+	 */
+	private function parse_atts($atts, $content, $tag)
+	{
+		$supplied_atts = !empty($atts) ? $atts : [];
+
+		$atts = shortcode_atts([
+			'if'        => null,
+			'else'      => null,
+			'logged_in' => null,
+		] + $this->get_operators(true), $atts, $tag);
+
+		// Only keep the passed attributes after making sure that they're valid pairs
+		$atts = array_intersect_key($supplied_atts, $atts);
+
+		// Strip whitespace if it's not default false
+		if (isset($atts['if']) && is_string($atts['if'])) {
+			$atts['if'] = trim($atts['if']);
+		} else {
+			$atts['if'] = false;
+		}
+
+		if (isset($atts['logged_in'])) {
+			// Truthy
+			if (in_array(strtolower($atts['logged_in']), ['0', 'false', 'no'])) {
+				$atts['logged_in'] = false;
+			} else {
+				$atts['logged_in'] = true;
+			}
+		}
+
+		/**
+		 * @filter `gravityview/gvlogic/atts` The logic attributes.
+		 *
+		 * @since 2.5
+		 *
+		 * @param array $atts The logic attributes.
+		 */
+		return apply_filters('gravityview/gvlogic/atts', $atts);
+	}
 }

Spacing +89 added lines, -89 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV\Shortcodes;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -20,16 +20,16 @@ 
     /**
      * {@inheritDoc}
      */
-    public static function add($name = null)
+    public static function add( $name = null )
     {
         parent::add(); // Me, myself and...
 
         /**
          * ...some aliases.
          */
-        parent::add('gvlogic2');
-        parent::add('gvlogic3'); // This level of nesting is not supported by GravityView support...but go for it!
-        parent::add('gvlogicelse');
+        parent::add( 'gvlogic2' );
+        parent::add( 'gvlogic3' ); // This level of nesting is not supported by GravityView support...but go for it!
+        parent::add( 'gvlogicelse' );
     }
 
     /**
@@ -41,79 +41,79 @@ 
      *
      * @return string The output.
      */
-    public function callback($atts, $content = '', $tag = '')
+    public function callback( $atts, $content = '', $tag = '' )
     {
         $request = gravityview()->request;
 
-        if ($request->is_admin()) {
-            return apply_filters('gravityview/shortcodes/gvlogic/output', '', $atts);
+        if ( $request->is_admin() ) {
+            return apply_filters( 'gravityview/shortcodes/gvlogic/output', '', $atts );
         }
 
-        $atts = $this->parse_atts($atts, $content, $tag);
+        $atts = $this->parse_atts( $atts, $content, $tag );
 
-        $content = \GravityView_Merge_Tags::replace_get_variables($content);
-        $atts = gv_map_deep($atts, ['\GravityView_Merge_Tags', 'replace_get_variables']);
+        $content = \GravityView_Merge_Tags::replace_get_variables( $content );
+        $atts = gv_map_deep( $atts, [ '\GravityView_Merge_Tags', 'replace_get_variables' ] );
 
         // An invalid operation
-        if (is_null(\GV\Utils::get($atts, 'logged_in', null)) && false === \GV\Utils::get($atts, 'if', false)) {
-            gravityview()->log->error('$atts->if/logged_in is empty.', ['data' => $atts]);
+        if ( is_null( \GV\Utils::get( $atts, 'logged_in', null ) ) && false === \GV\Utils::get( $atts, 'if', false ) ) {
+            gravityview()->log->error( '$atts->if/logged_in is empty.', [ 'data' => $atts ] );
 
-            return apply_filters('gravityview/shortcodes/gvlogic/output', '', $atts);
+            return apply_filters( 'gravityview/shortcodes/gvlogic/output', '', $atts );
         }
 
-        $authed = $this->authorized($atts);
-        $operator = $this->get_operator($atts);
-        $value = $this->get_value($atts);
+        $authed = $this->authorized( $atts );
+        $operator = $this->get_operator( $atts );
+        $value = $this->get_value( $atts );
 
-        if (false === $operator && is_null($value)) {
-            if (false !== $atts['if']) { // Only-if test
-                $match = $authed && !in_array(strtolower($atts['if']), ['', '0', 'false', 'no']);
+        if ( false === $operator && is_null( $value ) ) {
+            if ( false !== $atts[ 'if' ] ) { // Only-if test
+                $match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), [ '', '0', 'false', 'no' ] );
             } else {
                 $match = $authed; // Just login test
             }
 
-            $output = $this->get_output($match, $atts, $content);
+            $output = $this->get_output( $match, $atts, $content );
         } else { // Regular test
 
             $output = $content;
 
             // Allow checking against multiple values at once
-            $and_values = explode('&&', $value);
-            $or_values = explode('||', $value);
+            $and_values = explode( '&&', $value );
+            $or_values = explode( '||', $value );
 
             // Cannot combine AND and OR
-            if (sizeof($and_values) > 1) {
+            if ( sizeof( $and_values ) > 1 ) {
 
                 // Need to match all AND
-                foreach ($and_values as $and_value) {
-                    $match = $authed && \GVCommon::matches_operation($atts['if'], $and_value, $operator);
-                    if (!$match) {
+                foreach ( $and_values as $and_value ) {
+                    $match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $and_value, $operator );
+                    if ( ! $match ) {
                         break;
                     }
                 }
-            } elseif (sizeof($or_values) > 1) {
+            } elseif ( sizeof( $or_values ) > 1 ) {
 
                 // Only need to match a single OR
-                foreach ($or_values as $or_value) {
-                    $match = \GVCommon::matches_operation($atts['if'], $or_value, $operator);
+                foreach ( $or_values as $or_value ) {
+                    $match = \GVCommon::matches_operation( $atts[ 'if' ], $or_value, $operator );
 
                     // Negate the negative operators
-                    if (($authed && $match) || ($authed && (!$match && in_array($operator, ['isnot', 'not_contains', 'not_in'])))) {
+                    if ( ( $authed && $match ) || ( $authed && ( ! $match && in_array( $operator, [ 'isnot', 'not_contains', 'not_in' ] ) ) ) ) {
                         break;
                     }
                 }
             } else {
-                $match = $authed && \GVCommon::matches_operation($atts['if'], $value, $operator);
+                $match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
             }
 
-            $output = $this->get_output($match, $atts, $output);
+            $output = $this->get_output( $match, $atts, $output );
         }
 
         // Output and get recursive!
-        $output = do_shortcode($output);
-        $output = \GFCommon::replace_variables($output, [], [], false, true, false);
+        $output = do_shortcode( $output );
+        $output = \GFCommon::replace_variables( $output, [ ], [ ], false, true, false );
 
-        return apply_filters('gravityview/shortcodes/gvlogic/output', $output, $atts);
+        return apply_filters( 'gravityview/shortcodes/gvlogic/output', $output, $atts );
     }
 
     /**
@@ -123,15 +123,15 @@ 
      *
      * @return bool Yes, or no.
      */
-    private function authorized($atts)
+    private function authorized( $atts )
     {
-        $needs_login = \GV\Utils::get($atts, 'logged_in', null);
+        $needs_login = \GV\Utils::get( $atts, 'logged_in', null );
 
-        if (is_null($needs_login)) {
+        if ( is_null( $needs_login ) ) {
             return true; // No auth requirements have been set
         }
 
-        return !$needs_login ^ is_user_logged_in(); // XNOR
+        return ! $needs_login ^ is_user_logged_in(); // XNOR
     }
 
     /**
@@ -141,16 +141,16 @@ 
      *
      * @return bool|string The operator.
      */
-    private function get_operator($atts)
+    private function get_operator( $atts )
     {
-        $valid_ops = $this->get_operators(false);
+        $valid_ops = $this->get_operators( false );
 
-        foreach ($atts as $op => $value) {
-            if (in_array($op, ['if', 'else'])) {
+        foreach ( $atts as $op => $value ) {
+            if ( in_array( $op, [ 'if', 'else' ] ) ) {
                 continue;
             }
 
-            if (in_array($op, $valid_ops, true)) {
+            if ( in_array( $op, $valid_ops, true ) ) {
                 return $op;
             }
         }
@@ -165,16 +165,16 @@ 
      *
      * @return null|string The value.
      */
-    private function get_value($atts)
+    private function get_value( $atts )
     {
-        $valid_ops = $this->get_operators(false);
+        $valid_ops = $this->get_operators( false );
 
-        foreach ($atts as $op => $value) {
-            if (in_array($op, ['if', 'else'])) {
+        foreach ( $atts as $op => $value ) {
+            if ( in_array( $op, [ 'if', 'else' ] ) ) {
                 continue;
             }
 
-            if (in_array($op, $valid_ops, true)) {
+            if ( in_array( $op, $valid_ops, true ) ) {
                 return $value;
             }
         }
@@ -191,10 +191,10 @@ 
      *
      * @return string The output.
      */
-    private function get_output($match, $atts, $content)
+    private function get_output( $match, $atts, $content )
     {
-        if (!$match && !empty($atts['else'])) {
-            return $atts['else']; // Attributized else is easy :)
+        if ( ! $match && ! empty( $atts[ 'else' ] ) ) {
+            return $atts[ 'else' ]; // Attributized else is easy :)
         }
 
         $if = '';
@@ -203,10 +203,10 @@ 
         $opens = 0; // inner opens
         $found = false; // found split position
 
-        while ($content) { // scan
+        while ( $content ) { // scan
 
-            if (!preg_match('#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches)) {
-                if (!$found) { // We're still iffing.
+            if ( ! preg_match( '#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches ) ) {
+                if ( ! $found ) { // We're still iffing.
                     $if .= $content;
                 } else { // We are elsing
                     $else .= $content;
@@ -214,35 +214,35 @@ 
                 break; // No more shortcodes
             }
 
-            list($_, $before_shortcode, $shortcode, $_, $after_shortcode) = $matches;
+            list( $_, $before_shortcode, $shortcode, $_, $after_shortcode ) = $matches;
 
-            if (!$found) { // We're still iffing.
+            if ( ! $found ) { // We're still iffing.
                 $if .= $before_shortcode;
             } else { // We are elsing
                 $else .= $before_shortcode;
             }
 
-            if (0 === strpos($shortcode, '[else]') && 0 === $opens) {
+            if ( 0 === strpos( $shortcode, '[else]' ) && 0 === $opens ) {
                 // This is the else we need!
                 $found = true;
-                if ($match) {
+                if ( $match ) {
                     break; // We just need the if on a match, no need to analyze further
                 }
-            } elseif ($match && 0 === strpos($shortcode, '[else if') && 0 === $opens) {
+            } elseif ( $match && 0 === strpos( $shortcode, '[else if' ) && 0 === $opens ) {
                 $found = true; // We found a match, do not process further
                 break;
             } else {
                 // Increment inner tracking counters
-                if (0 === strpos($shortcode, '[gvlogic')) {
+                if ( 0 === strpos( $shortcode, '[gvlogic' ) ) {
                     $opens++;
                 }
 
-                if (0 === strpos($shortcode, '[/gvlogic')) {
+                if ( 0 === strpos( $shortcode, '[/gvlogic' ) ) {
                     $opens--;
                 }
 
                 // Tack on the shortcode
-                if (!$found) { // We're still iffing.
+                if ( ! $found ) { // We're still iffing.
                     $if .= $shortcode;
                 } else { // We are elsing
                     $else .= $shortcode;
@@ -252,25 +252,25 @@ 
             $content = $after_shortcode;
         }
 
-        gravityview()->log->debug('[gvlogic] output parsing:', [
+        gravityview()->log->debug( '[gvlogic] output parsing:', [
             'data' => [
                 'if'   => $if,
                 'else' => $else,
             ],
-        ]);
+        ] );
 
-        if (!$match) {
-            while (($position = strpos($if, '[else if=')) !== false) {
+        if ( ! $match ) {
+            while ( ( $position = strpos( $if, '[else if=' ) ) !== false ) {
                 // Try to match one of the elseif's
-                $sentinel = wp_generate_password(32, false);
-                $if = substr($if, $position); // ...by replacing it with a gvlogic shortcode
+                $sentinel = wp_generate_password( 32, false );
+                $if = substr( $if, $position ); // ...by replacing it with a gvlogic shortcode
                 // ..and executing it!
-                $result = do_shortcode(preg_replace('#\[else if#', '[gvlogic if', $if, 1)."[else]{$sentinel}[/gvlogic]");
-                if ($result !== $sentinel) {
+                $result = do_shortcode( preg_replace( '#\[else if#', '[gvlogic if', $if, 1 ) . "[else]{$sentinel}[/gvlogic]" );
+                if ( $result !== $sentinel ) {
                     // We have an elseif match!
                     return $result;
                 }
-                $if = substr($if, 1); // Move over to get the next elseif match.. and repeat
+                $if = substr( $if, 1 ); // Move over to get the next elseif match.. and repeat
             }
         }
 
@@ -284,7 +284,7 @@ 
      *
      * @return array
      */
-    private function get_operators($with_values = false)
+    private function get_operators( $with_values = false )
     {
         $operators = [
             'is', 'isnot', 'contains', 'starts_with', 'ends_with',
@@ -293,10 +293,10 @@ 
             'less_than_or_is', 'less_than_or_equals', 'not_contains',
         ];
 
-        if ($with_values) {
+        if ( $with_values ) {
             return array_combine(
                 $operators,
-                array_fill(0, count($operators), '')
+                array_fill( 0, count( $operators ), '' )
             );
         }
 
@@ -308,32 +308,32 @@ 
      *
      * @return array Array of attributes parsed for the shortcode
      */
-    private function parse_atts($atts, $content, $tag)
+    private function parse_atts( $atts, $content, $tag )
     {
-        $supplied_atts = !empty($atts) ? $atts : [];
+        $supplied_atts = ! empty( $atts ) ? $atts : [ ];
 
-        $atts = shortcode_atts([
+        $atts = shortcode_atts( [
             'if'        => null,
             'else'      => null,
             'logged_in' => null,
-        ] + $this->get_operators(true), $atts, $tag);
+        ] + $this->get_operators( true ), $atts, $tag );
 
         // Only keep the passed attributes after making sure that they're valid pairs
-        $atts = array_intersect_key($supplied_atts, $atts);
+        $atts = array_intersect_key( $supplied_atts, $atts );
 
         // Strip whitespace if it's not default false
-        if (isset($atts['if']) && is_string($atts['if'])) {
-            $atts['if'] = trim($atts['if']);
+        if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) {
+            $atts[ 'if' ] = trim( $atts[ 'if' ] );
         } else {
-            $atts['if'] = false;
+            $atts[ 'if' ] = false;
         }
 
-        if (isset($atts['logged_in'])) {
+        if ( isset( $atts[ 'logged_in' ] ) ) {
             // Truthy
-            if (in_array(strtolower($atts['logged_in']), ['0', 'false', 'no'])) {
-                $atts['logged_in'] = false;
+            if ( in_array( strtolower( $atts[ 'logged_in' ] ), [ '0', 'false', 'no' ] ) ) {
+                $atts[ 'logged_in' ] = false;
             } else {
-                $atts['logged_in'] = true;
+                $atts[ 'logged_in' ] = true;
             }
         }
 
@@ -344,6 +344,6 @@ 
          *
          * @param array $atts The logic attributes.
          */
-        return apply_filters('gravityview/gvlogic/atts', $atts);
+        return apply_filters( 'gravityview/gvlogic/atts', $atts );
     }
 }

Braces +26 added lines, -25 removed lines

@@ -20,8 +20,7 @@ 
     /**
      * {@inheritDoc}
      */
-    public static function add($name = null)
-    {
+    public static function add($name = null) {
         parent::add(); // Me, myself and...
 
         /**
@@ -41,8 +40,7 @@ 
      *
      * @return string The output.
      */
-    public function callback($atts, $content = '', $tag = '')
-    {
+    public function callback($atts, $content = '', $tag = '') {
         $request = gravityview()->request;
 
         if ($request->is_admin()) {
@@ -66,14 +64,16 @@ 
         $value = $this->get_value($atts);
 
         if (false === $operator && is_null($value)) {
-            if (false !== $atts['if']) { // Only-if test
+            if (false !== $atts['if']) {
+// Only-if test
                 $match = $authed && !in_array(strtolower($atts['if']), ['', '0', 'false', 'no']);
             } else {
                 $match = $authed; // Just login test
             }
 
             $output = $this->get_output($match, $atts, $content);
-        } else { // Regular test
+        } else {
+// Regular test
 
             $output = $content;
 
@@ -123,8 +123,7 @@ 
      *
      * @return bool Yes, or no.
      */
-    private function authorized($atts)
-    {
+    private function authorized($atts) {
         $needs_login = \GV\Utils::get($atts, 'logged_in', null);
 
         if (is_null($needs_login)) {
@@ -141,8 +140,7 @@ 
      *
      * @return bool|string The operator.
      */
-    private function get_operator($atts)
-    {
+    private function get_operator($atts) {
         $valid_ops = $this->get_operators(false);
 
         foreach ($atts as $op => $value) {
@@ -165,8 +163,7 @@ 
      *
      * @return null|string The value.
      */
-    private function get_value($atts)
-    {
+    private function get_value($atts) {
         $valid_ops = $this->get_operators(false);
 
         foreach ($atts as $op => $value) {
@@ -191,8 +188,7 @@ 
      *
      * @return string The output.
      */
-    private function get_output($match, $atts, $content)
-    {
+    private function get_output($match, $atts, $content) {
         if (!$match && !empty($atts['else'])) {
             return $atts['else']; // Attributized else is easy :)
         }
@@ -203,12 +199,15 @@ 
         $opens = 0; // inner opens
         $found = false; // found split position
 
-        while ($content) { // scan
+        while ($content) {
+// scan
 
             if (!preg_match('#(.*?)(\[\/?(gvlogic|else).*?])(.*)#s', $content, $matches)) {
-                if (!$found) { // We're still iffing.
+                if (!$found) {
+// We're still iffing.
                     $if .= $content;
-                } else { // We are elsing
+                } else {
+// We are elsing
                     $else .= $content;
                 }
                 break; // No more shortcodes
@@ -216,9 +215,11 @@ 
 
             list($_, $before_shortcode, $shortcode, $_, $after_shortcode) = $matches;
 
-            if (!$found) { // We're still iffing.
+            if (!$found) {
+// We're still iffing.
                 $if .= $before_shortcode;
-            } else { // We are elsing
+            } else {
+// We are elsing
                 $else .= $before_shortcode;
             }
 
@@ -242,9 +243,11 @@ 
                 }
 
                 // Tack on the shortcode
-                if (!$found) { // We're still iffing.
+                if (!$found) {
+// We're still iffing.
                     $if .= $shortcode;
-                } else { // We are elsing
+                } else {
+// We are elsing
                     $else .= $shortcode;
                 }
             }
@@ -284,8 +287,7 @@ 
      *
      * @return array
      */
-    private function get_operators($with_values = false)
-    {
+    private function get_operators($with_values = false) {
         $operators = [
             'is', 'isnot', 'contains', 'starts_with', 'ends_with',
             'greater_than', 'less_than', 'in', 'not_in',
@@ -308,8 +310,7 @@ 
      *
      * @return array Array of attributes parsed for the shortcode
      */
-    private function parse_atts($atts, $content, $tag)
-    {
+    private function parse_atts($atts, $content, $tag) {
         $supplied_atts = !empty($atts) ? $atts : [];
 
         $atts = shortcode_atts([

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

Indentation +168 added lines, -168 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,172 +23,172 @@ 
  */
 abstract class Entry_Template extends Template
 {
-    /**
-     * Prefix for filter names.
-     *
-     * @var string
-     */
-    protected $filter_prefix = 'gravityview/template/entries';
-
-    /**
-     * Directory name where custom templates for this plugin should be found in the theme.
-     *
-     * @var string
-     */
-    protected $theme_template_directory = 'gravityview/entries/';
-
-    /**
-     * Directory name where the default templates for this plugin are found.
-     *
-     * @var string
-     */
-    protected $plugin_template_directory = 'templates/entries/';
-
-    /**
-     * @var \GV\Entry The entry that need to be rendered.
-     */
-    public $entry;
-
-    /**
-     * @var \GV\View The view context.
-     */
-    public $view;
-
-    /**
-     * @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\View             $view    The View connected to this template.
-     * @param \GV\Entry_Collection $entries A collection of entries for this view.
-     * @param \GV\Request          $request The request context.
-     */
-    public function __construct(Entry $entry, View $view, Request $request)
-    {
-        $this->entry = $entry;
-        $this->view = $view;
-        $this->request = $request;
-
-        /** Add granular overrides. */
-        add_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates'], 10, 3);
-
-        parent::__construct();
-    }
-
-    public function __destruct()
-    {
-        remove_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates']);
-    }
-
-    /**
-     * Enable granular template overrides based on current post, view, form, etc.
-     *
-     * The loading order is:
-     *
-     * - post-[ID of post or page where view is embedded]-view-[View ID]-entry-[Entry ID]-table-footer.php
-     * - post-[ID of post or page where view is embedded]-entry-[Entry ID]-table-footer.php
-     * - post-[ID of post or page where view is embedded]-view-[View ID]-table-footer.php
-     * - post-[ID of post or page where view is embedded]-table-footer.php
-     * - view-[View ID]-entry-[Entry ID]-table-footer.php
-     * - form-[Form ID]-entry-[Entry ID]-table-footer.php
-     * - view-[View ID]-table-footer.php
-     * - form-[Form ID]-table-footer.php
-     * - entry-[Entry ID]-table-footer.php
-     * - table-footer.php
-     *
-     * @see  Gamajo_Template_Loader::get_template_file_names() Where the filter is
-     *
-     * @param array  $templates Existing list of templates.
-     * @param string $slug      Name of the template base, example: `table`, `list`, `datatables`, `map`
-     * @param string $name      Name of the template part, example: `body`, `footer`, `head`, `single`
-     *
-     * @return array $templates Modified template array, merged with existing $templates values
-     */
-    public function add_id_specific_templates($templates, $slug, $name)
-    {
-        $specifics = [];
-
-        list($slug_dir, $slug_name) = self::split_slug($slug, $name);
-
-        global $post;
-
-        if (!$this->request->is_view() && $post) {
-            $specifics[] = sprintf('%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name);
-            $specifics[] = sprintf('%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name);
-            $specifics[] = sprintf('%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name);
-            $specifics[] = sprintf('%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name);
-        }
-
-        $specifics[] = sprintf('%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name);
-        $specifics[] = sprintf('%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name);
-        $specifics[] = sprintf('%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name);
-        $specifics[] = sprintf('%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name);
-
-        $specifics[] = sprintf('%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name);
-
-        return array_merge($specifics, $templates);
-    }
-
-    /**
-     * Output some HTML.
-     *
-     * @return void
-     */
-    public function render()
-    {
-        $context = Template_Context::from_template($this);
-
-        /**
-         * Make various pieces of data available to the template
-         *  under the $gravityview scoped variable.
-         *
-         * @filter `gravityview/template/entry/context`
-         *
-         * @param \GV\Template_Context $context  The context for this template.
-         * @param \GV\Entry_Template   $template The current template.
-         *
-         * @since 2.0
-         */
-        $this->push_template_data(apply_filters('gravityview/template/entry/context', $context, $this), 'gravityview');
-
-        /** Load the template. */
-        $this->get_template_part(static::$slug);
-        $this->pop_template_data('gravityview');
-    }
-
-    /**
-     * Fetch the back link label for an entry context.
-     *
-     * @param bool $do_replace Whether to perform merge tag replacements, etc.
-     *
-     * @see `gravityview/template/links/back/label` filter
-     *
-     * @return string The link label
-     */
-    public function get_back_label($do_replace = true)
-    {
-        if (!$this->view) {
-            return '';
-        }
-
-        $back_link_label = $this->view->settings->get('back_link_label', null);
-
-        if ($do_replace) {
-            $back_link_label = \GravityView_API::replace_variables($back_link_label, Utils::get($this->view, 'form/form'), $this->entry->as_entry());
-
-            return do_shortcode($back_link_label);
-        }
-
-        return $back_link_label;
-    }
+	/**
+	 * Prefix for filter names.
+	 *
+	 * @var string
+	 */
+	protected $filter_prefix = 'gravityview/template/entries';
+
+	/**
+	 * Directory name where custom templates for this plugin should be found in the theme.
+	 *
+	 * @var string
+	 */
+	protected $theme_template_directory = 'gravityview/entries/';
+
+	/**
+	 * Directory name where the default templates for this plugin are found.
+	 *
+	 * @var string
+	 */
+	protected $plugin_template_directory = 'templates/entries/';
+
+	/**
+	 * @var \GV\Entry The entry that need to be rendered.
+	 */
+	public $entry;
+
+	/**
+	 * @var \GV\View The view context.
+	 */
+	public $view;
+
+	/**
+	 * @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\View             $view    The View connected to this template.
+	 * @param \GV\Entry_Collection $entries A collection of entries for this view.
+	 * @param \GV\Request          $request The request context.
+	 */
+	public function __construct(Entry $entry, View $view, Request $request)
+	{
+		$this->entry = $entry;
+		$this->view = $view;
+		$this->request = $request;
+
+		/** Add granular overrides. */
+		add_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates'], 10, 3);
+
+		parent::__construct();
+	}
+
+	public function __destruct()
+	{
+		remove_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates']);
+	}
+
+	/**
+	 * Enable granular template overrides based on current post, view, form, etc.
+	 *
+	 * The loading order is:
+	 *
+	 * - post-[ID of post or page where view is embedded]-view-[View ID]-entry-[Entry ID]-table-footer.php
+	 * - post-[ID of post or page where view is embedded]-entry-[Entry ID]-table-footer.php
+	 * - post-[ID of post or page where view is embedded]-view-[View ID]-table-footer.php
+	 * - post-[ID of post or page where view is embedded]-table-footer.php
+	 * - view-[View ID]-entry-[Entry ID]-table-footer.php
+	 * - form-[Form ID]-entry-[Entry ID]-table-footer.php
+	 * - view-[View ID]-table-footer.php
+	 * - form-[Form ID]-table-footer.php
+	 * - entry-[Entry ID]-table-footer.php
+	 * - table-footer.php
+	 *
+	 * @see  Gamajo_Template_Loader::get_template_file_names() Where the filter is
+	 *
+	 * @param array  $templates Existing list of templates.
+	 * @param string $slug      Name of the template base, example: `table`, `list`, `datatables`, `map`
+	 * @param string $name      Name of the template part, example: `body`, `footer`, `head`, `single`
+	 *
+	 * @return array $templates Modified template array, merged with existing $templates values
+	 */
+	public function add_id_specific_templates($templates, $slug, $name)
+	{
+		$specifics = [];
+
+		list($slug_dir, $slug_name) = self::split_slug($slug, $name);
+
+		global $post;
+
+		if (!$this->request->is_view() && $post) {
+			$specifics[] = sprintf('%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name);
+			$specifics[] = sprintf('%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name);
+			$specifics[] = sprintf('%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name);
+			$specifics[] = sprintf('%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name);
+		}
+
+		$specifics[] = sprintf('%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name);
+		$specifics[] = sprintf('%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name);
+		$specifics[] = sprintf('%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name);
+		$specifics[] = sprintf('%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name);
+
+		$specifics[] = sprintf('%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name);
+
+		return array_merge($specifics, $templates);
+	}
+
+	/**
+	 * Output some HTML.
+	 *
+	 * @return void
+	 */
+	public function render()
+	{
+		$context = Template_Context::from_template($this);
+
+		/**
+		 * Make various pieces of data available to the template
+		 *  under the $gravityview scoped variable.
+		 *
+		 * @filter `gravityview/template/entry/context`
+		 *
+		 * @param \GV\Template_Context $context  The context for this template.
+		 * @param \GV\Entry_Template   $template The current template.
+		 *
+		 * @since 2.0
+		 */
+		$this->push_template_data(apply_filters('gravityview/template/entry/context', $context, $this), 'gravityview');
+
+		/** Load the template. */
+		$this->get_template_part(static::$slug);
+		$this->pop_template_data('gravityview');
+	}
+
+	/**
+	 * Fetch the back link label for an entry context.
+	 *
+	 * @param bool $do_replace Whether to perform merge tag replacements, etc.
+	 *
+	 * @see `gravityview/template/links/back/label` filter
+	 *
+	 * @return string The link label
+	 */
+	public function get_back_label($do_replace = true)
+	{
+		if (!$this->view) {
+			return '';
+		}
+
+		$back_link_label = $this->view->settings->get('back_link_label', null);
+
+		if ($do_replace) {
+			$back_link_label = \GravityView_API::replace_variables($back_link_label, Utils::get($this->view, 'form/form'), $this->entry->as_entry());
+
+			return do_shortcode($back_link_label);
+		}
+
+		return $back_link_label;
+	}
 }
 
 /** Load implementations. */

Spacing +33 added lines, -33 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' );
 }
 
 /**
@@ -71,21 +71,21 @@ 
      * @param \GV\Entry_Collection $entries A collection of entries for this view.
      * @param \GV\Request          $request The request context.
      */
-    public function __construct(Entry $entry, View $view, Request $request)
+    public function __construct( Entry $entry, View $view, Request $request )
     {
         $this->entry = $entry;
         $this->view = $view;
         $this->request = $request;
 
         /** Add granular overrides. */
-        add_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates'], 10, 3);
+        add_filter( $this->filter_prefix . '_get_template_part', [ $this, 'add_id_specific_templates' ], 10, 3 );
 
         parent::__construct();
     }
 
     public function __destruct()
     {
-        remove_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates']);
+        remove_filter( $this->filter_prefix . '_get_template_part', [ $this, 'add_id_specific_templates' ] );
     }
 
     /**
@@ -112,29 +112,29 @@ 
      *
      * @return array $templates Modified template array, merged with existing $templates values
      */
-    public function add_id_specific_templates($templates, $slug, $name)
+    public function add_id_specific_templates( $templates, $slug, $name )
     {
-        $specifics = [];
+        $specifics = [ ];
 
-        list($slug_dir, $slug_name) = self::split_slug($slug, $name);
+        list( $slug_dir, $slug_name ) = self::split_slug( $slug, $name );
 
         global $post;
 
-        if (!$this->request->is_view() && $post) {
-            $specifics[] = sprintf('%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name);
-            $specifics[] = sprintf('%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name);
-            $specifics[] = sprintf('%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name);
-            $specifics[] = sprintf('%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name);
+        if ( ! $this->request->is_view() && $post ) {
+            $specifics[ ] = sprintf( '%spost-%d-view-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $this->entry->ID, $slug_name );
+            $specifics[ ] = sprintf( '%spost-%d-entry-%d-%s.php', $slug_dir, $post->ID, $this->entry->ID, $slug_name );
+            $specifics[ ] = sprintf( '%spost-%d-view-%d-%s.php', $slug_dir, $post->ID, $this->view->ID, $slug_name );
+            $specifics[ ] = sprintf( '%spost-%d-%s.php', $slug_dir, $post->ID, $slug_name );
         }
 
-        $specifics[] = sprintf('%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name);
-        $specifics[] = sprintf('%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name);
-        $specifics[] = sprintf('%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name);
-        $specifics[] = sprintf('%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name);
+        $specifics[ ] = sprintf( '%sview-%d-entry-%d-%s.php', $slug_dir, $this->view->ID, $this->entry->ID, $slug_name );
+        $specifics[ ] = sprintf( '%sform-%d-entry-%d-%s.php', $slug_dir, $this->view->form->ID, $this->entry->ID, $slug_name );
+        $specifics[ ] = sprintf( '%sview-%d-%s.php', $slug_dir, $this->view->ID, $slug_name );
+        $specifics[ ] = sprintf( '%sform-%d-%s.php', $slug_dir, $this->view->form->ID, $slug_name );
 
-        $specifics[] = sprintf('%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name);
+        $specifics[ ] = sprintf( '%sentry-%d-%s.php', $slug_dir, $this->entry->ID, $slug_name );
 
-        return array_merge($specifics, $templates);
+        return array_merge( $specifics, $templates );
     }
 
     /**
@@ -144,7 +144,7 @@ 
      */
     public function render()
     {
-        $context = Template_Context::from_template($this);
+        $context = Template_Context::from_template( $this );
 
         /**
          * Make various pieces of data available to the template
@@ -157,11 +157,11 @@ 
          *
          * @since 2.0
          */
-        $this->push_template_data(apply_filters('gravityview/template/entry/context', $context, $this), 'gravityview');
+        $this->push_template_data( apply_filters( 'gravityview/template/entry/context', $context, $this ), 'gravityview' );
 
         /** Load the template. */
-        $this->get_template_part(static::$slug);
-        $this->pop_template_data('gravityview');
+        $this->get_template_part( static::$slug );
+        $this->pop_template_data( 'gravityview' );
     }
 
     /**
@@ -173,18 +173,18 @@ 
      *
      * @return string The link label
      */
-    public function get_back_label($do_replace = true)
+    public function get_back_label( $do_replace = true )
     {
-        if (!$this->view) {
+        if ( ! $this->view ) {
             return '';
         }
 
-        $back_link_label = $this->view->settings->get('back_link_label', null);
+        $back_link_label = $this->view->settings->get( 'back_link_label', null );
 
-        if ($do_replace) {
-            $back_link_label = \GravityView_API::replace_variables($back_link_label, Utils::get($this->view, 'form/form'), $this->entry->as_entry());
+        if ( $do_replace ) {
+            $back_link_label = \GravityView_API::replace_variables( $back_link_label, Utils::get( $this->view, 'form/form' ), $this->entry->as_entry() );
 
-            return do_shortcode($back_link_label);
+            return do_shortcode( $back_link_label );
         }
 
         return $back_link_label;
@@ -192,6 +192,6 @@ 
 }
 
 /** Load implementations. */
-require gravityview()->plugin->dir('future/includes/class-gv-template-entry-table.php');
-require gravityview()->plugin->dir('future/includes/class-gv-template-entry-list.php');
-require gravityview()->plugin->dir('future/includes/class-gv-template-entry-legacy.php');
+require gravityview()->plugin->dir( 'future/includes/class-gv-template-entry-table.php' );
+require gravityview()->plugin->dir( 'future/includes/class-gv-template-entry-list.php' );
+require gravityview()->plugin->dir( 'future/includes/class-gv-template-entry-legacy.php' );

Braces +6 added lines, -12 removed lines

@@ -21,8 +21,7 @@ 
  *
  * Renders a \GV\Entry using a \GV\Entry_Renderer.
  */
-abstract class Entry_Template extends Template
-{
+abstract class Entry_Template extends Template {
     /**
      * Prefix for filter names.
      *
@@ -71,8 +70,7 @@ 
      * @param \GV\Entry_Collection $entries A collection of entries for this view.
      * @param \GV\Request          $request The request context.
      */
-    public function __construct(Entry $entry, View $view, Request $request)
-    {
+    public function __construct(Entry $entry, View $view, Request $request) {
         $this->entry = $entry;
         $this->view = $view;
         $this->request = $request;
@@ -83,8 +81,7 @@ 
         parent::__construct();
     }
 
-    public function __destruct()
-    {
+    public function __destruct() {
         remove_filter($this->filter_prefix.'_get_template_part', [$this, 'add_id_specific_templates']);
     }
 
@@ -112,8 +109,7 @@ 
      *
      * @return array $templates Modified template array, merged with existing $templates values
      */
-    public function add_id_specific_templates($templates, $slug, $name)
-    {
+    public function add_id_specific_templates($templates, $slug, $name) {
         $specifics = [];
 
         list($slug_dir, $slug_name) = self::split_slug($slug, $name);
@@ -142,8 +138,7 @@ 
      *
      * @return void
      */
-    public function render()
-    {
+    public function render() {
         $context = Template_Context::from_template($this);
 
         /**
@@ -173,8 +168,7 @@ 
      *
      * @return string The link label
      */
-    public function get_back_label($do_replace = true)
-    {
+    public function get_back_label($do_replace = true) {
         if (!$this->view) {
             return '';
         }

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

Indentation +85 added lines, -85 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,88 +14,88 @@ 
  */
 class Template_Context extends Context
 {
-    /**
-     * @var \GV\Template The template.
-     */
-    public $template;
-
-    /**
-     * @var \GV\View The view.
-     */
-    public $view;
-
-    /**
-     * @var \GV\Entry The entry. If single-entry view.
-     */
-    public $entry;
-
-    /**
-     * @var \GV\Entry_Collection The entries. If directory view.
-     */
-    public $entries;
-
-    /**
-     * @var \GV\Field_Collection The fields.
-     */
-    public $fields;
-
-    /**
-     * @var \GV\Field The field. When rendering a single field.
-     */
-    public $field;
-
-    /**
-     * @var \GV\Source The data source for a field.
-     */
-    public $source;
-
-    /**
-     * @var mixed The display value for a field.
-     */
-    public $display_value;
-
-    /**
-     * @var mixed The raw value for a field.
-     */
-    public $value;
-
-    /**
-     * @var \GV\Request The request.
-     */
-    public $request;
-
-    /**
-     * Create a context from a Template.
-     *
-     * @param \GV\Template|array $template The template or array with values expected in a template
-     * @param array              $data     Additional data not tied to the template object.
-     *
-     * @return \GV\Template_Context The context holder.
-     */
-    public static function from_template($template, $data = [])
-    {
-        $context = new self();
-
-        $context->template = $template;
-
-        /**
-         * Data.
-         */
-        $context->display_value = Utils::get($data, 'display_value');
-        $context->value = Utils::get($data, 'value');
-
-        /**
-         * Shortcuts.
-         */
-        $context->view = Utils::get($template, 'view');
-        $context->source = Utils::get($template, 'source');
-        $context->field = Utils::get($template, 'field') ?: Utils::get($data, 'field');
-        $context->entry = Utils::get($template, 'entry') ?: Utils::get($data, 'entry');
-        $context->request = Utils::get($template, 'request');
-
-        $context->entries = Utils::get($template, 'entries') ? $template->entries : null;
-        $context->fields = $context->view ? $context->view->fields : null;
-
-        return $context;
-    }
+	/**
+	 * @var \GV\Template The template.
+	 */
+	public $template;
+
+	/**
+	 * @var \GV\View The view.
+	 */
+	public $view;
+
+	/**
+	 * @var \GV\Entry The entry. If single-entry view.
+	 */
+	public $entry;
+
+	/**
+	 * @var \GV\Entry_Collection The entries. If directory view.
+	 */
+	public $entries;
+
+	/**
+	 * @var \GV\Field_Collection The fields.
+	 */
+	public $fields;
+
+	/**
+	 * @var \GV\Field The field. When rendering a single field.
+	 */
+	public $field;
+
+	/**
+	 * @var \GV\Source The data source for a field.
+	 */
+	public $source;
+
+	/**
+	 * @var mixed The display value for a field.
+	 */
+	public $display_value;
+
+	/**
+	 * @var mixed The raw value for a field.
+	 */
+	public $value;
+
+	/**
+	 * @var \GV\Request The request.
+	 */
+	public $request;
+
+	/**
+	 * Create a context from a Template.
+	 *
+	 * @param \GV\Template|array $template The template or array with values expected in a template
+	 * @param array              $data     Additional data not tied to the template object.
+	 *
+	 * @return \GV\Template_Context The context holder.
+	 */
+	public static function from_template($template, $data = [])
+	{
+		$context = new self();
+
+		$context->template = $template;
+
+		/**
+		 * Data.
+		 */
+		$context->display_value = Utils::get($data, 'display_value');
+		$context->value = Utils::get($data, 'value');
+
+		/**
+		 * Shortcuts.
+		 */
+		$context->view = Utils::get($template, 'view');
+		$context->source = Utils::get($template, 'source');
+		$context->field = Utils::get($template, 'field') ?: Utils::get($data, 'field');
+		$context->entry = Utils::get($template, 'entry') ?: Utils::get($data, 'entry');
+		$context->request = Utils::get($template, 'request');
+
+		$context->entries = Utils::get($template, 'entries') ? $template->entries : null;
+		$context->fields = $context->view ? $context->view->fields : null;
+
+		return $context;
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -72,7 +72,7 @@ 
      *
      * @return \GV\Template_Context The context holder.
      */
-    public static function from_template($template, $data = [])
+    public static function from_template( $template, $data = [ ] )
     {
         $context = new self();
 
@@ -81,19 +81,19 @@ 
         /**
          * Data.
          */
-        $context->display_value = Utils::get($data, 'display_value');
-        $context->value = Utils::get($data, 'value');
+        $context->display_value = Utils::get( $data, 'display_value' );
+        $context->value = Utils::get( $data, 'value' );
 
         /**
          * Shortcuts.
          */
-        $context->view = Utils::get($template, 'view');
-        $context->source = Utils::get($template, 'source');
-        $context->field = Utils::get($template, 'field') ?: Utils::get($data, 'field');
-        $context->entry = Utils::get($template, 'entry') ?: Utils::get($data, 'entry');
-        $context->request = Utils::get($template, 'request');
+        $context->view = Utils::get( $template, 'view' );
+        $context->source = Utils::get( $template, 'source' );
+        $context->field = Utils::get( $template, 'field' ) ?: Utils::get( $data, 'field' );
+        $context->entry = Utils::get( $template, 'entry' ) ?: Utils::get( $data, 'entry' );
+        $context->request = Utils::get( $template, 'request' );
 
-        $context->entries = Utils::get($template, 'entries') ? $template->entries : null;
+        $context->entries = Utils::get( $template, 'entries' ) ? $template->entries : null;
         $context->fields = $context->view ? $context->view->fields : null;
 
         return $context;

Braces +2 added lines, -4 removed lines

@@ -12,8 +12,7 @@ 
  *
  * This is provided to most template files as a global.
  */
-class Template_Context extends Context
-{
+class Template_Context extends Context {
     /**
      * @var \GV\Template The template.
      */
@@ -72,8 +71,7 @@ 
      *
      * @return \GV\Template_Context The context holder.
      */
-    public static function from_template($template, $data = [])
-    {
+    public static function from_template($template, $data = []) {
         $context = new self();
 
         $context->template = $template;

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

Indentation +137 added lines, -137 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,140 +14,140 @@ 
  */
 class Entry_Renderer extends Renderer
 {
-    /**
-     * Renders a single \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`
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @return string The rendered Entry.
-     */
-    public function render(Entry $entry, View $view, Request $request = null)
-    {
-        if (is_null($request)) {
-            $request = &gravityview()->request;
-        }
-
-        if (!$request->is_renderable()) {
-            gravityview()->log->error('Renderer unable to render Entry in {request_class} context', ['request_class' => get_class($request)]);
-
-            return null;
-        }
-
-        /**
-         * This View is password protected. Output the form.
-         */
-        if (post_password_required($view->ID)) {
-            return get_the_password_form($view->ID);
-        }
-
-        /**
-         * @action `gravityview_render_entry_{View ID}` Before rendering a single entry for a specific View ID
-         *
-         * @since 1.17
-         * @since 2.0
-         *
-         * @param \GV\Entry   $entry   The entry about to be rendered
-         * @param \GV\View    $view    The connected view
-         * @param \GV\Request $request The associated request
-         */
-        do_action('gravityview_render_entry_'.$view->ID, $entry, $view, $request);
-
-        /** Entry does not belong to this view. */
-        if ($view->joins) {
-            $form_ids = [];
-            foreach ($view->joins as $join) {
-                $form_ids[] = $join->join->ID;
-                $form_ids[] = $join->join_on->ID;
-            }
-            foreach ($entry->entries as $e) {
-                if (!in_array($e['form_id'], $form_ids)) {
-                    gravityview()->log->error('The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', ['entry_id' => $e->ID, 'view_id' => $view->ID]);
-
-                    return null;
-                }
-            }
-        } elseif ($view->form && $view->form->ID != $entry['form_id']) {
-            gravityview()->log->error('The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', ['entry_id' => $entry->ID, 'view_id' => $view->ID]);
-
-            return null;
-        }
-
-        /**
-         * @filter `gravityview_template_slug_{$template_id}` Modify the template slug about to be loaded in directory views.
-         *
-         * @since 1.6
-         *
-         * @param deprecated
-         *
-         * @see The `gravityview_get_template_id` filter
-         *
-         * @param string $slug Default: 'table'
-         * @param string $view The current view context: single
-         */
-        $template_slug = apply_filters('gravityview_template_slug_'.$view->settings->get('template'), 'table', 'single');
-
-        /**
-         * Load a legacy override template if exists.
-         */
-        $override = new \GV\Legacy_Override_Template($view, $entry, null, $request);
-        foreach (['single'] as $part) {
-            if (($path = $override->get_template_part($template_slug, $part)) && strpos($path, '/deprecated') === false) {
-                /**
-                 * We have to bail and call the legacy renderer. Crap!
-                 */
-                gravityview()->log->notice('Legacy templates detected in theme {path}', ['path' => $path]);
-
-                /**
-                 * Show a warning at the top, if View is editable by the user.
-                 */
-                add_action('gravityview_before', $this->legacy_template_warning($view, $path));
-
-                return $override->render($template_slug);
-            }
-        }
-
-        /**
-         * @filter `gravityview/template/entry/class` Filter the template class that is about to be used to render the entry.
-         *
-         * @since 2.0
-         *
-         * @param string      $class   The chosen class - Default: \GV\Entry_Table_Template.
-         * @param \GV\Entry   $entry   The entry about to be rendered.
-         * @param \GV\View    $view    The view connected to it.
-         * @param \GV\Request $request The associated request.
-         */
-        $class = apply_filters('gravityview/template/entry/class', sprintf('\GV\Entry_%s_Template', ucfirst($template_slug)), $entry, $view, $request);
-        if (!$class || !class_exists($class)) {
-            gravityview()->log->notice('{template_class} not found, falling back to legacy', ['template_class' => $class]);
-            $class = '\GV\Entry_Legacy_Template';
-        }
-        $template = new $class($entry, $view, $request);
-
-        add_action('gravityview/template/after', $view_id_output = function ($context) {
-            printf('<input type="hidden" class="gravityview-view-id" value="%d">', $context->view->ID);
-        });
-
-        /** Mock the legacy state for the widgets and whatnot */
-        $entries = new Entry_Collection();
-        $entries->add($entry);
-        \GV\Mocks\Legacy_Context::push([
-            'view'    => $view,
-            'entries' => $entries,
-            'entry'   => $entry,
-            'request' => $request,
-        ]);
-
-        ob_start();
-        $template->render();
-
-        remove_action('gravityview/template/after', $view_id_output);
-
-        return ob_get_clean();
-    }
+	/**
+	 * Renders a single \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`
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @return string The rendered Entry.
+	 */
+	public function render(Entry $entry, View $view, Request $request = null)
+	{
+		if (is_null($request)) {
+			$request = &gravityview()->request;
+		}
+
+		if (!$request->is_renderable()) {
+			gravityview()->log->error('Renderer unable to render Entry in {request_class} context', ['request_class' => get_class($request)]);
+
+			return null;
+		}
+
+		/**
+		 * This View is password protected. Output the form.
+		 */
+		if (post_password_required($view->ID)) {
+			return get_the_password_form($view->ID);
+		}
+
+		/**
+		 * @action `gravityview_render_entry_{View ID}` Before rendering a single entry for a specific View ID
+		 *
+		 * @since 1.17
+		 * @since 2.0
+		 *
+		 * @param \GV\Entry   $entry   The entry about to be rendered
+		 * @param \GV\View    $view    The connected view
+		 * @param \GV\Request $request The associated request
+		 */
+		do_action('gravityview_render_entry_'.$view->ID, $entry, $view, $request);
+
+		/** Entry does not belong to this view. */
+		if ($view->joins) {
+			$form_ids = [];
+			foreach ($view->joins as $join) {
+				$form_ids[] = $join->join->ID;
+				$form_ids[] = $join->join_on->ID;
+			}
+			foreach ($entry->entries as $e) {
+				if (!in_array($e['form_id'], $form_ids)) {
+					gravityview()->log->error('The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', ['entry_id' => $e->ID, 'view_id' => $view->ID]);
+
+					return null;
+				}
+			}
+		} elseif ($view->form && $view->form->ID != $entry['form_id']) {
+			gravityview()->log->error('The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', ['entry_id' => $entry->ID, 'view_id' => $view->ID]);
+
+			return null;
+		}
+
+		/**
+		 * @filter `gravityview_template_slug_{$template_id}` Modify the template slug about to be loaded in directory views.
+		 *
+		 * @since 1.6
+		 *
+		 * @param deprecated
+		 *
+		 * @see The `gravityview_get_template_id` filter
+		 *
+		 * @param string $slug Default: 'table'
+		 * @param string $view The current view context: single
+		 */
+		$template_slug = apply_filters('gravityview_template_slug_'.$view->settings->get('template'), 'table', 'single');
+
+		/**
+		 * Load a legacy override template if exists.
+		 */
+		$override = new \GV\Legacy_Override_Template($view, $entry, null, $request);
+		foreach (['single'] as $part) {
+			if (($path = $override->get_template_part($template_slug, $part)) && strpos($path, '/deprecated') === false) {
+				/**
+				 * We have to bail and call the legacy renderer. Crap!
+				 */
+				gravityview()->log->notice('Legacy templates detected in theme {path}', ['path' => $path]);
+
+				/**
+				 * Show a warning at the top, if View is editable by the user.
+				 */
+				add_action('gravityview_before', $this->legacy_template_warning($view, $path));
+
+				return $override->render($template_slug);
+			}
+		}
+
+		/**
+		 * @filter `gravityview/template/entry/class` Filter the template class that is about to be used to render the entry.
+		 *
+		 * @since 2.0
+		 *
+		 * @param string      $class   The chosen class - Default: \GV\Entry_Table_Template.
+		 * @param \GV\Entry   $entry   The entry about to be rendered.
+		 * @param \GV\View    $view    The view connected to it.
+		 * @param \GV\Request $request The associated request.
+		 */
+		$class = apply_filters('gravityview/template/entry/class', sprintf('\GV\Entry_%s_Template', ucfirst($template_slug)), $entry, $view, $request);
+		if (!$class || !class_exists($class)) {
+			gravityview()->log->notice('{template_class} not found, falling back to legacy', ['template_class' => $class]);
+			$class = '\GV\Entry_Legacy_Template';
+		}
+		$template = new $class($entry, $view, $request);
+
+		add_action('gravityview/template/after', $view_id_output = function ($context) {
+			printf('<input type="hidden" class="gravityview-view-id" value="%d">', $context->view->ID);
+		});
+
+		/** Mock the legacy state for the widgets and whatnot */
+		$entries = new Entry_Collection();
+		$entries->add($entry);
+		\GV\Mocks\Legacy_Context::push([
+			'view'    => $view,
+			'entries' => $entries,
+			'entry'   => $entry,
+			'request' => $request,
+		]);
+
+		ob_start();
+		$template->render();
+
+		remove_action('gravityview/template/after', $view_id_output);
+
+		return ob_get_clean();
+	}
 }

Spacing +35 added lines, -35 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -27,14 +27,14 @@ 
      *
      * @return string The rendered Entry.
      */
-    public function render(Entry $entry, View $view, Request $request = null)
+    public function render( Entry $entry, View $view, Request $request = null )
     {
-        if (is_null($request)) {
+        if ( is_null( $request ) ) {
             $request = &gravityview()->request;
         }
 
-        if (!$request->is_renderable()) {
-            gravityview()->log->error('Renderer unable to render Entry in {request_class} context', ['request_class' => get_class($request)]);
+        if ( ! $request->is_renderable() ) {
+            gravityview()->log->error( 'Renderer unable to render Entry in {request_class} context', [ 'request_class' => get_class( $request ) ] );
 
             return null;
         }
@@ -42,8 +42,8 @@ 
         /**
          * This View is password protected. Output the form.
          */
-        if (post_password_required($view->ID)) {
-            return get_the_password_form($view->ID);
+        if ( post_password_required( $view->ID ) ) {
+            return get_the_password_form( $view->ID );
         }
 
         /**
@@ -56,24 +56,24 @@ 
          * @param \GV\View    $view    The connected view
          * @param \GV\Request $request The associated request
          */
-        do_action('gravityview_render_entry_'.$view->ID, $entry, $view, $request);
+        do_action( 'gravityview_render_entry_' . $view->ID, $entry, $view, $request );
 
         /** Entry does not belong to this view. */
-        if ($view->joins) {
-            $form_ids = [];
-            foreach ($view->joins as $join) {
-                $form_ids[] = $join->join->ID;
-                $form_ids[] = $join->join_on->ID;
+        if ( $view->joins ) {
+            $form_ids = [ ];
+            foreach ( $view->joins as $join ) {
+                $form_ids[ ] = $join->join->ID;
+                $form_ids[ ] = $join->join_on->ID;
             }
-            foreach ($entry->entries as $e) {
-                if (!in_array($e['form_id'], $form_ids)) {
-                    gravityview()->log->error('The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', ['entry_id' => $e->ID, 'view_id' => $view->ID]);
+            foreach ( $entry->entries as $e ) {
+                if ( ! in_array( $e[ 'form_id' ], $form_ids ) ) {
+                    gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', [ 'entry_id' => $e->ID, 'view_id' => $view->ID ] );
 
                     return null;
                 }
             }
-        } elseif ($view->form && $view->form->ID != $entry['form_id']) {
-            gravityview()->log->error('The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', ['entry_id' => $entry->ID, 'view_id' => $view->ID]);
+        } elseif ( $view->form && $view->form->ID != $entry[ 'form_id' ] ) {
+            gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', [ 'entry_id' => $entry->ID, 'view_id' => $view->ID ] );
 
             return null;
         }
@@ -90,25 +90,25 @@ 
          * @param string $slug Default: 'table'
          * @param string $view The current view context: single
          */
-        $template_slug = apply_filters('gravityview_template_slug_'.$view->settings->get('template'), 'table', 'single');
+        $template_slug = apply_filters( 'gravityview_template_slug_' . $view->settings->get( 'template' ), 'table', 'single' );
 
         /**
          * Load a legacy override template if exists.
          */
-        $override = new \GV\Legacy_Override_Template($view, $entry, null, $request);
-        foreach (['single'] as $part) {
-            if (($path = $override->get_template_part($template_slug, $part)) && strpos($path, '/deprecated') === false) {
+        $override = new \GV\Legacy_Override_Template( $view, $entry, null, $request );
+        foreach ( [ 'single' ] as $part ) {
+            if ( ( $path = $override->get_template_part( $template_slug, $part ) ) && strpos( $path, '/deprecated' ) === false ) {
                 /**
                  * We have to bail and call the legacy renderer. Crap!
                  */
-                gravityview()->log->notice('Legacy templates detected in theme {path}', ['path' => $path]);
+                gravityview()->log->notice( 'Legacy templates detected in theme {path}', [ 'path' => $path ] );
 
                 /**
                  * Show a warning at the top, if View is editable by the user.
                  */
-                add_action('gravityview_before', $this->legacy_template_warning($view, $path));
+                add_action( 'gravityview_before', $this->legacy_template_warning( $view, $path ) );
 
-                return $override->render($template_slug);
+                return $override->render( $template_slug );
             }
         }
 
@@ -122,31 +122,31 @@ 
          * @param \GV\View    $view    The view connected to it.
          * @param \GV\Request $request The associated request.
          */
-        $class = apply_filters('gravityview/template/entry/class', sprintf('\GV\Entry_%s_Template', ucfirst($template_slug)), $entry, $view, $request);
-        if (!$class || !class_exists($class)) {
-            gravityview()->log->notice('{template_class} not found, falling back to legacy', ['template_class' => $class]);
+        $class = apply_filters( 'gravityview/template/entry/class', sprintf( '\GV\Entry_%s_Template', ucfirst( $template_slug ) ), $entry, $view, $request );
+        if ( ! $class || ! class_exists( $class ) ) {
+            gravityview()->log->notice( '{template_class} not found, falling back to legacy', [ 'template_class' => $class ] );
             $class = '\GV\Entry_Legacy_Template';
         }
-        $template = new $class($entry, $view, $request);
+        $template = new $class( $entry, $view, $request );
 
-        add_action('gravityview/template/after', $view_id_output = function ($context) {
-            printf('<input type="hidden" class="gravityview-view-id" value="%d">', $context->view->ID);
+        add_action( 'gravityview/template/after', $view_id_output = function( $context ) {
+            printf( '<input type="hidden" class="gravityview-view-id" value="%d">', $context->view->ID );
         });
 
         /** Mock the legacy state for the widgets and whatnot */
         $entries = new Entry_Collection();
-        $entries->add($entry);
-        \GV\Mocks\Legacy_Context::push([
+        $entries->add( $entry );
+        \GV\Mocks\Legacy_Context::push( [
             'view'    => $view,
             'entries' => $entries,
             'entry'   => $entry,
             'request' => $request,
-        ]);
+        ] );
 
         ob_start();
         $template->render();
 
-        remove_action('gravityview/template/after', $view_id_output);
+        remove_action( 'gravityview/template/after', $view_id_output );
 
         return ob_get_clean();
     }

Braces +2 added lines, -4 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Houses some preliminary \GV\Entry rendering functionality.
  */
-class Entry_Renderer extends Renderer
-{
+class Entry_Renderer extends Renderer {
     /**
      * Renders a single \GV\Entry instance.
      *
@@ -27,8 +26,7 @@ 
      *
      * @return string The rendered Entry.
      */
-    public function render(Entry $entry, View $view, Request $request = null)
-    {
+    public function render(Entry $entry, View $view, Request $request = null) {
         if (is_null($request)) {
             $request = &gravityview()->request;
         }

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

Indentation +171 added lines, -171 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -12,174 +12,174 @@ 
  */
 class GF_Field extends Field
 {
-    /**
-     * @var \GF_Field The backing Gravity Forms field.
-     */
-    public $field;
-
-    /**
-     * Create self from a configuration array.
-     *
-     * @param array $configuration The configuration array.
-     *
-     * @see \GV\Field::as_configuration()
-     *
-     * @internal
-     *
-     * @since 2.0
-     *
-     * @return \GV\GF_Field|null The field implementation or null on error.
-     */
-    public static function from_configuration($configuration)
-    {
-        if (empty($configuration['id']) || !is_numeric($configuration['id'])) {
-            gravityview()->log->error('Invalid configuration[id] supplied.');
-
-            return null;
-        }
-
-        if (empty($configuration['form_id']) || !$form = \GV\GF_Form::by_id($configuration['form_id'])) {
-            gravityview()->log->error('Invalid configuration[form_id] supplied.');
-
-            return null;
-        }
-
-        $field = self::by_id($form, $configuration['id']);
-
-        if (!$field) {
-            gravityview()->log->error('Invalid configuration[id] supplied.');
-
-            return null;
-        }
-
-        $field->update_configuration($configuration);
-
-        return $field;
-    }
-
-    /**
-     * Get a \GV\GF_Field by \GV\GF_Form and Field ID.
-     *
-     * @param \GV\GF_Form $form     The Gravity Form form.
-     * @param int         $field_id The Gravity Form field ID for the $form.
-     *
-     * @return \GV\Field|null The requested field or null if not found.
-     */
-    public static function by_id($form, $field_id)
-    {
-        if (!$form || !is_object($form) || !is_a($form, '\GV\GF_Form')) {
-            gravityview()->log->error('$form is not a \GV\GF_Form instance');
-
-            return null;
-        }
-
-        if (empty($form->form)) {
-            gravityview()->log->error('$form is not initialized with a backing Gravity Forms form');
-
-            return null;
-        }
-
-        $gv_field = \GFFormsModel::get_field($form->form, $field_id);
-
-        if (!$gv_field) {
-            gravityview()->log->error('Invalid $field_id #{field_id} for current source', ['field_id' => $field_id]);
-
-            return null;
-        }
-
-        $field = new self();
-        $field->ID = $field_id;
-        $field->field = $gv_field;
-
-        return $field;
-    }
-
-    /**
-     * Retrieve the label for this field.
-     *
-     * Requires a \GV\GF_Form in this implementation.
-     *
-     * @param \GV\View    $view    The view for this context if applicable.
-     * @param \GV\Source  $source  The source (form) for this context if applicable.
-     * @param \GV\Entry   $entry   The entry for this context if applicable.
-     * @param \GV\Request $request The request for this context if applicable.
-     *
-     * @return string The label for this Gravity Forms field.
-     */
-    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
-        if (!$this->show_label) {
-            return '';
-        }
-
-        if ($label = parent::get_label($view, $source, $entry, $request)) {
-            return $label;
-        }
-
-        if (!$source || !is_object($source) || !is_a($source, '\GV\GF_Form')) {
-            gravityview()->log->error('$source is not a valid \GV\GF_Form instance');
-
-            return null;
-        }
-
-        if ($this->label) {
-            return $this->label;
-        }
-
-        /** This is a complex Gravity Forms input. */
-        if ($input = \GFFormsModel::get_input($this->field, $this->ID)) {
-            $label = !empty($input['customLabel']) ? $input['customLabel'] : $input['label'];
-        } else {
-            /** This is a field with one label. */
-            $label = $this->field->get_field_label(true, $this->label);
-        }
-
-        return $label;
-    }
-
-    /**
-     * Retrieve the value for this field.
-     *
-     * Requires a \GV\GF_Entry in this implementation.
-     *
-     * @param \GV\View    $view    The view for this context if applicable.
-     * @param \GV\Source  $source  The source (form) for this context if applicable.
-     * @param \GV\Entry   $entry   The entry for this context if applicable.
-     * @param \GV\Request $request The request for this context if applicable.
-     *
-     * @return mixed The value for this field.
-     */
-    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
-        if (!$entry || !is_object($entry) || !is_a($entry, '\GV\GF_Entry')) {
-            gravityview()->log->error('$entry is not a valid \GV\GF_Entry instance');
-
-            return null;
-        }
-
-        $value = \RGFormsModel::get_lead_field_value($entry->as_entry(), $this->field);
-
-        /** Apply parent filters. */
-        return $this->get_value_filters($value, $view, $source, $entry, $request);
-    }
-
-    /**
-     * A proxy getter for the backing GravityView field.
-     *
-     * The view field configuration is checked first, though.
-     *
-     * @param string $key The property to get.
-     *
-     * @return mixed The value of the Gravity View field property, or null if not exists.
-     */
-    public function __get($key)
-    {
-        if ($value = parent::__get($key)) {
-            return $value;
-        }
-
-        if ($this->field) {
-            return $this->field->$key;
-        }
-    }
+	/**
+	 * @var \GF_Field The backing Gravity Forms field.
+	 */
+	public $field;
+
+	/**
+	 * Create self from a configuration array.
+	 *
+	 * @param array $configuration The configuration array.
+	 *
+	 * @see \GV\Field::as_configuration()
+	 *
+	 * @internal
+	 *
+	 * @since 2.0
+	 *
+	 * @return \GV\GF_Field|null The field implementation or null on error.
+	 */
+	public static function from_configuration($configuration)
+	{
+		if (empty($configuration['id']) || !is_numeric($configuration['id'])) {
+			gravityview()->log->error('Invalid configuration[id] supplied.');
+
+			return null;
+		}
+
+		if (empty($configuration['form_id']) || !$form = \GV\GF_Form::by_id($configuration['form_id'])) {
+			gravityview()->log->error('Invalid configuration[form_id] supplied.');
+
+			return null;
+		}
+
+		$field = self::by_id($form, $configuration['id']);
+
+		if (!$field) {
+			gravityview()->log->error('Invalid configuration[id] supplied.');
+
+			return null;
+		}
+
+		$field->update_configuration($configuration);
+
+		return $field;
+	}
+
+	/**
+	 * Get a \GV\GF_Field by \GV\GF_Form and Field ID.
+	 *
+	 * @param \GV\GF_Form $form     The Gravity Form form.
+	 * @param int         $field_id The Gravity Form field ID for the $form.
+	 *
+	 * @return \GV\Field|null The requested field or null if not found.
+	 */
+	public static function by_id($form, $field_id)
+	{
+		if (!$form || !is_object($form) || !is_a($form, '\GV\GF_Form')) {
+			gravityview()->log->error('$form is not a \GV\GF_Form instance');
+
+			return null;
+		}
+
+		if (empty($form->form)) {
+			gravityview()->log->error('$form is not initialized with a backing Gravity Forms form');
+
+			return null;
+		}
+
+		$gv_field = \GFFormsModel::get_field($form->form, $field_id);
+
+		if (!$gv_field) {
+			gravityview()->log->error('Invalid $field_id #{field_id} for current source', ['field_id' => $field_id]);
+
+			return null;
+		}
+
+		$field = new self();
+		$field->ID = $field_id;
+		$field->field = $gv_field;
+
+		return $field;
+	}
+
+	/**
+	 * Retrieve the label for this field.
+	 *
+	 * Requires a \GV\GF_Form in this implementation.
+	 *
+	 * @param \GV\View    $view    The view for this context if applicable.
+	 * @param \GV\Source  $source  The source (form) for this context if applicable.
+	 * @param \GV\Entry   $entry   The entry for this context if applicable.
+	 * @param \GV\Request $request The request for this context if applicable.
+	 *
+	 * @return string The label for this Gravity Forms field.
+	 */
+	public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+	{
+		if (!$this->show_label) {
+			return '';
+		}
+
+		if ($label = parent::get_label($view, $source, $entry, $request)) {
+			return $label;
+		}
+
+		if (!$source || !is_object($source) || !is_a($source, '\GV\GF_Form')) {
+			gravityview()->log->error('$source is not a valid \GV\GF_Form instance');
+
+			return null;
+		}
+
+		if ($this->label) {
+			return $this->label;
+		}
+
+		/** This is a complex Gravity Forms input. */
+		if ($input = \GFFormsModel::get_input($this->field, $this->ID)) {
+			$label = !empty($input['customLabel']) ? $input['customLabel'] : $input['label'];
+		} else {
+			/** This is a field with one label. */
+			$label = $this->field->get_field_label(true, $this->label);
+		}
+
+		return $label;
+	}
+
+	/**
+	 * Retrieve the value for this field.
+	 *
+	 * Requires a \GV\GF_Entry in this implementation.
+	 *
+	 * @param \GV\View    $view    The view for this context if applicable.
+	 * @param \GV\Source  $source  The source (form) for this context if applicable.
+	 * @param \GV\Entry   $entry   The entry for this context if applicable.
+	 * @param \GV\Request $request The request for this context if applicable.
+	 *
+	 * @return mixed The value for this field.
+	 */
+	public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+	{
+		if (!$entry || !is_object($entry) || !is_a($entry, '\GV\GF_Entry')) {
+			gravityview()->log->error('$entry is not a valid \GV\GF_Entry instance');
+
+			return null;
+		}
+
+		$value = \RGFormsModel::get_lead_field_value($entry->as_entry(), $this->field);
+
+		/** Apply parent filters. */
+		return $this->get_value_filters($value, $view, $source, $entry, $request);
+	}
+
+	/**
+	 * A proxy getter for the backing GravityView field.
+	 *
+	 * The view field configuration is checked first, though.
+	 *
+	 * @param string $key The property to get.
+	 *
+	 * @return mixed The value of the Gravity View field property, or null if not exists.
+	 */
+	public function __get($key)
+	{
+		if ($value = parent::__get($key)) {
+			return $value;
+		}
+
+		if ($this->field) {
+			return $this->field->$key;
+		}
+	}
 }

Spacing +35 added lines, -35 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -30,29 +30,29 @@ 
      *
      * @return \GV\GF_Field|null The field implementation or null on error.
      */
-    public static function from_configuration($configuration)
+    public static function from_configuration( $configuration )
     {
-        if (empty($configuration['id']) || !is_numeric($configuration['id'])) {
-            gravityview()->log->error('Invalid configuration[id] supplied.');
+        if ( empty( $configuration[ 'id' ] ) || ! is_numeric( $configuration[ 'id' ] ) ) {
+            gravityview()->log->error( 'Invalid configuration[id] supplied.' );
 
             return null;
         }
 
-        if (empty($configuration['form_id']) || !$form = \GV\GF_Form::by_id($configuration['form_id'])) {
-            gravityview()->log->error('Invalid configuration[form_id] supplied.');
+        if ( empty( $configuration[ 'form_id' ] ) || ! $form = \GV\GF_Form::by_id( $configuration[ 'form_id' ] ) ) {
+            gravityview()->log->error( 'Invalid configuration[form_id] supplied.' );
 
             return null;
         }
 
-        $field = self::by_id($form, $configuration['id']);
+        $field = self::by_id( $form, $configuration[ 'id' ] );
 
-        if (!$field) {
-            gravityview()->log->error('Invalid configuration[id] supplied.');
+        if ( ! $field ) {
+            gravityview()->log->error( 'Invalid configuration[id] supplied.' );
 
             return null;
         }
 
-        $field->update_configuration($configuration);
+        $field->update_configuration( $configuration );
 
         return $field;
     }
@@ -65,24 +65,24 @@ 
      *
      * @return \GV\Field|null The requested field or null if not found.
      */
-    public static function by_id($form, $field_id)
+    public static function by_id( $form, $field_id )
     {
-        if (!$form || !is_object($form) || !is_a($form, '\GV\GF_Form')) {
-            gravityview()->log->error('$form is not a \GV\GF_Form instance');
+        if ( ! $form || ! is_object( $form ) || ! is_a( $form, '\GV\GF_Form' ) ) {
+            gravityview()->log->error( '$form is not a \GV\GF_Form instance' );
 
             return null;
         }
 
-        if (empty($form->form)) {
-            gravityview()->log->error('$form is not initialized with a backing Gravity Forms form');
+        if ( empty( $form->form ) ) {
+            gravityview()->log->error( '$form is not initialized with a backing Gravity Forms form' );
 
             return null;
         }
 
-        $gv_field = \GFFormsModel::get_field($form->form, $field_id);
+        $gv_field = \GFFormsModel::get_field( $form->form, $field_id );
 
-        if (!$gv_field) {
-            gravityview()->log->error('Invalid $field_id #{field_id} for current source', ['field_id' => $field_id]);
+        if ( ! $gv_field ) {
+            gravityview()->log->error( 'Invalid $field_id #{field_id} for current source', [ 'field_id' => $field_id ] );
 
             return null;
         }
@@ -106,32 +106,32 @@ 
      *
      * @return string The label for this Gravity Forms field.
      */
-    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+    public function get_label( View $view = null, Source $source = null, Entry $entry = null, Request $request = null )
     {
-        if (!$this->show_label) {
+        if ( ! $this->show_label ) {
             return '';
         }
 
-        if ($label = parent::get_label($view, $source, $entry, $request)) {
+        if ( $label = parent::get_label( $view, $source, $entry, $request ) ) {
             return $label;
         }
 
-        if (!$source || !is_object($source) || !is_a($source, '\GV\GF_Form')) {
-            gravityview()->log->error('$source is not a valid \GV\GF_Form instance');
+        if ( ! $source || ! is_object( $source ) || ! is_a( $source, '\GV\GF_Form' ) ) {
+            gravityview()->log->error( '$source is not a valid \GV\GF_Form instance' );
 
             return null;
         }
 
-        if ($this->label) {
+        if ( $this->label ) {
             return $this->label;
         }
 
         /** This is a complex Gravity Forms input. */
-        if ($input = \GFFormsModel::get_input($this->field, $this->ID)) {
-            $label = !empty($input['customLabel']) ? $input['customLabel'] : $input['label'];
+        if ( $input = \GFFormsModel::get_input( $this->field, $this->ID ) ) {
+            $label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
         } else {
             /** This is a field with one label. */
-            $label = $this->field->get_field_label(true, $this->label);
+            $label = $this->field->get_field_label( true, $this->label );
         }
 
         return $label;
@@ -149,18 +149,18 @@ 
      *
      * @return mixed The value for this field.
      */
-    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
+    public function get_value( View $view = null, Source $source = null, Entry $entry = null, Request $request = null )
     {
-        if (!$entry || !is_object($entry) || !is_a($entry, '\GV\GF_Entry')) {
-            gravityview()->log->error('$entry is not a valid \GV\GF_Entry instance');
+        if ( ! $entry || ! is_object( $entry ) || ! is_a( $entry, '\GV\GF_Entry' ) ) {
+            gravityview()->log->error( '$entry is not a valid \GV\GF_Entry instance' );
 
             return null;
         }
 
-        $value = \RGFormsModel::get_lead_field_value($entry->as_entry(), $this->field);
+        $value = \RGFormsModel::get_lead_field_value( $entry->as_entry(), $this->field );
 
         /** Apply parent filters. */
-        return $this->get_value_filters($value, $view, $source, $entry, $request);
+        return $this->get_value_filters( $value, $view, $source, $entry, $request );
     }
 
     /**
@@ -172,13 +172,13 @@ 
      *
      * @return mixed The value of the Gravity View field property, or null if not exists.
      */
-    public function __get($key)
+    public function __get( $key )
     {
-        if ($value = parent::__get($key)) {
+        if ( $value = parent::__get( $key ) ) {
             return $value;
         }
 
-        if ($this->field) {
+        if ( $this->field ) {
             return $this->field->$key;
         }
     }

Braces +6 added lines, -12 removed lines

@@ -10,8 +10,7 @@ 
 /**
  * The Gravity Forms {@see \GF_Field} field object wrapper.
  */
-class GF_Field extends Field
-{
+class GF_Field extends Field {
     /**
      * @var \GF_Field The backing Gravity Forms field.
      */
@@ -30,8 +29,7 @@ 
      *
      * @return \GV\GF_Field|null The field implementation or null on error.
      */
-    public static function from_configuration($configuration)
-    {
+    public static function from_configuration($configuration) {
         if (empty($configuration['id']) || !is_numeric($configuration['id'])) {
             gravityview()->log->error('Invalid configuration[id] supplied.');
 
@@ -65,8 +63,7 @@ 
      *
      * @return \GV\Field|null The requested field or null if not found.
      */
-    public static function by_id($form, $field_id)
-    {
+    public static function by_id($form, $field_id) {
         if (!$form || !is_object($form) || !is_a($form, '\GV\GF_Form')) {
             gravityview()->log->error('$form is not a \GV\GF_Form instance');
 
@@ -106,8 +103,7 @@ 
      *
      * @return string The label for this Gravity Forms field.
      */
-    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
+    public function get_label(View $view = null, Source $source = null, Entry $entry = null, Request $request = null) {
         if (!$this->show_label) {
             return '';
         }
@@ -149,8 +145,7 @@ 
      *
      * @return mixed The value for this field.
      */
-    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null)
-    {
+    public function get_value(View $view = null, Source $source = null, Entry $entry = null, Request $request = null) {
         if (!$entry || !is_object($entry) || !is_a($entry, '\GV\GF_Entry')) {
             gravityview()->log->error('$entry is not a valid \GV\GF_Entry instance');
 
@@ -172,8 +167,7 @@ 
      *
      * @return mixed The value of the Gravity View field property, or null if not exists.
      */
-    public function __get($key)
-    {
+    public function __get($key) {
         if ($value = parent::__get($key)) {
             return $value;
         }

future/includes/class-gv-collection-entry-filter.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 +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -31,4 +31,4 @@ 
 }
 
 /** Load implementations. */
-require gravityview()->plugin->dir('future/includes/class-gv-collection-entry-filter-gravityforms.php');
+require gravityview()->plugin->dir( 'future/includes/class-gv-collection-entry-filter-gravityforms.php' );

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
  * For now we use the Gravity Forms backend for this, since developing an ORM
  *  will take us another year :)
  */
-abstract class Entry_Filter
-{
+abstract class Entry_Filter {
 }
 
 /** Load implementations. */

future/includes/class-gv-request.php

Indentation +292 added lines, -292 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,297 +14,297 @@ 
  */
 abstract class Request
 {
-    public function __construct()
-    {
-    }
-
-    /**
-     * Whether this request is something that is renderable.
-     *
-     * @since 2.5.2
-     *
-     * @return bool Yes or no.
-     */
-    public function is_renderable()
-    {
-        $is_renderable = in_array(get_class($this), [
-            'GV\Frontend_Request',
-            'GV\Mock_Request',
-            'GV\REST\Request',
-        ], true);
-
-        /**
-         * @filter `gravityview/request/is_renderable` Is this request renderable?
-         *
-         * @since 2.5.2
-         *
-         * @param bool        $is_renderable Huh?
-         * @param \GV\Request $this          This.
-         */
-        return apply_filters('gravityview/request/is_renderable', $is_renderable, $this);
-    }
-
-    /**
-     * Check if WordPress is_admin(), and make sure not DOING_AJAX.
-     *
-     * @return bool
-     */
-    public static function is_admin()
-    {
-        $doing_ajax = defined('DOING_AJAX') ? DOING_AJAX : false;
-        $load_scripts_styles = preg_match('#^/wp-admin/load-(scripts|styles).php$#', Utils::_SERVER('SCRIPT_NAME'));
-
-        return is_admin() && !($doing_ajax || $load_scripts_styles);
-    }
-
-    /**
-     * This is the frontend.
-     *
-     * @return bool True or false.
-     */
-    public static function is_frontend()
-    {
-        return !is_admin();
-    }
-
-    /**
-     * Is this the Add Media / From URL preview request?
-     *
-     * Will not work in WordPress 4.8+
-     *
-     * @return bool
-     */
-    public static function is_add_oembed_preview()
-    {
-        /** The preview request is a parse-embed AJAX call without a type set. */
-        return  self::is_ajax() && !empty($_POST['action']) && $_POST['action'] == 'parse-embed' && !isset($_POST['type']);
-    }
-
-    /**
-     * Is this an AJAX call in progress?
-     *
-     * @return bool
-     */
-    public static function is_ajax()
-    {
-        return defined('DOING_AJAX') && DOING_AJAX;
-    }
-
-    /**
-     * Is this a REST request? Call after parse_request.
-     *
-     * @return bool
-     */
-    public static function is_rest()
-    {
-        return !empty($GLOBALS['wp']->query_vars['rest_route']);
-    }
-
-    /**
-     * The current $post is a View, no?
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @todo tests
-     *
-     * @return \GV\View|false The view requested or false
-     */
-    public function is_view()
-    {
-        global $post;
-        if ($post && get_post_type($post) == 'gravityview') {
-            return \GV\View::from_post($post);
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks whether this is a single entry request.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @todo tests
-     *
-     * @param int $form_id The form ID, since slugs can be non-unique. Default: 0.
-     *
-     * @return \GV\GF_Entry|false The entry requested or false.
-     */
-    public function is_entry($form_id = 0)
-    {
-        global $wp_query;
-
-        if (!$wp_query) {
-            return false;
-        }
-
-        $id = get_query_var(Entry::get_endpoint_name());
-
-        if (!$id) {
-            return false;
-        }
-
-        static $entries = [];
-
-        if (isset($entries["$form_id:$id"])) {
-            return $entries["$form_id:$id"];
-        }
-
-        $view = $this->is_view();
-
-        /**
-         * Not CPT, so probably a shortcode.
-         */
-        if (!$view) {
-            $view = gravityview()->views->get();
-        }
-
-        /**
-         * A joined request.
-         */
-        if ($view && ($joins = $view->joins)) {
-            $forms = array_merge(wp_list_pluck($joins, 'join'), wp_list_pluck($joins, 'join_on'));
-            $valid_forms = array_unique(wp_list_pluck($forms, 'ID'));
-
-            $multientry = [];
-            foreach ($ids = explode(',', $id) as $i => $id) {
-                $valid_form = \GV\Utils::get($valid_forms, $i, 0);
-
-                if (!$e = GF_Entry::by_id($id, $valid_form)) {
-                    return false;
-                }
-
-                if (!in_array($e['form_id'], $valid_forms)) {
-                    return false;
-                }
-
-                array_push($multientry, $e);
-            }
-
-            // Allow Edit Entry to only edit a single entry on a multi-entry
-            $is_edit_entry = apply_filters('gravityview_is_edit_entry', false);
-
-            // Edit entry links are single-entry based
-            if ($is_edit_entry && 1 !== count($multientry)) {
-                return false;
-            }
-
-            $entry = Multi_Entry::from_entries(array_filter($multientry));
-        } else {
-            /**
-             * A regular one.
-             */
-            $entry = GF_Entry::by_id($id, $form_id);
-        }
-
-        $entries["$form_id:$id"] = $entry;
-
-        return $entry;
-    }
-
-    /**
-     * Checks whether this an edit entry request.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @todo tests
-     *
-     * @param int $form_id The form ID, since slugs can be non-unique. Default: 0.
-     *
-     * @return \GV\Entry|false The entry requested or false.
-     */
-    public function is_edit_entry($form_id = 0)
-    {
-        /**
-         * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
-         * The Edit Entry functionality overrides this value.
-         *
-         * @param bool $is_edit_entry
-         */
-        if (($entry = $this->is_entry($form_id)) && apply_filters('gravityview_is_edit_entry', false)) {
-            if ($entry->is_multi()) {
-                return array_pop($entry->entries);
-            }
-
-            return $entry;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks whether this an entry search request.
-     *
-     * @api
-     *
-     * @since 2.0
-     *
-     * @todo implementation
-     *
-     * @return bool True if this is a search request.
-     */
-    public function is_search()
-    {
-        $search_method = apply_filters('gravityview/search/method', 'get');
-
-        if ('post' === $search_method) {
-            $get = $_POST;
-        } else {
-            $get = $_GET;
-        }
-
-        unset($get['mode']);
-
-        $get = array_filter($get, 'gravityview_is_not_empty_string');
-
-        if ($has_field_key = $this->_has_field_key($get)) {
-            return true;
-        }
-
-        return isset($get['gv_search']) || isset($get['gv_start']) || isset($get['gv_end']) || isset($get['gv_by']) || isset($get['gv_id']);
-    }
-
-    /**
-     * Calculate whether the $_REQUEST has a GravityView field.
-     *
-     * @internal
-     *
-     * @todo Roll into the future Search refactor
-     *
-     * @since 2.0.7
-     *
-     * @param array $get $_POST or $_GET array
-     *
-     * @return bool True: GravityView-formatted field detected; False: not detected
-     */
-    private function _has_field_key($get)
-    {
-        $has_field_key = false;
-
-        $fields = \GravityView_Fields::get_all();
-
-        $meta = [];
-        foreach ($fields as $field) {
-            if (empty($field->_gf_field_class_name)) {
-                $meta[] = preg_quote($field->name);
-            }
-        }
-
-        foreach ($get as $key => $value) {
-            if (preg_match('/^(filter|input)_(([0-9_]+)|'.implode('|', $meta).')$/sm', $key)) {
-                $has_field_key = true;
-                break;
-            }
-        }
-
-        return $has_field_key;
-    }
+	public function __construct()
+	{
+	}
+
+	/**
+	 * Whether this request is something that is renderable.
+	 *
+	 * @since 2.5.2
+	 *
+	 * @return bool Yes or no.
+	 */
+	public function is_renderable()
+	{
+		$is_renderable = in_array(get_class($this), [
+			'GV\Frontend_Request',
+			'GV\Mock_Request',
+			'GV\REST\Request',
+		], true);
+
+		/**
+		 * @filter `gravityview/request/is_renderable` Is this request renderable?
+		 *
+		 * @since 2.5.2
+		 *
+		 * @param bool        $is_renderable Huh?
+		 * @param \GV\Request $this          This.
+		 */
+		return apply_filters('gravityview/request/is_renderable', $is_renderable, $this);
+	}
+
+	/**
+	 * Check if WordPress is_admin(), and make sure not DOING_AJAX.
+	 *
+	 * @return bool
+	 */
+	public static function is_admin()
+	{
+		$doing_ajax = defined('DOING_AJAX') ? DOING_AJAX : false;
+		$load_scripts_styles = preg_match('#^/wp-admin/load-(scripts|styles).php$#', Utils::_SERVER('SCRIPT_NAME'));
+
+		return is_admin() && !($doing_ajax || $load_scripts_styles);
+	}
+
+	/**
+	 * This is the frontend.
+	 *
+	 * @return bool True or false.
+	 */
+	public static function is_frontend()
+	{
+		return !is_admin();
+	}
+
+	/**
+	 * Is this the Add Media / From URL preview request?
+	 *
+	 * Will not work in WordPress 4.8+
+	 *
+	 * @return bool
+	 */
+	public static function is_add_oembed_preview()
+	{
+		/** The preview request is a parse-embed AJAX call without a type set. */
+		return  self::is_ajax() && !empty($_POST['action']) && $_POST['action'] == 'parse-embed' && !isset($_POST['type']);
+	}
+
+	/**
+	 * Is this an AJAX call in progress?
+	 *
+	 * @return bool
+	 */
+	public static function is_ajax()
+	{
+		return defined('DOING_AJAX') && DOING_AJAX;
+	}
+
+	/**
+	 * Is this a REST request? Call after parse_request.
+	 *
+	 * @return bool
+	 */
+	public static function is_rest()
+	{
+		return !empty($GLOBALS['wp']->query_vars['rest_route']);
+	}
+
+	/**
+	 * The current $post is a View, no?
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @todo tests
+	 *
+	 * @return \GV\View|false The view requested or false
+	 */
+	public function is_view()
+	{
+		global $post;
+		if ($post && get_post_type($post) == 'gravityview') {
+			return \GV\View::from_post($post);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks whether this is a single entry request.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @todo tests
+	 *
+	 * @param int $form_id The form ID, since slugs can be non-unique. Default: 0.
+	 *
+	 * @return \GV\GF_Entry|false The entry requested or false.
+	 */
+	public function is_entry($form_id = 0)
+	{
+		global $wp_query;
+
+		if (!$wp_query) {
+			return false;
+		}
+
+		$id = get_query_var(Entry::get_endpoint_name());
+
+		if (!$id) {
+			return false;
+		}
+
+		static $entries = [];
+
+		if (isset($entries["$form_id:$id"])) {
+			return $entries["$form_id:$id"];
+		}
+
+		$view = $this->is_view();
+
+		/**
+		 * Not CPT, so probably a shortcode.
+		 */
+		if (!$view) {
+			$view = gravityview()->views->get();
+		}
+
+		/**
+		 * A joined request.
+		 */
+		if ($view && ($joins = $view->joins)) {
+			$forms = array_merge(wp_list_pluck($joins, 'join'), wp_list_pluck($joins, 'join_on'));
+			$valid_forms = array_unique(wp_list_pluck($forms, 'ID'));
+
+			$multientry = [];
+			foreach ($ids = explode(',', $id) as $i => $id) {
+				$valid_form = \GV\Utils::get($valid_forms, $i, 0);
+
+				if (!$e = GF_Entry::by_id($id, $valid_form)) {
+					return false;
+				}
+
+				if (!in_array($e['form_id'], $valid_forms)) {
+					return false;
+				}
+
+				array_push($multientry, $e);
+			}
+
+			// Allow Edit Entry to only edit a single entry on a multi-entry
+			$is_edit_entry = apply_filters('gravityview_is_edit_entry', false);
+
+			// Edit entry links are single-entry based
+			if ($is_edit_entry && 1 !== count($multientry)) {
+				return false;
+			}
+
+			$entry = Multi_Entry::from_entries(array_filter($multientry));
+		} else {
+			/**
+			 * A regular one.
+			 */
+			$entry = GF_Entry::by_id($id, $form_id);
+		}
+
+		$entries["$form_id:$id"] = $entry;
+
+		return $entry;
+	}
+
+	/**
+	 * Checks whether this an edit entry request.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @todo tests
+	 *
+	 * @param int $form_id The form ID, since slugs can be non-unique. Default: 0.
+	 *
+	 * @return \GV\Entry|false The entry requested or false.
+	 */
+	public function is_edit_entry($form_id = 0)
+	{
+		/**
+		 * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
+		 * The Edit Entry functionality overrides this value.
+		 *
+		 * @param bool $is_edit_entry
+		 */
+		if (($entry = $this->is_entry($form_id)) && apply_filters('gravityview_is_edit_entry', false)) {
+			if ($entry->is_multi()) {
+				return array_pop($entry->entries);
+			}
+
+			return $entry;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks whether this an entry search request.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 *
+	 * @todo implementation
+	 *
+	 * @return bool True if this is a search request.
+	 */
+	public function is_search()
+	{
+		$search_method = apply_filters('gravityview/search/method', 'get');
+
+		if ('post' === $search_method) {
+			$get = $_POST;
+		} else {
+			$get = $_GET;
+		}
+
+		unset($get['mode']);
+
+		$get = array_filter($get, 'gravityview_is_not_empty_string');
+
+		if ($has_field_key = $this->_has_field_key($get)) {
+			return true;
+		}
+
+		return isset($get['gv_search']) || isset($get['gv_start']) || isset($get['gv_end']) || isset($get['gv_by']) || isset($get['gv_id']);
+	}
+
+	/**
+	 * Calculate whether the $_REQUEST has a GravityView field.
+	 *
+	 * @internal
+	 *
+	 * @todo Roll into the future Search refactor
+	 *
+	 * @since 2.0.7
+	 *
+	 * @param array $get $_POST or $_GET array
+	 *
+	 * @return bool True: GravityView-formatted field detected; False: not detected
+	 */
+	private function _has_field_key($get)
+	{
+		$has_field_key = false;
+
+		$fields = \GravityView_Fields::get_all();
+
+		$meta = [];
+		foreach ($fields as $field) {
+			if (empty($field->_gf_field_class_name)) {
+				$meta[] = preg_quote($field->name);
+			}
+		}
+
+		foreach ($get as $key => $value) {
+			if (preg_match('/^(filter|input)_(([0-9_]+)|'.implode('|', $meta).')$/sm', $key)) {
+				$has_field_key = true;
+				break;
+			}
+		}
+
+		return $has_field_key;
+	}
 }
 
 /** Load implementations. */

Spacing +56 added lines, -56 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -27,11 +27,11 @@ 
      */
     public function is_renderable()
     {
-        $is_renderable = in_array(get_class($this), [
+        $is_renderable = in_array( get_class( $this ), [
             'GV\Frontend_Request',
             'GV\Mock_Request',
             'GV\REST\Request',
-        ], true);
+        ], true );
 
         /**
          * @filter `gravityview/request/is_renderable` Is this request renderable?
@@ -41,7 +41,7 @@ 
          * @param bool        $is_renderable Huh?
          * @param \GV\Request $this          This.
          */
-        return apply_filters('gravityview/request/is_renderable', $is_renderable, $this);
+        return apply_filters( 'gravityview/request/is_renderable', $is_renderable, $this );
     }
 
     /**
@@ -51,10 +51,10 @@ 
      */
     public static function is_admin()
     {
-        $doing_ajax = defined('DOING_AJAX') ? DOING_AJAX : false;
-        $load_scripts_styles = preg_match('#^/wp-admin/load-(scripts|styles).php$#', Utils::_SERVER('SCRIPT_NAME'));
+        $doing_ajax = defined( 'DOING_AJAX' ) ? DOING_AJAX : false;
+        $load_scripts_styles = preg_match( '#^/wp-admin/load-(scripts|styles).php$#', Utils::_SERVER( 'SCRIPT_NAME' ) );
 
-        return is_admin() && !($doing_ajax || $load_scripts_styles);
+        return is_admin() && ! ( $doing_ajax || $load_scripts_styles );
     }
 
     /**
@@ -64,7 +64,7 @@ 
      */
     public static function is_frontend()
     {
-        return !is_admin();
+        return ! is_admin();
     }
 
     /**
@@ -77,7 +77,7 @@ 
     public static function is_add_oembed_preview()
     {
         /** The preview request is a parse-embed AJAX call without a type set. */
-        return  self::is_ajax() && !empty($_POST['action']) && $_POST['action'] == 'parse-embed' && !isset($_POST['type']);
+        return  self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] );
     }
 
     /**
@@ -87,7 +87,7 @@ 
      */
     public static function is_ajax()
     {
-        return defined('DOING_AJAX') && DOING_AJAX;
+        return defined( 'DOING_AJAX' ) && DOING_AJAX;
     }
 
     /**
@@ -97,7 +97,7 @@ 
      */
     public static function is_rest()
     {
-        return !empty($GLOBALS['wp']->query_vars['rest_route']);
+        return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] );
     }
 
     /**
@@ -114,8 +114,8 @@ 
     public function is_view()
     {
         global $post;
-        if ($post && get_post_type($post) == 'gravityview') {
-            return \GV\View::from_post($post);
+        if ( $post && get_post_type( $post ) == 'gravityview' ) {
+            return \GV\View::from_post( $post );
         }
 
         return false;
@@ -134,24 +134,24 @@ 
      *
      * @return \GV\GF_Entry|false The entry requested or false.
      */
-    public function is_entry($form_id = 0)
+    public function is_entry( $form_id = 0 )
     {
         global $wp_query;
 
-        if (!$wp_query) {
+        if ( ! $wp_query ) {
             return false;
         }
 
-        $id = get_query_var(Entry::get_endpoint_name());
+        $id = get_query_var( Entry::get_endpoint_name() );
 
-        if (!$id) {
+        if ( ! $id ) {
             return false;
         }
 
-        static $entries = [];
+        static $entries = [ ];
 
-        if (isset($entries["$form_id:$id"])) {
-            return $entries["$form_id:$id"];
+        if ( isset( $entries[ "$form_id:$id" ] ) ) {
+            return $entries[ "$form_id:$id" ];
         }
 
         $view = $this->is_view();
@@ -159,49 +159,49 @@ 
         /**
          * Not CPT, so probably a shortcode.
          */
-        if (!$view) {
+        if ( ! $view ) {
             $view = gravityview()->views->get();
         }
 
         /**
          * A joined request.
          */
-        if ($view && ($joins = $view->joins)) {
-            $forms = array_merge(wp_list_pluck($joins, 'join'), wp_list_pluck($joins, 'join_on'));
-            $valid_forms = array_unique(wp_list_pluck($forms, 'ID'));
+        if ( $view && ( $joins = $view->joins ) ) {
+            $forms = array_merge( wp_list_pluck( $joins, 'join' ), wp_list_pluck( $joins, 'join_on' ) );
+            $valid_forms = array_unique( wp_list_pluck( $forms, 'ID' ) );
 
-            $multientry = [];
-            foreach ($ids = explode(',', $id) as $i => $id) {
-                $valid_form = \GV\Utils::get($valid_forms, $i, 0);
+            $multientry = [ ];
+            foreach ( $ids = explode( ',', $id ) as $i => $id ) {
+                $valid_form = \GV\Utils::get( $valid_forms, $i, 0 );
 
-                if (!$e = GF_Entry::by_id($id, $valid_form)) {
+                if ( ! $e = GF_Entry::by_id( $id, $valid_form ) ) {
                     return false;
                 }
 
-                if (!in_array($e['form_id'], $valid_forms)) {
+                if ( ! in_array( $e[ 'form_id' ], $valid_forms ) ) {
                     return false;
                 }
 
-                array_push($multientry, $e);
+                array_push( $multientry, $e );
             }
 
             // Allow Edit Entry to only edit a single entry on a multi-entry
-            $is_edit_entry = apply_filters('gravityview_is_edit_entry', false);
+            $is_edit_entry = apply_filters( 'gravityview_is_edit_entry', false );
 
             // Edit entry links are single-entry based
-            if ($is_edit_entry && 1 !== count($multientry)) {
+            if ( $is_edit_entry && 1 !== count( $multientry ) ) {
                 return false;
             }
 
-            $entry = Multi_Entry::from_entries(array_filter($multientry));
+            $entry = Multi_Entry::from_entries( array_filter( $multientry ) );
         } else {
             /**
              * A regular one.
              */
-            $entry = GF_Entry::by_id($id, $form_id);
+            $entry = GF_Entry::by_id( $id, $form_id );
         }
 
-        $entries["$form_id:$id"] = $entry;
+        $entries[ "$form_id:$id" ] = $entry;
 
         return $entry;
     }
@@ -219,7 +219,7 @@ 
      *
      * @return \GV\Entry|false The entry requested or false.
      */
-    public function is_edit_entry($form_id = 0)
+    public function is_edit_entry( $form_id = 0 )
     {
         /**
          * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
@@ -227,9 +227,9 @@ 
          *
          * @param bool $is_edit_entry
          */
-        if (($entry = $this->is_entry($form_id)) && apply_filters('gravityview_is_edit_entry', false)) {
-            if ($entry->is_multi()) {
-                return array_pop($entry->entries);
+        if ( ( $entry = $this->is_entry( $form_id ) ) && apply_filters( 'gravityview_is_edit_entry', false ) ) {
+            if ( $entry->is_multi() ) {
+                return array_pop( $entry->entries );
             }
 
             return $entry;
@@ -251,23 +251,23 @@ 
      */
     public function is_search()
     {
-        $search_method = apply_filters('gravityview/search/method', 'get');
+        $search_method = apply_filters( 'gravityview/search/method', 'get' );
 
-        if ('post' === $search_method) {
+        if ( 'post' === $search_method ) {
             $get = $_POST;
         } else {
             $get = $_GET;
         }
 
-        unset($get['mode']);
+        unset( $get[ 'mode' ] );
 
-        $get = array_filter($get, 'gravityview_is_not_empty_string');
+        $get = array_filter( $get, 'gravityview_is_not_empty_string' );
 
-        if ($has_field_key = $this->_has_field_key($get)) {
+        if ( $has_field_key = $this->_has_field_key( $get ) ) {
             return true;
         }
 
-        return isset($get['gv_search']) || isset($get['gv_start']) || isset($get['gv_end']) || isset($get['gv_by']) || isset($get['gv_id']);
+        return isset( $get[ 'gv_search' ] ) || isset( $get[ 'gv_start' ] ) || isset( $get[ 'gv_end' ] ) || isset( $get[ 'gv_by' ] ) || isset( $get[ 'gv_id' ] );
     }
 
     /**
@@ -283,21 +283,21 @@ 
      *
      * @return bool True: GravityView-formatted field detected; False: not detected
      */
-    private function _has_field_key($get)
+    private function _has_field_key( $get )
     {
         $has_field_key = false;
 
         $fields = \GravityView_Fields::get_all();
 
-        $meta = [];
-        foreach ($fields as $field) {
-            if (empty($field->_gf_field_class_name)) {
-                $meta[] = preg_quote($field->name);
+        $meta = [ ];
+        foreach ( $fields as $field ) {
+            if ( empty( $field->_gf_field_class_name ) ) {
+                $meta[ ] = preg_quote( $field->name );
             }
         }
 
-        foreach ($get as $key => $value) {
-            if (preg_match('/^(filter|input)_(([0-9_]+)|'.implode('|', $meta).')$/sm', $key)) {
+        foreach ( $get as $key => $value ) {
+            if ( preg_match( '/^(filter|input)_(([0-9_]+)|' . implode( '|', $meta ) . ')$/sm', $key ) ) {
                 $has_field_key = true;
                 break;
             }
@@ -308,7 +308,7 @@ 
 }
 
 /** Load implementations. */
-require gravityview()->plugin->dir('future/includes/class-gv-request-frontend.php');
-require gravityview()->plugin->dir('future/includes/class-gv-request-admin.php');
-require gravityview()->plugin->dir('future/includes/rest/class-gv-request-rest.php');
-require gravityview()->plugin->dir('future/includes/class-gv-request-mock.php');
+require gravityview()->plugin->dir( 'future/includes/class-gv-request-frontend.php' );
+require gravityview()->plugin->dir( 'future/includes/class-gv-request-admin.php' );
+require gravityview()->plugin->dir( 'future/includes/rest/class-gv-request-rest.php' );
+require gravityview()->plugin->dir( 'future/includes/class-gv-request-mock.php' );

Braces +13 added lines, -26 removed lines

@@ -12,10 +12,8 @@ 
  *
  * Knows more about the request than anyone else.
  */
-abstract class Request
-{
-    public function __construct()
-    {
+abstract class Request {
+    public function __construct() {
     }
 
     /**
@@ -25,8 +23,7 @@ 
      *
      * @return bool Yes or no.
      */
-    public function is_renderable()
-    {
+    public function is_renderable() {
         $is_renderable = in_array(get_class($this), [
             'GV\Frontend_Request',
             'GV\Mock_Request',
@@ -49,8 +46,7 @@ 
      *
      * @return bool
      */
-    public static function is_admin()
-    {
+    public static function is_admin() {
         $doing_ajax = defined('DOING_AJAX') ? DOING_AJAX : false;
         $load_scripts_styles = preg_match('#^/wp-admin/load-(scripts|styles).php$#', Utils::_SERVER('SCRIPT_NAME'));
 
@@ -62,8 +58,7 @@ 
      *
      * @return bool True or false.
      */
-    public static function is_frontend()
-    {
+    public static function is_frontend() {
         return !is_admin();
     }
 
@@ -74,8 +69,7 @@ 
      *
      * @return bool
      */
-    public static function is_add_oembed_preview()
-    {
+    public static function is_add_oembed_preview() {
         /** The preview request is a parse-embed AJAX call without a type set. */
         return  self::is_ajax() && !empty($_POST['action']) && $_POST['action'] == 'parse-embed' && !isset($_POST['type']);
     }
@@ -85,8 +79,7 @@ 
      *
      * @return bool
      */
-    public static function is_ajax()
-    {
+    public static function is_ajax() {
         return defined('DOING_AJAX') && DOING_AJAX;
     }
 
@@ -95,8 +88,7 @@ 
      *
      * @return bool
      */
-    public static function is_rest()
-    {
+    public static function is_rest() {
         return !empty($GLOBALS['wp']->query_vars['rest_route']);
     }
 
@@ -111,8 +103,7 @@ 
      *
      * @return \GV\View|false The view requested or false
      */
-    public function is_view()
-    {
+    public function is_view() {
         global $post;
         if ($post && get_post_type($post) == 'gravityview') {
             return \GV\View::from_post($post);
@@ -134,8 +125,7 @@ 
      *
      * @return \GV\GF_Entry|false The entry requested or false.
      */
-    public function is_entry($form_id = 0)
-    {
+    public function is_entry($form_id = 0) {
         global $wp_query;
 
         if (!$wp_query) {
@@ -219,8 +209,7 @@ 
      *
      * @return \GV\Entry|false The entry requested or false.
      */
-    public function is_edit_entry($form_id = 0)
-    {
+    public function is_edit_entry($form_id = 0) {
         /**
          * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
          * The Edit Entry functionality overrides this value.
@@ -249,8 +238,7 @@ 
      *
      * @return bool True if this is a search request.
      */
-    public function is_search()
-    {
+    public function is_search() {
         $search_method = apply_filters('gravityview/search/method', 'get');
 
         if ('post' === $search_method) {
@@ -283,8 +271,7 @@ 
      *
      * @return bool True: GravityView-formatted field detected; False: not detected
      */
-    private function _has_field_key($get)
-    {
+    private function _has_field_key($get) {
         $has_field_key = false;
 
         $fields = \GravityView_Fields::get_all();

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

Indentation +90 added lines, -90 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -14,93 +14,93 @@ 
  */
 class Entry_List_Template extends Entry_Template
 {
-    /**
-     * @var string The template slug to be loaded (like "table", "list")
-     */
-    public static $slug = 'list';
-
-    /**
-     * Output the field in the list view.
-     *
-     * @param \GV\Field $field  The field to output.
-     * @param array     $extras Extra stuff, like wpautop, etc.
-     *
-     * @return string
-     */
-    public function the_field(\GV\Field $field, $extras = null)
-    {
-        $form = \GV\GF_Form::by_id($field->form_id) ?: $this->view->form;
-        $entry = $this->entry->from_field($field);
-
-        if (!$entry) {
-            return '';
-        }
-
-        $renderer = new Field_Renderer();
-        $source = is_numeric($field->ID) ? (GF_Form::by_id($field->form_id) ?: $this->view->form) : new Internal_Source();
-
-        $value = $renderer->render($field, $this->view, $source, $entry, $this->request);
-
-        $context = Template_Context::from_template($this, compact('field', 'entry'));
-
-        /**
-         * @deprecated Here for back-compatibility.
-         */
-        $label = apply_filters('gravityview_render_after_label', $field->get_label($this->view, $form, $entry), $field->as_configuration());
-        $label = apply_filters('gravityview/template/field_label', $label, $field->as_configuration(), is_numeric($field->ID) ? ($source->form ? $source->form : null) : null, $entry->as_entry());
-
-        /**
-         * @filter `gravityview/template/field/label` Override the field label.
-         *
-         * @since 2.0
-         *
-         * @param string               $label   The label to override.
-         * @param \GV\Template_Context $context The context.
-         */
-        $label = apply_filters('gravityview/template/field/label', $label, $context);
-
-        /**
-         * @filter `gravityview/template/table/entry/hide_empty`
-         *
-         * @param bool                 $hide_empty Should the row be hidden if the value is empty? Default: don't hide.
-         * @param \GV\Template_Context $context    The context ;) Love it, cherish it. And don't you dare modify it!
-         */
-        $hide_empty = apply_filters('gravityview/render/hide-empty-zone', Utils::get($extras, 'hide_empty', $this->view->settings->get('hide_empty', false)), $context);
-
-        if (is_numeric($field->ID)) {
-            $extras['field'] = $field->as_configuration();
-        }
-
-        $extras['entry'] = $this->entry->as_entry();
-        $extras['hide_empty'] = $hide_empty;
-        $extras['label'] = $label;
-        $extras['value'] = $value;
-
-        return \gravityview_field_output($extras, $context);
-    }
-
-    /**
-     * Return an array of variables ready to be extracted.
-     *
-     * @param string|array $zones The field zones to grab.
-     *
-     * @return array An array ready to be extract()ed in the form of
-     *               $zone => \GV\Field_Collection
-     *               has_$zone => int
-     */
-    public function extract_zone_vars($zones)
-    {
-        if (!is_array($zones)) {
-            $zones = [$zones];
-        }
-
-        $vars = [];
-        foreach ($zones as $zone) {
-            $zone_var = str_replace('-', '_', $zone);
-            $vars[$zone_var] = $this->view->fields->by_position('single_list-'.$zone)->by_visible($this->view);
-            $vars["has_$zone_var"] = $vars[$zone_var]->count();
-        }
-
-        return $vars;
-    }
+	/**
+	 * @var string The template slug to be loaded (like "table", "list")
+	 */
+	public static $slug = 'list';
+
+	/**
+	 * Output the field in the list view.
+	 *
+	 * @param \GV\Field $field  The field to output.
+	 * @param array     $extras Extra stuff, like wpautop, etc.
+	 *
+	 * @return string
+	 */
+	public function the_field(\GV\Field $field, $extras = null)
+	{
+		$form = \GV\GF_Form::by_id($field->form_id) ?: $this->view->form;
+		$entry = $this->entry->from_field($field);
+
+		if (!$entry) {
+			return '';
+		}
+
+		$renderer = new Field_Renderer();
+		$source = is_numeric($field->ID) ? (GF_Form::by_id($field->form_id) ?: $this->view->form) : new Internal_Source();
+
+		$value = $renderer->render($field, $this->view, $source, $entry, $this->request);
+
+		$context = Template_Context::from_template($this, compact('field', 'entry'));
+
+		/**
+		 * @deprecated Here for back-compatibility.
+		 */
+		$label = apply_filters('gravityview_render_after_label', $field->get_label($this->view, $form, $entry), $field->as_configuration());
+		$label = apply_filters('gravityview/template/field_label', $label, $field->as_configuration(), is_numeric($field->ID) ? ($source->form ? $source->form : null) : null, $entry->as_entry());
+
+		/**
+		 * @filter `gravityview/template/field/label` Override the field label.
+		 *
+		 * @since 2.0
+		 *
+		 * @param string               $label   The label to override.
+		 * @param \GV\Template_Context $context The context.
+		 */
+		$label = apply_filters('gravityview/template/field/label', $label, $context);
+
+		/**
+		 * @filter `gravityview/template/table/entry/hide_empty`
+		 *
+		 * @param bool                 $hide_empty Should the row be hidden if the value is empty? Default: don't hide.
+		 * @param \GV\Template_Context $context    The context ;) Love it, cherish it. And don't you dare modify it!
+		 */
+		$hide_empty = apply_filters('gravityview/render/hide-empty-zone', Utils::get($extras, 'hide_empty', $this->view->settings->get('hide_empty', false)), $context);
+
+		if (is_numeric($field->ID)) {
+			$extras['field'] = $field->as_configuration();
+		}
+
+		$extras['entry'] = $this->entry->as_entry();
+		$extras['hide_empty'] = $hide_empty;
+		$extras['label'] = $label;
+		$extras['value'] = $value;
+
+		return \gravityview_field_output($extras, $context);
+	}
+
+	/**
+	 * Return an array of variables ready to be extracted.
+	 *
+	 * @param string|array $zones The field zones to grab.
+	 *
+	 * @return array An array ready to be extract()ed in the form of
+	 *               $zone => \GV\Field_Collection
+	 *               has_$zone => int
+	 */
+	public function extract_zone_vars($zones)
+	{
+		if (!is_array($zones)) {
+			$zones = [$zones];
+		}
+
+		$vars = [];
+		foreach ($zones as $zone) {
+			$zone_var = str_replace('-', '_', $zone);
+			$vars[$zone_var] = $this->view->fields->by_position('single_list-'.$zone)->by_visible($this->view);
+			$vars["has_$zone_var"] = $vars[$zone_var]->count();
+		}
+
+		return $vars;
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -27,27 +27,27 @@ 
      *
      * @return string
      */
-    public function the_field(\GV\Field $field, $extras = null)
+    public function the_field( \GV\Field $field, $extras = null )
     {
-        $form = \GV\GF_Form::by_id($field->form_id) ?: $this->view->form;
-        $entry = $this->entry->from_field($field);
+        $form = \GV\GF_Form::by_id( $field->form_id ) ?: $this->view->form;
+        $entry = $this->entry->from_field( $field );
 
-        if (!$entry) {
+        if ( ! $entry ) {
             return '';
         }
 
         $renderer = new Field_Renderer();
-        $source = is_numeric($field->ID) ? (GF_Form::by_id($field->form_id) ?: $this->view->form) : new Internal_Source();
+        $source = is_numeric( $field->ID ) ? ( GF_Form::by_id( $field->form_id ) ?: $this->view->form ) : new Internal_Source();
 
-        $value = $renderer->render($field, $this->view, $source, $entry, $this->request);
+        $value = $renderer->render( $field, $this->view, $source, $entry, $this->request );
 
-        $context = Template_Context::from_template($this, compact('field', 'entry'));
+        $context = Template_Context::from_template( $this, compact( 'field', 'entry' ) );
 
         /**
          * @deprecated Here for back-compatibility.
          */
-        $label = apply_filters('gravityview_render_after_label', $field->get_label($this->view, $form, $entry), $field->as_configuration());
-        $label = apply_filters('gravityview/template/field_label', $label, $field->as_configuration(), is_numeric($field->ID) ? ($source->form ? $source->form : null) : null, $entry->as_entry());
+        $label = apply_filters( 'gravityview_render_after_label', $field->get_label( $this->view, $form, $entry ), $field->as_configuration() );
+        $label = apply_filters( 'gravityview/template/field_label', $label, $field->as_configuration(), is_numeric( $field->ID ) ? ( $source->form ? $source->form : null ) : null, $entry->as_entry() );
 
         /**
          * @filter `gravityview/template/field/label` Override the field label.
@@ -57,7 +57,7 @@ 
          * @param string               $label   The label to override.
          * @param \GV\Template_Context $context The context.
          */
-        $label = apply_filters('gravityview/template/field/label', $label, $context);
+        $label = apply_filters( 'gravityview/template/field/label', $label, $context );
 
         /**
          * @filter `gravityview/template/table/entry/hide_empty`
@@ -65,18 +65,18 @@ 
          * @param bool                 $hide_empty Should the row be hidden if the value is empty? Default: don't hide.
          * @param \GV\Template_Context $context    The context ;) Love it, cherish it. And don't you dare modify it!
          */
-        $hide_empty = apply_filters('gravityview/render/hide-empty-zone', Utils::get($extras, 'hide_empty', $this->view->settings->get('hide_empty', false)), $context);
+        $hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
 
-        if (is_numeric($field->ID)) {
-            $extras['field'] = $field->as_configuration();
+        if ( is_numeric( $field->ID ) ) {
+            $extras[ 'field' ] = $field->as_configuration();
         }
 
-        $extras['entry'] = $this->entry->as_entry();
-        $extras['hide_empty'] = $hide_empty;
-        $extras['label'] = $label;
-        $extras['value'] = $value;
+        $extras[ 'entry' ] = $this->entry->as_entry();
+        $extras[ 'hide_empty' ] = $hide_empty;
+        $extras[ 'label' ] = $label;
+        $extras[ 'value' ] = $value;
 
-        return \gravityview_field_output($extras, $context);
+        return \gravityview_field_output( $extras, $context );
     }
 
     /**
@@ -88,17 +88,17 @@ 
      *               $zone => \GV\Field_Collection
      *               has_$zone => int
      */
-    public function extract_zone_vars($zones)
+    public function extract_zone_vars( $zones )
     {
-        if (!is_array($zones)) {
-            $zones = [$zones];
+        if ( ! is_array( $zones ) ) {
+            $zones = [ $zones ];
         }
 
-        $vars = [];
-        foreach ($zones as $zone) {
-            $zone_var = str_replace('-', '_', $zone);
-            $vars[$zone_var] = $this->view->fields->by_position('single_list-'.$zone)->by_visible($this->view);
-            $vars["has_$zone_var"] = $vars[$zone_var]->count();
+        $vars = [ ];
+        foreach ( $zones as $zone ) {
+            $zone_var = str_replace( '-', '_', $zone );
+            $vars[ $zone_var ] = $this->view->fields->by_position( 'single_list-' . $zone )->by_visible( $this->view );
+            $vars[ "has_$zone_var" ] = $vars[ $zone_var ]->count();
         }
 
         return $vars;

Braces +3 added lines, -6 removed lines

@@ -12,8 +12,7 @@ 
  *
  * Renders a \GV\Entry using a \GV\Entry_Renderer.
  */
-class Entry_List_Template extends Entry_Template
-{
+class Entry_List_Template extends Entry_Template {
     /**
      * @var string The template slug to be loaded (like "table", "list")
      */
@@ -27,8 +26,7 @@ 
      *
      * @return string
      */
-    public function the_field(\GV\Field $field, $extras = null)
-    {
+    public function the_field(\GV\Field $field, $extras = null) {
         $form = \GV\GF_Form::by_id($field->form_id) ?: $this->view->form;
         $entry = $this->entry->from_field($field);
 
@@ -88,8 +86,7 @@ 
      *               $zone => \GV\Field_Collection
      *               has_$zone => int
      */
-    public function extract_zone_vars($zones)
-    {
+    public function extract_zone_vars($zones) {
         if (!is_array($zones)) {
             $zones = [$zones];
         }

future/includes/class-gv-source.php

Indentation +33 added lines, -33 removed lines

@@ -4,7 +4,7 @@ 
 
 /** If this file is called directly, abort. */
 if (!defined('GRAVITYVIEW_DIR')) {
-    exit();
+	exit();
 }
 
 /**
@@ -18,40 +18,40 @@ 
  */
 abstract class Source
 {
-    /**
-     * @var string BACKEND_INTERNAL The backend identifier for special GravityView data sources
-     *             like custom content and the like. Not really a form, but a source nevertheless.
-     */
-    const BACKEND_INTERNAL = 'internal';
+	/**
+	 * @var string BACKEND_INTERNAL The backend identifier for special GravityView data sources
+	 *             like custom content and the like. Not really a form, but a source nevertheless.
+	 */
+	const BACKEND_INTERNAL = 'internal';
 
-    /**
-     * @var string BACKEND_GRAVITYFORMS The backend identifier for special GravityView data sources
-     *             like custom content and the like. Not really a form, but a source nevertheless.
-     */
-    const BACKEND_GRAVITYFORMS = 'gravityforms';
+	/**
+	 * @var string BACKEND_GRAVITYFORMS The backend identifier for special GravityView data sources
+	 *             like custom content and the like. Not really a form, but a source nevertheless.
+	 */
+	const BACKEND_GRAVITYFORMS = 'gravityforms';
 
-    /**
-     * @var string The identifier of the backend used for this source.
-     *
-     * @see Constant backend identifiers above and \GV\Source subclasses.
-     *
-     * @api
-     *
-     * @since 2.0
-     */
-    public static $backend = null;
+	/**
+	 * @var string The identifier of the backend used for this source.
+	 *
+	 * @see Constant backend identifiers above and \GV\Source subclasses.
+	 *
+	 * @api
+	 *
+	 * @since 2.0
+	 */
+	public static $backend = null;
 
-    /**
-     * Get a \GV\Field instance by ID.
-     *
-     * Accepts a variable number of arguments, see implementations.
-     *
-     * @return \GV\Field|null A \GV\Field instance.
-     */
-    public static function get_field(/** varargs */)
-    {
-        gravityview()->log->error('{source}::get_field not implemented in {source}', ['source' => get_called_class()]);
+	/**
+	 * Get a \GV\Field instance by ID.
+	 *
+	 * Accepts a variable number of arguments, see implementations.
+	 *
+	 * @return \GV\Field|null A \GV\Field instance.
+	 */
+	public static function get_field(/** varargs */)
+	{
+		gravityview()->log->error('{source}::get_field not implemented in {source}', ['source' => get_called_class()]);
 
-        return null;
-    }
+		return null;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
 namespace GV;
 
 /** If this file is called directly, abort. */
-if (!defined('GRAVITYVIEW_DIR')) {
+if ( ! defined( 'GRAVITYVIEW_DIR' ) ) {
     exit();
 }
 
@@ -48,9 +48,9 @@ 
      *
      * @return \GV\Field|null A \GV\Field instance.
      */
-    public static function get_field(/** varargs */)
+    public static function get_field( /** varargs */ )
     {
-        gravityview()->log->error('{source}::get_field not implemented in {source}', ['source' => get_called_class()]);
+        gravityview()->log->error( '{source}::get_field not implemented in {source}', [ 'source' => get_called_class() ] );
 
         return null;
     }

Braces +2 added lines, -4 removed lines

@@ -16,8 +16,7 @@ 
  *  from the \GV\View and its \GV\Field configuration. While "gravityforms"
  *  fields are sourced from \GV\Entry instances.
  */
-abstract class Source
-{
+abstract class Source {
     /**
      * @var string BACKEND_INTERNAL The backend identifier for special GravityView data sources
      *             like custom content and the like. Not really a form, but a source nevertheless.
@@ -48,8 +47,7 @@ 
      *
      * @return \GV\Field|null A \GV\Field instance.
      */
-    public static function get_field(/** varargs */)
-    {
+    public static function get_field(/** varargs */) {
         gravityview()->log->error('{source}::get_field not implemented in {source}', ['source' => get_called_class()]);
 
         return null;