pryley / site-reviews

site-reviews.php

Indentation +11 added lines, -11 removed lines

@@ -20,17 +20,17 @@
 defined('WPINC') || die;
 
 if (!class_exists('GL_Plugin_Check_v4')) {
-    require_once __DIR__.'/activate.php';
+	require_once __DIR__.'/activate.php';
 }
 if ((new GL_Plugin_Check_v4(__FILE__))->canProceed()) {
-    require_once __DIR__.'/autoload.php';
-    require_once __DIR__.'/compatibility.php';
-    require_once __DIR__.'/deprecated.php';
-    require_once __DIR__.'/helpers.php';
-    $app = new GeminiLabs\SiteReviews\Application();
-    $app->make('Provider')->register($app);
-    register_activation_hook(__FILE__, array($app, 'activate'));
-    register_deactivation_hook(__FILE__, array($app, 'deactivate'));
-    register_shutdown_function(array($app, 'catchFatalError'));
-    $app->init();
+	require_once __DIR__.'/autoload.php';
+	require_once __DIR__.'/compatibility.php';
+	require_once __DIR__.'/deprecated.php';
+	require_once __DIR__.'/helpers.php';
+	$app = new GeminiLabs\SiteReviews\Application();
+	$app->make('Provider')->register($app);
+	register_activation_hook(__FILE__, array($app, 'activate'));
+	register_deactivation_hook(__FILE__, array($app, 'deactivate'));
+	register_shutdown_function(array($app, 'catchFatalError'));
+	$app->init();
 }

plugin/Reviews.php

Indentation +54 added lines, -54 removed lines

@@ -9,65 +9,65 @@
 
 class Reviews extends ArrayObject
 {
-    /**
-     * @var array
-     */
-    public $args;
+	/**
+	 * @var array
+	 */
+	public $args;
 
-    /**
-     * @var int
-     */
-    public $max_num_pages;
+	/**
+	 * @var int
+	 */
+	public $max_num_pages;
 
-    /**
-     * @var array
-     */
-    public $reviews;
+	/**
+	 * @var array
+	 */
+	public $reviews;
 
-    public function __construct(array $reviews, $maxPageCount, array $args)
-    {
-        $this->args = $args;
-        $this->max_num_pages = $maxPageCount;
-        $this->reviews = $reviews;
-        parent::__construct($reviews, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS);
-    }
+	public function __construct(array $reviews, $maxPageCount, array $args)
+	{
+		$this->args = $args;
+		$this->max_num_pages = $maxPageCount;
+		$this->reviews = $reviews;
+		parent::__construct($reviews, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS);
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->build();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return (string) $this->build();
+	}
 
-    /**
-     * @return ReviewsHtml
-     */
-    public function build()
-    {
-        $args = glsr(SiteReviewsDefaults::class)->merge($this->args);
-        return glsr(SiteReviewsPartial::class)->build($args, $this);
-    }
+	/**
+	 * @return ReviewsHtml
+	 */
+	public function build()
+	{
+		$args = glsr(SiteReviewsDefaults::class)->merge($this->args);
+		return glsr(SiteReviewsPartial::class)->build($args, $this);
+	}
 
-    /**
-     * @param mixed $key
-     * @return mixed
-     */
-    public function offsetGet($key)
-    {
-        if (array_key_exists($key, $this->reviews)) {
-            return $this->reviews[$key];
-        }
-        return property_exists($this, $key)
-            ? $this->$key
-            : null;
-    }
+	/**
+	 * @param mixed $key
+	 * @return mixed
+	 */
+	public function offsetGet($key)
+	{
+		if (array_key_exists($key, $this->reviews)) {
+			return $this->reviews[$key];
+		}
+		return property_exists($this, $key)
+			? $this->$key
+			: null;
+	}
 
-    /**
-     * @return void
-     */
-    public function render()
-    {
-        echo $this->build();
-    }
+	/**
+	 * @return void
+	 */
+	public function render()
+	{
+		echo $this->build();
+	}
 }

plugin/Modules/Html/ReviewHtml.php

Indentation +40 added lines, -40 removed lines

@@ -7,48 +7,48 @@
 
 class ReviewHtml extends ArrayObject
 {
-    /**
-     * @var Review
-     */
-    public $review;
+	/**
+	 * @var Review
+	 */
+	public $review;
 
-    /**
-     * @var array
-     */
-    public $values;
+	/**
+	 * @var array
+	 */
+	public $values;
 
-    public function __construct(Review $review, array $values = [])
-    {
-        $this->review = $review;
-        $this->values = $values;
-        parent::__construct($values, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS);
-    }
+	public function __construct(Review $review, array $values = [])
+	{
+		$this->review = $review;
+		$this->values = $values;
+		parent::__construct($values, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS);
+	}
 
-    /**
-     * @return string|void
-     */
-    public function __toString()
-    {
-        if (empty($this->values)) {
-            return;
-        }
-        return glsr(Template::class)->build('templates/review', [
-            'context' => $this->values,
-            'review' => $this->review,
-        ]);
-    }
+	/**
+	 * @return string|void
+	 */
+	public function __toString()
+	{
+		if (empty($this->values)) {
+			return;
+		}
+		return glsr(Template::class)->build('templates/review', [
+			'context' => $this->values,
+			'review' => $this->review,
+		]);
+	}
 
-    /**
-     * @param mixed $key
-     * @return mixed
-     */
-    public function offsetGet($key)
-    {
-        if (array_key_exists($key, $this->values)) {
-            return $this->values[$key];
-        }
-        return property_exists($this, $key)
-            ? $this->$key
-            : null;
-    }
+	/**
+	 * @param mixed $key
+	 * @return mixed
+	 */
+	public function offsetGet($key)
+	{
+		if (array_key_exists($key, $this->values)) {
+			return $this->values[$key];
+		}
+		return property_exists($this, $key)
+			? $this->$key
+			: null;
+	}
 }

