pryley / site-reviews

plugin/Handlers/RegisterTinymcePopups.php

Indentation +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@
 
 class RegisterTinymcePopups
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        foreach ($command->popups as $slug => $label) {
-            $buttonClass = Helper::buildClassName($slug.'-popup', 'Shortcodes');
-            if (!class_exists($buttonClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $buttonClass));
-                continue;
-            }
-            $shortcode = glsr($buttonClass)->register($slug, [
-                'label' => $label,
-                'title' => $label,
-            ]);
-            glsr()->mceShortcodes[$slug] = $shortcode->properties;
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		foreach ($command->popups as $slug => $label) {
+			$buttonClass = Helper::buildClassName($slug.'-popup', 'Shortcodes');
+			if (!class_exists($buttonClass)) {
+				glsr_log()->error(sprintf('Class missing (%s)', $buttonClass));
+				continue;
+			}
+			$shortcode = glsr($buttonClass)->register($slug, [
+				'label' => $label,
+				'title' => $label,
+			]);
+			glsr()->mceShortcodes[$slug] = $shortcode->properties;
+		}
+	}
 }

plugin/Handlers/RegisterWidgets.php

Indentation +17 added lines, -17 removed lines

@@ -8,21 +8,21 @@
 
 class RegisterWidgets
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        global $wp_widget_factory;
-        foreach ($command->widgets as $key => $values) {
-            $widgetClass = Helper::buildClassName($key.'-widget', 'Widgets');
-            if (!class_exists($widgetClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $widgetClass));
-                continue;
-            }
-            // Here we bypass register_widget() in order to pass our custom values to the widget
-            $widget = new $widgetClass(Application::ID.'_'.$key, $values['title'], $values);
-            $wp_widget_factory->widgets[$widgetClass] = $widget;
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		global $wp_widget_factory;
+		foreach ($command->widgets as $key => $values) {
+			$widgetClass = Helper::buildClassName($key.'-widget', 'Widgets');
+			if (!class_exists($widgetClass)) {
+				glsr_log()->error(sprintf('Class missing (%s)', $widgetClass));
+				continue;
+			}
+			// Here we bypass register_widget() in order to pass our custom values to the widget
+			$widget = new $widgetClass(Application::ID.'_'.$key, $values['title'], $values);
+			$wp_widget_factory->widgets[$widgetClass] = $widget;
+		}
+	}
 }

plugin/Database/DefaultsManager.php

Indentation +52 added lines, -52 removed lines

@@ -6,60 +6,60 @@
 
 class DefaultsManager
 {
-    /**
-     * @return array
-     */
-    public function defaults()
-    {
-        $settings = $this->settings();
-        $defaults = (array) array_combine(array_keys($settings), glsr_array_column($settings, 'default'));
-        return wp_parse_args($defaults, [
-            'version' => '',
-            'version_upgraded_from' => '',
-        ]);
-    }
+	/**
+	 * @return array
+	 */
+	public function defaults()
+	{
+		$settings = $this->settings();
+		$defaults = (array) array_combine(array_keys($settings), glsr_array_column($settings, 'default'));
+		return wp_parse_args($defaults, [
+			'version' => '',
+			'version_upgraded_from' => '',
+		]);
+	}
 
-    /**
-     * @return array
-     */
-    public function get()
-    {
-        return Arr::convertDotNotationArray($this->defaults());
-    }
+	/**
+	 * @return array
+	 */
+	public function get()
+	{
+		return Arr::convertDotNotationArray($this->defaults());
+	}
 
-    /**
-     * @return array
-     */
-    public function set()
-    {
-        $settings = glsr(OptionManager::class)->all();
-        $currentSettings = Arr::removeEmptyArrayValues($settings);
-        $defaultSettings = array_replace_recursive($this->get(), $currentSettings);
-        $updatedSettings = array_replace_recursive($settings, $defaultSettings);
-        update_option(OptionManager::databaseKey(), $updatedSettings);
-        return $defaultSettings;
-    }
+	/**
+	 * @return array
+	 */
+	public function set()
+	{
+		$settings = glsr(OptionManager::class)->all();
+		$currentSettings = Arr::removeEmptyArrayValues($settings);
+		$defaultSettings = array_replace_recursive($this->get(), $currentSettings);
+		$updatedSettings = array_replace_recursive($settings, $defaultSettings);
+		update_option(OptionManager::databaseKey(), $updatedSettings);
+		return $defaultSettings;
+	}
 
-    /**
-     * @return array
-     */
-    public function settings()
-    {
-        $settings = apply_filters('site-reviews/addon/settings', glsr()->config('settings'));
-        return $this->normalize($settings);
-    }
+	/**
+	 * @return array
+	 */
+	public function settings()
+	{
+		$settings = apply_filters('site-reviews/addon/settings', glsr()->config('settings'));
+		return $this->normalize($settings);
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $settings)
-    {
-        array_walk($settings, function (&$setting) {
-            if (isset($setting['default'])) {
-                return;
-            }
-            $setting['default'] = '';
-        });
-        return $settings;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $settings)
+	{
+		array_walk($settings, function (&$setting) {
+			if (isset($setting['default'])) {
+				return;
+			}
+			$setting['default'] = '';
+		});
+		return $settings;
+	}
 }

plugin/Database/OptionManager.php

Indentation +138 added lines, -138 removed lines

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

plugin/Commands/RegisterPostType.php

Indentation +69 added lines, -69 removed lines

