pryley / site-reviews

plugin/Database/Cache.php

Indentation +57 added lines, -57 removed lines

@@ -6,63 +6,63 @@
 
 class Cache
 {
-    /**
-     * @return array
-     */
-    public function getCloudflareIps()
-    {
-        if (false === ($ipAddresses = get_transient(Application::ID.'_cloudflare_ips'))) {
-            $ipAddresses = array_fill_keys(['v4', 'v6'], []);
-            foreach (array_keys($ipAddresses) as $version) {
-                $url = 'https://www.cloudflare.com/ips-'.$version;
-                $response = wp_remote_get($url, ['sslverify' => false]);
-                if (is_wp_error($response)) {
-                    glsr_log()->error($response->get_error_message());
-                    continue;
-                }
-                if ('200' != ($statusCode = wp_remote_retrieve_response_code($response))) {
-                    glsr_log()->error('Unable to connect to '.$url.' ['.$statusCode.']');
-                    continue;
-                }
-                $ipAddresses[$version] = array_filter(
-                    (array) preg_split('/\R/', wp_remote_retrieve_body($response))
-                );
-            }
-            set_transient(Application::ID.'_cloudflare_ips', $ipAddresses, WEEK_IN_SECONDS);
-        }
-        return $ipAddresses;
-    }
+	/**
+	 * @return array
+	 */
+	public function getCloudflareIps()
+	{
+		if (false === ($ipAddresses = get_transient(Application::ID.'_cloudflare_ips'))) {
+			$ipAddresses = array_fill_keys(['v4', 'v6'], []);
+			foreach (array_keys($ipAddresses) as $version) {
+				$url = 'https://www.cloudflare.com/ips-'.$version;
+				$response = wp_remote_get($url, ['sslverify' => false]);
+				if (is_wp_error($response)) {
+					glsr_log()->error($response->get_error_message());
+					continue;
+				}
+				if ('200' != ($statusCode = wp_remote_retrieve_response_code($response))) {
+					glsr_log()->error('Unable to connect to '.$url.' ['.$statusCode.']');
+					continue;
+				}
+				$ipAddresses[$version] = array_filter(
+					(array) preg_split('/\R/', wp_remote_retrieve_body($response))
+				);
+			}
+			set_transient(Application::ID.'_cloudflare_ips', $ipAddresses, WEEK_IN_SECONDS);
+		}
+		return $ipAddresses;
+	}
 
-    /**
-     * @param string $metaKey
-     * @return array
-     */
-    public function getReviewCountsFor($metaKey)
-    {
-        $counts = wp_cache_get(Application::ID, $metaKey.'_count');
-        if (false === $counts) {
-            $counts = [];
-            $results = glsr(SqlQueries::class)->getReviewCountsFor($metaKey);
-            foreach ($results as $result) {
-                $counts[$result->name] = $result->num_posts;
-            }
-            wp_cache_set(Application::ID, $counts, $metaKey.'_count');
-        }
-        return $counts;
-    }
+	/**
+	 * @param string $metaKey
+	 * @return array
+	 */
+	public function getReviewCountsFor($metaKey)
+	{
+		$counts = wp_cache_get(Application::ID, $metaKey.'_count');
+		if (false === $counts) {
+			$counts = [];
+			$results = glsr(SqlQueries::class)->getReviewCountsFor($metaKey);
+			foreach ($results as $result) {
+				$counts[$result->name] = $result->num_posts;
+			}
+			wp_cache_set(Application::ID, $counts, $metaKey.'_count');
+		}
+		return $counts;
+	}
 
-    /**
-     * @return string
-     */
-    public function getRemotePostTest()
-    {
-        if (false === ($test = get_transient(Application::ID.'_remote_post_test'))) {
-            $response = wp_remote_post('https://api.wordpress.org/stats/php/1.0/');
-            $test = !is_wp_error($response) && in_array($response['response']['code'], range(200, 299))
-                ? 'Works'
-                : 'Does not work';
-            set_transient(Application::ID.'_remote_post_test', $test, WEEK_IN_SECONDS);
-        }
-        return $test;
-    }
+	/**
+	 * @return string
+	 */
+	public function getRemotePostTest()
+	{
+		if (false === ($test = get_transient(Application::ID.'_remote_post_test'))) {
+			$response = wp_remote_post('https://api.wordpress.org/stats/php/1.0/');
+			$test = !is_wp_error($response) && in_array($response['response']['code'], range(200, 299))
+				? 'Works'
+				: 'Does not work';
+			set_transient(Application::ID.'_remote_post_test', $test, WEEK_IN_SECONDS);
+		}
+		return $test;
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -11,24 +11,24 @@ 
      */
     public function getCloudflareIps()
     {
-        if (false === ($ipAddresses = get_transient(Application::ID.'_cloudflare_ips'))) {
-            $ipAddresses = array_fill_keys(['v4', 'v6'], []);
-            foreach (array_keys($ipAddresses) as $version) {
+        if( false === ($ipAddresses = get_transient( Application::ID.'_cloudflare_ips' )) ) {
+            $ipAddresses = array_fill_keys( ['v4', 'v6'], [] );
+            foreach( array_keys( $ipAddresses ) as $version ) {
                 $url = 'https://www.cloudflare.com/ips-'.$version;
-                $response = wp_remote_get($url, ['sslverify' => false]);
-                if (is_wp_error($response)) {
-                    glsr_log()->error($response->get_error_message());
+                $response = wp_remote_get( $url, ['sslverify' => false] );
+                if( is_wp_error( $response ) ) {
+                    glsr_log()->error( $response->get_error_message() );
                     continue;
                 }
-                if ('200' != ($statusCode = wp_remote_retrieve_response_code($response))) {
-                    glsr_log()->error('Unable to connect to '.$url.' ['.$statusCode.']');
+                if( '200' != ($statusCode = wp_remote_retrieve_response_code( $response )) ) {
+                    glsr_log()->error( 'Unable to connect to '.$url.' ['.$statusCode.']' );
                     continue;
                 }
                 $ipAddresses[$version] = array_filter(
-                    (array) preg_split('/\R/', wp_remote_retrieve_body($response))
+                    (array)preg_split( '/\R/', wp_remote_retrieve_body( $response ) )
                 );
             }
-            set_transient(Application::ID.'_cloudflare_ips', $ipAddresses, WEEK_IN_SECONDS);
+            set_transient( Application::ID.'_cloudflare_ips', $ipAddresses, WEEK_IN_SECONDS );
         }
         return $ipAddresses;
     }
@@ -37,16 +37,16 @@ 
      * @param string $metaKey
      * @return array
      */
-    public function getReviewCountsFor($metaKey)
+    public function getReviewCountsFor( $metaKey )
     {
-        $counts = wp_cache_get(Application::ID, $metaKey.'_count');
-        if (false === $counts) {
+        $counts = wp_cache_get( Application::ID, $metaKey.'_count' );
+        if( false === $counts ) {
             $counts = [];
-            $results = glsr(SqlQueries::class)->getReviewCountsFor($metaKey);
-            foreach ($results as $result) {
+            $results = glsr( SqlQueries::class )->getReviewCountsFor( $metaKey );
+            foreach( $results as $result ) {
                 $counts[$result->name] = $result->num_posts;
             }
-            wp_cache_set(Application::ID, $counts, $metaKey.'_count');
+            wp_cache_set( Application::ID, $counts, $metaKey.'_count' );
         }
         return $counts;
     }
@@ -56,12 +56,12 @@ 
      */
     public function getRemotePostTest()
     {
-        if (false === ($test = get_transient(Application::ID.'_remote_post_test'))) {
-            $response = wp_remote_post('https://api.wordpress.org/stats/php/1.0/');
-            $test = !is_wp_error($response) && in_array($response['response']['code'], range(200, 299))
+        if( false === ($test = get_transient( Application::ID.'_remote_post_test' )) ) {
+            $response = wp_remote_post( 'https://api.wordpress.org/stats/php/1.0/' );
+            $test = !is_wp_error( $response ) && in_array( $response['response']['code'], range( 200, 299 ) )
                 ? 'Works'
                 : 'Does not work';
-            set_transient(Application::ID.'_remote_post_test', $test, WEEK_IN_SECONDS);
+            set_transient( Application::ID.'_remote_post_test', $test, WEEK_IN_SECONDS );
         }
         return $test;
     }

plugin/Defaults/CreateReviewDefaults.php

Indentation +36 added lines, -36 removed lines

@@ -6,41 +6,41 @@
 
 class CreateReviewDefaults extends Defaults
 {
-    /**
-     * @var array
-     */
-    protected $guarded = [
-        'assigned_to',
-        'content',
-        'date',
-        'pinned',
-        'response',
-        'review_id',
-        'review_type',
-        'title',
-    ];
+	/**
+	 * @var array
+	 */
+	protected $guarded = [
+		'assigned_to',
+		'content',
+		'date',
+		'pinned',
+		'response',
+		'review_id',
+		'review_type',
+		'title',
+	];
 
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'assigned_to' => '',
-            'author' => '',
-            'avatar' => '',
-            'content' => '',
-            'custom' => '',
-            'date' => '',
-            'email' => '',
-            'ip_address' => '',
-            'pinned' => false,
-            'rating' => '',
-            'response' => '',
-            'review_id' => md5(time().mt_rand()),
-            'review_type' => 'local',
-            'title' => '',
-            'url' => '',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'assigned_to' => '',
+			'author' => '',
+			'avatar' => '',
+			'content' => '',
+			'custom' => '',
+			'date' => '',
+			'email' => '',
+			'ip_address' => '',
+			'pinned' => false,
+			'rating' => '',
+			'response' => '',
+			'review_id' => md5(time().mt_rand()),
+			'review_type' => 'local',
+			'title' => '',
+			'url' => '',
+		];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
             'pinned' => false,
             'rating' => '',
             'response' => '',
-            'review_id' => md5(time().mt_rand()),
+            'review_id' => md5( time().mt_rand() ),
             'review_type' => 'local',
             'title' => '',
             'url' => '',

plugin/Modules/Validator/ValidateReview.php

Indentation +259 added lines, -259 removed lines

@@ -13,285 +13,285 @@
 
 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->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->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 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 +70 added lines, -70 removed lines

@@ -58,20 +58,20 @@ 
     /**
      * @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->validateHoneyPot();
         $this->validateReviewLimits();
         $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;
     }
@@ -81,9 +81,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 );
     }
 
     /**
@@ -91,11 +91,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;
         }
@@ -107,23 +107,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;
     }
@@ -131,35 +131,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;
     }
 
@@ -169,11 +169,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 );
         }
     }
 
@@ -182,11 +182,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):'
             );
         }
@@ -197,18 +197,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:'
         );
     }
@@ -218,18 +218,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 );
     }
 
     /**
@@ -237,11 +237,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:'
             );
         }
@@ -252,11 +252,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' ) );
         }
     }
 
@@ -265,33 +265,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/System.php

Indentation +351 added lines, -351 removed lines

@@ -12,377 +12,377 @@
 
 class System
 {
-    const PAD = 40;
+	const PAD = 40;
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->get();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->get();
+	}
 
-    /**
-     * @return string
-     */
-    public function get()
-    {
-        $details = [
-            'plugin' => 'Plugin Details',
-            'addon' => 'Addon Details',
-            'browser' => 'Browser Details',
-            'server' => 'Server Details',
-            'php' => 'PHP Configuration',
-            'wordpress' => 'WordPress Configuration',
-            'mu-plugin' => 'Must-Use Plugins',
-            'multisite-plugin' => 'Network Active Plugins',
-            'active-plugin' => 'Active Plugins',
-            'inactive-plugin' => 'Inactive Plugins',
-            'setting' => 'Plugin Settings',
-            'reviews' => 'Review Counts',
-        ];
-        $systemInfo = array_reduce(array_keys($details), function ($carry, $key) use ($details) {
-            $methodName = Helper::buildMethodName('get-'.$key.'-details');
-            if (method_exists($this, $methodName) && $systemDetails = $this->$methodName()) {
-                return $carry.$this->implode(
-                    strtoupper($details[$key]),
-                    apply_filters('site-reviews/system/'.$key, $systemDetails)
-                );
-            }
-            return $carry;
-        });
-        return trim($systemInfo);
-    }
+	/**
+	 * @return string
+	 */
+	public function get()
+	{
+		$details = [
+			'plugin' => 'Plugin Details',
+			'addon' => 'Addon Details',
+			'browser' => 'Browser Details',
+			'server' => 'Server Details',
+			'php' => 'PHP Configuration',
+			'wordpress' => 'WordPress Configuration',
+			'mu-plugin' => 'Must-Use Plugins',
+			'multisite-plugin' => 'Network Active Plugins',
+			'active-plugin' => 'Active Plugins',
+			'inactive-plugin' => 'Inactive Plugins',
+			'setting' => 'Plugin Settings',
+			'reviews' => 'Review Counts',
+		];
+		$systemInfo = array_reduce(array_keys($details), function ($carry, $key) use ($details) {
+			$methodName = Helper::buildMethodName('get-'.$key.'-details');
+			if (method_exists($this, $methodName) && $systemDetails = $this->$methodName()) {
+				return $carry.$this->implode(
+					strtoupper($details[$key]),
+					apply_filters('site-reviews/system/'.$key, $systemDetails)
+				);
+			}
+			return $carry;
+		});
+		return trim($systemInfo);
+	}
 
-    /**
-     * @return array
-     */
-    public function getActivePluginDetails()
-    {
-        $plugins = get_plugins();
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactive = array_diff_key($plugins, array_flip($activePlugins));
-        return $this->normalizePluginList(array_diff_key($plugins, $inactive));
-    }
+	/**
+	 * @return array
+	 */
+	public function getActivePluginDetails()
+	{
+		$plugins = get_plugins();
+		$activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
+		$inactive = array_diff_key($plugins, array_flip($activePlugins));
+		return $this->normalizePluginList(array_diff_key($plugins, $inactive));
+	}
 
-    /**
-     * @return array
-     */
-    public function getAddonDetails()
-    {
-        $details = apply_filters('site-reviews/addon/system-info', []);
-        ksort($details);
-        return $details;
-    }
+	/**
+	 * @return array
+	 */
+	public function getAddonDetails()
+	{
+		$details = apply_filters('site-reviews/addon/system-info', []);
+		ksort($details);
+		return $details;
+	}
 
-    /**
-     * @return array
-     */
-    public function getBrowserDetails()
-    {
-        $browser = new Browser();
-        $name = esc_attr($browser->getName());
-        $userAgent = esc_attr($browser->getUserAgent()->getUserAgentString());
-        $version = esc_attr($browser->getVersion());
-        return [
-            'Browser Name' => sprintf('%s %s', $name, $version),
-            'Browser UA' => $userAgent,
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getBrowserDetails()
+	{
+		$browser = new Browser();
+		$name = esc_attr($browser->getName());
+		$userAgent = esc_attr($browser->getUserAgent()->getUserAgentString());
+		$version = esc_attr($browser->getVersion());
+		return [
+			'Browser Name' => sprintf('%s %s', $name, $version),
+			'Browser UA' => $userAgent,
+		];
+	}
 
-    /**
-     * @return array
-     */
-    public function getInactivePluginDetails()
-    {
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactivePlugins = $this->normalizePluginList(array_diff_key(get_plugins(), array_flip($activePlugins)));
-        $multisitePlugins = $this->getMultisitePluginDetails();
-        return empty($multisitePlugins)
-            ? $inactivePlugins
-            : array_diff($inactivePlugins, $multisitePlugins);
-    }
+	/**
+	 * @return array
+	 */
+	public function getInactivePluginDetails()
+	{
+		$activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
+		$inactivePlugins = $this->normalizePluginList(array_diff_key(get_plugins(), array_flip($activePlugins)));
+		$multisitePlugins = $this->getMultisitePluginDetails();
+		return empty($multisitePlugins)
+			? $inactivePlugins
+			: array_diff($inactivePlugins, $multisitePlugins);
+	}
 
-    /**
-     * @return array
-     */
-    public function getMuPluginDetails()
-    {
-        if (empty($plugins = get_mu_plugins())) {
-            return [];
-        }
-        return $this->normalizePluginList($plugins);
-    }
+	/**
+	 * @return array
+	 */
+	public function getMuPluginDetails()
+	{
+		if (empty($plugins = get_mu_plugins())) {
+			return [];
+		}
+		return $this->normalizePluginList($plugins);
+	}
 
-    /**
-     * @return array
-     */
-    public function getMultisitePluginDetails()
-    {
-        $activePlugins = (array) get_site_option('active_sitewide_plugins', []);
-        if (!is_multisite() || empty($activePlugins)) {
-            return [];
-        }
-        return $this->normalizePluginList(array_intersect_key(get_plugins(), $activePlugins));
-    }
+	/**
+	 * @return array
+	 */
+	public function getMultisitePluginDetails()
+	{
+		$activePlugins = (array) get_site_option('active_sitewide_plugins', []);
+		if (!is_multisite() || empty($activePlugins)) {
+			return [];
+		}
+		return $this->normalizePluginList(array_intersect_key(get_plugins(), $activePlugins));
+	}
 
-    /**
-     * @return array
-     */
-    public function getPhpDetails()
-    {
-        $displayErrors = $this->getINI('display_errors', null)
-            ? 'On ('.$this->getINI('display_errors').')'
-            : 'N/A';
-        $intlSupport = extension_loaded('intl')
-            ? phpversion('intl')
-            : 'false';
-        return [
-            'cURL' => var_export(function_exists('curl_init'), true),
-            'Default Charset' => $this->getINI('default_charset'),
-            'Display Errors' => $displayErrors,
-            'fsockopen' => var_export(function_exists('fsockopen'), true),
-            'Intl' => $intlSupport,
-            'IPv6' => var_export(defined('AF_INET6'), true),
-            'Max Execution Time' => $this->getINI('max_execution_time'),
-            'Max Input Nesting Level' => $this->getINI('max_input_nesting_level'),
-            'Max Input Vars' => $this->getINI('max_input_vars'),
-            'Memory Limit' => $this->getINI('memory_limit'),
-            'Post Max Size' => $this->getINI('post_max_size'),
-            'Sendmail Path' => $this->getINI('sendmail_path'),
-            'Session Cookie Path' => esc_html($this->getINI('session.cookie_path')),
-            'Session Name' => esc_html($this->getINI('session.name')),
-            'Session Save Path' => esc_html($this->getINI('session.save_path')),
-            'Session Use Cookies' => var_export(wp_validate_boolean($this->getINI('session.use_cookies', false)), true),
-            'Session Use Only Cookies' => var_export(wp_validate_boolean($this->getINI('session.use_only_cookies', false)), true),
-            'Upload Max Filesize' => $this->getINI('upload_max_filesize'),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getPhpDetails()
+	{
+		$displayErrors = $this->getINI('display_errors', null)
+			? 'On ('.$this->getINI('display_errors').')'
+			: 'N/A';
+		$intlSupport = extension_loaded('intl')
+			? phpversion('intl')
+			: 'false';
+		return [
+			'cURL' => var_export(function_exists('curl_init'), true),
+			'Default Charset' => $this->getINI('default_charset'),
+			'Display Errors' => $displayErrors,
+			'fsockopen' => var_export(function_exists('fsockopen'), true),
+			'Intl' => $intlSupport,
+			'IPv6' => var_export(defined('AF_INET6'), true),
+			'Max Execution Time' => $this->getINI('max_execution_time'),
+			'Max Input Nesting Level' => $this->getINI('max_input_nesting_level'),
+			'Max Input Vars' => $this->getINI('max_input_vars'),
+			'Memory Limit' => $this->getINI('memory_limit'),
+			'Post Max Size' => $this->getINI('post_max_size'),
+			'Sendmail Path' => $this->getINI('sendmail_path'),
+			'Session Cookie Path' => esc_html($this->getINI('session.cookie_path')),
+			'Session Name' => esc_html($this->getINI('session.name')),
+			'Session Save Path' => esc_html($this->getINI('session.save_path')),
+			'Session Use Cookies' => var_export(wp_validate_boolean($this->getINI('session.use_cookies', false)), true),
+			'Session Use Only Cookies' => var_export(wp_validate_boolean($this->getINI('session.use_only_cookies', false)), true),
+			'Upload Max Filesize' => $this->getINI('upload_max_filesize'),
+		];
+	}
 
-    /**
-     * @return array
-     */
-    public function getReviewsDetails()
-    {
-        $counts = glsr(CountsManager::class)->getCounts();
-        $counts = Arr::flattenArray($counts);
-        array_walk($counts, function (&$ratings) use ($counts) {
-            if (!is_array($ratings)) {
-                glsr_log()
-                    ->error('$ratings is not an array, possibly due to incorrectly imported reviews.')
-                    ->debug($ratings)
-                    ->debug($counts);
-                return;
-            }
-            $ratings = array_sum($ratings).' ('.implode(', ', $ratings).')';
-        });
-        ksort($counts);
-        return $counts;
-    }
+	/**
+	 * @return array
+	 */
+	public function getReviewsDetails()
+	{
+		$counts = glsr(CountsManager::class)->getCounts();
+		$counts = Arr::flattenArray($counts);
+		array_walk($counts, function (&$ratings) use ($counts) {
+			if (!is_array($ratings)) {
+				glsr_log()
+					->error('$ratings is not an array, possibly due to incorrectly imported reviews.')
+					->debug($ratings)
+					->debug($counts);
+				return;
+			}
+			$ratings = array_sum($ratings).' ('.implode(', ', $ratings).')';
+		});
+		ksort($counts);
+		return $counts;
+	}
 
-    /**
-     * @return array
-     */
-    public function getServerDetails()
-    {
-        global $wpdb;
-        return [
-            'Host Name' => $this->getHostName(),
-            'MySQL Version' => $wpdb->db_version(),
-            'PHP Version' => PHP_VERSION,
-            'Server Software' => filter_input(INPUT_SERVER, 'SERVER_SOFTWARE'),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getServerDetails()
+	{
+		global $wpdb;
+		return [
+			'Host Name' => $this->getHostName(),
+			'MySQL Version' => $wpdb->db_version(),
+			'PHP Version' => PHP_VERSION,
+			'Server Software' => filter_input(INPUT_SERVER, 'SERVER_SOFTWARE'),
+		];
+	}
 
-    /**
-     * @return array
-     */
-    public function getSettingDetails()
-    {
-        $settings = glsr(OptionManager::class)->get('settings', []);
-        $settings = Arr::flattenArray($settings, true);
-        $settings = $this->purgeSensitiveData($settings);
-        ksort($settings);
-        $details = [];
-        foreach ($settings as $key => $value) {
-            if (Str::startsWith('strings', $key) && Str::endsWith('id', $key)) {
-                continue;
-            }
-            $value = htmlspecialchars(trim(preg_replace('/\s\s+/', '\\n', $value)), ENT_QUOTES, 'UTF-8');
-            $details[$key] = $value;
-        }
-        return $details;
-    }
+	/**
+	 * @return array
+	 */
+	public function getSettingDetails()
+	{
+		$settings = glsr(OptionManager::class)->get('settings', []);
+		$settings = Arr::flattenArray($settings, true);
+		$settings = $this->purgeSensitiveData($settings);
+		ksort($settings);
+		$details = [];
+		foreach ($settings as $key => $value) {
+			if (Str::startsWith('strings', $key) && Str::endsWith('id', $key)) {
+				continue;
+			}
+			$value = htmlspecialchars(trim(preg_replace('/\s\s+/', '\\n', $value)), ENT_QUOTES, 'UTF-8');
+			$details[$key] = $value;
+		}
+		return $details;
+	}
 
-    /**
-     * @return array
-     */
-    public function getPluginDetails()
-    {
-        return [
-            'Console level' => glsr(Console::class)->humanLevel(),
-            'Console size' => glsr(Console::class)->humanSize('0'),
-            'Last Rating Count' => date_i18n('Y-m-d H:i', glsr(OptionManager::class)->get('last_review_count')),
-            'Version (current)' => glsr()->version,
-            'Version (previous)' => glsr(OptionManager::class)->get('version_upgraded_from'),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getPluginDetails()
+	{
+		return [
+			'Console level' => glsr(Console::class)->humanLevel(),
+			'Console size' => glsr(Console::class)->humanSize('0'),
+			'Last Rating Count' => date_i18n('Y-m-d H:i', glsr(OptionManager::class)->get('last_review_count')),
+			'Version (current)' => glsr()->version,
+			'Version (previous)' => glsr(OptionManager::class)->get('version_upgraded_from'),
+		];
+	}
 
-    /**
-     * @return array
-     */
-    public function getWordpressDetails()
-    {
-        global $wpdb;
-        $theme = wp_get_theme();
-        return [
-            'Active Theme' => sprintf('%s v%s', (string) $theme->Name, (string) $theme->Version),
-            'Email Domain' => substr(strrchr(glsr(OptionManager::class)->getWP('admin_email'), '@'), 1),
-            'Home URL' => home_url(),
-            'Language' => get_locale(),
-            'Memory Limit' => WP_MEMORY_LIMIT,
-            'Multisite' => var_export(is_multisite(), true),
-            'Page For Posts ID' => glsr(OptionManager::class)->getWP('page_for_posts'),
-            'Page On Front ID' => glsr(OptionManager::class)->getWP('page_on_front'),
-            'Permalink Structure' => glsr(OptionManager::class)->getWP('permalink_structure', 'default'),
-            'Post Stati' => implode(', ', get_post_stati()),
-            'Remote Post' => glsr(Cache::class)->getRemotePostTest(),
-            'Show On Front' => glsr(OptionManager::class)->getWP('show_on_front'),
-            'Site URL' => site_url(),
-            'Timezone' => glsr(OptionManager::class)->getWP('timezone_string', $this->getINI('date.timezone').' (PHP)'),
-            'Version' => get_bloginfo('version'),
-            'WP Debug' => var_export(defined('WP_DEBUG'), true),
-            'WP Max Upload Size' => size_format(wp_max_upload_size()),
-            'WP Memory Limit' => WP_MEMORY_LIMIT,
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getWordpressDetails()
+	{
+		global $wpdb;
+		$theme = wp_get_theme();
+		return [
+			'Active Theme' => sprintf('%s v%s', (string) $theme->Name, (string) $theme->Version),
+			'Email Domain' => substr(strrchr(glsr(OptionManager::class)->getWP('admin_email'), '@'), 1),
+			'Home URL' => home_url(),
+			'Language' => get_locale(),
+			'Memory Limit' => WP_MEMORY_LIMIT,
+			'Multisite' => var_export(is_multisite(), true),
+			'Page For Posts ID' => glsr(OptionManager::class)->getWP('page_for_posts'),
+			'Page On Front ID' => glsr(OptionManager::class)->getWP('page_on_front'),
+			'Permalink Structure' => glsr(OptionManager::class)->getWP('permalink_structure', 'default'),
+			'Post Stati' => implode(', ', get_post_stati()),
+			'Remote Post' => glsr(Cache::class)->getRemotePostTest(),
+			'Show On Front' => glsr(OptionManager::class)->getWP('show_on_front'),
+			'Site URL' => site_url(),
+			'Timezone' => glsr(OptionManager::class)->getWP('timezone_string', $this->getINI('date.timezone').' (PHP)'),
+			'Version' => get_bloginfo('version'),
+			'WP Debug' => var_export(defined('WP_DEBUG'), true),
+			'WP Max Upload Size' => size_format(wp_max_upload_size()),
+			'WP Memory Limit' => WP_MEMORY_LIMIT,
+		];
+	}
 
-    /**
-     * @return string
-     */
-    protected function detectWebhostProvider()
-    {
-        $checks = [
-            '.accountservergroup.com' => 'Site5',
-            '.gridserver.com' => 'MediaTemple Grid',
-            '.inmotionhosting.com' => 'InMotion Hosting',
-            '.ovh.net' => 'OVH',
-            '.pair.com' => 'pair Networks',
-            '.stabletransit.com' => 'Rackspace Cloud',
-            '.stratoserver.net' => 'STRATO',
-            '.sysfix.eu' => 'SysFix.eu Power Hosting',
-            'bluehost.com' => 'Bluehost',
-            'DH_USER' => 'DreamHost',
-            'Flywheel' => 'Flywheel',
-            'ipagemysql.com' => 'iPage',
-            'ipowermysql.com' => 'IPower',
-            'localhost:/tmp/mysql5.sock' => 'ICDSoft',
-            'mysqlv5' => 'NetworkSolutions',
-            'PAGELYBIN' => 'Pagely',
-            'secureserver.net' => 'GoDaddy',
-            'WPE_APIKEY' => 'WP Engine',
-        ];
-        foreach ($checks as $key => $value) {
-            if (!$this->isWebhostCheckValid($key)) {
-                continue;
-            }
-            return $value;
-        }
-        return implode(',', array_filter([DB_HOST, filter_input(INPUT_SERVER, 'SERVER_NAME')]));
-    }
+	/**
+	 * @return string
+	 */
+	protected function detectWebhostProvider()
+	{
+		$checks = [
+			'.accountservergroup.com' => 'Site5',
+			'.gridserver.com' => 'MediaTemple Grid',
+			'.inmotionhosting.com' => 'InMotion Hosting',
+			'.ovh.net' => 'OVH',
+			'.pair.com' => 'pair Networks',
+			'.stabletransit.com' => 'Rackspace Cloud',
+			'.stratoserver.net' => 'STRATO',
+			'.sysfix.eu' => 'SysFix.eu Power Hosting',
+			'bluehost.com' => 'Bluehost',
+			'DH_USER' => 'DreamHost',
+			'Flywheel' => 'Flywheel',
+			'ipagemysql.com' => 'iPage',
+			'ipowermysql.com' => 'IPower',
+			'localhost:/tmp/mysql5.sock' => 'ICDSoft',
+			'mysqlv5' => 'NetworkSolutions',
+			'PAGELYBIN' => 'Pagely',
+			'secureserver.net' => 'GoDaddy',
+			'WPE_APIKEY' => 'WP Engine',
+		];
+		foreach ($checks as $key => $value) {
+			if (!$this->isWebhostCheckValid($key)) {
+				continue;
+			}
+			return $value;
+		}
+		return implode(',', array_filter([DB_HOST, filter_input(INPUT_SERVER, 'SERVER_NAME')]));
+	}
 
-    /**
-     * @return string
-     */
-    protected function getHostName()
-    {
-        return sprintf('%s (%s)',
-            $this->detectWebhostProvider(),
-            Helper::getIpAddress()
-        );
-    }
+	/**
+	 * @return string
+	 */
+	protected function getHostName()
+	{
+		return sprintf('%s (%s)',
+			$this->detectWebhostProvider(),
+			Helper::getIpAddress()
+		);
+	}
 
-    protected function getINI($name, $disabledValue = 'ini_get() is disabled.')
-    {
-        return function_exists('ini_get')
-            ? ini_get($name)
-            : $disabledValue;
-    }
+	protected function getINI($name, $disabledValue = 'ini_get() is disabled.')
+	{
+		return function_exists('ini_get')
+			? ini_get($name)
+			: $disabledValue;
+	}
 
-    /**
-     * @return array
-     */
-    protected function getWordpressPlugins()
-    {
-        $plugins = get_plugins();
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactive = $this->normalizePluginList(array_diff_key($plugins, array_flip($activePlugins)));
-        $active = $this->normalizePluginList(array_diff_key($plugins, $inactive));
-        return $active + $inactive;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getWordpressPlugins()
+	{
+		$plugins = get_plugins();
+		$activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
+		$inactive = $this->normalizePluginList(array_diff_key($plugins, array_flip($activePlugins)));
+		$active = $this->normalizePluginList(array_diff_key($plugins, $inactive));
+		return $active + $inactive;
+	}
 
-    /**
-     * @param string $title
-     * @return string
-     */
-    protected function implode($title, array $details)
-    {
-        $strings = ['['.$title.']'];
-        $padding = max(array_map('strlen', array_keys($details)));
-        $padding = max([$padding, static::PAD]);
-        foreach ($details as $key => $value) {
-            $strings[] = is_string($key)
-                ? sprintf('%s : %s', str_pad($key, $padding, '.'), $value)
-                : ' - '.$value;
-        }
-        return implode(PHP_EOL, $strings).PHP_EOL.PHP_EOL;
-    }
+	/**
+	 * @param string $title
+	 * @return string
+	 */
+	protected function implode($title, array $details)
+	{
+		$strings = ['['.$title.']'];
+		$padding = max(array_map('strlen', array_keys($details)));
+		$padding = max([$padding, static::PAD]);
+		foreach ($details as $key => $value) {
+			$strings[] = is_string($key)
+				? sprintf('%s : %s', str_pad($key, $padding, '.'), $value)
+				: ' - '.$value;
+		}
+		return implode(PHP_EOL, $strings).PHP_EOL.PHP_EOL;
+	}
 
-    /**
-     * @param string $key
-     * @return bool
-     */
-    protected function isWebhostCheckValid($key)
-    {
-        return defined($key)
-            || filter_input(INPUT_SERVER, $key)
-            || Str::contains(filter_input(INPUT_SERVER, 'SERVER_NAME'), $key)
-            || Str::contains(DB_HOST, $key)
-            || Str::contains(php_uname(), $key);
-    }
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+	protected function isWebhostCheckValid($key)
+	{
+		return defined($key)
+			|| filter_input(INPUT_SERVER, $key)
+			|| Str::contains(filter_input(INPUT_SERVER, 'SERVER_NAME'), $key)
+			|| Str::contains(DB_HOST, $key)
+			|| Str::contains(php_uname(), $key);
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizePluginList(array $plugins)
-    {
-        $plugins = array_map(function ($plugin) {
-            return sprintf('%s v%s', Arr::get($plugin, 'Name'), Arr::get($plugin, 'Version'));
-        }, $plugins);
-        natcasesort($plugins);
-        return array_flip($plugins);
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizePluginList(array $plugins)
+	{
+		$plugins = array_map(function ($plugin) {
+			return sprintf('%s v%s', Arr::get($plugin, 'Name'), Arr::get($plugin, 'Version'));
+		}, $plugins);
+		natcasesort($plugins);
+		return array_flip($plugins);
+	}
 
-    /**
-     * @return array
-     */
-    protected function purgeSensitiveData(array $settings)
-    {
-        $keys = [
-            'general.rebusify_serial',
-            'licenses.',
-            'submissions.recaptcha.key',
-            'submissions.recaptcha.secret',
-        ];
-        array_walk($settings, function (&$value, $setting) use ($keys) {
-            foreach ($keys as $key) {
-                if (!Str::startsWith($key, $setting) || empty($value)) {
-                    continue;
-                }
-                $value = str_repeat('•', 13);
-                return;
-            }
-        });
-        return $settings;
-    }
+	/**
+	 * @return array
+	 */
+	protected function purgeSensitiveData(array $settings)
+	{
+		$keys = [
+			'general.rebusify_serial',
+			'licenses.',
+			'submissions.recaptcha.key',
+			'submissions.recaptcha.secret',
+		];
+		array_walk($settings, function (&$value, $setting) use ($keys) {
+			foreach ($keys as $key) {
+				if (!Str::startsWith($key, $setting) || empty($value)) {
+					continue;
+				}
+				$value = str_repeat('•', 13);
+				return;
+			}
+		});
+		return $settings;
+	}
 }

Spacing +111 added lines, -111 removed lines

@@ -41,17 +41,17 @@ 
             'setting' => 'Plugin Settings',
             'reviews' => 'Review Counts',
         ];
-        $systemInfo = array_reduce(array_keys($details), function ($carry, $key) use ($details) {
-            $methodName = Helper::buildMethodName('get-'.$key.'-details');
-            if (method_exists($this, $methodName) && $systemDetails = $this->$methodName()) {
+        $systemInfo = array_reduce( array_keys( $details ), function( $carry, $key ) use ($details) {
+            $methodName = Helper::buildMethodName( 'get-'.$key.'-details' );
+            if( method_exists( $this, $methodName ) && $systemDetails = $this->$methodName() ) {
                 return $carry.$this->implode(
-                    strtoupper($details[$key]),
-                    apply_filters('site-reviews/system/'.$key, $systemDetails)
+                    strtoupper( $details[$key] ),
+                    apply_filters( 'site-reviews/system/'.$key, $systemDetails )
                 );
             }
             return $carry;
         });
-        return trim($systemInfo);
+        return trim( $systemInfo );
     }
 
     /**
@@ -60,9 +60,9 @@ 
     public function getActivePluginDetails()
     {
         $plugins = get_plugins();
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactive = array_diff_key($plugins, array_flip($activePlugins));
-        return $this->normalizePluginList(array_diff_key($plugins, $inactive));
+        $activePlugins = glsr( OptionManager::class )->getWP( 'active_plugins', [], 'array' );
+        $inactive = array_diff_key( $plugins, array_flip( $activePlugins ) );
+        return $this->normalizePluginList( array_diff_key( $plugins, $inactive ) );
     }
 
     /**
@@ -70,8 +70,8 @@ 
      */
     public function getAddonDetails()
     {
-        $details = apply_filters('site-reviews/addon/system-info', []);
-        ksort($details);
+        $details = apply_filters( 'site-reviews/addon/system-info', [] );
+        ksort( $details );
         return $details;
     }
 
@@ -81,11 +81,11 @@ 
     public function getBrowserDetails()
     {
         $browser = new Browser();
-        $name = esc_attr($browser->getName());
-        $userAgent = esc_attr($browser->getUserAgent()->getUserAgentString());
-        $version = esc_attr($browser->getVersion());
+        $name = esc_attr( $browser->getName() );
+        $userAgent = esc_attr( $browser->getUserAgent()->getUserAgentString() );
+        $version = esc_attr( $browser->getVersion() );
         return [
-            'Browser Name' => sprintf('%s %s', $name, $version),
+            'Browser Name' => sprintf( '%s %s', $name, $version ),
             'Browser UA' => $userAgent,
         ];
     }
@@ -95,12 +95,12 @@ 
      */
     public function getInactivePluginDetails()
     {
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactivePlugins = $this->normalizePluginList(array_diff_key(get_plugins(), array_flip($activePlugins)));
+        $activePlugins = glsr( OptionManager::class )->getWP( 'active_plugins', [], 'array' );
+        $inactivePlugins = $this->normalizePluginList( array_diff_key( get_plugins(), array_flip( $activePlugins ) ) );
         $multisitePlugins = $this->getMultisitePluginDetails();
         return empty($multisitePlugins)
             ? $inactivePlugins
-            : array_diff($inactivePlugins, $multisitePlugins);
+            : array_diff( $inactivePlugins, $multisitePlugins );
     }
 
     /**
@@ -108,10 +108,10 @@ 
      */
     public function getMuPluginDetails()
     {
-        if (empty($plugins = get_mu_plugins())) {
+        if( empty($plugins = get_mu_plugins()) ) {
             return [];
         }
-        return $this->normalizePluginList($plugins);
+        return $this->normalizePluginList( $plugins );
     }
 
     /**
@@ -119,11 +119,11 @@ 
      */
     public function getMultisitePluginDetails()
     {
-        $activePlugins = (array) get_site_option('active_sitewide_plugins', []);
-        if (!is_multisite() || empty($activePlugins)) {
+        $activePlugins = (array)get_site_option( 'active_sitewide_plugins', [] );
+        if( !is_multisite() || empty($activePlugins) ) {
             return [];
         }
-        return $this->normalizePluginList(array_intersect_key(get_plugins(), $activePlugins));
+        return $this->normalizePluginList( array_intersect_key( get_plugins(), $activePlugins ) );
     }
 
     /**
@@ -131,31 +131,31 @@ 
      */
     public function getPhpDetails()
     {
-        $displayErrors = $this->getINI('display_errors', null)
-            ? 'On ('.$this->getINI('display_errors').')'
+        $displayErrors = $this->getINI( 'display_errors', null )
+            ? 'On ('.$this->getINI( 'display_errors' ).')'
             : 'N/A';
-        $intlSupport = extension_loaded('intl')
-            ? phpversion('intl')
+        $intlSupport = extension_loaded( 'intl' )
+            ? phpversion( 'intl' )
             : 'false';
         return [
-            'cURL' => var_export(function_exists('curl_init'), true),
-            'Default Charset' => $this->getINI('default_charset'),
+            'cURL' => var_export( function_exists( 'curl_init' ), true ),
+            'Default Charset' => $this->getINI( 'default_charset' ),
             'Display Errors' => $displayErrors,
-            'fsockopen' => var_export(function_exists('fsockopen'), true),
+            'fsockopen' => var_export( function_exists( 'fsockopen' ), true ),
             'Intl' => $intlSupport,
-            'IPv6' => var_export(defined('AF_INET6'), true),
-            'Max Execution Time' => $this->getINI('max_execution_time'),
-            'Max Input Nesting Level' => $this->getINI('max_input_nesting_level'),
-            'Max Input Vars' => $this->getINI('max_input_vars'),
-            'Memory Limit' => $this->getINI('memory_limit'),
-            'Post Max Size' => $this->getINI('post_max_size'),
-            'Sendmail Path' => $this->getINI('sendmail_path'),
-            'Session Cookie Path' => esc_html($this->getINI('session.cookie_path')),
-            'Session Name' => esc_html($this->getINI('session.name')),
-            'Session Save Path' => esc_html($this->getINI('session.save_path')),
-            'Session Use Cookies' => var_export(wp_validate_boolean($this->getINI('session.use_cookies', false)), true),
-            'Session Use Only Cookies' => var_export(wp_validate_boolean($this->getINI('session.use_only_cookies', false)), true),
-            'Upload Max Filesize' => $this->getINI('upload_max_filesize'),
+            'IPv6' => var_export( defined( 'AF_INET6' ), true ),
+            'Max Execution Time' => $this->getINI( 'max_execution_time' ),
+            'Max Input Nesting Level' => $this->getINI( 'max_input_nesting_level' ),
+            'Max Input Vars' => $this->getINI( 'max_input_vars' ),
+            'Memory Limit' => $this->getINI( 'memory_limit' ),
+            'Post Max Size' => $this->getINI( 'post_max_size' ),
+            'Sendmail Path' => $this->getINI( 'sendmail_path' ),
+            'Session Cookie Path' => esc_html( $this->getINI( 'session.cookie_path' ) ),
+            'Session Name' => esc_html( $this->getINI( 'session.name' ) ),
+            'Session Save Path' => esc_html( $this->getINI( 'session.save_path' ) ),
+            'Session Use Cookies' => var_export( wp_validate_boolean( $this->getINI( 'session.use_cookies', false ) ), true ),
+            'Session Use Only Cookies' => var_export( wp_validate_boolean( $this->getINI( 'session.use_only_cookies', false ) ), true ),
+            'Upload Max Filesize' => $this->getINI( 'upload_max_filesize' ),
         ];
     }
 
@@ -164,19 +164,19 @@ 
      */
     public function getReviewsDetails()
     {
-        $counts = glsr(CountsManager::class)->getCounts();
-        $counts = Arr::flattenArray($counts);
-        array_walk($counts, function (&$ratings) use ($counts) {
-            if (!is_array($ratings)) {
+        $counts = glsr( CountsManager::class )->getCounts();
+        $counts = Arr::flattenArray( $counts );
+        array_walk( $counts, function( &$ratings ) use ($counts) {
+            if( !is_array( $ratings ) ) {
                 glsr_log()
-                    ->error('$ratings is not an array, possibly due to incorrectly imported reviews.')
-                    ->debug($ratings)
-                    ->debug($counts);
+                    ->error( '$ratings is not an array, possibly due to incorrectly imported reviews.' )
+                    ->debug( $ratings )
+                    ->debug( $counts );
                 return;
             }
-            $ratings = array_sum($ratings).' ('.implode(', ', $ratings).')';
+            $ratings = array_sum( $ratings ).' ('.implode( ', ', $ratings ).')';
         });
-        ksort($counts);
+        ksort( $counts );
         return $counts;
     }
 
@@ -190,7 +190,7 @@ 
             'Host Name' => $this->getHostName(),
             'MySQL Version' => $wpdb->db_version(),
             'PHP Version' => PHP_VERSION,
-            'Server Software' => filter_input(INPUT_SERVER, 'SERVER_SOFTWARE'),
+            'Server Software' => filter_input( INPUT_SERVER, 'SERVER_SOFTWARE' ),
         ];
     }
 
@@ -199,16 +199,16 @@ 
      */
     public function getSettingDetails()
     {
-        $settings = glsr(OptionManager::class)->get('settings', []);
-        $settings = Arr::flattenArray($settings, true);
-        $settings = $this->purgeSensitiveData($settings);
-        ksort($settings);
+        $settings = glsr( OptionManager::class )->get( 'settings', [] );
+        $settings = Arr::flattenArray( $settings, true );
+        $settings = $this->purgeSensitiveData( $settings );
+        ksort( $settings );
         $details = [];
-        foreach ($settings as $key => $value) {
-            if (Str::startsWith('strings', $key) && Str::endsWith('id', $key)) {
+        foreach( $settings as $key => $value ) {
+            if( Str::startsWith( 'strings', $key ) && Str::endsWith( 'id', $key ) ) {
                 continue;
             }
-            $value = htmlspecialchars(trim(preg_replace('/\s\s+/', '\\n', $value)), ENT_QUOTES, 'UTF-8');
+            $value = htmlspecialchars( trim( preg_replace( '/\s\s+/', '\\n', $value ) ), ENT_QUOTES, 'UTF-8' );
             $details[$key] = $value;
         }
         return $details;
@@ -220,11 +220,11 @@ 
     public function getPluginDetails()
     {
         return [
-            'Console level' => glsr(Console::class)->humanLevel(),
-            'Console size' => glsr(Console::class)->humanSize('0'),
-            'Last Rating Count' => date_i18n('Y-m-d H:i', glsr(OptionManager::class)->get('last_review_count')),
+            'Console level' => glsr( Console::class )->humanLevel(),
+            'Console size' => glsr( Console::class )->humanSize( '0' ),
+            'Last Rating Count' => date_i18n( 'Y-m-d H:i', glsr( OptionManager::class )->get( 'last_review_count' ) ),
             'Version (current)' => glsr()->version,
-            'Version (previous)' => glsr(OptionManager::class)->get('version_upgraded_from'),
+            'Version (previous)' => glsr( OptionManager::class )->get( 'version_upgraded_from' ),
         ];
     }
 
@@ -236,23 +236,23 @@ 
         global $wpdb;
         $theme = wp_get_theme();
         return [
-            'Active Theme' => sprintf('%s v%s', (string) $theme->Name, (string) $theme->Version),
-            'Email Domain' => substr(strrchr(glsr(OptionManager::class)->getWP('admin_email'), '@'), 1),
+            'Active Theme' => sprintf( '%s v%s', (string)$theme->Name, (string)$theme->Version ),
+            'Email Domain' => substr( strrchr( glsr( OptionManager::class )->getWP( 'admin_email' ), '@' ), 1 ),
             'Home URL' => home_url(),
             'Language' => get_locale(),
             'Memory Limit' => WP_MEMORY_LIMIT,
-            'Multisite' => var_export(is_multisite(), true),
-            'Page For Posts ID' => glsr(OptionManager::class)->getWP('page_for_posts'),
-            'Page On Front ID' => glsr(OptionManager::class)->getWP('page_on_front'),
-            'Permalink Structure' => glsr(OptionManager::class)->getWP('permalink_structure', 'default'),
-            'Post Stati' => implode(', ', get_post_stati()),
-            'Remote Post' => glsr(Cache::class)->getRemotePostTest(),
-            'Show On Front' => glsr(OptionManager::class)->getWP('show_on_front'),
+            'Multisite' => var_export( is_multisite(), true ),
+            'Page For Posts ID' => glsr( OptionManager::class )->getWP( 'page_for_posts' ),
+            'Page On Front ID' => glsr( OptionManager::class )->getWP( 'page_on_front' ),
+            'Permalink Structure' => glsr( OptionManager::class )->getWP( 'permalink_structure', 'default' ),
+            'Post Stati' => implode( ', ', get_post_stati() ),
+            'Remote Post' => glsr( Cache::class )->getRemotePostTest(),
+            'Show On Front' => glsr( OptionManager::class )->getWP( 'show_on_front' ),
             'Site URL' => site_url(),
-            'Timezone' => glsr(OptionManager::class)->getWP('timezone_string', $this->getINI('date.timezone').' (PHP)'),
-            'Version' => get_bloginfo('version'),
-            'WP Debug' => var_export(defined('WP_DEBUG'), true),
-            'WP Max Upload Size' => size_format(wp_max_upload_size()),
+            'Timezone' => glsr( OptionManager::class )->getWP( 'timezone_string', $this->getINI( 'date.timezone' ).' (PHP)' ),
+            'Version' => get_bloginfo( 'version' ),
+            'WP Debug' => var_export( defined( 'WP_DEBUG' ), true ),
+            'WP Max Upload Size' => size_format( wp_max_upload_size() ),
             'WP Memory Limit' => WP_MEMORY_LIMIT,
         ];
     }
@@ -282,13 +282,13 @@ 
             'secureserver.net' => 'GoDaddy',
             'WPE_APIKEY' => 'WP Engine',
         ];
-        foreach ($checks as $key => $value) {
-            if (!$this->isWebhostCheckValid($key)) {
+        foreach( $checks as $key => $value ) {
+            if( !$this->isWebhostCheckValid( $key ) ) {
                 continue;
             }
             return $value;
         }
-        return implode(',', array_filter([DB_HOST, filter_input(INPUT_SERVER, 'SERVER_NAME')]));
+        return implode( ',', array_filter( [DB_HOST, filter_input( INPUT_SERVER, 'SERVER_NAME' )] ) );
     }
 
     /**
@@ -296,16 +296,16 @@ 
      */
     protected function getHostName()
     {
-        return sprintf('%s (%s)',
+        return sprintf( '%s (%s)',
             $this->detectWebhostProvider(),
             Helper::getIpAddress()
         );
     }
 
-    protected function getINI($name, $disabledValue = 'ini_get() is disabled.')
+    protected function getINI( $name, $disabledValue = 'ini_get() is disabled.' )
     {
-        return function_exists('ini_get')
-            ? ini_get($name)
+        return function_exists( 'ini_get' )
+            ? ini_get( $name )
             : $disabledValue;
     }
 
@@ -315,9 +315,9 @@ 
     protected function getWordpressPlugins()
     {
         $plugins = get_plugins();
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactive = $this->normalizePluginList(array_diff_key($plugins, array_flip($activePlugins)));
-        $active = $this->normalizePluginList(array_diff_key($plugins, $inactive));
+        $activePlugins = glsr( OptionManager::class )->getWP( 'active_plugins', [], 'array' );
+        $inactive = $this->normalizePluginList( array_diff_key( $plugins, array_flip( $activePlugins ) ) );
+        $active = $this->normalizePluginList( array_diff_key( $plugins, $inactive ) );
         return $active + $inactive;
     }
 
@@ -325,48 +325,48 @@ 
      * @param string $title
      * @return string
      */
-    protected function implode($title, array $details)
+    protected function implode( $title, array $details )
     {
         $strings = ['['.$title.']'];
-        $padding = max(array_map('strlen', array_keys($details)));
-        $padding = max([$padding, static::PAD]);
-        foreach ($details as $key => $value) {
-            $strings[] = is_string($key)
-                ? sprintf('%s : %s', str_pad($key, $padding, '.'), $value)
+        $padding = max( array_map( 'strlen', array_keys( $details ) ) );
+        $padding = max( [$padding, static::PAD] );
+        foreach( $details as $key => $value ) {
+            $strings[] = is_string( $key )
+                ? sprintf( '%s : %s', str_pad( $key, $padding, '.' ), $value )
                 : ' - '.$value;
         }
-        return implode(PHP_EOL, $strings).PHP_EOL.PHP_EOL;
+        return implode( PHP_EOL, $strings ).PHP_EOL.PHP_EOL;
     }
 
     /**
      * @param string $key
      * @return bool
      */
-    protected function isWebhostCheckValid($key)
+    protected function isWebhostCheckValid( $key )
     {
-        return defined($key)
-            || filter_input(INPUT_SERVER, $key)
-            || Str::contains(filter_input(INPUT_SERVER, 'SERVER_NAME'), $key)
-            || Str::contains(DB_HOST, $key)
-            || Str::contains(php_uname(), $key);
+        return defined( $key )
+            || filter_input( INPUT_SERVER, $key )
+            || Str::contains( filter_input( INPUT_SERVER, 'SERVER_NAME' ), $key )
+            || Str::contains( DB_HOST, $key )
+            || Str::contains( php_uname(), $key );
     }
 
     /**
      * @return array
      */
-    protected function normalizePluginList(array $plugins)
+    protected function normalizePluginList( array $plugins )
     {
-        $plugins = array_map(function ($plugin) {
-            return sprintf('%s v%s', Arr::get($plugin, 'Name'), Arr::get($plugin, 'Version'));
-        }, $plugins);
-        natcasesort($plugins);
-        return array_flip($plugins);
+        $plugins = array_map( function( $plugin ) {
+            return sprintf( '%s v%s', Arr::get( $plugin, 'Name' ), Arr::get( $plugin, 'Version' ) );
+        }, $plugins );
+        natcasesort( $plugins );
+        return array_flip( $plugins );
     }
 
     /**
      * @return array
      */
-    protected function purgeSensitiveData(array $settings)
+    protected function purgeSensitiveData( array $settings )
     {
         $keys = [
             'general.rebusify_serial',
@@ -374,12 +374,12 @@ 
             'submissions.recaptcha.key',
             'submissions.recaptcha.secret',
         ];
-        array_walk($settings, function (&$value, $setting) use ($keys) {
-            foreach ($keys as $key) {
-                if (!Str::startsWith($key, $setting) || empty($value)) {
+        array_walk( $settings, function( &$value, $setting ) use ($keys) {
+            foreach( $keys as $key ) {
+                if( !Str::startsWith( $key, $setting ) || empty($value) ) {
                     continue;
                 }
-                $value = str_repeat('•', 13);
+                $value = str_repeat( '•', 13 );
                 return;
             }
         });

plugin/Helper.php

Indentation +114 added lines, -114 removed lines

@@ -8,124 +8,124 @@
 
 class Helper
 {
-    /**
-     * @param string $name
-     * @param string $path
-     * @return string
-     */
-    public static function buildClassName($name, $path = '')
-    {
-        $className = Str::camelCase($name);
-        $path = ltrim(str_replace(__NAMESPACE__, '', $path), '\\');
-        return !empty($path)
-            ? __NAMESPACE__.'\\'.$path.'\\'.$className
-            : $className;
-    }
+	/**
+	 * @param string $name
+	 * @param string $path
+	 * @return string
+	 */
+	public static function buildClassName($name, $path = '')
+	{
+		$className = Str::camelCase($name);
+		$path = ltrim(str_replace(__NAMESPACE__, '', $path), '\\');
+		return !empty($path)
+			? __NAMESPACE__.'\\'.$path.'\\'.$className
+			: $className;
+	}
 
-    /**
-     * @param string $name
-     * @param string $prefix
-     * @return string
-     */
-    public static function buildMethodName($name, $prefix = '')
-    {
-        return lcfirst($prefix.static::buildClassName($name));
-    }
+	/**
+	 * @param string $name
+	 * @param string $prefix
+	 * @return string
+	 */
+	public static function buildMethodName($name, $prefix = '')
+	{
+		return lcfirst($prefix.static::buildClassName($name));
+	}
 
-    /**
-     * @param string $name
-     * @return string
-     */
-    public static function buildPropertyName($name)
-    {
-        return lcfirst(static::buildClassName($name));
-    }
+	/**
+	 * @param string $name
+	 * @return string
+	 */
+	public static function buildPropertyName($name)
+	{
+		return lcfirst(static::buildClassName($name));
+	}
 
-    /**
-     * @param string $cast
-     * @param mixed $value
-     * @return mixed
-     */
-    public static function castTo($cast = '', $value)
-    {
-        switch ($cast) {
-            case 'array':
-                return (array) $value;
-            case 'bool':
-            case 'boolean':
-                return filter_var($value, FILTER_VALIDATE_BOOLEAN);
-            case 'float':
-                return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
-            case 'int':
-            case 'integer':
-                return (int) filter_var($value, FILTER_VALIDATE_INT);
-            case 'object':
-                return (object) (array) $value;
-            case 'str':
-            case 'string':
-                if (is_object($value) && in_array('__toString', get_class_methods($value))) {
-                    return (string) $value->__toString();
-                }
-                if (is_array($value) || is_object($value)) {
-                    return serialize($value);
-                }
-                return (string) $value;
-            default:
-                return $value;
-        }
-    }
+	/**
+	 * @param string $cast
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	public static function castTo($cast = '', $value)
+	{
+		switch ($cast) {
+			case 'array':
+				return (array) $value;
+			case 'bool':
+			case 'boolean':
+				return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+			case 'float':
+				return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
+			case 'int':
+			case 'integer':
+				return (int) filter_var($value, FILTER_VALIDATE_INT);
+			case 'object':
+				return (object) (array) $value;
+			case 'str':
+			case 'string':
+				if (is_object($value) && in_array('__toString', get_class_methods($value))) {
+					return (string) $value->__toString();
+				}
+				if (is_array($value) || is_object($value)) {
+					return serialize($value);
+				}
+				return (string) $value;
+			default:
+				return $value;
+		}
+	}
 
-    /**
-     * @param string $key
-     * @return mixed
-     */
-    public static function filterInput($key, array $request = [])
-    {
-        if (isset($request[$key])) {
-            return $request[$key];
-        }
-        $variable = filter_input(INPUT_POST, $key);
-        if (is_null($variable) && isset($_POST[$key])) {
-            $variable = $_POST[$key];
-        }
-        return $variable;
-    }
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	public static function filterInput($key, array $request = [])
+	{
+		if (isset($request[$key])) {
+			return $request[$key];
+		}
+		$variable = filter_input(INPUT_POST, $key);
+		if (is_null($variable) && isset($_POST[$key])) {
+			$variable = $_POST[$key];
+		}
+		return $variable;
+	}
 
-    /**
-     * @param string $key
-     * @return array
-     */
-    public static function filterInputArray($key)
-    {
-        $variable = filter_input(INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
-        if (empty($variable) && !empty($_POST[$key]) && is_array($_POST[$key])) {
-            $variable = $_POST[$key];
-        }
-        return (array) $variable;
-    }
+	/**
+	 * @param string $key
+	 * @return array
+	 */
+	public static function filterInputArray($key)
+	{
+		$variable = filter_input(INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
+		if (empty($variable) && !empty($_POST[$key]) && is_array($_POST[$key])) {
+			$variable = $_POST[$key];
+		}
+		return (array) $variable;
+	}
 
-    /**
-     * @return string
-     */
-    public static function getIpAddress()
-    {
-        $whitelist = [];
-        $isUsingCloudflare = !empty(filter_input(INPUT_SERVER, 'CF-Connecting-IP'));
-        if (apply_filters('site-reviews/whip/whitelist/cloudflare', $isUsingCloudflare)) {
-            $cloudflareIps = glsr(Cache::class)->getCloudflareIps();
-            $whitelist[Whip::CLOUDFLARE_HEADERS] = [Whip::IPV4 => $cloudflareIps['v4']];
-            if (defined('AF_INET6')) {
-                $whitelist[Whip::CLOUDFLARE_HEADERS][Whip::IPV6] = $cloudflareIps['v6'];
-            }
-        }
-        $whitelist = apply_filters('site-reviews/whip/whitelist', $whitelist);
-        $methods = apply_filters('site-reviews/whip/methods', Whip::ALL_METHODS);
-        $whip = new Whip($methods, $whitelist);
-        do_action_ref_array('site-reviews/whip', [$whip]);
-        if (false !== ($clientAddress = $whip->getValidIpAddress())) {
-            return (string) $clientAddress;
-        }
-        glsr_log()->error('Unable to detect IP address.');
-        return 'unknown';
-    }
+	/**
+	 * @return string
+	 */
+	public static function getIpAddress()
+	{
+		$whitelist = [];
+		$isUsingCloudflare = !empty(filter_input(INPUT_SERVER, 'CF-Connecting-IP'));
+		if (apply_filters('site-reviews/whip/whitelist/cloudflare', $isUsingCloudflare)) {
+			$cloudflareIps = glsr(Cache::class)->getCloudflareIps();
+			$whitelist[Whip::CLOUDFLARE_HEADERS] = [Whip::IPV4 => $cloudflareIps['v4']];
+			if (defined('AF_INET6')) {
+				$whitelist[Whip::CLOUDFLARE_HEADERS][Whip::IPV6] = $cloudflareIps['v6'];
+			}
+		}
+		$whitelist = apply_filters('site-reviews/whip/whitelist', $whitelist);
+		$methods = apply_filters('site-reviews/whip/methods', Whip::ALL_METHODS);
+		$whip = new Whip($methods, $whitelist);
+		do_action_ref_array('site-reviews/whip', [$whip]);
+		if (false !== ($clientAddress = $whip->getValidIpAddress())) {
+			return (string) $clientAddress;
+		}
+		glsr_log()->error('Unable to detect IP address.');
+		return 'unknown';
+	}
 }

Spacing +38 added lines, -38 removed lines

@@ -13,10 +13,10 @@ 
      * @param string $path
      * @return string
      */
-    public static function buildClassName($name, $path = '')
+    public static function buildClassName( $name, $path = '' )
     {
-        $className = Str::camelCase($name);
-        $path = ltrim(str_replace(__NAMESPACE__, '', $path), '\\');
+        $className = Str::camelCase( $name );
+        $path = ltrim( str_replace( __NAMESPACE__, '', $path ), '\\' );
         return !empty($path)
             ? __NAMESPACE__.'\\'.$path.'\\'.$className
             : $className;
@@ -27,18 +27,18 @@ 
      * @param string $prefix
      * @return string
      */
-    public static function buildMethodName($name, $prefix = '')
+    public static function buildMethodName( $name, $prefix = '' )
     {
-        return lcfirst($prefix.static::buildClassName($name));
+        return lcfirst( $prefix.static::buildClassName( $name ) );
     }
 
     /**
      * @param string $name
      * @return string
      */
-    public static function buildPropertyName($name)
+    public static function buildPropertyName( $name )
     {
-        return lcfirst(static::buildClassName($name));
+        return lcfirst( static::buildClassName( $name ) );
     }
 
     /**
@@ -46,30 +46,30 @@ 
      * @param mixed $value
      * @return mixed
      */
-    public static function castTo($cast = '', $value)
+    public static function castTo( $cast = '', $value )
     {
-        switch ($cast) {
+        switch( $cast ) {
             case 'array':
-                return (array) $value;
+                return (array)$value;
             case 'bool':
             case 'boolean':
-                return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+                return filter_var( $value, FILTER_VALIDATE_BOOLEAN );
             case 'float':
-                return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
+                return (float)filter_var( $value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND );
             case 'int':
             case 'integer':
-                return (int) filter_var($value, FILTER_VALIDATE_INT);
+                return (int)filter_var( $value, FILTER_VALIDATE_INT );
             case 'object':
-                return (object) (array) $value;
+                return (object)(array)$value;
             case 'str':
             case 'string':
-                if (is_object($value) && in_array('__toString', get_class_methods($value))) {
-                    return (string) $value->__toString();
+                if( is_object( $value ) && in_array( '__toString', get_class_methods( $value ) ) ) {
+                    return (string)$value->__toString();
                 }
-                if (is_array($value) || is_object($value)) {
-                    return serialize($value);
+                if( is_array( $value ) || is_object( $value ) ) {
+                    return serialize( $value );
                 }
-                return (string) $value;
+                return (string)$value;
             default:
                 return $value;
         }
@@ -79,13 +79,13 @@ 
      * @param string $key
      * @return mixed
      */
-    public static function filterInput($key, array $request = [])
+    public static function filterInput( $key, array $request = [] )
     {
-        if (isset($request[$key])) {
+        if( isset($request[$key]) ) {
             return $request[$key];
         }
-        $variable = filter_input(INPUT_POST, $key);
-        if (is_null($variable) && isset($_POST[$key])) {
+        $variable = filter_input( INPUT_POST, $key );
+        if( is_null( $variable ) && isset($_POST[$key]) ) {
             $variable = $_POST[$key];
         }
         return $variable;
@@ -95,13 +95,13 @@ 
      * @param string $key
      * @return array
      */
-    public static function filterInputArray($key)
+    public static function filterInputArray( $key )
     {
-        $variable = filter_input(INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
-        if (empty($variable) && !empty($_POST[$key]) && is_array($_POST[$key])) {
+        $variable = filter_input( INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
+        if( empty($variable) && !empty($_POST[$key]) && is_array( $_POST[$key] ) ) {
             $variable = $_POST[$key];
         }
-        return (array) $variable;
+        return (array)$variable;
     }
 
     /**
@@ -110,22 +110,22 @@ 
     public static function getIpAddress()
     {
         $whitelist = [];
-        $isUsingCloudflare = !empty(filter_input(INPUT_SERVER, 'CF-Connecting-IP'));
-        if (apply_filters('site-reviews/whip/whitelist/cloudflare', $isUsingCloudflare)) {
-            $cloudflareIps = glsr(Cache::class)->getCloudflareIps();
+        $isUsingCloudflare = !empty(filter_input( INPUT_SERVER, 'CF-Connecting-IP' ));
+        if( apply_filters( 'site-reviews/whip/whitelist/cloudflare', $isUsingCloudflare ) ) {
+            $cloudflareIps = glsr( Cache::class )->getCloudflareIps();
             $whitelist[Whip::CLOUDFLARE_HEADERS] = [Whip::IPV4 => $cloudflareIps['v4']];
-            if (defined('AF_INET6')) {
+            if( defined( 'AF_INET6' ) ) {
                 $whitelist[Whip::CLOUDFLARE_HEADERS][Whip::IPV6] = $cloudflareIps['v6'];
             }
         }
-        $whitelist = apply_filters('site-reviews/whip/whitelist', $whitelist);
-        $methods = apply_filters('site-reviews/whip/methods', Whip::ALL_METHODS);
-        $whip = new Whip($methods, $whitelist);
-        do_action_ref_array('site-reviews/whip', [$whip]);
-        if (false !== ($clientAddress = $whip->getValidIpAddress())) {
-            return (string) $clientAddress;
+        $whitelist = apply_filters( 'site-reviews/whip/whitelist', $whitelist );
+        $methods = apply_filters( 'site-reviews/whip/methods', Whip::ALL_METHODS );
+        $whip = new Whip( $methods, $whitelist );
+        do_action_ref_array( 'site-reviews/whip', [$whip] );
+        if( false !== ($clientAddress = $whip->getValidIpAddress()) ) {
+            return (string)$clientAddress;
         }
-        glsr_log()->error('Unable to detect IP address.');
+        glsr_log()->error( 'Unable to detect IP address.' );
         return 'unknown';
     }
 }

plugin/Defaults/ValidateReviewDefaults.php

Indentation +18 added lines, -18 removed lines

@@ -6,22 +6,22 @@
 
 class ValidateReviewDefaults extends Defaults
 {
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'assign_to' => '',
-            'category' => '',
-            'content' => '',
-            'email' => '',
-            'form_id' => '',
-            'ip_address' => '',
-            'name' => '',
-            'rating' => '0',
-            'terms' => '',
-            'title' => '',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'assign_to' => '',
+			'category' => '',
+			'content' => '',
+			'email' => '',
+			'form_id' => '',
+			'ip_address' => '',
+			'name' => '',
+			'rating' => '0',
+			'terms' => '',
+			'title' => '',
+		];
+	}
 }

deprecated.php

Indentation +116 added lines, -116 removed lines

@@ -3,134 +3,134 @@
 defined('WPINC') || die;
 
 if (apply_filters('site-reviews/support/deprecated/v4', true)) {
-    // Unprotected review meta has been deprecated
-    add_filter('get_post_metadata', function ($data, $postId, $metaKey, $single) {
-        $metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
-        if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
-            return $data;
-        }
-        glsr()->deprecated[] = sprintf(
-            'The "%1$s" meta_key has been deprecated for Reviews. Please use the protected "_%1$s" meta_key instead.',
-            $metaKey
-        );
-        return get_post_meta($postId, '_'.$metaKey, $single);
-    }, 10, 4);
+	// Unprotected review meta has been deprecated
+	add_filter('get_post_metadata', function ($data, $postId, $metaKey, $single) {
+		$metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
+		if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
+			return $data;
+		}
+		glsr()->deprecated[] = sprintf(
+			'The "%1$s" meta_key has been deprecated for Reviews. Please use the protected "_%1$s" meta_key instead.',
+			$metaKey
+		);
+		return get_post_meta($postId, '_'.$metaKey, $single);
+	}, 10, 4);
 
-    // Modules/Html/Template.php
-    add_filter('site-reviews/interpolate/reviews', function ($context, $template) {
-        $search = '{{ navigation }}';
-        if (false !== strpos($template, $search)) {
-            $context['navigation'] = $context['pagination'];
-            glsr()->deprecated[] = 'The {{ navigation }} template key in "YOUR_THEME/site-reviews/reviews.php" has been deprecated. Please use the {{ pagination }} template key instead.';
-        }
-        return $context;
-    }, 10, 2);
+	// Modules/Html/Template.php
+	add_filter('site-reviews/interpolate/reviews', function ($context, $template) {
+		$search = '{{ navigation }}';
+		if (false !== strpos($template, $search)) {
+			$context['navigation'] = $context['pagination'];
+			glsr()->deprecated[] = 'The {{ navigation }} template key in "YOUR_THEME/site-reviews/reviews.php" has been deprecated. Please use the {{ pagination }} template key instead.';
+		}
+		return $context;
+	}, 10, 2);
 
-    // Database/ReviewManager.php
-    add_action('site-reviews/review/created', function ($review) {
-        if (has_action('site-reviews/local/review/create')) {
-            glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/review/created" hook instead.';
-            do_action('site-reviews/local/review/create', (array) get_post($review->ID), (array) $review, $review->ID);
-        }
-    }, 9);
+	// Database/ReviewManager.php
+	add_action('site-reviews/review/created', function ($review) {
+		if (has_action('site-reviews/local/review/create')) {
+			glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/review/created" hook instead.';
+			do_action('site-reviews/local/review/create', (array) get_post($review->ID), (array) $review, $review->ID);
+		}
+	}, 9);
 
-    // Handlers/CreateReview.php
-    add_action('site-reviews/review/submitted', function ($review) {
-        if (has_action('site-reviews/local/review/submitted')) {
-            glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.';
-            do_action('site-reviews/local/review/submitted', null, $review);
-        }
-        if (has_filter('site-reviews/local/review/submitted/message')) {
-            glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.';
-        }
-    }, 9);
+	// Handlers/CreateReview.php
+	add_action('site-reviews/review/submitted', function ($review) {
+		if (has_action('site-reviews/local/review/submitted')) {
+			glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.';
+			do_action('site-reviews/local/review/submitted', null, $review);
+		}
+		if (has_filter('site-reviews/local/review/submitted/message')) {
+			glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.';
+		}
+	}, 9);
 
-    // Database/ReviewManager.php
-    add_filter('site-reviews/create/review-values', function ($values, $command) {
-        if (has_filter('site-reviews/local/review')) {
-            glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.';
-            return apply_filters('site-reviews/local/review', $values, $command);
-        }
-        return $values;
-    }, 9, 2);
+	// Database/ReviewManager.php
+	add_filter('site-reviews/create/review-values', function ($values, $command) {
+		if (has_filter('site-reviews/local/review')) {
+			glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.';
+			return apply_filters('site-reviews/local/review', $values, $command);
+		}
+		return $values;
+	}, 9, 2);
 
-    // Handlers/EnqueuePublicAssets.php
-    add_filter('site-reviews/enqueue/public/localize', function ($variables) {
-        if (has_filter('site-reviews/enqueue/localize')) {
-            glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.';
-            return apply_filters('site-reviews/enqueue/localize', $variables);
-        }
-        return $variables;
-    }, 9);
+	// Handlers/EnqueuePublicAssets.php
+	add_filter('site-reviews/enqueue/public/localize', function ($variables) {
+		if (has_filter('site-reviews/enqueue/localize')) {
+			glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.';
+			return apply_filters('site-reviews/enqueue/localize', $variables);
+		}
+		return $variables;
+	}, 9);
 
-    // Modules/Rating.php
-    add_filter('site-reviews/rating/average', function ($average) {
-        if (has_filter('site-reviews/average/rating')) {
-            glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.';
-        }
-        return $average;
-    }, 9);
+	// Modules/Rating.php
+	add_filter('site-reviews/rating/average', function ($average) {
+		if (has_filter('site-reviews/average/rating')) {
+			glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.';
+		}
+		return $average;
+	}, 9);
 
-    // Modules/Rating.php
-    add_filter('site-reviews/rating/ranking', function ($ranking) {
-        if (has_filter('site-reviews/bayesian/ranking')) {
-            glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.';
-        }
-        return $ranking;
-    }, 9);
+	// Modules/Rating.php
+	add_filter('site-reviews/rating/ranking', function ($ranking) {
+		if (has_filter('site-reviews/bayesian/ranking')) {
+			glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.';
+		}
+		return $ranking;
+	}, 9);
 
-    // Modules/Html/Partials/SiteReviews.php
-    add_filter('site-reviews/review/build/after', function ($renderedFields) {
-        if (has_filter('site-reviews/reviews/review/text')) {
-            glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
-        }
-        if (has_filter('site-reviews/reviews/review/title')) {
-            glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
-        }
-        return $renderedFields;
-    }, 9);
+	// Modules/Html/Partials/SiteReviews.php
+	add_filter('site-reviews/review/build/after', function ($renderedFields) {
+		if (has_filter('site-reviews/reviews/review/text')) {
+			glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
+		}
+		if (has_filter('site-reviews/reviews/review/title')) {
+			glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
+		}
+		return $renderedFields;
+	}, 9);
 
-    // Modules/Html/Partials/SiteReviews.php
-    add_filter('site-reviews/review/build/before', function ($review) {
-        if (has_filter('site-reviews/rendered/review')) {
-            glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.';
-        }
-        if (has_filter('site-reviews/rendered/review/meta/order')) {
-            glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
-        }
-        if (has_filter('site-reviews/rendered/review/order')) {
-            glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
-        }
-        if (has_filter('site-reviews/rendered/review-form/login-register')) {
-            glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).';
-        }
-        if (has_filter('site-reviews/reviews/navigation_links')) {
-            glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).';
-        }
-        return $review;
-    }, 9);
+	// Modules/Html/Partials/SiteReviews.php
+	add_filter('site-reviews/review/build/before', function ($review) {
+		if (has_filter('site-reviews/rendered/review')) {
+			glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.';
+		}
+		if (has_filter('site-reviews/rendered/review/meta/order')) {
+			glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
+		}
+		if (has_filter('site-reviews/rendered/review/order')) {
+			glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
+		}
+		if (has_filter('site-reviews/rendered/review-form/login-register')) {
+			glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).';
+		}
+		if (has_filter('site-reviews/reviews/navigation_links')) {
+			glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).';
+		}
+		return $review;
+	}, 9);
 
-    add_filter('site-reviews/validate/custom', function ($result, $request) {
-        if (has_filter('site-reviews/validate/review/submission')) {
-            glsr_log()->warning('The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.');
-            return apply_filters('site-reviews/validate/review/submission', $result, $request);
-        }
-        return $result;
-    }, 9, 2);
+	add_filter('site-reviews/validate/custom', function ($result, $request) {
+		if (has_filter('site-reviews/validate/review/submission')) {
+			glsr_log()->warning('The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.');
+			return apply_filters('site-reviews/validate/review/submission', $result, $request);
+		}
+		return $result;
+	}, 9, 2);
 
-    add_filter('site-reviews/views/file', function ($file, $view, $data) {
-        if (has_filter('site-reviews/addon/views/file')) {
-            glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.';
-            $file = apply_filters('site-reviews/addon/views/file', $file, $view, $data);
-        }
-        return $file;
-    }, 9, 3);
+	add_filter('site-reviews/views/file', function ($file, $view, $data) {
+		if (has_filter('site-reviews/addon/views/file')) {
+			glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.';
+			$file = apply_filters('site-reviews/addon/views/file', $file, $view, $data);
+		}
+		return $file;
+	}, 9, 3);
 }
 
 add_action('wp_footer', function () {
-    $notices = array_keys(array_flip(glsr()->deprecated));
-    natsort($notices);
-    foreach ($notices as $notice) {
-        glsr_log()->warning($notice);
-    }
+	$notices = array_keys(array_flip(glsr()->deprecated));
+	natsort($notices);
+	foreach ($notices as $notice) {
+		glsr_log()->warning($notice);
+	}
 });

Spacing +58 added lines, -58 removed lines

@@ -1,136 +1,136 @@
 <?php
 
-defined('WPINC') || die;
+defined( 'WPINC' ) || die;
 
-if (apply_filters('site-reviews/support/deprecated/v4', true)) {
+if( apply_filters( 'site-reviews/support/deprecated/v4', true ) ) {
     // Unprotected review meta has been deprecated
-    add_filter('get_post_metadata', function ($data, $postId, $metaKey, $single) {
-        $metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
-        if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
+    add_filter( 'get_post_metadata', function( $data, $postId, $metaKey, $single ) {
+        $metaKeys = array_keys( glsr( 'Defaults\CreateReviewDefaults' )->defaults() );
+        if( !in_array( $metaKey, $metaKeys ) || glsr()->post_type != get_post_type( $postId ) ) {
             return $data;
         }
         glsr()->deprecated[] = sprintf(
             'The "%1$s" meta_key has been deprecated for Reviews. Please use the protected "_%1$s" meta_key instead.',
             $metaKey
         );
-        return get_post_meta($postId, '_'.$metaKey, $single);
-    }, 10, 4);
+        return get_post_meta( $postId, '_'.$metaKey, $single );
+    }, 10, 4 );
 
     // Modules/Html/Template.php
-    add_filter('site-reviews/interpolate/reviews', function ($context, $template) {
+    add_filter( 'site-reviews/interpolate/reviews', function( $context, $template ) {
         $search = '{{ navigation }}';
-        if (false !== strpos($template, $search)) {
+        if( false !== strpos( $template, $search ) ) {
             $context['navigation'] = $context['pagination'];
             glsr()->deprecated[] = 'The {{ navigation }} template key in "YOUR_THEME/site-reviews/reviews.php" has been deprecated. Please use the {{ pagination }} template key instead.';
         }
         return $context;
-    }, 10, 2);
+    }, 10, 2 );
 
     // Database/ReviewManager.php
-    add_action('site-reviews/review/created', function ($review) {
-        if (has_action('site-reviews/local/review/create')) {
+    add_action( 'site-reviews/review/created', function( $review ) {
+        if( has_action( 'site-reviews/local/review/create' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/review/created" hook instead.';
-            do_action('site-reviews/local/review/create', (array) get_post($review->ID), (array) $review, $review->ID);
+            do_action( 'site-reviews/local/review/create', (array)get_post( $review->ID ), (array)$review, $review->ID );
         }
-    }, 9);
+    }, 9 );
 
     // Handlers/CreateReview.php
-    add_action('site-reviews/review/submitted', function ($review) {
-        if (has_action('site-reviews/local/review/submitted')) {
+    add_action( 'site-reviews/review/submitted', function( $review ) {
+        if( has_action( 'site-reviews/local/review/submitted' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.';
-            do_action('site-reviews/local/review/submitted', null, $review);
+            do_action( 'site-reviews/local/review/submitted', null, $review );
         }
-        if (has_filter('site-reviews/local/review/submitted/message')) {
+        if( has_filter( 'site-reviews/local/review/submitted/message' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.';
         }
-    }, 9);
+    }, 9 );
 
     // Database/ReviewManager.php
-    add_filter('site-reviews/create/review-values', function ($values, $command) {
-        if (has_filter('site-reviews/local/review')) {
+    add_filter( 'site-reviews/create/review-values', function( $values, $command ) {
+        if( has_filter( 'site-reviews/local/review' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.';
-            return apply_filters('site-reviews/local/review', $values, $command);
+            return apply_filters( 'site-reviews/local/review', $values, $command );
         }
         return $values;
-    }, 9, 2);
+    }, 9, 2 );
 
     // Handlers/EnqueuePublicAssets.php
-    add_filter('site-reviews/enqueue/public/localize', function ($variables) {
-        if (has_filter('site-reviews/enqueue/localize')) {
+    add_filter( 'site-reviews/enqueue/public/localize', function( $variables ) {
+        if( has_filter( 'site-reviews/enqueue/localize' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.';
-            return apply_filters('site-reviews/enqueue/localize', $variables);
+            return apply_filters( 'site-reviews/enqueue/localize', $variables );
         }
         return $variables;
-    }, 9);
+    }, 9 );
 
     // Modules/Rating.php
-    add_filter('site-reviews/rating/average', function ($average) {
-        if (has_filter('site-reviews/average/rating')) {
+    add_filter( 'site-reviews/rating/average', function( $average ) {
+        if( has_filter( 'site-reviews/average/rating' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.';
         }
         return $average;
-    }, 9);
+    }, 9 );
 
     // Modules/Rating.php
-    add_filter('site-reviews/rating/ranking', function ($ranking) {
-        if (has_filter('site-reviews/bayesian/ranking')) {
+    add_filter( 'site-reviews/rating/ranking', function( $ranking ) {
+        if( has_filter( 'site-reviews/bayesian/ranking' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.';
         }
         return $ranking;
-    }, 9);
+    }, 9 );
 
     // Modules/Html/Partials/SiteReviews.php
-    add_filter('site-reviews/review/build/after', function ($renderedFields) {
-        if (has_filter('site-reviews/reviews/review/text')) {
+    add_filter( 'site-reviews/review/build/after', function( $renderedFields ) {
+        if( has_filter( 'site-reviews/reviews/review/text' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
         }
-        if (has_filter('site-reviews/reviews/review/title')) {
+        if( has_filter( 'site-reviews/reviews/review/title' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
         }
         return $renderedFields;
-    }, 9);
+    }, 9 );
 
     // Modules/Html/Partials/SiteReviews.php
-    add_filter('site-reviews/review/build/before', function ($review) {
-        if (has_filter('site-reviews/rendered/review')) {
+    add_filter( 'site-reviews/review/build/before', function( $review ) {
+        if( has_filter( 'site-reviews/rendered/review' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.';
         }
-        if (has_filter('site-reviews/rendered/review/meta/order')) {
+        if( has_filter( 'site-reviews/rendered/review/meta/order' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
         }
-        if (has_filter('site-reviews/rendered/review/order')) {
+        if( has_filter( 'site-reviews/rendered/review/order' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
         }
-        if (has_filter('site-reviews/rendered/review-form/login-register')) {
+        if( has_filter( 'site-reviews/rendered/review-form/login-register' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).';
         }
-        if (has_filter('site-reviews/reviews/navigation_links')) {
+        if( has_filter( 'site-reviews/reviews/navigation_links' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).';
         }
         return $review;
-    }, 9);
+    }, 9 );
 
-    add_filter('site-reviews/validate/custom', function ($result, $request) {
-        if (has_filter('site-reviews/validate/review/submission')) {
-            glsr_log()->warning('The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.');
-            return apply_filters('site-reviews/validate/review/submission', $result, $request);
+    add_filter( 'site-reviews/validate/custom', function( $result, $request ) {
+        if( has_filter( 'site-reviews/validate/review/submission' ) ) {
+            glsr_log()->warning( 'The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.' );
+            return apply_filters( 'site-reviews/validate/review/submission', $result, $request );
         }
         return $result;
-    }, 9, 2);
+    }, 9, 2 );
 
-    add_filter('site-reviews/views/file', function ($file, $view, $data) {
-        if (has_filter('site-reviews/addon/views/file')) {
+    add_filter( 'site-reviews/views/file', function( $file, $view, $data ) {
+        if( has_filter( 'site-reviews/addon/views/file' ) ) {
             glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.';
-            $file = apply_filters('site-reviews/addon/views/file', $file, $view, $data);
+            $file = apply_filters( 'site-reviews/addon/views/file', $file, $view, $data );
         }
         return $file;
-    }, 9, 3);
+    }, 9, 3 );
 }
 
-add_action('wp_footer', function () {
-    $notices = array_keys(array_flip(glsr()->deprecated));
-    natsort($notices);
-    foreach ($notices as $notice) {
-        glsr_log()->warning($notice);
+add_action( 'wp_footer', function() {
+    $notices = array_keys( array_flip( glsr()->deprecated ) );
+    natsort( $notices );
+    foreach( $notices as $notice ) {
+        glsr_log()->warning( $notice );
     }
 });

plugin/Modules/Schema.php

Indentation +296 added lines, -296 removed lines

@@ -12,322 +12,322 @@
 
 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);
-        $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) {
-                continue;
-            }
-            $reviews[] = $this->buildReview($review);
-        }
-        if (!empty($reviews)) {
-            array_walk($reviews, function (&$review) {
-                unset($review['@context']);
-                unset($review['itemReviewed']);
-            });
-            $schema['review'] = $reviews;
-        }
-        return $schema;
-    }
+	/**
+	 * @return array
+	 */
+	public function build(array $args = [])
+	{
+		$this->args = $args;
+		$schema = $this->buildSummary($args);
+		$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) {
+				continue;
+			}
+			$reviews[] = $this->buildReview($review);
+		}
+		if (!empty($reviews)) {
+			array_walk($reviews, function (&$review) {
+				unset($review['@context']);
+				unset($review['itemReviewed']);
+			});
+			$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');
-        $count = array_sum($this->getRatingCounts());
-        $schema = method_exists($this, $buildSummary)
-            ? $this->$buildSummary()
-            : $this->buildSummaryForCustom();
-        if (!empty($count)) {
-            $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);
-    }
+	/**
+	 * @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');
+		$count = array_sum($this->getRatingCounts());
+		$schema = method_exists($this, $buildSummary)
+			? $this->$buildSummary()
+			: $this->buildSummaryForCustom();
+		if (!empty($count)) {
+			$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 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)
-    {
-        $schemas = glsr()->schemas;
-        $schemas[] = $schema;
-        glsr()->schemas = array_map('unserialize', array_unique(array_map('serialize', $schemas)));
-    }
+	/**
+	 * @return void
+	 */
+	public function store(array $schema)
+	{
+		$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);
+	}
 
-    /**
-     * @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 +96 added lines, -96 removed lines

@@ -30,21 +30,21 @@ 
     /**
      * @return array
      */
-    public function build(array $args = [])
+    public function build( array $args = [] )
     {
         $this->args = $args;
-        $schema = $this->buildSummary($args);
+        $schema = $this->buildSummary( $args );
         $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) {
+            if( 'local' != $review->review_type ) {
                 continue;
             }
-            $reviews[] = $this->buildReview($review);
+            $reviews[] = $this->buildReview( $review );
         }
-        if (!empty($reviews)) {
-            array_walk($reviews, function (&$review) {
+        if( !empty($reviews) ) {
+            array_walk( $reviews, function( &$review ) {
                 unset($review['@context']);
                 unset($review['itemReviewed']);
             });
@@ -57,27 +57,27 @@ 
      * @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');
-        $count = array_sum($this->getRatingCounts());
-        $schema = method_exists($this, $buildSummary)
+        $buildSummary = Helper::buildMethodName( $this->getSchemaOptionValue( 'type' ), 'buildSummaryFor' );
+        $count = array_sum( $this->getRatingCounts() );
+        $schema = method_exists( $this, $buildSummary )
             ? $this->$buildSummary()
             : $this->buildSummaryForCustom();
-        if (!empty($count)) {
+        if( !empty($count) ) {
             $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 );
     }
 
     /**
@@ -85,64 +85,64 @@ 
      */
     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 )
     {
         $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 );
     }
 
     /**
      * @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;
     }
@@ -152,9 +152,9 @@ 
      */
     protected function buildSummaryForCustom()
     {
-        return $this->buildSchemaValues($this->getSchemaType(), [
+        return $this->buildSchemaValues( $this->getSchemaType(), [
             'description', 'image', 'name', 'url',
-        ]);
+        ] );
     }
 
     /**
@@ -162,9 +162,9 @@ 
      */
     protected function buildSummaryForLocalBusiness()
     {
-        return $this->buildSchemaValues($this->buildSummaryForCustom(), [
+        return $this->buildSchemaValues( $this->buildSummaryForCustom(), [
             'address', 'priceRange', 'telephone',
-        ]);
+        ] );
     }
 
     /**
@@ -172,15 +172,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' );
     }
 
     /**
@@ -188,8 +188,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;
     }
@@ -199,7 +199,7 @@ 
      */
     protected function getRatingValue()
     {
-        return glsr(Rating::class)->getAverage($this->getRatingCounts());
+        return glsr( Rating::class )->getAverage( $this->getRatingCounts() );
     }
 
     /**
@@ -207,15 +207,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
@@ -226,12 +226,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'];
@@ -242,21 +242,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() );
         }
     }
 
@@ -264,15 +264,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 );
     }
 
     /**
@@ -281,19 +281,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 ) );
     }
 
     /**
@@ -301,7 +301,7 @@ 
      */
     protected function getThingImage()
     {
-        return (string) get_the_post_thumbnail_url(null, 'large');
+        return (string)get_the_post_thumbnail_url( null, 'large' );
     }
 
     /**
@@ -317,7 +317,7 @@ 
      */
     protected function getThingUrl()
     {
-        return (string) get_the_permalink();
+        return (string)get_the_permalink();
     }
 
     /**
@@ -325,7 +325,7 @@ 
      * @param string $value
      * @return string
      */
-    protected function setAndGetKeyValue($option, $value)
+    protected function setAndGetKeyValue( $option, $value )
     {
         $this->keyValues[$option] = $value;
         return $value;

plugin/Handlers/EnqueuePublicAssets.php

Indentation +136 added lines, -136 removed lines

@@ -9,148 +9,148 @@
 
 class EnqueuePublicAssets
 {
-    /**
-     * @return void
-     */
-    public function handle()
-    {
-        $this->enqueueAssets();
-        $this->enqueuePolyfillService();
-        $this->enqueueRecaptchaScript();
-        $this->inlineScript();
-        $this->inlineStyles();
-    }
+	/**
+	 * @return void
+	 */
+	public function handle()
+	{
+		$this->enqueueAssets();
+		$this->enqueuePolyfillService();
+		$this->enqueueRecaptchaScript();
+		$this->inlineScript();
+		$this->inlineStyles();
+	}
 
-    /**
-     * @return void
-     */
-    public function enqueueAssets()
-    {
-        if (apply_filters('site-reviews/assets/css', true)) {
-            wp_enqueue_style(
-                Application::ID,
-                $this->getStylesheet(),
-                [],
-                glsr()->version
-            );
-        }
-        if (apply_filters('site-reviews/assets/js', true)) {
-            $dependencies = apply_filters('site-reviews/assets/polyfill', true)
-                ? [Application::ID.'/polyfill']
-                : [];
-            $dependencies = apply_filters('site-reviews/enqueue/public/dependencies', $dependencies);
-            wp_enqueue_script(
-                Application::ID,
-                glsr()->url('assets/scripts/'.Application::ID.'.js'),
-                $dependencies,
-                glsr()->version,
-                true
-            );
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function enqueueAssets()
+	{
+		if (apply_filters('site-reviews/assets/css', true)) {
+			wp_enqueue_style(
+				Application::ID,
+				$this->getStylesheet(),
+				[],
+				glsr()->version
+			);
+		}
+		if (apply_filters('site-reviews/assets/js', true)) {
+			$dependencies = apply_filters('site-reviews/assets/polyfill', true)
+				? [Application::ID.'/polyfill']
+				: [];
+			$dependencies = apply_filters('site-reviews/enqueue/public/dependencies', $dependencies);
+			wp_enqueue_script(
+				Application::ID,
+				glsr()->url('assets/scripts/'.Application::ID.'.js'),
+				$dependencies,
+				glsr()->version,
+				true
+			);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function enqueuePolyfillService()
-    {
-        if (!apply_filters('site-reviews/assets/polyfill', true)) {
-            return;
-        }
-        wp_enqueue_script(Application::ID.'/polyfill', add_query_arg([
-            'features' => 'Array.prototype.findIndex,CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event,XMLHttpRequest,MutationObserver',
-            'flags' => 'gated',
-        ], 'https://polyfill.io/v3/polyfill.min.js'));
-    }
+	/**
+	 * @return void
+	 */
+	public function enqueuePolyfillService()
+	{
+		if (!apply_filters('site-reviews/assets/polyfill', true)) {
+			return;
+		}
+		wp_enqueue_script(Application::ID.'/polyfill', add_query_arg([
+			'features' => 'Array.prototype.findIndex,CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event,XMLHttpRequest,MutationObserver',
+			'flags' => 'gated',
+		], 'https://polyfill.io/v3/polyfill.min.js'));
+	}
 
-    /**
-     * @return void
-     */
-    public function enqueueRecaptchaScript()
-    {
-        // wpforms-recaptcha
-        // google-recaptcha
-        // nf-google-recaptcha
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
-            return;
-        }
-        $language = apply_filters('site-reviews/recaptcha/language', get_locale());
-        wp_enqueue_script(Application::ID.'/google-recaptcha', add_query_arg([
-            'hl' => $language,
-            'render' => 'explicit',
-        ], 'https://www.google.com/recaptcha/api.js'));
-    }
+	/**
+	 * @return void
+	 */
+	public function enqueueRecaptchaScript()
+	{
+		// wpforms-recaptcha
+		// google-recaptcha
+		// nf-google-recaptcha
+		if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+			return;
+		}
+		$language = apply_filters('site-reviews/recaptcha/language', get_locale());
+		wp_enqueue_script(Application::ID.'/google-recaptcha', add_query_arg([
+			'hl' => $language,
+			'render' => 'explicit',
+		], 'https://www.google.com/recaptcha/api.js'));
+	}
 
-    /**
-     * @return void
-     */
-    public function inlineScript()
-    {
-        $variables = [
-            'action' => Application::PREFIX.'action',
-            'ajaxpagination' => $this->getFixedSelectorsForPagination(),
-            'ajaxurl' => admin_url('admin-ajax.php'),
-            'nameprefix' => Application::ID,
-            'validationconfig' => glsr(Style::class)->validation,
-            'validationstrings' => glsr(ValidationStringsDefaults::class)->defaults(),
-        ];
-        $variables = apply_filters('site-reviews/enqueue/public/localize', $variables);
-        wp_add_inline_script(Application::ID, $this->buildInlineScript($variables), 'before');
-    }
+	/**
+	 * @return void
+	 */
+	public function inlineScript()
+	{
+		$variables = [
+			'action' => Application::PREFIX.'action',
+			'ajaxpagination' => $this->getFixedSelectorsForPagination(),
+			'ajaxurl' => admin_url('admin-ajax.php'),
+			'nameprefix' => Application::ID,
+			'validationconfig' => glsr(Style::class)->validation,
+			'validationstrings' => glsr(ValidationStringsDefaults::class)->defaults(),
+		];
+		$variables = apply_filters('site-reviews/enqueue/public/localize', $variables);
+		wp_add_inline_script(Application::ID, $this->buildInlineScript($variables), 'before');
+	}
 
-    /**
-     * @return void
-     */
-    public function inlineStyles()
-    {
-        $inlineStylesheetPath = glsr()->path('assets/styles/inline-styles.css');
-        if (!apply_filters('site-reviews/assets/css', true)) {
-            return;
-        }
-        if (!file_exists($inlineStylesheetPath)) {
-            glsr_log()->error('Inline stylesheet is missing: '.$inlineStylesheetPath);
-            return;
-        }
-        $inlineStylesheetValues = glsr()->config('inline-styles');
-        $stylesheet = str_replace(
-            array_keys($inlineStylesheetValues),
-            array_values($inlineStylesheetValues),
-            file_get_contents($inlineStylesheetPath)
-        );
-        wp_add_inline_style(Application::ID, $stylesheet);
-    }
+	/**
+	 * @return void
+	 */
+	public function inlineStyles()
+	{
+		$inlineStylesheetPath = glsr()->path('assets/styles/inline-styles.css');
+		if (!apply_filters('site-reviews/assets/css', true)) {
+			return;
+		}
+		if (!file_exists($inlineStylesheetPath)) {
+			glsr_log()->error('Inline stylesheet is missing: '.$inlineStylesheetPath);
+			return;
+		}
+		$inlineStylesheetValues = glsr()->config('inline-styles');
+		$stylesheet = str_replace(
+			array_keys($inlineStylesheetValues),
+			array_values($inlineStylesheetValues),
+			file_get_contents($inlineStylesheetPath)
+		);
+		wp_add_inline_style(Application::ID, $stylesheet);
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildInlineScript(array $variables)
-    {
-        $script = 'window.hasOwnProperty("GLSR")||(window.GLSR={});';
-        foreach ($variables as $key => $value) {
-            $script.= sprintf('GLSR.%s=%s;', $key, json_encode($value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
-        }
-        $pattern = '/\"([^ \-\"]+)\"(:[{\[\"])/'; // removes unnecessary quotes surrounding object keys
-        $optimizedScript = preg_replace($pattern, '$1$2', $script);
-        return apply_filters('site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildInlineScript(array $variables)
+	{
+		$script = 'window.hasOwnProperty("GLSR")||(window.GLSR={});';
+		foreach ($variables as $key => $value) {
+			$script.= sprintf('GLSR.%s=%s;', $key, json_encode($value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+		}
+		$pattern = '/\"([^ \-\"]+)\"(:[{\[\"])/'; // removes unnecessary quotes surrounding object keys
+		$optimizedScript = preg_replace($pattern, '$1$2', $script);
+		return apply_filters('site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getFixedSelectorsForPagination()
-    {
-        $selectors = ['#wpadminbar', '.site-navigation-fixed'];
-        return apply_filters('site-reviews/enqueue/public/localize/ajax-pagination', $selectors);
-    }
+	/**
+	 * @return array
+	 */
+	protected function getFixedSelectorsForPagination()
+	{
+		$selectors = ['#wpadminbar', '.site-navigation-fixed'];
+		return apply_filters('site-reviews/enqueue/public/localize/ajax-pagination', $selectors);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getStylesheet()
-    {
-        $currentStyle = glsr(Style::class)->style;
-        return file_exists(glsr()->path('assets/styles/custom/'.$currentStyle.'.css'))
-            ? glsr()->url('assets/styles/custom/'.$currentStyle.'.css')
-            : glsr()->url('assets/styles/'.Application::ID.'.css');
-    }
+	/**
+	 * @return string
+	 */
+	protected function getStylesheet()
+	{
+		$currentStyle = glsr(Style::class)->style;
+		return file_exists(glsr()->path('assets/styles/custom/'.$currentStyle.'.css'))
+			? glsr()->url('assets/styles/custom/'.$currentStyle.'.css')
+			: glsr()->url('assets/styles/'.Application::ID.'.css');
+	}
 }

Spacing +36 added lines, -36 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function enqueueAssets()
     {
-        if (apply_filters('site-reviews/assets/css', true)) {
+        if( apply_filters( 'site-reviews/assets/css', true ) ) {
             wp_enqueue_style(
                 Application::ID,
                 $this->getStylesheet(),
@@ -34,14 +34,14 @@ 
                 glsr()->version
             );
         }
-        if (apply_filters('site-reviews/assets/js', true)) {
-            $dependencies = apply_filters('site-reviews/assets/polyfill', true)
+        if( apply_filters( 'site-reviews/assets/js', true ) ) {
+            $dependencies = apply_filters( 'site-reviews/assets/polyfill', true )
                 ? [Application::ID.'/polyfill']
                 : [];
-            $dependencies = apply_filters('site-reviews/enqueue/public/dependencies', $dependencies);
+            $dependencies = apply_filters( 'site-reviews/enqueue/public/dependencies', $dependencies );
             wp_enqueue_script(
                 Application::ID,
-                glsr()->url('assets/scripts/'.Application::ID.'.js'),
+                glsr()->url( 'assets/scripts/'.Application::ID.'.js' ),
                 $dependencies,
                 glsr()->version,
                 true
@@ -54,13 +54,13 @@ 
      */
     public function enqueuePolyfillService()
     {
-        if (!apply_filters('site-reviews/assets/polyfill', true)) {
+        if( !apply_filters( 'site-reviews/assets/polyfill', true ) ) {
             return;
         }
-        wp_enqueue_script(Application::ID.'/polyfill', add_query_arg([
+        wp_enqueue_script( Application::ID.'/polyfill', add_query_arg( [
             'features' => 'Array.prototype.findIndex,CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event,XMLHttpRequest,MutationObserver',
             'flags' => 'gated',
-        ], 'https://polyfill.io/v3/polyfill.min.js'));
+        ], 'https://polyfill.io/v3/polyfill.min.js' ) );
     }
 
     /**
@@ -71,14 +71,14 @@ 
         // wpforms-recaptcha
         // google-recaptcha
         // nf-google-recaptcha
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
             return;
         }
-        $language = apply_filters('site-reviews/recaptcha/language', get_locale());
-        wp_enqueue_script(Application::ID.'/google-recaptcha', add_query_arg([
+        $language = apply_filters( 'site-reviews/recaptcha/language', get_locale() );
+        wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg( [
             'hl' => $language,
             'render' => 'explicit',
-        ], 'https://www.google.com/recaptcha/api.js'));
+        ], 'https://www.google.com/recaptcha/api.js' ) );
     }
 
     /**
@@ -89,13 +89,13 @@ 
         $variables = [
             'action' => Application::PREFIX.'action',
             'ajaxpagination' => $this->getFixedSelectorsForPagination(),
-            'ajaxurl' => admin_url('admin-ajax.php'),
+            'ajaxurl' => admin_url( 'admin-ajax.php' ),
             'nameprefix' => Application::ID,
-            'validationconfig' => glsr(Style::class)->validation,
-            'validationstrings' => glsr(ValidationStringsDefaults::class)->defaults(),
+            'validationconfig' => glsr( Style::class )->validation,
+            'validationstrings' => glsr( ValidationStringsDefaults::class )->defaults(),
         ];
-        $variables = apply_filters('site-reviews/enqueue/public/localize', $variables);
-        wp_add_inline_script(Application::ID, $this->buildInlineScript($variables), 'before');
+        $variables = apply_filters( 'site-reviews/enqueue/public/localize', $variables );
+        wp_add_inline_script( Application::ID, $this->buildInlineScript( $variables ), 'before' );
     }
 
     /**
@@ -103,35 +103,35 @@ 
      */
     public function inlineStyles()
     {
-        $inlineStylesheetPath = glsr()->path('assets/styles/inline-styles.css');
-        if (!apply_filters('site-reviews/assets/css', true)) {
+        $inlineStylesheetPath = glsr()->path( 'assets/styles/inline-styles.css' );
+        if( !apply_filters( 'site-reviews/assets/css', true ) ) {
             return;
         }
-        if (!file_exists($inlineStylesheetPath)) {
-            glsr_log()->error('Inline stylesheet is missing: '.$inlineStylesheetPath);
+        if( !file_exists( $inlineStylesheetPath ) ) {
+            glsr_log()->error( 'Inline stylesheet is missing: '.$inlineStylesheetPath );
             return;
         }
-        $inlineStylesheetValues = glsr()->config('inline-styles');
+        $inlineStylesheetValues = glsr()->config( 'inline-styles' );
         $stylesheet = str_replace(
-            array_keys($inlineStylesheetValues),
-            array_values($inlineStylesheetValues),
-            file_get_contents($inlineStylesheetPath)
+            array_keys( $inlineStylesheetValues ),
+            array_values( $inlineStylesheetValues ),
+            file_get_contents( $inlineStylesheetPath )
         );
-        wp_add_inline_style(Application::ID, $stylesheet);
+        wp_add_inline_style( Application::ID, $stylesheet );
     }
 
     /**
      * @return string
      */
-    protected function buildInlineScript(array $variables)
+    protected function buildInlineScript( array $variables )
     {
         $script = 'window.hasOwnProperty("GLSR")||(window.GLSR={});';
-        foreach ($variables as $key => $value) {
-            $script.= sprintf('GLSR.%s=%s;', $key, json_encode($value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+        foreach( $variables as $key => $value ) {
+            $script .= sprintf( 'GLSR.%s=%s;', $key, json_encode( $value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ) );
         }
         $pattern = '/\"([^ \-\"]+)\"(:[{\[\"])/'; // removes unnecessary quotes surrounding object keys
-        $optimizedScript = preg_replace($pattern, '$1$2', $script);
-        return apply_filters('site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables);
+        $optimizedScript = preg_replace( $pattern, '$1$2', $script );
+        return apply_filters( 'site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables );
     }
 
     /**
@@ -140,7 +140,7 @@ 
     protected function getFixedSelectorsForPagination()
     {
         $selectors = ['#wpadminbar', '.site-navigation-fixed'];
-        return apply_filters('site-reviews/enqueue/public/localize/ajax-pagination', $selectors);
+        return apply_filters( 'site-reviews/enqueue/public/localize/ajax-pagination', $selectors );
     }
 
     /**
@@ -148,9 +148,9 @@ 
      */
     protected function getStylesheet()
     {
-        $currentStyle = glsr(Style::class)->style;
-        return file_exists(glsr()->path('assets/styles/custom/'.$currentStyle.'.css'))
-            ? glsr()->url('assets/styles/custom/'.$currentStyle.'.css')
-            : glsr()->url('assets/styles/'.Application::ID.'.css');
+        $currentStyle = glsr( Style::class )->style;
+        return file_exists( glsr()->path( 'assets/styles/custom/'.$currentStyle.'.css' ) )
+            ? glsr()->url( 'assets/styles/custom/'.$currentStyle.'.css' )
+            : glsr()->url( 'assets/styles/'.Application::ID.'.css' );
     }
 }