pryley / site-reviews

plugin/Modules/Validator/ValidateReview.php

Indentation +272 added lines, -272 removed lines

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

Spacing +73 added lines, -73 removed lines

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

plugin/Modules/Schema.php

Indentation +308 added lines, -308 removed lines

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

Spacing +97 added lines, -97 removed lines

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

plugin/Modules/Date.php

Indentation +79 added lines, -79 removed lines

@@ -7,87 +7,87 @@
 
 class Date
 {
-    /**
-     * [60, 1],
-     * [60 * 100, 60],
-     * [3600 * 70, 3600],
-     * [3600 * 24 * 10, 3600 * 24],
-     * [3600 * 24 * 30, 3600 * 24 * 7],
-     * [3600 * 24 * 30 * 30, 3600 * 24 * 30],
-     * [INF, 3600 * 24 * 265],.
-     */
-    protected static $TIME_PERIODS = [
-        [60, 1],
-        [6000, 60],
-        [252000, 3600],
-        [864000, 86400],
-        [2592000, 604800],
-        [77760000, 2592000],
-        [INF, 22896000],
-    ];
+	/**
+	 * [60, 1],
+	 * [60 * 100, 60],
+	 * [3600 * 70, 3600],
+	 * [3600 * 24 * 10, 3600 * 24],
+	 * [3600 * 24 * 30, 3600 * 24 * 7],
+	 * [3600 * 24 * 30 * 30, 3600 * 24 * 30],
+	 * [INF, 3600 * 24 * 265],.
+	 */
+	protected static $TIME_PERIODS = [
+		[60, 1],
+		[6000, 60],
+		[252000, 3600],
+		[864000, 86400],
+		[2592000, 604800],
+		[77760000, 2592000],
+		[INF, 22896000],
+	];
 
-    /**
-     * @param mixed $date
-     * @param string $format
-     * @return bool
-     */
-    public function isDate($date, $format = 'Y-m-d H:i:s')
-    {
-        $datetime = DateTime::createFromFormat($format, $date);
-        return $datetime && $date == $datetime->format($format);
-    }
+	/**
+	 * @param mixed $date
+	 * @param string $format
+	 * @return bool
+	 */
+	public function isDate($date, $format = 'Y-m-d H:i:s')
+	{
+		$datetime = DateTime::createFromFormat($format, $date);
+		return $datetime && $date == $datetime->format($format);
+	}
 
-    /**
-     * @param mixed $date
-     * @return bool
-     */
-    public function isTimestamp($date)
-    {
-        return ctype_digit($date)
-            ? true
-            : false;
-    }
+	/**
+	 * @param mixed $date
+	 * @return bool
+	 */
+	public function isTimestamp($date)
+	{
+		return ctype_digit($date)
+			? true
+			: false;
+	}
 
-    /**
-     * @param mixed $date
-     * @param string $fallback
-     * @return string
-     */
-    public function localized($date, $fallback = '')
-    {
-        return $this->isDate($date) || $this->isTimestamp($date)
-            ? date_i18n('Y-m-d H:i', $date)
-            : $fallback;
-    }
+	/**
+	 * @param mixed $date
+	 * @param string $fallback
+	 * @return string
+	 */
+	public function localized($date, $fallback = '')
+	{
+		return $this->isDate($date) || $this->isTimestamp($date)
+			? date_i18n('Y-m-d H:i', $date)
+			: $fallback;
+	}
 
-    /**
-     * @param mixed $date
-     * @return string
-     */
-    public function relative($date)
-    {
-        if (!$this->isDate($date)) {
-            return '';
-        }
-        $diff = time() - strtotime($date);
-        foreach (static::$TIME_PERIODS as $i => $timePeriod) {
-            if ($diff > $timePeriod[0]) {
-                continue;
-            }
-            $unit = intval(floor($diff / $timePeriod[1]));
-            $relativeDates = [
-                _n('%s second ago', '%s seconds ago', $unit, 'site-reviews'),
-                _n('%s minute ago', '%s minutes ago', $unit, 'site-reviews'),
-                _n('an hour ago', '%s hours ago', $unit, 'site-reviews'),
-                _n('yesterday', '%s days ago', $unit, 'site-reviews'),
-                _n('a week ago', '%s weeks ago', $unit, 'site-reviews'),
-                _n('%s month ago', '%s months ago', $unit, 'site-reviews'),
-                _n('%s year ago', '%s years ago', $unit, 'site-reviews'),
-            ];
-            $relativeDate = $relativeDates[$i];
-            return Str::contains($relativeDate, '%s')
-                ? sprintf($relativeDate, $unit)
-                : $relativeDate;
-        }
-    }
+	/**
+	 * @param mixed $date
+	 * @return string
+	 */
+	public function relative($date)
+	{
+		if (!$this->isDate($date)) {
+			return '';
+		}
+		$diff = time() - strtotime($date);
+		foreach (static::$TIME_PERIODS as $i => $timePeriod) {
+			if ($diff > $timePeriod[0]) {
+				continue;
+			}
+			$unit = intval(floor($diff / $timePeriod[1]));
+			$relativeDates = [
+				_n('%s second ago', '%s seconds ago', $unit, 'site-reviews'),
+				_n('%s minute ago', '%s minutes ago', $unit, 'site-reviews'),
+				_n('an hour ago', '%s hours ago', $unit, 'site-reviews'),
+				_n('yesterday', '%s days ago', $unit, 'site-reviews'),
+				_n('a week ago', '%s weeks ago', $unit, 'site-reviews'),
+				_n('%s month ago', '%s months ago', $unit, 'site-reviews'),
+				_n('%s year ago', '%s years ago', $unit, 'site-reviews'),
+			];
+			$relativeDate = $relativeDates[$i];
+			return Str::contains($relativeDate, '%s')
+				? sprintf($relativeDate, $unit)
+				: $relativeDate;
+		}
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -31,19 +31,19 @@ 
      * @param string $format
      * @return bool
      */
-    public function isDate($date, $format = 'Y-m-d H:i:s')
+    public function isDate( $date, $format = 'Y-m-d H:i:s' )
     {
-        $datetime = DateTime::createFromFormat($format, $date);
-        return $datetime && $date == $datetime->format($format);
+        $datetime = DateTime::createFromFormat( $format, $date );
+        return $datetime && $date == $datetime->format( $format );
     }
 
     /**
      * @param mixed $date
      * @return bool
      */
-    public function isTimestamp($date)
+    public function isTimestamp( $date )
     {
-        return ctype_digit($date)
+        return ctype_digit( $date )
             ? true
             : false;
     }
@@ -53,10 +53,10 @@ 
      * @param string $fallback
      * @return string
      */
-    public function localized($date, $fallback = '')
+    public function localized( $date, $fallback = '' )
     {
-        return $this->isDate($date) || $this->isTimestamp($date)
-            ? date_i18n('Y-m-d H:i', $date)
+        return $this->isDate( $date ) || $this->isTimestamp( $date )
+            ? date_i18n( 'Y-m-d H:i', $date )
             : $fallback;
     }
 
@@ -64,29 +64,29 @@ 
      * @param mixed $date
      * @return string
      */
-    public function relative($date)
+    public function relative( $date )
     {
-        if (!$this->isDate($date)) {
+        if( !$this->isDate( $date ) ) {
             return '';
         }
-        $diff = time() - strtotime($date);
-        foreach (static::$TIME_PERIODS as $i => $timePeriod) {
-            if ($diff > $timePeriod[0]) {
+        $diff = time() - strtotime( $date );
+        foreach( static::$TIME_PERIODS as $i => $timePeriod ) {
+            if( $diff > $timePeriod[0] ) {
                 continue;
             }
-            $unit = intval(floor($diff / $timePeriod[1]));
+            $unit = intval( floor( $diff / $timePeriod[1] ) );
             $relativeDates = [
-                _n('%s second ago', '%s seconds ago', $unit, 'site-reviews'),
-                _n('%s minute ago', '%s minutes ago', $unit, 'site-reviews'),
-                _n('an hour ago', '%s hours ago', $unit, 'site-reviews'),
-                _n('yesterday', '%s days ago', $unit, 'site-reviews'),
-                _n('a week ago', '%s weeks ago', $unit, 'site-reviews'),
-                _n('%s month ago', '%s months ago', $unit, 'site-reviews'),
-                _n('%s year ago', '%s years ago', $unit, 'site-reviews'),
+                _n( '%s second ago', '%s seconds ago', $unit, 'site-reviews' ),
+                _n( '%s minute ago', '%s minutes ago', $unit, 'site-reviews' ),
+                _n( 'an hour ago', '%s hours ago', $unit, 'site-reviews' ),
+                _n( 'yesterday', '%s days ago', $unit, 'site-reviews' ),
+                _n( 'a week ago', '%s weeks ago', $unit, 'site-reviews' ),
+                _n( '%s month ago', '%s months ago', $unit, 'site-reviews' ),
+                _n( '%s year ago', '%s years ago', $unit, 'site-reviews' ),
             ];
             $relativeDate = $relativeDates[$i];
-            return Str::contains($relativeDate, '%s')
-                ? sprintf($relativeDate, $unit)
+            return Str::contains( $relativeDate, '%s' )
+                ? sprintf( $relativeDate, $unit )
                 : $relativeDate;
         }
     }

plugin/Modules/Migrations/Migrate_4_0_2.php

Indentation +53 added lines, -53 removed lines

@@ -9,70 +9,70 @@
 
 class Migrate_4_0_2
 {
-    /**
-     * @return void
-     */
-    public function deleteSessions()
-    {
-        global $wpdb;
-        $wpdb->query("
+	/**
+	 * @return void
+	 */
+	public function deleteSessions()
+	{
+		global $wpdb;
+		$wpdb->query("
             DELETE
             FROM {$wpdb->options}
             WHERE option_name LIKE '_glsr_session%'
         ");
-    }
+	}
 
-    /**
-     * @return void
-     */
-    public function migrateSettings()
-    {
-        if ($settings = get_option(OptionManager::databaseKey(3))) {
-            $multilingual = 'yes' == Arr::get($settings, 'settings.general.support.polylang')
-                ? 'polylang'
-                : '';
-            $settings = Arr::set($settings, 'settings.general.multilingual', $multilingual);
-            $settings = Arr::set($settings, 'settings.general.rebusify', 'no');
-            $settings = Arr::set($settings, 'settings.general.rebusify_email', '');
-            $settings = Arr::set($settings, 'settings.general.rebusify_serial', '');
-            $settings = Arr::set($settings, 'settings.reviews.name.format', '');
-            $settings = Arr::set($settings, 'settings.reviews.name.initial', '');
-            $settings = Arr::set($settings, 'settings.submissions.blacklist.integration', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.email', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.ip_address', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.username', '');
-            unset($settings['settings']['general']['support']);
-            update_option(OptionManager::databaseKey(4), $settings);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function migrateSettings()
+	{
+		if ($settings = get_option(OptionManager::databaseKey(3))) {
+			$multilingual = 'yes' == Arr::get($settings, 'settings.general.support.polylang')
+				? 'polylang'
+				: '';
+			$settings = Arr::set($settings, 'settings.general.multilingual', $multilingual);
+			$settings = Arr::set($settings, 'settings.general.rebusify', 'no');
+			$settings = Arr::set($settings, 'settings.general.rebusify_email', '');
+			$settings = Arr::set($settings, 'settings.general.rebusify_serial', '');
+			$settings = Arr::set($settings, 'settings.reviews.name.format', '');
+			$settings = Arr::set($settings, 'settings.reviews.name.initial', '');
+			$settings = Arr::set($settings, 'settings.submissions.blacklist.integration', '');
+			$settings = Arr::set($settings, 'settings.submissions.limit', '');
+			$settings = Arr::set($settings, 'settings.submissions.limit_whitelist.email', '');
+			$settings = Arr::set($settings, 'settings.submissions.limit_whitelist.ip_address', '');
+			$settings = Arr::set($settings, 'settings.submissions.limit_whitelist.username', '');
+			unset($settings['settings']['general']['support']);
+			update_option(OptionManager::databaseKey(4), $settings);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function protectMetaKeys()
-    {
-        global $wpdb;
-        $keys = array_keys(glsr(CreateReviewDefaults::class)->defaults());
-        $keys = implode("','", $keys);
-        $postType = Application::POST_TYPE;
-        $wpdb->query("
+	/**
+	 * @return void
+	 */
+	public function protectMetaKeys()
+	{
+		global $wpdb;
+		$keys = array_keys(glsr(CreateReviewDefaults::class)->defaults());
+		$keys = implode("','", $keys);
+		$postType = Application::POST_TYPE;
+		$wpdb->query("
             UPDATE {$wpdb->postmeta} pm
             INNER JOIN {$wpdb->posts} p ON p.id = pm.post_id
             SET pm.meta_key = CONCAT('_', pm.meta_key)
             WHERE pm.meta_key IN ('{$keys}')
             AND p.post_type = '{$postType}'
         ");
-    }
+	}
 
-    /**
-     * @return void
-     */
-    public function run()
-    {
-        $this->migrateSettings();
-        $this->protectMetaKeys();
-        $this->deleteSessions();
-        delete_transient(Application::ID.'_cloudflare_ips');
-    }
+	/**
+	 * @return void
+	 */
+	public function run()
+	{
+		$this->migrateSettings();
+		$this->protectMetaKeys();
+		$this->deleteSessions();
+		delete_transient(Application::ID.'_cloudflare_ips');
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -15,11 +15,11 @@ 
     public function deleteSessions()
     {
         global $wpdb;
-        $wpdb->query("
+        $wpdb->query( "
             DELETE
             FROM {$wpdb->options}
             WHERE option_name LIKE '_glsr_session%'
-        ");
+        " );
     }
 
     /**
@@ -27,23 +27,23 @@ 
      */
     public function migrateSettings()
     {
-        if ($settings = get_option(OptionManager::databaseKey(3))) {
-            $multilingual = 'yes' == Arr::get($settings, 'settings.general.support.polylang')
+        if( $settings = get_option( OptionManager::databaseKey( 3 ) ) ) {
+            $multilingual = 'yes' == Arr::get( $settings, 'settings.general.support.polylang' )
                 ? 'polylang'
                 : '';
-            $settings = Arr::set($settings, 'settings.general.multilingual', $multilingual);
-            $settings = Arr::set($settings, 'settings.general.rebusify', 'no');
-            $settings = Arr::set($settings, 'settings.general.rebusify_email', '');
-            $settings = Arr::set($settings, 'settings.general.rebusify_serial', '');
-            $settings = Arr::set($settings, 'settings.reviews.name.format', '');
-            $settings = Arr::set($settings, 'settings.reviews.name.initial', '');
-            $settings = Arr::set($settings, 'settings.submissions.blacklist.integration', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.email', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.ip_address', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.username', '');
+            $settings = Arr::set( $settings, 'settings.general.multilingual', $multilingual );
+            $settings = Arr::set( $settings, 'settings.general.rebusify', 'no' );
+            $settings = Arr::set( $settings, 'settings.general.rebusify_email', '' );
+            $settings = Arr::set( $settings, 'settings.general.rebusify_serial', '' );
+            $settings = Arr::set( $settings, 'settings.reviews.name.format', '' );
+            $settings = Arr::set( $settings, 'settings.reviews.name.initial', '' );
+            $settings = Arr::set( $settings, 'settings.submissions.blacklist.integration', '' );
+            $settings = Arr::set( $settings, 'settings.submissions.limit', '' );
+            $settings = Arr::set( $settings, 'settings.submissions.limit_whitelist.email', '' );
+            $settings = Arr::set( $settings, 'settings.submissions.limit_whitelist.ip_address', '' );
+            $settings = Arr::set( $settings, 'settings.submissions.limit_whitelist.username', '' );
             unset($settings['settings']['general']['support']);
-            update_option(OptionManager::databaseKey(4), $settings);
+            update_option( OptionManager::databaseKey( 4 ), $settings );
         }
     }
 
@@ -53,16 +53,16 @@ 
     public function protectMetaKeys()
     {
         global $wpdb;
-        $keys = array_keys(glsr(CreateReviewDefaults::class)->defaults());
-        $keys = implode("','", $keys);
+        $keys = array_keys( glsr( CreateReviewDefaults::class )->defaults() );
+        $keys = implode( "','", $keys );
         $postType = Application::POST_TYPE;
-        $wpdb->query("
+        $wpdb->query( "
             UPDATE {$wpdb->postmeta} pm
             INNER JOIN {$wpdb->posts} p ON p.id = pm.post_id
             SET pm.meta_key = CONCAT('_', pm.meta_key)
             WHERE pm.meta_key IN ('{$keys}')
             AND p.post_type = '{$postType}'
-        ");
+        " );
     }
 
     /**
@@ -73,6 +73,6 @@ 
         $this->migrateSettings();
         $this->protectMetaKeys();
         $this->deleteSessions();
-        delete_transient(Application::ID.'_cloudflare_ips');
+        delete_transient( Application::ID.'_cloudflare_ips' );
     }
 }

plugin/Modules/Migrations/Migrate_3_0_0.php

Indentation +147 added lines, -147 removed lines

@@ -7,160 +7,160 @@
 
 class Migrate_3_0_0
 {
-    const MAPPED_SETTINGS = [
-        'settings.general.notification' => 'settings.general.notifications', // array
-        'settings.general.notification_email' => 'settings.general.notification_email',
-        'settings.general.notification_message' => 'settings.general.notification_message',
-        'settings.general.require.approval' => 'settings.general.require.approval',
-        'settings.general.require.login' => 'settings.general.require.login',
-        'settings.general.require.login_register' => 'settings.general.require.login_register',
-        'settings.general.webhook_url' => 'settings.general.notification_slack',
-        'settings.reviews-form.akismet' => 'settings.submissions.akismet',
-        'settings.reviews-form.blacklist.action' => 'settings.submissions.blacklist.action',
-        'settings.reviews-form.blacklist.entries' => 'settings.submissions.blacklist.entries',
-        'settings.reviews-form.recaptcha.integration' => 'settings.submissions.recaptcha.integration',
-        'settings.reviews-form.recaptcha.key' => 'settings.submissions.recaptcha.key',
-        'settings.reviews-form.recaptcha.position' => 'settings.submissions.recaptcha.position',
-        'settings.reviews-form.recaptcha.secret' => 'settings.submissions.recaptcha.secret',
-        'settings.reviews-form.required' => 'settings.submissions.required', // array
-        'settings.reviews.assigned_links.enabled' => 'settings.reviews.assigned_links',
-        'settings.reviews.avatars.enabled' => 'settings.reviews.avatars',
-        'settings.reviews.date.custom' => 'settings.reviews.date.custom',
-        'settings.reviews.date.format' => 'settings.reviews.date.format',
-        'settings.reviews.excerpt.enabled' => 'settings.reviews.excerpts',
-        'settings.reviews.excerpt.length' => 'settings.reviews.excerpts_length',
-        'settings.reviews.schema.address' => 'settings.schema.address',
-        'settings.reviews.schema.description.custom' => 'settings.schema.description.custom',
-        'settings.reviews.schema.description.default' => 'settings.schema.description.default',
-        'settings.reviews.schema.highprice' => 'settings.schema.highprice',
-        'settings.reviews.schema.image.custom' => 'settings.schema.image.custom',
-        'settings.reviews.schema.image.default' => 'settings.schema.image.default',
-        'settings.reviews.schema.lowprice' => 'settings.schema.lowprice',
-        'settings.reviews.schema.name.custom' => 'settings.schema.name.custom',
-        'settings.reviews.schema.name.default' => 'settings.schema.name.default',
-        'settings.reviews.schema.pricecurrency' => 'settings.schema.pricecurrency',
-        'settings.reviews.schema.pricerange' => 'settings.schema.pricerange',
-        'settings.reviews.schema.telephone' => 'settings.schema.telephone',
-        'settings.reviews.schema.type.custom' => 'settings.schema.type.custom',
-        'settings.reviews.schema.type.default' => 'settings.schema.type.default',
-        'settings.reviews.schema.url.custom' => 'settings.schema.url.custom',
-        'settings.reviews.schema.url.default' => 'settings.schema.url.default',
-        'version' => 'version_upgraded_from',
-    ];
+	const MAPPED_SETTINGS = [
+		'settings.general.notification' => 'settings.general.notifications', // array
+		'settings.general.notification_email' => 'settings.general.notification_email',
+		'settings.general.notification_message' => 'settings.general.notification_message',
+		'settings.general.require.approval' => 'settings.general.require.approval',
+		'settings.general.require.login' => 'settings.general.require.login',
+		'settings.general.require.login_register' => 'settings.general.require.login_register',
+		'settings.general.webhook_url' => 'settings.general.notification_slack',
+		'settings.reviews-form.akismet' => 'settings.submissions.akismet',
+		'settings.reviews-form.blacklist.action' => 'settings.submissions.blacklist.action',
+		'settings.reviews-form.blacklist.entries' => 'settings.submissions.blacklist.entries',
+		'settings.reviews-form.recaptcha.integration' => 'settings.submissions.recaptcha.integration',
+		'settings.reviews-form.recaptcha.key' => 'settings.submissions.recaptcha.key',
+		'settings.reviews-form.recaptcha.position' => 'settings.submissions.recaptcha.position',
+		'settings.reviews-form.recaptcha.secret' => 'settings.submissions.recaptcha.secret',
+		'settings.reviews-form.required' => 'settings.submissions.required', // array
+		'settings.reviews.assigned_links.enabled' => 'settings.reviews.assigned_links',
+		'settings.reviews.avatars.enabled' => 'settings.reviews.avatars',
+		'settings.reviews.date.custom' => 'settings.reviews.date.custom',
+		'settings.reviews.date.format' => 'settings.reviews.date.format',
+		'settings.reviews.excerpt.enabled' => 'settings.reviews.excerpts',
+		'settings.reviews.excerpt.length' => 'settings.reviews.excerpts_length',
+		'settings.reviews.schema.address' => 'settings.schema.address',
+		'settings.reviews.schema.description.custom' => 'settings.schema.description.custom',
+		'settings.reviews.schema.description.default' => 'settings.schema.description.default',
+		'settings.reviews.schema.highprice' => 'settings.schema.highprice',
+		'settings.reviews.schema.image.custom' => 'settings.schema.image.custom',
+		'settings.reviews.schema.image.default' => 'settings.schema.image.default',
+		'settings.reviews.schema.lowprice' => 'settings.schema.lowprice',
+		'settings.reviews.schema.name.custom' => 'settings.schema.name.custom',
+		'settings.reviews.schema.name.default' => 'settings.schema.name.default',
+		'settings.reviews.schema.pricecurrency' => 'settings.schema.pricecurrency',
+		'settings.reviews.schema.pricerange' => 'settings.schema.pricerange',
+		'settings.reviews.schema.telephone' => 'settings.schema.telephone',
+		'settings.reviews.schema.type.custom' => 'settings.schema.type.custom',
+		'settings.reviews.schema.type.default' => 'settings.schema.type.default',
+		'settings.reviews.schema.url.custom' => 'settings.schema.url.custom',
+		'settings.reviews.schema.url.default' => 'settings.schema.url.default',
+		'version' => 'version_upgraded_from',
+	];
 
-    /**
-     * @var array
-     */
-    protected $newSettings;
+	/**
+	 * @var array
+	 */
+	protected $newSettings;
 
-    /**
-     * @var array
-     */
-    protected $oldSettings;
+	/**
+	 * @var array
+	 */
+	protected $oldSettings;
 
-    /**
-     * @return void
-     */
-    public function migrateSettings()
-    {
-        $this->newSettings = $this->getNewSettings();
-        $this->oldSettings = $this->getOldSettings();
-        if (empty($this->oldSettings) || empty($this->newSettings)) {
-            return;
-        }
-        foreach (static::MAPPED_SETTINGS as $old => $new) {
-            if (empty($this->oldSettings[$old])) {
-                continue;
-            }
-            $this->newSettings[$new] = $this->oldSettings[$old];
-        }
-        $this->migrateNotificationSettings();
-        $this->migrateRecaptchaSettings();
-        $this->migrateRequiredSettings();
-        $oldSettings = Arr::convertDotNotationArray($this->oldSettings);
-        $newSettings = Arr::convertDotNotationArray($this->newSettings);
-        if (isset($oldSettings['settings']['strings']) && is_array($oldSettings['settings']['strings'])) {
-            $newSettings['settings']['strings'] = $oldSettings['settings']['strings'];
-        }
-        update_option(OptionManager::databaseKey(3), $newSettings);
-    }
+	/**
+	 * @return void
+	 */
+	public function migrateSettings()
+	{
+		$this->newSettings = $this->getNewSettings();
+		$this->oldSettings = $this->getOldSettings();
+		if (empty($this->oldSettings) || empty($this->newSettings)) {
+			return;
+		}
+		foreach (static::MAPPED_SETTINGS as $old => $new) {
+			if (empty($this->oldSettings[$old])) {
+				continue;
+			}
+			$this->newSettings[$new] = $this->oldSettings[$old];
+		}
+		$this->migrateNotificationSettings();
+		$this->migrateRecaptchaSettings();
+		$this->migrateRequiredSettings();
+		$oldSettings = Arr::convertDotNotationArray($this->oldSettings);
+		$newSettings = Arr::convertDotNotationArray($this->newSettings);
+		if (isset($oldSettings['settings']['strings']) && is_array($oldSettings['settings']['strings'])) {
+			$newSettings['settings']['strings'] = $oldSettings['settings']['strings'];
+		}
+		update_option(OptionManager::databaseKey(3), $newSettings);
+	}
 
-    /**
-     * @return void
-     */
-    public function run()
-    {
-        $this->migrateSettings();
-    }
+	/**
+	 * @return void
+	 */
+	public function run()
+	{
+		$this->migrateSettings();
+	}
 
-    /**
-     * @return array
-     */
-    protected function getNewSettings()
-    {
-        return  Arr::flattenArray(Arr::consolidateArray(OptionManager::databaseKey(3)));
-    }
+	/**
+	 * @return array
+	 */
+	protected function getNewSettings()
+	{
+		return  Arr::flattenArray(Arr::consolidateArray(OptionManager::databaseKey(3)));
+	}
 
-    /**
-     * @return array
-     */
-    protected function getOldSettings()
-    {
-        $defaults = array_fill_keys(array_keys(static::MAPPED_SETTINGS), '');
-        $settings = Arr::consolidateArray(get_option(OptionManager::databaseKey(2)));
-        $settings = Arr::flattenArray($settings);
-        return !empty($settings)
-            ? wp_parse_args($settings, $defaults)
-            : [];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getOldSettings()
+	{
+		$defaults = array_fill_keys(array_keys(static::MAPPED_SETTINGS), '');
+		$settings = Arr::consolidateArray(get_option(OptionManager::databaseKey(2)));
+		$settings = Arr::flattenArray($settings);
+		return !empty($settings)
+			? wp_parse_args($settings, $defaults)
+			: [];
+	}
 
-    /**
-     * @return void
-     */
-    protected function migrateNotificationSettings()
-    {
-        $notifications = [
-            'custom' => 'custom',
-            'default' => 'admin',
-            'webhook' => 'slack',
-        ];
-        $this->newSettings['settings.general.notifications'] = [];
-        foreach ($notifications as $old => $new) {
-            if ($this->oldSettings['settings.general.notification'] != $old) {
-                continue;
-            }
-            $this->newSettings['settings.general.notifications'][] = $new;
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function migrateNotificationSettings()
+	{
+		$notifications = [
+			'custom' => 'custom',
+			'default' => 'admin',
+			'webhook' => 'slack',
+		];
+		$this->newSettings['settings.general.notifications'] = [];
+		foreach ($notifications as $old => $new) {
+			if ($this->oldSettings['settings.general.notification'] != $old) {
+				continue;
+			}
+			$this->newSettings['settings.general.notifications'][] = $new;
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function migrateRecaptchaSettings()
-    {
-        $recaptcha = [
-            'BadgePosition' => $this->oldSettings['settings.reviews-form.recaptcha.position'],
-            'SecretKey' => $this->oldSettings['settings.reviews-form.recaptcha.secret'],
-            'SiteKey' => $this->oldSettings['settings.reviews-form.recaptcha.key'],
-        ];
-        if (in_array($this->oldSettings['settings.reviews-form.recaptcha.integration'], ['custom', 'invisible-recaptcha'])) {
-            $this->newSettings['settings.submissions.recaptcha.integration'] = 'all';
-        }
-        if ('invisible-recaptcha' == $this->oldSettings['settings.reviews-form.recaptcha.integration']) {
-            $recaptcha = wp_parse_args((array) get_site_option('ic-settings', [], false), $recaptcha);
-        }
-        $this->newSettings['settings.submissions.recaptcha.key'] = $recaptcha['SiteKey'];
-        $this->newSettings['settings.submissions.recaptcha.secret'] = $recaptcha['SecretKey'];
-        $this->newSettings['settings.submissions.recaptcha.position'] = $recaptcha['BadgePosition'];
-    }
+	/**
+	 * @return void
+	 */
+	protected function migrateRecaptchaSettings()
+	{
+		$recaptcha = [
+			'BadgePosition' => $this->oldSettings['settings.reviews-form.recaptcha.position'],
+			'SecretKey' => $this->oldSettings['settings.reviews-form.recaptcha.secret'],
+			'SiteKey' => $this->oldSettings['settings.reviews-form.recaptcha.key'],
+		];
+		if (in_array($this->oldSettings['settings.reviews-form.recaptcha.integration'], ['custom', 'invisible-recaptcha'])) {
+			$this->newSettings['settings.submissions.recaptcha.integration'] = 'all';
+		}
+		if ('invisible-recaptcha' == $this->oldSettings['settings.reviews-form.recaptcha.integration']) {
+			$recaptcha = wp_parse_args((array) get_site_option('ic-settings', [], false), $recaptcha);
+		}
+		$this->newSettings['settings.submissions.recaptcha.key'] = $recaptcha['SiteKey'];
+		$this->newSettings['settings.submissions.recaptcha.secret'] = $recaptcha['SecretKey'];
+		$this->newSettings['settings.submissions.recaptcha.position'] = $recaptcha['BadgePosition'];
+	}
 
-    /**
-     * @return void
-     */
-    protected function migrateRequiredSettings()
-    {
-        $this->newSettings['settings.submissions.required'] = array_filter((array) $this->oldSettings['settings.reviews-form.required']);
-        $this->newSettings['settings.submissions.required'][] = 'rating';
-        $this->newSettings['settings.submissions.required'][] = 'terms';
-    }
+	/**
+	 * @return void
+	 */
+	protected function migrateRequiredSettings()
+	{
+		$this->newSettings['settings.submissions.required'] = array_filter((array) $this->oldSettings['settings.reviews-form.required']);
+		$this->newSettings['settings.submissions.required'][] = 'rating';
+		$this->newSettings['settings.submissions.required'][] = 'terms';
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -65,11 +65,11 @@ 
     {
         $this->newSettings = $this->getNewSettings();
         $this->oldSettings = $this->getOldSettings();
-        if (empty($this->oldSettings) || empty($this->newSettings)) {
+        if( empty($this->oldSettings) || empty($this->newSettings) ) {
             return;
         }
-        foreach (static::MAPPED_SETTINGS as $old => $new) {
-            if (empty($this->oldSettings[$old])) {
+        foreach( static::MAPPED_SETTINGS as $old => $new ) {
+            if( empty($this->oldSettings[$old]) ) {
                 continue;
             }
             $this->newSettings[$new] = $this->oldSettings[$old];
@@ -77,12 +77,12 @@ 
         $this->migrateNotificationSettings();
         $this->migrateRecaptchaSettings();
         $this->migrateRequiredSettings();
-        $oldSettings = Arr::convertDotNotationArray($this->oldSettings);
-        $newSettings = Arr::convertDotNotationArray($this->newSettings);
-        if (isset($oldSettings['settings']['strings']) && is_array($oldSettings['settings']['strings'])) {
+        $oldSettings = Arr::convertDotNotationArray( $this->oldSettings );
+        $newSettings = Arr::convertDotNotationArray( $this->newSettings );
+        if( isset($oldSettings['settings']['strings']) && is_array( $oldSettings['settings']['strings'] ) ) {
             $newSettings['settings']['strings'] = $oldSettings['settings']['strings'];
         }
-        update_option(OptionManager::databaseKey(3), $newSettings);
+        update_option( OptionManager::databaseKey( 3 ), $newSettings );
     }
 
     /**
@@ -98,7 +98,7 @@ 
      */
     protected function getNewSettings()
     {
-        return  Arr::flattenArray(Arr::consolidateArray(OptionManager::databaseKey(3)));
+        return  Arr::flattenArray( Arr::consolidateArray( OptionManager::databaseKey( 3 ) ) );
     }
 
     /**
@@ -106,11 +106,11 @@ 
      */
     protected function getOldSettings()
     {
-        $defaults = array_fill_keys(array_keys(static::MAPPED_SETTINGS), '');
-        $settings = Arr::consolidateArray(get_option(OptionManager::databaseKey(2)));
-        $settings = Arr::flattenArray($settings);
+        $defaults = array_fill_keys( array_keys( static::MAPPED_SETTINGS ), '' );
+        $settings = Arr::consolidateArray( get_option( OptionManager::databaseKey( 2 ) ) );
+        $settings = Arr::flattenArray( $settings );
         return !empty($settings)
-            ? wp_parse_args($settings, $defaults)
+            ? wp_parse_args( $settings, $defaults )
             : [];
     }
 
@@ -125,8 +125,8 @@ 
             'webhook' => 'slack',
         ];
         $this->newSettings['settings.general.notifications'] = [];
-        foreach ($notifications as $old => $new) {
-            if ($this->oldSettings['settings.general.notification'] != $old) {
+        foreach( $notifications as $old => $new ) {
+            if( $this->oldSettings['settings.general.notification'] != $old ) {
                 continue;
             }
             $this->newSettings['settings.general.notifications'][] = $new;
@@ -143,11 +143,11 @@ 
             'SecretKey' => $this->oldSettings['settings.reviews-form.recaptcha.secret'],
             'SiteKey' => $this->oldSettings['settings.reviews-form.recaptcha.key'],
         ];
-        if (in_array($this->oldSettings['settings.reviews-form.recaptcha.integration'], ['custom', 'invisible-recaptcha'])) {
+        if( in_array( $this->oldSettings['settings.reviews-form.recaptcha.integration'], ['custom', 'invisible-recaptcha'] ) ) {
             $this->newSettings['settings.submissions.recaptcha.integration'] = 'all';
         }
-        if ('invisible-recaptcha' == $this->oldSettings['settings.reviews-form.recaptcha.integration']) {
-            $recaptcha = wp_parse_args((array) get_site_option('ic-settings', [], false), $recaptcha);
+        if( 'invisible-recaptcha' == $this->oldSettings['settings.reviews-form.recaptcha.integration'] ) {
+            $recaptcha = wp_parse_args( (array)get_site_option( 'ic-settings', [], false ), $recaptcha );
         }
         $this->newSettings['settings.submissions.recaptcha.key'] = $recaptcha['SiteKey'];
         $this->newSettings['settings.submissions.recaptcha.secret'] = $recaptcha['SecretKey'];
@@ -159,7 +159,7 @@ 
      */
     protected function migrateRequiredSettings()
     {
-        $this->newSettings['settings.submissions.required'] = array_filter((array) $this->oldSettings['settings.reviews-form.required']);
+        $this->newSettings['settings.submissions.required'] = array_filter( (array)$this->oldSettings['settings.reviews-form.required'] );
         $this->newSettings['settings.submissions.required'][] = 'rating';
         $this->newSettings['settings.submissions.required'][] = 'terms';
     }

plugin/Modules/Multilingual/Wpml.php

Indentation +66 added lines, -66 removed lines

@@ -9,75 +9,75 @@
 
 class Wpml implements Contract
 {
-    public $pluginName = 'WPML';
-    public $supportedVersion = '3.3.5';
+	public $pluginName = 'WPML';
+	public $supportedVersion = '3.3.5';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getPostId($postId)
-    {
-        $postId = trim($postId);
-        if (!is_numeric($postId)) {
-            return 0;
-        }
-        if ($this->isEnabled()) {
-            $postId = apply_filters('wpml_object_id', $postId, 'any', true);
-        }
-        return intval($postId);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getPostId($postId)
+	{
+		$postId = trim($postId);
+		if (!is_numeric($postId)) {
+			return 0;
+		}
+		if ($this->isEnabled()) {
+			$postId = apply_filters('wpml_object_id', $postId, 'any', true);
+		}
+		return intval($postId);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getPostIds(array $postIds)
-    {
-        if (!$this->isEnabled()) {
-            return $postIds;
-        }
-        $newPostIds = [];
-        foreach (Arr::unique($postIds) as $postId) {
-            $postType = get_post_type($postId);
-            if (!$postType) {
-                continue;
-            }
-            $elementType = 'post_'.$postType;
-            $trid = apply_filters('wpml_element_trid', null, $postId, $elementType);
-            $translations = apply_filters('wpml_get_element_translations', null, $trid, $elementType);
-            if (!is_array($translations)) {
-                $translations = [];
-            }
-            $newPostIds = array_merge(
-                $newPostIds,
-                array_column($translations, 'element_id')
-            );
-        }
-        return Arr::unique($newPostIds);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getPostIds(array $postIds)
+	{
+		if (!$this->isEnabled()) {
+			return $postIds;
+		}
+		$newPostIds = [];
+		foreach (Arr::unique($postIds) as $postId) {
+			$postType = get_post_type($postId);
+			if (!$postType) {
+				continue;
+			}
+			$elementType = 'post_'.$postType;
+			$trid = apply_filters('wpml_element_trid', null, $postId, $elementType);
+			$translations = apply_filters('wpml_get_element_translations', null, $trid, $elementType);
+			if (!is_array($translations)) {
+				$translations = [];
+			}
+			$newPostIds = array_merge(
+				$newPostIds,
+				array_column($translations, 'element_id')
+			);
+		}
+		return Arr::unique($newPostIds);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isActive()
-    {
-        return defined('ICL_SITEPRESS_VERSION');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isActive()
+	{
+		return defined('ICL_SITEPRESS_VERSION');
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isEnabled()
-    {
-        return $this->isActive()
-            && 'wpml' == glsr(OptionManager::class)->get('settings.general.multilingual');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isEnabled()
+	{
+		return $this->isActive()
+			&& 'wpml' == glsr(OptionManager::class)->get('settings.general.multilingual');
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isSupported()
-    {
-        return $this->isActive()
-            && Helper::isGreaterThanOrEqual(ICL_SITEPRESS_VERSION, $this->supportedVersion);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isSupported()
+	{
+		return $this->isActive()
+			&& Helper::isGreaterThanOrEqual(ICL_SITEPRESS_VERSION, $this->supportedVersion);
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -15,44 +15,44 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getPostId($postId)
+    public function getPostId( $postId )
     {
-        $postId = trim($postId);
-        if (!is_numeric($postId)) {
+        $postId = trim( $postId );
+        if( !is_numeric( $postId ) ) {
             return 0;
         }
-        if ($this->isEnabled()) {
-            $postId = apply_filters('wpml_object_id', $postId, 'any', true);
+        if( $this->isEnabled() ) {
+            $postId = apply_filters( 'wpml_object_id', $postId, 'any', true );
         }
-        return intval($postId);
+        return intval( $postId );
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getPostIds(array $postIds)
+    public function getPostIds( array $postIds )
     {
-        if (!$this->isEnabled()) {
+        if( !$this->isEnabled() ) {
             return $postIds;
         }
         $newPostIds = [];
-        foreach (Arr::unique($postIds) as $postId) {
-            $postType = get_post_type($postId);
-            if (!$postType) {
+        foreach( Arr::unique( $postIds ) as $postId ) {
+            $postType = get_post_type( $postId );
+            if( !$postType ) {
                 continue;
             }
             $elementType = 'post_'.$postType;
-            $trid = apply_filters('wpml_element_trid', null, $postId, $elementType);
-            $translations = apply_filters('wpml_get_element_translations', null, $trid, $elementType);
-            if (!is_array($translations)) {
+            $trid = apply_filters( 'wpml_element_trid', null, $postId, $elementType );
+            $translations = apply_filters( 'wpml_get_element_translations', null, $trid, $elementType );
+            if( !is_array( $translations ) ) {
                 $translations = [];
             }
             $newPostIds = array_merge(
                 $newPostIds,
-                array_column($translations, 'element_id')
+                array_column( $translations, 'element_id' )
             );
         }
-        return Arr::unique($newPostIds);
+        return Arr::unique( $newPostIds );
     }
 
     /**
@@ -60,7 +60,7 @@ 
      */
     public function isActive()
     {
-        return defined('ICL_SITEPRESS_VERSION');
+        return defined( 'ICL_SITEPRESS_VERSION' );
     }
 
     /**
@@ -69,7 +69,7 @@ 
     public function isEnabled()
     {
         return $this->isActive()
-            && 'wpml' == glsr(OptionManager::class)->get('settings.general.multilingual');
+            && 'wpml' == glsr( OptionManager::class )->get( 'settings.general.multilingual' );
     }
 
     /**
@@ -78,6 +78,6 @@ 
     public function isSupported()
     {
         return $this->isActive()
-            && Helper::isGreaterThanOrEqual(ICL_SITEPRESS_VERSION, $this->supportedVersion);
+            && Helper::isGreaterThanOrEqual( ICL_SITEPRESS_VERSION, $this->supportedVersion );
     }
 }

plugin/Modules/Multilingual/Polylang.php

Indentation +62 added lines, -62 removed lines

@@ -9,71 +9,71 @@
 
 class Polylang implements Contract
 {
-    public $pluginName = 'Polylang';
-    public $supportedVersion = '2.3';
+	public $pluginName = 'Polylang';
+	public $supportedVersion = '2.3';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getPostId($postId)
-    {
-        $postId = trim($postId);
-        if (!is_numeric($postId)) {
-            return 0;
-        }
-        if ($this->isEnabled()) {
-            $polylangPostId = pll_get_post($postId, pll_get_post_language(get_the_ID()));
-        }
-        if (!empty($polylangPostId)) {
-            $postId = $polylangPostId;
-        }
-        return intval($postId);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getPostId($postId)
+	{
+		$postId = trim($postId);
+		if (!is_numeric($postId)) {
+			return 0;
+		}
+		if ($this->isEnabled()) {
+			$polylangPostId = pll_get_post($postId, pll_get_post_language(get_the_ID()));
+		}
+		if (!empty($polylangPostId)) {
+			$postId = $polylangPostId;
+		}
+		return intval($postId);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getPostIds(array $postIds)
-    {
-        if (!$this->isEnabled()) {
-            return $postIds;
-        }
-        $newPostIds = [];
-        foreach (Arr::unique($postIds) as $postId) {
-            $newPostIds = array_merge(
-                $newPostIds,
-                array_values(pll_get_post_translations($postId))
-            );
-        }
-        return Arr::unique($newPostIds);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getPostIds(array $postIds)
+	{
+		if (!$this->isEnabled()) {
+			return $postIds;
+		}
+		$newPostIds = [];
+		foreach (Arr::unique($postIds) as $postId) {
+			$newPostIds = array_merge(
+				$newPostIds,
+				array_values(pll_get_post_translations($postId))
+			);
+		}
+		return Arr::unique($newPostIds);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isActive()
-    {
-        return function_exists('PLL')
-            && function_exists('pll_get_post')
-            && function_exists('pll_get_post_language')
-            && function_exists('pll_get_post_translations');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isActive()
+	{
+		return function_exists('PLL')
+			&& function_exists('pll_get_post')
+			&& function_exists('pll_get_post_language')
+			&& function_exists('pll_get_post_translations');
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isEnabled()
-    {
-        return $this->isActive()
-            && 'polylang' == glsr(OptionManager::class)->get('settings.general.multilingual');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isEnabled()
+	{
+		return $this->isActive()
+			&& 'polylang' == glsr(OptionManager::class)->get('settings.general.multilingual');
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isSupported()
-    {
-        return defined('POLYLANG_VERSION')
-            && Helper::isGreaterThanOrEqual(POLYLANG_VERSION, $this->supportedVersion);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isSupported()
+	{
+		return defined('POLYLANG_VERSION')
+			&& Helper::isGreaterThanOrEqual(POLYLANG_VERSION, $this->supportedVersion);
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -15,37 +15,37 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getPostId($postId)
+    public function getPostId( $postId )
     {
-        $postId = trim($postId);
-        if (!is_numeric($postId)) {
+        $postId = trim( $postId );
+        if( !is_numeric( $postId ) ) {
             return 0;
         }
-        if ($this->isEnabled()) {
-            $polylangPostId = pll_get_post($postId, pll_get_post_language(get_the_ID()));
+        if( $this->isEnabled() ) {
+            $polylangPostId = pll_get_post( $postId, pll_get_post_language( get_the_ID() ) );
         }
-        if (!empty($polylangPostId)) {
+        if( !empty($polylangPostId) ) {
             $postId = $polylangPostId;
         }
-        return intval($postId);
+        return intval( $postId );
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getPostIds(array $postIds)
+    public function getPostIds( array $postIds )
     {
-        if (!$this->isEnabled()) {
+        if( !$this->isEnabled() ) {
             return $postIds;
         }
         $newPostIds = [];
-        foreach (Arr::unique($postIds) as $postId) {
+        foreach( Arr::unique( $postIds ) as $postId ) {
             $newPostIds = array_merge(
                 $newPostIds,
-                array_values(pll_get_post_translations($postId))
+                array_values( pll_get_post_translations( $postId ) )
             );
         }
-        return Arr::unique($newPostIds);
+        return Arr::unique( $newPostIds );
     }
 
     /**
@@ -53,10 +53,10 @@ 
      */
     public function isActive()
     {
-        return function_exists('PLL')
-            && function_exists('pll_get_post')
-            && function_exists('pll_get_post_language')
-            && function_exists('pll_get_post_translations');
+        return function_exists( 'PLL' )
+            && function_exists( 'pll_get_post' )
+            && function_exists( 'pll_get_post_language' )
+            && function_exists( 'pll_get_post_translations' );
     }
 
     /**
@@ -65,7 +65,7 @@ 
     public function isEnabled()
     {
         return $this->isActive()
-            && 'polylang' == glsr(OptionManager::class)->get('settings.general.multilingual');
+            && 'polylang' == glsr( OptionManager::class )->get( 'settings.general.multilingual' );
     }
 
     /**
@@ -73,7 +73,7 @@ 
      */
     public function isSupported()
     {
-        return defined('POLYLANG_VERSION')
-            && Helper::isGreaterThanOrEqual(POLYLANG_VERSION, $this->supportedVersion);
+        return defined( 'POLYLANG_VERSION' )
+            && Helper::isGreaterThanOrEqual( POLYLANG_VERSION, $this->supportedVersion );
     }
 }

plugin/Helper.php

Indentation +214 added lines, -214 removed lines

@@ -8,218 +8,218 @@
 
 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 $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 static::buildMethodName($name);
-    }
-
-    /**
-     * @param string $cast
-     * @param mixed $value
-     * @return mixed
-     */
-    public static function castTo($cast = '', $value)
-    {
-        $method = static::buildMethodName($cast, 'castTo');
-        return !empty($cast) && method_exists(__CLASS__, $method)
-            ? static::$method($value)
-            : $value;
-    }
-
-    /**
-     * @param mixed $value
-     * @return array
-     */
-    public static function castToArray($value)
-    {
-        return (array) $value;
-    }
-
-    /**
-     * @param mixed $value
-     * @return bool
-     */
-    public static function castToBool($value)
-    {
-        return filter_var($value, FILTER_VALIDATE_BOOLEAN);
-    }
-
-    /**
-     * @param mixed $value
-     * @return float
-     */
-    public static function castToFloat($value)
-    {
-        return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
-    }
-
-    /**
-     * @param mixed $value
-     * @return int
-     */
-    public static function castToInt($value)
-    {
-        return (int) filter_var($value, FILTER_VALIDATE_INT);
-    }
-
-    /**
-     * @param mixed $value
-     * @return object
-     */
-    public static function castToObject($value)
-    {
-        return (object) (array) $value;
-    }
-
-    /**
-     * @param mixed $value
-     * @return string
-     */
-    public static function castToString($value)
-    {
-        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;
-    }
-
-    /**
-     * @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;
-    }
-
-    /**
-     * @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';
-    }
-
-    /**
-     * @param mixed $value
-     * @param string|int $min
-     * @param string|int $max
-     * @return bool
-     */
-    public static function inRange($value, $min, $max)
-    {
-        $inRange = filter_var($value, FILTER_VALIDATE_INT, ['options' => [
-            'min_range' => intval($min),
-            'max_range' => intval($max),
-        ]]);
-        return false !== $inRange;
-    }
-
-    /**
-     * @param int|string $value
-     * @param int|string $compareWithValue
-     * @return bool
-     */
-    public static function isGreaterThan($value, $compareWithValue)
-    {
-        return version_compare($value, $compareWithValue, '>');
-    }
-
-    /**
-     * @param int|string $value
-     * @param int|string $compareWithValue
-     * @return bool
-     */
-    public static function isGreaterThanOrEqual($value, $compareWithValue)
-    {
-        return version_compare($value, $compareWithValue, '>=');
-    }
-
-    /**
-     * @param int|string $value
-     * @param int|string $compareWithValue
-     * @return bool
-     */
-    public static function isLessThan($value, $compareWithValue)
-    {
-        return version_compare($value, $compareWithValue, '<');
-    }
-
-    /**
-     * @param int|string $value
-     * @param int|string $compareWithValue
-     * @return bool
-     */
-    public static function isLessThanOrEqual($value, $compareWithValue)
-    {
-        return version_compare($value, $compareWithValue, '<=');
-    }
+	/**
+	 * @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
+	 * @return string
+	 */
+	public static function buildPropertyName($name)
+	{
+		return static::buildMethodName($name);
+	}
+
+	/**
+	 * @param string $cast
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	public static function castTo($cast = '', $value)
+	{
+		$method = static::buildMethodName($cast, 'castTo');
+		return !empty($cast) && method_exists(__CLASS__, $method)
+			? static::$method($value)
+			: $value;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return array
+	 */
+	public static function castToArray($value)
+	{
+		return (array) $value;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public static function castToBool($value)
+	{
+		return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return float
+	 */
+	public static function castToFloat($value)
+	{
+		return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return int
+	 */
+	public static function castToInt($value)
+	{
+		return (int) filter_var($value, FILTER_VALIDATE_INT);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return object
+	 */
+	public static function castToObject($value)
+	{
+		return (object) (array) $value;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return string
+	 */
+	public static function castToString($value)
+	{
+		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;
+	}
+
+	/**
+	 * @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;
+	}
+
+	/**
+	 * @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';
+	}
+
+	/**
+	 * @param mixed $value
+	 * @param string|int $min
+	 * @param string|int $max
+	 * @return bool
+	 */
+	public static function inRange($value, $min, $max)
+	{
+		$inRange = filter_var($value, FILTER_VALIDATE_INT, ['options' => [
+			'min_range' => intval($min),
+			'max_range' => intval($max),
+		]]);
+		return false !== $inRange;
+	}
+
+	/**
+	 * @param int|string $value
+	 * @param int|string $compareWithValue
+	 * @return bool
+	 */
+	public static function isGreaterThan($value, $compareWithValue)
+	{
+		return version_compare($value, $compareWithValue, '>');
+	}
+
+	/**
+	 * @param int|string $value
+	 * @param int|string $compareWithValue
+	 * @return bool
+	 */
+	public static function isGreaterThanOrEqual($value, $compareWithValue)
+	{
+		return version_compare($value, $compareWithValue, '>=');
+	}
+
+	/**
+	 * @param int|string $value
+	 * @param int|string $compareWithValue
+	 * @return bool
+	 */
+	public static function isLessThan($value, $compareWithValue)
+	{
+		return version_compare($value, $compareWithValue, '<');
+	}
+
+	/**
+	 * @param int|string $value
+	 * @param int|string $compareWithValue
+	 * @return bool
+	 */
+	public static function isLessThanOrEqual($value, $compareWithValue)
+	{
+		return version_compare($value, $compareWithValue, '<=');
+	}
 }

Spacing +59 added lines, -59 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 static::buildMethodName($name);
+        return static::buildMethodName( $name );
     }
 
     /**
@@ -46,11 +46,11 @@ 
      * @param mixed $value
      * @return mixed
      */
-    public static function castTo($cast = '', $value)
+    public static function castTo( $cast = '', $value )
     {
-        $method = static::buildMethodName($cast, 'castTo');
-        return !empty($cast) && method_exists(__CLASS__, $method)
-            ? static::$method($value)
+        $method = static::buildMethodName( $cast, 'castTo' );
+        return !empty($cast) && method_exists( __CLASS__, $method )
+            ? static::$method( $value )
             : $value;
     }
 
@@ -58,73 +58,73 @@ 
      * @param mixed $value
      * @return array
      */
-    public static function castToArray($value)
+    public static function castToArray( $value )
     {
-        return (array) $value;
+        return (array)$value;
     }
 
     /**
      * @param mixed $value
      * @return bool
      */
-    public static function castToBool($value)
+    public static function castToBool( $value )
     {
-        return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+        return filter_var( $value, FILTER_VALIDATE_BOOLEAN );
     }
 
     /**
      * @param mixed $value
      * @return float
      */
-    public static function castToFloat($value)
+    public static function castToFloat( $value )
     {
-        return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
+        return (float)filter_var( $value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND );
     }
 
     /**
      * @param mixed $value
      * @return int
      */
-    public static function castToInt($value)
+    public static function castToInt( $value )
     {
-        return (int) filter_var($value, FILTER_VALIDATE_INT);
+        return (int)filter_var( $value, FILTER_VALIDATE_INT );
     }
 
     /**
      * @param mixed $value
      * @return object
      */
-    public static function castToObject($value)
+    public static function castToObject( $value )
     {
-        return (object) (array) $value;
+        return (object)(array)$value;
     }
 
     /**
      * @param mixed $value
      * @return string
      */
-    public static function castToString($value)
+    public static function castToString( $value )
     {
-        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;
     }
 
     /**
      * @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;
@@ -134,13 +134,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;
     }
 
     /**
@@ -149,22 +149,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';
     }
 
@@ -174,12 +174,12 @@ 
      * @param string|int $max
      * @return bool
      */
-    public static function inRange($value, $min, $max)
+    public static function inRange( $value, $min, $max )
     {
-        $inRange = filter_var($value, FILTER_VALIDATE_INT, ['options' => [
-            'min_range' => intval($min),
-            'max_range' => intval($max),
-        ]]);
+        $inRange = filter_var( $value, FILTER_VALIDATE_INT, ['options' => [
+            'min_range' => intval( $min ),
+            'max_range' => intval( $max ),
+        ]] );
         return false !== $inRange;
     }
 
@@ -188,9 +188,9 @@ 
      * @param int|string $compareWithValue
      * @return bool
      */
-    public static function isGreaterThan($value, $compareWithValue)
+    public static function isGreaterThan( $value, $compareWithValue )
     {
-        return version_compare($value, $compareWithValue, '>');
+        return version_compare( $value, $compareWithValue, '>' );
     }
 
     /**
@@ -198,9 +198,9 @@ 
      * @param int|string $compareWithValue
      * @return bool
      */
-    public static function isGreaterThanOrEqual($value, $compareWithValue)
+    public static function isGreaterThanOrEqual( $value, $compareWithValue )
     {
-        return version_compare($value, $compareWithValue, '>=');
+        return version_compare( $value, $compareWithValue, '>=' );
     }
 
     /**
@@ -208,9 +208,9 @@ 
      * @param int|string $compareWithValue
      * @return bool
      */
-    public static function isLessThan($value, $compareWithValue)
+    public static function isLessThan( $value, $compareWithValue )
     {
-        return version_compare($value, $compareWithValue, '<');
+        return version_compare( $value, $compareWithValue, '<' );
     }
 
     /**
@@ -218,8 +218,8 @@ 
      * @param int|string $compareWithValue
      * @return bool
      */
-    public static function isLessThanOrEqual($value, $compareWithValue)
+    public static function isLessThanOrEqual( $value, $compareWithValue )
     {
-        return version_compare($value, $compareWithValue, '<=');
+        return version_compare( $value, $compareWithValue, '<=' );
     }
 }

plugin/Database/OptionManager.php

Indentation +142 added lines, -142 removed lines

@@ -9,157 +9,157 @@
 
 class OptionManager
 {
-    /**
-     * @var array
-     */
-    protected $options;
+	/**
+	 * @var array
+	 */
+	protected $options;
 
-    /**
-     * @return string
-     */
-    public static function databaseKey($version = null)
-    {
-        if (1 == $version) {
-            return 'geminilabs_site_reviews_settings';
-        }
-        if (2 == $version) {
-            return 'geminilabs_site_reviews-v2';
-        }
-        if (null === $version) {
-            $version = explode('.', glsr()->version);
-            $version = array_shift($version);
-        }
-        return Str::snakeCase(Application::ID.'-v'.intval($version));
-    }
+	/**
+	 * @return string
+	 */
+	public static function databaseKey($version = null)
+	{
+		if (1 == $version) {
+			return 'geminilabs_site_reviews_settings';
+		}
+		if (2 == $version) {
+			return 'geminilabs_site_reviews-v2';
+		}
+		if (null === $version) {
+			$version = explode('.', glsr()->version);
+			$version = array_shift($version);
+		}
+		return Str::snakeCase(Application::ID.'-v'.intval($version));
+	}
 
-    /**
-     * @return array
-     */
-    public function all()
-    {
-        if (empty($this->options)) {
-            $this->reset();
-        }
-        return $this->options;
-    }
+	/**
+	 * @return array
+	 */
+	public function all()
+	{
+		if (empty($this->options)) {
+			$this->reset();
+		}
+		return $this->options;
+	}
 
-    /**
-     * @param string $path
-     * @return bool
-     */
-    public function delete($path)
-    {
-        $keys = explode('.', $path);
-        $last = array_pop($keys);
-        $options = $this->all();
-        $pointer = &$options;
-        foreach ($keys as $key) {
-            if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
-                continue;
-            }
-            $pointer = &$pointer[$key];
-        }
-        unset($pointer[$last]);
-        return $this->set($options);
-    }
+	/**
+	 * @param string $path
+	 * @return bool
+	 */
+	public function delete($path)
+	{
+		$keys = explode('.', $path);
+		$last = array_pop($keys);
+		$options = $this->all();
+		$pointer = &$options;
+		foreach ($keys as $key) {
+			if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
+				continue;
+			}
+			$pointer = &$pointer[$key];
+		}
+		unset($pointer[$last]);
+		return $this->set($options);
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @param string $cast
-     * @return mixed
-     */
-    public function get($path = '', $fallback = '', $cast = '')
-    {
-        $result = Arr::get($this->all(), $path, $fallback);
-        return Helper::castTo($cast, $result);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @param string $cast
+	 * @return mixed
+	 */
+	public function get($path = '', $fallback = '', $cast = '')
+	{
+		$result = Arr::get($this->all(), $path, $fallback);
+		return Helper::castTo($cast, $result);
+	}
 
-    /**
-     * @param string $path
-     * @return bool
-     */
-    public function getBool($path)
-    {
-        return Helper::castToBool($this->get($path));
-    }
+	/**
+	 * @param string $path
+	 * @return bool
+	 */
+	public function getBool($path)
+	{
+		return Helper::castToBool($this->get($path));
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @param string $cast
-     * @return mixed
-     */
-    public function getWP($path, $fallback = '', $cast = '')
-    {
-        $option = get_option($path, $fallback);
-        if (empty($option)) {
-            $option = $fallback;
-        }
-        return Helper::castTo($cast, $option);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @param string $cast
+	 * @return mixed
+	 */
+	public function getWP($path, $fallback = '', $cast = '')
+	{
+		$option = get_option($path, $fallback);
+		if (empty($option)) {
+			$option = $fallback;
+		}
+		return Helper::castTo($cast, $option);
+	}
 
-    /**
-     * @return string
-     */
-    public function json()
-    {
-        return json_encode($this->all());
-    }
+	/**
+	 * @return string
+	 */
+	public function json()
+	{
+		return json_encode($this->all());
+	}
 
-    /**
-     * @return array
-     */
-    public function normalize(array $options = [])
-    {
-        $options = wp_parse_args(
-            Arr::flattenArray($options),
-            glsr(DefaultsManager::class)->defaults()
-        );
-        array_walk($options, function (&$value) {
-            if (!is_string($value)) {
-                return;
-            }
-            $value = wp_kses($value, wp_kses_allowed_html('post'));
-        });
-        return Arr::convertDotNotationArray($options);
-    }
+	/**
+	 * @return array
+	 */
+	public function normalize(array $options = [])
+	{
+		$options = wp_parse_args(
+			Arr::flattenArray($options),
+			glsr(DefaultsManager::class)->defaults()
+		);
+		array_walk($options, function (&$value) {
+			if (!is_string($value)) {
+				return;
+			}
+			$value = wp_kses($value, wp_kses_allowed_html('post'));
+		});
+		return Arr::convertDotNotationArray($options);
+	}
 
-    /**
-     * @return bool
-     */
-    public function isRecaptchaEnabled()
-    {
-        $integration = $this->get('settings.submissions.recaptcha.integration');
-        return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
-    }
+	/**
+	 * @return bool
+	 */
+	public function isRecaptchaEnabled()
+	{
+		$integration = $this->get('settings.submissions.recaptcha.integration');
+		return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
+	}
 
-    /**
-     * @return array
-     */
-    public function reset()
-    {
-        $options = $this->getWP(static::databaseKey(), []);
-        if (!is_array($options) || empty($options)) {
-            delete_option(static::databaseKey());
-            $options = glsr()->defaults ?: [];
-        }
-        $this->options = $options;
-    }
+	/**
+	 * @return array
+	 */
+	public function reset()
+	{
+		$options = $this->getWP(static::databaseKey(), []);
+		if (!is_array($options) || empty($options)) {
+			delete_option(static::databaseKey());
+			$options = glsr()->defaults ?: [];
+		}
+		$this->options = $options;
+	}
 
-    /**
-     * @param string|array $pathOrOptions
-     * @param mixed $value
-     * @return bool
-     */
-    public function set($pathOrOptions, $value = '')
-    {
-        if (is_string($pathOrOptions)) {
-            $pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value);
-        }
-        if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
-            $this->reset();
-        }
-        return $result;
-    }
+	/**
+	 * @param string|array $pathOrOptions
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function set($pathOrOptions, $value = '')
+	{
+		if (is_string($pathOrOptions)) {
+			$pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value);
+		}
+		if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
+			$this->reset();
+		}
+		return $result;
+	}
 }

Spacing +39 added lines, -39 removed lines

@@ -17,19 +17,19 @@ 
     /**
      * @return string
      */
-    public static function databaseKey($version = null)
+    public static function databaseKey( $version = null )
     {
-        if (1 == $version) {
+        if( 1 == $version ) {
             return 'geminilabs_site_reviews_settings';
         }
-        if (2 == $version) {
+        if( 2 == $version ) {
             return 'geminilabs_site_reviews-v2';
         }
-        if (null === $version) {
-            $version = explode('.', glsr()->version);
-            $version = array_shift($version);
+        if( null === $version ) {
+            $version = explode( '.', glsr()->version );
+            $version = array_shift( $version );
         }
-        return Str::snakeCase(Application::ID.'-v'.intval($version));
+        return Str::snakeCase( Application::ID.'-v'.intval( $version ) );
     }
 
     /**
@@ -37,7 +37,7 @@ 
      */
     public function all()
     {
-        if (empty($this->options)) {
+        if( empty($this->options) ) {
             $this->reset();
         }
         return $this->options;
@@ -47,20 +47,20 @@ 
      * @param string $path
      * @return bool
      */
-    public function delete($path)
+    public function delete( $path )
     {
-        $keys = explode('.', $path);
-        $last = array_pop($keys);
+        $keys = explode( '.', $path );
+        $last = array_pop( $keys );
         $options = $this->all();
         $pointer = &$options;
-        foreach ($keys as $key) {
-            if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
+        foreach( $keys as $key ) {
+            if( !isset($pointer[$key]) || !is_array( $pointer[$key] ) ) {
                 continue;
             }
             $pointer = &$pointer[$key];
         }
         unset($pointer[$last]);
-        return $this->set($options);
+        return $this->set( $options );
     }
 
     /**
@@ -69,19 +69,19 @@ 
      * @param string $cast
      * @return mixed
      */
-    public function get($path = '', $fallback = '', $cast = '')
+    public function get( $path = '', $fallback = '', $cast = '' )
     {
-        $result = Arr::get($this->all(), $path, $fallback);
-        return Helper::castTo($cast, $result);
+        $result = Arr::get( $this->all(), $path, $fallback );
+        return Helper::castTo( $cast, $result );
     }
 
     /**
      * @param string $path
      * @return bool
      */
-    public function getBool($path)
+    public function getBool( $path )
     {
-        return Helper::castToBool($this->get($path));
+        return Helper::castToBool( $this->get( $path ) );
     }
 
     /**
@@ -90,13 +90,13 @@ 
      * @param string $cast
      * @return mixed
      */
-    public function getWP($path, $fallback = '', $cast = '')
+    public function getWP( $path, $fallback = '', $cast = '' )
     {
-        $option = get_option($path, $fallback);
-        if (empty($option)) {
+        $option = get_option( $path, $fallback );
+        if( empty($option) ) {
             $option = $fallback;
         }
-        return Helper::castTo($cast, $option);
+        return Helper::castTo( $cast, $option );
     }
 
     /**
@@ -104,25 +104,25 @@ 
      */
     public function json()
     {
-        return json_encode($this->all());
+        return json_encode( $this->all() );
     }
 
     /**
      * @return array
      */
-    public function normalize(array $options = [])
+    public function normalize( array $options = [] )
     {
         $options = wp_parse_args(
-            Arr::flattenArray($options),
-            glsr(DefaultsManager::class)->defaults()
+            Arr::flattenArray( $options ),
+            glsr( DefaultsManager::class )->defaults()
         );
-        array_walk($options, function (&$value) {
-            if (!is_string($value)) {
+        array_walk( $options, function( &$value ) {
+            if( !is_string( $value ) ) {
                 return;
             }
-            $value = wp_kses($value, wp_kses_allowed_html('post'));
+            $value = wp_kses( $value, wp_kses_allowed_html( 'post' ) );
         });
-        return Arr::convertDotNotationArray($options);
+        return Arr::convertDotNotationArray( $options );
     }
 
     /**
@@ -130,7 +130,7 @@ 
      */
     public function isRecaptchaEnabled()
     {
-        $integration = $this->get('settings.submissions.recaptcha.integration');
+        $integration = $this->get( 'settings.submissions.recaptcha.integration' );
         return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
     }
 
@@ -139,9 +139,9 @@ 
      */
     public function reset()
     {
-        $options = $this->getWP(static::databaseKey(), []);
-        if (!is_array($options) || empty($options)) {
-            delete_option(static::databaseKey());
+        $options = $this->getWP( static::databaseKey(), [] );
+        if( !is_array( $options ) || empty($options) ) {
+            delete_option( static::databaseKey() );
             $options = glsr()->defaults ?: [];
         }
         $this->options = $options;
@@ -152,12 +152,12 @@ 
      * @param mixed $value
      * @return bool
      */
-    public function set($pathOrOptions, $value = '')
+    public function set( $pathOrOptions, $value = '' )
     {
-        if (is_string($pathOrOptions)) {
-            $pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value);
+        if( is_string( $pathOrOptions ) ) {
+            $pathOrOptions = Arr::set( $this->all(), $pathOrOptions, $value );
         }
-        if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
+        if( $result = update_option( static::databaseKey(), (array)$pathOrOptions ) ) {
             $this->reset();
         }
         return $result;