@@ -9,77 +9,77 @@
 
 class RegisterPostType
 {
-    public $args;
-    public $columns;
-    public $plural;
-    public $postType;
-    public $single;
+	public $args;
+	public $columns;
+	public $plural;
+	public $postType;
+	public $single;
 
-    public function __construct($input)
-    {
-        $args = glsr(PostTypeDefaults::class)->merge($input);
-        $this->normalize($args);
-        $this->normalizeColumns();
-        $this->normalizeLabels();
-    }
+	public function __construct($input)
+	{
+		$args = glsr(PostTypeDefaults::class)->merge($input);
+		$this->normalize($args);
+		$this->normalizeColumns();
+		$this->normalizeLabels();
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalize(array $args)
-    {
-        foreach ($args as $key => $value) {
-            $property = Helper::buildPropertyName($key);
-            if (!property_exists($this, $property)) {
-                continue;
-            }
-            $this->$property = $value;
-            unset($args[$key]);
-        }
-        $this->args = wp_parse_args($args, [
-            'menu_name' => $this->plural,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalize(array $args)
+	{
+		foreach ($args as $key => $value) {
+			$property = Helper::buildPropertyName($key);
+			if (!property_exists($this, $property)) {
+				continue;
+			}
+			$this->$property = $value;
+			unset($args[$key]);
+		}
+		$this->args = wp_parse_args($args, [
+			'menu_name' => $this->plural,
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeLabels()
-    {
-        $this->args['labels'] = wp_parse_args($this->args['labels'], [
-            'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural),
-            'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural),
-            'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single),
-            'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single),
-            'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single),
-            'menu_name' => $this->args['menu_name'],
-            'name' => $this->plural,
-            'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single),
-            'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural),
-            'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural),
-            'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural),
-            'singular_name' => $this->single,
-            'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single),
-            'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single),
-        ]);
-        unset($this->args['menu_name']);
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeLabels()
+	{
+		$this->args['labels'] = wp_parse_args($this->args['labels'], [
+			'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural),
+			'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural),
+			'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single),
+			'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single),
+			'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single),
+			'menu_name' => $this->args['menu_name'],
+			'name' => $this->plural,
+			'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single),
+			'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural),
+			'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural),
+			'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural),
+			'singular_name' => $this->single,
+			'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single),
+			'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single),
+		]);
+		unset($this->args['menu_name']);
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeColumns()
-    {
-        $this->columns = ['cb' => ''] + $this->columns;
-        if (array_key_exists('category', $this->columns)) {
-            $keys = array_keys($this->columns);
-            $keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY;
-            $this->columns = array_combine($keys, $this->columns);
-        }
-        if (array_key_exists('pinned', $this->columns)) {
-            $this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>',
-                ['class' => 'pinned-icon']
-            );
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeColumns()
+	{
+		$this->columns = ['cb' => ''] + $this->columns;
+		if (array_key_exists('category', $this->columns)) {
+			$keys = array_keys($this->columns);
+			$keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY;
+			$this->columns = array_combine($keys, $this->columns);
+		}
+		if (array_key_exists('pinned', $this->columns)) {
+			$this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>',
+				['class' => 'pinned-icon']
+			);
+		}
+	}
 }

plugin/Commands/CreateReview.php

Indentation +128 added lines, -128 removed lines

@@ -6,140 +6,140 @@
 
 class CreateReview
 {
-    public $ajax_request;
-    public $assigned_to;
-    public $author;
-    public $avatar;
-    public $blacklisted;
-    public $category;
-    public $content;
-    public $custom;
-    public $date;
-    public $email;
-    public $form_id;
-    public $ip_address;
-    public $post_id;
-    public $rating;
-    public $referer;
-    public $request;
-    public $response;
-    public $terms;
-    public $title;
-    public $url;
+	public $ajax_request;
+	public $assigned_to;
+	public $author;
+	public $avatar;
+	public $blacklisted;
+	public $category;
+	public $content;
+	public $custom;
+	public $date;
+	public $email;
+	public $form_id;
+	public $ip_address;
+	public $post_id;
+	public $rating;
+	public $referer;
+	public $request;
+	public $response;
+	public $terms;
+	public $title;
+	public $url;
 
-    public function __construct($input)
-    {
-        $this->request = $input;
-        $this->ajax_request = isset($input['_ajax_request']);
-        $this->assigned_to = $this->getNumeric('assign_to');
-        $this->author = sanitize_text_field($this->getUser('name'));
-        $this->avatar = $this->getAvatar();
-        $this->blacklisted = isset($input['blacklisted']);
-        $this->category = $this->getCategory();
-        $this->content = sanitize_textarea_field($this->get('content'));
-        $this->custom = $this->getCustom();
-        $this->date = $this->getDate('date');
-        $this->email = sanitize_email($this->getUser('email'));
-        $this->form_id = sanitize_key($this->get('form_id'));
-        $this->ip_address = $this->get('ip_address');
-        $this->post_id = intval($this->get('_post_id'));
-        $this->rating = intval($this->get('rating'));
-        $this->referer = $this->get('_referer');
-        $this->response = sanitize_textarea_field($this->get('response'));
-        $this->terms = !empty($input['terms']);
-        $this->title = sanitize_text_field($this->get('title'));
-        $this->url = esc_url_raw($this->get('url'));
-    }
+	public function __construct($input)
+	{
+		$this->request = $input;
+		$this->ajax_request = isset($input['_ajax_request']);
+		$this->assigned_to = $this->getNumeric('assign_to');
+		$this->author = sanitize_text_field($this->getUser('name'));
+		$this->avatar = $this->getAvatar();
+		$this->blacklisted = isset($input['blacklisted']);
+		$this->category = $this->getCategory();
+		$this->content = sanitize_textarea_field($this->get('content'));
+		$this->custom = $this->getCustom();
+		$this->date = $this->getDate('date');
+		$this->email = sanitize_email($this->getUser('email'));
+		$this->form_id = sanitize_key($this->get('form_id'));
+		$this->ip_address = $this->get('ip_address');
+		$this->post_id = intval($this->get('_post_id'));
+		$this->rating = intval($this->get('rating'));
+		$this->referer = $this->get('_referer');
+		$this->response = sanitize_textarea_field($this->get('response'));
+		$this->terms = !empty($input['terms']);
+		$this->title = sanitize_text_field($this->get('title'));
+		$this->url = esc_url_raw($this->get('url'));
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function get($key)
-    {
-        return (string) Arr::get($this->request, $key);
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function get($key)
+	{
+		return (string) Arr::get($this->request, $key);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getAvatar()
-    {
-        $avatar = $this->get('avatar');
-        return !filter_var($avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)
-            ? (string) get_avatar_url($this->get('email'))
-            : $avatar;
-    }
+	/**
+	 * @return string
+	 */
+	protected function getAvatar()
+	{
+		$avatar = $this->get('avatar');
+		return !filter_var($avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)
+			? (string) get_avatar_url($this->get('email'))
+			: $avatar;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getCategory()
-    {
-        $categories = Arr::convertStringToArray($this->get('category'));
-        return sanitize_key(Arr::get($categories, 0));
-    }
+	/**
+	 * @return string
+	 */
+	protected function getCategory()
+	{
+		$categories = Arr::convertStringToArray($this->get('category'));
+		return sanitize_key(Arr::get($categories, 0));
+	}
 
-    /**
-     * @return array
-     */
-    protected function getCustom()
-    {
-        $unset = [
-            '_action', '_ajax_request', '_counter', '_nonce', '_post_id', '_recaptcha-token',
-            '_referer', 'assign_to', 'category', 'content', 'date', 'email', 'excluded', 'form_id',
-            'gotcha', 'ip_address', 'name', 'rating', 'response', 'terms', 'title', 'url',
-        ];
-        $unset = apply_filters('site-reviews/create/unset-keys-from-custom', $unset);
-        $custom = $this->request;
-        foreach ($unset as $value) {
-            unset($custom[$value]);
-        }
-        return $custom;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getCustom()
+	{
+		$unset = [
+			'_action', '_ajax_request', '_counter', '_nonce', '_post_id', '_recaptcha-token',
+			'_referer', 'assign_to', 'category', 'content', 'date', 'email', 'excluded', 'form_id',
+			'gotcha', 'ip_address', 'name', 'rating', 'response', 'terms', 'title', 'url',
+		];
+		$unset = apply_filters('site-reviews/create/unset-keys-from-custom', $unset);
+		$custom = $this->request;
+		foreach ($unset as $value) {
+			unset($custom[$value]);
+		}
+		return $custom;
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getDate($key)
-    {
-        $date = strtotime($this->get($key));
-        if (false === $date) {
-            $date = time();
-        }
-        return get_date_from_gmt(gmdate('Y-m-d H:i:s', $date));
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getDate($key)
+	{
+		$date = strtotime($this->get($key));
+		if (false === $date) {
+			$date = time();
+		}
+		return get_date_from_gmt(gmdate('Y-m-d H:i:s', $date));
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getUser($key)
-    {
-        $value = $this->get($key);
-        if (empty($value)) {
-            $user = wp_get_current_user();
-            $userValues = [
-                'email' => 'user_email',
-                'name' => 'display_name',
-            ];
-            if ($user->exists() && array_key_exists($key, $userValues)) {
-                return $user->{$userValues[$key]};
-            }
-        }
-        return $value;
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getUser($key)
+	{
+		$value = $this->get($key);
+		if (empty($value)) {
+			$user = wp_get_current_user();
+			$userValues = [
+				'email' => 'user_email',
+				'name' => 'display_name',
+			];
+			if ($user->exists() && array_key_exists($key, $userValues)) {
+				return $user->{$userValues[$key]};
+			}
+		}
+		return $value;
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getNumeric($key)
-    {
-        $value = $this->get($key);
-        return is_numeric($value)
-            ? $value
-            : '';
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getNumeric($key)
+	{
+		$value = $this->get($key);
+		return is_numeric($value)
+			? $value
+			: '';
+	}
 }

plugin/Router.php

Indentation +147 added lines, -147 removed lines

@@ -7,162 +7,162 @@
 
 class Router
 {
-    /**
-     * @var array
-     */
-    protected $unguardedActions = [];
+	/**
+	 * @var array
+	 */
+	protected $unguardedActions = [];
 
-    public function __construct()
-    {
-        $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
-            'dismiss-notice',
-            'fetch-paged-reviews',
-        ]);
-    }
+	public function __construct()
+	{
+		$this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
+			'dismiss-notice',
+			'fetch-paged-reviews',
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routeAdminPostRequest()
-    {
-        $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
-            return;
-        }
-        check_admin_referer($request['_action']);
-        $this->routeRequest('admin', $request['_action'], $request);
-    }
+	/**
+	 * @return void
+	 */
+	public function routeAdminPostRequest()
+	{
+		$request = $this->getRequest();
+		if (!$this->isValidPostRequest($request)) {
+			return;
+		}
+		check_admin_referer($request['_action']);
+		$this->routeRequest('admin', $request['_action'], $request);
+	}
 
-    /**
-     * @return void
-     */
-    public function routeAjaxRequest()
-    {
-        $request = $this->getRequest();
-        $this->checkAjaxRequest($request);
-        $this->checkAjaxNonce($request);
-        $this->routeRequest('ajax', $request['_action'], $request);
-        wp_die();
-    }
+	/**
+	 * @return void
+	 */
+	public function routeAjaxRequest()
+	{
+		$request = $this->getRequest();
+		$this->checkAjaxRequest($request);
+		$this->checkAjaxNonce($request);
+		$this->routeRequest('ajax', $request['_action'], $request);
+		wp_die();
+	}
 
-    /**
-     * @return void
-     */
-    public function routePublicPostRequest()
-    {
-        if (is_admin()) {
-            return;
-        }
-        $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
-            return;
-        }
-        if (!$this->isValidPublicNonce($request)) {
-            return;
-        }
-        $this->routeRequest('public', $request['_action'], $request);
-    }
+	/**
+	 * @return void
+	 */
+	public function routePublicPostRequest()
+	{
+		if (is_admin()) {
+			return;
+		}
+		$request = $this->getRequest();
+		if (!$this->isValidPostRequest($request)) {
+			return;
+		}
+		if (!$this->isValidPublicNonce($request)) {
+			return;
+		}
+		$this->routeRequest('public', $request['_action'], $request);
+	}
 
-    /**
-     * @return void
-     */
-    protected function checkAjaxNonce(array $request)
-    {
-        if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) {
-            return;
-        }
-        if (!isset($request['_nonce'])) {
-            $this->sendAjaxError('request is missing a nonce', $request);
-        }
-        if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            $this->sendAjaxError('request failed the nonce check', $request, 403);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function checkAjaxNonce(array $request)
+	{
+		if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) {
+			return;
+		}
+		if (!isset($request['_nonce'])) {
+			$this->sendAjaxError('request is missing a nonce', $request);
+		}
+		if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
+			$this->sendAjaxError('request failed the nonce check', $request, 403);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function checkAjaxRequest(array $request)
-    {
-        if (!isset($request['_action'])) {
-            $this->sendAjaxError('request must include an action', $request);
-        }
-        if (empty($request['_ajax_request'])) {
-            $this->sendAjaxError('request is invalid', $request);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function checkAjaxRequest(array $request)
+	{
+		if (!isset($request['_action'])) {
+			$this->sendAjaxError('request must include an action', $request);
+		}
+		if (empty($request['_ajax_request'])) {
+			$this->sendAjaxError('request is invalid', $request);
+		}
+	}
 
-    /**
-     * All ajax requests in the plugin are triggered by a single action hook: glsr_action,
-     * while each ajax route is determined by $_POST[request][_action].
-     * @return array
-     */
-    protected function getRequest()
-    {
-        $request = Helper::filterInputArray(Application::ID);
-        if (Helper::filterInput('action') == Application::PREFIX.'action') {
-            $request['_ajax_request'] = true;
-        }
-        if ('submit-review' == Helper::filterInput('_action', $request)) {
-            $request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response');
-        }
-        return $request;
-    }
+	/**
+	 * All ajax requests in the plugin are triggered by a single action hook: glsr_action,
+	 * while each ajax route is determined by $_POST[request][_action].
+	 * @return array
+	 */
+	protected function getRequest()
+	{
+		$request = Helper::filterInputArray(Application::ID);
+		if (Helper::filterInput('action') == Application::PREFIX.'action') {
+			$request['_ajax_request'] = true;
+		}
+		if ('submit-review' == Helper::filterInput('_action', $request)) {
+			$request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response');
+		}
+		return $request;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isValidPostRequest(array $request = [])
-    {
-        return !empty($request['_action']) && empty($request['_ajax_request']);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isValidPostRequest(array $request = [])
+	{
+		return !empty($request['_action']) && empty($request['_ajax_request']);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isValidPublicNonce(array $request)
-    {
-        if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            glsr_log()->error('nonce check failed for public request')->debug($request);
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isValidPublicNonce(array $request)
+	{
+		if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
+			glsr_log()->error('nonce check failed for public request')->debug($request);
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * @param string $type
-     * @param string $action
-     * @return void
-     */
-    protected function routeRequest($type, $action, array $request = [])
-    {
-        $actionHook = 'site-reviews/route/'.$type.'/request';
-        $controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers'));
-        $method = Helper::buildMethodName($action, 'router');
-        $request = apply_filters('site-reviews/route/request', $request, $action, $type);
-        do_action($actionHook, $action, $request);
-        if (is_callable([$controller, $method])) {
-            call_user_func([$controller, $method], $request);
-            return;
-        }
-        if (0 === did_action($actionHook)) {
-            glsr_log('Unknown '.$type.' router request: '.$action);
-        }
-    }
+	/**
+	 * @param string $type
+	 * @param string $action
+	 * @return void
+	 */
+	protected function routeRequest($type, $action, array $request = [])
+	{
+		$actionHook = 'site-reviews/route/'.$type.'/request';
+		$controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers'));
+		$method = Helper::buildMethodName($action, 'router');
+		$request = apply_filters('site-reviews/route/request', $request, $action, $type);
+		do_action($actionHook, $action, $request);
+		if (is_callable([$controller, $method])) {
+			call_user_func([$controller, $method], $request);
+			return;
+		}
+		if (0 === did_action($actionHook)) {
+			glsr_log('Unknown '.$type.' router request: '.$action);
+		}
+	}
 
-    /**
-     * @param string $error
-     * @param int $statusCode
-     * @return void
-     */
-    protected function sendAjaxError($error, array $request, $statusCode = 400)
-    {
-        glsr_log()->error($error)->debug($request);
-        glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
-        wp_send_json_error([
-            'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
-            'notices' => glsr(Notice::class)->get(),
-            'error' => $error,
-        ]);
-    }
+	/**
+	 * @param string $error
+	 * @param int $statusCode
+	 * @return void
+	 */
+	protected function sendAjaxError($error, array $request, $statusCode = 400)
+	{
+		glsr_log()->error($error)->debug($request);
+		glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
+		wp_send_json_error([
+			'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
+			'notices' => glsr(Notice::class)->get(),
+			'error' => $error,
+		]);
+	}
 }

plugin/Database/CountsManager.php

Indentation +354 added lines, -354 removed lines

@@ -12,385 +12,385 @@
 
 class CountsManager
 {
-    const LIMIT = 500;
-    const META_AVERAGE = '_glsr_average';
-    const META_COUNT = '_glsr_count';
-    const META_RANKING = '_glsr_ranking';
+	const LIMIT = 500;
+	const META_AVERAGE = '_glsr_average';
+	const META_COUNT = '_glsr_count';
+	const META_RANKING = '_glsr_ranking';
 
-    /**
-     * @return array
-     * @todo verify the additional type checks are needed
-     */
-    public function buildCounts(array $args = [])
-    {
-        $counts = [];
-        $query = $this->queryReviews($args);
-        while ($query) {
-            $types = array_keys(array_flip(glsr_array_column($query->reviews, 'type')));
-            $types = array_unique(array_merge(['local'], $types));
-            foreach ($types as $type) {
-                $type = $this->normalizeType($type);
-                if (isset($counts[$type])) {
-                    continue;
-            }
-                $counts[$type] = array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
-            }
-            foreach ($query->reviews as $review) {
-                $type = $this->normalizeType($review->type);
-                ++$counts[$type][$review->rating];
-            }
-            $query = $query->has_more
-                ? $this->queryReviews($args, end($query->reviews)->ID)
-                : false;
-        }
-        return $counts;
-    }
+	/**
+	 * @return array
+	 * @todo verify the additional type checks are needed
+	 */
+	public function buildCounts(array $args = [])
+	{
+		$counts = [];
+		$query = $this->queryReviews($args);
+		while ($query) {
+			$types = array_keys(array_flip(glsr_array_column($query->reviews, 'type')));
+			$types = array_unique(array_merge(['local'], $types));
+			foreach ($types as $type) {
+				$type = $this->normalizeType($type);
+				if (isset($counts[$type])) {
+					continue;
+			}
+				$counts[$type] = array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
+			}
+			foreach ($query->reviews as $review) {
+				$type = $this->normalizeType($review->type);
+				++$counts[$type][$review->rating];
+			}
+			$query = $query->has_more
+				? $this->queryReviews($args, end($query->reviews)->ID)
+				: false;
+		}
+		return $counts;
+	}
 
-    /**
-     * @param int $postId
-     * @return array
-     */
-    public function buildPostCounts($postId)
-    {
-        return $this->buildCounts(['post_ids' => [$postId]]);
-    }
+	/**
+	 * @param int $postId
+	 * @return array
+	 */
+	public function buildPostCounts($postId)
+	{
+		return $this->buildCounts(['post_ids' => [$postId]]);
+	}
 
-    /**
-     * @param int $termTaxonomyId
-     * @return array
-     */
-    public function buildTermCounts($termTaxonomyId)
-    {
-        return $this->buildCounts(['term_ids' => [$termTaxonomyId]]);
-    }
+	/**
+	 * @param int $termTaxonomyId
+	 * @return array
+	 */
+	public function buildTermCounts($termTaxonomyId)
+	{
+		return $this->buildCounts(['term_ids' => [$termTaxonomyId]]);
+	}
 
-    /**
-     * @return void
-     */
-    public function countAll()
-    {
-        $terms = glsr(Database::class)->getTerms(['fields' => 'all']);
-        foreach ($terms as $term) {
-            $this->setTermCounts($term->term_id, $this->buildTermCounts($term->term_taxonomy_id));
-        }
-        $postIds = glsr(SqlQueries::class)->getReviewsMeta('assigned_to');
-        foreach ($postIds as $postId) {
-            $this->setPostCounts($postId, $this->buildPostCounts($postId));
-        }
-        $this->setCounts($this->buildCounts());
-    }
+	/**
+	 * @return void
+	 */
+	public function countAll()
+	{
+		$terms = glsr(Database::class)->getTerms(['fields' => 'all']);
+		foreach ($terms as $term) {
+			$this->setTermCounts($term->term_id, $this->buildTermCounts($term->term_taxonomy_id));
+		}
+		$postIds = glsr(SqlQueries::class)->getReviewsMeta('assigned_to');
+		foreach ($postIds as $postId) {
+			$this->setPostCounts($postId, $this->buildPostCounts($postId));
+		}
+		$this->setCounts($this->buildCounts());
+	}
 
-    /**
-     * @return void
-     */
-    public function decrease(Review $review)
-    {
-        $this->decreaseCounts($review);
-        $this->decreasePostCounts($review);
-        $this->decreaseTermCounts($review);
-    }
+	/**
+	 * @return void
+	 */
+	public function decrease(Review $review)
+	{
+		$this->decreaseCounts($review);
+		$this->decreasePostCounts($review);
+		$this->decreaseTermCounts($review);
+	}
 
-    /**
-     * @return void
-     */
-    public function decreaseCounts(Review $review)
-    {
-        $this->setCounts($this->decreaseRating(
-            $this->getCounts(),
-            $review->review_type,
-            $review->rating
-        ));
-    }
+	/**
+	 * @return void
+	 */
+	public function decreaseCounts(Review $review)
+	{
+		$this->setCounts($this->decreaseRating(
+			$this->getCounts(),
+			$review->review_type,
+			$review->rating
+		));
+	}
 
-    /**
-     * @return void
-     */
-    public function decreasePostCounts(Review $review)
-    {
-        if (empty($counts = $this->getPostCounts($review->assigned_to))) {
-            return;
-        }
-        $counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
-        $this->setPostCounts($review->assigned_to, $counts);
-    }
+	/**
+	 * @return void
+	 */
+	public function decreasePostCounts(Review $review)
+	{
+		if (empty($counts = $this->getPostCounts($review->assigned_to))) {
+			return;
+		}
+		$counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
+		$this->setPostCounts($review->assigned_to, $counts);
+	}
 
-    /**
-     * @return void
-     */
-    public function decreaseTermCounts(Review $review)
-    {
-        foreach ($review->term_ids as $termId) {
-            if (empty($counts = $this->getTermCounts($termId))) {
-                continue;
-            }
-            $counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
-            $this->setTermCounts($termId, $counts);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function decreaseTermCounts(Review $review)
+	{
+		foreach ($review->term_ids as $termId) {
+			if (empty($counts = $this->getTermCounts($termId))) {
+				continue;
+			}
+			$counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
+			$this->setTermCounts($termId, $counts);
+		}
+	}
 
-    /**
-     * @return array
-     */
-    public function flatten(array $reviewCounts, array $args = [])
-    {
-        $counts = [];
-        array_walk_recursive($reviewCounts, function ($num, $index) use (&$counts) {
-            $counts[$index] = $num + intval(Arr::get($counts, $index, 0));
-        });
-        $args = wp_parse_args($args, [
-            'max' => glsr()->constant('MAX_RATING', Rating::class),
-            'min' => glsr()->constant('MIN_RATING', Rating::class),
-        ]);
-        foreach ($counts as $index => &$num) {
-            if ($index >= intval($args['min']) && $index <= intval($args['max'])) {
-                continue;
-            }
-            $num = 0;
-        }
-        return $counts;
-    }
+	/**
+	 * @return array
+	 */
+	public function flatten(array $reviewCounts, array $args = [])
+	{
+		$counts = [];
+		array_walk_recursive($reviewCounts, function ($num, $index) use (&$counts) {
+			$counts[$index] = $num + intval(Arr::get($counts, $index, 0));
+		});
+		$args = wp_parse_args($args, [
+			'max' => glsr()->constant('MAX_RATING', Rating::class),
+			'min' => glsr()->constant('MIN_RATING', Rating::class),
+		]);
+		foreach ($counts as $index => &$num) {
+			if ($index >= intval($args['min']) && $index <= intval($args['max'])) {
+				continue;
+			}
+			$num = 0;
+		}
+		return $counts;
+	}
 
-    /**
-     * @return array
-     */
-    public function get(array $args = [])
-    {
-        $args = $this->normalizeArgs($args);
-        $counts = [];
-        if ($this->isMixedCount($args)) {
-            $counts = [$this->buildCounts($args)]; // force query the database
-        } else {
-            foreach ($args['post_ids'] as $postId) {
-                $counts[] = $this->getPostCounts($postId);
-        }
-            foreach ($args['term_ids'] as $termId) {
-                $counts[] = $this->getTermCounts($termId);
-            }
-            if (empty($counts)) {
-                $counts[] = $this->getCounts();
-            }
-        }
-        return in_array($args['type'], ['', 'all'])
-            ? $this->normalize([$this->flatten($counts)])
-            : $this->normalize(glsr_array_column($counts, $args['type']));
-    }
+	/**
+	 * @return array
+	 */
+	public function get(array $args = [])
+	{
+		$args = $this->normalizeArgs($args);
+		$counts = [];
+		if ($this->isMixedCount($args)) {
+			$counts = [$this->buildCounts($args)]; // force query the database
+		} else {
+			foreach ($args['post_ids'] as $postId) {
+				$counts[] = $this->getPostCounts($postId);
+		}
+			foreach ($args['term_ids'] as $termId) {
+				$counts[] = $this->getTermCounts($termId);
+			}
+			if (empty($counts)) {
+				$counts[] = $this->getCounts();
+			}
+		}
+		return in_array($args['type'], ['', 'all'])
+			? $this->normalize([$this->flatten($counts)])
+			: $this->normalize(glsr_array_column($counts, $args['type']));
+	}
 
-    /**
-     * @return array
-     */
-    public function getCounts()
-    {
-        $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 getCounts()
+	{
+		$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;
+	}
 
-    /**
-     * @param int $postId
-     * @return array
-     */
-    public function getPostCounts($postId)
-    {
-        return array_filter((array) get_post_meta($postId, static::META_COUNT, true));
-    }
+	/**
+	 * @param int $postId
+	 * @return array
+	 */
+	public function getPostCounts($postId)
+	{
+		return array_filter((array) get_post_meta($postId, static::META_COUNT, true));
+	}
 
-    /**
-     * @param int $termId
-     * @return array
-     */
-    public function getTermCounts($termId)
-    {
-        return array_filter((array) get_term_meta($termId, static::META_COUNT, true));
-    }
+	/**
+	 * @param int $termId
+	 * @return array
+	 */
+	public function getTermCounts($termId)
+	{
+		return array_filter((array) get_term_meta($termId, static::META_COUNT, true));
+	}
 
-    /**
-     * @return void
-     */
-    public function increase(Review $review)
-    {
-        $this->increaseCounts($review);
-        $this->increasePostCounts($review);
-        $this->increaseTermCounts($review);
-    }
+	/**
+	 * @return void
+	 */
+	public function increase(Review $review)
+	{
+		$this->increaseCounts($review);
+		$this->increasePostCounts($review);
+		$this->increaseTermCounts($review);
+	}
 
-    /**
-     * @return void
-     */
-    public function increaseCounts(Review $review)
-    {
-        if (empty($counts = $this->getCounts())) {
-            $counts = $this->buildCounts();
-        }
-        $this->setCounts($this->increaseRating($counts, $review->review_type, $review->rating));
-    }
+	/**
+	 * @return void
+	 */
+	public function increaseCounts(Review $review)
+	{
+		if (empty($counts = $this->getCounts())) {
+			$counts = $this->buildCounts();
+		}
+		$this->setCounts($this->increaseRating($counts, $review->review_type, $review->rating));
+	}
 
-    /**
-     * @return void
-     */
-    public function increasePostCounts(Review $review)
-    {
-        if (!(get_post($review->assigned_to) instanceof WP_Post)) {
-            return;
-        }
-        $counts = $this->getPostCounts($review->assigned_to);
-        $counts = empty($counts)
-            ? $this->buildPostCounts($review->assigned_to)
-            : $this->increaseRating($counts, $review->review_type, $review->rating);
-        $this->setPostCounts($review->assigned_to, $counts);
-    }
+	/**
+	 * @return void
+	 */
+	public function increasePostCounts(Review $review)
+	{
+		if (!(get_post($review->assigned_to) instanceof WP_Post)) {
+			return;
+		}
+		$counts = $this->getPostCounts($review->assigned_to);
+		$counts = empty($counts)
+			? $this->buildPostCounts($review->assigned_to)
+			: $this->increaseRating($counts, $review->review_type, $review->rating);
+		$this->setPostCounts($review->assigned_to, $counts);
+	}
 
-    /**
-     * @return void
-     */
-    public function increaseTermCounts(Review $review)
-    {
-        $terms = glsr(ReviewManager::class)->normalizeTerms(implode(',', $review->term_ids));
-        foreach ($terms as $term) {
-            $counts = $this->getTermCounts($term['term_id']);
-            $counts = empty($counts)
-                ? $this->buildTermCounts($term['term_taxonomy_id'])
-                : $this->increaseRating($counts, $review->review_type, $review->rating);
-            $this->setTermCounts($term['term_id'], $counts);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function increaseTermCounts(Review $review)
+	{
+		$terms = glsr(ReviewManager::class)->normalizeTerms(implode(',', $review->term_ids));
+		foreach ($terms as $term) {
+			$counts = $this->getTermCounts($term['term_id']);
+			$counts = empty($counts)
+				? $this->buildTermCounts($term['term_taxonomy_id'])
+				: $this->increaseRating($counts, $review->review_type, $review->rating);
+			$this->setTermCounts($term['term_id'], $counts);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function setCounts(array $reviewCounts)
-    {
-        glsr(OptionManager::class)->set('counts', $reviewCounts);
-    }
+	/**
+	 * @return void
+	 */
+	public function setCounts(array $reviewCounts)
+	{
+		glsr(OptionManager::class)->set('counts', $reviewCounts);
+	}
 
-    /**
-     * @param int $postId
-     * @return void
-     */
-    public function setPostCounts($postId, array $reviewCounts)
-    {
-        $ratingCounts = $this->flatten($reviewCounts);
-        update_post_meta($postId, static::META_COUNT, $reviewCounts);
-        update_post_meta($postId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
-        update_post_meta($postId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
-    }
+	/**
+	 * @param int $postId
+	 * @return void
+	 */
+	public function setPostCounts($postId, array $reviewCounts)
+	{
+		$ratingCounts = $this->flatten($reviewCounts);
+		update_post_meta($postId, static::META_COUNT, $reviewCounts);
+		update_post_meta($postId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
+		update_post_meta($postId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
+	}
 
-    /**
-     * @param int $termId
-     * @return void
-     */
-    public function setTermCounts($termId, array $reviewCounts)
-    {
-        $term = get_term($termId, Application::TAXONOMY);
-        if (!isset($term->term_id)) {
-            return;
-        }
-        $ratingCounts = $this->flatten($reviewCounts);
-        update_term_meta($termId, static::META_COUNT, $reviewCounts);
-        update_term_meta($termId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
-        update_term_meta($termId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
-    }
+	/**
+	 * @param int $termId
+	 * @return void
+	 */
+	public function setTermCounts($termId, array $reviewCounts)
+	{
+		$term = get_term($termId, Application::TAXONOMY);
+		if (!isset($term->term_id)) {
+			return;
+		}
+		$ratingCounts = $this->flatten($reviewCounts);
+		update_term_meta($termId, static::META_COUNT, $reviewCounts);
+		update_term_meta($termId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
+		update_term_meta($termId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
+	}
 
-    /**
-     * @param string $type
-     * @param int $rating
-     * @return array
-     */
-    protected function decreaseRating(array $reviewCounts, $type, $rating)
-    {
-        if (isset($reviewCounts[$type][$rating])) {
-            $reviewCounts[$type][$rating] = max(0, $reviewCounts[$type][$rating] - 1);
-        }
-        return $reviewCounts;
-    }
+	/**
+	 * @param string $type
+	 * @param int $rating
+	 * @return array
+	 */
+	protected function decreaseRating(array $reviewCounts, $type, $rating)
+	{
+		if (isset($reviewCounts[$type][$rating])) {
+			$reviewCounts[$type][$rating] = max(0, $reviewCounts[$type][$rating] - 1);
+		}
+		return $reviewCounts;
+	}
 
-    /**
-     * @param string $type
-     * @param int $rating
-     * @return array
-     */
-    protected function increaseRating(array $reviewCounts, $type, $rating)
-    {
-        if (!array_key_exists($type, glsr()->reviewTypes)) {
-            return $reviewCounts;
-        }
-        if (!array_key_exists($type, $reviewCounts)) {
-            $reviewCounts[$type] = [];
-        }
-        $reviewCounts = $this->normalize($reviewCounts);
-        $reviewCounts[$type][$rating] = intval($reviewCounts[$type][$rating]) + 1;
-        return $reviewCounts;
-    }
+	/**
+	 * @param string $type
+	 * @param int $rating
+	 * @return array
+	 */
+	protected function increaseRating(array $reviewCounts, $type, $rating)
+	{
+		if (!array_key_exists($type, glsr()->reviewTypes)) {
+			return $reviewCounts;
+		}
+		if (!array_key_exists($type, $reviewCounts)) {
+			$reviewCounts[$type] = [];
+		}
+		$reviewCounts = $this->normalize($reviewCounts);
+		$reviewCounts[$type][$rating] = intval($reviewCounts[$type][$rating]) + 1;
+		return $reviewCounts;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isMixedCount(array $args)
-    {
-        return !empty($args['post_ids']) && !empty($args['term_ids']);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isMixedCount(array $args)
+	{
+		return !empty($args['post_ids']) && !empty($args['term_ids']);
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $reviewCounts)
-    {
-        if (empty($reviewCounts)) {
-            $reviewCounts = [[]];
-        }
-        foreach ($reviewCounts as &$counts) {
-            foreach (range(0, glsr()->constant('MAX_RATING', Rating::class)) as $index) {
-                if (isset($counts[$index])) {
-                    continue;
-                }
-                $counts[$index] = 0;
-            }
-            ksort($counts);
-        }
-        return $reviewCounts;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $reviewCounts)
+	{
+		if (empty($reviewCounts)) {
+			$reviewCounts = [[]];
+		}
+		foreach ($reviewCounts as &$counts) {
+			foreach (range(0, glsr()->constant('MAX_RATING', Rating::class)) as $index) {
+				if (isset($counts[$index])) {
+					continue;
+				}
+				$counts[$index] = 0;
+			}
+			ksort($counts);
+		}
+		return $reviewCounts;
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeArgs(array $args)
-    {
-        $args = wp_parse_args(array_filter($args), [
-            'post_ids' => [],
-            'term_ids' => [],
-            'type' => 'local',
-        ]);
-        $args['post_ids'] = glsr(Polylang::class)->getPostIds($args['post_ids']);
-        $args['type'] = $this->normalizeType($args['type']);
-        return $args;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeArgs(array $args)
+	{
+		$args = wp_parse_args(array_filter($args), [
+			'post_ids' => [],
+			'term_ids' => [],
+			'type' => 'local',
+		]);
+		$args['post_ids'] = glsr(Polylang::class)->getPostIds($args['post_ids']);
+		$args['type'] = $this->normalizeType($args['type']);
+		return $args;
+	}
 
-    /**
-     * @param string $type
-     * @return string
-     */
-    protected function normalizeType($type)
-    {
-        return empty($type) || !is_string($type)
-            ? 'local'
-            : $type;
-    }
+	/**
+	 * @param string $type
+	 * @return string
+	 */
+	protected function normalizeType($type)
+	{
+		return empty($type) || !is_string($type)
+			? 'local'
+			: $type;
+	}
 
-    /**
-     * @param int $lastPostId
-     * @return object
-     */
-    protected function queryReviews(array $args = [], $lastPostId = 0)
-    {
-        $reviews = glsr(SqlQueries::class)->getReviewCounts($args, $lastPostId, static::LIMIT);
-        $hasMore = is_array($reviews)
-            ? count($reviews) == static::LIMIT
-            : false;
-        return (object) [
-            'has_more' => $hasMore,
-            'reviews' => $reviews,
-        ];
-    }
+	/**
+	 * @param int $lastPostId
+	 * @return object
+	 */
+	protected function queryReviews(array $args = [], $lastPostId = 0)
+	{
+		$reviews = glsr(SqlQueries::class)->getReviewCounts($args, $lastPostId, static::LIMIT);
+		$hasMore = is_array($reviews)
+			? count($reviews) == static::LIMIT
+			: false;
+		return (object) [
+			'has_more' => $hasMore,
+			'reviews' => $reviews,
+		];
+	}
 }

plugin/Database/SqlQueries.php

Indentation +103 added lines, -103 removed lines

@@ -8,23 +8,23 @@ 
 
 class SqlQueries
 {
-    protected $db;
-    protected $postType;
+	protected $db;
+	protected $postType;
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->db = $wpdb;
-        $this->postType = Application::POST_TYPE;
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->db = $wpdb;
+		$this->postType = Application::POST_TYPE;
+	}
 
-    /**
-     * @param string $metaReviewId
-     * @return int
-     */
-    public function getPostIdFromReviewId($metaReviewId)
-    {
-        $postId = $this->db->get_var("
+	/**
+	 * @param string $metaReviewId
+	 * @return int
+	 */
+	public function getPostIdFromReviewId($metaReviewId)
+	{
+		$postId = $this->db->get_var("
             SELECT p.ID
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -32,17 +32,17 @@ 
             AND m.meta_key = '_review_id'
             AND m.meta_value = '{$metaReviewId}'
         ");
-        return intval($postId);
-    }
+		return intval($postId);
+	}
 
-    /**
-     * @param int $lastPostId
-     * @param int $limit
-     * @return array
-     */
-    public function getReviewCounts(array $args, $lastPostId = 0, $limit = 500)
-    {
-        return (array) $this->db->get_results("
+	/**
+	 * @param int $lastPostId
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getReviewCounts(array $args, $lastPostId = 0, $limit = 500)
+	{
+		return (array) $this->db->get_results("
             SELECT DISTINCT p.ID, m1.meta_value AS rating, m2.meta_value AS type
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
@@ -57,17 +57,17 @@ 
             ORDER By p.ID ASC
             LIMIT {$limit}
         ");
-    }
+	}
 
-    /**
-     * @todo remove this?
-     * @param string $metaKey
-     * @return array
-     */
-    public function getReviewCountsFor($metaKey)
-    {
-        $metaKey = Str::prefix('_', $metaKey);
-        return (array) $this->db->get_results("
+	/**
+	 * @todo remove this?
+	 * @param string $metaKey
+	 * @return array
+	 */
+	public function getReviewCountsFor($metaKey)
+	{
+		$metaKey = Str::prefix('_', $metaKey);
+		return (array) $this->db->get_results("
             SELECT DISTINCT m.meta_value AS name, COUNT(*) num_posts
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -75,16 +75,16 @@ 
             AND m.meta_key = '{$metaKey}'
             GROUP BY name
         ");
-    }
+	}
 
-    /**
-     * @todo remove this?
-     * @param string $reviewType
-     * @return array
-     */
-    public function getReviewIdsByType($reviewType)
-    {
-        $results = $this->db->get_col("
+	/**
+	 * @todo remove this?
+	 * @param string $reviewType
+	 * @return array
+	 */
+	public function getReviewIdsByType($reviewType)
+	{
+		$results = $this->db->get_col("
             SELECT DISTINCT m1.meta_value AS review_id
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
@@ -94,20 +94,20 @@ 
             AND m2.meta_key = '_review_type'
             AND m2.meta_value = '{$reviewType}'
         ");
-        return array_keys(array_flip($results));
-    }
+		return array_keys(array_flip($results));
+	}
 
-    /**
-     * @param int $greaterThanId
-     * @param int $limit
-     * @return array
-     */
-    public function getReviewRatingsFromIds(array $postIds, $greaterThanId = 0, $limit = 100)
-    {
-        sort($postIds);
-        $postIds = array_slice($postIds, intval(array_search($greaterThanId, $postIds)), $limit);
-        $postIds = implode(',', $postIds);
-        return (array) $this->db->get_results("
+	/**
+	 * @param int $greaterThanId
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getReviewRatingsFromIds(array $postIds, $greaterThanId = 0, $limit = 100)
+	{
+		sort($postIds);
+		$postIds = array_slice($postIds, intval(array_search($greaterThanId, $postIds)), $limit);
+		$postIds = implode(',', $postIds);
+		return (array) $this->db->get_results("
             SELECT p.ID, m.meta_value AS rating
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -120,17 +120,17 @@ 
             ORDER By p.ID ASC
             LIMIT {$limit}
         ");
-    }
+	}
 
-    /**
-     * @param string $key
-     * @param string $status
-     * @return array
-     */
-    public function getReviewsMeta($key, $status = 'publish')
-    {
-        $key = Str::prefix('_', $key);
-        $values = $this->db->get_col("
+	/**
+	 * @param string $key
+	 * @param string $status
+	 * @return array
+	 */
+	public function getReviewsMeta($key, $status = 'publish')
+	{
+		$key = Str::prefix('_', $key);
+		$values = $this->db->get_col("
             SELECT DISTINCT m.meta_value
             FROM {$this->db->postmeta} m
             LEFT JOIN {$this->db->posts} p ON p.ID = m.post_id
@@ -141,42 +141,42 @@ 
             GROUP BY p.ID -- remove duplicate meta_value entries
             ORDER BY m.meta_id ASC -- sort by oldest meta_value
         ");
-        sort($values);
-        return $values;
-    }
+		sort($values);
+		return $values;
+	}
 
-    /**
-     * @param string $and
-     * @return string
-     */
-    protected function getAndForCounts(array $args, $and = '')
-    {
-        $postIds = implode(',', array_filter(Arr::get($args, 'post_ids', [])));
-        $termIds = implode(',', array_filter(Arr::get($args, 'term_ids', [])));
-        if (!empty($args['type'])) {
-            $and.= "AND m2.meta_value = '{$args['type']}' ";
-        }
-        if ($postIds) {
-            $and.= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) ";
-        }
-        if ($termIds) {
-            $and.= "AND tr.term_taxonomy_id IN ({$termIds}) ";
-        }
-        return apply_filters('site-reviews/query/and-for-counts', $and);
-    }
+	/**
+	 * @param string $and
+	 * @return string
+	 */
+	protected function getAndForCounts(array $args, $and = '')
+	{
+		$postIds = implode(',', array_filter(Arr::get($args, 'post_ids', [])));
+		$termIds = implode(',', array_filter(Arr::get($args, 'term_ids', [])));
+		if (!empty($args['type'])) {
+			$and.= "AND m2.meta_value = '{$args['type']}' ";
+		}
+		if ($postIds) {
+			$and.= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) ";
+		}
+		if ($termIds) {
+			$and.= "AND tr.term_taxonomy_id IN ({$termIds}) ";
+		}
+		return apply_filters('site-reviews/query/and-for-counts', $and);
+	}
 
-    /**
-     * @param string $innerJoin
-     * @return string
-     */
-    protected function getInnerJoinForCounts(array $args, $innerJoin = '')
-    {
-        if (!empty(Arr::get($args, 'post_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
-        }
-        if (!empty(Arr::get($args, 'term_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
-        }
-        return apply_filters('site-reviews/query/inner-join-for-counts', $innerJoin);
-    }
+	/**
+	 * @param string $innerJoin
+	 * @return string
+	 */
+	protected function getInnerJoinForCounts(array $args, $innerJoin = '')
+	{
+		if (!empty(Arr::get($args, 'post_ids'))) {
+			$innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
+		}
+		if (!empty(Arr::get($args, 'term_ids'))) {
+			$innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
+		}
+		return apply_filters('site-reviews/query/inner-join-for-counts', $innerJoin);
+	}
 }