plugin/Contracts/PartialContract.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 interface PartialContract
 {
-    /**
-     * @return string
-     */
-    public function build(array $args = []);
+	/**
+	 * @return string
+	 */
+	public function build(array $args = []);
 }

uninstall.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 require_once $file;
 
 if (!(new GL_Plugin_Check_v4($file))->isValid()) {
-    return;
+	return;
 }
 delete_option(GeminiLabs\SiteReviews\Database\OptionManager::databaseKey(3));
 delete_option(GeminiLabs\SiteReviews\Database\OptionManager::databaseKey(4));

activate.php

Indentation +126 added lines, -126 removed lines

@@ -8,141 +8,141 @@
  */
 class GL_Plugin_Check_v4
 {
-    const MIN_PHP_VERSION = '5.6.0';
-    const MIN_WORDPRESS_VERSION = '4.7.0';
+	const MIN_PHP_VERSION = '5.6.0';
+	const MIN_WORDPRESS_VERSION = '4.7.0';
 
-    /**
-     * @var array
-     */
-    public $versions;
+	/**
+	 * @var array
+	 */
+	public $versions;
 
-    /**
-     * @var string
-     */
-    protected $file;
+	/**
+	 * @var string
+	 */
+	protected $file;
 
-    /**
-     * @param string $file
-     */
-    public function __construct($file)
-    {
-        $this->file = realpath($file);
-        $versionRequirements = get_file_data($this->file, [
-            'php' => 'Requires PHP',
-            'wordpress' => 'Requires at least',
-        ]);
-        $this->versions = wp_parse_args(array_filter($versionRequirements), [
-            'php' => static::MIN_PHP_VERSION,
-            'wordpress' => static::MIN_WORDPRESS_VERSION,
-        ]);
-    }
+	/**
+	 * @param string $file
+	 */
+	public function __construct($file)
+	{
+		$this->file = realpath($file);
+		$versionRequirements = get_file_data($this->file, [
+			'php' => 'Requires PHP',
+			'wordpress' => 'Requires at least',
+		]);
+		$this->versions = wp_parse_args(array_filter($versionRequirements), [
+			'php' => static::MIN_PHP_VERSION,
+			'wordpress' => static::MIN_WORDPRESS_VERSION,
+		]);
+	}
 
-    /**
-     * @return bool
-     */
-    public function canProceed()
-    {
-        if ($this->isValid()) {
-            return true;
-        }
-        add_action('activated_plugin', [$this, 'deactivate']);
-        add_action('admin_notices', [$this, 'deactivate']);
-        return false;
-    }
+	/**
+	 * @return bool
+	 */
+	public function canProceed()
+	{
+		if ($this->isValid()) {
+			return true;
+		}
+		add_action('activated_plugin', [$this, 'deactivate']);
+		add_action('admin_notices', [$this, 'deactivate']);
+		return false;
+	}
 
-    /**
-     * @return bool
-     */
-    public function isPhpValid()
-    {
-        return !version_compare(PHP_VERSION, $this->versions['php'], '<');
-    }
+	/**
+	 * @return bool
+	 */
+	public function isPhpValid()
+	{
+		return !version_compare(PHP_VERSION, $this->versions['php'], '<');
+	}
 
-    /**
-     * @return bool
-     */
-    public function isValid()
-    {
-        return $this->isPhpValid() && $this->isWpValid();
-    }
+	/**
+	 * @return bool
+	 */
+	public function isValid()
+	{
+		return $this->isPhpValid() && $this->isWpValid();
+	}
 
-    /**
-     * @return bool
-     */
-    public function isWpValid()
-    {
-        global $wp_version;
-        return !version_compare($wp_version, $this->versions['wordpress'], '<');
-    }
+	/**
+	 * @return bool
+	 */
+	public function isWpValid()
+	{
+		global $wp_version;
+		return !version_compare($wp_version, $this->versions['wordpress'], '<');
+	}
 
-    /**
-     * @param string $plugin
-     * @return void
-     */
-    public function deactivate($plugin)
-    {
-        if ($this->isValid()) {
-            return;
-        }
-        $pluginSlug = plugin_basename($this->file);
-        if ($plugin == $pluginSlug) {
-            $this->redirect(); //exit
-        }
-        $pluginData = get_file_data($this->file, ['name' => 'Plugin Name'], 'plugin');
-        deactivate_plugins($pluginSlug);
-        $this->printNotice($pluginData['name']);
-    }
+	/**
+	 * @param string $plugin
+	 * @return void
+	 */
+	public function deactivate($plugin)
+	{
+		if ($this->isValid()) {
+			return;
+		}
+		$pluginSlug = plugin_basename($this->file);
+		if ($plugin == $pluginSlug) {
+			$this->redirect(); //exit
+		}
+		$pluginData = get_file_data($this->file, ['name' => 'Plugin Name'], 'plugin');
+		deactivate_plugins($pluginSlug);
+		$this->printNotice($pluginData['name']);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getMessages()
-    {
-        return [
-            'notice' => __('The %s plugin was deactivated.', 'site-reviews'),
-            'php_version' => __('PHP version', 'site-reviews'),
-            'rollback' => __('You can use the %s plugin to restore %s to the previous version.', 'site-reviews'),
-            'update_php' => __('Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'site-reviews'),
-            'update_wp' => __('Update WordPress', 'site-reviews'),
-            'wp_version' => __('WordPress version', 'site-reviews'),
-            'wrong_version' => __('This plugin requires %s or greater in order to work properly.', 'site-reviews'),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getMessages()
+	{
+		return [
+			'notice' => __('The %s plugin was deactivated.', 'site-reviews'),
+			'php_version' => __('PHP version', 'site-reviews'),
+			'rollback' => __('You can use the %s plugin to restore %s to the previous version.', 'site-reviews'),
+			'update_php' => __('Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'site-reviews'),
+			'update_wp' => __('Update WordPress', 'site-reviews'),
+			'wp_version' => __('WordPress version', 'site-reviews'),
+			'wrong_version' => __('This plugin requires %s or greater in order to work properly.', 'site-reviews'),
+		];
+	}
 
-    /**
-     * @param string $pluginName
-     * @return void
-     */
-    protected function printNotice($pluginName)
-    {
-        $noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>';
-        $messages = $this->getMessages();
-        $rollbackMessage = sprintf('<strong>'.$messages['rollback'].'</strong>', '<a href="https://wordpress.org/plugins/wp-rollback/">WP Rollback</a>', $pluginName);
-        if (!$this->isPhpValid()) {
-            printf($noticeTemplate,
-                sprintf($messages['notice'], $pluginName),
-                sprintf($messages['wrong_version'], $messages['php_version'].' '.$this->versions['php']),
-                sprintf($messages['update_php'], PHP_VERSION).'</p><p>'.$rollbackMessage
-            );
-        } elseif (!$this->isWpValid()) {
-            printf($noticeTemplate,
-                sprintf($messages['notice'], $pluginName),
-                sprintf($messages['wrong_version'], $messages['wp_version'].' '.$this->versions['wordpress']),
-                $rollbackMessage.'</p><p>'.sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages['update_wp'])
-            );
-        }
-    }
+	/**
+	 * @param string $pluginName
+	 * @return void
+	 */
+	protected function printNotice($pluginName)
+	{
+		$noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>';
+		$messages = $this->getMessages();
+		$rollbackMessage = sprintf('<strong>'.$messages['rollback'].'</strong>', '<a href="https://wordpress.org/plugins/wp-rollback/">WP Rollback</a>', $pluginName);
+		if (!$this->isPhpValid()) {
+			printf($noticeTemplate,
+				sprintf($messages['notice'], $pluginName),
+				sprintf($messages['wrong_version'], $messages['php_version'].' '.$this->versions['php']),
+				sprintf($messages['update_php'], PHP_VERSION).'</p><p>'.$rollbackMessage
+			);
+		} elseif (!$this->isWpValid()) {
+			printf($noticeTemplate,
+				sprintf($messages['notice'], $pluginName),
+				sprintf($messages['wrong_version'], $messages['wp_version'].' '.$this->versions['wordpress']),
+				$rollbackMessage.'</p><p>'.sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages['update_wp'])
+			);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function redirect()
-    {
-        wp_safe_redirect(self_admin_url(sprintf('plugins.php?plugin_status=%s&paged=%s&s=%s',
-            filter_input(INPUT_GET, 'plugin_status'),
-            filter_input(INPUT_GET, 'paged'),
-            filter_input(INPUT_GET, 's')
-        )));
-        exit;
-    }
+	/**
+	 * @return void
+	 */
+	protected function redirect()
+	{
+		wp_safe_redirect(self_admin_url(sprintf('plugins.php?plugin_status=%s&paged=%s&s=%s',
+			filter_input(INPUT_GET, 'plugin_status'),
+			filter_input(INPUT_GET, 'paged'),
+			filter_input(INPUT_GET, 's')
+		)));
+		exit;
+	}
 }

plugin/Database/GlobalCountsManager.php

Indentation +62 added lines, -62 removed lines

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

plugin/Controllers/ReviewController.php

Indentation +148 added lines, -148 removed lines

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

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;
+	}
 }