pryley / site-reviews

plugin/Modules/Validator.php

Indentation +274 added lines, -274 removed lines

@@ -12,302 +12,302 @@
  */
 class Validator
 {
-    use ValidationRules;
+	use ValidationRules;
 
-    /**
-     * @var array
-     */
-    public $errors = [];
+	/**
+	 * @var array
+	 */
+	public $errors = [];
 
-    /**
-     * The data under validation.
-     * @var array
-     */
-    protected $data = [];
+	/**
+	 * The data under validation.
+	 * @var array
+	 */
+	protected $data = [];
 
-    /**
-     * The failed validation rules.
-     * @var array
-     */
-    protected $failedRules = [];
+	/**
+	 * The failed validation rules.
+	 * @var array
+	 */
+	protected $failedRules = [];
 
-    /**
-     * The rules to be applied to the data.
-     * @var array
-     */
-    protected $rules = [];
+	/**
+	 * The rules to be applied to the data.
+	 * @var array
+	 */
+	protected $rules = [];
 
-    /**
-     * The size related validation rules.
-     * @var array
-     */
-    protected $sizeRules = [
-        'Between', 'Max', 'Min',
-    ];
+	/**
+	 * The size related validation rules.
+	 * @var array
+	 */
+	protected $sizeRules = [
+		'Between', 'Max', 'Min',
+	];
 
-    /**
-     * The validation rules that imply the field is required.
-     * @var array
-     */
-    protected $implicitRules = [
-        'Required',
-    ];
+	/**
+	 * The validation rules that imply the field is required.
+	 * @var array
+	 */
+	protected $implicitRules = [
+		'Required',
+	];
 
-    /**
-     * The numeric related validation rules.
-     * @var array
-     */
-    protected $numericRules = [
-        'Number',
-    ];
+	/**
+	 * The numeric related validation rules.
+	 * @var array
+	 */
+	protected $numericRules = [
+		'Number',
+	];
 
-    /**
-     * Run the validator's rules against its data.
-     * @param mixed $data
-     * @return array
-     */
-    public function validate($data, array $rules = [])
-    {
-        $this->normalizeData($data);
-        $this->setRules($rules);
-        foreach ($this->rules as $attribute => $rules) {
-            foreach ($rules as $rule) {
-                $this->validateAttribute($attribute, $rule);
-                if ($this->shouldStopValidating($attribute)) {
-                    break;
-                }
-            }
-        }
-        return $this->errors;
-    }
+	/**
+	 * Run the validator's rules against its data.
+	 * @param mixed $data
+	 * @return array
+	 */
+	public function validate($data, array $rules = [])
+	{
+		$this->normalizeData($data);
+		$this->setRules($rules);
+		foreach ($this->rules as $attribute => $rules) {
+			foreach ($rules as $rule) {
+				$this->validateAttribute($attribute, $rule);
+				if ($this->shouldStopValidating($attribute)) {
+					break;
+				}
+			}
+		}
+		return $this->errors;
+	}
 
-    /**
-     * Validate a given attribute against a rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     * @throws BadMethodCallException
-     */
-    public function validateAttribute($attribute, $rule)
-    {
-        list($rule, $parameters) = $this->parseRule($rule);
-        if ('' == $rule) {
-            return;
-        }
-        $value = $this->getValue($attribute);
-        if (!method_exists($this, $method = 'validate'.$rule)) {
-            throw new BadMethodCallException("Method [$method] does not exist.");
-        }
-        if (!$this->$method($value, $attribute, $parameters)) {
-            $this->addFailure($attribute, $rule, $parameters);
-        }
-    }
+	/**
+	 * Validate a given attribute against a rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 * @throws BadMethodCallException
+	 */
+	public function validateAttribute($attribute, $rule)
+	{
+		list($rule, $parameters) = $this->parseRule($rule);
+		if ('' == $rule) {
+			return;
+		}
+		$value = $this->getValue($attribute);
+		if (!method_exists($this, $method = 'validate'.$rule)) {
+			throw new BadMethodCallException("Method [$method] does not exist.");
+		}
+		if (!$this->$method($value, $attribute, $parameters)) {
+			$this->addFailure($attribute, $rule, $parameters);
+		}
+	}
 
-    /**
-     * Add an error message to the validator's collection of errors.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     */
-    protected function addError($attribute, $rule, array $parameters)
-    {
-        $message = $this->getMessage($attribute, $rule, $parameters);
-        $this->errors[$attribute][] = $message;
-    }
+	/**
+	 * Add an error message to the validator's collection of errors.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 */
+	protected function addError($attribute, $rule, array $parameters)
+	{
+		$message = $this->getMessage($attribute, $rule, $parameters);
+		$this->errors[$attribute][] = $message;
+	}
 
-    /**
-     * Add a failed rule and error message to the collection.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     */
-    protected function addFailure($attribute, $rule, array $parameters)
-    {
-        $this->addError($attribute, $rule, $parameters);
-        $this->failedRules[$attribute][$rule] = $parameters;
-    }
+	/**
+	 * Add a failed rule and error message to the collection.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 */
+	protected function addFailure($attribute, $rule, array $parameters)
+	{
+		$this->addError($attribute, $rule, $parameters);
+		$this->failedRules[$attribute][$rule] = $parameters;
+	}
 
-    /**
-     * Get the data type of the given attribute.
-     * @param string $attribute
-     * @return string
-     */
-    protected function getAttributeType($attribute)
-    {
-        return !$this->hasRule($attribute, $this->numericRules)
-            ? 'length'
-            : '';
-    }
+	/**
+	 * Get the data type of the given attribute.
+	 * @param string $attribute
+	 * @return string
+	 */
+	protected function getAttributeType($attribute)
+	{
+		return !$this->hasRule($attribute, $this->numericRules)
+			? 'length'
+			: '';
+	}
 
-    /**
-     * Get the validation message for an attribute and rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return string|null
-     */
-    protected function getMessage($attribute, $rule, array $parameters)
-    {
-        if (in_array($rule, $this->sizeRules)) {
-            return $this->getSizeMessage($attribute, $rule, $parameters);
-        }
-        $lowerRule = Str::snakeCase($rule);
-        return $this->translator($lowerRule, $parameters);
-    }
+	/**
+	 * Get the validation message for an attribute and rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return string|null
+	 */
+	protected function getMessage($attribute, $rule, array $parameters)
+	{
+		if (in_array($rule, $this->sizeRules)) {
+			return $this->getSizeMessage($attribute, $rule, $parameters);
+		}
+		$lowerRule = Str::snakeCase($rule);
+		return $this->translator($lowerRule, $parameters);
+	}
 
-    /**
-     * Get a rule and its parameters for a given attribute.
-     * @param string $attribute
-     * @param string|array $rules
-     * @return array|null
-     */
-    protected function getRule($attribute, $rules)
-    {
-        if (!array_key_exists($attribute, $this->rules)) {
-            return;
-        }
-        $rules = (array) $rules;
-        foreach ($this->rules[$attribute] as $rule) {
-            list($rule, $parameters) = $this->parseRule($rule);
-            if (in_array($rule, $rules)) {
-                return [$rule, $parameters];
-            }
-        }
-    }
+	/**
+	 * Get a rule and its parameters for a given attribute.
+	 * @param string $attribute
+	 * @param string|array $rules
+	 * @return array|null
+	 */
+	protected function getRule($attribute, $rules)
+	{
+		if (!array_key_exists($attribute, $this->rules)) {
+			return;
+		}
+		$rules = (array) $rules;
+		foreach ($this->rules[$attribute] as $rule) {
+			list($rule, $parameters) = $this->parseRule($rule);
+			if (in_array($rule, $rules)) {
+				return [$rule, $parameters];
+			}
+		}
+	}
 
-    /**
-     * Get the size of an attribute.
-     * @param string $attribute
-     * @param mixed $value
-     * @return mixed
-     */
-    protected function getSize($attribute, $value)
-    {
-        $hasNumeric = $this->hasRule($attribute, $this->numericRules);
-        if (is_numeric($value) && $hasNumeric) {
-            return $value;
-        } elseif (is_array($value)) {
-            return count($value);
-        }
-        return function_exists('mb_strlen')
-            ? mb_strlen($value)
-            : strlen($value);
-    }
+	/**
+	 * Get the size of an attribute.
+	 * @param string $attribute
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	protected function getSize($attribute, $value)
+	{
+		$hasNumeric = $this->hasRule($attribute, $this->numericRules);
+		if (is_numeric($value) && $hasNumeric) {
+			return $value;
+		} elseif (is_array($value)) {
+			return count($value);
+		}
+		return function_exists('mb_strlen')
+			? mb_strlen($value)
+			: strlen($value);
+	}
 
-    /**
-     * Get the proper error message for an attribute and size rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return string|null
-     */
-    protected function getSizeMessage($attribute, $rule, array $parameters)
-    {
-        $type = $this->getAttributeType($attribute);
-        $lowerRule = Str::snakeCase($rule.$type);
-        return $this->translator($lowerRule, $parameters);
-    }
+	/**
+	 * Get the proper error message for an attribute and size rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return string|null
+	 */
+	protected function getSizeMessage($attribute, $rule, array $parameters)
+	{
+		$type = $this->getAttributeType($attribute);
+		$lowerRule = Str::snakeCase($rule.$type);
+		return $this->translator($lowerRule, $parameters);
+	}
 
-    /**
-     * Get the value of a given attribute.
-     * @param string $attribute
-     * @return mixed
-     */
-    protected function getValue($attribute)
-    {
-        if (isset($this->data[$attribute])) {
-            return $this->data[$attribute];
-        }
-    }
+	/**
+	 * Get the value of a given attribute.
+	 * @param string $attribute
+	 * @return mixed
+	 */
+	protected function getValue($attribute)
+	{
+		if (isset($this->data[$attribute])) {
+			return $this->data[$attribute];
+		}
+	}
 
-    /**
-     * Determine if the given attribute has a rule in the given set.
-     * @param string $attribute
-     * @param string|array $rules
-     * @return bool
-     */
-    protected function hasRule($attribute, $rules)
-    {
-        return !is_null($this->getRule($attribute, $rules));
-    }
+	/**
+	 * Determine if the given attribute has a rule in the given set.
+	 * @param string $attribute
+	 * @param string|array $rules
+	 * @return bool
+	 */
+	protected function hasRule($attribute, $rules)
+	{
+		return !is_null($this->getRule($attribute, $rules));
+	}
 
-    /**
-     * Normalize the provided data to an array.
-     * @param mixed $data
-     * @return void
-     */
-    protected function normalizeData($data)
-    {
-        $this->data = is_object($data)
-            ? get_object_vars($data)
-            : $data;
-    }
+	/**
+	 * Normalize the provided data to an array.
+	 * @param mixed $data
+	 * @return void
+	 */
+	protected function normalizeData($data)
+	{
+		$this->data = is_object($data)
+			? get_object_vars($data)
+			: $data;
+	}
 
-    /**
-     * Parse a parameter list.
-     * @param string $rule
-     * @param string $parameter
-     * @return array
-     */
-    protected function parseParameters($rule, $parameter)
-    {
-        return 'regex' == strtolower($rule)
-            ? [$parameter]
-            : str_getcsv($parameter);
-    }
+	/**
+	 * Parse a parameter list.
+	 * @param string $rule
+	 * @param string $parameter
+	 * @return array
+	 */
+	protected function parseParameters($rule, $parameter)
+	{
+		return 'regex' == strtolower($rule)
+			? [$parameter]
+			: str_getcsv($parameter);
+	}
 
-    /**
-     * Extract the rule name and parameters from a rule.
-     * @param string $rule
-     * @return array
-     */
-    protected function parseRule($rule)
-    {
-        $parameters = [];
-        if (Str::contains($rule, ':')) {
-            list($rule, $parameter) = explode(':', $rule, 2);
-            $parameters = $this->parseParameters($rule, $parameter);
-        }
-        $rule = Str::camelCase($rule);
-        return [$rule, $parameters];
-    }
+	/**
+	 * Extract the rule name and parameters from a rule.
+	 * @param string $rule
+	 * @return array
+	 */
+	protected function parseRule($rule)
+	{
+		$parameters = [];
+		if (Str::contains($rule, ':')) {
+			list($rule, $parameter) = explode(':', $rule, 2);
+			$parameters = $this->parseParameters($rule, $parameter);
+		}
+		$rule = Str::camelCase($rule);
+		return [$rule, $parameters];
+	}
 
-    /**
-     * Set the validation rules.
-     * @return void
-     */
-    protected function setRules(array $rules)
-    {
-        foreach ($rules as $key => $rule) {
-            $rules[$key] = is_string($rule)
-                ? explode('|', $rule)
-                : $rule;
-        }
-        $this->rules = $rules;
-    }
+	/**
+	 * Set the validation rules.
+	 * @return void
+	 */
+	protected function setRules(array $rules)
+	{
+		foreach ($rules as $key => $rule) {
+			$rules[$key] = is_string($rule)
+				? explode('|', $rule)
+				: $rule;
+		}
+		$this->rules = $rules;
+	}
 
-    /**
-     * Check if we should stop further validations on a given attribute.
-     * @param string $attribute
-     * @return bool
-     */
-    protected function shouldStopValidating($attribute)
-    {
-        return $this->hasRule($attribute, $this->implicitRules)
-            && isset($this->failedRules[$attribute])
-            && array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
-    }
+	/**
+	 * Check if we should stop further validations on a given attribute.
+	 * @param string $attribute
+	 * @return bool
+	 */
+	protected function shouldStopValidating($attribute)
+	{
+		return $this->hasRule($attribute, $this->implicitRules)
+			&& isset($this->failedRules[$attribute])
+			&& array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
+	}
 
-    /**
-     * Returns a translated message for the attribute.
-     * @param string $key
-     * @param string $attribute
-     * @return void|string
-     */
-    protected function translator($key, array $parameters)
-    {
-        $strings = glsr(ValidationStringsDefaults::class)->defaults();
-        if (isset($strings[$key])) {
-            return $this->replace($strings[$key], $parameters);
-        }
-        return 'error';
-    }
+	/**
+	 * Returns a translated message for the attribute.
+	 * @param string $key
+	 * @param string $attribute
+	 * @return void|string
+	 */
+	protected function translator($key, array $parameters)
+	{
+		$strings = glsr(ValidationStringsDefaults::class)->defaults();
+		if (isset($strings[$key])) {
+			return $this->replace($strings[$key], $parameters);
+		}
+		return 'error';
+	}
 }

