pryley / site-reviews

views/pages/tools/general.php

Spacing +12 added lines, -12 removed lines

@@ -1,25 +1,25 @@ 
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
-<?php if (glsr()->hasPermission('settings')) : ?>
+<?php if( glsr()->hasPermission( 'settings' ) ) : ?>
 <div class="glsr-card card">
     <h3>Export Settings</h3>
     <p>Export the Site Reviews settings for this site to a <code>*.json</code> file. This allows you to easily import the plugin settings into another site.</p>
-    <p>To export your Site Reviews reviews and categories, please use the WordPress <a href="<?= admin_url('export.php'); ?>">Export</a> tool.</p>
+    <p>To export your Site Reviews reviews and categories, please use the WordPress <a href="<?= admin_url( 'export.php' ); ?>">Export</a> tool.</p>
     <form method="post">
         <input type="hidden" name="{{ id }}[_action]" value="export-settings">
-        <?php wp_nonce_field('export-settings'); ?>
-        <?php submit_button(__('Export Settings', 'site-reviews'), 'secondary'); ?>
+        <?php wp_nonce_field( 'export-settings' ); ?>
+        <?php submit_button( __( 'Export Settings', 'site-reviews' ), 'secondary' ); ?>
     </form>
 </div>
 <div class="glsr-card card">
     <h3>Import Settings</h3>
     <p>Import the Site Reviews settings from a <code>*.json</code> file. This file can be obtained by exporting the settings on another site using the export tool below.</p>
-    <p>To import your Site Reviews reviews and categories from another website, please use the WordPress <a href="<?= admin_url('import.php'); ?>">Import</a> tool.</p>
+    <p>To import your Site Reviews reviews and categories from another website, please use the WordPress <a href="<?= admin_url( 'import.php' ); ?>">Import</a> tool.</p>
     <form method="post" enctype="multipart/form-data">
         <input type="file" name="import-file">
         <input type="hidden" name="{{ id }}[_action]" value="import-settings">
-        <?php wp_nonce_field('import-settings'); ?>
-        <?php submit_button(__('Import Settings', 'site-reviews'), 'secondary'); ?>
+        <?php wp_nonce_field( 'import-settings' ); ?>
+        <?php submit_button( __( 'Import Settings', 'site-reviews' ), 'secondary' ); ?>
     </form>
 </div>
 <?php endif; ?>
@@ -29,10 +29,10 @@ 
     <p>Run this tool if your reviews stopped working correctly after upgrading the plugin to version 4 (i.e. read-only reviews, zero-star ratings, etc.).</p>
     <form method="post">
         <input type="hidden" name="{{ id }}[_action]" value="migrate-reviews">
-        <?php wp_nonce_field('migrate-reviews'); ?>
+        <?php wp_nonce_field( 'migrate-reviews' ); ?>
         <p class="submit">
             <button type="submit" class="glsr-button button" name="migrate-reviews" id="migrate-reviews">
-                <span data-loading="<?= __('Migrating Reviews...', 'site-reviews'); ?>"><?= __('Run Migration', 'site-reviews'); ?></span>
+                <span data-loading="<?= __( 'Migrating Reviews...', 'site-reviews' ); ?>"><?= __( 'Run Migration', 'site-reviews' ); ?></span>
             </button>
         </p>
     </form>
@@ -44,10 +44,10 @@ 
     <p>If you suspect that the rating counts are incorrect (perhaps you have edited reviews directly in your database), you can recalculate them here.</p>
     <form method="post">
         <input type="hidden" name="{{ id }}[_action]" value="count-reviews">
-        <?php wp_nonce_field('count-reviews'); ?>
+        <?php wp_nonce_field( 'count-reviews' ); ?>
         <p class="submit">
             <button type="submit" class="glsr-button button" name="count-reviews" id="count-reviews">
-                <span data-loading="<?= __('Recalculating Counts...', 'site-reviews'); ?>"><?= __('Recalculate Counts', 'site-reviews'); ?></span>
+                <span data-loading="<?= __( 'Recalculating Counts...', 'site-reviews' ); ?>"><?= __( 'Recalculate Counts', 'site-reviews' ); ?></span>
             </button>
         </p>
     </form>

plugin/Modules/Upgrader/Upgrade_3_0_0.php

Indentation +150 added lines, -150 removed lines

@@ -8,163 +8,163 @@
 
 class Upgrade_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)) {
-            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'];
-        }
-        glsr(OptionManager::class)->set($newSettings);
-    }
+	/**
+	 * @return void
+	 */
+	public function migrateSettings()
+	{
+		$this->newSettings = $this->getNewSettings();
+		$this->oldSettings = $this->getOldSettings();
+		if (empty($this->oldSettings)) {
+			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'];
+		}
+		glsr(OptionManager::class)->set($newSettings);
+	}
 
-    /**
-     * @return void
-     */
-    public function run()
-    {
-        $this->migrateSettings();
-    }
+	/**
+	 * @return void
+	 */
+	public function run()
+	{
+		$this->migrateSettings();
+	}
 
-    /**
-     * @return array
-     */
-    protected function getNewSettings()
-    {
-        return wp_parse_args(
-            Arr::flattenArray(glsr(OptionManager::class)->all()),
-            glsr(DefaultsManager::class)->defaults()
-        );
-    }
+	/**
+	 * @return array
+	 */
+	protected function getNewSettings()
+	{
+		return wp_parse_args(
+			Arr::flattenArray(glsr(OptionManager::class)->all()),
+			glsr(DefaultsManager::class)->defaults()
+		);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getOldSettings()
-    {
-        $defaults = array_fill_keys(array_keys(static::MAPPED_SETTINGS), '');
-        $settings = Arr::flattenArray((array) get_option('geminilabs_site_reviews-v2', []));
-        if (!empty($settings)) {
-            $settings = wp_parse_args($settings, $defaults);
-        }
-        return $settings;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getOldSettings()
+	{
+		$defaults = array_fill_keys(array_keys(static::MAPPED_SETTINGS), '');
+		$settings = Arr::flattenArray((array) get_option('geminilabs_site_reviews-v2', []));
+		if (!empty($settings)) {
+			$settings = wp_parse_args($settings, $defaults);
+		}
+		return $settings;
+	}
 
-    /**
-     * @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/Upgrader/Upgrade_4_0_2.php

Indentation +53 added lines, -53 removed lines

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

Spacing +21 added lines, -21 removed lines

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

plugin/Modules/Upgrader.php

Indentation +85 added lines, -85 removed lines

@@ -8,95 +8,95 @@
 
 class Upgrader
 {
-    /**
-     * @return string
-     */
-    public $currentVersion;
+	/**
+	 * @return string
+	 */
+	public $currentVersion;
 
-    /**
-     * @return void
-     */
-    public function run()
-    {
-        $files = $this->getUpgraderFiles();
-        $this->currentVersion = $this->currentVersion();
-        array_walk($files, function ($file) {
-            $className = str_replace('.php', '', $file);
-            $upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className);
-            $suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
-            if (version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) {
-                return;
-            }
-            glsr('Modules\\Upgrader\\'.$className)->run();
-            glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix);
-        });
-        $this->finish();
-    }
+	/**
+	 * @return void
+	 */
+	public function run()
+	{
+		$files = $this->getUpgraderFiles();
+		$this->currentVersion = $this->currentVersion();
+		array_walk($files, function ($file) {
+			$className = str_replace('.php', '', $file);
+			$upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className);
+			$suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
+			if (version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) {
+				return;
+			}
+			glsr('Modules\\Upgrader\\'.$className)->run();
+			glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix);
+		});
+		$this->finish();
+	}
 
