pryley / site-reviews

plugin/Blocks/SiteReviewsFormBlock.php

Indentation +105 added lines, -105 removed lines

@@ -7,115 +7,115 @@
 
 class SiteReviewsFormBlock extends BlockGenerator
 {
-    /**
-     * @return array
-     */
-    public function attributes()
-    {
-        return [
-            'assign_to' => [
-                'default' => '',
-                'type' => 'string',
-            ],
-            'category' => [
-                'default' => '',
-                'type' => 'string',
-            ],
-            'className' => [
-                'default' => '',
-                'type' => 'string',
-            ],
-            'hide' => [
-                'default' => '',
-                'type' => 'string',
-            ],
-            'id' => [
-                'default' => '',
-                'type' => 'string',
-            ],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function attributes()
+	{
+		return [
+			'assign_to' => [
+				'default' => '',
+				'type' => 'string',
+			],
+			'category' => [
+				'default' => '',
+				'type' => 'string',
+			],
+			'className' => [
+				'default' => '',
+				'type' => 'string',
+			],
+			'hide' => [
+				'default' => '',
+				'type' => 'string',
+			],
+			'id' => [
+				'default' => '',
+				'type' => 'string',
+			],
+		];
+	}
 
-    /**
-     * @return string
-     */
-    public function render(array $attributes)
-    {
-        $attributes['class'] = $attributes['className'];
-        $shortcode = glsr(Shortcode::class);
-        if ('edit' == filter_input(INPUT_GET, 'context')) {
-            $this->filterFormFields();
-            $this->filterRatingField();
-            $this->filterShortcodeClass();
-            $this->filterSubmitButton();
-            if (!$this->hasVisibleFields($shortcode, $attributes)) {
-                $this->filterInterpolation();
-            }
-        }
-        return $shortcode->buildShortcode($attributes);
-    }
+	/**
+	 * @return string
+	 */
+	public function render(array $attributes)
+	{
+		$attributes['class'] = $attributes['className'];
+		$shortcode = glsr(Shortcode::class);
+		if ('edit' == filter_input(INPUT_GET, 'context')) {
+			$this->filterFormFields();
+			$this->filterRatingField();
+			$this->filterShortcodeClass();
+			$this->filterSubmitButton();
+			if (!$this->hasVisibleFields($shortcode, $attributes)) {
+				$this->filterInterpolation();
+			}
+		}
+		return $shortcode->buildShortcode($attributes);
+	}
 
-    /**
-     * @return void
-     */
-    protected function filterFormFields()
-    {
-        add_filter('site-reviews/config/forms/submission-form', function (array $config) {
-            array_walk($config, function (&$field) {
-                $field['disabled'] = true;
-                $field['tabindex'] = '-1';
-            });
-            return $config;
-        });
-    }
+	/**
+	 * @return void
+	 */
+	protected function filterFormFields()
+	{
+		add_filter('site-reviews/config/forms/submission-form', function (array $config) {
+			array_walk($config, function (&$field) {
+				$field['disabled'] = true;
+				$field['tabindex'] = '-1';
+			});
+			return $config;
+		});
+	}
 
-    /**
-     * @return void
-     */
-    protected function filterInterpolation()
-    {
-        add_filter('site-reviews/interpolate/reviews-form', function ($context) {
-            $context['class'] = 'glsr-default glsr-block-disabled';
-            $context['fields'] = __('You have hidden all of the fields for this block.', 'site-reviews');
-            $context['response'] = '';
-            $context['submit_button'] = '';
-            return $context;
-        });
-    }
+	/**
+	 * @return void
+	 */
+	protected function filterInterpolation()
+	{
+		add_filter('site-reviews/interpolate/reviews-form', function ($context) {
+			$context['class'] = 'glsr-default glsr-block-disabled';
+			$context['fields'] = __('You have hidden all of the fields for this block.', 'site-reviews');
+			$context['response'] = '';
+			$context['submit_button'] = '';
+			return $context;
+		});
+	}
 
-    /**
-     * @return void
-     */
-    protected function filterRatingField()
-    {
-        add_filter('site-reviews/rendered/field', function ($html, $type, $args) {
-            if ('rating' == $args['path']) {
-                $stars = '<span class="glsr-stars">';
-                $stars.= str_repeat('<span class="glsr-star glsr-star-empty" aria-hidden="true"></span>', (int) glsr()->constant('MAX_RATING', Rating::class));
-                $stars.= '</span>';
-                $html = preg_replace('/(.*)(<select.*)(<\/select>)(.*)/', '$1'.$stars.'$4', $html);
-            }
-            return $html;
-        }, 10, 3);
-    }
+	/**
+	 * @return void
+	 */
+	protected function filterRatingField()
+	{
+		add_filter('site-reviews/rendered/field', function ($html, $type, $args) {
+			if ('rating' == $args['path']) {
+				$stars = '<span class="glsr-stars">';
+				$stars.= str_repeat('<span class="glsr-star glsr-star-empty" aria-hidden="true"></span>', (int) glsr()->constant('MAX_RATING', Rating::class));
+				$stars.= '</span>';
+				$html = preg_replace('/(.*)(<select.*)(<\/select>)(.*)/', '$1'.$stars.'$4', $html);
+			}
+			return $html;
+		}, 10, 3);
+	}
 
-    /**
-     * @return void
-     */
-    protected function filterShortcodeClass()
-    {
-        add_filter('site-reviews/style', function () {
-            return 'default';
-        });
-    }
+	/**
+	 * @return void
+	 */
+	protected function filterShortcodeClass()
+	{
+		add_filter('site-reviews/style', function () {
+			return 'default';
+		});
+	}
 
-    /**
-     * @return void
-     */
-    protected function filterSubmitButton()
-    {
-        add_filter('site-reviews/rendered/template/form/submit-button', function ($template) {
-            return str_replace('type="submit"', 'tabindex="-1"', $template);
-        });
-    }
+	/**
+	 * @return void
+	 */
+	protected function filterSubmitButton()
+	{
+		add_filter('site-reviews/rendered/template/form/submit-button', function ($template) {
+			return str_replace('type="submit"', 'tabindex="-1"', $template);
+		});
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -39,20 +39,20 @@ 
     /**
      * @return string
      */
-    public function render(array $attributes)
+    public function render( array $attributes )
     {
         $attributes['class'] = $attributes['className'];
-        $shortcode = glsr(Shortcode::class);
-        if ('edit' == filter_input(INPUT_GET, 'context')) {
+        $shortcode = glsr( Shortcode::class );
+        if( 'edit' == filter_input( INPUT_GET, 'context' ) ) {
             $this->filterFormFields();
             $this->filterRatingField();
             $this->filterShortcodeClass();
             $this->filterSubmitButton();
-            if (!$this->hasVisibleFields($shortcode, $attributes)) {
+            if( !$this->hasVisibleFields( $shortcode, $attributes ) ) {
                 $this->filterInterpolation();
             }
         }
-        return $shortcode->buildShortcode($attributes);
+        return $shortcode->buildShortcode( $attributes );
     }
 
     /**
@@ -60,8 +60,8 @@ 
      */
     protected function filterFormFields()
     {
-        add_filter('site-reviews/config/forms/submission-form', function (array $config) {
-            array_walk($config, function (&$field) {
+        add_filter( 'site-reviews/config/forms/submission-form', function( array $config ) {
+            array_walk( $config, function( &$field ) {
                 $field['disabled'] = true;
                 $field['tabindex'] = '-1';
             });
@@ -74,9 +74,9 @@ 
      */
     protected function filterInterpolation()
     {
-        add_filter('site-reviews/interpolate/reviews-form', function ($context) {
+        add_filter( 'site-reviews/interpolate/reviews-form', function( $context ) {
             $context['class'] = 'glsr-default glsr-block-disabled';
-            $context['fields'] = __('You have hidden all of the fields for this block.', 'site-reviews');
+            $context['fields'] = __( 'You have hidden all of the fields for this block.', 'site-reviews' );
             $context['response'] = '';
             $context['submit_button'] = '';
             return $context;
@@ -88,15 +88,15 @@ 
      */
     protected function filterRatingField()
     {
-        add_filter('site-reviews/rendered/field', function ($html, $type, $args) {
-            if ('rating' == $args['path']) {
+        add_filter( 'site-reviews/rendered/field', function( $html, $type, $args ) {
+            if( 'rating' == $args['path'] ) {
                 $stars = '<span class="glsr-stars">';
-                $stars.= str_repeat('<span class="glsr-star glsr-star-empty" aria-hidden="true"></span>', (int) glsr()->constant('MAX_RATING', Rating::class));
-                $stars.= '</span>';
-                $html = preg_replace('/(.*)(<select.*)(<\/select>)(.*)/', '$1'.$stars.'$4', $html);
+                $stars .= str_repeat( '<span class="glsr-star glsr-star-empty" aria-hidden="true"></span>', (int)glsr()->constant( 'MAX_RATING', Rating::class ) );
+                $stars .= '</span>';
+                $html = preg_replace( '/(.*)(<select.*)(<\/select>)(.*)/', '$1'.$stars.'$4', $html );
             }
             return $html;
-        }, 10, 3);
+        }, 10, 3 );
     }
 
     /**
@@ -104,7 +104,7 @@ 
      */
     protected function filterShortcodeClass()
     {
-        add_filter('site-reviews/style', function () {
+        add_filter( 'site-reviews/style', function() {
             return 'default';
         });
     }
@@ -114,8 +114,8 @@ 
      */
     protected function filterSubmitButton()
     {
-        add_filter('site-reviews/rendered/template/form/submit-button', function ($template) {
-            return str_replace('type="submit"', 'tabindex="-1"', $template);
+        add_filter( 'site-reviews/rendered/template/form/submit-button', function( $template ) {
+            return str_replace( 'type="submit"', 'tabindex="-1"', $template );
         });
     }
 }

views/pages/welcome/whatsnew.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <p class="about-description">We hope you love the changes in this new release!</p>
 <div class="is-fullwidth">

plugin/Modules/Updater.php

Braces +4 added lines, -2 removed lines

@@ -139,7 +139,8 @@ 
         foreach (glsr()->addons as $addon) {
             try {
                 glsr($addon)->updater->getPluginUpdate(true);
-            } catch (\Exception $e) {
+            }
+            catch (\Exception $e) {
                 glsr_log()->error($e->getMessage());
             }
         }
@@ -198,7 +199,8 @@ 
             unset($transient->no_update[$this->plugin]);
             $updateInfo->update = true;
             $transient->response[$this->plugin] = $updateInfo;
-        } else {
+        }
+        else {
             unset($transient->response[$this->plugin]);
             $transient->no_update[$this->plugin] = $updateInfo;
         }

Indentation +244 added lines, -244 removed lines

@@ -8,266 +8,266 @@
 
 class Updater
 {
-    /**
-     * @var string
-     */
-    protected $apiUrl;
-    /**
-     * @var array
-     */
-    protected $data;
-    /**
-     * @var string
-     */
-    protected $plugin;
-    /**
-     * @var string
-     */
-    protected $transientName;
+	/**
+	 * @var string
+	 */
+	protected $apiUrl;
+	/**
+	 * @var array
+	 */
+	protected $data;
+	/**
+	 * @var string
+	 */
+	protected $plugin;
+	/**
+	 * @var string
+	 */
+	protected $transientName;
 
-    /**
-     * @param string $apiUrl
-     * @param string $file
-     */
-    public function __construct($apiUrl, $file, array $data = [])
-    {
-        if (!function_exists('get_plugin_data')) {
-            require_once ABSPATH.WPINC.'/plugin.php';
-        }
-        $this->apiUrl = trailingslashit(apply_filters('site-reviews/addon/api-url', $apiUrl));
-        $this->data = wp_parse_args($data, get_plugin_data($file));
-        $this->plugin = plugin_basename($file);
-        $this->transientName = Application::PREFIX.md5(Arr::get($data, 'TextDomain'));
-    }
+	/**
+	 * @param string $apiUrl
+	 * @param string $file
+	 */
+	public function __construct($apiUrl, $file, array $data = [])
+	{
+		if (!function_exists('get_plugin_data')) {
+			require_once ABSPATH.WPINC.'/plugin.php';
+		}
+		$this->apiUrl = trailingslashit(apply_filters('site-reviews/addon/api-url', $apiUrl));
+		$this->data = wp_parse_args($data, get_plugin_data($file));
+		$this->plugin = plugin_basename($file);
+		$this->transientName = Application::PREFIX.md5(Arr::get($data, 'TextDomain'));
+	}
 
-    /**
-     * @return object
-     */
-    public function activateLicense(array $data = [])
-    {
-        return $this->request('activate_license', $data);
-    }
+	/**
+	 * @return object
+	 */
+	public function activateLicense(array $data = [])
+	{
+		return $this->request('activate_license', $data);
+	}
 
-    /**
-     * @return object
-     */
-    public function checkLicense(array $data = [])
-    {
-        $response = $this->request('check_license', $data);
-        if ('valid' === Arr::get($response, 'license')) {
-            $this->getPluginUpdate(true);
-        }
-        return $response;
-    }
+	/**
+	 * @return object
+	 */
+	public function checkLicense(array $data = [])
+	{
+		$response = $this->request('check_license', $data);
+		if ('valid' === Arr::get($response, 'license')) {
+			$this->getPluginUpdate(true);
+		}
+		return $response;
+	}
 
-    /**
-     * @return object
-     */
-    public function deactivateLicense(array $data = [])
-    {
-        return $this->request('deactivate_license', $data);
-    }
+	/**
+	 * @return object
+	 */
+	public function deactivateLicense(array $data = [])
+	{
+		return $this->request('deactivate_license', $data);
+	}
 
-    /**
-     * @param false|object|array $result
-     * @param string $action
-     * @param object $args
-     * @return mixed
-     */
-    public function filterPluginUpdateDetails($result, $action, $args)
-    {
-        if ('plugin_information' != $action
-            || Arr::get($this->data, 'TextDomain') != Arr::get($args, 'slug')) {
-            return $result;
-        }
-        if ($updateInfo = $this->getPluginUpdate()) {
-            return $this->modifyUpdateDetails($updateInfo);
-        }
-        return $result;
-    }
+	/**
+	 * @param false|object|array $result
+	 * @param string $action
+	 * @param object $args
+	 * @return mixed
+	 */
+	public function filterPluginUpdateDetails($result, $action, $args)
+	{
+		if ('plugin_information' != $action
+			|| Arr::get($this->data, 'TextDomain') != Arr::get($args, 'slug')) {
+			return $result;
+		}
+		if ($updateInfo = $this->getPluginUpdate()) {
+			return $this->modifyUpdateDetails($updateInfo);
+		}
+		return $result;
+	}
 
-    /**
-     * @param object $transient
-     * @return object
-     */
-    public function filterPluginUpdates($transient)
-    {
-        if ($updateInfo = $this->getPluginUpdate()) {
-            return $this->modifyPluginUpdates($transient, $updateInfo);
-        }
-        return $transient;
-    }
+	/**
+	 * @param object $transient
+	 * @return object
+	 */
+	public function filterPluginUpdates($transient)
+	{
+		if ($updateInfo = $this->getPluginUpdate()) {
+			return $this->modifyPluginUpdates($transient, $updateInfo);
+		}
+		return $transient;
+	}
 
-    /**
-     * @return object
-     */
-    public function getVersion(array $data = [])
-    {
-        return $this->request('get_version', $data);
-    }
+	/**
+	 * @return object
+	 */
+	public function getVersion(array $data = [])
+	{
+		return $this->request('get_version', $data);
+	}
 
-    /**
-     * @return void
-     */
-    public function init()
-    {
-        if ($this->apiUrl === trailingslashit(home_url())) {
-            return;
-        }
-        add_filter('plugins_api',                             [$this, 'filterPluginUpdateDetails'], 10, 3);
-        add_filter('pre_set_site_transient_update_plugins',   [$this, 'filterPluginUpdates'], 999);
-        add_action('load-update-core.php',                    [$this, 'onForceUpdateCheck'], 9);
-        add_action('in_plugin_update_message-'.$this->plugin, [$this, 'renderLicenseMissingLink']);
-    }
+	/**
+	 * @return void
+	 */
+	public function init()
+	{
+		if ($this->apiUrl === trailingslashit(home_url())) {
+			return;
+		}
+		add_filter('plugins_api',                             [$this, 'filterPluginUpdateDetails'], 10, 3);
+		add_filter('pre_set_site_transient_update_plugins',   [$this, 'filterPluginUpdates'], 999);
+		add_action('load-update-core.php',                    [$this, 'onForceUpdateCheck'], 9);
+		add_action('in_plugin_update_message-'.$this->plugin, [$this, 'renderLicenseMissingLink']);
+	}
 
-    /**
-     * @return bool
-     */
-    public function isLicenseValid()
-    {
-        $result = $this->checkLicense();
-        return 'valid' === Arr::get($result, 'license');
-    }
+	/**
+	 * @return bool
+	 */
+	public function isLicenseValid()
+	{
+		$result = $this->checkLicense();
+		return 'valid' === Arr::get($result, 'license');
+	}
 
-    /**
-     * @return void
-     */
-    public function onForceUpdateCheck()
-    {
-        if (!filter_input(INPUT_GET, 'force-check')) {
-            return;
-        }
-        foreach (glsr()->addons as $addon) {
-            try {
-                glsr($addon)->updater->getPluginUpdate(true);
-            } catch (\Exception $e) {
-                glsr_log()->error($e->getMessage());
-            }
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function onForceUpdateCheck()
+	{
+		if (!filter_input(INPUT_GET, 'force-check')) {
+			return;
+		}
+		foreach (glsr()->addons as $addon) {
+			try {
+				glsr($addon)->updater->getPluginUpdate(true);
+			} catch (\Exception $e) {
+				glsr_log()->error($e->getMessage());
+			}
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function renderLicenseMissingLink()
-    {
-        if (!$this->isLicenseValid()) {
-            glsr()->render('partials/addons/license-missing');
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function renderLicenseMissingLink()
+	{
+		if (!$this->isLicenseValid()) {
+			glsr()->render('partials/addons/license-missing');
+		}
+	}
 
-    /**
-     * @return false|object
-     */
-    protected function getCachedVersion()
-    {
-        return get_transient($this->transientName);
-    }
+	/**
+	 * @return false|object
+	 */
+	protected function getCachedVersion()
+	{
+		return get_transient($this->transientName);
+	}
 
-    /**
-     * @param bool $force
-     * @return false|object
-     */
-    protected function getPluginUpdate($force = false)
-    {
-        $version = $this->getCachedVersion();
-        if (false === $version || $force) {
-            $version = $this->getVersion();
-            $this->setCachedVersion($version);
-        }
-        if (isset($version->error)) {
-            glsr_log()->error($version->error);
-            return false;
-        }
-        return $version;
-    }
+	/**
+	 * @param bool $force
+	 * @return false|object
+	 */
+	protected function getPluginUpdate($force = false)
+	{
+		$version = $this->getCachedVersion();
+		if (false === $version || $force) {
+			$version = $this->getVersion();
+			$this->setCachedVersion($version);
+		}
+		if (isset($version->error)) {
+			glsr_log()->error($version->error);
+			return false;
+		}
+		return $version;
+	}
 
-    /**
-     * @param object $transient
-     * @param object $updateInfo
-     * @return object
-     */
-    protected function modifyPluginUpdates($transient, $updateInfo)
-    {
-        $updateInfo->id = Application::ID.'/'.Arr::get($this->data, 'TextDomain');
-        $updateInfo->plugin = $this->plugin;
-        $updateInfo->requires_php = Arr::get($this->data, 'RequiresPHP');
-        $updateInfo->tested = Arr::get($this->data, 'testedTo');
-        $transient->checked[$this->plugin] = Arr::get($this->data, 'Version');
-        $transient->last_checked = time();
-        if (Helper::isGreaterThan($updateInfo->new_version, Arr::get($this->data, 'Version'))) {
-            unset($transient->no_update[$this->plugin]);
-            $updateInfo->update = true;
-            $transient->response[$this->plugin] = $updateInfo;
-        } else {
-            unset($transient->response[$this->plugin]);
-            $transient->no_update[$this->plugin] = $updateInfo;
-        }
-        return $transient;
-    }
+	/**
+	 * @param object $transient
+	 * @param object $updateInfo
+	 * @return object
+	 */
+	protected function modifyPluginUpdates($transient, $updateInfo)
+	{
+		$updateInfo->id = Application::ID.'/'.Arr::get($this->data, 'TextDomain');
+		$updateInfo->plugin = $this->plugin;
+		$updateInfo->requires_php = Arr::get($this->data, 'RequiresPHP');
+		$updateInfo->tested = Arr::get($this->data, 'testedTo');
+		$transient->checked[$this->plugin] = Arr::get($this->data, 'Version');
+		$transient->last_checked = time();
+		if (Helper::isGreaterThan($updateInfo->new_version, Arr::get($this->data, 'Version'))) {
+			unset($transient->no_update[$this->plugin]);
+			$updateInfo->update = true;
+			$transient->response[$this->plugin] = $updateInfo;
+		} else {
+			unset($transient->response[$this->plugin]);
+			$transient->no_update[$this->plugin] = $updateInfo;
+		}
+		return $transient;
+	}
 
-    /**
-     * @param object $updateInfo
-     * @return object
-     */
-    protected function modifyUpdateDetails($updateInfo)
-    {
-        $updateInfo->author = Arr::get($this->data, 'Author');
-        $updateInfo->author_profile = Arr::get($this->data, 'AuthorURI');
-        $updateInfo->requires = Arr::get($this->data, 'RequiresWP');
-        $updateInfo->requires_php = Arr::get($this->data, 'RequiresPHP');
-        $updateInfo->tested = Arr::get($this->data, 'testedTo');
-        $updateInfo->version = $updateInfo->new_version;
-        return $updateInfo;
-    }
+	/**
+	 * @param object $updateInfo
+	 * @return object
+	 */
+	protected function modifyUpdateDetails($updateInfo)
+	{
+		$updateInfo->author = Arr::get($this->data, 'Author');
+		$updateInfo->author_profile = Arr::get($this->data, 'AuthorURI');
+		$updateInfo->requires = Arr::get($this->data, 'RequiresWP');
+		$updateInfo->requires_php = Arr::get($this->data, 'RequiresPHP');
+		$updateInfo->tested = Arr::get($this->data, 'testedTo');
+		$updateInfo->version = $updateInfo->new_version;
+		return $updateInfo;
+	}
 
-    /**
-     * @param \WP_Error|array $response
-     * @return object
-     */
-    protected function normalizeResponse($response)
-    {
-        $body = wp_remote_retrieve_body($response);
-        if ($data = json_decode($body)) {
-            $data = array_map('maybe_unserialize', (array) $data);
-            return (object) $data;
-        }
-        $error = is_wp_error($response)
-            ? $response->get_error_message()
-            : 'Update server not responding ('.Arr::get($this->data, 'TextDomain').')';
-        return (object) ['error' => $error];
-    }
+	/**
+	 * @param \WP_Error|array $response
+	 * @return object
+	 */
+	protected function normalizeResponse($response)
+	{
+		$body = wp_remote_retrieve_body($response);
+		if ($data = json_decode($body)) {
+			$data = array_map('maybe_unserialize', (array) $data);
+			return (object) $data;
+		}
+		$error = is_wp_error($response)
+			? $response->get_error_message()
+			: 'Update server not responding ('.Arr::get($this->data, 'TextDomain').')';
+		return (object) ['error' => $error];
+	}
 
-    /**
-     * @param string $action activate_license|check_license|deactivate_license|get_version
-     * @return object
-     */
-    protected function request($action, array $data = [])
-    {
-        $data = wp_parse_args($data, $this->data);
-        $response = wp_remote_post($this->apiUrl, [
-            'body' => [
-                'edd_action' => $action,
-                'item_id' => Arr::get($data, 'item_id'),
-                'item_name' => Arr::get($data, 'Name'),
-                'license' => Arr::get($data, 'license'),
-                'slug' => Arr::get($data, 'TextDomain'),
-                'url' => home_url(),
-            ],
-            'sslverify' => apply_filters('site-reviews/sslverify/post', false),
-            'timeout' => 15,
-        ]);
-        return $this->normalizeResponse($response);
-    }
+	/**
+	 * @param string $action activate_license|check_license|deactivate_license|get_version
+	 * @return object
+	 */
+	protected function request($action, array $data = [])
+	{
+		$data = wp_parse_args($data, $this->data);
+		$response = wp_remote_post($this->apiUrl, [
+			'body' => [
+				'edd_action' => $action,
+				'item_id' => Arr::get($data, 'item_id'),
+				'item_name' => Arr::get($data, 'Name'),
+				'license' => Arr::get($data, 'license'),
+				'slug' => Arr::get($data, 'TextDomain'),
+				'url' => home_url(),
+			],
+			'sslverify' => apply_filters('site-reviews/sslverify/post', false),
+			'timeout' => 15,
+		]);
+		return $this->normalizeResponse($response);
+	}
 
-    /**
-     * @param object $version
-     * @return void
-     */
-    protected function setCachedVersion($version)
-    {
-        if (!isset($version->error)) {
-            set_transient($this->transientName, $version, 3 * HOUR_IN_SECONDS);
-        }
-    }
+	/**
+	 * @param object $version
+	 * @return void
+	 */
+	protected function setCachedVersion($version)
+	{
+		if (!isset($version->error)) {
+			set_transient($this->transientName, $version, 3 * HOUR_IN_SECONDS);
+		}
+	}
 }

Spacing +76 added lines, -76 removed lines

@@ -29,33 +29,33 @@ 
      * @param string $apiUrl
      * @param string $file
      */
-    public function __construct($apiUrl, $file, array $data = [])
+    public function __construct( $apiUrl, $file, array $data = [] )
     {
-        if (!function_exists('get_plugin_data')) {
+        if( !function_exists( 'get_plugin_data' ) ) {
             require_once ABSPATH.WPINC.'/plugin.php';
         }
-        $this->apiUrl = trailingslashit(apply_filters('site-reviews/addon/api-url', $apiUrl));
-        $this->data = wp_parse_args($data, get_plugin_data($file));
-        $this->plugin = plugin_basename($file);
-        $this->transientName = Application::PREFIX.md5(Arr::get($data, 'TextDomain'));
+        $this->apiUrl = trailingslashit( apply_filters( 'site-reviews/addon/api-url', $apiUrl ) );
+        $this->data = wp_parse_args( $data, get_plugin_data( $file ) );
+        $this->plugin = plugin_basename( $file );
+        $this->transientName = Application::PREFIX.md5( Arr::get( $data, 'TextDomain' ) );
     }
 
     /**
      * @return object
      */
-    public function activateLicense(array $data = [])
+    public function activateLicense( array $data = [] )
     {
-        return $this->request('activate_license', $data);
+        return $this->request( 'activate_license', $data );
     }
 
     /**
      * @return object
      */
-    public function checkLicense(array $data = [])
+    public function checkLicense( array $data = [] )
     {
-        $response = $this->request('check_license', $data);
-        if ('valid' === Arr::get($response, 'license')) {
-            $this->getPluginUpdate(true);
+        $response = $this->request( 'check_license', $data );
+        if( 'valid' === Arr::get( $response, 'license' ) ) {
+            $this->getPluginUpdate( true );
         }
         return $response;
     }
@@ -63,9 +63,9 @@ 
     /**
      * @return object
      */
-    public function deactivateLicense(array $data = [])
+    public function deactivateLicense( array $data = [] )
     {
-        return $this->request('deactivate_license', $data);
+        return $this->request( 'deactivate_license', $data );
     }
 
     /**
@@ -74,14 +74,14 @@ 
      * @param object $args
      * @return mixed
      */
-    public function filterPluginUpdateDetails($result, $action, $args)
+    public function filterPluginUpdateDetails( $result, $action, $args )
     {
-        if ('plugin_information' != $action
-            || Arr::get($this->data, 'TextDomain') != Arr::get($args, 'slug')) {
+        if( 'plugin_information' != $action
+            || Arr::get( $this->data, 'TextDomain' ) != Arr::get( $args, 'slug' ) ) {
             return $result;
         }
-        if ($updateInfo = $this->getPluginUpdate()) {
-            return $this->modifyUpdateDetails($updateInfo);
+        if( $updateInfo = $this->getPluginUpdate() ) {
+            return $this->modifyUpdateDetails( $updateInfo );
         }
         return $result;
     }
@@ -90,10 +90,10 @@ 
      * @param object $transient
      * @return object
      */
-    public function filterPluginUpdates($transient)
+    public function filterPluginUpdates( $transient )
     {
-        if ($updateInfo = $this->getPluginUpdate()) {
-            return $this->modifyPluginUpdates($transient, $updateInfo);
+        if( $updateInfo = $this->getPluginUpdate() ) {
+            return $this->modifyPluginUpdates( $transient, $updateInfo );
         }
         return $transient;
     }
@@ -101,9 +101,9 @@ 
     /**
      * @return object
      */
-    public function getVersion(array $data = [])
+    public function getVersion( array $data = [] )
     {
-        return $this->request('get_version', $data);
+        return $this->request( 'get_version', $data );
     }
 
     /**
@@ -111,13 +111,13 @@ 
      */
     public function init()
     {
-        if ($this->apiUrl === trailingslashit(home_url())) {
+        if( $this->apiUrl === trailingslashit( home_url() ) ) {
             return;
         }
-        add_filter('plugins_api',                             [$this, 'filterPluginUpdateDetails'], 10, 3);
-        add_filter('pre_set_site_transient_update_plugins',   [$this, 'filterPluginUpdates'], 999);
-        add_action('load-update-core.php',                    [$this, 'onForceUpdateCheck'], 9);
-        add_action('in_plugin_update_message-'.$this->plugin, [$this, 'renderLicenseMissingLink']);
+        add_filter( 'plugins_api', [$this, 'filterPluginUpdateDetails'], 10, 3 );
+        add_filter( 'pre_set_site_transient_update_plugins', [$this, 'filterPluginUpdates'], 999 );
+        add_action( 'load-update-core.php', [$this, 'onForceUpdateCheck'], 9 );
+        add_action( 'in_plugin_update_message-'.$this->plugin, [$this, 'renderLicenseMissingLink'] );
     }
 
     /**
@@ -126,7 +126,7 @@ 
     public function isLicenseValid()
     {
         $result = $this->checkLicense();
-        return 'valid' === Arr::get($result, 'license');
+        return 'valid' === Arr::get( $result, 'license' );
     }
 
     /**
@@ -134,14 +134,14 @@ 
      */
     public function onForceUpdateCheck()
     {
-        if (!filter_input(INPUT_GET, 'force-check')) {
+        if( !filter_input( INPUT_GET, 'force-check' ) ) {
             return;
         }
-        foreach (glsr()->addons as $addon) {
+        foreach( glsr()->addons as $addon ) {
             try {
-                glsr($addon)->updater->getPluginUpdate(true);
-            } catch (\Exception $e) {
-                glsr_log()->error($e->getMessage());
+                glsr( $addon )->updater->getPluginUpdate( true );
+            } catch( \Exception $e ) {
+                glsr_log()->error( $e->getMessage() );
             }
         }
     }
@@ -151,8 +151,8 @@ 
      */
     public function renderLicenseMissingLink()
     {
-        if (!$this->isLicenseValid()) {
-            glsr()->render('partials/addons/license-missing');
+        if( !$this->isLicenseValid() ) {
+            glsr()->render( 'partials/addons/license-missing' );
         }
     }
 
@@ -161,22 +161,22 @@ 
      */
     protected function getCachedVersion()
     {
-        return get_transient($this->transientName);
+        return get_transient( $this->transientName );
     }
 
     /**
      * @param bool $force
      * @return false|object
      */
-    protected function getPluginUpdate($force = false)
+    protected function getPluginUpdate( $force = false )
     {
         $version = $this->getCachedVersion();
-        if (false === $version || $force) {
+        if( false === $version || $force ) {
             $version = $this->getVersion();
-            $this->setCachedVersion($version);
+            $this->setCachedVersion( $version );
         }
-        if (isset($version->error)) {
-            glsr_log()->error($version->error);
+        if( isset($version->error) ) {
+            glsr_log()->error( $version->error );
             return false;
         }
         return $version;
@@ -187,15 +187,15 @@ 
      * @param object $updateInfo
      * @return object
      */
-    protected function modifyPluginUpdates($transient, $updateInfo)
+    protected function modifyPluginUpdates( $transient, $updateInfo )
     {
-        $updateInfo->id = Application::ID.'/'.Arr::get($this->data, 'TextDomain');
+        $updateInfo->id = Application::ID.'/'.Arr::get( $this->data, 'TextDomain' );
         $updateInfo->plugin = $this->plugin;
-        $updateInfo->requires_php = Arr::get($this->data, 'RequiresPHP');
-        $updateInfo->tested = Arr::get($this->data, 'testedTo');
-        $transient->checked[$this->plugin] = Arr::get($this->data, 'Version');
+        $updateInfo->requires_php = Arr::get( $this->data, 'RequiresPHP' );
+        $updateInfo->tested = Arr::get( $this->data, 'testedTo' );
+        $transient->checked[$this->plugin] = Arr::get( $this->data, 'Version' );
         $transient->last_checked = time();
-        if (Helper::isGreaterThan($updateInfo->new_version, Arr::get($this->data, 'Version'))) {
+        if( Helper::isGreaterThan( $updateInfo->new_version, Arr::get( $this->data, 'Version' ) ) ) {
             unset($transient->no_update[$this->plugin]);
             $updateInfo->update = true;
             $transient->response[$this->plugin] = $updateInfo;
@@ -210,13 +210,13 @@ 
      * @param object $updateInfo
      * @return object
      */
-    protected function modifyUpdateDetails($updateInfo)
+    protected function modifyUpdateDetails( $updateInfo )
     {
-        $updateInfo->author = Arr::get($this->data, 'Author');
-        $updateInfo->author_profile = Arr::get($this->data, 'AuthorURI');
-        $updateInfo->requires = Arr::get($this->data, 'RequiresWP');
-        $updateInfo->requires_php = Arr::get($this->data, 'RequiresPHP');
-        $updateInfo->tested = Arr::get($this->data, 'testedTo');
+        $updateInfo->author = Arr::get( $this->data, 'Author' );
+        $updateInfo->author_profile = Arr::get( $this->data, 'AuthorURI' );
+        $updateInfo->requires = Arr::get( $this->data, 'RequiresWP' );
+        $updateInfo->requires_php = Arr::get( $this->data, 'RequiresPHP' );
+        $updateInfo->tested = Arr::get( $this->data, 'testedTo' );
         $updateInfo->version = $updateInfo->new_version;
         return $updateInfo;
     }
@@ -225,49 +225,49 @@ 
      * @param \WP_Error|array $response
      * @return object
      */
-    protected function normalizeResponse($response)
+    protected function normalizeResponse( $response )
     {
-        $body = wp_remote_retrieve_body($response);
-        if ($data = json_decode($body)) {
-            $data = array_map('maybe_unserialize', (array) $data);
-            return (object) $data;
+        $body = wp_remote_retrieve_body( $response );
+        if( $data = json_decode( $body ) ) {
+            $data = array_map( 'maybe_unserialize', (array)$data );
+            return (object)$data;
         }
-        $error = is_wp_error($response)
+        $error = is_wp_error( $response )
             ? $response->get_error_message()
-            : 'Update server not responding ('.Arr::get($this->data, 'TextDomain').')';
-        return (object) ['error' => $error];
+            : 'Update server not responding ('.Arr::get( $this->data, 'TextDomain' ).')';
+        return (object)['error' => $error];
     }
 
     /**
      * @param string $action activate_license|check_license|deactivate_license|get_version
      * @return object
      */
-    protected function request($action, array $data = [])
+    protected function request( $action, array $data = [] )
     {
-        $data = wp_parse_args($data, $this->data);
-        $response = wp_remote_post($this->apiUrl, [
+        $data = wp_parse_args( $data, $this->data );
+        $response = wp_remote_post( $this->apiUrl, [
             'body' => [
                 'edd_action' => $action,
-                'item_id' => Arr::get($data, 'item_id'),
-                'item_name' => Arr::get($data, 'Name'),
-                'license' => Arr::get($data, 'license'),
-                'slug' => Arr::get($data, 'TextDomain'),
+                'item_id' => Arr::get( $data, 'item_id' ),
+                'item_name' => Arr::get( $data, 'Name' ),
+                'license' => Arr::get( $data, 'license' ),
+                'slug' => Arr::get( $data, 'TextDomain' ),
                 'url' => home_url(),
             ],
-            'sslverify' => apply_filters('site-reviews/sslverify/post', false),
+            'sslverify' => apply_filters( 'site-reviews/sslverify/post', false ),
             'timeout' => 15,
-        ]);
-        return $this->normalizeResponse($response);
+        ] );
+        return $this->normalizeResponse( $response );
     }
 
     /**
      * @param object $version
      * @return void
      */
-    protected function setCachedVersion($version)
+    protected function setCachedVersion( $version )
     {
-        if (!isset($version->error)) {
-            set_transient($this->transientName, $version, 3 * HOUR_IN_SECONDS);
+        if( !isset($version->error) ) {
+            set_transient( $this->transientName, $version, 3 * HOUR_IN_SECONDS );
         }
     }
 }

plugin/Controllers/ReviewController.php

Braces +2 added lines, -1 removed lines

@@ -64,7 +64,8 @@
         $review = glsr_get_review($post);
         if ('publish' == $post->post_status) {
             glsr(CountsManager::class)->increaseAll($review);
-        } else {
+        }
+        else {
             glsr(CountsManager::class)->decreaseAll($review);
         }
     }

Indentation +148 added lines, -148 removed lines

@@ -16,159 +16,159 @@
 
 class ReviewController extends Controller
 {
-    /**
-     * Triggered when a category is added to a review.
-     *
-     * @param int $postId
-     * @param array $terms
-     * @param array $newTTIds
-     * @param string $taxonomy
-     * @param bool $append
-     * @param array $oldTTIds
-     * @return void
-     * @action set_object_terms
-     */
-    public function onAfterChangeCategory($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds)
-    {
-        sort($newTTIds);
-        sort($oldTTIds);
-        if ($newTTIds === $oldTTIds || !$this->isReviewPostId($postId)) {
-            return;
-        }
-        $review = glsr_get_review($postId);
-        if ('publish' !== $review->status) {
-            return;
-        }
-        $ignoredIds = array_intersect($oldTTIds, $newTTIds);
-        $decreasedIds = array_diff($oldTTIds, $ignoredIds);
-        $increasedIds = array_diff($newTTIds, $ignoredIds);
-        if ($review->term_ids = glsr(Database::class)->getTermIds($decreasedIds, 'term_taxonomy_id')) {
-            glsr(TermCountsManager::class)->decrease($review);
-        }
-        if ($review->term_ids = glsr(Database::class)->getTermIds($increasedIds, 'term_taxonomy_id')) {
-            glsr(TermCountsManager::class)->increase($review);
-        }
-    }
+	/**
+	 * Triggered when a category is added to a review.
+	 *
+	 * @param int $postId
+	 * @param array $terms
+	 * @param array $newTTIds
+	 * @param string $taxonomy
+	 * @param bool $append
+	 * @param array $oldTTIds
+	 * @return void
+	 * @action set_object_terms
+	 */
+	public function onAfterChangeCategory($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds)
+	{
+		sort($newTTIds);
+		sort($oldTTIds);
+		if ($newTTIds === $oldTTIds || !$this->isReviewPostId($postId)) {
+			return;
+		}
+		$review = glsr_get_review($postId);
+		if ('publish' !== $review->status) {
+			return;
+		}
+		$ignoredIds = array_intersect($oldTTIds, $newTTIds);
+		$decreasedIds = array_diff($oldTTIds, $ignoredIds);
+		$increasedIds = array_diff($newTTIds, $ignoredIds);
+		if ($review->term_ids = glsr(Database::class)->getTermIds($decreasedIds, 'term_taxonomy_id')) {
+			glsr(TermCountsManager::class)->decrease($review);
+		}
+		if ($review->term_ids = glsr(Database::class)->getTermIds($increasedIds, 'term_taxonomy_id')) {
+			glsr(TermCountsManager::class)->increase($review);
+		}
+	}
 
-    /**
-     * Triggered when an existing review is approved|unapproved.
-     *
-     * @param string $oldStatus
-     * @param string $newStatus
-     * @param \WP_Post $post
-     * @return void
-     * @action transition_post_status
-     */
-    public function onAfterChangeStatus($newStatus, $oldStatus, $post)
-    {
-        if (Application::POST_TYPE != Arr::get($post, 'post_type') 
-            || in_array($oldStatus, ['new', $newStatus])) {
-            return;
-        }
-        $review = glsr_get_review($post);
-        if ('publish' == $post->post_status) {
-            glsr(CountsManager::class)->increaseAll($review);
-        } else {
-            glsr(CountsManager::class)->decreaseAll($review);
-        }
-    }
+	/**
+	 * Triggered when an existing review is approved|unapproved.
+	 *
+	 * @param string $oldStatus
+	 * @param string $newStatus
+	 * @param \WP_Post $post
+	 * @return void
+	 * @action transition_post_status
+	 */
+	public function onAfterChangeStatus($newStatus, $oldStatus, $post)
+	{
+		if (Application::POST_TYPE != Arr::get($post, 'post_type') 
+			|| in_array($oldStatus, ['new', $newStatus])) {
+			return;
+		}
+		$review = glsr_get_review($post);
+		if ('publish' == $post->post_status) {
+			glsr(CountsManager::class)->increaseAll($review);
+		} else {
+			glsr(CountsManager::class)->decreaseAll($review);
+		}
+	}
 
-    /**
-     * Triggered when a review is first created.
-     *
-     * @return void
-     * @action site-reviews/review/created
-     */
-    public function onAfterCreate(Review $review)
-    {
-        if ('publish' !== $review->status) {
-            return;
-        }
-        glsr(GlobalCountsManager::class)->increase($review);
-        glsr(PostCountsManager::class)->increase($review);
-    }
+	/**
+	 * Triggered when a review is first created.
+	 *
+	 * @return void
+	 * @action site-reviews/review/created
+	 */
+	public function onAfterCreate(Review $review)
+	{
+		if ('publish' !== $review->status) {
+			return;
+		}
+		glsr(GlobalCountsManager::class)->increase($review);
+		glsr(PostCountsManager::class)->increase($review);
+	}
 
-    /**
-     * Triggered when a review is deleted.
-     *
-     * @param int $postId
-     * @return void
-     * @action before_delete_post
-     */
-    public function onBeforeDelete($postId)
-    {
-        if (!$this->isReviewPostId($postId)) {
-            return;
-        }
-        $review = glsr_get_review($postId);
-        if ('trash' !== $review->status) { // do not run for trashed posts
-            glsr(CountsManager::class)->decreaseAll($review);
-        }
-    }
+	/**
+	 * Triggered when a review is deleted.
+	 *
+	 * @param int $postId
+	 * @return void
+	 * @action before_delete_post
+	 */
+	public function onBeforeDelete($postId)
+	{
+		if (!$this->isReviewPostId($postId)) {
+			return;
+		}
+		$review = glsr_get_review($postId);
+		if ('trash' !== $review->status) { // do not run for trashed posts
+			glsr(CountsManager::class)->decreaseAll($review);
+		}
+	}
 
-    /**
-     * Triggered when a review's rating, assigned_to, or review_type is changed.
-     *
-     * @param int $metaId
-     * @param int $postId
-     * @param string $metaKey
-     * @param mixed $metaValue
-     * @return void
-     * @action update_postmeta
-     */
-    public function onBeforeUpdate($metaId, $postId, $metaKey, $metaValue)
-    {
-        if (!$this->isReviewPostId($postId)) {
-            return;
-        }
-        $metaKey = Str::removePrefix('_', $metaKey);
-        if (!in_array($metaKey, ['assigned_to', 'rating', 'review_type'])) {
-            return;
-        }
-        $review = glsr_get_review($postId);
-        if ($review->$metaKey == $metaValue) {
-            return;
-        }
-        $method = Helper::buildMethodName($metaKey, 'onBeforeChange');
-        call_user_func([$this, $method], $review, $metaValue);
-    }
+	/**
+	 * Triggered when a review's rating, assigned_to, or review_type is changed.
+	 *
+	 * @param int $metaId
+	 * @param int $postId
+	 * @param string $metaKey
+	 * @param mixed $metaValue
+	 * @return void
+	 * @action update_postmeta
+	 */
+	public function onBeforeUpdate($metaId, $postId, $metaKey, $metaValue)
+	{
+		if (!$this->isReviewPostId($postId)) {
+			return;
+		}
+		$metaKey = Str::removePrefix('_', $metaKey);
+		if (!in_array($metaKey, ['assigned_to', 'rating', 'review_type'])) {
+			return;
+		}
+		$review = glsr_get_review($postId);
+		if ($review->$metaKey == $metaValue) {
+			return;
+		}
+		$method = Helper::buildMethodName($metaKey, 'onBeforeChange');
+		call_user_func([$this, $method], $review, $metaValue);
+	}
 
-    /**
-     * Triggered by the onBeforeUpdate method.
-     *
-     * @param string|int $assignedTo
-     * @return void
-     */
-    protected function onBeforeChangeAssignedTo(Review $review, $assignedTo)
-    {
-        glsr(PostCountsManager::class)->decrease($review);
-        $review->assigned_to = $assignedTo;
-        glsr(PostCountsManager::class)->increase($review);
-    }
+	/**
+	 * Triggered by the onBeforeUpdate method.
+	 *
+	 * @param string|int $assignedTo
+	 * @return void
+	 */
+	protected function onBeforeChangeAssignedTo(Review $review, $assignedTo)
+	{
+		glsr(PostCountsManager::class)->decrease($review);
+		$review->assigned_to = $assignedTo;
+		glsr(PostCountsManager::class)->increase($review);
+	}
 
-    /**
-     * Triggered by the onBeforeUpdate method.
-     *
-     * @param string|int $rating
-     * @return void
-     */
-    protected function onBeforeChangeRating(Review $review, $rating)
-    {
-        glsr(CountsManager::class)->decreaseAll($review);
-        $review->rating = $rating;
-        glsr(CountsManager::class)->increaseAll($review);
-    }
+	/**
+	 * Triggered by the onBeforeUpdate method.
+	 *
+	 * @param string|int $rating
+	 * @return void
+	 */
+	protected function onBeforeChangeRating(Review $review, $rating)
+	{
+		glsr(CountsManager::class)->decreaseAll($review);
+		$review->rating = $rating;
+		glsr(CountsManager::class)->increaseAll($review);
+	}
 
-    /**
-     * Triggered by the onBeforeUpdate method.
-     *
-     * @param string $reviewType
-     * @return void
-     */
-    protected function onBeforeChangeReviewType(Review $review, $reviewType)
-    {
-        glsr(CountsManager::class)->decreaseAll($review);
-        $review->review_type = $reviewType;
-        glsr(CountsManager::class)->increaseAll($review);
-    }
+	/**
+	 * Triggered by the onBeforeUpdate method.
+	 *
+	 * @param string $reviewType
+	 * @return void
+	 */
+	protected function onBeforeChangeReviewType(Review $review, $reviewType)
+	{
+		glsr(CountsManager::class)->decreaseAll($review);
+		$review->review_type = $reviewType;
+		glsr(CountsManager::class)->increaseAll($review);
+	}
 }

Spacing +46 added lines, -46 removed lines

@@ -28,25 +28,25 @@ 
      * @return void
      * @action set_object_terms
      */
-    public function onAfterChangeCategory($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds)
+    public function onAfterChangeCategory( $postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds )
     {
-        sort($newTTIds);
-        sort($oldTTIds);
-        if ($newTTIds === $oldTTIds || !$this->isReviewPostId($postId)) {
+        sort( $newTTIds );
+        sort( $oldTTIds );
+        if( $newTTIds === $oldTTIds || !$this->isReviewPostId( $postId ) ) {
             return;
         }
-        $review = glsr_get_review($postId);
-        if ('publish' !== $review->status) {
+        $review = glsr_get_review( $postId );
+        if( 'publish' !== $review->status ) {
             return;
         }
-        $ignoredIds = array_intersect($oldTTIds, $newTTIds);
-        $decreasedIds = array_diff($oldTTIds, $ignoredIds);
-        $increasedIds = array_diff($newTTIds, $ignoredIds);
-        if ($review->term_ids = glsr(Database::class)->getTermIds($decreasedIds, 'term_taxonomy_id')) {
-            glsr(TermCountsManager::class)->decrease($review);
+        $ignoredIds = array_intersect( $oldTTIds, $newTTIds );
+        $decreasedIds = array_diff( $oldTTIds, $ignoredIds );
+        $increasedIds = array_diff( $newTTIds, $ignoredIds );
+        if( $review->term_ids = glsr( Database::class )->getTermIds( $decreasedIds, 'term_taxonomy_id' ) ) {
+            glsr( TermCountsManager::class )->decrease( $review );
         }
-        if ($review->term_ids = glsr(Database::class)->getTermIds($increasedIds, 'term_taxonomy_id')) {
-            glsr(TermCountsManager::class)->increase($review);
+        if( $review->term_ids = glsr( Database::class )->getTermIds( $increasedIds, 'term_taxonomy_id' ) ) {
+            glsr( TermCountsManager::class )->increase( $review );
         }
     }
 
@@ -59,17 +59,17 @@ 
      * @return void
      * @action transition_post_status
      */
-    public function onAfterChangeStatus($newStatus, $oldStatus, $post)
+    public function onAfterChangeStatus( $newStatus, $oldStatus, $post )
     {
-        if (Application::POST_TYPE != Arr::get($post, 'post_type') 
-            || in_array($oldStatus, ['new', $newStatus])) {
+        if( Application::POST_TYPE != Arr::get( $post, 'post_type' ) 
+            || in_array( $oldStatus, ['new', $newStatus] ) ) {
             return;
         }
-        $review = glsr_get_review($post);
-        if ('publish' == $post->post_status) {
-            glsr(CountsManager::class)->increaseAll($review);
+        $review = glsr_get_review( $post );
+        if( 'publish' == $post->post_status ) {
+            glsr( CountsManager::class )->increaseAll( $review );
         } else {
-            glsr(CountsManager::class)->decreaseAll($review);
+            glsr( CountsManager::class )->decreaseAll( $review );
         }
     }
 
@@ -79,13 +79,13 @@ 
      * @return void
      * @action site-reviews/review/created
      */
-    public function onAfterCreate(Review $review)
+    public function onAfterCreate( Review $review )
     {
-        if ('publish' !== $review->status) {
+        if( 'publish' !== $review->status ) {
             return;
         }
-        glsr(GlobalCountsManager::class)->increase($review);
-        glsr(PostCountsManager::class)->increase($review);
+        glsr( GlobalCountsManager::class )->increase( $review );
+        glsr( PostCountsManager::class )->increase( $review );
     }
 
     /**
@@ -95,14 +95,14 @@ 
      * @return void
      * @action before_delete_post
      */
-    public function onBeforeDelete($postId)
+    public function onBeforeDelete( $postId )
     {
-        if (!$this->isReviewPostId($postId)) {
+        if( !$this->isReviewPostId( $postId ) ) {
             return;
         }
-        $review = glsr_get_review($postId);
-        if ('trash' !== $review->status) { // do not run for trashed posts
-            glsr(CountsManager::class)->decreaseAll($review);
+        $review = glsr_get_review( $postId );
+        if( 'trash' !== $review->status ) { // do not run for trashed posts
+            glsr( CountsManager::class )->decreaseAll( $review );
         }
     }
 
@@ -116,21 +116,21 @@ 
      * @return void
      * @action update_postmeta
      */
-    public function onBeforeUpdate($metaId, $postId, $metaKey, $metaValue)
+    public function onBeforeUpdate( $metaId, $postId, $metaKey, $metaValue )
     {
-        if (!$this->isReviewPostId($postId)) {
+        if( !$this->isReviewPostId( $postId ) ) {
             return;
         }
-        $metaKey = Str::removePrefix('_', $metaKey);
-        if (!in_array($metaKey, ['assigned_to', 'rating', 'review_type'])) {
+        $metaKey = Str::removePrefix( '_', $metaKey );
+        if( !in_array( $metaKey, ['assigned_to', 'rating', 'review_type'] ) ) {
             return;
         }
-        $review = glsr_get_review($postId);
-        if ($review->$metaKey == $metaValue) {
+        $review = glsr_get_review( $postId );
+        if( $review->$metaKey == $metaValue ) {
             return;
         }
-        $method = Helper::buildMethodName($metaKey, 'onBeforeChange');
-        call_user_func([$this, $method], $review, $metaValue);
+        $method = Helper::buildMethodName( $metaKey, 'onBeforeChange' );
+        call_user_func( [$this, $method], $review, $metaValue );
     }
 
     /**
@@ -139,11 +139,11 @@ 
      * @param string|int $assignedTo
      * @return void
      */
-    protected function onBeforeChangeAssignedTo(Review $review, $assignedTo)
+    protected function onBeforeChangeAssignedTo( Review $review, $assignedTo )
     {
-        glsr(PostCountsManager::class)->decrease($review);
+        glsr( PostCountsManager::class )->decrease( $review );
         $review->assigned_to = $assignedTo;
-        glsr(PostCountsManager::class)->increase($review);
+        glsr( PostCountsManager::class )->increase( $review );
     }
 
     /**
@@ -152,11 +152,11 @@ 
      * @param string|int $rating
      * @return void
      */
-    protected function onBeforeChangeRating(Review $review, $rating)
+    protected function onBeforeChangeRating( Review $review, $rating )
     {
-        glsr(CountsManager::class)->decreaseAll($review);
+        glsr( CountsManager::class )->decreaseAll( $review );
         $review->rating = $rating;
-        glsr(CountsManager::class)->increaseAll($review);
+        glsr( CountsManager::class )->increaseAll( $review );
     }
 
     /**
@@ -165,10 +165,10 @@ 
      * @param string $reviewType
      * @return void
      */
-    protected function onBeforeChangeReviewType(Review $review, $reviewType)
+    protected function onBeforeChangeReviewType( Review $review, $reviewType )
     {
-        glsr(CountsManager::class)->decreaseAll($review);
+        glsr( CountsManager::class )->decreaseAll( $review );
         $review->review_type = $reviewType;
-        glsr(CountsManager::class)->increaseAll($review);
+        glsr( CountsManager::class )->increaseAll( $review );
     }
 }

plugin/Database/ReviewManager.php

Indentation +190 added lines, -190 removed lines

@@ -16,204 +16,204 @@
 
 class ReviewManager
 {
-    /**
-     * @return false|Review
-     */
-    public function create(CreateReview $command)
-    {
-        $reviewValues = glsr(CreateReviewDefaults::class)->restrict((array) $command);
-        $reviewValues = apply_filters('site-reviews/create/review-values', $reviewValues, $command);
-        $reviewValues = Arr::prefixArrayKeys($reviewValues);
-        unset($reviewValues['json']); // @todo remove the need for this
-        $postValues = [
-            'comment_status' => 'closed',
-            'meta_input' => $reviewValues,
-            'ping_status' => 'closed',
-            'post_content' => $reviewValues['_content'],
-            'post_date' => $reviewValues['_date'],
-            'post_date_gmt' => get_gmt_from_date($reviewValues['_date']),
-            'post_name' => $reviewValues['_review_type'].'-'.$reviewValues['_review_id'],
-            'post_status' => $this->getNewPostStatus($reviewValues, $command->blacklisted),
-            'post_title' => $reviewValues['_title'],
-            'post_type' => Application::POST_TYPE,
-        ];
-        $postId = wp_insert_post($postValues, true);
-        if (is_wp_error($postId)) {
-            glsr_log()->error($postId->get_error_message())->debug($postValues);
-            return false;
-        }
-        $this->setTerms($postId, $command->category);
-        $review = $this->single(get_post($postId));
-        do_action('site-reviews/review/created', $review, $command);
-        return $review;
-    }
+	/**
+	 * @return false|Review
+	 */
+	public function create(CreateReview $command)
+	{
+		$reviewValues = glsr(CreateReviewDefaults::class)->restrict((array) $command);
+		$reviewValues = apply_filters('site-reviews/create/review-values', $reviewValues, $command);
+		$reviewValues = Arr::prefixArrayKeys($reviewValues);
+		unset($reviewValues['json']); // @todo remove the need for this
+		$postValues = [
+			'comment_status' => 'closed',
+			'meta_input' => $reviewValues,
+			'ping_status' => 'closed',
+			'post_content' => $reviewValues['_content'],
+			'post_date' => $reviewValues['_date'],
+			'post_date_gmt' => get_gmt_from_date($reviewValues['_date']),
+			'post_name' => $reviewValues['_review_type'].'-'.$reviewValues['_review_id'],
+			'post_status' => $this->getNewPostStatus($reviewValues, $command->blacklisted),
+			'post_title' => $reviewValues['_title'],
+			'post_type' => Application::POST_TYPE,
+		];
+		$postId = wp_insert_post($postValues, true);
+		if (is_wp_error($postId)) {
+			glsr_log()->error($postId->get_error_message())->debug($postValues);
+			return false;
+		}
+		$this->setTerms($postId, $command->category);
+		$review = $this->single(get_post($postId));
+		do_action('site-reviews/review/created', $review, $command);
+		return $review;
+	}
 
-    /**
-     * @param string $metaReviewId
-     * @return void
-     */
-    public function delete($metaReviewId)
-    {
-        if ($postId = $this->getPostId($metaReviewId)) {
-            wp_delete_post($postId, true);
-        }
-    }
+	/**
+	 * @param string $metaReviewId
+	 * @return void
+	 */
+	public function delete($metaReviewId)
+	{
+		if ($postId = $this->getPostId($metaReviewId)) {
+			wp_delete_post($postId, true);
+		}
+	}
 
-    /**
-     * @return object
-     */
-    public function get(array $args = [])
-    {
-        $args = glsr(ReviewsDefaults::class)->merge($args);
-        $metaQuery = glsr(QueryBuilder::class)->buildQuery(
-            ['assigned_to', 'email', 'ip_address', 'type', 'rating'],
-            $args
-        );
-        $taxQuery = glsr(QueryBuilder::class)->buildQuery(
-            ['category'],
-            ['category' => $this->normalizeTermIds($args['category'])]
-        );
-        $paged = glsr(QueryBuilder::class)->getPaged(
-            wp_validate_boolean($args['pagination'])
-        );
-        $parameters = [
-            'meta_key' => '_pinned',
-            'meta_query' => $metaQuery,
-            'offset' => $args['offset'],
-            'order' => $args['order'],
-            'orderby' => 'meta_value '.$args['orderby'],
-            'paged' => Arr::get($args, 'paged', $paged),
-            'post__in' => $args['post__in'],
-            'post__not_in' => $args['post__not_in'],
-            'post_status' => 'publish',
-            'post_type' => Application::POST_TYPE,
-            'posts_per_page' => $args['per_page'],
-            'tax_query' => $taxQuery,
-        ];
-        $parameters = apply_filters('site-reviews/get/reviews/query', $parameters, $args);
-        $query = new WP_Query($parameters);
-        $results = array_map([$this, 'single'], $query->posts);
-        $reviews = new Reviews($results, $query->max_num_pages, $args);
-        return apply_filters('site-reviews/get/reviews', $reviews, $query);
-    }
+	/**
+	 * @return object
+	 */
+	public function get(array $args = [])
+	{
+		$args = glsr(ReviewsDefaults::class)->merge($args);
+		$metaQuery = glsr(QueryBuilder::class)->buildQuery(
+			['assigned_to', 'email', 'ip_address', 'type', 'rating'],
+			$args
+		);
+		$taxQuery = glsr(QueryBuilder::class)->buildQuery(
+			['category'],
+			['category' => $this->normalizeTermIds($args['category'])]
+		);
+		$paged = glsr(QueryBuilder::class)->getPaged(
+			wp_validate_boolean($args['pagination'])
+		);
+		$parameters = [
+			'meta_key' => '_pinned',
+			'meta_query' => $metaQuery,
+			'offset' => $args['offset'],
+			'order' => $args['order'],
+			'orderby' => 'meta_value '.$args['orderby'],
+			'paged' => Arr::get($args, 'paged', $paged),
+			'post__in' => $args['post__in'],
+			'post__not_in' => $args['post__not_in'],
+			'post_status' => 'publish',
+			'post_type' => Application::POST_TYPE,
+			'posts_per_page' => $args['per_page'],
+			'tax_query' => $taxQuery,
+		];
+		$parameters = apply_filters('site-reviews/get/reviews/query', $parameters, $args);
+		$query = new WP_Query($parameters);
+		$results = array_map([$this, 'single'], $query->posts);
+		$reviews = new Reviews($results, $query->max_num_pages, $args);
+		return apply_filters('site-reviews/get/reviews', $reviews, $query);
+	}
 
-    /**
-     * @param string $metaReviewId
-     * @return int
-     */
-    public function getPostId($metaReviewId)
-    {
-        return glsr(SqlQueries::class)->getPostIdFromReviewId($metaReviewId);
-    }
+	/**
+	 * @param string $metaReviewId
+	 * @return int
+	 */
+	public function getPostId($metaReviewId)
+	{
+		return glsr(SqlQueries::class)->getPostIdFromReviewId($metaReviewId);
+	}
 
-    /**
-     * @return array
-     */
-    public function getRatingCounts(array $args = [])
-    {
-        $args = glsr(SiteReviewsSummaryDefaults::class)->filter($args);
-        $counts = glsr(CountsManager::class)->getCounts([
-            'post_ids' => Arr::convertStringToArray($args['assigned_to']),
-            'term_ids' => $this->normalizeTermIds($args['category']),
-            'type' => $args['type'],
-        ]);
-        return glsr(CountsManager::class)->flatten($counts, [
-            'min' => $args['rating'],
-        ]);
-    }
+	/**
+	 * @return array
+	 */
+	public function getRatingCounts(array $args = [])
+	{
+		$args = glsr(SiteReviewsSummaryDefaults::class)->filter($args);
+		$counts = glsr(CountsManager::class)->getCounts([
+			'post_ids' => Arr::convertStringToArray($args['assigned_to']),
+			'term_ids' => $this->normalizeTermIds($args['category']),
+			'type' => $args['type'],
+		]);
+		return glsr(CountsManager::class)->flatten($counts, [
+			'min' => $args['rating'],
+		]);
+	}
 
-    /**
-     * @param string $commaSeparatedTermIds
-     * @return array
-     */
-    public function normalizeTermIds($commaSeparatedTermIds)
-    {
-        $termIds = glsr_array_column($this->normalizeTerms($commaSeparatedTermIds), 'term_id');
-        return array_unique(array_map('intval', $termIds));
-    }
+	/**
+	 * @param string $commaSeparatedTermIds
+	 * @return array
+	 */
+	public function normalizeTermIds($commaSeparatedTermIds)
+	{
+		$termIds = glsr_array_column($this->normalizeTerms($commaSeparatedTermIds), 'term_id');
+		return array_unique(array_map('intval', $termIds));
+	}
 
-    /**
-     * @param string $commaSeparatedTermIds
-     * @return array
-     */
-    public function normalizeTerms($commaSeparatedTermIds)
-    {
-        $terms = [];
-        $termIds = Arr::convertStringToArray($commaSeparatedTermIds);
-        foreach ($termIds as $termId) {
-            if (is_numeric($termId)) {
-                $termId = intval($termId);
-            }
-            $term = term_exists($termId, Application::TAXONOMY);
-            if (!isset($term['term_id'])) {
-                continue;
-            }
-            $terms[] = $term;
-        }
-        return $terms;
-    }
+	/**
+	 * @param string $commaSeparatedTermIds
+	 * @return array
+	 */
+	public function normalizeTerms($commaSeparatedTermIds)
+	{
+		$terms = [];
+		$termIds = Arr::convertStringToArray($commaSeparatedTermIds);
+		foreach ($termIds as $termId) {
+			if (is_numeric($termId)) {
+				$termId = intval($termId);
+			}
+			$term = term_exists($termId, Application::TAXONOMY);
+			if (!isset($term['term_id'])) {
+				continue;
+			}
+			$terms[] = $term;
+		}
+		return $terms;
+	}
 
-    /**
-     * @param int $postId
-     * @return void
-     */
-    public function revert($postId)
-    {
-        if (Application::POST_TYPE != get_post_field('post_type', $postId)) {
-            return;
-        }
-        delete_post_meta($postId, '_edit_last');
-        $result = wp_update_post([
-            'ID' => $postId,
-            'post_content' => glsr(Database::class)->get($postId, 'content'),
-            'post_date' => glsr(Database::class)->get($postId, 'date'),
-            'post_title' => glsr(Database::class)->get($postId, 'title'),
-        ]);
-        if (is_wp_error($result)) {
-            glsr_log()->error($result->get_error_message());
-            return;
-        }
-        do_action('site-reviews/review/reverted', glsr_get_review($postId));
-    }
+	/**
+	 * @param int $postId
+	 * @return void
+	 */
+	public function revert($postId)
+	{
+		if (Application::POST_TYPE != get_post_field('post_type', $postId)) {
+			return;
+		}
+		delete_post_meta($postId, '_edit_last');
+		$result = wp_update_post([
+			'ID' => $postId,
+			'post_content' => glsr(Database::class)->get($postId, 'content'),
+			'post_date' => glsr(Database::class)->get($postId, 'date'),
+			'post_title' => glsr(Database::class)->get($postId, 'title'),
+		]);
+		if (is_wp_error($result)) {
+			glsr_log()->error($result->get_error_message());
+			return;
+		}
+		do_action('site-reviews/review/reverted', glsr_get_review($postId));
+	}
 
-    /**
-     * @return Review
-     */
-    public function single(WP_Post $post)
-    {
-        if (Application::POST_TYPE != $post->post_type) {
-            $post = new WP_Post((object) []);
-        }
-        $review = new Review($post);
-        return apply_filters('site-reviews/get/review', $review, $post);
-    }
+	/**
+	 * @return Review
+	 */
+	public function single(WP_Post $post)
+	{
+		if (Application::POST_TYPE != $post->post_type) {
+			$post = new WP_Post((object) []);
+		}
+		$review = new Review($post);
+		return apply_filters('site-reviews/get/review', $review, $post);
+	}
 
-    /**
-     * @param bool $isBlacklisted
-     * @return string
-     */
-    protected function getNewPostStatus(array $reviewValues, $isBlacklisted)
-    {
-        $requireApproval = glsr(OptionManager::class)->getBool('settings.general.require.approval');
-        return 'local' == $reviewValues['_review_type'] && ($requireApproval || $isBlacklisted)
-            ? 'pending'
-            : 'publish';
-    }
+	/**
+	 * @param bool $isBlacklisted
+	 * @return string
+	 */
+	protected function getNewPostStatus(array $reviewValues, $isBlacklisted)
+	{
+		$requireApproval = glsr(OptionManager::class)->getBool('settings.general.require.approval');
+		return 'local' == $reviewValues['_review_type'] && ($requireApproval || $isBlacklisted)
+			? 'pending'
+			: 'publish';
+	}
 
-    /**
-     * @param int $postId
-     * @param string $termIds
-     * @return void
-     */
-    protected function setTerms($postId, $termIds)
-    {
-        $termIds = $this->normalizeTermIds($termIds);
-        if (empty($termIds)) {
-            return;
-        }
-        $termTaxonomyIds = wp_set_object_terms($postId, $termIds, Application::TAXONOMY);
-        if (is_wp_error($termTaxonomyIds)) {
-            glsr_log()->error($termTaxonomyIds->get_error_message());
-        }
-    }
+	/**
+	 * @param int $postId
+	 * @param string $termIds
+	 * @return void
+	 */
+	protected function setTerms($postId, $termIds)
+	{
+		$termIds = $this->normalizeTermIds($termIds);
+		if (empty($termIds)) {
+			return;
+		}
+		$termTaxonomyIds = wp_set_object_terms($postId, $termIds, Application::TAXONOMY);
+		if (is_wp_error($termTaxonomyIds)) {
+			glsr_log()->error($termTaxonomyIds->get_error_message());
+		}
+	}
 }

Spacing +72 added lines, -72 removed lines

@@ -19,11 +19,11 @@ 
     /**
      * @return false|Review
      */
-    public function create(CreateReview $command)
+    public function create( CreateReview $command )
     {
-        $reviewValues = glsr(CreateReviewDefaults::class)->restrict((array) $command);
-        $reviewValues = apply_filters('site-reviews/create/review-values', $reviewValues, $command);
-        $reviewValues = Arr::prefixArrayKeys($reviewValues);
+        $reviewValues = glsr( CreateReviewDefaults::class )->restrict( (array)$command );
+        $reviewValues = apply_filters( 'site-reviews/create/review-values', $reviewValues, $command );
+        $reviewValues = Arr::prefixArrayKeys( $reviewValues );
         unset($reviewValues['json']); // @todo remove the need for this
         $postValues = [
             'comment_status' => 'closed',
@@ -31,20 +31,20 @@ 
             'ping_status' => 'closed',
             'post_content' => $reviewValues['_content'],
             'post_date' => $reviewValues['_date'],
-            'post_date_gmt' => get_gmt_from_date($reviewValues['_date']),
+            'post_date_gmt' => get_gmt_from_date( $reviewValues['_date'] ),
             'post_name' => $reviewValues['_review_type'].'-'.$reviewValues['_review_id'],
-            'post_status' => $this->getNewPostStatus($reviewValues, $command->blacklisted),
+            'post_status' => $this->getNewPostStatus( $reviewValues, $command->blacklisted ),
             'post_title' => $reviewValues['_title'],
             'post_type' => Application::POST_TYPE,
         ];
-        $postId = wp_insert_post($postValues, true);
-        if (is_wp_error($postId)) {
-            glsr_log()->error($postId->get_error_message())->debug($postValues);
+        $postId = wp_insert_post( $postValues, true );
+        if( is_wp_error( $postId ) ) {
+            glsr_log()->error( $postId->get_error_message() )->debug( $postValues );
             return false;
         }
-        $this->setTerms($postId, $command->category);
-        $review = $this->single(get_post($postId));
-        do_action('site-reviews/review/created', $review, $command);
+        $this->setTerms( $postId, $command->category );
+        $review = $this->single( get_post( $postId ) );
+        do_action( 'site-reviews/review/created', $review, $command );
         return $review;
     }
 
@@ -52,29 +52,29 @@ 
      * @param string $metaReviewId
      * @return void
      */
-    public function delete($metaReviewId)
+    public function delete( $metaReviewId )
     {
-        if ($postId = $this->getPostId($metaReviewId)) {
-            wp_delete_post($postId, true);
+        if( $postId = $this->getPostId( $metaReviewId ) ) {
+            wp_delete_post( $postId, true );
         }
     }
 
     /**
      * @return object
      */
-    public function get(array $args = [])
+    public function get( array $args = [] )
     {
-        $args = glsr(ReviewsDefaults::class)->merge($args);
-        $metaQuery = glsr(QueryBuilder::class)->buildQuery(
+        $args = glsr( ReviewsDefaults::class )->merge( $args );
+        $metaQuery = glsr( QueryBuilder::class )->buildQuery(
             ['assigned_to', 'email', 'ip_address', 'type', 'rating'],
             $args
         );
-        $taxQuery = glsr(QueryBuilder::class)->buildQuery(
+        $taxQuery = glsr( QueryBuilder::class )->buildQuery(
             ['category'],
-            ['category' => $this->normalizeTermIds($args['category'])]
+            ['category' => $this->normalizeTermIds( $args['category'] )]
         );
-        $paged = glsr(QueryBuilder::class)->getPaged(
-            wp_validate_boolean($args['pagination'])
+        $paged = glsr( QueryBuilder::class )->getPaged(
+            wp_validate_boolean( $args['pagination'] )
         );
         $parameters = [
             'meta_key' => '_pinned',
@@ -82,7 +82,7 @@ 
             'offset' => $args['offset'],
             'order' => $args['order'],
             'orderby' => 'meta_value '.$args['orderby'],
-            'paged' => Arr::get($args, 'paged', $paged),
+            'paged' => Arr::get( $args, 'paged', $paged ),
             'post__in' => $args['post__in'],
             'post__not_in' => $args['post__not_in'],
             'post_status' => 'publish',
@@ -90,62 +90,62 @@ 
             'posts_per_page' => $args['per_page'],
             'tax_query' => $taxQuery,
         ];
-        $parameters = apply_filters('site-reviews/get/reviews/query', $parameters, $args);
-        $query = new WP_Query($parameters);
-        $results = array_map([$this, 'single'], $query->posts);
-        $reviews = new Reviews($results, $query->max_num_pages, $args);
-        return apply_filters('site-reviews/get/reviews', $reviews, $query);
+        $parameters = apply_filters( 'site-reviews/get/reviews/query', $parameters, $args );
+        $query = new WP_Query( $parameters );
+        $results = array_map( [$this, 'single'], $query->posts );
+        $reviews = new Reviews( $results, $query->max_num_pages, $args );
+        return apply_filters( 'site-reviews/get/reviews', $reviews, $query );
     }
 
     /**
      * @param string $metaReviewId
      * @return int
      */
-    public function getPostId($metaReviewId)
+    public function getPostId( $metaReviewId )
     {
-        return glsr(SqlQueries::class)->getPostIdFromReviewId($metaReviewId);
+        return glsr( SqlQueries::class )->getPostIdFromReviewId( $metaReviewId );
     }
 
     /**
      * @return array
      */
-    public function getRatingCounts(array $args = [])
+    public function getRatingCounts( array $args = [] )
     {
-        $args = glsr(SiteReviewsSummaryDefaults::class)->filter($args);
-        $counts = glsr(CountsManager::class)->getCounts([
-            'post_ids' => Arr::convertStringToArray($args['assigned_to']),
-            'term_ids' => $this->normalizeTermIds($args['category']),
+        $args = glsr( SiteReviewsSummaryDefaults::class )->filter( $args );
+        $counts = glsr( CountsManager::class )->getCounts( [
+            'post_ids' => Arr::convertStringToArray( $args['assigned_to'] ),
+            'term_ids' => $this->normalizeTermIds( $args['category'] ),
             'type' => $args['type'],
-        ]);
-        return glsr(CountsManager::class)->flatten($counts, [
+        ] );
+        return glsr( CountsManager::class )->flatten( $counts, [
             'min' => $args['rating'],
-        ]);
+        ] );
     }
 
     /**
      * @param string $commaSeparatedTermIds
      * @return array
      */
-    public function normalizeTermIds($commaSeparatedTermIds)
+    public function normalizeTermIds( $commaSeparatedTermIds )
     {
-        $termIds = glsr_array_column($this->normalizeTerms($commaSeparatedTermIds), 'term_id');
-        return array_unique(array_map('intval', $termIds));
+        $termIds = glsr_array_column( $this->normalizeTerms( $commaSeparatedTermIds ), 'term_id' );
+        return array_unique( array_map( 'intval', $termIds ) );
     }
 
     /**
      * @param string $commaSeparatedTermIds
      * @return array
      */
-    public function normalizeTerms($commaSeparatedTermIds)
+    public function normalizeTerms( $commaSeparatedTermIds )
     {
         $terms = [];
-        $termIds = Arr::convertStringToArray($commaSeparatedTermIds);
-        foreach ($termIds as $termId) {
-            if (is_numeric($termId)) {
-                $termId = intval($termId);
+        $termIds = Arr::convertStringToArray( $commaSeparatedTermIds );
+        foreach( $termIds as $termId ) {
+            if( is_numeric( $termId ) ) {
+                $termId = intval( $termId );
             }
-            $term = term_exists($termId, Application::TAXONOMY);
-            if (!isset($term['term_id'])) {
+            $term = term_exists( $termId, Application::TAXONOMY );
+            if( !isset($term['term_id']) ) {
                 continue;
             }
             $terms[] = $term;
@@ -157,44 +157,44 @@ 
      * @param int $postId
      * @return void
      */
-    public function revert($postId)
+    public function revert( $postId )
     {
-        if (Application::POST_TYPE != get_post_field('post_type', $postId)) {
+        if( Application::POST_TYPE != get_post_field( 'post_type', $postId ) ) {
             return;
         }
-        delete_post_meta($postId, '_edit_last');
-        $result = wp_update_post([
+        delete_post_meta( $postId, '_edit_last' );
+        $result = wp_update_post( [
             'ID' => $postId,
-            'post_content' => glsr(Database::class)->get($postId, 'content'),
-            'post_date' => glsr(Database::class)->get($postId, 'date'),
-            'post_title' => glsr(Database::class)->get($postId, 'title'),
-        ]);
-        if (is_wp_error($result)) {
-            glsr_log()->error($result->get_error_message());
+            'post_content' => glsr( Database::class )->get( $postId, 'content' ),
+            'post_date' => glsr( Database::class )->get( $postId, 'date' ),
+            'post_title' => glsr( Database::class )->get( $postId, 'title' ),
+        ] );
+        if( is_wp_error( $result ) ) {
+            glsr_log()->error( $result->get_error_message() );
             return;
         }
-        do_action('site-reviews/review/reverted', glsr_get_review($postId));
+        do_action( 'site-reviews/review/reverted', glsr_get_review( $postId ) );
     }
 
     /**
      * @return Review
      */
-    public function single(WP_Post $post)
+    public function single( WP_Post $post )
     {
-        if (Application::POST_TYPE != $post->post_type) {
-            $post = new WP_Post((object) []);
+        if( Application::POST_TYPE != $post->post_type ) {
+            $post = new WP_Post( (object)[] );
         }
-        $review = new Review($post);
-        return apply_filters('site-reviews/get/review', $review, $post);
+        $review = new Review( $post );
+        return apply_filters( 'site-reviews/get/review', $review, $post );
     }
 
     /**
      * @param bool $isBlacklisted
      * @return string
      */
-    protected function getNewPostStatus(array $reviewValues, $isBlacklisted)
+    protected function getNewPostStatus( array $reviewValues, $isBlacklisted )
     {
-        $requireApproval = glsr(OptionManager::class)->getBool('settings.general.require.approval');
+        $requireApproval = glsr( OptionManager::class )->getBool( 'settings.general.require.approval' );
         return 'local' == $reviewValues['_review_type'] && ($requireApproval || $isBlacklisted)
             ? 'pending'
             : 'publish';
@@ -205,15 +205,15 @@ 
      * @param string $termIds
      * @return void
      */
-    protected function setTerms($postId, $termIds)
+    protected function setTerms( $postId, $termIds )
     {
-        $termIds = $this->normalizeTermIds($termIds);
-        if (empty($termIds)) {
+        $termIds = $this->normalizeTermIds( $termIds );
+        if( empty($termIds) ) {
             return;
         }
-        $termTaxonomyIds = wp_set_object_terms($postId, $termIds, Application::TAXONOMY);
-        if (is_wp_error($termTaxonomyIds)) {
-            glsr_log()->error($termTaxonomyIds->get_error_message());
+        $termTaxonomyIds = wp_set_object_terms( $postId, $termIds, Application::TAXONOMY );
+        if( is_wp_error( $termTaxonomyIds ) ) {
+            glsr_log()->error( $termTaxonomyIds->get_error_message() );
         }
     }
 }

plugin/Database/GlobalCountsManager.php

Indentation +62 added lines, -62 removed lines

@@ -7,73 +7,73 @@
 
 class GlobalCountsManager
 {
-    /**
-     * @var CountsManager
-     */
-    protected $manager;
+	/**
+	 * @var CountsManager
+	 */
+	protected $manager;
 
-    public function __construct()
-    {
-        $this->manager = glsr(CountsManager::class);
-    }
+	public function __construct()
+	{
+		$this->manager = glsr(CountsManager::class);
+	}
 
-    /**
-     * @return array
-     */
-    public function build()
-    {
-        return $this->manager->buildCounts();
-    }
+	/**
+	 * @return array
+	 */
+	public function build()
+	{
+		return $this->manager->buildCounts();
+	}
 
-    /**
-     * @return void
-     */
-    public function decrease(Review $review)
-    {
-        $this->update($this->manager->decreaseRating(
-            $this->get(),
-            $review->review_type,
-            $review->rating
-        ));
-    }
+	/**
+	 * @return void
+	 */
+	public function decrease(Review $review)
+	{
+		$this->update($this->manager->decreaseRating(
+			$this->get(),
+			$review->review_type,
+			$review->rating
+		));
+	}
 
-    /**
-     * @return array
-     */
-    public function get()
-    {
-        $counts = glsr(OptionManager::class)->get('counts', []);
-        if (!is_array($counts)) {
-            glsr_log()->error('Review counts is not an array; possibly due to incorrectly imported reviews.')->debug($counts);
-            return [];
-        }
-        return $counts;
-    }
+	/**
+	 * @return array
+	 */
+	public function get()
+	{
+		$counts = glsr(OptionManager::class)->get('counts', []);
+		if (!is_array($counts)) {
+			glsr_log()->error('Review counts is not an array; possibly due to incorrectly imported reviews.')->debug($counts);
+			return [];
+		}
+		return $counts;
+	}
 
-    /**
-     * @return void
-     */
-    public function increase(Review $review)
-    {
-        if (empty($counts = $this->get())) {
-            $counts = $this->build();
-        }
-        $this->update($this->manager->increaseRating($counts, $review->review_type, $review->rating));
-    }
+	/**
+	 * @return void
+	 */
+	public function increase(Review $review)
+	{
+		if (empty($counts = $this->get())) {
+			$counts = $this->build();
+		}
+		$this->update($this->manager->increaseRating($counts, $review->review_type, $review->rating));
+	}
 
-    /**
-     * @return void
-     */
-    public function update(array $reviewCounts)
-    {
-        glsr(OptionManager::class)->set('counts', $reviewCounts);
-    }
+	/**
+	 * @return void
+	 */
+	public function update(array $reviewCounts)
+	{
+		glsr(OptionManager::class)->set('counts', $reviewCounts);
+	}
 
-    /**
-     * @return void
-     */
-    public function updateAll()
-    {
-        $this->update($this->build());
-    }
+	/**
+	 * @return void
+	 */
+	public function updateAll()
+	{
+		$this->update($this->build());
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -14,7 +14,7 @@ 
 
     public function __construct()
     {
-        $this->manager = glsr(CountsManager::class);
+        $this->manager = glsr( CountsManager::class );
     }
 
     /**
@@ -28,13 +28,13 @@ 
     /**
      * @return void
      */
-    public function decrease(Review $review)
+    public function decrease( Review $review )
     {
-        $this->update($this->manager->decreaseRating(
+        $this->update( $this->manager->decreaseRating(
             $this->get(),
             $review->review_type,
             $review->rating
-        ));
+        ) );
     }
 
     /**
@@ -42,9 +42,9 @@ 
      */
     public function get()
     {
-        $counts = glsr(OptionManager::class)->get('counts', []);
-        if (!is_array($counts)) {
-            glsr_log()->error('Review counts is not an array; possibly due to incorrectly imported reviews.')->debug($counts);
+        $counts = glsr( OptionManager::class )->get( 'counts', [] );
+        if( !is_array( $counts ) ) {
+            glsr_log()->error( 'Review counts is not an array; possibly due to incorrectly imported reviews.' )->debug( $counts );
             return [];
         }
         return $counts;
@@ -53,20 +53,20 @@ 
     /**
      * @return void
      */
-    public function increase(Review $review)
+    public function increase( Review $review )
     {
-        if (empty($counts = $this->get())) {
+        if( empty($counts = $this->get()) ) {
             $counts = $this->build();
         }
-        $this->update($this->manager->increaseRating($counts, $review->review_type, $review->rating));
+        $this->update( $this->manager->increaseRating( $counts, $review->review_type, $review->rating ) );
     }
 
     /**
      * @return void
      */
-    public function update(array $reviewCounts)
+    public function update( array $reviewCounts )
     {
-        glsr(OptionManager::class)->set('counts', $reviewCounts);
+        glsr( OptionManager::class )->set( 'counts', $reviewCounts );
     }
 
     /**
@@ -74,6 +74,6 @@ 
      */
     public function updateAll()
     {
-        $this->update($this->build());
+        $this->update( $this->build() );
     }
 }

plugin/Helpers/Str.php

Indentation +169 added lines, -169 removed lines

@@ -4,186 +4,186 @@
 
 class Str
 {
-    /**
-     * @param string $subject
-     * @param string $search
-     * @return string
-     */
-    public static function afterLast($subject, $search)
-    {
-        return '' === $search
-            ? $subject
-            : array_reverse(explode($search, $subject))[0];
-    }
+	/**
+	 * @param string $subject
+	 * @param string $search
+	 * @return string
+	 */
+	public static function afterLast($subject, $search)
+	{
+		return '' === $search
+			? $subject
+			: array_reverse(explode($search, $subject))[0];
+	}
 
-    /**
-     * @param string $string
-     * @return string
-     */
-    public static function camelCase($string)
-    {
-        $string = ucwords(str_replace(['-', '_'], ' ', trim($string)));
-        return str_replace(' ', '', $string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	public static function camelCase($string)
+	{
+		$string = ucwords(str_replace(['-', '_'], ' ', trim($string)));
+		return str_replace(' ', '', $string);
+	}
 
-    /**
-     * @param string $haystack
-     * @param string $needle
-     * @return bool
-     */
-    public static function contains($haystack, $needle)
-    {
-        return false !== strpos($haystack, $needle);
-    }
+	/**
+	 * @param string $haystack
+	 * @param string $needle
+	 * @return bool
+	 */
+	public static function contains($haystack, $needle)
+	{
+		return false !== strpos($haystack, $needle);
+	}
 
-    /**
-     * @param string $name
-     * @param string $nameType first|first_initial|initials|last|last_initial
-     * @param string $initialType period|period_space|space
-     * @return string
-     */
-    public static function convertName($name, $nameType = '', $initialType = '')
-    {
-        $names = preg_split('/\W/', $name, 0, PREG_SPLIT_NO_EMPTY);
-        $firstName = array_shift($names);
-        $lastName = array_pop($names);
-        $initialTypes = [
-            'period' => '.',
-            'period_space' => '. ',
-            'space' => ' ',
-        ];
-        $initialPunctuation = (string) Arr::get($initialTypes, $initialType, ' ');
-        if ('initials' == $nameType) {
-            return static::convertToInitials($name, $initialPunctuation);
-        }
-        $nameTypes = [
-            'first' => $firstName,
-            'first_initial' => substr($firstName, 0, 1).$initialPunctuation.$lastName,
-            'last' => $lastName,
-            'last_initial' => $firstName.' '.substr($lastName, 0, 1).$initialPunctuation,
-        ];
-        return trim((string) Arr::get($nameTypes, $nameType, $name));
-    }
+	/**
+	 * @param string $name
+	 * @param string $nameType first|first_initial|initials|last|last_initial
+	 * @param string $initialType period|period_space|space
+	 * @return string
+	 */
+	public static function convertName($name, $nameType = '', $initialType = '')
+	{
+		$names = preg_split('/\W/', $name, 0, PREG_SPLIT_NO_EMPTY);
+		$firstName = array_shift($names);
+		$lastName = array_pop($names);
+		$initialTypes = [
+			'period' => '.',
+			'period_space' => '. ',
+			'space' => ' ',
+		];
+		$initialPunctuation = (string) Arr::get($initialTypes, $initialType, ' ');
+		if ('initials' == $nameType) {
+			return static::convertToInitials($name, $initialPunctuation);
+		}
+		$nameTypes = [
+			'first' => $firstName,
+			'first_initial' => substr($firstName, 0, 1).$initialPunctuation.$lastName,
+			'last' => $lastName,
+			'last_initial' => $firstName.' '.substr($lastName, 0, 1).$initialPunctuation,
+		];
+		return trim((string) Arr::get($nameTypes, $nameType, $name));
+	}
 
-    /**
-     * @param string $path
-     * @param string $prefix
-     * @return string
-     */
-    public static function convertPathToId($path, $prefix = '')
-    {
-        return str_replace(['[', ']'], ['-', ''], static::convertPathToName($path, $prefix));
-    }
+	/**
+	 * @param string $path
+	 * @param string $prefix
+	 * @return string
+	 */
+	public static function convertPathToId($path, $prefix = '')
+	{
+		return str_replace(['[', ']'], ['-', ''], static::convertPathToName($path, $prefix));
+	}
 
-    /**
-     * @param string $path
-     * @param string $prefix
-     * @return string
-     */
-    public static function convertPathToName($path, $prefix = '')
-    {
-        $levels = explode('.', $path);
-        return array_reduce($levels, function ($result, $value) {
-            return $result .= '['.$value.']';
-        }, $prefix);
-    }
+	/**
+	 * @param string $path
+	 * @param string $prefix
+	 * @return string
+	 */
+	public static function convertPathToName($path, $prefix = '')
+	{
+		$levels = explode('.', $path);
+		return array_reduce($levels, function ($result, $value) {
+			return $result .= '['.$value.']';
+		}, $prefix);
+	}
 
-    /**
-     * @param string $name
-     * @param string $initialPunctuation
-     * @return string
-     */
-    public static function convertToInitials($name, $initialPunctuation = '')
-    {
-        preg_match_all('/(?<=\s|\b)\pL/u', $name, $matches);
-        return array_reduce($matches[0], function ($carry, $word) use ($initialPunctuation) {
-            return $carry.strtoupper(substr($word, 0, 1)).$initialPunctuation;
-        });
-    }
+	/**
+	 * @param string $name
+	 * @param string $initialPunctuation
+	 * @return string
+	 */
+	public static function convertToInitials($name, $initialPunctuation = '')
+	{
+		preg_match_all('/(?<=\s|\b)\pL/u', $name, $matches);
+		return array_reduce($matches[0], function ($carry, $word) use ($initialPunctuation) {
+			return $carry.strtoupper(substr($word, 0, 1)).$initialPunctuation;
+		});
+	}
 
-    /**
-     * @param string $string
-     * @return string
-     */
-    public static function dashCase($string)
-    {
-        return str_replace('_', '-', static::snakeCase($string));
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	public static function dashCase($string)
+	{
+		return str_replace('_', '-', static::snakeCase($string));
+	}
 
-    /**
-     * @param string $needle
-     * @param string $haystack
-     * @return bool
-     */
-    public static function endsWith($needle, $haystack)
-    {
-        $length = strlen($needle);
-        return 0 != $length
-            ? substr($haystack, -$length) === $needle
-            : true;
-    }
+	/**
+	 * @param string $needle
+	 * @param string $haystack
+	 * @return bool
+	 */
+	public static function endsWith($needle, $haystack)
+	{
+		$length = strlen($needle);
+		return 0 != $length
+			? substr($haystack, -$length) === $needle
+			: true;
+	}
 
-    /**
-     * @param string $prefix
-     * @param string $string
-     * @param string|null $trim
-     * @return string
-     */
-    public static function prefix($prefix, $string, $trim = null)
-    {
-        if (null === $trim) {
-            $trim = $prefix;
-        }
-        return $prefix.trim(static::removePrefix($trim, $string));
-    }
+	/**
+	 * @param string $prefix
+	 * @param string $string
+	 * @param string|null $trim
+	 * @return string
+	 */
+	public static function prefix($prefix, $string, $trim = null)
+	{
+		if (null === $trim) {
+			$trim = $prefix;
+		}
+		return $prefix.trim(static::removePrefix($trim, $string));
+	}
 
-    /**
-     * @param string $prefix
-     * @param string $string
-     * @return string
-     */
-    public static function removePrefix($prefix, $string)
-    {
-        return static::startsWith($prefix, $string)
-            ? substr($string, strlen($prefix))
-            : $string;
-    }
+	/**
+	 * @param string $prefix
+	 * @param string $string
+	 * @return string
+	 */
+	public static function removePrefix($prefix, $string)
+	{
+		return static::startsWith($prefix, $string)
+			? substr($string, strlen($prefix))
+			: $string;
+	}
 
-    /**
-     * @param string $string
-     * @return string
-     */
-    public static function snakeCase($string)
-    {
-        if (!ctype_lower($string)) {
-            $string = preg_replace('/\s+/u', '', $string);
-            $string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string);
-            $string = function_exists('mb_strtolower')
-                ? mb_strtolower($string, 'UTF-8')
-                : strtolower($string);
-        }
-        return str_replace('-', '_', $string);
-    }
+	/**
+	 * @param string $string
+	 * @return string
+	 */
+	public static function snakeCase($string)
+	{
+		if (!ctype_lower($string)) {
+			$string = preg_replace('/\s+/u', '', $string);
+			$string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string);
+			$string = function_exists('mb_strtolower')
+				? mb_strtolower($string, 'UTF-8')
+				: strtolower($string);
+		}
+		return str_replace('-', '_', $string);
+	}
 
-    /**
-     * @param string $needle
-     * @param string $haystack
-     * @return bool
-     */
-    public static function startsWith($needle, $haystack)
-    {
-        return substr($haystack, 0, strlen($needle)) === $needle;
-    }
+	/**
+	 * @param string $needle
+	 * @param string $haystack
+	 * @return bool
+	 */
+	public static function startsWith($needle, $haystack)
+	{
+		return substr($haystack, 0, strlen($needle)) === $needle;
+	}
 
-    /**
-     * @param string $string
-     * @param int $length
-     * @return string
-     */
-    public static function truncate($string, $length)
-    {
-        return strlen($string) > $length
-            ? substr($string, 0, $length)
-            : $string;
-    }
+	/**
+	 * @param string $string
+	 * @param int $length
+	 * @return string
+	 */
+	public static function truncate($string, $length)
+	{
+		return strlen($string) > $length
+			? substr($string, 0, $length)
+			: $string;
+	}
 }

Spacing +51 added lines, -51 removed lines

@@ -9,21 +9,21 @@ 
      * @param string $search
      * @return string
      */
-    public static function afterLast($subject, $search)
+    public static function afterLast( $subject, $search )
     {
         return '' === $search
             ? $subject
-            : array_reverse(explode($search, $subject))[0];
+            : array_reverse( explode( $search, $subject ) )[0];
     }
 
     /**
      * @param string $string
      * @return string
      */
-    public static function camelCase($string)
+    public static function camelCase( $string )
     {
-        $string = ucwords(str_replace(['-', '_'], ' ', trim($string)));
-        return str_replace(' ', '', $string);
+        $string = ucwords( str_replace( ['-', '_'], ' ', trim( $string ) ) );
+        return str_replace( ' ', '', $string );
     }
 
     /**
@@ -31,9 +31,9 @@ 
      * @param string $needle
      * @return bool
      */
-    public static function contains($haystack, $needle)
+    public static function contains( $haystack, $needle )
     {
-        return false !== strpos($haystack, $needle);
+        return false !== strpos( $haystack, $needle );
     }
 
     /**
@@ -42,27 +42,27 @@ 
      * @param string $initialType period|period_space|space
      * @return string
      */
-    public static function convertName($name, $nameType = '', $initialType = '')
+    public static function convertName( $name, $nameType = '', $initialType = '' )
     {
-        $names = preg_split('/\W/', $name, 0, PREG_SPLIT_NO_EMPTY);
-        $firstName = array_shift($names);
-        $lastName = array_pop($names);
+        $names = preg_split( '/\W/', $name, 0, PREG_SPLIT_NO_EMPTY );
+        $firstName = array_shift( $names );
+        $lastName = array_pop( $names );
         $initialTypes = [
             'period' => '.',
             'period_space' => '. ',
             'space' => ' ',
         ];
-        $initialPunctuation = (string) Arr::get($initialTypes, $initialType, ' ');
-        if ('initials' == $nameType) {
-            return static::convertToInitials($name, $initialPunctuation);
+        $initialPunctuation = (string)Arr::get( $initialTypes, $initialType, ' ' );
+        if( 'initials' == $nameType ) {
+            return static::convertToInitials( $name, $initialPunctuation );
         }
         $nameTypes = [
             'first' => $firstName,
-            'first_initial' => substr($firstName, 0, 1).$initialPunctuation.$lastName,
+            'first_initial' => substr( $firstName, 0, 1 ).$initialPunctuation.$lastName,
             'last' => $lastName,
-            'last_initial' => $firstName.' '.substr($lastName, 0, 1).$initialPunctuation,
+            'last_initial' => $firstName.' '.substr( $lastName, 0, 1 ).$initialPunctuation,
         ];
-        return trim((string) Arr::get($nameTypes, $nameType, $name));
+        return trim( (string)Arr::get( $nameTypes, $nameType, $name ) );
     }
 
     /**
@@ -70,9 +70,9 @@ 
      * @param string $prefix
      * @return string
      */
-    public static function convertPathToId($path, $prefix = '')
+    public static function convertPathToId( $path, $prefix = '' )
     {
-        return str_replace(['[', ']'], ['-', ''], static::convertPathToName($path, $prefix));
+        return str_replace( ['[', ']'], ['-', ''], static::convertPathToName( $path, $prefix ) );
     }
 
     /**
@@ -80,12 +80,12 @@ 
      * @param string $prefix
      * @return string
      */
-    public static function convertPathToName($path, $prefix = '')
+    public static function convertPathToName( $path, $prefix = '' )
     {
-        $levels = explode('.', $path);
-        return array_reduce($levels, function ($result, $value) {
+        $levels = explode( '.', $path );
+        return array_reduce( $levels, function( $result, $value ) {
             return $result .= '['.$value.']';
-        }, $prefix);
+        }, $prefix );
     }
 
     /**
@@ -93,11 +93,11 @@ 
      * @param string $initialPunctuation
      * @return string
      */
-    public static function convertToInitials($name, $initialPunctuation = '')
+    public static function convertToInitials( $name, $initialPunctuation = '' )
     {
-        preg_match_all('/(?<=\s|\b)\pL/u', $name, $matches);
-        return array_reduce($matches[0], function ($carry, $word) use ($initialPunctuation) {
-            return $carry.strtoupper(substr($word, 0, 1)).$initialPunctuation;
+        preg_match_all( '/(?<=\s|\b)\pL/u', $name, $matches );
+        return array_reduce( $matches[0], function( $carry, $word ) use ($initialPunctuation) {
+            return $carry.strtoupper( substr( $word, 0, 1 ) ).$initialPunctuation;
         });
     }
 
@@ -105,9 +105,9 @@ 
      * @param string $string
      * @return string
      */
-    public static function dashCase($string)
+    public static function dashCase( $string )
     {
-        return str_replace('_', '-', static::snakeCase($string));
+        return str_replace( '_', '-', static::snakeCase( $string ) );
     }
 
     /**
@@ -115,11 +115,11 @@ 
      * @param string $haystack
      * @return bool
      */
-    public static function endsWith($needle, $haystack)
+    public static function endsWith( $needle, $haystack )
     {
-        $length = strlen($needle);
+        $length = strlen( $needle );
         return 0 != $length
-            ? substr($haystack, -$length) === $needle
+            ? substr( $haystack, -$length ) === $needle
             : true;
     }
 
@@ -129,12 +129,12 @@ 
      * @param string|null $trim
      * @return string
      */
-    public static function prefix($prefix, $string, $trim = null)
+    public static function prefix( $prefix, $string, $trim = null )
     {
-        if (null === $trim) {
+        if( null === $trim ) {
             $trim = $prefix;
         }
-        return $prefix.trim(static::removePrefix($trim, $string));
+        return $prefix.trim( static::removePrefix( $trim, $string ) );
     }
 
     /**
@@ -142,10 +142,10 @@ 
      * @param string $string
      * @return string
      */
-    public static function removePrefix($prefix, $string)
+    public static function removePrefix( $prefix, $string )
     {
-        return static::startsWith($prefix, $string)
-            ? substr($string, strlen($prefix))
+        return static::startsWith( $prefix, $string )
+            ? substr( $string, strlen( $prefix ) )
             : $string;
     }
 
@@ -153,16 +153,16 @@ 
      * @param string $string
      * @return string
      */
-    public static function snakeCase($string)
+    public static function snakeCase( $string )
     {
-        if (!ctype_lower($string)) {
-            $string = preg_replace('/\s+/u', '', $string);
-            $string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string);
-            $string = function_exists('mb_strtolower')
-                ? mb_strtolower($string, 'UTF-8')
-                : strtolower($string);
+        if( !ctype_lower( $string ) ) {
+            $string = preg_replace( '/\s+/u', '', $string );
+            $string = preg_replace( '/(.)(?=[A-Z])/u', '$1_', $string );
+            $string = function_exists( 'mb_strtolower' )
+                ? mb_strtolower( $string, 'UTF-8' )
+                : strtolower( $string );
         }
-        return str_replace('-', '_', $string);
+        return str_replace( '-', '_', $string );
     }
 
     /**
@@ -170,9 +170,9 @@ 
      * @param string $haystack
      * @return bool
      */
-    public static function startsWith($needle, $haystack)
+    public static function startsWith( $needle, $haystack )
     {
-        return substr($haystack, 0, strlen($needle)) === $needle;
+        return substr( $haystack, 0, strlen( $needle ) ) === $needle;
     }
 
     /**
@@ -180,10 +180,10 @@ 
      * @param int $length
      * @return string
      */
-    public static function truncate($string, $length)
+    public static function truncate( $string, $length )
     {
-        return strlen($string) > $length
-            ? substr($string, 0, $length)
+        return strlen( $string ) > $length
+            ? substr( $string, 0, $length )
             : $string;
     }
 }

plugin/Modules/Validator/ValidateReview.php

Indentation +272 added lines, -272 removed lines

@@ -13,299 +13,299 @@
 
 class ValidateReview
 {
-    const RECAPTCHA_ENDPOINT = 'https://www.google.com/recaptcha/api/siteverify';
+	const RECAPTCHA_ENDPOINT = 'https://www.google.com/recaptcha/api/siteverify';
 
-    const RECAPTCHA_DISABLED = 0;
-    const RECAPTCHA_EMPTY = 1;
-    const RECAPTCHA_FAILED = 2;
-    const RECAPTCHA_INVALID = 3;
-    const RECAPTCHA_VALID = 4;
+	const RECAPTCHA_DISABLED = 0;
+	const RECAPTCHA_EMPTY = 1;
+	const RECAPTCHA_FAILED = 2;
+	const RECAPTCHA_INVALID = 3;
+	const RECAPTCHA_VALID = 4;
 
-    const VALIDATION_RULES = [
-        'content' => 'required',
-        'email' => 'required|email',
-        'name' => 'required',
-        'rating' => 'required|number|between:1,5',
-        'terms' => 'accepted',
-        'title' => 'required',
-    ];
+	const VALIDATION_RULES = [
+		'content' => 'required',
+		'email' => 'required|email',
+		'name' => 'required',
+		'rating' => 'required|number|between:1,5',
+		'terms' => 'accepted',
+		'title' => 'required',
+	];
 
-    /**
-     * @var string|void
-     */
-    public $error;
+	/**
+	 * @var string|void
+	 */
+	public $error;
 
-    /**
-     * @var string
-     */
-    public $form_id;
+	/**
+	 * @var string
+	 */
+	public $form_id;
 
-    /**
-     * @var bool
-     */
-    public $recaptchaIsUnset = false;
+	/**
+	 * @var bool
+	 */
+	public $recaptchaIsUnset = false;
 
-    /**
-     * @var array
-     */
-    public $request;
+	/**
+	 * @var array
+	 */
+	public $request;
 
-    /**
-     * @var array
-     */
-    protected $options;
+	/**
+	 * @var array
+	 */
+	protected $options;
 
-    /**
-     * @return static
-     */
-    public function validate(array $request)
-    {
-        $request['ip_address'] = Helper::getIpAddress(); // required for Akismet and Blacklist validation
-        $this->form_id = $request['form_id'];
-        $this->options = glsr(OptionManager::class)->all();
-        $this->request = $this->validateRequest($request);
-        $this->validateCustom();
-        $this->validatePermission();
-        $this->validateHoneyPot();
-        $this->validateReviewLimits();
-        $this->validateBlacklist();
-        $this->validateAkismet();
-        $this->validateRecaptcha();
-        if (!empty($this->error)) {
-            $this->setSessionValues('message', $this->error);
-        }
-        return $this;
-    }
+	/**
+	 * @return static
+	 */
+	public function validate(array $request)
+	{
+		$request['ip_address'] = Helper::getIpAddress(); // required for Akismet and Blacklist validation
+		$this->form_id = $request['form_id'];
+		$this->options = glsr(OptionManager::class)->all();
+		$this->request = $this->validateRequest($request);
+		$this->validateCustom();
+		$this->validatePermission();
+		$this->validateHoneyPot();
+		$this->validateReviewLimits();
+		$this->validateBlacklist();
+		$this->validateAkismet();
+		$this->validateRecaptcha();
+		if (!empty($this->error)) {
+			$this->setSessionValues('message', $this->error);
+		}
+		return $this;
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @return mixed
-     */
-    protected function getOption($path, $fallback = '')
-    {
-        return Arr::get($this->options, $path, $fallback);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @return mixed
+	 */
+	protected function getOption($path, $fallback = '')
+	{
+		return Arr::get($this->options, $path, $fallback);
+	}
 
-    /**
-     * @return int
-     */
-    protected function getRecaptchaStatus()
-    {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
-            return static::RECAPTCHA_DISABLED;
-        }
-        if (empty($this->request['_recaptcha-token'])) {
-            return $this->request['_counter'] < intval(apply_filters('site-reviews/recaptcha/timeout', 5))
-                ? static::RECAPTCHA_EMPTY
-                : static::RECAPTCHA_FAILED;
-        }
-        return $this->getRecaptchaTokenStatus();
-    }
+	/**
+	 * @return int
+	 */
+	protected function getRecaptchaStatus()
+	{
+		if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+			return static::RECAPTCHA_DISABLED;
+		}
+		if (empty($this->request['_recaptcha-token'])) {
+			return $this->request['_counter'] < intval(apply_filters('site-reviews/recaptcha/timeout', 5))
+				? static::RECAPTCHA_EMPTY
+				: static::RECAPTCHA_FAILED;
+		}
+		return $this->getRecaptchaTokenStatus();
+	}
 
-    /**
-     * @return int
-     */
-    protected function getRecaptchaTokenStatus()
-    {
-        $endpoint = add_query_arg([
-            'remoteip' => Helper::getIpAddress(),
-            'response' => $this->request['_recaptcha-token'],
-            'secret' => $this->getOption('settings.submissions.recaptcha.secret'),
-        ], static::RECAPTCHA_ENDPOINT);
-        if (is_wp_error($response = wp_remote_get($endpoint))) {
-            glsr_log()->error($response->get_error_message());
-            return static::RECAPTCHA_FAILED;
-        }
-        $response = json_decode(wp_remote_retrieve_body($response));
-        if (!empty($response->success)) {
-            return boolval($response->success)
-                ? static::RECAPTCHA_VALID
-                : static::RECAPTCHA_INVALID;
-        }
-        foreach ($response->{'error-codes'} as $error) {
-            glsr_log()->error('reCAPTCHA error: '.$error);
-        }
-        return static::RECAPTCHA_INVALID;
-    }
+	/**
+	 * @return int
+	 */
+	protected function getRecaptchaTokenStatus()
+	{
+		$endpoint = add_query_arg([
+			'remoteip' => Helper::getIpAddress(),
+			'response' => $this->request['_recaptcha-token'],
+			'secret' => $this->getOption('settings.submissions.recaptcha.secret'),
+		], static::RECAPTCHA_ENDPOINT);
+		if (is_wp_error($response = wp_remote_get($endpoint))) {
+			glsr_log()->error($response->get_error_message());
+			return static::RECAPTCHA_FAILED;
+		}
+		$response = json_decode(wp_remote_retrieve_body($response));
+		if (!empty($response->success)) {
+			return boolval($response->success)
+				? static::RECAPTCHA_VALID
+				: static::RECAPTCHA_INVALID;
+		}
+		foreach ($response->{'error-codes'} as $error) {
+			glsr_log()->error('reCAPTCHA error: '.$error);
+		}
+		return static::RECAPTCHA_INVALID;
+	}
 
-    /**
-     * @return array
-     */
-    protected function getValidationRules(array $request)
-    {
-        $rules = array_intersect_key(
-            apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
-            array_flip($this->getOption('settings.submissions.required', []))
-        );
-        $excluded = explode(',', Arr::get($request, 'excluded'));
-        return array_diff_key($rules, array_flip($excluded));
-    }
+	/**
+	 * @return array
+	 */
+	protected function getValidationRules(array $request)
+	{
+		$rules = array_intersect_key(
+			apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
+			array_flip($this->getOption('settings.submissions.required', []))
+		);
+		$excluded = explode(',', Arr::get($request, 'excluded'));
+		return array_diff_key($rules, array_flip($excluded));
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isRequestValid(array $request)
-    {
-        $rules = $this->getValidationRules($request);
-        $errors = glsr(Validator::class)->validate($request, $rules);
-        if (empty($errors)) {
-            return true;
-        }
-        $this->error = __('Please fix the submission errors.', 'site-reviews');
-        $this->setSessionValues('errors', $errors);
-        $this->setSessionValues('values', $request);
-        return false;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isRequestValid(array $request)
+	{
+		$rules = $this->getValidationRules($request);
+		$errors = glsr(Validator::class)->validate($request, $rules);
+		if (empty($errors)) {
+			return true;
+		}
+		$this->error = __('Please fix the submission errors.', 'site-reviews');
+		$this->setSessionValues('errors', $errors);
+		$this->setSessionValues('values', $request);
+		return false;
+	}
 
-    protected function setError($message, $loggedMessage = '')
-    {
-        $this->setSessionValues('errors', [], $loggedMessage);
-        $this->error = $message;
-    }
+	protected function setError($message, $loggedMessage = '')
+	{
+		$this->setSessionValues('errors', [], $loggedMessage);
+		$this->error = $message;
+	}
 
-    /**
-     * @param string $type
-     * @param mixed $value
-     * @param string $loggedMessage
-     * @return void
-     */
-    protected function setSessionValues($type, $value, $loggedMessage = '')
-    {
-        glsr()->sessionSet($this->form_id.$type, $value);
-        if (!empty($loggedMessage)) {
-            glsr_log()->warning($loggedMessage)->debug($this->request);
-        }
-    }
+	/**
+	 * @param string $type
+	 * @param mixed $value
+	 * @param string $loggedMessage
+	 * @return void
+	 */
+	protected function setSessionValues($type, $value, $loggedMessage = '')
+	{
+		glsr()->sessionSet($this->form_id.$type, $value);
+		if (!empty($loggedMessage)) {
+			glsr_log()->warning($loggedMessage)->debug($this->request);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateAkismet()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (glsr(Akismet::class)->isSpam($this->request)) {
-            $this->setError(__('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews'),
-                'Akismet caught a spam submission (consider adding the IP address to the blacklist):'
-            );
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateAkismet()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (glsr(Akismet::class)->isSpam($this->request)) {
+			$this->setError(__('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews'),
+				'Akismet caught a spam submission (consider adding the IP address to the blacklist):'
+			);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateBlacklist()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
-            return;
-        }
-        $blacklistAction = $this->getOption('settings.submissions.blacklist.action');
-        if ('reject' != $blacklistAction) {
-            $this->request['blacklisted'] = true;
-            return;
-        }
-        $this->setError(__('Your review cannot be submitted at this time.', 'site-reviews'),
-            'Blacklisted submission detected:'
-        );
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateBlacklist()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
+			return;
+		}
+		$blacklistAction = $this->getOption('settings.submissions.blacklist.action');
+		if ('reject' != $blacklistAction) {
+			$this->request['blacklisted'] = true;
+			return;
+		}
+		$this->setError(__('Your review cannot be submitted at this time.', 'site-reviews'),
+			'Blacklisted submission detected:'
+		);
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateCustom()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        $validated = apply_filters('site-reviews/validate/custom', true, $this->request);
-        if (true === $validated) {
-            return;
-        }
-        $errorMessage = is_string($validated)
-            ? $validated
-            : __('The review submission failed. Please notify the site administrator.', 'site-reviews');
-        $this->setError($errorMessage);
-        $this->setSessionValues('values', $this->request);
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateCustom()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		$validated = apply_filters('site-reviews/validate/custom', true, $this->request);
+		if (true === $validated) {
+			return;
+		}
+		$errorMessage = is_string($validated)
+			? $validated
+			: __('The review submission failed. Please notify the site administrator.', 'site-reviews');
+		$this->setError($errorMessage);
+		$this->setSessionValues('values', $this->request);
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateHoneyPot()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (!empty($this->request['gotcha'])) {
-            $this->setError(__('The review submission failed. Please notify the site administrator.', 'site-reviews'),
-                'The Honeypot caught a bad submission:'
-            );
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateHoneyPot()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (!empty($this->request['gotcha'])) {
+			$this->setError(__('The review submission failed. Please notify the site administrator.', 'site-reviews'),
+				'The Honeypot caught a bad submission:'
+			);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function validatePermission()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (!is_user_logged_in() && glsr(OptionManager::class)->getBool('settings.general.require.login')) {
-            $this->setError(__('You must be logged in to submit a review.', 'site-reviews'));
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function validatePermission()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (!is_user_logged_in() && glsr(OptionManager::class)->getBool('settings.general.require.login')) {
+			$this->setError(__('You must be logged in to submit a review.', 'site-reviews'));
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateReviewLimits()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (glsr(ReviewLimits::class)->hasReachedLimit($this->request)) {
-            $this->setError(__('You have already submitted a review.', 'site-reviews'));
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateReviewLimits()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (glsr(ReviewLimits::class)->hasReachedLimit($this->request)) {
+			$this->setError(__('You have already submitted a review.', 'site-reviews'));
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateRecaptcha()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        $status = $this->getRecaptchaStatus();
-        if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
-            return;
-        }
-        if (static::RECAPTCHA_EMPTY === $status) {
-            $this->setSessionValues('recaptcha', 'unset');
-            $this->recaptchaIsUnset = true;
-            return;
-        }
-        $this->setSessionValues('recaptcha', 'reset');
-        $errors = [
-            static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
-            static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
-        ];
-        $this->setError($errors[$status]);
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateRecaptcha()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		$status = $this->getRecaptchaStatus();
+		if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
+			return;
+		}
+		if (static::RECAPTCHA_EMPTY === $status) {
+			$this->setSessionValues('recaptcha', 'unset');
+			$this->recaptchaIsUnset = true;
+			return;
+		}
+		$this->setSessionValues('recaptcha', 'reset');
+		$errors = [
+			static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
+			static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
+		];
+		$this->setError($errors[$status]);
+	}
 
-    /**
-     * @return array
-     */
-    protected function validateRequest(array $request)
-    {
-        return $this->isRequestValid($request)
-            ? array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request)
-            : $request;
-    }
+	/**
+	 * @return array
+	 */
+	protected function validateRequest(array $request)
+	{
+		return $this->isRequestValid($request)
+			? array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request)
+			: $request;
+	}
 }

Spacing +73 added lines, -73 removed lines

@@ -58,12 +58,12 @@ 
     /**
      * @return static
      */
-    public function validate(array $request)
+    public function validate( array $request )
     {
         $request['ip_address'] = Helper::getIpAddress(); // required for Akismet and Blacklist validation
         $this->form_id = $request['form_id'];
-        $this->options = glsr(OptionManager::class)->all();
-        $this->request = $this->validateRequest($request);
+        $this->options = glsr( OptionManager::class )->all();
+        $this->request = $this->validateRequest( $request );
         $this->validateCustom();
         $this->validatePermission();
         $this->validateHoneyPot();
@@ -71,8 +71,8 @@ 
         $this->validateBlacklist();
         $this->validateAkismet();
         $this->validateRecaptcha();
-        if (!empty($this->error)) {
-            $this->setSessionValues('message', $this->error);
+        if( !empty($this->error) ) {
+            $this->setSessionValues( 'message', $this->error );
         }
         return $this;
     }
@@ -82,9 +82,9 @@ 
      * @param mixed $fallback
      * @return mixed
      */
-    protected function getOption($path, $fallback = '')
+    protected function getOption( $path, $fallback = '' )
     {
-        return Arr::get($this->options, $path, $fallback);
+        return Arr::get( $this->options, $path, $fallback );
     }
 
     /**
@@ -92,11 +92,11 @@ 
      */
     protected function getRecaptchaStatus()
     {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
             return static::RECAPTCHA_DISABLED;
         }
-        if (empty($this->request['_recaptcha-token'])) {
-            return $this->request['_counter'] < intval(apply_filters('site-reviews/recaptcha/timeout', 5))
+        if( empty($this->request['_recaptcha-token']) ) {
+            return $this->request['_counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ) )
                 ? static::RECAPTCHA_EMPTY
                 : static::RECAPTCHA_FAILED;
         }
@@ -108,23 +108,23 @@ 
      */
     protected function getRecaptchaTokenStatus()
     {
-        $endpoint = add_query_arg([
+        $endpoint = add_query_arg( [
             'remoteip' => Helper::getIpAddress(),
             'response' => $this->request['_recaptcha-token'],
-            'secret' => $this->getOption('settings.submissions.recaptcha.secret'),
-        ], static::RECAPTCHA_ENDPOINT);
-        if (is_wp_error($response = wp_remote_get($endpoint))) {
-            glsr_log()->error($response->get_error_message());
+            'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ),
+        ], static::RECAPTCHA_ENDPOINT );
+        if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) {
+            glsr_log()->error( $response->get_error_message() );
             return static::RECAPTCHA_FAILED;
         }
-        $response = json_decode(wp_remote_retrieve_body($response));
-        if (!empty($response->success)) {
-            return boolval($response->success)
+        $response = json_decode( wp_remote_retrieve_body( $response ) );
+        if( !empty($response->success) ) {
+            return boolval( $response->success )
                 ? static::RECAPTCHA_VALID
                 : static::RECAPTCHA_INVALID;
         }
-        foreach ($response->{'error-codes'} as $error) {
-            glsr_log()->error('reCAPTCHA error: '.$error);
+        foreach( $response->{'error-codes'} as $error ) {
+            glsr_log()->error( 'reCAPTCHA error: '.$error );
         }
         return static::RECAPTCHA_INVALID;
     }
@@ -132,35 +132,35 @@ 
     /**
      * @return array
      */
-    protected function getValidationRules(array $request)
+    protected function getValidationRules( array $request )
     {
         $rules = array_intersect_key(
-            apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
-            array_flip($this->getOption('settings.submissions.required', []))
+            apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES, $request ),
+            array_flip( $this->getOption( 'settings.submissions.required', [] ) )
         );
-        $excluded = explode(',', Arr::get($request, 'excluded'));
-        return array_diff_key($rules, array_flip($excluded));
+        $excluded = explode( ',', Arr::get( $request, 'excluded' ) );
+        return array_diff_key( $rules, array_flip( $excluded ) );
     }
 
     /**
      * @return bool
      */
-    protected function isRequestValid(array $request)
+    protected function isRequestValid( array $request )
     {
-        $rules = $this->getValidationRules($request);
-        $errors = glsr(Validator::class)->validate($request, $rules);
-        if (empty($errors)) {
+        $rules = $this->getValidationRules( $request );
+        $errors = glsr( Validator::class )->validate( $request, $rules );
+        if( empty($errors) ) {
             return true;
         }
-        $this->error = __('Please fix the submission errors.', 'site-reviews');
-        $this->setSessionValues('errors', $errors);
-        $this->setSessionValues('values', $request);
+        $this->error = __( 'Please fix the submission errors.', 'site-reviews' );
+        $this->setSessionValues( 'errors', $errors );
+        $this->setSessionValues( 'values', $request );
         return false;
     }
 
-    protected function setError($message, $loggedMessage = '')
+    protected function setError( $message, $loggedMessage = '' )
     {
-        $this->setSessionValues('errors', [], $loggedMessage);
+        $this->setSessionValues( 'errors', [], $loggedMessage );
         $this->error = $message;
     }
 
@@ -170,11 +170,11 @@ 
      * @param string $loggedMessage
      * @return void
      */
-    protected function setSessionValues($type, $value, $loggedMessage = '')
+    protected function setSessionValues( $type, $value, $loggedMessage = '' )
     {
-        glsr()->sessionSet($this->form_id.$type, $value);
-        if (!empty($loggedMessage)) {
-            glsr_log()->warning($loggedMessage)->debug($this->request);
+        glsr()->sessionSet( $this->form_id.$type, $value );
+        if( !empty($loggedMessage) ) {
+            glsr_log()->warning( $loggedMessage )->debug( $this->request );
         }
     }
 
@@ -183,11 +183,11 @@ 
      */
     protected function validateAkismet()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (glsr(Akismet::class)->isSpam($this->request)) {
-            $this->setError(__('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews'),
+        if( glsr( Akismet::class )->isSpam( $this->request ) ) {
+            $this->setError( __( 'This review has been flagged as possible spam and cannot be submitted.', 'site-reviews' ),
                 'Akismet caught a spam submission (consider adding the IP address to the blacklist):'
             );
         }
@@ -198,18 +198,18 @@ 
      */
     protected function validateBlacklist()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
+        if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) ) {
             return;
         }
-        $blacklistAction = $this->getOption('settings.submissions.blacklist.action');
-        if ('reject' != $blacklistAction) {
+        $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
+        if( 'reject' != $blacklistAction ) {
             $this->request['blacklisted'] = true;
             return;
         }
-        $this->setError(__('Your review cannot be submitted at this time.', 'site-reviews'),
+        $this->setError( __( 'Your review cannot be submitted at this time.', 'site-reviews' ),
             'Blacklisted submission detected:'
         );
     }
@@ -219,18 +219,18 @@ 
      */
     protected function validateCustom()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        $validated = apply_filters('site-reviews/validate/custom', true, $this->request);
-        if (true === $validated) {
+        $validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
+        if( true === $validated ) {
             return;
         }
-        $errorMessage = is_string($validated)
+        $errorMessage = is_string( $validated )
             ? $validated
-            : __('The review submission failed. Please notify the site administrator.', 'site-reviews');
-        $this->setError($errorMessage);
-        $this->setSessionValues('values', $this->request);
+            : __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
+        $this->setError( $errorMessage );
+        $this->setSessionValues( 'values', $this->request );
     }
 
     /**
@@ -238,11 +238,11 @@ 
      */
     protected function validateHoneyPot()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!empty($this->request['gotcha'])) {
-            $this->setError(__('The review submission failed. Please notify the site administrator.', 'site-reviews'),
+        if( !empty($this->request['gotcha']) ) {
+            $this->setError( __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ),
                 'The Honeypot caught a bad submission:'
             );
         }
@@ -253,11 +253,11 @@ 
      */
     protected function validatePermission()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!is_user_logged_in() && glsr(OptionManager::class)->getBool('settings.general.require.login')) {
-            $this->setError(__('You must be logged in to submit a review.', 'site-reviews'));
+        if( !is_user_logged_in() && glsr( OptionManager::class )->getBool( 'settings.general.require.login' ) ) {
+            $this->setError( __( 'You must be logged in to submit a review.', 'site-reviews' ) );
         }
     }
 
@@ -266,11 +266,11 @@ 
      */
     protected function validateReviewLimits()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (glsr(ReviewLimits::class)->hasReachedLimit($this->request)) {
-            $this->setError(__('You have already submitted a review.', 'site-reviews'));
+        if( glsr( ReviewLimits::class )->hasReachedLimit( $this->request ) ) {
+            $this->setError( __( 'You have already submitted a review.', 'site-reviews' ) );
         }
     }
 
@@ -279,33 +279,33 @@ 
      */
     protected function validateRecaptcha()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
         $status = $this->getRecaptchaStatus();
-        if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
+        if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ) ) {
             return;
         }
-        if (static::RECAPTCHA_EMPTY === $status) {
-            $this->setSessionValues('recaptcha', 'unset');
+        if( static::RECAPTCHA_EMPTY === $status ) {
+            $this->setSessionValues( 'recaptcha', 'unset' );
             $this->recaptchaIsUnset = true;
             return;
         }
-        $this->setSessionValues('recaptcha', 'reset');
+        $this->setSessionValues( 'recaptcha', 'reset' );
         $errors = [
-            static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
-            static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
+            static::RECAPTCHA_FAILED => __( 'The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews' ),
+            static::RECAPTCHA_INVALID => __( 'The reCAPTCHA verification failed, please try again.', 'site-reviews' ),
         ];
-        $this->setError($errors[$status]);
+        $this->setError( $errors[$status] );
     }
 
     /**
      * @return array
      */
-    protected function validateRequest(array $request)
+    protected function validateRequest( array $request )
     {
-        return $this->isRequestValid($request)
-            ? array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request)
+        return $this->isRequestValid( $request )
+            ? array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request )
             : $request;
     }
 }

plugin/Modules/Schema.php

Indentation +308 added lines, -308 removed lines

@@ -12,335 +12,335 @@
 
 class Schema
 {
-    /**
-     * @var array
-     */
-    protected $args;
+	/**
+	 * @var array
+	 */
+	protected $args;
 
-    /**
-     * @var array
-     */
-    protected $keyValues = [];
+	/**
+	 * @var array
+	 */
+	protected $keyValues = [];
 
-    /**
-     * @var array
-     */
-    protected $ratingCounts;
+	/**
+	 * @var array
+	 */
+	protected $ratingCounts;
 
-    /**
-     * @return array
-     */
-    public function build(array $args = [])
-    {
-        $this->args = $args;
-        $schema = $this->buildSummary($args);
-        if (!empty($schema)) {
-            $reviews = $this->buildReviews();
-            foreach ($reviews as &$review) {
-                unset($review['@context']);
-                unset($review['itemReviewed']);
-            }
-        }
-        if (!empty($reviews)) {
-            $schema['review'] = $reviews;
-        }
-        return $schema;
-    }
+	/**
+	 * @return array
+	 */
+	public function build(array $args = [])
+	{
+		$this->args = $args;
+		$schema = $this->buildSummary($args);
+		if (!empty($schema)) {
+			$reviews = $this->buildReviews();
+			foreach ($reviews as &$review) {
+				unset($review['@context']);
+				unset($review['itemReviewed']);
+			}
+		}
+		if (!empty($reviews)) {
+			$schema['review'] = $reviews;
+		}
+		return $schema;
+	}
 
-    /**
-     * @param array|null $args
-     * @return array
-     */
-    public function buildSummary($args = null)
-    {
-        if (is_array($args)) {
-            $this->args = $args;
-        }
-        $buildSummary = Helper::buildMethodName($this->getSchemaOptionValue('type'), 'buildSummaryFor');
-        if ($count = array_sum($this->getRatingCounts())) {
-            $schema = method_exists($this, $buildSummary)
-                ? $this->$buildSummary()
-                : $this->buildSummaryForCustom();
-            $schema->aggregateRating(
-                $this->getSchemaType('AggregateRating')
-                    ->ratingValue($this->getRatingValue())
-                    ->reviewCount($count)
-                    ->bestRating(glsr()->constant('MAX_RATING', Rating::class))
-                    ->worstRating(glsr()->constant('MIN_RATING', Rating::class))
-            );
-            $schema = $schema->toArray();
-            return apply_filters('site-reviews/schema/'.$schema['@type'], $schema, $args);
-        }
-        return [];
-    }
+	/**
+	 * @param array|null $args
+	 * @return array
+	 */
+	public function buildSummary($args = null)
+	{
+		if (is_array($args)) {
+			$this->args = $args;
+		}
+		$buildSummary = Helper::buildMethodName($this->getSchemaOptionValue('type'), 'buildSummaryFor');
+		if ($count = array_sum($this->getRatingCounts())) {
+			$schema = method_exists($this, $buildSummary)
+				? $this->$buildSummary()
+				: $this->buildSummaryForCustom();
+			$schema->aggregateRating(
+				$this->getSchemaType('AggregateRating')
+					->ratingValue($this->getRatingValue())
+					->reviewCount($count)
+					->bestRating(glsr()->constant('MAX_RATING', Rating::class))
+					->worstRating(glsr()->constant('MIN_RATING', Rating::class))
+			);
+			$schema = $schema->toArray();
+			return apply_filters('site-reviews/schema/'.$schema['@type'], $schema, $args);
+		}
+		return [];
+	}
 
-    /**
-     * @return void
-     */
-    public function render()
-    {
-        if (empty(glsr()->schemas)) {
-            return;
-        }
-        printf('<script type="application/ld+json">%s</script>', json_encode(
-            apply_filters('site-reviews/schema/all', glsr()->schemas),
-            JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES
-        ));
-    }
+	/**
+	 * @return void
+	 */
+	public function render()
+	{
+		if (empty(glsr()->schemas)) {
+			return;
+		}
+		printf('<script type="application/ld+json">%s</script>', json_encode(
+			apply_filters('site-reviews/schema/all', glsr()->schemas),
+			JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES
+		));
+	}
 
-    /**
-     * @return void
-     */
-    public function store(array $schema)
-    {
-        if (empty($schema)) {
-            return;
-        }
-        $schemas = glsr()->schemas;
-        $schemas[] = $schema;
-        glsr()->schemas = array_map('unserialize', array_unique(array_map('serialize', $schemas)));
-    }
+	/**
+	 * @return void
+	 */
+	public function store(array $schema)
+	{
+		if (empty($schema)) {
+			return;
+		}
+		$schemas = glsr()->schemas;
+		$schemas[] = $schema;
+		glsr()->schemas = array_map('unserialize', array_unique(array_map('serialize', $schemas)));
+	}
 
-    /**
-     * @param Review $review
-     * @return array
-     */
-    protected function buildReview($review)
-    {
-        $schema = $this->getSchemaType('Review')
-            ->doIf(!in_array('title', $this->args['hide']), function ($schema) use ($review) {
-                $schema->name($review->title);
-            })
-            ->doIf(!in_array('excerpt', $this->args['hide']), function ($schema) use ($review) {
-                $schema->reviewBody($review->content);
-            })
-            ->datePublished((new DateTime($review->date)))
-            ->author($this->getSchemaType('Person')->name($review->author))
-            ->itemReviewed($this->getSchemaType()->name($this->getSchemaOptionValue('name')));
-        if (!empty($review->rating)) {
-            $schema->reviewRating(
-                $this->getSchemaType('Rating')
-                    ->ratingValue($review->rating)
-                    ->bestRating(glsr()->constant('MAX_RATING', Rating::class))
-                    ->worstRating(glsr()->constant('MIN_RATING', Rating::class))
-            );
-        }
-        return apply_filters('site-reviews/schema/review', $schema->toArray(), $review, $this->args);
-    }
+	/**
+	 * @param Review $review
+	 * @return array
+	 */
+	protected function buildReview($review)
+	{
+		$schema = $this->getSchemaType('Review')
+			->doIf(!in_array('title', $this->args['hide']), function ($schema) use ($review) {
+				$schema->name($review->title);
+			})
+			->doIf(!in_array('excerpt', $this->args['hide']), function ($schema) use ($review) {
+				$schema->reviewBody($review->content);
+			})
+			->datePublished((new DateTime($review->date)))
+			->author($this->getSchemaType('Person')->name($review->author))
+			->itemReviewed($this->getSchemaType()->name($this->getSchemaOptionValue('name')));
+		if (!empty($review->rating)) {
+			$schema->reviewRating(
+				$this->getSchemaType('Rating')
+					->ratingValue($review->rating)
+					->bestRating(glsr()->constant('MAX_RATING', Rating::class))
+					->worstRating(glsr()->constant('MIN_RATING', Rating::class))
+			);
+		}
+		return apply_filters('site-reviews/schema/review', $schema->toArray(), $review, $this->args);
+	}
 
-    /**
-     * @return array
-     */
-    protected function buildReviews()
-    {
-        $reviews = [];
-        foreach (glsr(ReviewManager::class)->get($this->args) as $review) {
-            // Only include critic reviews that have been directly produced by your site, not reviews from third-party sites or syndicated reviews.
-            // @see https://developers.google.com/search/docs/data-types/review
-            if ('local' === $review->review_type) {
-                $reviews[] = $this->buildReview($review);
-            }
-        }
-        return $reviews;
-    }
+	/**
+	 * @return array
+	 */
+	protected function buildReviews()
+	{
+		$reviews = [];
+		foreach (glsr(ReviewManager::class)->get($this->args) as $review) {
+			// Only include critic reviews that have been directly produced by your site, not reviews from third-party sites or syndicated reviews.
+			// @see https://developers.google.com/search/docs/data-types/review
+			if ('local' === $review->review_type) {
+				$reviews[] = $this->buildReview($review);
+			}
+		}
+		return $reviews;
+	}
 
-    /**
-     * @param mixed $schema
-     * @return mixed
-     */
-    protected function buildSchemaValues($schema, array $values = [])
-    {
-        foreach ($values as $value) {
-            $option = $this->getSchemaOptionValue($value);
-            if (empty($option)) {
-                continue;
-            }
-            $schema->$value($option);
-        }
-        return $schema;
-    }
+	/**
+	 * @param mixed $schema
+	 * @return mixed
+	 */
+	protected function buildSchemaValues($schema, array $values = [])
+	{
+		foreach ($values as $value) {
+			$option = $this->getSchemaOptionValue($value);
+			if (empty($option)) {
+				continue;
+			}
+			$schema->$value($option);
+		}
+		return $schema;
+	}
 
-    /**
-     * @return mixed
-     */
-    protected function buildSummaryForCustom()
-    {
-        return $this->buildSchemaValues($this->getSchemaType(), [
-            'description', 'image', 'name', 'url',
-        ]);
-    }
+	/**
+	 * @return mixed
+	 */
+	protected function buildSummaryForCustom()
+	{
+		return $this->buildSchemaValues($this->getSchemaType(), [
+			'description', 'image', 'name', 'url',
+		]);
+	}
 
-    /**
-     * @return mixed
-     */
-    protected function buildSummaryForLocalBusiness()
-    {
-        return $this->buildSchemaValues($this->buildSummaryForCustom(), [
-            'address', 'priceRange', 'telephone',
-        ]);
-    }
+	/**
+	 * @return mixed
+	 */
+	protected function buildSummaryForLocalBusiness()
+	{
+		return $this->buildSchemaValues($this->buildSummaryForCustom(), [
+			'address', 'priceRange', 'telephone',
+		]);
+	}
 
-    /**
-     * @return mixed
-     */
-    protected function buildSummaryForProduct()
-    {
-        $offerType = $this->getSchemaOption('offerType', 'AggregateOffer');
-        $offers = $this->buildSchemaValues($this->getSchemaType($offerType), [
-            'highPrice', 'lowPrice', 'price', 'priceCurrency',
-        ]);
-        return $this->buildSummaryForCustom()
-            ->doIf(!empty($offers->getProperties()), function ($schema) use ($offers) {
-                $schema->offers($offers);
-            })
-            ->setProperty('@id', $this->getSchemaOptionValue('url').'#product');
-    }
+	/**
+	 * @return mixed
+	 */
+	protected function buildSummaryForProduct()
+	{
+		$offerType = $this->getSchemaOption('offerType', 'AggregateOffer');
+		$offers = $this->buildSchemaValues($this->getSchemaType($offerType), [
+			'highPrice', 'lowPrice', 'price', 'priceCurrency',
+		]);
+		return $this->buildSummaryForCustom()
+			->doIf(!empty($offers->getProperties()), function ($schema) use ($offers) {
+				$schema->offers($offers);
+			})
+			->setProperty('@id', $this->getSchemaOptionValue('url').'#product');
+	}
 
-    /**
-     * @return array
-     */
-    protected function getRatingCounts()
-    {
-        if (!isset($this->ratingCounts)) {
-            $this->ratingCounts = glsr(ReviewManager::class)->getRatingCounts($this->args);
-        }
-        return $this->ratingCounts;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getRatingCounts()
+	{
+		if (!isset($this->ratingCounts)) {
+			$this->ratingCounts = glsr(ReviewManager::class)->getRatingCounts($this->args);
+		}
+		return $this->ratingCounts;
+	}
 
-    /**
-     * @return int|float
-     */
-    protected function getRatingValue()
-    {
-        return glsr(Rating::class)->getAverage($this->getRatingCounts());
-    }
+	/**
+	 * @return int|float
+	 */
+	protected function getRatingValue()
+	{
+		return glsr(Rating::class)->getAverage($this->getRatingCounts());
+	}
 
-    /**
-     * @param string $option
-     * @param string $fallback
-     * @return string
-     */
-    protected function getSchemaOption($option, $fallback)
-    {
-        $option = strtolower($option);
-        if ($schemaOption = trim((string) get_post_meta(intval(get_the_ID()), 'schema_'.$option, true))) {
-            return $schemaOption;
-        }
-        $setting = glsr(OptionManager::class)->get('settings.schema.'.$option);
-        if (is_array($setting)) {
-            return $this->getSchemaOptionDefault($setting, $fallback);
-        }
-        return !empty($setting)
-            ? $setting
-            : $fallback;
-    }
+	/**
+	 * @param string $option
+	 * @param string $fallback
+	 * @return string
+	 */
+	protected function getSchemaOption($option, $fallback)
+	{
+		$option = strtolower($option);
+		if ($schemaOption = trim((string) get_post_meta(intval(get_the_ID()), 'schema_'.$option, true))) {
+			return $schemaOption;
+		}
+		$setting = glsr(OptionManager::class)->get('settings.schema.'.$option);
+		if (is_array($setting)) {
+			return $this->getSchemaOptionDefault($setting, $fallback);
+		}
+		return !empty($setting)
+			? $setting
+			: $fallback;
+	}
 
-    /**
-     * @param string $fallback
-     * @return string
-     */
-    protected function getSchemaOptionDefault(array $setting, $fallback)
-    {
-        $setting = wp_parse_args($setting, [
-            'custom' => '',
-            'default' => $fallback,
-        ]);
-        return 'custom' != $setting['default']
-            ? $setting['default']
-            : $setting['custom'];
-    }
+	/**
+	 * @param string $fallback
+	 * @return string
+	 */
+	protected function getSchemaOptionDefault(array $setting, $fallback)
+	{
+		$setting = wp_parse_args($setting, [
+			'custom' => '',
+			'default' => $fallback,
+		]);
+		return 'custom' != $setting['default']
+			? $setting['default']
+			: $setting['custom'];
+	}
 
-    /**
-     * @param string $option
-     * @param string $fallback
-     * @return void|string
-     */
-    protected function getSchemaOptionValue($option, $fallback = 'post')
-    {
-        if (array_key_exists($option, $this->keyValues)) {
-            return $this->keyValues[$option];
-        }
-        $value = $this->getSchemaOption($option, $fallback);
-        if ($value != $fallback) {
-            return $this->setAndGetKeyValue($option, $value);
-        }
-        if (!is_single() && !is_page()) {
-            return;
-        }
-        $method = Helper::buildMethodName($option, 'getThing');
-        if (method_exists($this, $method)) {
-            return $this->setAndGetKeyValue($option, $this->$method());
-        }
-    }
+	/**
+	 * @param string $option
+	 * @param string $fallback
+	 * @return void|string
+	 */
+	protected function getSchemaOptionValue($option, $fallback = 'post')
+	{
+		if (array_key_exists($option, $this->keyValues)) {
+			return $this->keyValues[$option];
+		}
+		$value = $this->getSchemaOption($option, $fallback);
+		if ($value != $fallback) {
+			return $this->setAndGetKeyValue($option, $value);
+		}
+		if (!is_single() && !is_page()) {
+			return;
+		}
+		$method = Helper::buildMethodName($option, 'getThing');
+		if (method_exists($this, $method)) {
+			return $this->setAndGetKeyValue($option, $this->$method());
+		}
+	}
 
-    /**
-     * @param string|null $type
-     * @return mixed
-     */
-    protected function getSchemaType($type = null)
-    {
-        if (!is_string($type)) {
-            $type = $this->getSchemaOption('type', 'LocalBusiness');
-        }
-        $className = Helper::buildClassName($type, 'Modules\Schema');
-        return class_exists($className)
-            ? new $className()
-            : new UnknownType($type);
-    }
+	/**
+	 * @param string|null $type
+	 * @return mixed
+	 */
+	protected function getSchemaType($type = null)
+	{
+		if (!is_string($type)) {
+			$type = $this->getSchemaOption('type', 'LocalBusiness');
+		}
+		$className = Helper::buildClassName($type, 'Modules\Schema');
+		return class_exists($className)
+			? new $className()
+			: new UnknownType($type);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getThingDescription()
-    {
-        $post = get_post();
-        $text = Arr::get($post, 'post_excerpt');
-        if (empty($text)) {
-            $text = Arr::get($post, 'post_content');
-        }
-        if (function_exists('excerpt_remove_blocks')) {
-            $text = excerpt_remove_blocks($text);
-        }
-        $text = strip_shortcodes($text);
-        $text = wpautop($text);
-        $text = wptexturize($text);
-        $text = wp_strip_all_tags($text);
-        $text = str_replace(']]>', ']]&gt;', $text);
-        return wp_trim_words($text, apply_filters('excerpt_length', 55));
-    }
+	/**
+	 * @return string
+	 */
+	protected function getThingDescription()
+	{
+		$post = get_post();
+		$text = Arr::get($post, 'post_excerpt');
+		if (empty($text)) {
+			$text = Arr::get($post, 'post_content');
+		}
+		if (function_exists('excerpt_remove_blocks')) {
+			$text = excerpt_remove_blocks($text);
+		}
+		$text = strip_shortcodes($text);
+		$text = wpautop($text);
+		$text = wptexturize($text);
+		$text = wp_strip_all_tags($text);
+		$text = str_replace(']]>', ']]&gt;', $text);
+		return wp_trim_words($text, apply_filters('excerpt_length', 55));
+	}
 
-    /**
-     * @return string
-     */
-    protected function getThingImage()
-    {
-        return (string) get_the_post_thumbnail_url(null, 'large');
-    }
+	/**
+	 * @return string
+	 */
+	protected function getThingImage()
+	{
+		return (string) get_the_post_thumbnail_url(null, 'large');
+	}
 
-    /**
-     * @return string
-     */
-    protected function getThingName()
-    {
-        return get_the_title();
-    }
+	/**
+	 * @return string
+	 */
+	protected function getThingName()
+	{
+		return get_the_title();
+	}
 
-    /**
-     * @return string
-     */
-    protected function getThingUrl()
-    {
-        return (string) get_the_permalink();
-    }
+	/**
+	 * @return string
+	 */
+	protected function getThingUrl()
+	{
+		return (string) get_the_permalink();
+	}
 
-    /**
-     * @param string $option
-     * @param string $value
-     * @return string
-     */
-    protected function setAndGetKeyValue($option, $value)
-    {
-        $this->keyValues[$option] = $value;
-        return $value;
-    }
+	/**
+	 * @param string $option
+	 * @param string $value
+	 * @return string
+	 */
+	protected function setAndGetKeyValue($option, $value)
+	{
+		$this->keyValues[$option] = $value;
+		return $value;
+	}
 }

Spacing +97 added lines, -97 removed lines

@@ -30,18 +30,18 @@ 
     /**
      * @return array
      */
-    public function build(array $args = [])
+    public function build( array $args = [] )
     {
         $this->args = $args;
-        $schema = $this->buildSummary($args);
-        if (!empty($schema)) {
+        $schema = $this->buildSummary( $args );
+        if( !empty($schema) ) {
             $reviews = $this->buildReviews();
-            foreach ($reviews as &$review) {
+            foreach( $reviews as &$review ) {
                 unset($review['@context']);
                 unset($review['itemReviewed']);
             }
         }
-        if (!empty($reviews)) {
+        if( !empty($reviews) ) {
             $schema['review'] = $reviews;
         }
         return $schema;
@@ -51,25 +51,25 @@ 
      * @param array|null $args
      * @return array
      */
-    public function buildSummary($args = null)
+    public function buildSummary( $args = null )
     {
-        if (is_array($args)) {
+        if( is_array( $args ) ) {
             $this->args = $args;
         }
-        $buildSummary = Helper::buildMethodName($this->getSchemaOptionValue('type'), 'buildSummaryFor');
-        if ($count = array_sum($this->getRatingCounts())) {
-            $schema = method_exists($this, $buildSummary)
+        $buildSummary = Helper::buildMethodName( $this->getSchemaOptionValue( 'type' ), 'buildSummaryFor' );
+        if( $count = array_sum( $this->getRatingCounts() ) ) {
+            $schema = method_exists( $this, $buildSummary )
                 ? $this->$buildSummary()
                 : $this->buildSummaryForCustom();
             $schema->aggregateRating(
-                $this->getSchemaType('AggregateRating')
-                    ->ratingValue($this->getRatingValue())
-                    ->reviewCount($count)
-                    ->bestRating(glsr()->constant('MAX_RATING', Rating::class))
-                    ->worstRating(glsr()->constant('MIN_RATING', Rating::class))
+                $this->getSchemaType( 'AggregateRating' )
+                    ->ratingValue( $this->getRatingValue() )
+                    ->reviewCount( $count )
+                    ->bestRating( glsr()->constant( 'MAX_RATING', Rating::class ) )
+                    ->worstRating( glsr()->constant( 'MIN_RATING', Rating::class ) )
             );
             $schema = $schema->toArray();
-            return apply_filters('site-reviews/schema/'.$schema['@type'], $schema, $args);
+            return apply_filters( 'site-reviews/schema/'.$schema['@type'], $schema, $args );
         }
         return [];
     }
@@ -79,53 +79,53 @@ 
      */
     public function render()
     {
-        if (empty(glsr()->schemas)) {
+        if( empty(glsr()->schemas) ) {
             return;
         }
-        printf('<script type="application/ld+json">%s</script>', json_encode(
-            apply_filters('site-reviews/schema/all', glsr()->schemas),
+        printf( '<script type="application/ld+json">%s</script>', json_encode(
+            apply_filters( 'site-reviews/schema/all', glsr()->schemas ),
             JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES
-        ));
+        ) );
     }
 
     /**
      * @return void
      */
-    public function store(array $schema)
+    public function store( array $schema )
     {
-        if (empty($schema)) {
+        if( empty($schema) ) {
             return;
         }
         $schemas = glsr()->schemas;
         $schemas[] = $schema;
-        glsr()->schemas = array_map('unserialize', array_unique(array_map('serialize', $schemas)));
+        glsr()->schemas = array_map( 'unserialize', array_unique( array_map( 'serialize', $schemas ) ) );
     }
 
     /**
      * @param Review $review
      * @return array
      */
-    protected function buildReview($review)
+    protected function buildReview( $review )
     {
-        $schema = $this->getSchemaType('Review')
-            ->doIf(!in_array('title', $this->args['hide']), function ($schema) use ($review) {
-                $schema->name($review->title);
+        $schema = $this->getSchemaType( 'Review' )
+            ->doIf( !in_array( 'title', $this->args['hide'] ), function( $schema ) use ($review) {
+                $schema->name( $review->title );
             })
-            ->doIf(!in_array('excerpt', $this->args['hide']), function ($schema) use ($review) {
-                $schema->reviewBody($review->content);
+            ->doIf( !in_array( 'excerpt', $this->args['hide'] ), function( $schema ) use ($review) {
+                $schema->reviewBody( $review->content );
             })
-            ->datePublished((new DateTime($review->date)))
-            ->author($this->getSchemaType('Person')->name($review->author))
-            ->itemReviewed($this->getSchemaType()->name($this->getSchemaOptionValue('name')));
-        if (!empty($review->rating)) {
+            ->datePublished( (new DateTime( $review->date )) )
+            ->author( $this->getSchemaType( 'Person' )->name( $review->author ) )
+            ->itemReviewed( $this->getSchemaType()->name( $this->getSchemaOptionValue( 'name' ) ) );
+        if( !empty($review->rating) ) {
             $schema->reviewRating(
-                $this->getSchemaType('Rating')
-                    ->ratingValue($review->rating)
-                    ->bestRating(glsr()->constant('MAX_RATING', Rating::class))
-                    ->worstRating(glsr()->constant('MIN_RATING', Rating::class))
+                $this->getSchemaType( 'Rating' )
+                    ->ratingValue( $review->rating )
+                    ->bestRating( glsr()->constant( 'MAX_RATING', Rating::class ) )
+                    ->worstRating( glsr()->constant( 'MIN_RATING', Rating::class ) )
             );
         }
-        return apply_filters('site-reviews/schema/review', $schema->toArray(), $review, $this->args);
+        return apply_filters( 'site-reviews/schema/review', $schema->toArray(), $review, $this->args );
     }
 
     /**
@@ -134,11 +134,11 @@ 
     protected function buildReviews()
     {
         $reviews = [];
-        foreach (glsr(ReviewManager::class)->get($this->args) as $review) {
+        foreach( glsr( ReviewManager::class )->get( $this->args ) as $review ) {
             // Only include critic reviews that have been directly produced by your site, not reviews from third-party sites or syndicated reviews.
             // @see https://developers.google.com/search/docs/data-types/review
-            if ('local' === $review->review_type) {
-                $reviews[] = $this->buildReview($review);
+            if( 'local' === $review->review_type ) {
+                $reviews[] = $this->buildReview( $review );
             }
         }
         return $reviews;
@@ -148,14 +148,14 @@ 
      * @param mixed $schema
      * @return mixed
      */
-    protected function buildSchemaValues($schema, array $values = [])
+    protected function buildSchemaValues( $schema, array $values = [] )
     {
-        foreach ($values as $value) {
-            $option = $this->getSchemaOptionValue($value);
-            if (empty($option)) {
+        foreach( $values as $value ) {
+            $option = $this->getSchemaOptionValue( $value );
+            if( empty($option) ) {
                 continue;
             }
-            $schema->$value($option);
+            $schema->$value( $option );
         }
         return $schema;
     }
@@ -165,9 +165,9 @@ 
      */
     protected function buildSummaryForCustom()
     {
-        return $this->buildSchemaValues($this->getSchemaType(), [
+        return $this->buildSchemaValues( $this->getSchemaType(), [
             'description', 'image', 'name', 'url',
-        ]);
+        ] );
     }
 
     /**
@@ -175,9 +175,9 @@ 
      */
     protected function buildSummaryForLocalBusiness()
     {
-        return $this->buildSchemaValues($this->buildSummaryForCustom(), [
+        return $this->buildSchemaValues( $this->buildSummaryForCustom(), [
             'address', 'priceRange', 'telephone',
-        ]);
+        ] );
     }
 
     /**
@@ -185,15 +185,15 @@ 
      */
     protected function buildSummaryForProduct()
     {
-        $offerType = $this->getSchemaOption('offerType', 'AggregateOffer');
-        $offers = $this->buildSchemaValues($this->getSchemaType($offerType), [
+        $offerType = $this->getSchemaOption( 'offerType', 'AggregateOffer' );
+        $offers = $this->buildSchemaValues( $this->getSchemaType( $offerType ), [
             'highPrice', 'lowPrice', 'price', 'priceCurrency',
-        ]);
+        ] );
         return $this->buildSummaryForCustom()
-            ->doIf(!empty($offers->getProperties()), function ($schema) use ($offers) {
-                $schema->offers($offers);
+            ->doIf( !empty($offers->getProperties()), function( $schema ) use ($offers) {
+                $schema->offers( $offers );
             })
-            ->setProperty('@id', $this->getSchemaOptionValue('url').'#product');
+            ->setProperty( '@id', $this->getSchemaOptionValue( 'url' ).'#product' );
     }
 
     /**
@@ -201,8 +201,8 @@ 
      */
     protected function getRatingCounts()
     {
-        if (!isset($this->ratingCounts)) {
-            $this->ratingCounts = glsr(ReviewManager::class)->getRatingCounts($this->args);
+        if( !isset($this->ratingCounts) ) {
+            $this->ratingCounts = glsr( ReviewManager::class )->getRatingCounts( $this->args );
         }
         return $this->ratingCounts;
     }
@@ -212,7 +212,7 @@ 
      */
     protected function getRatingValue()
     {
-        return glsr(Rating::class)->getAverage($this->getRatingCounts());
+        return glsr( Rating::class )->getAverage( $this->getRatingCounts() );
     }
 
     /**
@@ -220,15 +220,15 @@ 
      * @param string $fallback
      * @return string
      */
-    protected function getSchemaOption($option, $fallback)
+    protected function getSchemaOption( $option, $fallback )
     {
-        $option = strtolower($option);
-        if ($schemaOption = trim((string) get_post_meta(intval(get_the_ID()), 'schema_'.$option, true))) {
+        $option = strtolower( $option );
+        if( $schemaOption = trim( (string)get_post_meta( intval( get_the_ID() ), 'schema_'.$option, true ) ) ) {
             return $schemaOption;
         }
-        $setting = glsr(OptionManager::class)->get('settings.schema.'.$option);
-        if (is_array($setting)) {
-            return $this->getSchemaOptionDefault($setting, $fallback);
+        $setting = glsr( OptionManager::class )->get( 'settings.schema.'.$option );
+        if( is_array( $setting ) ) {
+            return $this->getSchemaOptionDefault( $setting, $fallback );
         }
         return !empty($setting)
             ? $setting
@@ -239,12 +239,12 @@ 
      * @param string $fallback
      * @return string
      */
-    protected function getSchemaOptionDefault(array $setting, $fallback)
+    protected function getSchemaOptionDefault( array $setting, $fallback )
     {
-        $setting = wp_parse_args($setting, [
+        $setting = wp_parse_args( $setting, [
             'custom' => '',
             'default' => $fallback,
-        ]);
+        ] );
         return 'custom' != $setting['default']
             ? $setting['default']
             : $setting['custom'];
@@ -255,21 +255,21 @@ 
      * @param string $fallback
      * @return void|string
      */
-    protected function getSchemaOptionValue($option, $fallback = 'post')
+    protected function getSchemaOptionValue( $option, $fallback = 'post' )
     {
-        if (array_key_exists($option, $this->keyValues)) {
+        if( array_key_exists( $option, $this->keyValues ) ) {
             return $this->keyValues[$option];
         }
-        $value = $this->getSchemaOption($option, $fallback);
-        if ($value != $fallback) {
-            return $this->setAndGetKeyValue($option, $value);
+        $value = $this->getSchemaOption( $option, $fallback );
+        if( $value != $fallback ) {
+            return $this->setAndGetKeyValue( $option, $value );
         }
-        if (!is_single() && !is_page()) {
+        if( !is_single() && !is_page() ) {
             return;
         }
-        $method = Helper::buildMethodName($option, 'getThing');
-        if (method_exists($this, $method)) {
-            return $this->setAndGetKeyValue($option, $this->$method());
+        $method = Helper::buildMethodName( $option, 'getThing' );
+        if( method_exists( $this, $method ) ) {
+            return $this->setAndGetKeyValue( $option, $this->$method() );
         }
     }
 
@@ -277,15 +277,15 @@ 
      * @param string|null $type
      * @return mixed
      */
-    protected function getSchemaType($type = null)
+    protected function getSchemaType( $type = null )
     {
-        if (!is_string($type)) {
-            $type = $this->getSchemaOption('type', 'LocalBusiness');
+        if( !is_string( $type ) ) {
+            $type = $this->getSchemaOption( 'type', 'LocalBusiness' );
         }
-        $className = Helper::buildClassName($type, 'Modules\Schema');
-        return class_exists($className)
+        $className = Helper::buildClassName( $type, 'Modules\Schema' );
+        return class_exists( $className )
             ? new $className()
-            : new UnknownType($type);
+            : new UnknownType( $type );
     }
 
     /**
@@ -294,19 +294,19 @@ 
     protected function getThingDescription()
     {
         $post = get_post();
-        $text = Arr::get($post, 'post_excerpt');
-        if (empty($text)) {
-            $text = Arr::get($post, 'post_content');
+        $text = Arr::get( $post, 'post_excerpt' );
+        if( empty($text) ) {
+            $text = Arr::get( $post, 'post_content' );
         }
-        if (function_exists('excerpt_remove_blocks')) {
-            $text = excerpt_remove_blocks($text);
+        if( function_exists( 'excerpt_remove_blocks' ) ) {
+            $text = excerpt_remove_blocks( $text );
         }
-        $text = strip_shortcodes($text);
-        $text = wpautop($text);
-        $text = wptexturize($text);
-        $text = wp_strip_all_tags($text);
-        $text = str_replace(']]>', ']]&gt;', $text);
-        return wp_trim_words($text, apply_filters('excerpt_length', 55));
+        $text = strip_shortcodes( $text );
+        $text = wpautop( $text );
+        $text = wptexturize( $text );
+        $text = wp_strip_all_tags( $text );
+        $text = str_replace( ']]>', ']]&gt;', $text );
+        return wp_trim_words( $text, apply_filters( 'excerpt_length', 55 ) );
     }
 
     /**
@@ -314,7 +314,7 @@ 
      */
     protected function getThingImage()
     {
-        return (string) get_the_post_thumbnail_url(null, 'large');
+        return (string)get_the_post_thumbnail_url( null, 'large' );
     }
 
     /**
@@ -330,7 +330,7 @@ 
      */
     protected function getThingUrl()
     {
-        return (string) get_the_permalink();
+        return (string)get_the_permalink();
     }
 
     /**
@@ -338,7 +338,7 @@ 
      * @param string $value
      * @return string
      */
-    protected function setAndGetKeyValue($option, $value)
+    protected function setAndGetKeyValue( $option, $value )
     {
         $this->keyValues[$option] = $value;
         return $value;