pryley / site-reviews

plugin/Modules/Updater.php

Indentation +244 added lines, -244 removed lines

@@ -8,266 +8,266 @@
 
 class Updater
 {
-    /**
-     * @var string
-     */
-    protected $apiUrl;
-    /**
-     * @var array
-     */
-    protected $data;
-    /**
-     * @var string
-     */
-    protected $plugin;
-    /**
-     * @var string
-     */
-    protected $transientName;
+	/**
+	 * @var string
+	 */
+	protected $apiUrl;
+	/**
+	 * @var array
+	 */
+	protected $data;
+	/**
+	 * @var string
+	 */
+	protected $plugin;
+	/**
+	 * @var string
+	 */
+	protected $transientName;
 
-    /**
-     * @param string $apiUrl
-     * @param string $file
-     */
-    public function __construct($apiUrl, $file, array $data = [])
-    {
-        if (!function_exists('get_plugin_data')) {
-            require_once ABSPATH.WPINC.'/plugin.php';
-        }
-        $this->apiUrl = trailingslashit(apply_filters('site-reviews/addon/api-url', $apiUrl));
-        $this->data = wp_parse_args($data, get_plugin_data($file));
-        $this->plugin = plugin_basename($file);
-        $this->transientName = Application::PREFIX.md5(Arr::get($data, 'TextDomain'));
-    }
+	/**
+	 * @param string $apiUrl
+	 * @param string $file
+	 */
+	public function __construct($apiUrl, $file, array $data = [])
+	{
+		if (!function_exists('get_plugin_data')) {
+			require_once ABSPATH.WPINC.'/plugin.php';
+		}
+		$this->apiUrl = trailingslashit(apply_filters('site-reviews/addon/api-url', $apiUrl));
+		$this->data = wp_parse_args($data, get_plugin_data($file));
+		$this->plugin = plugin_basename($file);
+		$this->transientName = Application::PREFIX.md5(Arr::get($data, 'TextDomain'));
+	}
 
-    /**
-     * @return object
-     */
-    public function activateLicense(array $data = [])
-    {
-        return $this->request('activate_license', $data);
-    }
+	/**
+	 * @return object
+	 */
+	public function activateLicense(array $data = [])
+	{
+		return $this->request('activate_license', $data);
+	}
 
-    /**
-     * @return object
-     */
-    public function checkLicense(array $data = [])
-    {
-        $response = $this->request('check_license', $data);
-        if ('valid' === Arr::get($response, 'license')) {
-            $this->getPluginUpdate(true);
-        }
-        return $response;
-    }
+	/**
+	 * @return object
+	 */
+	public function checkLicense(array $data = [])
+	{
+		$response = $this->request('check_license', $data);
+		if ('valid' === Arr::get($response, 'license')) {
+			$this->getPluginUpdate(true);
+		}
+		return $response;
+	}
 
-    /**
-     * @return object
-     */
-    public function deactivateLicense(array $data = [])
-    {
-        return $this->request('deactivate_license', $data);
-    }
+	/**
+	 * @return object
+	 */
+	public function deactivateLicense(array $data = [])
+	{
+		return $this->request('deactivate_license', $data);
+	}
 
-    /**
-     * @param false|object|array $result
-     * @param string $action
-     * @param object $args
-     * @return mixed
-     */
-    public function filterPluginUpdateDetails($result, $action, $args)
-    {
-        if ('plugin_information' != $action
-            || Arr::get($this->data, 'TextDomain') != Arr::get($args, 'slug')) {
-            return $result;
-        }
-        if ($updateInfo = $this->getPluginUpdate()) {
-            return $this->modifyUpdateDetails($updateInfo);
-        }
-        return $result;
-    }
+	/**
+	 * @param false|object|array $result
+	 * @param string $action
+	 * @param object $args
+	 * @return mixed
+	 */
+	public function filterPluginUpdateDetails($result, $action, $args)
+	{
+		if ('plugin_information' != $action
+			|| Arr::get($this->data, 'TextDomain') != Arr::get($args, 'slug')) {
+			return $result;
+		}
+		if ($updateInfo = $this->getPluginUpdate()) {
+			return $this->modifyUpdateDetails($updateInfo);
+		}
+		return $result;
+	}
 
-    /**
-     * @param object $transient
-     * @return object
-     */
-    public function filterPluginUpdates($transient)
-    {
-        if ($updateInfo = $this->getPluginUpdate()) {
-            return $this->modifyPluginUpdates($transient, $updateInfo);
-        }
-        return $transient;
-    }
+	/**
+	 * @param object $transient
+	 * @return object
+	 */
+	public function filterPluginUpdates($transient)
+	{
+		if ($updateInfo = $this->getPluginUpdate()) {
+			return $this->modifyPluginUpdates($transient, $updateInfo);
+		}
+		return $transient;
+	}
 
-    /**
-     * @return object
-     */
-    public function getVersion(array $data = [])
-    {
-        return $this->request('get_version', $data);
-    }
+	/**
+	 * @return object
+	 */
+	public function getVersion(array $data = [])
+	{
+		return $this->request('get_version', $data);
+	}
 
-    /**
-     * @return void
-     */
-    public function init()
-    {
-        if ($this->apiUrl === trailingslashit(home_url())) {
-            return;
-        }
-        add_filter('plugins_api',                             [$this, 'filterPluginUpdateDetails'], 10, 3);
-        add_filter('pre_set_site_transient_update_plugins',   [$this, 'filterPluginUpdates'], 999);
-        add_action('load-update-core.php',                    [$this, 'onForceUpdateCheck'], 9);
-        add_action('in_plugin_update_message-'.$this->plugin, [$this, 'renderLicenseMissingLink']);
-    }
+	/**
+	 * @return void
+	 */
+	public function init()
+	{
+		if ($this->apiUrl === trailingslashit(home_url())) {
+			return;
+		}
+		add_filter('plugins_api',                             [$this, 'filterPluginUpdateDetails'], 10, 3);
+		add_filter('pre_set_site_transient_update_plugins',   [$this, 'filterPluginUpdates'], 999);
+		add_action('load-update-core.php',                    [$this, 'onForceUpdateCheck'], 9);
+		add_action('in_plugin_update_message-'.$this->plugin, [$this, 'renderLicenseMissingLink']);
+	}
 
-    /**
-     * @return bool
-     */
-    public function isLicenseValid()
-    {
-        $result = $this->checkLicense();
-        return 'valid' === Arr::get($result, 'license');
-    }
+	/**
+	 * @return bool
+	 */
+	public function isLicenseValid()
+	{
+		$result = $this->checkLicense();
+		return 'valid' === Arr::get($result, 'license');
+	}
 
-    /**
-     * @return void
-     */
-    public function onForceUpdateCheck()
-    {
-        if (!filter_input(INPUT_GET, 'force-check')) {
-            return;
-        }
-        foreach (glsr()->addons as $addon) {
-            try {
-                glsr($addon)->updater->getPluginUpdate(true);
-            } catch (\Exception $e) {
-                glsr_log()->error($e->getMessage());
-            }
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function onForceUpdateCheck()
+	{
+		if (!filter_input(INPUT_GET, 'force-check')) {
+			return;
+		}
+		foreach (glsr()->addons as $addon) {
+			try {
+				glsr($addon)->updater->getPluginUpdate(true);
+			} catch (\Exception $e) {
+				glsr_log()->error($e->getMessage());
+			}
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function renderLicenseMissingLink()
-    {
-        if (!$this->isLicenseValid()) {
-            glsr()->render('partials/addons/license-missing');
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function renderLicenseMissingLink()
+	{
+		if (!$this->isLicenseValid()) {
+			glsr()->render('partials/addons/license-missing');
+		}
+	}
 
-    /**
-     * @return false|object
-     */
-    protected function getCachedVersion()
-    {
-        return get_transient($this->transientName);
-    }
+	/**
+	 * @return false|object
+	 */
+	protected function getCachedVersion()
+	{
+		return get_transient($this->transientName);
+	}
 
-    /**
-     * @param bool $force
-     * @return false|object
-     */
-    protected function getPluginUpdate($force = false)
-    {
-        $version = $this->getCachedVersion();
-        if (false === $version || $force) {
-            $version = $this->getVersion();
-            $this->setCachedVersion($version);
-        }
-        if (isset($version->error)) {
-            glsr_log()->error($version->error);
-            return false;
-        }
-        return $version;
-    }
+	/**
+	 * @param bool $force
+	 * @return false|object
+	 */
+	protected function getPluginUpdate($force = false)
+	{
+		$version = $this->getCachedVersion();
+		if (false === $version || $force) {
+			$version = $this->getVersion();
+			$this->setCachedVersion($version);
+		}
+		if (isset($version->error)) {
+			glsr_log()->error($version->error);
+			return false;
+		}
+		return $version;
+	}
 
-    /**
-     * @param object $transient
-     * @param object $updateInfo
-     * @return object
-     */
-    protected function modifyPluginUpdates($transient, $updateInfo)
-    {
-        $updateInfo->id = Application::ID.'/'.Arr::get($this->data, 'TextDomain');
-        $updateInfo->plugin = $this->plugin;
-        $updateInfo->requires_php = Arr::get($this->data, 'RequiresPHP');
-        $updateInfo->tested = Arr::get($this->data, 'testedTo');
-        $transient->checked[$this->plugin] = Arr::get($this->data, 'Version');
-        $transient->last_checked = time();
-        if (Helper::isGreaterThan($updateInfo->new_version, Arr::get($this->data, 'Version'))) {
-            unset($transient->no_update[$this->plugin]);
-            $updateInfo->update = true;
-            $transient->response[$this->plugin] = $updateInfo;
-        } else {
-            unset($transient->response[$this->plugin]);
-            $transient->no_update[$this->plugin] = $updateInfo;
-        }
-        return $transient;
-    }
+	/**
+	 * @param object $transient
+	 * @param object $updateInfo
+	 * @return object
+	 */
+	protected function modifyPluginUpdates($transient, $updateInfo)
+	{
+		$updateInfo->id = Application::ID.'/'.Arr::get($this->data, 'TextDomain');
+		$updateInfo->plugin = $this->plugin;
+		$updateInfo->requires_php = Arr::get($this->data, 'RequiresPHP');
+		$updateInfo->tested = Arr::get($this->data, 'testedTo');
+		$transient->checked[$this->plugin] = Arr::get($this->data, 'Version');
+		$transient->last_checked = time();
+		if (Helper::isGreaterThan($updateInfo->new_version, Arr::get($this->data, 'Version'))) {
+			unset($transient->no_update[$this->plugin]);
+			$updateInfo->update = true;
+			$transient->response[$this->plugin] = $updateInfo;
+		} else {
+			unset($transient->response[$this->plugin]);
+			$transient->no_update[$this->plugin] = $updateInfo;
+		}
+		return $transient;
+	}
 
-    /**
-     * @param object $updateInfo
-     * @return object
-     */
-    protected function modifyUpdateDetails($updateInfo)
-    {
-        $updateInfo->author = Arr::get($this->data, 'Author');
-        $updateInfo->author_profile = Arr::get($this->data, 'AuthorURI');
-        $updateInfo->requires = Arr::get($this->data, 'RequiresWP');
-        $updateInfo->requires_php = Arr::get($this->data, 'RequiresPHP');
-        $updateInfo->tested = Arr::get($this->data, 'testedTo');
-        $updateInfo->version = $updateInfo->new_version;
-        return $updateInfo;
-    }
+	/**
+	 * @param object $updateInfo
+	 * @return object
+	 */
+	protected function modifyUpdateDetails($updateInfo)
+	{
+		$updateInfo->author = Arr::get($this->data, 'Author');
+		$updateInfo->author_profile = Arr::get($this->data, 'AuthorURI');
+		$updateInfo->requires = Arr::get($this->data, 'RequiresWP');
+		$updateInfo->requires_php = Arr::get($this->data, 'RequiresPHP');
+		$updateInfo->tested = Arr::get($this->data, 'testedTo');
+		$updateInfo->version = $updateInfo->new_version;
+		return $updateInfo;
+	}
 
-    /**
-     * @param \WP_Error|array $response
-     * @return object
-     */
-    protected function normalizeResponse($response)
-    {
-        $body = wp_remote_retrieve_body($response);
-        if ($data = json_decode($body)) {
-            $data = array_map('maybe_unserialize', (array) $data);
-            return (object) $data;
-        }
-        $error = is_wp_error($response)
-            ? $response->get_error_message()
-            : 'Update server not responding ('.Arr::get($this->data, 'TextDomain').')';
-        return (object) ['error' => $error];
-    }
+	/**
+	 * @param \WP_Error|array $response
+	 * @return object
+	 */
+	protected function normalizeResponse($response)
+	{
+		$body = wp_remote_retrieve_body($response);
+		if ($data = json_decode($body)) {
+			$data = array_map('maybe_unserialize', (array) $data);
+			return (object) $data;
+		}
+		$error = is_wp_error($response)
+			? $response->get_error_message()
+			: 'Update server not responding ('.Arr::get($this->data, 'TextDomain').')';
+		return (object) ['error' => $error];
+	}
 
-    /**
-     * @param string $action activate_license|check_license|deactivate_license|get_version
-     * @return object
-     */
-    protected function request($action, array $data = [])
-    {
-        $data = wp_parse_args($data, $this->data);
-        $response = wp_remote_post($this->apiUrl, [
-            'body' => [
-                'edd_action' => $action,
-                'item_id' => Arr::get($data, 'item_id'),
-                'item_name' => Arr::get($data, 'Name'),
-                'license' => Arr::get($data, 'license'),
-                'slug' => Arr::get($data, 'TextDomain'),
-                'url' => home_url(),
-            ],
-            'sslverify' => apply_filters('site-reviews/sslverify/post', false),
-            'timeout' => 15,
-        ]);
-        return $this->normalizeResponse($response);
-    }
+	/**
+	 * @param string $action activate_license|check_license|deactivate_license|get_version
+	 * @return object
+	 */
+	protected function request($action, array $data = [])
+	{
+		$data = wp_parse_args($data, $this->data);
+		$response = wp_remote_post($this->apiUrl, [
+			'body' => [
+				'edd_action' => $action,
+				'item_id' => Arr::get($data, 'item_id'),
+				'item_name' => Arr::get($data, 'Name'),
+				'license' => Arr::get($data, 'license'),
+				'slug' => Arr::get($data, 'TextDomain'),
+				'url' => home_url(),
+			],
+			'sslverify' => apply_filters('site-reviews/sslverify/post', false),
+			'timeout' => 15,
+		]);
+		return $this->normalizeResponse($response);
+	}
 
-    /**
-     * @param object $version
-     * @return void
-     */
-    protected function setCachedVersion($version)
-    {
-        if (!isset($version->error)) {
-            set_transient($this->transientName, $version, 3 * HOUR_IN_SECONDS);
-        }
-    }
+	/**
+	 * @param object $version
+	 * @return void
+	 */
+	protected function setCachedVersion($version)
+	{
+		if (!isset($version->error)) {
+			set_transient($this->transientName, $version, 3 * HOUR_IN_SECONDS);
+		}
+	}
 }

plugin/Modules/Migrations/Migrate_4_0_2.php

Indentation +53 added lines, -53 removed lines

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

plugin/Modules/Migrations/Migrate_3_0_0.php

Indentation +147 added lines, -147 removed lines

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

plugin/Modules/Multilingual/Wpml.php

Indentation +66 added lines, -66 removed lines

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

plugin/Modules/Multilingual/Polylang.php

Indentation +62 added lines, -62 removed lines

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

plugin/Helper.php

Indentation +214 added lines, -214 removed lines

@@ -8,218 +8,218 @@
 
 class Helper
 {
-    /**
-     * @param string $name
-     * @param string $path
-     * @return string
-     */
-    public static function buildClassName($name, $path = '')
-    {
-        $className = Str::camelCase($name);
-        $path = ltrim(str_replace(__NAMESPACE__, '', $path), '\\');
-        return !empty($path)
-            ? __NAMESPACE__.'\\'.$path.'\\'.$className
-            : $className;
-    }
-
-    /**
-     * @param string $name
-     * @param string $prefix
-     * @return string
-     */
-    public static function buildMethodName($name, $prefix = '')
-    {
-        return lcfirst($prefix.static::buildClassName($name));
-    }
-
-    /**
-     * @param string $name
-     * @return string
-     */
-    public static function buildPropertyName($name)
-    {
-        return static::buildMethodName($name);
-    }
-
-    /**
-     * @param string $cast
-     * @param mixed $value
-     * @return mixed
-     */
-    public static function castTo($cast = '', $value)
-    {
-        $method = static::buildMethodName($cast, 'castTo');
-        return !empty($cast) && method_exists(__CLASS__, $method)
-            ? static::$method($value)
-            : $value;
-    }
-
-    /**
-     * @param mixed $value
-     * @return array
-     */
-    public static function castToArray($value)
-    {
-        return (array) $value;
-    }
-
-    /**
-     * @param mixed $value
-     * @return bool
-     */
-    public static function castToBool($value)
-    {
-        return filter_var($value, FILTER_VALIDATE_BOOLEAN);
-    }
-
-    /**
-     * @param mixed $value
-     * @return float
-     */
-    public static function castToFloat($value)
-    {
-        return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
-    }
-
-    /**
-     * @param mixed $value
-     * @return int
-     */
-    public static function castToInt($value)
-    {
-        return (int) filter_var($value, FILTER_VALIDATE_INT);
-    }
-
-    /**
-     * @param mixed $value
-     * @return object
-     */
-    public static function castToObject($value)
-    {
-        return (object) (array) $value;
-    }
-
-    /**
-     * @param mixed $value
-     * @return string
-     */
-    public static function castToString($value)
-    {
-        if (is_object($value) && in_array('__toString', get_class_methods($value))) {
-            return (string) $value->__toString();
-        }
-        if (is_array($value) || is_object($value)) {
-            return serialize($value);
-        }
-        return (string) $value;
-    }
-
-    /**
-     * @param string $key
-     * @return mixed
-     */
-    public static function filterInput($key, array $request = [])
-    {
-        if (isset($request[$key])) {
-            return $request[$key];
-        }
-        $variable = filter_input(INPUT_POST, $key);
-        if (is_null($variable) && isset($_POST[$key])) {
-            $variable = $_POST[$key];
-        }
-        return $variable;
-    }
-
-    /**
-     * @param string $key
-     * @return array
-     */
-    public static function filterInputArray($key)
-    {
-        $variable = filter_input(INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
-        if (empty($variable) && !empty($_POST[$key]) && is_array($_POST[$key])) {
-            $variable = $_POST[$key];
-        }
-        return (array) $variable;
-    }
-
-    /**
-     * @return string
-     */
-    public static function getIpAddress()
-    {
-        $whitelist = [];
-        $isUsingCloudflare = !empty(filter_input(INPUT_SERVER, 'CF-Connecting-IP'));
-        if (apply_filters('site-reviews/whip/whitelist/cloudflare', $isUsingCloudflare)) {
-            $cloudflareIps = glsr(Cache::class)->getCloudflareIps();
-            $whitelist[Whip::CLOUDFLARE_HEADERS] = [Whip::IPV4 => $cloudflareIps['v4']];
-            if (defined('AF_INET6')) {
-                $whitelist[Whip::CLOUDFLARE_HEADERS][Whip::IPV6] = $cloudflareIps['v6'];
-            }
-        }
-        $whitelist = apply_filters('site-reviews/whip/whitelist', $whitelist);
-        $methods = apply_filters('site-reviews/whip/methods', Whip::ALL_METHODS);
-        $whip = new Whip($methods, $whitelist);
-        do_action_ref_array('site-reviews/whip', [$whip]);
-        if (false !== ($clientAddress = $whip->getValidIpAddress())) {
-            return (string) $clientAddress;
-        }
-        glsr_log()->error('Unable to detect IP address.');
-        return 'unknown';
-    }
-
-    /**
-     * @param mixed $value
-     * @param string|int $min
-     * @param string|int $max
-     * @return bool
-     */
-    public static function inRange($value, $min, $max)
-    {
-        $inRange = filter_var($value, FILTER_VALIDATE_INT, ['options' => [
-            'min_range' => intval($min),
-            'max_range' => intval($max),
-        ]]);
-        return false !== $inRange;
-    }
-
-    /**
-     * @param int|string $value
-     * @param int|string $compareWithValue
-     * @return bool
-     */
-    public static function isGreaterThan($value, $compareWithValue)
-    {
-        return version_compare($value, $compareWithValue, '>');
-    }
-
-    /**
-     * @param int|string $value
-     * @param int|string $compareWithValue
-     * @return bool
-     */
-    public static function isGreaterThanOrEqual($value, $compareWithValue)
-    {
-        return version_compare($value, $compareWithValue, '>=');
-    }
-
-    /**
-     * @param int|string $value
-     * @param int|string $compareWithValue
-     * @return bool
-     */
-    public static function isLessThan($value, $compareWithValue)
-    {
-        return version_compare($value, $compareWithValue, '<');
-    }
-
-    /**
-     * @param int|string $value
-     * @param int|string $compareWithValue
-     * @return bool
-     */
-    public static function isLessThanOrEqual($value, $compareWithValue)
-    {
-        return version_compare($value, $compareWithValue, '<=');
-    }
+	/**
+	 * @param string $name
+	 * @param string $path
+	 * @return string
+	 */
+	public static function buildClassName($name, $path = '')
+	{
+		$className = Str::camelCase($name);
+		$path = ltrim(str_replace(__NAMESPACE__, '', $path), '\\');
+		return !empty($path)
+			? __NAMESPACE__.'\\'.$path.'\\'.$className
+			: $className;
+	}
+
+	/**
+	 * @param string $name
+	 * @param string $prefix
+	 * @return string
+	 */
+	public static function buildMethodName($name, $prefix = '')
+	{
+		return lcfirst($prefix.static::buildClassName($name));
+	}
+
+	/**
+	 * @param string $name
+	 * @return string
+	 */
+	public static function buildPropertyName($name)
+	{
+		return static::buildMethodName($name);
+	}
+
+	/**
+	 * @param string $cast
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	public static function castTo($cast = '', $value)
+	{
+		$method = static::buildMethodName($cast, 'castTo');
+		return !empty($cast) && method_exists(__CLASS__, $method)
+			? static::$method($value)
+			: $value;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return array
+	 */
+	public static function castToArray($value)
+	{
+		return (array) $value;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public static function castToBool($value)
+	{
+		return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return float
+	 */
+	public static function castToFloat($value)
+	{
+		return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return int
+	 */
+	public static function castToInt($value)
+	{
+		return (int) filter_var($value, FILTER_VALIDATE_INT);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return object
+	 */
+	public static function castToObject($value)
+	{
+		return (object) (array) $value;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return string
+	 */
+	public static function castToString($value)
+	{
+		if (is_object($value) && in_array('__toString', get_class_methods($value))) {
+			return (string) $value->__toString();
+		}
+		if (is_array($value) || is_object($value)) {
+			return serialize($value);
+		}
+		return (string) $value;
+	}
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	public static function filterInput($key, array $request = [])
+	{
+		if (isset($request[$key])) {
+			return $request[$key];
+		}
+		$variable = filter_input(INPUT_POST, $key);
+		if (is_null($variable) && isset($_POST[$key])) {
+			$variable = $_POST[$key];
+		}
+		return $variable;
+	}
+
+	/**
+	 * @param string $key
+	 * @return array
+	 */
+	public static function filterInputArray($key)
+	{
+		$variable = filter_input(INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
+		if (empty($variable) && !empty($_POST[$key]) && is_array($_POST[$key])) {
+			$variable = $_POST[$key];
+		}
+		return (array) $variable;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function getIpAddress()
+	{
+		$whitelist = [];
+		$isUsingCloudflare = !empty(filter_input(INPUT_SERVER, 'CF-Connecting-IP'));
+		if (apply_filters('site-reviews/whip/whitelist/cloudflare', $isUsingCloudflare)) {
+			$cloudflareIps = glsr(Cache::class)->getCloudflareIps();
+			$whitelist[Whip::CLOUDFLARE_HEADERS] = [Whip::IPV4 => $cloudflareIps['v4']];
+			if (defined('AF_INET6')) {
+				$whitelist[Whip::CLOUDFLARE_HEADERS][Whip::IPV6] = $cloudflareIps['v6'];
+			}
+		}
+		$whitelist = apply_filters('site-reviews/whip/whitelist', $whitelist);
+		$methods = apply_filters('site-reviews/whip/methods', Whip::ALL_METHODS);
+		$whip = new Whip($methods, $whitelist);
+		do_action_ref_array('site-reviews/whip', [$whip]);
+		if (false !== ($clientAddress = $whip->getValidIpAddress())) {
+			return (string) $clientAddress;
+		}
+		glsr_log()->error('Unable to detect IP address.');
+		return 'unknown';
+	}
+
+	/**
+	 * @param mixed $value
+	 * @param string|int $min
+	 * @param string|int $max
+	 * @return bool
+	 */
+	public static function inRange($value, $min, $max)
+	{
+		$inRange = filter_var($value, FILTER_VALIDATE_INT, ['options' => [
+			'min_range' => intval($min),
+			'max_range' => intval($max),
+		]]);
+		return false !== $inRange;
+	}
+
+	/**
+	 * @param int|string $value
+	 * @param int|string $compareWithValue
+	 * @return bool
+	 */
+	public static function isGreaterThan($value, $compareWithValue)
+	{
+		return version_compare($value, $compareWithValue, '>');
+	}
+
+	/**
+	 * @param int|string $value
+	 * @param int|string $compareWithValue
+	 * @return bool
+	 */
+	public static function isGreaterThanOrEqual($value, $compareWithValue)
+	{
+		return version_compare($value, $compareWithValue, '>=');
+	}
+
+	/**
+	 * @param int|string $value
+	 * @param int|string $compareWithValue
+	 * @return bool
+	 */
+	public static function isLessThan($value, $compareWithValue)
+	{
+		return version_compare($value, $compareWithValue, '<');
+	}
+
+	/**
+	 * @param int|string $value
+	 * @param int|string $compareWithValue
+	 * @return bool
+	 */
+	public static function isLessThanOrEqual($value, $compareWithValue)
+	{
+		return version_compare($value, $compareWithValue, '<=');
+	}
 }

plugin/Database/OptionManager.php

Indentation +142 added lines, -142 removed lines

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

plugin/Database/CountsManager.php

Indentation +227 added lines, -227 removed lines

@@ -14,248 +14,248 @@
 
 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
-     */
-    public function buildCounts(array $args = [])
-    {
-        $counts = [
-            'local' => $this->generateEmptyCountsArray(),
-        ];
-        $query = $this->queryReviews($args);
-        while ($query) {
-            $counts = $this->populateCountsFromQuery($query, $counts);
-            $query = $query->has_more
-                ? $this->queryReviews($args, end($query->reviews)->ID)
-                : false;
-        }
-        return $counts;
-    }
+	/**
+	 * @return array
+	 */
+	public function buildCounts(array $args = [])
+	{
+		$counts = [
+			'local' => $this->generateEmptyCountsArray(),
+		];
+		$query = $this->queryReviews($args);
+		while ($query) {
+			$counts = $this->populateCountsFromQuery($query, $counts);
+			$query = $query->has_more
+				? $this->queryReviews($args, end($query->reviews)->ID)
+				: false;
+		}
+		return $counts;
+	}
 
-    /**
-     * @return void
-     */
-    public function decreaseAll(Review $review)
-    {
-        glsr(GlobalCountsManager::class)->decrease($review);
-        glsr(PostCountsManager::class)->decrease($review);
-        glsr(TermCountsManager::class)->decrease($review);
-    }
+	/**
+	 * @return void
+	 */
+	public function decreaseAll(Review $review)
+	{
+		glsr(GlobalCountsManager::class)->decrease($review);
+		glsr(PostCountsManager::class)->decrease($review);
+		glsr(TermCountsManager::class)->decrease($review);
+	}
 
-    /**
-     * @param string $type
-     * @param int $rating
-     * @return array
-     */
-    public 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
+	 */
+	public function decreaseRating(array $reviewCounts, $type, $rating)
+	{
+		if (isset($reviewCounts[$type][$rating])) {
+			$reviewCounts[$type][$rating] = max(0, $reviewCounts[$type][$rating] - 1);
+		}
+		return $reviewCounts;
+	}
 
-    /**
-     * @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));
-        });
-        $min = Arr::get($args, 'min', glsr()->constant('MIN_RATING', Rating::class));
-        $max = Arr::get($args, 'max', glsr()->constant('MAX_RATING', Rating::class));
-        foreach ($counts as $index => &$num) {
-            if (!Helper::inRange($index, $min, $max)) {
-                $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));
+		});
+		$min = Arr::get($args, 'min', glsr()->constant('MIN_RATING', Rating::class));
+		$max = Arr::get($args, 'max', glsr()->constant('MAX_RATING', Rating::class));
+		foreach ($counts as $index => &$num) {
+			if (!Helper::inRange($index, $min, $max)) {
+				$num = 0;
+			}
+		}
+		return $counts;
+	}
 
-    /**
-     * @return array
-     */
-    public function getCounts(array $args = [])
-    {
-        $args = $this->normalizeArgs($args);
-        $counts = $this->hasMixedAssignment($args)
-            ? $this->buildCounts($args) // force query the database
-            : $this->get($args);
-        return $this->normalize($counts);
-    }
+	/**
+	 * @return array
+	 */
+	public function getCounts(array $args = [])
+	{
+		$args = $this->normalizeArgs($args);
+		$counts = $this->hasMixedAssignment($args)
+			? $this->buildCounts($args) // force query the database
+			: $this->get($args);
+		return $this->normalize($counts);
+	}
 
-    /**
-     * @return void
-     */
-    public function increaseAll(Review $review)
-    {
-        glsr(GlobalCountsManager::class)->increase($review);
-        glsr(PostCountsManager::class)->increase($review);
-        glsr(TermCountsManager::class)->increase($review);
-    }
+	/**
+	 * @return void
+	 */
+	public function increaseAll(Review $review)
+	{
+		glsr(GlobalCountsManager::class)->increase($review);
+		glsr(PostCountsManager::class)->increase($review);
+		glsr(TermCountsManager::class)->increase($review);
+	}
 
-    /**
-     * @param string $type
-     * @param int $rating
-     * @return array
-     */
-    public 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
+	 */
+	public 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 void
-     */
-    public function updateAll()
-    {
-        glsr(GlobalCountsManager::class)->updateAll();
-        glsr(PostCountsManager::class)->updateAll();
-        glsr(TermCountsManager::class)->updateAll();
-        glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
-    }
+	/**
+	 * @return void
+	 */
+	public function updateAll()
+	{
+		glsr(GlobalCountsManager::class)->updateAll();
+		glsr(PostCountsManager::class)->updateAll();
+		glsr(TermCountsManager::class)->updateAll();
+		glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
+	}
 
-    /**
-     * @return array
-     */
-    protected function combine(array $results)
-    {
-        if (!wp_is_numeric_array($results)) {
-            return $results;
-        }
-        $mergedKeys = array_keys(array_merge(...$results));
-        $counts = array_fill_keys($mergedKeys, $this->generateEmptyCountsArray());
-        foreach ($results as $typeRatings) {
-            foreach ($typeRatings as $type => $ratings) {
-                foreach ($ratings as $index => $rating) {
-                    $counts[$type][$index] = intval($rating) + $counts[$type][$index];
-                }
-            }
-        }
-        return $counts;
-    }
+	/**
+	 * @return array
+	 */
+	protected function combine(array $results)
+	{
+		if (!wp_is_numeric_array($results)) {
+			return $results;
+		}
+		$mergedKeys = array_keys(array_merge(...$results));
+		$counts = array_fill_keys($mergedKeys, $this->generateEmptyCountsArray());
+		foreach ($results as $typeRatings) {
+			foreach ($typeRatings as $type => $ratings) {
+				foreach ($ratings as $index => $rating) {
+					$counts[$type][$index] = intval($rating) + $counts[$type][$index];
+				}
+			}
+		}
+		return $counts;
+	}
 
-    /**
-     * @return array
-     */
-    protected function generateEmptyCountsArray()
-    {
-        return array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
-    }
+	/**
+	 * @return array
+	 */
+	protected function generateEmptyCountsArray()
+	{
+		return array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
+	}
 
-    /**
-     * @return array
-     */
-    protected function get($args)
-    {
-        $results = [];
-        foreach ($args['post_ids'] as $postId) {
-            $results[] = glsr(PostCountsManager::class)->get($postId);
-        }
-        foreach ($args['term_ids'] as $termId) {
-            $results[] = glsr(TermCountsManager::class)->get($termId);
-        }
-        if (empty($results)) {
-            $results[] = glsr(GlobalCountsManager::class)->get();
-        }
-        $results[] = ['local' => $this->generateEmptyCountsArray()]; // make sure there is a fallback
-        return $this->combine($results);
-    }
+	/**
+	 * @return array
+	 */
+	protected function get($args)
+	{
+		$results = [];
+		foreach ($args['post_ids'] as $postId) {
+			$results[] = glsr(PostCountsManager::class)->get($postId);
+		}
+		foreach ($args['term_ids'] as $termId) {
+			$results[] = glsr(TermCountsManager::class)->get($termId);
+		}
+		if (empty($results)) {
+			$results[] = glsr(GlobalCountsManager::class)->get();
+		}
+		$results[] = ['local' => $this->generateEmptyCountsArray()]; // make sure there is a fallback
+		return $this->combine($results);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function hasMixedAssignment(array $args)
-    {
-        return !empty($args['post_ids']) && !empty($args['term_ids']);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function hasMixedAssignment(array $args)
+	{
+		return !empty($args['post_ids']) && !empty($args['term_ids']);
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $reviewCounts)
-    {
-        foreach ($reviewCounts as &$counts) {
-            foreach (array_keys($this->generateEmptyCountsArray()) as $index) {
-                if (!isset($counts[$index])) {
-                    $counts[$index] = 0;
-                }
-            }
-            ksort($counts);
-        }
-        return $reviewCounts;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $reviewCounts)
+	{
+		foreach ($reviewCounts as &$counts) {
+			foreach (array_keys($this->generateEmptyCountsArray()) as $index) {
+				if (!isset($counts[$index])) {
+					$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(Multilingual::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(Multilingual::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 object $query
-     * @return array
-     */
-    protected function populateCountsFromQuery($query, array $counts)
-    {
-        foreach ($query->reviews as $review) {
-            $type = $this->normalizeType($review->type);
-            if (!array_key_exists($type, $counts)) {
-                $counts[$type] = $this->generateEmptyCountsArray();
-            }
-            ++$counts[$type][$review->rating];
-        }
-        return $counts;
-    }
+	/**
+	 * @param object $query
+	 * @return array
+	 */
+	protected function populateCountsFromQuery($query, array $counts)
+	{
+		foreach ($query->reviews as $review) {
+			$type = $this->normalizeType($review->type);
+			if (!array_key_exists($type, $counts)) {
+				$counts[$type] = $this->generateEmptyCountsArray();
+			}
+			++$counts[$type][$review->rating];
+		}
+		return $counts;
+	}
 
-    /**
-     * @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,
+		];
+	}
 }

helpers.php

Indentation +74 added lines, -74 removed lines

@@ -9,25 +9,25 @@ 
  * @return mixed
  */
 add_filter('plugins_loaded', function () {
-    $hooks = array(
-        'glsr_calculate_ratings' => 1,
-        'glsr_create_review' => 2,
-        'glsr_debug' => 10,
-        'glsr_get' => 4,
-        'glsr_get_option' => 4,
-        'glsr_get_options' => 1,
-        'glsr_get_review' => 2,
-        'glsr_get_reviews' => 2,
-        'glsr_log' => 3,
-        'glsr_star_rating' => 2,
-    );
-    foreach ($hooks as $function => $acceptedArgs) {
-        add_filter($function, function () use ($function) {
-            $args = func_get_args();
-            array_shift($args); // remove the fallback value
-            return call_user_func_array($function, $args);
-        }, 10, $acceptedArgs);
-    }
+	$hooks = array(
+		'glsr_calculate_ratings' => 1,
+		'glsr_create_review' => 2,
+		'glsr_debug' => 10,
+		'glsr_get' => 4,
+		'glsr_get_option' => 4,
+		'glsr_get_options' => 1,
+		'glsr_get_review' => 2,
+		'glsr_get_reviews' => 2,
+		'glsr_log' => 3,
+		'glsr_star_rating' => 2,
+	);
+	foreach ($hooks as $function => $acceptedArgs) {
+		add_filter($function, function () use ($function) {
+			$args = func_get_args();
+			array_shift($args); // remove the fallback value
+			return call_user_func_array($function, $args);
+		}, 10, $acceptedArgs);
+	}
 });
 
 /**
@@ -35,10 +35,10 @@ 
  */
 function glsr($alias = null)
 {
-    $app = \GeminiLabs\SiteReviews\Application::load();
-    return !is_null($alias)
-        ? $app->make($alias)
-        : $app;
+	$app = \GeminiLabs\SiteReviews\Application::load();
+	return !is_null($alias)
+		? $app->make($alias)
+		: $app;
 }
 
 /**
@@ -48,15 +48,15 @@ 
  */
 function glsr_array_column(array $array, $column)
 {
-    $result = array();
-    foreach ($array as $subarray) {
-        $subarray = (array) $subarray;
-        if (!isset($subarray[$column])) {
-            continue;
-        }
-        $result[] = $subarray[$column];
-    }
-    return $result;
+	$result = array();
+	foreach ($array as $subarray) {
+		$subarray = (array) $subarray;
+		if (!isset($subarray[$column])) {
+			continue;
+		}
+		$result[] = $subarray[$column];
+	}
+	return $result;
 }
 
 /**
@@ -64,8 +64,8 @@ 
  */
 function glsr_calculate_ratings()
 {
-    glsr('Database\CountsManager')->updateAll();
-    glsr_log()->notice(__('Recalculated rating counts.', 'site-reviews'));
+	glsr('Database\CountsManager')->updateAll();
+	glsr_log()->notice(__('Recalculated rating counts.', 'site-reviews'));
 }
 
 /**
@@ -73,10 +73,10 @@ 
  */
 function glsr_create_review($reviewValues = array())
 {
-    $review = new \GeminiLabs\SiteReviews\Commands\CreateReview(
-        \GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray($reviewValues)
-    );
-    return glsr('Database\ReviewManager')->create($review);
+	$review = new \GeminiLabs\SiteReviews\Commands\CreateReview(
+		\GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray($reviewValues)
+	);
+	return glsr('Database\ReviewManager')->create($review);
 }
 
 /**
@@ -84,12 +84,12 @@ 
  */
 function glsr_current_screen()
 {
-    if (function_exists('get_current_screen')) {
-        $screen = get_current_screen();
-    }
-    return empty($screen)
-        ? (object) array_fill_keys(['base', 'id', 'post_type'], null)
-        : $screen;
+	if (function_exists('get_current_screen')) {
+		$screen = get_current_screen();
+	}
+	return empty($screen)
+		? (object) array_fill_keys(['base', 'id', 'post_type'], null)
+		: $screen;
 }
 
 /**
@@ -98,16 +98,16 @@ 
  */
 function glsr_debug(...$vars)
 {
-    if (1 == count($vars)) {
-        $value = htmlspecialchars(print_r($vars[0], true), ENT_QUOTES, 'UTF-8');
-        printf('<div class="glsr-debug"><pre>%s</pre></div>', $value);
-    } else {
-        echo '<div class="glsr-debug-group">';
-        foreach ($vars as $var) {
-            glsr_debug($var);
-        }
-        echo '</div>';
-    }
+	if (1 == count($vars)) {
+		$value = htmlspecialchars(print_r($vars[0], true), ENT_QUOTES, 'UTF-8');
+		printf('<div class="glsr-debug"><pre>%s</pre></div>', $value);
+	} else {
+		echo '<div class="glsr-debug-group">';
+		foreach ($vars as $var) {
+			glsr_debug($var);
+		}
+		echo '</div>';
+	}
 }
 
 /**
@@ -118,7 +118,7 @@ 
  */
 function glsr_get($array, $path = '', $fallback = '')
 {
-    return \GeminiLabs\SiteReviews\Helpers\Arr::get($array, $path, $fallback);
+	return \GeminiLabs\SiteReviews\Helpers\Arr::get($array, $path, $fallback);
 }
 
 /**
@@ -129,9 +129,9 @@ 
  */
 function glsr_get_option($path = '', $fallback = '', $cast = '')
 {
-    return is_string($path)
-        ? glsr('Database\OptionManager')->get(\GeminiLabs\SiteReviews\Helpers\Str::prefix('settings.', $path), $fallback, $cast)
-        : $fallback;
+	return is_string($path)
+		? glsr('Database\OptionManager')->get(\GeminiLabs\SiteReviews\Helpers\Str::prefix('settings.', $path), $fallback, $cast)
+		: $fallback;
 }
 
 /**
@@ -139,7 +139,7 @@ 
  */
 function glsr_get_options()
 {
-    return glsr('Database\OptionManager')->get('settings');
+	return glsr('Database\OptionManager')->get('settings');
 }
 
 /**
@@ -148,13 +148,13 @@ 
  */
 function glsr_get_review($post)
 {
-    if (is_numeric($post)) {
-        $post = get_post($post);
-    }
-    if (!($post instanceof WP_Post)) {
-        $post = new WP_Post((object) []);
-    }
-    return glsr('Database\ReviewManager')->single($post);
+	if (is_numeric($post)) {
+		$post = get_post($post);
+	}
+	if (!($post instanceof WP_Post)) {
+		$post = new WP_Post((object) []);
+	}
+	return glsr('Database\ReviewManager')->single($post);
 }
 
 /**
@@ -162,7 +162,7 @@ 
  */
 function glsr_get_reviews($args = array())
 {
-    return glsr('Database\ReviewManager')->get(\GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray($args));
+	return glsr('Database\ReviewManager')->get(\GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray($args));
 }
 
 /**
@@ -170,12 +170,12 @@ 
  */
 function glsr_log()
 {
-    $args = func_get_args();
-    $console = glsr('Modules\Console');
-    if ($value = \GeminiLabs\SiteReviews\Helpers\Arr::get($args, '0')) {
-        return $console->debug($value, \GeminiLabs\SiteReviews\Helpers\Arr::get($args, '1', []));
-    }
-    return $console;
+	$args = func_get_args();
+	$console = glsr('Modules\Console');
+	if ($value = \GeminiLabs\SiteReviews\Helpers\Arr::get($args, '0')) {
+		return $console->debug($value, \GeminiLabs\SiteReviews\Helpers\Arr::get($args, '1', []));
+	}
+	return $console;
 }
 
 /**
@@ -183,5 +183,5 @@ 
  */
 function glsr_star_rating($rating)
 {
-    return glsr('Modules\Html\Partial')->build('star-rating', ['rating' => $rating]);
+	return glsr('Modules\Html\Partial')->build('star-rating', ['rating' => $rating]);
 }