-    /**
-     * @return void
-     */
-    public function finish()
-    {
-        if ($this->currentVersion !== glsr()->version) {
-            $this->setReviewCounts();
-            $this->updateVersionFrom($this->currentVersion);
-        } elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
-            $this->setReviewCounts();
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function finish()
+	{
+		if ($this->currentVersion !== glsr()->version) {
+			$this->setReviewCounts();
+			$this->updateVersionFrom($this->currentVersion);
+		} elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
+			$this->setReviewCounts();
+		}
+	}
 
-    /**
-     * @return string
-     */
-    protected function currentVersion()
-    {
-        $fallback = '0.0.0';
-        $majorVersions = [4, 3, 2];
-        foreach ($majorVersions as $majorVersion) {
-            $settings = get_option(OptionManager::databaseKey($majorVersion));
-            $version = Arr::get($settings, 'version', $fallback);
-            if (version_compare($version, $fallback, '>')) {
-                return $version;
-            }
-        }
-        return $fallback;
-    }
+	/**
+	 * @return string
+	 */
+	protected function currentVersion()
+	{
+		$fallback = '0.0.0';
+		$majorVersions = [4, 3, 2];
+		foreach ($majorVersions as $majorVersion) {
+			$settings = get_option(OptionManager::databaseKey($majorVersion));
+			$version = Arr::get($settings, 'version', $fallback);
+			if (version_compare($version, $fallback, '>')) {
+				return $version;
+			}
+		}
+		return $fallback;
+	}
 