plugin/Modules/Translator.php

Indentation +88 added lines, -88 removed lines

@@ -6,97 +6,97 @@
 
 class Translator
 {
-    /**
-     * @param string $original
-     * @param string $domain
-     * @return string
-     */
-    public function translate($original, $domain, array $args)
-    {
-        $domains = apply_filters('site-reviews/translator/domains', [Application::ID]);
-        if (!in_array($domain, $domains)) {
-            return $original;
-        }
-        $args = $this->normalizeTranslationArgs($args);
-        $strings = $this->getTranslationStrings($args['single'], $args['plural']);
-        if (empty($strings)) {
-            return $original;
-        }
-        $string = current($strings);
-        return 'plural' == $string['type']
-            ? $this->translatePlural($domain, $string, $args)
-            : $this->translateSingle($domain, $string, $args);
-    }
+	/**
+	 * @param string $original
+	 * @param string $domain
+	 * @return string
+	 */
+	public function translate($original, $domain, array $args)
+	{
+		$domains = apply_filters('site-reviews/translator/domains', [Application::ID]);
+		if (!in_array($domain, $domains)) {
+			return $original;
+		}
+		$args = $this->normalizeTranslationArgs($args);
+		$strings = $this->getTranslationStrings($args['single'], $args['plural']);
+		if (empty($strings)) {
+			return $original;
+		}
+		$string = current($strings);
+		return 'plural' == $string['type']
+			? $this->translatePlural($domain, $string, $args)
+			: $this->translateSingle($domain, $string, $args);
+	}
 
-    /**
-     * Used when search/replacing a default text-domain translation
-     * @return string
-     */
-    public function getTranslation(array $args)
-    {
-        $args = $this->normalizeTranslationArgs($args);
-        return get_translations_for_domain(Application::ID)->translate_plural($args['single'], $args['plural'], $args['number']);
-    }
+	/**
+	 * Used when search/replacing a default text-domain translation
+	 * @return string
+	 */
+	public function getTranslation(array $args)
+	{
+		$args = $this->normalizeTranslationArgs($args);
+		return get_translations_for_domain(Application::ID)->translate_plural($args['single'], $args['plural'], $args['number']);
+	}
 
-    /**
-     * @param string $single
-     * @param string $plural
-     * @return array
-     */
-    protected function getTranslationStrings($single, $plural)
-    {
-        return array_filter(glsr(Translation::class)->translations(), function ($string) use ($single, $plural) {
-            return $string['s1'] == html_entity_decode($single, ENT_COMPAT, 'UTF-8')
-                && $string['p1'] == html_entity_decode($plural, ENT_COMPAT, 'UTF-8');
-        });
-    }
+	/**
+	 * @param string $single
+	 * @param string $plural
+	 * @return array
+	 */
+	protected function getTranslationStrings($single, $plural)
+	{
+		return array_filter(glsr(Translation::class)->translations(), function ($string) use ($single, $plural) {
+			return $string['s1'] == html_entity_decode($single, ENT_COMPAT, 'UTF-8')
+				&& $string['p1'] == html_entity_decode($plural, ENT_COMPAT, 'UTF-8');
+		});
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeTranslationArgs(array $args)
-    {
-        $defaults = [
-            'context' => '',
-            'number' => 1,
-            'plural' => '',
-            'single' => '',
-        ];
-        return shortcode_atts($defaults, $args);
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeTranslationArgs(array $args)
+	{
+		$defaults = [
+			'context' => '',
+			'number' => 1,
+			'plural' => '',
+			'single' => '',
+		];
+		return shortcode_atts($defaults, $args);
+	}
 
-    /**
-     * @param string $domain
-     * @return string
-     */
-    protected function translatePlural($domain, array $string, array $args)
-    {
-        if (!empty($string['s2'])) {
-            $args['single'] = $string['s2'];
-        }
-        if (!empty($string['p2'])) {
-            $args['plural'] = $string['p2'];
-        }
-        return get_translations_for_domain($domain)->translate_plural(
-            $args['single'],
-            $args['plural'],
-            $args['number'],
-            $args['context']
-        );
-    }
+	/**
+	 * @param string $domain
+	 * @return string
+	 */
+	protected function translatePlural($domain, array $string, array $args)
+	{
+		if (!empty($string['s2'])) {
+			$args['single'] = $string['s2'];
+		}
+		if (!empty($string['p2'])) {
+			$args['plural'] = $string['p2'];
+		}
+		return get_translations_for_domain($domain)->translate_plural(
+			$args['single'],
+			$args['plural'],
+			$args['number'],
+			$args['context']
+		);
+	}
 
-    /**
-     * @param string $domain
-     * @return string
-     */
-    protected function translateSingle($domain, array $string, array $args)
-    {
-        if (!empty($string['s2'])) {
-            $args['single'] = $string['s2'];
-        }
-        return get_translations_for_domain($domain)->translate(
-            $args['single'],
-            $args['context']
-        );
-    }
+	/**
+	 * @param string $domain
+	 * @return string
+	 */
+	protected function translateSingle($domain, array $string, array $args)
+	{
+		if (!empty($string['s2'])) {
+			$args['single'] = $string['s2'];
+		}
+		return get_translations_for_domain($domain)->translate(
+			$args['single'],
+			$args['context']
+		);
+	}
 }

plugin/Controllers/TranslationController.php

Indentation +224 added lines, -224 removed lines

@@ -10,228 +10,228 @@
 
 class TranslationController
 {
-    /**
-     * @var Translator
-     */
-    public $translator;
-
-    public function __construct(Translator $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    /**
-     * @param array $messages
-     * @return array
-     * @filter bulk_post_updated_messages
-     */
-    public function filterBulkUpdateMessages($messages, array $counts)
-    {
-        $messages = Arr::consolidateArray($messages);
-        $messages[Application::POST_TYPE] = [
-            'updated' => _n('%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews'),
-            'locked' => _n('%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews'),
-            'deleted' => _n('%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews'),
-            'trashed' => _n('%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews'),
-            'untrashed' => _n('%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews'),
-        ];
-        return $messages;
-    }
-
-    /**
-     * @param string $translation
-     * @param string $text
-     * @param string $domain
-     * @return string
-     * @filter gettext
-     */
-    public function filterGettext($translation, $text, $domain)
-    {
-        return apply_filters('site-reviews/gettext/'.$domain, $translation, $text);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $text
-     * @return string
-     * @filter site-reviews/gettext/site-reviews
-     */
-    public function filterGettextSiteReviews($translation, $text)
-    {
-        return $this->translator->translate($translation, Application::ID, [
-            'single' => $text,
-        ]);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $text
-     * @param string $context
-     * @param string $domain
-     * @return string
-     * @filter gettext_with_context
-     */
-    public function filterGettextWithContext($translation, $text, $context, $domain)
-    {
-        return apply_filters('site-reviews/gettext_with_context/'.$domain, $translation, $text, $context);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $text
-     * @param string $context
-     * @return string
-     * @filter site-reviews/gettext_with_context/site-reviews
-     */
-    public function filterGettextWithContextSiteReviews($translation, $text, $context)
-    {
-        return $this->translator->translate($translation, Application::ID, [
-            'context' => $context,
-            'single' => $text,
-        ]);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @param string $domain
-     * @return string
-     * @filter ngettext
-     */
-    public function filterNgettext($translation, $single, $plural, $number, $domain)
-    {
-        return apply_filters('site-reviews/ngettext/'.$domain, $translation, $single, $plural, $number);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @return string
-     * @filter site-reviews/ngettext/site-reviews
-     */
-    public function filterNgettextSiteReviews($translation, $single, $plural, $number)
-    {
-        return $this->translator->translate($translation, Application::ID, [
-            'number' => $number,
-            'plural' => $plural,
-            'single' => $single,
-        ]);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @param string $context
-     * @param string $domain
-     * @return string
-     * @filter ngettext_with_context
-     */
-    public function filterNgettextWithContext($translation, $single, $plural, $number, $context, $domain)
-    {
-        return apply_filters('site-reviews/ngettext_with_context/'.$domain, $translation, $single, $plural, $number, $context);
-    }
-
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @param string $context
-     * @return string
-     * @filter site-reviews/ngettext_with_context/site-reviews
-     */
-    public function filterNgettextWithContextSiteReviews($translation, $single, $plural, $number, $context)
-    {
-        return $this->translator->translate($translation, Application::ID, [
-            'context' => $context,
-            'number' => $number,
-            'plural' => $plural,
-            'single' => $single,
-        ]);
-    }
-
-    /**
-     * @param array $postStates
-     * @param \WP_Post $post
-     * @return array
-     * @filter display_post_states
-     */
-    public function filterPostStates($postStates, $post)
-    {
-        $postStates = Arr::consolidateArray($postStates);
-        if (Application::POST_TYPE == Arr::get($post, 'post_type') && array_key_exists('pending', $postStates)) {
-            $postStates['pending'] = __('Unapproved', 'site-reviews');
-        }
-        return $postStates;
-    }
-
-    /**
-     * @param string $translation
-     * @param string $text
-     * @return string
-     * @filter site-reviews/gettext/default
-     * @filter site-reviews/gettext_with_context/default
-     */
-    public function filterPostStatusLabels($translation, $text)
-    {
-        return $this->canModifyTranslation()
-            ? glsr(Labels::class)->filterPostStatusLabels($translation, $text)
-            : $translation;
-    }
-
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @return string
-     * @filter site-reviews/ngettext/default
-     */
-    public function filterPostStatusText($translation, $single, $plural, $number)
-    {
-        if ($this->canModifyTranslation()) {
-            $strings = [
-                'Published' => __('Approved', 'site-reviews'),
-                'Pending' => __('Unapproved', 'site-reviews'),
-            ];
-            foreach ($strings as $search => $replace) {
-                if (!Str::contains($single, $search)) {
-                    continue;
-                }
-                return $this->translator->getTranslation([
-                    'number' => $number,
-                    'plural' => str_replace($search, $replace, $plural),
-                    'single' => str_replace($search, $replace, $single),
-                ]);
-            }
-        }
-        return $translation;
-    }
-
-    /**
-     * @return void
-     * @action admin_enqueue_scripts
-     */
-    public function translatePostStatusLabels()
-    {
-        if ($this->canModifyTranslation()) {
-            glsr(Labels::class)->translatePostStatusLabels();
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    protected function canModifyTranslation()
-    {
-        $screen = glsr_current_screen();
-        return Application::POST_TYPE == $screen->post_type 
-            && in_array($screen->base, ['edit', 'post']);
-    }
+	/**
+	 * @var Translator
+	 */
+	public $translator;
+
+	public function __construct(Translator $translator)
+	{
+		$this->translator = $translator;
+	}
+
+	/**
+	 * @param array $messages
+	 * @return array
+	 * @filter bulk_post_updated_messages
+	 */
+	public function filterBulkUpdateMessages($messages, array $counts)
+	{
+		$messages = Arr::consolidateArray($messages);
+		$messages[Application::POST_TYPE] = [
+			'updated' => _n('%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews'),
+			'locked' => _n('%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews'),
+			'deleted' => _n('%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews'),
+			'trashed' => _n('%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews'),
+			'untrashed' => _n('%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews'),
+		];
+		return $messages;
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @param string $domain
+	 * @return string
+	 * @filter gettext
+	 */
+	public function filterGettext($translation, $text, $domain)
+	{
+		return apply_filters('site-reviews/gettext/'.$domain, $translation, $text);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @return string
+	 * @filter site-reviews/gettext/site-reviews
+	 */
+	public function filterGettextSiteReviews($translation, $text)
+	{
+		return $this->translator->translate($translation, Application::ID, [
+			'single' => $text,
+		]);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @param string $context
+	 * @param string $domain
+	 * @return string
+	 * @filter gettext_with_context
+	 */
+	public function filterGettextWithContext($translation, $text, $context, $domain)
+	{
+		return apply_filters('site-reviews/gettext_with_context/'.$domain, $translation, $text, $context);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @param string $context
+	 * @return string
+	 * @filter site-reviews/gettext_with_context/site-reviews
+	 */
+	public function filterGettextWithContextSiteReviews($translation, $text, $context)
+	{
+		return $this->translator->translate($translation, Application::ID, [
+			'context' => $context,
+			'single' => $text,
+		]);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @param string $domain
+	 * @return string
+	 * @filter ngettext
+	 */
+	public function filterNgettext($translation, $single, $plural, $number, $domain)
+	{
+		return apply_filters('site-reviews/ngettext/'.$domain, $translation, $single, $plural, $number);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @return string
+	 * @filter site-reviews/ngettext/site-reviews
+	 */
+	public function filterNgettextSiteReviews($translation, $single, $plural, $number)
+	{
+		return $this->translator->translate($translation, Application::ID, [
+			'number' => $number,
+			'plural' => $plural,
+			'single' => $single,
+		]);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @param string $context
+	 * @param string $domain
+	 * @return string
+	 * @filter ngettext_with_context
+	 */
+	public function filterNgettextWithContext($translation, $single, $plural, $number, $context, $domain)
+	{
+		return apply_filters('site-reviews/ngettext_with_context/'.$domain, $translation, $single, $plural, $number, $context);
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @param string $context
+	 * @return string
+	 * @filter site-reviews/ngettext_with_context/site-reviews
+	 */
+	public function filterNgettextWithContextSiteReviews($translation, $single, $plural, $number, $context)
+	{
+		return $this->translator->translate($translation, Application::ID, [
+			'context' => $context,
+			'number' => $number,
+			'plural' => $plural,
+			'single' => $single,
+		]);
+	}
+
+	/**
+	 * @param array $postStates
+	 * @param \WP_Post $post
+	 * @return array
+	 * @filter display_post_states
+	 */
+	public function filterPostStates($postStates, $post)
+	{
+		$postStates = Arr::consolidateArray($postStates);
+		if (Application::POST_TYPE == Arr::get($post, 'post_type') && array_key_exists('pending', $postStates)) {
+			$postStates['pending'] = __('Unapproved', 'site-reviews');
+		}
+		return $postStates;
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @return string
+	 * @filter site-reviews/gettext/default
+	 * @filter site-reviews/gettext_with_context/default
+	 */
+	public function filterPostStatusLabels($translation, $text)
+	{
+		return $this->canModifyTranslation()
+			? glsr(Labels::class)->filterPostStatusLabels($translation, $text)
+			: $translation;
+	}
+
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @return string
+	 * @filter site-reviews/ngettext/default
+	 */
+	public function filterPostStatusText($translation, $single, $plural, $number)
+	{
+		if ($this->canModifyTranslation()) {
+			$strings = [
+				'Published' => __('Approved', 'site-reviews'),
+				'Pending' => __('Unapproved', 'site-reviews'),
+			];
+			foreach ($strings as $search => $replace) {
+				if (!Str::contains($single, $search)) {
+					continue;
+				}
+				return $this->translator->getTranslation([
+					'number' => $number,
+					'plural' => str_replace($search, $replace, $plural),
+					'single' => str_replace($search, $replace, $single),
+				]);
+			}
+		}
+		return $translation;
+	}
+
+	/**
+	 * @return void
+	 * @action admin_enqueue_scripts
+	 */
+	public function translatePostStatusLabels()
+	{
+		if ($this->canModifyTranslation()) {
+			glsr(Labels::class)->translatePostStatusLabels();
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function canModifyTranslation()
+	{
+		$screen = glsr_current_screen();
+		return Application::POST_TYPE == $screen->post_type 
+			&& in_array($screen->base, ['edit', 'post']);
+	}
 }

plugin/Filters.php

Indentation +66 added lines, -66 removed lines

@@ -15,72 +15,72 @@
 
 class Filters implements HooksContract
 {
-    protected $admin;
-    protected $app;
-    protected $basename;
-    protected $blocks;
-    protected $editor;
-    protected $listtable;
-    protected $public;
-    protected $rebusify;
-    protected $translator;
-    protected $welcome;
+	protected $admin;
+	protected $app;
+	protected $basename;
+	protected $blocks;
+	protected $editor;
+	protected $listtable;
+	protected $public;
+	protected $rebusify;
+	protected $translator;
+	protected $welcome;
 
-    public function __construct(Application $app)
-    {
-        $this->app = $app;
-        $this->admin = $app->make(AdminController::class);
-        $this->basename = plugin_basename($app->file);
-        $this->blocks = $app->make(BlocksController::class);
-        $this->editor = $app->make(EditorController::class);
-        $this->listtable = $app->make(ListTableController::class);
-        $this->public = $app->make(PublicController::class);
-        $this->rebusify = $app->make(RebusifyController::class);
-        $this->translator = $app->make(TranslationController::class);
-        $this->welcome = $app->make(WelcomeController::class);
-    }
+	public function __construct(Application $app)
+	{
+		$this->app = $app;
+		$this->admin = $app->make(AdminController::class);
+		$this->basename = plugin_basename($app->file);
+		$this->blocks = $app->make(BlocksController::class);
+		$this->editor = $app->make(EditorController::class);
+		$this->listtable = $app->make(ListTableController::class);
+		$this->public = $app->make(PublicController::class);
+		$this->rebusify = $app->make(RebusifyController::class);
+		$this->translator = $app->make(TranslationController::class);
+		$this->welcome = $app->make(WelcomeController::class);
+	}
 
-    /**
-     * @return void
-     */
-    public function run()
-    {
-        add_filter('map_meta_cap',                                              [$this->admin, 'filterCreateCapability'], 10, 2);
-        add_filter('mce_external_plugins',                                      [$this->admin, 'filterTinymcePlugins'], 15);
-        add_filter('plugin_action_links_'.$this->basename,                      [$this->admin, 'filterActionLinks']);
-        add_filter('dashboard_glance_items',                                    [$this->admin, 'filterDashboardGlanceItems']);
-        add_filter('block_categories',                                          [$this->blocks, 'filterBlockCategories']);
-        add_filter('classic_editor_enabled_editors_for_post_type',              [$this->blocks, 'filterEnabledEditors'], 10, 2);
-        add_filter('use_block_editor_for_post_type',                            [$this->blocks, 'filterUseBlockEditor'], 10, 2);
-        add_filter('wp_editor_settings',                                        [$this->editor, 'filterEditorSettings']);
-        add_filter('the_editor',                                                [$this->editor, 'filterEditorTextarea']);
-        add_filter('is_protected_meta',                                         [$this->editor, 'filterIsProtectedMeta'], 10, 3);
-        add_filter('post_updated_messages',                                     [$this->editor, 'filterUpdateMessages']);
-        add_filter('manage_'.Application::POST_TYPE.'_posts_columns',           [$this->listtable, 'filterColumnsForPostType']);
-        add_filter('post_date_column_status',                                   [$this->listtable, 'filterDateColumnStatus'], 10, 2);
-        add_filter('default_hidden_columns',                                    [$this->listtable, 'filterDefaultHiddenColumns'], 10, 2);
-        add_filter('post_row_actions',                                          [$this->listtable, 'filterRowActions'], 10, 2);
-        add_filter('manage_edit-'.Application::POST_TYPE.'_sortable_columns',   [$this->listtable, 'filterSortableColumns']);
-        add_filter('script_loader_tag',                                         [$this->public, 'filterEnqueuedScripts'], 10, 2);
-        add_filter('site-reviews/config/forms/submission-form',                 [$this->public, 'filterFieldOrder'], 11);
-        add_filter('site-reviews/render/view',                                  [$this->public, 'filterRenderView']);
-        add_filter('site-reviews/settings/callback',                            [$this->rebusify, 'filterSettingsCallback']);
-        add_filter('site-reviews/interpolate/partials/form/table-row-multiple', [$this->rebusify, 'filterSettingsTableRow'], 10, 3);
-        add_filter('bulk_post_updated_messages',                                [$this->translator, 'filterBulkUpdateMessages'], 10, 2);
-        add_filter('gettext',                                                   [$this->translator, 'filterGettext'], 9, 3);
-        add_filter('site-reviews/gettext/site-reviews',                         [$this->translator, 'filterGettextSiteReviews'], 10, 2);
-        add_filter('gettext_with_context',                                      [$this->translator, 'filterGettextWithContext'], 9, 4);
-        add_filter('site-reviews/gettext_with_context/site-reviews',            [$this->translator, 'filterGettextWithContextSiteReviews'], 10, 3);
-        add_filter('ngettext',                                                  [$this->translator, 'filterNgettext'], 9, 5);
-        add_filter('site-reviews/ngettext/site-reviews',                        [$this->translator, 'filterNgettextSiteReviews'], 10, 4);
-        add_filter('ngettext_with_context',                                     [$this->translator, 'filterNgettextWithContext'], 9, 6);
-        add_filter('site-reviews/ngettext_with_context/site-reviews',           [$this->translator, 'filterNgettextWithContextSiteReviews'], 10, 5);
-        add_filter('display_post_states',                                       [$this->translator, 'filterPostStates'], 10, 2);
-        add_filter('site-reviews/gettext/default',                              [$this->translator, 'filterPostStatusLabels'], 10, 2);
-        add_filter('site-reviews/gettext_with_context/default',                 [$this->translator, 'filterPostStatusLabels'], 10, 2);
-        add_filter('site-reviews/ngettext/default',                             [$this->translator, 'filterPostStatusText'], 10, 4);
-        add_filter('plugin_action_links_'.$this->basename,                      [$this->welcome, 'filterActionLinks'], 9);
-        add_filter('admin_title',                                               [$this->welcome, 'filterAdminTitle']);
-        add_filter('admin_footer_text',                                         [$this->welcome, 'filterFooterText']);
-    }
+	/**
+	 * @return void
+	 */
+	public function run()
+	{
+		add_filter('map_meta_cap',                                              [$this->admin, 'filterCreateCapability'], 10, 2);
+		add_filter('mce_external_plugins',                                      [$this->admin, 'filterTinymcePlugins'], 15);
+		add_filter('plugin_action_links_'.$this->basename,                      [$this->admin, 'filterActionLinks']);
+		add_filter('dashboard_glance_items',                                    [$this->admin, 'filterDashboardGlanceItems']);
+		add_filter('block_categories',                                          [$this->blocks, 'filterBlockCategories']);
+		add_filter('classic_editor_enabled_editors_for_post_type',              [$this->blocks, 'filterEnabledEditors'], 10, 2);
+		add_filter('use_block_editor_for_post_type',                            [$this->blocks, 'filterUseBlockEditor'], 10, 2);
+		add_filter('wp_editor_settings',                                        [$this->editor, 'filterEditorSettings']);
+		add_filter('the_editor',                                                [$this->editor, 'filterEditorTextarea']);
+		add_filter('is_protected_meta',                                         [$this->editor, 'filterIsProtectedMeta'], 10, 3);
+		add_filter('post_updated_messages',                                     [$this->editor, 'filterUpdateMessages']);
+		add_filter('manage_'.Application::POST_TYPE.'_posts_columns',           [$this->listtable, 'filterColumnsForPostType']);
+		add_filter('post_date_column_status',                                   [$this->listtable, 'filterDateColumnStatus'], 10, 2);
+		add_filter('default_hidden_columns',                                    [$this->listtable, 'filterDefaultHiddenColumns'], 10, 2);
+		add_filter('post_row_actions',                                          [$this->listtable, 'filterRowActions'], 10, 2);
+		add_filter('manage_edit-'.Application::POST_TYPE.'_sortable_columns',   [$this->listtable, 'filterSortableColumns']);
+		add_filter('script_loader_tag',                                         [$this->public, 'filterEnqueuedScripts'], 10, 2);
+		add_filter('site-reviews/config/forms/submission-form',                 [$this->public, 'filterFieldOrder'], 11);
+		add_filter('site-reviews/render/view',                                  [$this->public, 'filterRenderView']);
+		add_filter('site-reviews/settings/callback',                            [$this->rebusify, 'filterSettingsCallback']);
+		add_filter('site-reviews/interpolate/partials/form/table-row-multiple', [$this->rebusify, 'filterSettingsTableRow'], 10, 3);
+		add_filter('bulk_post_updated_messages',                                [$this->translator, 'filterBulkUpdateMessages'], 10, 2);
+		add_filter('gettext',                                                   [$this->translator, 'filterGettext'], 9, 3);
+		add_filter('site-reviews/gettext/site-reviews',                         [$this->translator, 'filterGettextSiteReviews'], 10, 2);
+		add_filter('gettext_with_context',                                      [$this->translator, 'filterGettextWithContext'], 9, 4);
+		add_filter('site-reviews/gettext_with_context/site-reviews',            [$this->translator, 'filterGettextWithContextSiteReviews'], 10, 3);
+		add_filter('ngettext',                                                  [$this->translator, 'filterNgettext'], 9, 5);
+		add_filter('site-reviews/ngettext/site-reviews',                        [$this->translator, 'filterNgettextSiteReviews'], 10, 4);
+		add_filter('ngettext_with_context',                                     [$this->translator, 'filterNgettextWithContext'], 9, 6);
+		add_filter('site-reviews/ngettext_with_context/site-reviews',           [$this->translator, 'filterNgettextWithContextSiteReviews'], 10, 5);
+		add_filter('display_post_states',                                       [$this->translator, 'filterPostStates'], 10, 2);
+		add_filter('site-reviews/gettext/default',                              [$this->translator, 'filterPostStatusLabels'], 10, 2);
+		add_filter('site-reviews/gettext_with_context/default',                 [$this->translator, 'filterPostStatusLabels'], 10, 2);
+		add_filter('site-reviews/ngettext/default',                             [$this->translator, 'filterPostStatusText'], 10, 4);
+		add_filter('plugin_action_links_'.$this->basename,                      [$this->welcome, 'filterActionLinks'], 9);
+		add_filter('admin_title',                                               [$this->welcome, 'filterAdminTitle']);
+		add_filter('admin_footer_text',                                         [$this->welcome, 'filterFooterText']);
+	}
 }

plugin/Controllers/PublicController.php

Indentation +71 added lines, -71 removed lines

@@ -13,81 +13,81 @@
 
 class PublicController extends Controller
 {
-    /**
-     * @return void
-     * @action wp_enqueue_scripts
-     */
-    public function enqueueAssets()
-    {
-        (new EnqueuePublicAssets())->handle();
-    }
+	/**
+	 * @return void
+	 * @action wp_enqueue_scripts
+	 */
+	public function enqueueAssets()
+	{
+		(new EnqueuePublicAssets())->handle();
+	}
 
-    /**
-     * @param string $tag
-     * @param string $handle
-     * @return string
-     * @filter script_loader_tag
-     */
-    public function filterEnqueuedScripts($tag, $handle)
-    {
-        $scripts = [Application::ID.'/google-recaptcha'];
-        if (in_array($handle, apply_filters('site-reviews/async-scripts', $scripts))) {
-            $tag = str_replace(' src=', ' async src=', $tag);
-        }
-        if (in_array($handle, apply_filters('site-reviews/defer-scripts', $scripts))) {
-            $tag = str_replace(' src=', ' defer src=', $tag);
-        }
-        return $tag;
-    }
+	/**
+	 * @param string $tag
+	 * @param string $handle
+	 * @return string
+	 * @filter script_loader_tag
+	 */
+	public function filterEnqueuedScripts($tag, $handle)
+	{
+		$scripts = [Application::ID.'/google-recaptcha'];
+		if (in_array($handle, apply_filters('site-reviews/async-scripts', $scripts))) {
+			$tag = str_replace(' src=', ' async src=', $tag);
+		}
+		if (in_array($handle, apply_filters('site-reviews/defer-scripts', $scripts))) {
+			$tag = str_replace(' src=', ' defer src=', $tag);
+		}
+		return $tag;
+	}
 
-    /**
-     * @return array
-     * @filter site-reviews/config/forms/submission-form
-     */
-    public function filterFieldOrder(array $config)
-    {
-        $order = (array) apply_filters('site-reviews/submission-form/order', array_keys($config));
-        return array_intersect_key(array_merge(array_flip($order), $config), $config);
-    }
+	/**
+	 * @return array
+	 * @filter site-reviews/config/forms/submission-form
+	 */
+	public function filterFieldOrder(array $config)
+	{
+		$order = (array) apply_filters('site-reviews/submission-form/order', array_keys($config));
+		return array_intersect_key(array_merge(array_flip($order), $config), $config);
+	}
 
-    /**
-     * @param string $view
-     * @return string
-     * @filter site-reviews/render/view
-     */
-    public function filterRenderView($view)
-    {
-        return glsr(Style::class)->filterView($view);
-    }
+	/**
+	 * @param string $view
+	 * @return string
+	 * @filter site-reviews/render/view
+	 */
+	public function filterRenderView($view)
+	{
+		return glsr(Style::class)->filterView($view);
+	}
 
-    /**
-     * @return void
-     * @action site-reviews/builder
-     */
-    public function modifyBuilder(Builder $instance)
-    {
-        call_user_func_array([glsr(Style::class), 'modifyField'], [$instance]);
-    }
+	/**
+	 * @return void
+	 * @action site-reviews/builder
+	 */
+	public function modifyBuilder(Builder $instance)
+	{
+		call_user_func_array([glsr(Style::class), 'modifyField'], [$instance]);
+	}
 
-    /**
-     * @return void
-     * @action wp_footer
-     */
-    public function renderSchema()
-    {
-        glsr(Schema::class)->render();
-    }
+	/**
+	 * @return void
+	 * @action wp_footer
+	 */
+	public function renderSchema()
+	{
+		glsr(Schema::class)->render();
+	}
 
-    /**
-     * @return CreateReview
-     */
-    public function routerSubmitReview(array $request)
-    {
-        $validated = glsr(ValidateReview::class)->validate($request);
-        $command = new CreateReview($validated->request);
-        if (empty($validated->error) && !$validated->recaptchaIsUnset) {
-            $this->execute($command);
-        }
-        return $command;
-    }
+	/**
+	 * @return CreateReview
+	 */
+	public function routerSubmitReview(array $request)
+	{
+		$validated = glsr(ValidateReview::class)->validate($request);
+		$command = new CreateReview($validated->request);
+		if (empty($validated->error) && !$validated->recaptchaIsUnset) {
+			$this->execute($command);
+		}
+		return $command;
+	}
 }

plugin/Database/Cache.php

Indentation +57 added lines, -57 removed lines

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

plugin/Controllers/RebusifyController.php

Indentation +227 added lines, -227 removed lines

@@ -12,231 +12,231 @@
 
 class RebusifyController extends Controller
 {
-    protected $apiKey = 'settings.general.rebusify_serial';
-    protected $emailKey = 'settings.general.rebusify_email';
-    protected $enabledKey = 'settings.general.rebusify';
-    protected $rebusifyKey = '_glsr_rebusify';
-
-    /**
-     * @return array
-     * @filter site-reviews/settings/callback
-     */
-    public function filterSettingsCallback(array $settings)
-    {
-        if ('yes' !== Arr::get($settings, $this->enabledKey)) {
-            return $settings;
-        }
-        $isApiKeyModified = $this->isEmptyOrModified($this->apiKey, $settings);
-        $isEmailModified = $this->isEmptyOrModified($this->emailKey, $settings);
-        $isAccountVerified = glsr(OptionManager::class)->getWP($this->rebusifyKey, false);
-        if (!$isAccountVerified || $isApiKeyModified || $isEmailModified) {
-            $settings = $this->sanitizeRebusifySettings($settings);
-        }
-        return $settings;
-    }
-
-    /**
-     * @param string $template
-     * @return array
-     * @filter site-reviews/interpolate/partials/form/table-row-multiple
-     */
-    public function filterSettingsTableRow(array $context, $template, array $data)
-    {
-        if ($this->enabledKey !== Arr::get($data, 'field.path')) {
-            return $context;
-        }
-        $rebusifyProductType = glsr(OptionManager::class)->getWP($this->rebusifyKey);
-        if ('P' === $rebusifyProductType) {
-            return $context;
-        }
-        if ('F' === $rebusifyProductType && 'yes' === glsr_get_option('general.rebusify')) {
-            $button = $this->buildUpgradeButton();
-        } else {
-            $button = $this->buildCreateButton();
-        }
-        $context['field'].= $button;
-        return $context;
-    }
-
-    /**
-     * Triggered when a review is created.
-     * @return void
-     * @action site-reviews/review/created
-     */
-    public function onCreated(Review $review)
-    {
-        if (!$this->canPostReview($review)) {
-            return;
-        }
-        $rebusify = glsr(Rebusify::class)->sendReview($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
-        }
-    }
-
-    /**
-     * Triggered when a review is reverted to its original title/content/date_timestamp.
-     * @return void
-     * @action site-reviews/review/reverted
-     */
-    public function onReverted(Review $review)
-    {
-        if (!$this->canPostReview($review)) {
-            return;
-        }
-        $rebusify = glsr(Rebusify::class)->sendReview($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
-        }
-    }
-
-    /**
-     * Triggered when an existing review is updated.
-     * @return void
-     * @action site-reviews/review/saved
-     */
-    public function onSaved(Review $review)
-    {
-        if (!$this->canPostReview($review)) {
-            return;
-        }
-        $rebusify = glsr(Rebusify::class)->sendReview($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
-        }
-    }
-
-    /**
-     * Triggered when a review's response is added or updated.
-     * @param int $metaId
-     * @param int $postId
-     * @param string $metaKey
-     * @return void
-     * @action updated_postmeta
-     */
-    public function onUpdatedMeta($metaId, $postId, $metaKey)
-    {
-        $review = glsr_get_review($postId);
-        if (!$this->canPostResponse($review) || '_response' !== $metaKey) {
-            return;
-        }
-        $rebusify = glsr(Rebusify::class)->sendReviewResponse($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify_response', true);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildCreateButton()
-    {
-        return glsr(Builder::class)->a(__('Create Your Rebusify Account', 'site-reviews'), [
-            'class' => 'button',
-            'href' => Rebusify::WEB_URL,
-            'target' => '_blank',
-        ]);
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildUpgradeButton()
-    {
-        $build = glsr(Builder::class);
-        $notice = $build->p(__('Free Rebusify accounts are limited to 500 blockchain transactions per year.', 'site-reviews'));
-        $button = $build->a(__('Upgrade Your Rebusify Plan', 'site-reviews'), [
-            'class' => 'button',
-            'href' => Rebusify::WEB_URL,
-            'target' => '_blank',
-        ]);
-        return $build->div($notice.$button, [
-            'class' => 'glsr-notice-inline notice inline notice-info',
-        ]);
-    }
-
-    /**
-     * @return bool
-     */
-    protected function canPostResponse(Review $review)
-    {
-        $requiredValues = [
-            glsr(Database::class)->get($review->ID, 'rebusify'),
-            $review->response,
-            $review->review_id,
-        ];
-        return $this->canProceed($review, 'rebusify_response')
-            && 'publish' === $review->status
-            && 3 === count(array_filter($requiredValues));
-    }
-
-    /**
-     * @return bool
-     */
-    protected function canPostReview(Review $review)
-    {
-        $requiredValues = [
-            $review->author,
-            $review->content,
-            $review->rating,
-            $review->review_id,
-            $review->title,
-        ];
-        return $this->canProceed($review)
-            && 'publish' === $review->status
-            && 5 === count(array_filter($requiredValues));
-    }
-
-    /**
-     * @param string $metaKey
-     * @return bool
-     */
-    protected function canProceed(Review $review, $metaKey = 'rebusify')
-    {
-        return glsr(OptionManager::class)->getBool($this->enabledKey)
-            && $this->isReviewPostId($review->ID)
-            && !$this->hasMetaKey($review, $metaKey);
-    }
-
-    /**
-     * @param string $metaKey
-     * @return bool
-     */
-    protected function hasMetaKey(Review $review, $metaKey = 'rebusify')
-    {
-        return '' !== glsr(Database::class)->get($review->ID, $metaKey);
-    }
-
-    /**
-     * @param string $key
-     * @return bool
-     */
-    protected function isEmptyOrModified($key, array $settings)
-    {
-        $oldValue = glsr_get_option($key);
-        $newValue = Arr::get($settings, $key);
-        return empty($newValue) || $newValue !== $oldValue;
-    }
-
-    /**
-     * @return array
-     */
-    protected function sanitizeRebusifySettings(array $settings)
-    {
-        $rebusify = glsr(Rebusify::class)->activateKey(
-            Arr::get($settings, $this->apiKey),
-            Arr::get($settings, $this->emailKey)
-        );
-        if ($rebusify->success) {
-            update_option($this->rebusifyKey, Arr::get($rebusify->response, 'producttype'));
-        } else {
-            delete_option($this->rebusifyKey);
-            $settings = Arr::set($settings, $this->enabledKey, 'no');
-            glsr(Notice::class)->addError(sprintf(
-                __('Your Rebusify account details could not be verified, please try again. %s', 'site-reviews'),
-                '('.$rebusify->message.')'
-            ));
-        }
-        return $settings;
-    }
+	protected $apiKey = 'settings.general.rebusify_serial';
+	protected $emailKey = 'settings.general.rebusify_email';
+	protected $enabledKey = 'settings.general.rebusify';
+	protected $rebusifyKey = '_glsr_rebusify';
+
+	/**
+	 * @return array
+	 * @filter site-reviews/settings/callback
+	 */
+	public function filterSettingsCallback(array $settings)
+	{
+		if ('yes' !== Arr::get($settings, $this->enabledKey)) {
+			return $settings;
+		}
+		$isApiKeyModified = $this->isEmptyOrModified($this->apiKey, $settings);
+		$isEmailModified = $this->isEmptyOrModified($this->emailKey, $settings);
+		$isAccountVerified = glsr(OptionManager::class)->getWP($this->rebusifyKey, false);
+		if (!$isAccountVerified || $isApiKeyModified || $isEmailModified) {
+			$settings = $this->sanitizeRebusifySettings($settings);
+		}
+		return $settings;
+	}
+
+	/**
+	 * @param string $template
+	 * @return array
+	 * @filter site-reviews/interpolate/partials/form/table-row-multiple
+	 */
+	public function filterSettingsTableRow(array $context, $template, array $data)
+	{
+		if ($this->enabledKey !== Arr::get($data, 'field.path')) {
+			return $context;
+		}
+		$rebusifyProductType = glsr(OptionManager::class)->getWP($this->rebusifyKey);
+		if ('P' === $rebusifyProductType) {
+			return $context;
+		}
+		if ('F' === $rebusifyProductType && 'yes' === glsr_get_option('general.rebusify')) {
+			$button = $this->buildUpgradeButton();
+		} else {
+			$button = $this->buildCreateButton();
+		}
+		$context['field'].= $button;
+		return $context;
+	}
+
+	/**
+	 * Triggered when a review is created.
+	 * @return void
+	 * @action site-reviews/review/created
+	 */
+	public function onCreated(Review $review)
+	{
+		if (!$this->canPostReview($review)) {
+			return;
+		}
+		$rebusify = glsr(Rebusify::class)->sendReview($review);
+		if ($rebusify->success) {
+			glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
+		}
+	}
+
+	/**
+	 * Triggered when a review is reverted to its original title/content/date_timestamp.
+	 * @return void
+	 * @action site-reviews/review/reverted
+	 */
+	public function onReverted(Review $review)
+	{
+		if (!$this->canPostReview($review)) {
+			return;
+		}
+		$rebusify = glsr(Rebusify::class)->sendReview($review);
+		if ($rebusify->success) {
+			glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
+		}
+	}
+
+	/**
+	 * Triggered when an existing review is updated.
+	 * @return void
+	 * @action site-reviews/review/saved
+	 */
+	public function onSaved(Review $review)
+	{
+		if (!$this->canPostReview($review)) {
+			return;
+		}
+		$rebusify = glsr(Rebusify::class)->sendReview($review);
+		if ($rebusify->success) {
+			glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
+		}
+	}
+
+	/**
+	 * Triggered when a review's response is added or updated.
+	 * @param int $metaId
+	 * @param int $postId
+	 * @param string $metaKey
+	 * @return void
+	 * @action updated_postmeta
+	 */
+	public function onUpdatedMeta($metaId, $postId, $metaKey)
+	{
+		$review = glsr_get_review($postId);
+		if (!$this->canPostResponse($review) || '_response' !== $metaKey) {
+			return;
+		}
+		$rebusify = glsr(Rebusify::class)->sendReviewResponse($review);
+		if ($rebusify->success) {
+			glsr(Database::class)->set($review->ID, 'rebusify_response', true);
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildCreateButton()
+	{
+		return glsr(Builder::class)->a(__('Create Your Rebusify Account', 'site-reviews'), [
+			'class' => 'button',
+			'href' => Rebusify::WEB_URL,
+			'target' => '_blank',
+		]);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildUpgradeButton()
+	{
+		$build = glsr(Builder::class);
+		$notice = $build->p(__('Free Rebusify accounts are limited to 500 blockchain transactions per year.', 'site-reviews'));
+		$button = $build->a(__('Upgrade Your Rebusify Plan', 'site-reviews'), [
+			'class' => 'button',
+			'href' => Rebusify::WEB_URL,
+			'target' => '_blank',
+		]);
+		return $build->div($notice.$button, [
+			'class' => 'glsr-notice-inline notice inline notice-info',
+		]);
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function canPostResponse(Review $review)
+	{
+		$requiredValues = [
+			glsr(Database::class)->get($review->ID, 'rebusify'),
+			$review->response,
+			$review->review_id,
+		];
+		return $this->canProceed($review, 'rebusify_response')
+			&& 'publish' === $review->status
+			&& 3 === count(array_filter($requiredValues));
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function canPostReview(Review $review)
+	{
+		$requiredValues = [
+			$review->author,
+			$review->content,
+			$review->rating,
+			$review->review_id,
+			$review->title,
+		];
+		return $this->canProceed($review)
+			&& 'publish' === $review->status
+			&& 5 === count(array_filter($requiredValues));
+	}
+
+	/**
+	 * @param string $metaKey
+	 * @return bool
+	 */
+	protected function canProceed(Review $review, $metaKey = 'rebusify')
+	{
+		return glsr(OptionManager::class)->getBool($this->enabledKey)
+			&& $this->isReviewPostId($review->ID)
+			&& !$this->hasMetaKey($review, $metaKey);
+	}
+
+	/**
+	 * @param string $metaKey
+	 * @return bool
+	 */
+	protected function hasMetaKey(Review $review, $metaKey = 'rebusify')
+	{
+		return '' !== glsr(Database::class)->get($review->ID, $metaKey);
+	}
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+	protected function isEmptyOrModified($key, array $settings)
+	{
+		$oldValue = glsr_get_option($key);
+		$newValue = Arr::get($settings, $key);
+		return empty($newValue) || $newValue !== $oldValue;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function sanitizeRebusifySettings(array $settings)
+	{
+		$rebusify = glsr(Rebusify::class)->activateKey(
+			Arr::get($settings, $this->apiKey),
+			Arr::get($settings, $this->emailKey)
+		);
+		if ($rebusify->success) {
+			update_option($this->rebusifyKey, Arr::get($rebusify->response, 'producttype'));
+		} else {
+			delete_option($this->rebusifyKey);
+			$settings = Arr::set($settings, $this->enabledKey, 'no');
+			glsr(Notice::class)->addError(sprintf(
+				__('Your Rebusify account details could not be verified, please try again. %s', 'site-reviews'),
+				'('.$rebusify->message.')'
+			));
+		}
+		return $settings;
+	}
 }

plugin/Defaults/CreateReviewDefaults.php

Indentation +36 added lines, -36 removed lines

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

plugin/Modules/Validator/ValidateReview.php

Indentation +259 added lines, -259 removed lines

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