-    /**
-     * @return array
-     */
-    protected function getUpgraderFiles()
-    {
-        $files = [];
-        $upgradeDir = dirname(__FILE__).'/Upgrades';
-        if (is_dir($upgradeDir)) {
-            $iterator = new DirectoryIterator($upgradeDir);
-            foreach ($iterator as $fileinfo) {
-                if ($fileinfo->isFile()) {
-                    $files[] = $fileinfo->getFilename();
-                }
-            }
-            natsort($files);
-        }
-        return $files;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getUpgraderFiles()
+	{
+		$files = [];
+		$upgradeDir = dirname(__FILE__).'/Upgrades';
+		if (is_dir($upgradeDir)) {
+			$iterator = new DirectoryIterator($upgradeDir);
+			foreach ($iterator as $fileinfo) {
+				if ($fileinfo->isFile()) {
+					$files[] = $fileinfo->getFilename();
+				}
+			}
+			natsort($files);
+		}
+		return $files;
+	}
 
-    /**
-     * @return void
-     */
-    protected function setReviewCounts()
-    {
-        add_action('admin_init', 'glsr_calculate_ratings');
-    }
+	/**
+	 * @return void
+	 */
+	protected function setReviewCounts()
+	{
+		add_action('admin_init', 'glsr_calculate_ratings');
+	}
 
-    /**
-     * @param string $previousVersion
-     * @return void
-     */
-    protected function updateVersionFrom($previousVersion)
-    {
-        glsr(OptionManager::class)->set('version', glsr()->version);
-        glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion);
-    }
+	/**
+	 * @param string $previousVersion
+	 * @return void
+	 */
+	protected function updateVersionFrom($previousVersion)
+	{
+		glsr(OptionManager::class)->set('version', glsr()->version);
+		glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion);
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -20,15 +20,15 @@ 
     {
         $files = $this->getUpgraderFiles();
         $this->currentVersion = $this->currentVersion();
-        array_walk($files, function ($file) {
-            $className = str_replace('.php', '', $file);
-            $upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className);
-            $suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
-            if (version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) {
+        array_walk( $files, function( $file ) {
+            $className = str_replace( '.php', '', $file );
+            $upgradeFromVersion = str_replace( ['Upgrade_', '_'], ['', '.'], $className );
+            $suffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions
+            if( version_compare( $this->currentVersion, $upgradeFromVersion.$suffix, '>=' ) ) {
                 return;
             }
-            glsr('Modules\\Upgrader\\'.$className)->run();
-            glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix);
+            glsr( 'Modules\\Upgrader\\'.$className )->run();
+            glsr_log()->notice( 'Completed Upgrade for v'.$upgradeFromVersion.$suffix );
         });
         $this->finish();
     }
@@ -38,10 +38,10 @@ 
      */
     public function finish()
     {
-        if ($this->currentVersion !== glsr()->version) {
+        if( $this->currentVersion !== glsr()->version ) {
             $this->setReviewCounts();
-            $this->updateVersionFrom($this->currentVersion);
-        } elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
+            $this->updateVersionFrom( $this->currentVersion );
+        } elseif( !glsr( OptionManager::class )->get( 'last_review_count', false ) ) {
             $this->setReviewCounts();
         }
     }
@@ -53,10 +53,10 @@ 
     {
         $fallback = '0.0.0';
         $majorVersions = [4, 3, 2];
-        foreach ($majorVersions as $majorVersion) {
-            $settings = get_option(OptionManager::databaseKey($majorVersion));
-            $version = Arr::get($settings, 'version', $fallback);
-            if (version_compare($version, $fallback, '>')) {
+        foreach( $majorVersions as $majorVersion ) {
+            $settings = get_option( OptionManager::databaseKey( $majorVersion ) );
+            $version = Arr::get( $settings, 'version', $fallback );
+            if( version_compare( $version, $fallback, '>' ) ) {
                 return $version;
             }
         }
@@ -69,15 +69,15 @@ 
     protected function getUpgraderFiles()
     {
         $files = [];
-        $upgradeDir = dirname(__FILE__).'/Upgrades';
-        if (is_dir($upgradeDir)) {
-            $iterator = new DirectoryIterator($upgradeDir);
-            foreach ($iterator as $fileinfo) {
-                if ($fileinfo->isFile()) {
+        $upgradeDir = dirname( __FILE__ ).'/Upgrades';
+        if( is_dir( $upgradeDir ) ) {
+            $iterator = new DirectoryIterator( $upgradeDir );
+            foreach( $iterator as $fileinfo ) {
+                if( $fileinfo->isFile() ) {
                     $files[] = $fileinfo->getFilename();
                 }
             }
-            natsort($files);
+            natsort( $files );
         }
         return $files;
     }
@@ -87,16 +87,16 @@ 
      */
     protected function setReviewCounts()
     {
-        add_action('admin_init', 'glsr_calculate_ratings');
+        add_action( 'admin_init', 'glsr_calculate_ratings' );
     }
 
     /**
      * @param string $previousVersion
      * @return void
      */
-    protected function updateVersionFrom($previousVersion)
+    protected function updateVersionFrom( $previousVersion )
     {
-        glsr(OptionManager::class)->set('version', glsr()->version);
-        glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion);
+        glsr( OptionManager::class )->set( 'version', glsr()->version );
+        glsr( OptionManager::class )->set( 'version_upgraded_from', $previousVersion );
     }
 }

plugin/Controllers/AdminController.php

Indentation +227 added lines, -227 removed lines

@@ -17,231 +17,231 @@
 
 class AdminController extends Controller
 {
-    /**
-     * @return void
-     * @action admin_enqueue_scripts
-     */
-    public function enqueueAssets()
-    {
-        $command = new EnqueueAdminAssets([
-            'pointers' => [[
-                'content' => __('You can pin exceptional reviews so that they are always shown first.', 'site-reviews'),
-                'id' => 'glsr-pointer-pinned',
-                'position' => [
-                    'edge' => 'right',
-                    'align' => 'middle',
-                ],
-                'screen' => Application::POST_TYPE,
-                'target' => '#misc-pub-pinned',
-                'title' => __('Pin Your Reviews', 'site-reviews'),
-            ]],
-        ]);
-        $this->execute($command);
-    }
-
-    /**
-     * @return array
-     * @filter plugin_action_links_site-reviews/site-reviews.php
-     */
-    public function filterActionLinks(array $links)
-    {
-        $links['documentation'] = glsr(Builder::class)->a(__('Help', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=documentation'),
-        ]);
-        $links['settings'] = glsr(Builder::class)->a(__('Settings', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=settings'),
-        ]);
-        return $links;
-    }
-
-    /**
-     * @param array $capabilities
-     * @param string $capability
-     * @return array
-     * @filter map_meta_cap
-     */
-    public function filterCreateCapability($capabilities, $capability)
-    {
-        if ($capability == 'create_'.Application::POST_TYPE) {
-            $capabilities[] = 'do_not_allow';
-        }
-        return $capabilities;
-    }
-
-    /**
-     * @param array $items
-     * @return array
-     * @filter dashboard_glance_items
-     */
-    public function filterDashboardGlanceItems($items)
-    {
-        $postCount = wp_count_posts(Application::POST_TYPE);
-        if (empty($postCount->publish)) {
-            return $items;
-        }
-        $text = _n('%s Review', '%s Reviews', $postCount->publish, 'site-reviews');
-        $text = sprintf($text, number_format_i18n($postCount->publish));
-        $items = Arr::consolidateArray($items);
-        $items[] = current_user_can(get_post_type_object(Application::POST_TYPE)->cap->edit_posts)
-            ? glsr(Builder::class)->a($text, [
-                'class' => 'glsr-review-count',
-                'href' => 'edit.php?post_type='.Application::POST_TYPE,
-            ])
-            : glsr(Builder::class)->span($text, [
-                'class' => 'glsr-review-count',
-            ]);
-        return $items;
-    }
-
-    /**
-     * @param array $plugins
-     * @return array
-     * @filter mce_external_plugins
-     */
-    public function filterTinymcePlugins($plugins)
-    {
-        if (current_user_can('edit_posts') || current_user_can('edit_pages')) {
-            $plugins = Arr::consolidateArray($plugins);
-            $plugins['glsr_shortcode'] = glsr()->url('assets/scripts/mce-plugin.js');
-        }
-        return $plugins;
-    }
-
-    /**
-     * @return void
-     * @action admin_init
-     */
-    public function registerTinymcePopups()
-    {
-        $command = new RegisterTinymcePopups([
-            'site_reviews' => esc_html__('Recent Reviews', 'site-reviews'),
-            'site_reviews_form' => esc_html__('Submit a Review', 'site-reviews'),
-            'site_reviews_summary' => esc_html__('Summary of Reviews', 'site-reviews'),
-        ]);
-        $this->execute($command);
-    }
-
-    /**
-     * @param string $editorId
-     * @return void|null
-     * @action media_buttons
-     */
-    public function renderTinymceButton($editorId)
-    {
-        $allowedEditors = apply_filters('site-reviews/tinymce/editor-ids', ['content'], $editorId);
-        if ('post' != glsr_current_screen()->base || !in_array($editorId, $allowedEditors)) {
-            return;
-        }
-        $shortcodes = [];
-        foreach (glsr()->mceShortcodes as $shortcode => $values) {
-            $shortcodes[$shortcode] = $values;
-        }
-        if (empty($shortcodes)) {
-            return;
-        }
-        glsr()->render('partials/editor/tinymce', [
-            'shortcodes' => $shortcodes,
-        ]);
-    }
-
-    /**
-     * @return void
-     */
-    public function routerClearConsole()
-    {
-        glsr(Console::class)->clear();
-        glsr(Notice::class)->addSuccess(__('Console cleared.', 'site-reviews'));
-    }
-
-    /**
-     * @return void
-     */
-    public function routerFetchConsole()
-    {
-        glsr(Notice::class)->addSuccess(__('Console reloaded.', 'site-reviews'));
-    }
-
-    /**
-     * @param bool $showNotice
-     * @return void
-     */
-    public function routerCountReviews($showNotice = true)
-    {
-        glsr(CountsManager::class)->updateAll();
-        glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
-        if ($showNotice) {
-            glsr(Notice::class)->clear()->addSuccess(__('Recalculated rating counts.', 'site-reviews'));
-        }
-    }
-
-    /**
-     * @return void
-     */
-    public function routerMigrateReviews()
-    {
-        glsr(Upgrade_4_0_2::class)->protectMetaKeys();
-        glsr(Notice::class)->clear()->addSuccess(__('All reviews have been migrated.', 'site-reviews'));
-    }
-
-    /**
-     * @return void
-     */
-    public function routerDownloadConsole()
-    {
-        $this->download(Application::ID.'-console.txt', glsr(Console::class)->get());
-    }
-
-    /**
-     * @return void
-     */
-    public function routerDownloadSystemInfo()
-    {
-        $this->download(Application::ID.'-system-info.txt', glsr(System::class)->get());
-    }
-
-    /**
-     * @return void
-     */
-    public function routerExportSettings()
-    {
-        $this->download(Application::ID.'-settings.json', glsr(OptionManager::class)->json());
-    }
-
-    /**
-     * @return void
-     */
-    public function routerImportSettings()
-    {
-        $file = $_FILES['import-file'];
-        if (UPLOAD_ERR_OK !== $file['error']) {
-            return glsr(Notice::class)->addError($this->getUploadError($file['error']));
-        }
-        if ('application/json' !== $file['type'] || !Str::endsWith('.json', $file['name'])) {
-            return glsr(Notice::class)->addError(__('Please use a valid Site Reviews settings file.', 'site-reviews'));
-        }
-        $settings = json_decode(file_get_contents($file['tmp_name']), true);
-        if (empty($settings)) {
-            return glsr(Notice::class)->addWarning(__('There were no settings found to import.', 'site-reviews'));
-        }
-        glsr(OptionManager::class)->set(glsr(OptionManager::class)->normalize($settings));
-        glsr(Notice::class)->addSuccess(__('Settings imported.', 'site-reviews'));
-    }
-
-    /**
-     * @param int $errorCode
-     * @return string
-     */
-    protected function getUploadError($errorCode)
-    {
-        $errors = [
-            UPLOAD_ERR_INI_SIZE => __('The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews'),
-            UPLOAD_ERR_FORM_SIZE => __('The uploaded file is too big.', 'site-reviews'),
-            UPLOAD_ERR_PARTIAL => __('The uploaded file was only partially uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_FILE => __('No file was uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_TMP_DIR => __('Missing a temporary folder.', 'site-reviews'),
-            UPLOAD_ERR_CANT_WRITE => __('Failed to write file to disk.', 'site-reviews'),
-            UPLOAD_ERR_EXTENSION => __('A PHP extension stopped the file upload.', 'site-reviews'),
-        ];
-        return Arr::get($errors, $errorCode, __('Unknown upload error.', 'site-reviews'));
-    }
+	/**
+	 * @return void
+	 * @action admin_enqueue_scripts
+	 */
+	public function enqueueAssets()
+	{
+		$command = new EnqueueAdminAssets([
+			'pointers' => [[
+				'content' => __('You can pin exceptional reviews so that they are always shown first.', 'site-reviews'),
+				'id' => 'glsr-pointer-pinned',
+				'position' => [
+					'edge' => 'right',
+					'align' => 'middle',
+				],
+				'screen' => Application::POST_TYPE,
+				'target' => '#misc-pub-pinned',
+				'title' => __('Pin Your Reviews', 'site-reviews'),
+			]],
+		]);
+		$this->execute($command);
+	}
+
+	/**
+	 * @return array
+	 * @filter plugin_action_links_site-reviews/site-reviews.php
+	 */
+	public function filterActionLinks(array $links)
+	{
+		$links['documentation'] = glsr(Builder::class)->a(__('Help', 'site-reviews'), [
+			'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=documentation'),
+		]);
+		$links['settings'] = glsr(Builder::class)->a(__('Settings', 'site-reviews'), [
+			'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=settings'),
+		]);
+		return $links;
+	}
+
+	/**
+	 * @param array $capabilities
+	 * @param string $capability
+	 * @return array
+	 * @filter map_meta_cap
+	 */
+	public function filterCreateCapability($capabilities, $capability)
+	{
+		if ($capability == 'create_'.Application::POST_TYPE) {
+			$capabilities[] = 'do_not_allow';
+		}
+		return $capabilities;
+	}
+
+	/**
+	 * @param array $items
+	 * @return array
+	 * @filter dashboard_glance_items
+	 */
+	public function filterDashboardGlanceItems($items)
+	{
+		$postCount = wp_count_posts(Application::POST_TYPE);
+		if (empty($postCount->publish)) {
+			return $items;
+		}
+		$text = _n('%s Review', '%s Reviews', $postCount->publish, 'site-reviews');
+		$text = sprintf($text, number_format_i18n($postCount->publish));
+		$items = Arr::consolidateArray($items);
+		$items[] = current_user_can(get_post_type_object(Application::POST_TYPE)->cap->edit_posts)
+			? glsr(Builder::class)->a($text, [
+				'class' => 'glsr-review-count',
+				'href' => 'edit.php?post_type='.Application::POST_TYPE,
+			])
+			: glsr(Builder::class)->span($text, [
+				'class' => 'glsr-review-count',
+			]);
+		return $items;
+	}
+
+	/**
+	 * @param array $plugins
+	 * @return array
+	 * @filter mce_external_plugins
+	 */
+	public function filterTinymcePlugins($plugins)
+	{
+		if (current_user_can('edit_posts') || current_user_can('edit_pages')) {
+			$plugins = Arr::consolidateArray($plugins);
+			$plugins['glsr_shortcode'] = glsr()->url('assets/scripts/mce-plugin.js');
+		}
+		return $plugins;
+	}
+
+	/**
+	 * @return void
+	 * @action admin_init
+	 */
+	public function registerTinymcePopups()
+	{
+		$command = new RegisterTinymcePopups([
+			'site_reviews' => esc_html__('Recent Reviews', 'site-reviews'),
+			'site_reviews_form' => esc_html__('Submit a Review', 'site-reviews'),
+			'site_reviews_summary' => esc_html__('Summary of Reviews', 'site-reviews'),
+		]);
+		$this->execute($command);
+	}
+
+	/**
+	 * @param string $editorId
+	 * @return void|null
+	 * @action media_buttons
+	 */
+	public function renderTinymceButton($editorId)
+	{
+		$allowedEditors = apply_filters('site-reviews/tinymce/editor-ids', ['content'], $editorId);
+		if ('post' != glsr_current_screen()->base || !in_array($editorId, $allowedEditors)) {
+			return;
+		}
+		$shortcodes = [];
+		foreach (glsr()->mceShortcodes as $shortcode => $values) {
+			$shortcodes[$shortcode] = $values;
+		}
+		if (empty($shortcodes)) {
+			return;
+		}
+		glsr()->render('partials/editor/tinymce', [
+			'shortcodes' => $shortcodes,
+		]);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerClearConsole()
+	{
+		glsr(Console::class)->clear();
+		glsr(Notice::class)->addSuccess(__('Console cleared.', 'site-reviews'));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerFetchConsole()
+	{
+		glsr(Notice::class)->addSuccess(__('Console reloaded.', 'site-reviews'));
+	}
+
+	/**
+	 * @param bool $showNotice
+	 * @return void
+	 */
+	public function routerCountReviews($showNotice = true)
+	{
+		glsr(CountsManager::class)->updateAll();
+		glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
+		if ($showNotice) {
+			glsr(Notice::class)->clear()->addSuccess(__('Recalculated rating counts.', 'site-reviews'));
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerMigrateReviews()
+	{
+		glsr(Upgrade_4_0_2::class)->protectMetaKeys();
+		glsr(Notice::class)->clear()->addSuccess(__('All reviews have been migrated.', 'site-reviews'));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerDownloadConsole()
+	{
+		$this->download(Application::ID.'-console.txt', glsr(Console::class)->get());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerDownloadSystemInfo()
+	{
+		$this->download(Application::ID.'-system-info.txt', glsr(System::class)->get());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerExportSettings()
+	{
+		$this->download(Application::ID.'-settings.json', glsr(OptionManager::class)->json());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerImportSettings()
+	{
+		$file = $_FILES['import-file'];
+		if (UPLOAD_ERR_OK !== $file['error']) {
+			return glsr(Notice::class)->addError($this->getUploadError($file['error']));
+		}
+		if ('application/json' !== $file['type'] || !Str::endsWith('.json', $file['name'])) {
+			return glsr(Notice::class)->addError(__('Please use a valid Site Reviews settings file.', 'site-reviews'));
+		}
+		$settings = json_decode(file_get_contents($file['tmp_name']), true);
+		if (empty($settings)) {
+			return glsr(Notice::class)->addWarning(__('There were no settings found to import.', 'site-reviews'));
+		}
+		glsr(OptionManager::class)->set(glsr(OptionManager::class)->normalize($settings));
+		glsr(Notice::class)->addSuccess(__('Settings imported.', 'site-reviews'));
+	}
+
+	/**
+	 * @param int $errorCode
+	 * @return string
+	 */
+	protected function getUploadError($errorCode)
+	{
+		$errors = [
+			UPLOAD_ERR_INI_SIZE => __('The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews'),
+			UPLOAD_ERR_FORM_SIZE => __('The uploaded file is too big.', 'site-reviews'),
+			UPLOAD_ERR_PARTIAL => __('The uploaded file was only partially uploaded.', 'site-reviews'),
+			UPLOAD_ERR_NO_FILE => __('No file was uploaded.', 'site-reviews'),
+			UPLOAD_ERR_NO_TMP_DIR => __('Missing a temporary folder.', 'site-reviews'),
+			UPLOAD_ERR_CANT_WRITE => __('Failed to write file to disk.', 'site-reviews'),
+			UPLOAD_ERR_EXTENSION => __('A PHP extension stopped the file upload.', 'site-reviews'),
+		];
+		return Arr::get($errors, $errorCode, __('Unknown upload error.', 'site-reviews'));
+	}
 }

Spacing +73 added lines, -73 removed lines

@@ -23,9 +23,9 @@ 
      */
     public function enqueueAssets()
     {
-        $command = new EnqueueAdminAssets([
+        $command = new EnqueueAdminAssets( [
             'pointers' => [[
-                'content' => __('You can pin exceptional reviews so that they are always shown first.', 'site-reviews'),
+                'content' => __( 'You can pin exceptional reviews so that they are always shown first.', 'site-reviews' ),
                 'id' => 'glsr-pointer-pinned',
                 'position' => [
                     'edge' => 'right',
@@ -33,24 +33,24 @@ 
                 ],
                 'screen' => Application::POST_TYPE,
                 'target' => '#misc-pub-pinned',
-                'title' => __('Pin Your Reviews', 'site-reviews'),
+                'title' => __( 'Pin Your Reviews', 'site-reviews' ),
             ]],
-        ]);
-        $this->execute($command);
+        ] );
+        $this->execute( $command );
     }
 
     /**
      * @return array
      * @filter plugin_action_links_site-reviews/site-reviews.php
      */
-    public function filterActionLinks(array $links)
+    public function filterActionLinks( array $links )
     {
-        $links['documentation'] = glsr(Builder::class)->a(__('Help', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=documentation'),
-        ]);
-        $links['settings'] = glsr(Builder::class)->a(__('Settings', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=settings'),
-        ]);
+        $links['documentation'] = glsr( Builder::class )->a( __( 'Help', 'site-reviews' ), [
+            'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=documentation' ),
+        ] );
+        $links['settings'] = glsr( Builder::class )->a( __( 'Settings', 'site-reviews' ), [
+            'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=settings' ),
+        ] );
         return $links;
     }
 
@@ -60,9 +60,9 @@ 
      * @return array
      * @filter map_meta_cap
      */
-    public function filterCreateCapability($capabilities, $capability)
+    public function filterCreateCapability( $capabilities, $capability )
     {
-        if ($capability == 'create_'.Application::POST_TYPE) {
+        if( $capability == 'create_'.Application::POST_TYPE ) {
             $capabilities[] = 'do_not_allow';
         }
         return $capabilities;
@@ -73,23 +73,23 @@ 
      * @return array
      * @filter dashboard_glance_items
      */
-    public function filterDashboardGlanceItems($items)
+    public function filterDashboardGlanceItems( $items )
     {
-        $postCount = wp_count_posts(Application::POST_TYPE);
-        if (empty($postCount->publish)) {
+        $postCount = wp_count_posts( Application::POST_TYPE );
+        if( empty($postCount->publish) ) {
             return $items;
         }
-        $text = _n('%s Review', '%s Reviews', $postCount->publish, 'site-reviews');
-        $text = sprintf($text, number_format_i18n($postCount->publish));
-        $items = Arr::consolidateArray($items);
-        $items[] = current_user_can(get_post_type_object(Application::POST_TYPE)->cap->edit_posts)
-            ? glsr(Builder::class)->a($text, [
+        $text = _n( '%s Review', '%s Reviews', $postCount->publish, 'site-reviews' );
+        $text = sprintf( $text, number_format_i18n( $postCount->publish ) );
+        $items = Arr::consolidateArray( $items );
+        $items[] = current_user_can( get_post_type_object( Application::POST_TYPE )->cap->edit_posts )
+            ? glsr( Builder::class )->a( $text, [
                 'class' => 'glsr-review-count',
                 'href' => 'edit.php?post_type='.Application::POST_TYPE,
-            ])
-            : glsr(Builder::class)->span($text, [
+            ] )
+            : glsr( Builder::class )->span( $text, [
                 'class' => 'glsr-review-count',
-            ]);
+            ] );
         return $items;
     }
 
@@ -98,11 +98,11 @@ 
      * @return array
      * @filter mce_external_plugins
      */
-    public function filterTinymcePlugins($plugins)
+    public function filterTinymcePlugins( $plugins )
     {
-        if (current_user_can('edit_posts') || current_user_can('edit_pages')) {
-            $plugins = Arr::consolidateArray($plugins);
-            $plugins['glsr_shortcode'] = glsr()->url('assets/scripts/mce-plugin.js');
+        if( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) {
+            $plugins = Arr::consolidateArray( $plugins );
+            $plugins['glsr_shortcode'] = glsr()->url( 'assets/scripts/mce-plugin.js' );
         }
         return $plugins;
     }
@@ -113,12 +113,12 @@ 
      */
     public function registerTinymcePopups()
     {
-        $command = new RegisterTinymcePopups([
-            'site_reviews' => esc_html__('Recent Reviews', 'site-reviews'),
-            'site_reviews_form' => esc_html__('Submit a Review', 'site-reviews'),
-            'site_reviews_summary' => esc_html__('Summary of Reviews', 'site-reviews'),
-        ]);
-        $this->execute($command);
+        $command = new RegisterTinymcePopups( [
+            'site_reviews' => esc_html__( 'Recent Reviews', 'site-reviews' ),
+            'site_reviews_form' => esc_html__( 'Submit a Review', 'site-reviews' ),
+            'site_reviews_summary' => esc_html__( 'Summary of Reviews', 'site-reviews' ),
+        ] );
+        $this->execute( $command );
     }
 
     /**
@@ -126,22 +126,22 @@ 
      * @return void|null
      * @action media_buttons
      */
-    public function renderTinymceButton($editorId)
+    public function renderTinymceButton( $editorId )
     {
-        $allowedEditors = apply_filters('site-reviews/tinymce/editor-ids', ['content'], $editorId);
-        if ('post' != glsr_current_screen()->base || !in_array($editorId, $allowedEditors)) {
+        $allowedEditors = apply_filters( 'site-reviews/tinymce/editor-ids', ['content'], $editorId );
+        if( 'post' != glsr_current_screen()->base || !in_array( $editorId, $allowedEditors ) ) {
             return;
         }
         $shortcodes = [];
-        foreach (glsr()->mceShortcodes as $shortcode => $values) {
+        foreach( glsr()->mceShortcodes as $shortcode => $values ) {
             $shortcodes[$shortcode] = $values;
         }
-        if (empty($shortcodes)) {
+        if( empty($shortcodes) ) {
             return;
         }
-        glsr()->render('partials/editor/tinymce', [
+        glsr()->render( 'partials/editor/tinymce', [
             'shortcodes' => $shortcodes,
-        ]);
+        ] );
     }
 
     /**
@@ -149,8 +149,8 @@ 
      */
     public function routerClearConsole()
     {
-        glsr(Console::class)->clear();
-        glsr(Notice::class)->addSuccess(__('Console cleared.', 'site-reviews'));
+        glsr( Console::class )->clear();
+        glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ) );
     }
 
     /**
@@ -158,19 +158,19 @@ 
      */
     public function routerFetchConsole()
     {
-        glsr(Notice::class)->addSuccess(__('Console reloaded.', 'site-reviews'));
+        glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ) );
     }
 
     /**
      * @param bool $showNotice
      * @return void
      */
-    public function routerCountReviews($showNotice = true)
+    public function routerCountReviews( $showNotice = true )
     {
-        glsr(CountsManager::class)->updateAll();
-        glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
-        if ($showNotice) {
-            glsr(Notice::class)->clear()->addSuccess(__('Recalculated rating counts.', 'site-reviews'));
+        glsr( CountsManager::class )->updateAll();
+        glsr( OptionManager::class )->set( 'last_review_count', current_time( 'timestamp' ) );
+        if( $showNotice ) {
+            glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ) );
         }
     }
 
@@ -179,8 +179,8 @@ 
      */
     public function routerMigrateReviews()
     {
-        glsr(Upgrade_4_0_2::class)->protectMetaKeys();
-        glsr(Notice::class)->clear()->addSuccess(__('All reviews have been migrated.', 'site-reviews'));
+        glsr( Upgrade_4_0_2::class )->protectMetaKeys();
+        glsr( Notice::class )->clear()->addSuccess( __( 'All reviews have been migrated.', 'site-reviews' ) );
     }
 
     /**
@@ -188,7 +188,7 @@ 
      */
     public function routerDownloadConsole()
     {
-        $this->download(Application::ID.'-console.txt', glsr(Console::class)->get());
+        $this->download( Application::ID.'-console.txt', glsr( Console::class )->get() );
     }
 
     /**
@@ -196,7 +196,7 @@ 
      */
     public function routerDownloadSystemInfo()
     {
-        $this->download(Application::ID.'-system-info.txt', glsr(System::class)->get());
+        $this->download( Application::ID.'-system-info.txt', glsr( System::class )->get() );
     }
 
     /**
@@ -204,7 +204,7 @@ 
      */
     public function routerExportSettings()
     {
-        $this->download(Application::ID.'-settings.json', glsr(OptionManager::class)->json());
+        $this->download( Application::ID.'-settings.json', glsr( OptionManager::class )->json() );
     }
 
     /**
@@ -213,35 +213,35 @@ 
     public function routerImportSettings()
     {
         $file = $_FILES['import-file'];
-        if (UPLOAD_ERR_OK !== $file['error']) {
-            return glsr(Notice::class)->addError($this->getUploadError($file['error']));
+        if( UPLOAD_ERR_OK !== $file['error'] ) {
+            return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ) );
         }
-        if ('application/json' !== $file['type'] || !Str::endsWith('.json', $file['name'])) {
-            return glsr(Notice::class)->addError(__('Please use a valid Site Reviews settings file.', 'site-reviews'));
+        if( 'application/json' !== $file['type'] || !Str::endsWith( '.json', $file['name'] ) ) {
+            return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ) );
         }
-        $settings = json_decode(file_get_contents($file['tmp_name']), true);
-        if (empty($settings)) {
-            return glsr(Notice::class)->addWarning(__('There were no settings found to import.', 'site-reviews'));
+        $settings = json_decode( file_get_contents( $file['tmp_name'] ), true );
+        if( empty($settings) ) {
+            return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ) );
         }
-        glsr(OptionManager::class)->set(glsr(OptionManager::class)->normalize($settings));
-        glsr(Notice::class)->addSuccess(__('Settings imported.', 'site-reviews'));
+        glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ) );
+        glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ) );
     }
 
     /**
      * @param int $errorCode
      * @return string
      */
-    protected function getUploadError($errorCode)
+    protected function getUploadError( $errorCode )
     {
         $errors = [
-            UPLOAD_ERR_INI_SIZE => __('The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews'),
-            UPLOAD_ERR_FORM_SIZE => __('The uploaded file is too big.', 'site-reviews'),
-            UPLOAD_ERR_PARTIAL => __('The uploaded file was only partially uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_FILE => __('No file was uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_TMP_DIR => __('Missing a temporary folder.', 'site-reviews'),
-            UPLOAD_ERR_CANT_WRITE => __('Failed to write file to disk.', 'site-reviews'),
-            UPLOAD_ERR_EXTENSION => __('A PHP extension stopped the file upload.', 'site-reviews'),
+            UPLOAD_ERR_INI_SIZE => __( 'The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews' ),
+            UPLOAD_ERR_FORM_SIZE => __( 'The uploaded file is too big.', 'site-reviews' ),
+            UPLOAD_ERR_PARTIAL => __( 'The uploaded file was only partially uploaded.', 'site-reviews' ),
+            UPLOAD_ERR_NO_FILE => __( 'No file was uploaded.', 'site-reviews' ),
+            UPLOAD_ERR_NO_TMP_DIR => __( 'Missing a temporary folder.', 'site-reviews' ),
+            UPLOAD_ERR_CANT_WRITE => __( 'Failed to write file to disk.', 'site-reviews' ),
+            UPLOAD_ERR_EXTENSION => __( 'A PHP extension stopped the file upload.', 'site-reviews' ),
         ];
-        return Arr::get($errors, $errorCode, __('Unknown upload error.', 'site-reviews'));
+        return Arr::get( $errors, $errorCode, __( 'Unknown upload error.', 'site-reviews' ) );
     }
 }

plugin/Controllers/AjaxController.php

Indentation +165 added lines, -165 removed lines

@@ -14,180 +14,180 @@
 
 class AjaxController extends Controller
 {
-    /**
-     * @return void
-     */
-    public function routerChangeStatus(array $request)
-    {
-        wp_send_json_success($this->execute(new ChangeStatus($request)));
-    }
+	/**
+	 * @return void
+	 */
+	public function routerChangeStatus(array $request)
+	{
+		wp_send_json_success($this->execute(new ChangeStatus($request)));
+	}
 
-    /**
-     * @return void
-     */
-    public function routerClearConsole()
-    {
-        glsr(AdminController::class)->routerClearConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerClearConsole()
+	{
+		glsr(AdminController::class)->routerClearConsole();
+		wp_send_json_success([
+			'console' => glsr(Console::class)->get(),
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerCountReviews()
-    {
-        glsr(AdminController::class)->routerCountReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerCountReviews()
+	{
+		glsr(AdminController::class)->routerCountReviews();
+		wp_send_json_success([
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerMigrateReviews()
-    {
-        glsr(AdminController::class)->routerMigrateReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerMigrateReviews()
+	{
+		glsr(AdminController::class)->routerMigrateReviews();
+		wp_send_json_success([
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerDismissNotice(array $request)
-    {
-        glsr(NoticeController::class)->routerDismissNotice($request);
-        wp_send_json_success();
-    }
+	/**
+	 * @return void
+	 */
+	public function routerDismissNotice(array $request)
+	{
+		glsr(NoticeController::class)->routerDismissNotice($request);
+		wp_send_json_success();
+	}
 
-    /**
-     * @return void
-     */
-    public function routerMceShortcode(array $request)
-    {
-        $shortcode = $request['shortcode'];
-        $response = false;
-        if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
-            $data = glsr()->mceShortcodes[$shortcode];
-            if (!empty($data['errors'])) {
-                $data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
-            }
-            $response = [
-                'body' => $data['fields'],
-                'close' => $data['btn_close'],
-                'ok' => $data['btn_okay'],
-                'shortcode' => $shortcode,
-                'title' => $data['title'],
-            ];
-        }
-        wp_send_json_success($response);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerMceShortcode(array $request)
+	{
+		$shortcode = $request['shortcode'];
+		$response = false;
+		if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
+			$data = glsr()->mceShortcodes[$shortcode];
+			if (!empty($data['errors'])) {
+				$data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
+			}
+			$response = [
+				'body' => $data['fields'],
+				'close' => $data['btn_close'],
+				'ok' => $data['btn_okay'],
+				'shortcode' => $shortcode,
+				'title' => $data['title'],
+			];
+		}
+		wp_send_json_success($response);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerFetchConsole()
-    {
-        glsr(AdminController::class)->routerFetchConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerFetchConsole()
+	{
+		glsr(AdminController::class)->routerFetchConsole();
+		wp_send_json_success([
+			'console' => glsr(Console::class)->get(),
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerSearchPosts(array $request)
-    {
-        $results = glsr(Database::class)->searchPosts($request['search']);
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
-            'items' => $results,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerSearchPosts(array $request)
+	{
+		$results = glsr(Database::class)->searchPosts($request['search']);
+		wp_send_json_success([
+			'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+			'items' => $results,
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerSearchTranslations(array $request)
-    {
-        if (empty($request['exclude'])) {
-            $request['exclude'] = [];
-        }
-        $results = glsr(Translation::class)
-            ->search($request['search'])
-            ->exclude()
-            ->exclude($request['exclude'])
-            ->renderResults();
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
-            'items' => $results,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerSearchTranslations(array $request)
+	{
+		if (empty($request['exclude'])) {
+			$request['exclude'] = [];
+		}
+		$results = glsr(Translation::class)
+			->search($request['search'])
+			->exclude()
+			->exclude($request['exclude'])
+			->renderResults();
+		wp_send_json_success([
+			'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+			'items' => $results,
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerSubmitReview(array $request)
-    {
-        $command = glsr(PublicController::class)->routerSubmitReview($request);
-        $redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
-        $data = [
-            'errors' => glsr()->sessionGet($command->form_id.'errors', false),
-            'message' => glsr()->sessionGet($command->form_id.'message', ''),
-            'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
-            'redirect' => $redirect,
-        ];
-        if (false === $data['errors']) {
-            glsr()->sessionClear();
-            wp_send_json_success($data);
-        }
-        wp_send_json_error($data);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerSubmitReview(array $request)
+	{
+		$command = glsr(PublicController::class)->routerSubmitReview($request);
+		$redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
+		$redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
+		$data = [
+			'errors' => glsr()->sessionGet($command->form_id.'errors', false),
+			'message' => glsr()->sessionGet($command->form_id.'message', ''),
+			'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
+			'redirect' => $redirect,
+		];
+		if (false === $data['errors']) {
+			glsr()->sessionClear();
+			wp_send_json_success($data);
+		}
+		wp_send_json_error($data);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerFetchPagedReviews(array $request)
-    {
-        $homePath = untrailingslashit(parse_url(home_url(), PHP_URL_PATH));
-        $urlPath = untrailingslashit(parse_url(Arr::get($request, 'url'), PHP_URL_PATH));
-        $urlQuery = [];
-        parse_str(parse_url(Arr::get($request, 'url'), PHP_URL_QUERY), $urlQuery);
-        $pagedUrl = $homePath === $urlPath
-            ? home_url()
-            : home_url($urlPath);
-        $args = [
-            'paged' => (int) Arr::get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
-            'pagedUrl' => trailingslashit($pagedUrl),
-            'pagination' => 'ajax',
-            'schema' => false,
-        ];
-        $atts = (array) json_decode(Arr::get($request, 'atts'));
-        $atts = glsr(SiteReviewsShortcode::class)->normalizeAtts($atts);
-        $html = glsr(SiteReviewsPartial::class)->build(wp_parse_args($args, $atts));
-        return wp_send_json_success([
-            'pagination' => $html->getPagination(),
-            'reviews' => $html->getReviews(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerFetchPagedReviews(array $request)
+	{
+		$homePath = untrailingslashit(parse_url(home_url(), PHP_URL_PATH));
+		$urlPath = untrailingslashit(parse_url(Arr::get($request, 'url'), PHP_URL_PATH));
+		$urlQuery = [];
+		parse_str(parse_url(Arr::get($request, 'url'), PHP_URL_QUERY), $urlQuery);
+		$pagedUrl = $homePath === $urlPath
+			? home_url()
+			: home_url($urlPath);
+		$args = [
+			'paged' => (int) Arr::get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
+			'pagedUrl' => trailingslashit($pagedUrl),
+			'pagination' => 'ajax',
+			'schema' => false,
+		];
+		$atts = (array) json_decode(Arr::get($request, 'atts'));
+		$atts = glsr(SiteReviewsShortcode::class)->normalizeAtts($atts);
+		$html = glsr(SiteReviewsPartial::class)->build(wp_parse_args($args, $atts));
+		return wp_send_json_success([
+			'pagination' => $html->getPagination(),
+			'reviews' => $html->getReviews(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerTogglePinned(array $request)
-    {
-        $isPinned = $this->execute(new TogglePinned($request));
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-            'pinned' => $isPinned,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerTogglePinned(array $request)
+	{
+		$isPinned = $this->execute(new TogglePinned($request));
+		wp_send_json_success([
+			'notices' => glsr(Notice::class)->get(),
+			'pinned' => $isPinned,
+		]);
+	}
 }

Spacing +67 added lines, -67 removed lines

@@ -17,9 +17,9 @@ 
     /**
      * @return void
      */
-    public function routerChangeStatus(array $request)
+    public function routerChangeStatus( array $request )
     {
-        wp_send_json_success($this->execute(new ChangeStatus($request)));
+        wp_send_json_success( $this->execute( new ChangeStatus( $request ) ) );
     }
 
     /**
@@ -27,11 +27,11 @@ 
      */
     public function routerClearConsole()
     {
-        glsr(AdminController::class)->routerClearConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerClearConsole();
+        wp_send_json_success( [
+            'console' => glsr( Console::class )->get(),
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
@@ -39,10 +39,10 @@ 
      */
     public function routerCountReviews()
     {
-        glsr(AdminController::class)->routerCountReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerCountReviews();
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
@@ -50,32 +50,32 @@ 
      */
     public function routerMigrateReviews()
     {
-        glsr(AdminController::class)->routerMigrateReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerMigrateReviews();
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerDismissNotice(array $request)
+    public function routerDismissNotice( array $request )
     {
-        glsr(NoticeController::class)->routerDismissNotice($request);
+        glsr( NoticeController::class )->routerDismissNotice( $request );
         wp_send_json_success();
     }
 
     /**
      * @return void
      */
-    public function routerMceShortcode(array $request)
+    public function routerMceShortcode( array $request )
     {
         $shortcode = $request['shortcode'];
         $response = false;
-        if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
+        if( array_key_exists( $shortcode, glsr()->mceShortcodes ) ) {
             $data = glsr()->mceShortcodes[$shortcode];
-            if (!empty($data['errors'])) {
-                $data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
+            if( !empty($data['errors']) ) {
+                $data['btn_okay'] = [esc_html__( 'Okay', 'site-reviews' )];
             }
             $response = [
                 'body' => $data['fields'],
@@ -85,7 +85,7 @@ 
                 'title' => $data['title'],
             ];
         }
-        wp_send_json_success($response);
+        wp_send_json_success( $response );
     }
 
     /**
@@ -93,101 +93,101 @@ 
      */
     public function routerFetchConsole()
     {
-        glsr(AdminController::class)->routerFetchConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerFetchConsole();
+        wp_send_json_success( [
+            'console' => glsr( Console::class )->get(),
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSearchPosts(array $request)
+    public function routerSearchPosts( array $request )
     {
-        $results = glsr(Database::class)->searchPosts($request['search']);
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+        $results = glsr( Database::class )->searchPosts( $request['search'] );
+        wp_send_json_success( [
+            'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
             'items' => $results,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSearchTranslations(array $request)
+    public function routerSearchTranslations( array $request )
     {
-        if (empty($request['exclude'])) {
+        if( empty($request['exclude']) ) {
             $request['exclude'] = [];
         }
-        $results = glsr(Translation::class)
-            ->search($request['search'])
+        $results = glsr( Translation::class )
+            ->search( $request['search'] )
             ->exclude()
-            ->exclude($request['exclude'])
+            ->exclude( $request['exclude'] )
             ->renderResults();
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+        wp_send_json_success( [
+            'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
             'items' => $results,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSubmitReview(array $request)
+    public function routerSubmitReview( array $request )
     {
-        $command = glsr(PublicController::class)->routerSubmitReview($request);
-        $redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
+        $command = glsr( PublicController::class )->routerSubmitReview( $request );
+        $redirect = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ) ) );
+        $redirect = apply_filters( 'site-reviews/review/redirect', $redirect, $command );
         $data = [
-            'errors' => glsr()->sessionGet($command->form_id.'errors', false),
-            'message' => glsr()->sessionGet($command->form_id.'message', ''),
-            'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
+            'errors' => glsr()->sessionGet( $command->form_id.'errors', false ),
+            'message' => glsr()->sessionGet( $command->form_id.'message', '' ),
+            'recaptcha' => glsr()->sessionGet( $command->form_id.'recaptcha', false ),
             'redirect' => $redirect,
         ];
-        if (false === $data['errors']) {
+        if( false === $data['errors'] ) {
             glsr()->sessionClear();
-            wp_send_json_success($data);
+            wp_send_json_success( $data );
         }
-        wp_send_json_error($data);
+        wp_send_json_error( $data );
     }
 
     /**
      * @return void
      */
-    public function routerFetchPagedReviews(array $request)
+    public function routerFetchPagedReviews( array $request )
     {
-        $homePath = untrailingslashit(parse_url(home_url(), PHP_URL_PATH));
-        $urlPath = untrailingslashit(parse_url(Arr::get($request, 'url'), PHP_URL_PATH));
+        $homePath = untrailingslashit( parse_url( home_url(), PHP_URL_PATH ) );
+        $urlPath = untrailingslashit( parse_url( Arr::get( $request, 'url' ), PHP_URL_PATH ) );
         $urlQuery = [];
-        parse_str(parse_url(Arr::get($request, 'url'), PHP_URL_QUERY), $urlQuery);
+        parse_str( parse_url( Arr::get( $request, 'url' ), PHP_URL_QUERY ), $urlQuery );
         $pagedUrl = $homePath === $urlPath
             ? home_url()
-            : home_url($urlPath);
+            : home_url( $urlPath );
         $args = [
-            'paged' => (int) Arr::get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
-            'pagedUrl' => trailingslashit($pagedUrl),
+            'paged' => (int)Arr::get( $urlQuery, glsr()->constant( 'PAGED_QUERY_VAR' ), 1 ),
+            'pagedUrl' => trailingslashit( $pagedUrl ),
             'pagination' => 'ajax',
             'schema' => false,
         ];
-        $atts = (array) json_decode(Arr::get($request, 'atts'));
-        $atts = glsr(SiteReviewsShortcode::class)->normalizeAtts($atts);
-        $html = glsr(SiteReviewsPartial::class)->build(wp_parse_args($args, $atts));
-        return wp_send_json_success([
+        $atts = (array)json_decode( Arr::get( $request, 'atts' ) );
+        $atts = glsr( SiteReviewsShortcode::class )->normalizeAtts( $atts );
+        $html = glsr( SiteReviewsPartial::class )->build( wp_parse_args( $args, $atts ) );
+        return wp_send_json_success( [
             'pagination' => $html->getPagination(),
             'reviews' => $html->getReviews(),
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerTogglePinned(array $request)
+    public function routerTogglePinned( array $request )
     {
-        $isPinned = $this->execute(new TogglePinned($request));
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
+        $isPinned = $this->execute( new TogglePinned( $request ) );
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
             'pinned' => $isPinned,
-        ]);
+        ] );
     }
 }