pryley / site-reviews

plugin/Modules/Upgrader/Upgrade_3_0_0.php

Spacing +19 added lines, -19 removed lines

@@ -71,11 +71,11 @@ 
     {
         $this->newSettings = $this->getNewSettings();
         $this->oldSettings = $this->getOldSettings();
-        if (empty($this->oldSettings)) {
+        if( empty($this->oldSettings) ) {
             return;
         }
-        foreach (static::MAPPED_SETTINGS as $old => $new) {
-            if (empty($this->oldSettings[$old])) {
+        foreach( static::MAPPED_SETTINGS as $old => $new ) {
+            if( empty($this->oldSettings[$old]) ) {
                 continue;
             }
             $this->newSettings[$new] = $this->oldSettings[$old];
@@ -83,12 +83,12 @@ 
         $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'])) {
+        $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);
+        glsr( OptionManager::class )->set( $newSettings );
     }
 
     /**
@@ -97,8 +97,8 @@ 
     protected function getNewSettings()
     {
         return wp_parse_args(
-            Arr::flattenArray(glsr(OptionManager::class)->all()),
-            glsr(DefaultsManager::class)->defaults()
+            Arr::flattenArray( glsr( OptionManager::class )->all() ),
+            glsr( DefaultsManager::class )->defaults()
         );
     }
 
@@ -107,10 +107,10 @@ 
      */
     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);
+        $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;
     }
@@ -126,8 +126,8 @@ 
             'webhook' => 'slack',
         ];
         $this->newSettings['settings.general.notifications'] = [];
-        foreach ($notifications as $old => $new) {
-            if ($this->oldSettings['settings.general.notification'] != $old) {
+        foreach( $notifications as $old => $new ) {
+            if( $this->oldSettings['settings.general.notification'] != $old ) {
                 continue;
             }
             $this->newSettings['settings.general.notifications'][] = $new;
@@ -144,11 +144,11 @@ 
             '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'])) {
+        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);
+        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'];
@@ -160,7 +160,7 @@ 
      */
     protected function migrateRequiredSettings()
     {
-        $this->newSettings['settings.submissions.required'] = array_filter((array) $this->oldSettings['settings.reviews-form.required']);
+        $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';
     }

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/Style.php

Indentation +128 added lines, -128 removed lines

@@ -12,144 +12,144 @@
 
 class Style
 {
-    /**
-     * @var array
-     */
-    public $fields;
+	/**
+	 * @var array
+	 */
+	public $fields;
 
-    /**
-     * @var string
-     */
-    public $style;
+	/**
+	 * @var string
+	 */
+	public $style;
 
-    /**
-     * @var array
-     */
-    public $pagination;
+	/**
+	 * @var array
+	 */
+	public $pagination;
 
-    /**
-     * @var array
-     */
-    public $validation;
+	/**
+	 * @var array
+	 */
+	public $validation;
 
-    public function __construct()
-    {
-        $this->style = glsr(OptionManager::class)->get('settings.general.style', 'default');
-        $this->setConfig();
-    }
+	public function __construct()
+	{
+		$this->style = glsr(OptionManager::class)->get('settings.general.style', 'default');
+		$this->setConfig();
+	}
 
-    /**
-     * @param string $view
-     * @return string
-     */
-    public function filterView($view)
-    {
-        $styledViews = [
-            'templates/form/field',
-            'templates/form/response',
-            'templates/form/submit-button',
-            'templates/reviews-form',
-        ];
-        if (!preg_match('('.implode('|', $styledViews).')', $view)) {
-            return $view;
-        }
-        $views = $this->generatePossibleViews($view);
-        foreach ($views as $possibleView) {
-            if (!file_exists(glsr()->file($possibleView))) {
-                continue;
-            }
-            return Str::removePrefix('views/', $possibleView);
-        }
-        return $view;
-    }
+	/**
+	 * @param string $view
+	 * @return string
+	 */
+	public function filterView($view)
+	{
+		$styledViews = [
+			'templates/form/field',
+			'templates/form/response',
+			'templates/form/submit-button',
+			'templates/reviews-form',
+		];
+		if (!preg_match('('.implode('|', $styledViews).')', $view)) {
+			return $view;
+		}
+		$views = $this->generatePossibleViews($view);
+		foreach ($views as $possibleView) {
+			if (!file_exists(glsr()->file($possibleView))) {
+				continue;
+			}
+			return Str::removePrefix('views/', $possibleView);
+		}
+		return $view;
+	}
 
-    /**
-     * @return string
-     */
-    public function get()
-    {
-        return apply_filters('site-reviews/style', $this->style);
-    }
+	/**
+	 * @return string
+	 */
+	public function get()
+	{
+		return apply_filters('site-reviews/style', $this->style);
+	}
 
-    /**
-     * @return array
-     */
-    public function setConfig()
-    {
-        $config = shortcode_atts(
-            array_fill_keys(['fields', 'pagination', 'validation'], []),
-            glsr()->config('styles/'.$this->style)
-        );
-        $this->fields = glsr(StyleFieldsDefaults::class)->restrict($config['fields']);
-        $this->pagination = glsr(PaginationDefaults::class)->restrict($config['pagination']);
-        $this->validation = glsr(StyleValidationDefaults::class)->restrict($config['validation']);
-    }
+	/**
+	 * @return array
+	 */
+	public function setConfig()
+	{
+		$config = shortcode_atts(
+			array_fill_keys(['fields', 'pagination', 'validation'], []),
+			glsr()->config('styles/'.$this->style)
+		);
+		$this->fields = glsr(StyleFieldsDefaults::class)->restrict($config['fields']);
+		$this->pagination = glsr(PaginationDefaults::class)->restrict($config['pagination']);
+		$this->validation = glsr(StyleValidationDefaults::class)->restrict($config['validation']);
+	}
 
-    /**
-     * @return void
-     */
-    public function modifyField(Builder $instance)
-    {
-        if (!$this->isPublicInstance($instance) || empty(array_filter($this->fields))) {
-            return;
-        }
-        call_user_func_array([$this, 'customize'], [$instance]);
-    }
+	/**
+	 * @return void
+	 */
+	public function modifyField(Builder $instance)
+	{
+		if (!$this->isPublicInstance($instance) || empty(array_filter($this->fields))) {
+			return;
+		}
+		call_user_func_array([$this, 'customize'], [$instance]);
+	}
 
-    /**
-     * @return array
-     */
-    public function paginationArgs(array $args)
-    {
-        return wp_parse_args($args, $this->pagination);
-    }
+	/**
+	 * @return array
+	 */
+	public function paginationArgs(array $args)
+	{
+		return wp_parse_args($args, $this->pagination);
+	}
 
-    /**
-     * @return void
-     */
-    protected function customize(Builder $instance)
-    {
-        if (!array_key_exists($instance->tag, $this->fields)) {
-            return;
-        }
-        $args = wp_parse_args($instance->args, array_fill_keys(['class', 'type'], ''));
-        $key = $instance->tag.'_'.$args['type'];
-        $classes = Arr::get($this->fields, $key, Arr::get($this->fields, $instance->tag));
-        $instance->args['class'] = trim($args['class'].' '.$classes);
-        do_action_ref_array('site-reviews/customize/'.$this->style, [$instance]);
-    }
+	/**
+	 * @return void
+	 */
+	protected function customize(Builder $instance)
+	{
+		if (!array_key_exists($instance->tag, $this->fields)) {
+			return;
+		}
+		$args = wp_parse_args($instance->args, array_fill_keys(['class', 'type'], ''));
+		$key = $instance->tag.'_'.$args['type'];
+		$classes = Arr::get($this->fields, $key, Arr::get($this->fields, $instance->tag));
+		$instance->args['class'] = trim($args['class'].' '.$classes);
+		do_action_ref_array('site-reviews/customize/'.$this->style, [$instance]);
+	}
 
-    /**
-     * @param string $view
-     * @return array
-     */
-    protected function generatePossibleViews($view)
-    {
-        $basename = basename($view);
-        $basepath = rtrim($view, $basename);
-        $customPath = 'views/partials/styles/'.$this->style.'/';
-        $parts = explode('_', $basename);
-        $views = [
-            $customPath.$basename,
-            $customPath.$parts[0],
-            $view,
-            $basepath.$parts[0],
-        ];
-        return array_filter($views);
-    }
+	/**
+	 * @param string $view
+	 * @return array
+	 */
+	protected function generatePossibleViews($view)
+	{
+		$basename = basename($view);
+		$basepath = rtrim($view, $basename);
+		$customPath = 'views/partials/styles/'.$this->style.'/';
+		$parts = explode('_', $basename);
+		$views = [
+			$customPath.$basename,
+			$customPath.$parts[0],
+			$view,
+			$basepath.$parts[0],
+		];
+		return array_filter($views);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isPublicInstance(Builder $instance)
-    {
-        $args = wp_parse_args($instance->args, [
-            'is_public' => false,
-            'is_raw' => false,
-        ]);
-        if (is_admin() || !$args['is_public'] || $args['is_raw']) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isPublicInstance(Builder $instance)
+	{
+		$args = wp_parse_args($instance->args, [
+			'is_public' => false,
+			'is_raw' => false,
+		]);
+		if (is_admin() || !$args['is_public'] || $args['is_raw']) {
+			return false;
+		}
+		return true;
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -34,7 +34,7 @@ 
 
     public function __construct()
     {
-        $this->style = glsr(OptionManager::class)->get('settings.general.style', 'default');
+        $this->style = glsr( OptionManager::class )->get( 'settings.general.style', 'default' );
         $this->setConfig();
     }
 
@@ -42,7 +42,7 @@ 
      * @param string $view
      * @return string
      */
-    public function filterView($view)
+    public function filterView( $view )
     {
         $styledViews = [
             'templates/form/field',
@@ -50,15 +50,15 @@ 
             'templates/form/submit-button',
             'templates/reviews-form',
         ];
-        if (!preg_match('('.implode('|', $styledViews).')', $view)) {
+        if( !preg_match( '('.implode( '|', $styledViews ).')', $view ) ) {
             return $view;
         }
-        $views = $this->generatePossibleViews($view);
-        foreach ($views as $possibleView) {
-            if (!file_exists(glsr()->file($possibleView))) {
+        $views = $this->generatePossibleViews( $view );
+        foreach( $views as $possibleView ) {
+            if( !file_exists( glsr()->file( $possibleView ) ) ) {
                 continue;
             }
-            return Str::removePrefix('views/', $possibleView);
+            return Str::removePrefix( 'views/', $possibleView );
         }
         return $view;
     }
@@ -68,7 +68,7 @@ 
      */
     public function get()
     {
-        return apply_filters('site-reviews/style', $this->style);
+        return apply_filters( 'site-reviews/style', $this->style );
     }
 
     /**
@@ -77,77 +77,77 @@ 
     public function setConfig()
     {
         $config = shortcode_atts(
-            array_fill_keys(['fields', 'pagination', 'validation'], []),
-            glsr()->config('styles/'.$this->style)
+            array_fill_keys( ['fields', 'pagination', 'validation'], [] ),
+            glsr()->config( 'styles/'.$this->style )
         );
-        $this->fields = glsr(StyleFieldsDefaults::class)->restrict($config['fields']);
-        $this->pagination = glsr(PaginationDefaults::class)->restrict($config['pagination']);
-        $this->validation = glsr(StyleValidationDefaults::class)->restrict($config['validation']);
+        $this->fields = glsr( StyleFieldsDefaults::class )->restrict( $config['fields'] );
+        $this->pagination = glsr( PaginationDefaults::class )->restrict( $config['pagination'] );
+        $this->validation = glsr( StyleValidationDefaults::class )->restrict( $config['validation'] );
     }
 
     /**
      * @return void
      */
-    public function modifyField(Builder $instance)
+    public function modifyField( Builder $instance )
     {
-        if (!$this->isPublicInstance($instance) || empty(array_filter($this->fields))) {
+        if( !$this->isPublicInstance( $instance ) || empty(array_filter( $this->fields )) ) {
             return;
         }
-        call_user_func_array([$this, 'customize'], [$instance]);
+        call_user_func_array( [$this, 'customize'], [$instance] );
     }
 
     /**
      * @return array
      */
-    public function paginationArgs(array $args)
+    public function paginationArgs( array $args )
     {
-        return wp_parse_args($args, $this->pagination);
+        return wp_parse_args( $args, $this->pagination );
     }
 
     /**
      * @return void
      */
-    protected function customize(Builder $instance)
+    protected function customize( Builder $instance )
     {
-        if (!array_key_exists($instance->tag, $this->fields)) {
+        if( !array_key_exists( $instance->tag, $this->fields ) ) {
             return;
         }
-        $args = wp_parse_args($instance->args, array_fill_keys(['class', 'type'], ''));
+        $args = wp_parse_args( $instance->args, array_fill_keys( ['class', 'type'], '' ) );
         $key = $instance->tag.'_'.$args['type'];
-        $classes = Arr::get($this->fields, $key, Arr::get($this->fields, $instance->tag));
-        $instance->args['class'] = trim($args['class'].' '.$classes);
-        do_action_ref_array('site-reviews/customize/'.$this->style, [$instance]);
+        $classes = Arr::get( $this->fields, $key, Arr::get( $this->fields, $instance->tag ) );
+        $instance->args['class'] = trim( $args['class'].' '.$classes );
+        do_action_ref_array( 'site-reviews/customize/'.$this->style, [$instance] );
     }
 
     /**
      * @param string $view
      * @return array
      */
-    protected function generatePossibleViews($view)
+    protected function generatePossibleViews( $view )
     {
-        $basename = basename($view);
-        $basepath = rtrim($view, $basename);
+        $basename = basename( $view );
+        $basepath = rtrim( $view, $basename );
         $customPath = 'views/partials/styles/'.$this->style.'/';
-        $parts = explode('_', $basename);
+        $parts = explode( '_', $basename );
         $views = [
             $customPath.$basename,
             $customPath.$parts[0],
             $view,
             $basepath.$parts[0],
         ];
-        return array_filter($views);
+        return array_filter( $views );
     }
 
     /**
      * @return bool
      */
-    protected function isPublicInstance(Builder $instance)
+    protected function isPublicInstance( Builder $instance )
     {
-        $args = wp_parse_args($instance->args, [
+        $args = wp_parse_args( $instance->args, [
             'is_public' => false,
             'is_raw' => false,
-        ]);
-        if (is_admin() || !$args['is_public'] || $args['is_raw']) {
+        ] );
+        if( is_admin() || !$args['is_public'] || $args['is_raw'] ) {
             return false;
         }
         return true;

plugin/Review.php

Indentation +157 added lines, -157 removed lines

@@ -12,173 +12,173 @@
 
 class Review implements \ArrayAccess
 {
-    public $assigned_to;
-    public $author;
-    public $avatar;
-    public $content;
-    public $custom;
-    public $date;
-    public $email;
-    public $ID;
-    public $ip_address;
-    public $modified;
-    public $pinned;
-    public $rating;
-    public $response;
-    public $review_id;
-    public $review_type;
-    public $status;
-    public $term_ids;
-    public $title;
-    public $url;
-    public $user_id;
+	public $assigned_to;
+	public $author;
+	public $avatar;
+	public $content;
+	public $custom;
+	public $date;
+	public $email;
+	public $ID;
+	public $ip_address;
+	public $modified;
+	public $pinned;
+	public $rating;
+	public $response;
+	public $review_id;
+	public $review_type;
+	public $status;
+	public $term_ids;
+	public $title;
+	public $url;
+	public $user_id;
 
-    public function __construct(WP_Post $post)
-    {
-        if (Application::POST_TYPE != $post->post_type) {
-            return;
-        }
-        $this->content = $post->post_content;
-        $this->date = $post->post_date;
-        $this->ID = intval($post->ID);
-        $this->status = $post->post_status;
-        $this->title = $post->post_title;
-        $this->user_id = intval($post->post_author);
-        $this->setProperties($post);
-        $this->setTermIds($post);
-    }
+	public function __construct(WP_Post $post)
+	{
+		if (Application::POST_TYPE != $post->post_type) {
+			return;
+		}
+		$this->content = $post->post_content;
+		$this->date = $post->post_date;
+		$this->ID = intval($post->ID);
+		$this->status = $post->post_status;
+		$this->title = $post->post_title;
+		$this->user_id = intval($post->post_author);
+		$this->setProperties($post);
+		$this->setTermIds($post);
+	}
 
-    /**
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        return $this->offsetGet($key);
-    }
+	/**
+	 * @return mixed
+	 */
+	public function __get($key)
+	{
+		return $this->offsetGet($key);
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->build();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return (string) $this->build();
+	}
 
-    /**
-     * @return ReviewHtml
-     */
-    public function build(array $args = [])
-    {
-        if (empty($this->ID)) {
-            return new ReviewHtml($this);
-        }
-        $partial = glsr(SiteReviewsPartial::class);
-        $partial->args = glsr(SiteReviewsDefaults::class)->merge($args);
-        $partial->options = Arr::flattenArray(glsr(OptionManager::class)->all());
-        return $partial->buildReview($this);
-    }
+	/**
+	 * @return ReviewHtml
+	 */
+	public function build(array $args = [])
+	{
+		if (empty($this->ID)) {
+			return new ReviewHtml($this);
+		}
+		$partial = glsr(SiteReviewsPartial::class);
+		$partial->args = glsr(SiteReviewsDefaults::class)->merge($args);
+		$partial->options = Arr::flattenArray(glsr(OptionManager::class)->all());
+		return $partial->buildReview($this);
+	}
 
-    /**
-     * @param mixed $key
-     * @return bool
-     */
-    public function offsetExists($key)
-    {
-        return property_exists($this, $key) || array_key_exists($key, (array) $this->custom);
-    }
+	/**
+	 * @param mixed $key
+	 * @return bool
+	 */
+	public function offsetExists($key)
+	{
+		return property_exists($this, $key) || array_key_exists($key, (array) $this->custom);
+	}
 
-    /**
-     * @param mixed $key
-     * @return mixed
-     */
-    public function offsetGet($key)
-    {
-        return property_exists($this, $key)
-            ? $this->$key
-            : Arr::get($this->custom, $key, null);
-    }
+	/**
+	 * @param mixed $key
+	 * @return mixed
+	 */
+	public function offsetGet($key)
+	{
+		return property_exists($this, $key)
+			? $this->$key
+			: Arr::get($this->custom, $key, null);
+	}
 
-    /**
-     * @param mixed $key
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($key, $value)
-    {
-        if (property_exists($this, $key)) {
-            $this->$key = $value;
-            return;
-        }
-        if (!is_array($this->custom)) {
-            $this->custom = array_filter((array) $this->custom);
-        }
-        $this->custom[$key] = $value;
-    }
+	/**
+	 * @param mixed $key
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function offsetSet($key, $value)
+	{
+		if (property_exists($this, $key)) {
+			$this->$key = $value;
+			return;
+		}
+		if (!is_array($this->custom)) {
+			$this->custom = array_filter((array) $this->custom);
+		}
+		$this->custom[$key] = $value;
+	}
 
-    /**
-     * @param mixed $key
-     * @return void
-     */
-    public function offsetUnset($key)
-    {
-        $this->offsetSet($key, null);
-    }
+	/**
+	 * @param mixed $key
+	 * @return void
+	 */
+	public function offsetUnset($key)
+	{
+		$this->offsetSet($key, null);
+	}
 
-    /**
-     * @return void
-     */
-    public function render()
-    {
-        echo $this->build();
-    }
+	/**
+	 * @return void
+	 */
+	public function render()
+	{
+		echo $this->build();
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isModified(array $properties)
-    {
-        return $this->date != $properties['date']
-            || $this->content != $properties['content']
-            || $this->title != $properties['title'];
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isModified(array $properties)
+	{
+		return $this->date != $properties['date']
+			|| $this->content != $properties['content']
+			|| $this->title != $properties['title'];
+	}
 
-    /**
-     * @return void
-     */
-    protected function setProperties(WP_Post $post)
-    {
-        $defaults = [
-            'author' => __('Anonymous', 'site-reviews'),
-            'date' => '',
-            'review_id' => '',
-            'review_type' => 'local',
-        ];
-        $meta = array_filter(
-            array_map('array_shift', array_filter((array) get_post_meta($post->ID))),
-            'strlen'
-        );
-        $meta = array_merge($defaults, Arr::unprefixArrayKeys($meta));
-        $properties = glsr(CreateReviewDefaults::class)->restrict(array_merge($defaults, $meta));
-        $this->modified = $this->isModified($properties);
-        array_walk($properties, function ($value, $key) {
-            if (!property_exists($this, $key) || isset($this->$key)) {
-                return;
-            }
-            $this->$key = maybe_unserialize($value);
-        });
-    }
+	/**
+	 * @return void
+	 */
+	protected function setProperties(WP_Post $post)
+	{
+		$defaults = [
+			'author' => __('Anonymous', 'site-reviews'),
+			'date' => '',
+			'review_id' => '',
+			'review_type' => 'local',
+		];
+		$meta = array_filter(
+			array_map('array_shift', array_filter((array) get_post_meta($post->ID))),
+			'strlen'
+		);
+		$meta = array_merge($defaults, Arr::unprefixArrayKeys($meta));
+		$properties = glsr(CreateReviewDefaults::class)->restrict(array_merge($defaults, $meta));
+		$this->modified = $this->isModified($properties);
+		array_walk($properties, function ($value, $key) {
+			if (!property_exists($this, $key) || isset($this->$key)) {
+				return;
+			}
+			$this->$key = maybe_unserialize($value);
+		});
+	}
 
-    /**
-     * @return void
-     */
-    protected function setTermIds(WP_Post $post)
-    {
-        $this->term_ids = [];
-        if (!is_array($terms = get_the_terms($post, Application::TAXONOMY))) {
-            return;
-        }
-        foreach ($terms as $term) {
-            $this->term_ids[] = $term->term_id;
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function setTermIds(WP_Post $post)
+	{
+		$this->term_ids = [];
+		if (!is_array($terms = get_the_terms($post, Application::TAXONOMY))) {
+			return;
+		}
+		foreach ($terms as $term) {
+			$this->term_ids[] = $term->term_id;
+		}
+	}
 }

Spacing +40 added lines, -40 removed lines

@@ -33,27 +33,27 @@ 
     public $url;
     public $user_id;
 
-    public function __construct(WP_Post $post)
+    public function __construct( WP_Post $post )
     {
-        if (Application::POST_TYPE != $post->post_type) {
+        if( Application::POST_TYPE != $post->post_type ) {
             return;
         }
         $this->content = $post->post_content;
         $this->date = $post->post_date;
-        $this->ID = intval($post->ID);
+        $this->ID = intval( $post->ID );
         $this->status = $post->post_status;
         $this->title = $post->post_title;
-        $this->user_id = intval($post->post_author);
-        $this->setProperties($post);
-        $this->setTermIds($post);
+        $this->user_id = intval( $post->post_author );
+        $this->setProperties( $post );
+        $this->setTermIds( $post );
     }
 
     /**
      * @return mixed
      */
-    public function __get($key)
+    public function __get( $key )
     {
-        return $this->offsetGet($key);
+        return $this->offsetGet( $key );
     }
 
     /**
@@ -61,41 +61,41 @@ 
      */
     public function __toString()
     {
-        return (string) $this->build();
+        return (string)$this->build();
     }
 
     /**
      * @return ReviewHtml
      */
-    public function build(array $args = [])
+    public function build( array $args = [] )
     {
-        if (empty($this->ID)) {
-            return new ReviewHtml($this);
+        if( empty($this->ID) ) {
+            return new ReviewHtml( $this );
         }
-        $partial = glsr(SiteReviewsPartial::class);
-        $partial->args = glsr(SiteReviewsDefaults::class)->merge($args);
-        $partial->options = Arr::flattenArray(glsr(OptionManager::class)->all());
-        return $partial->buildReview($this);
+        $partial = glsr( SiteReviewsPartial::class );
+        $partial->args = glsr( SiteReviewsDefaults::class )->merge( $args );
+        $partial->options = Arr::flattenArray( glsr( OptionManager::class )->all() );
+        return $partial->buildReview( $this );
     }
 
     /**
      * @param mixed $key
      * @return bool
      */
-    public function offsetExists($key)
+    public function offsetExists( $key )
     {
-        return property_exists($this, $key) || array_key_exists($key, (array) $this->custom);
+        return property_exists( $this, $key ) || array_key_exists( $key, (array)$this->custom );
     }
 
     /**
      * @param mixed $key
      * @return mixed
      */
-    public function offsetGet($key)
+    public function offsetGet( $key )
     {
-        return property_exists($this, $key)
+        return property_exists( $this, $key )
             ? $this->$key
-            : Arr::get($this->custom, $key, null);
+            : Arr::get( $this->custom, $key, null );
     }
 
     /**
@@ -103,14 +103,14 @@ 
      * @param mixed $value
      * @return void
      */
-    public function offsetSet($key, $value)
+    public function offsetSet( $key, $value )
     {
-        if (property_exists($this, $key)) {
+        if( property_exists( $this, $key ) ) {
             $this->$key = $value;
             return;
         }
-        if (!is_array($this->custom)) {
-            $this->custom = array_filter((array) $this->custom);
+        if( !is_array( $this->custom ) ) {
+            $this->custom = array_filter( (array)$this->custom );
         }
         $this->custom[$key] = $value;
     }
@@ -119,9 +119,9 @@ 
      * @param mixed $key
      * @return void
      */
-    public function offsetUnset($key)
+    public function offsetUnset( $key )
     {
-        $this->offsetSet($key, null);
+        $this->offsetSet( $key, null );
     }
 
     /**
@@ -135,7 +135,7 @@ 
     /**
      * @return bool
      */
-    protected function isModified(array $properties)
+    protected function isModified( array $properties )
     {
         return $this->date != $properties['date']
             || $this->content != $properties['content']
@@ -145,39 +145,39 @@ 
     /**
      * @return void
      */
-    protected function setProperties(WP_Post $post)
+    protected function setProperties( WP_Post $post )
     {
         $defaults = [
-            'author' => __('Anonymous', 'site-reviews'),
+            'author' => __( 'Anonymous', 'site-reviews' ),
             'date' => '',
             'review_id' => '',
             'review_type' => 'local',
         ];
         $meta = array_filter(
-            array_map('array_shift', array_filter((array) get_post_meta($post->ID))),
+            array_map( 'array_shift', array_filter( (array)get_post_meta( $post->ID ) ) ),
             'strlen'
         );
-        $meta = array_merge($defaults, Arr::unprefixArrayKeys($meta));
-        $properties = glsr(CreateReviewDefaults::class)->restrict(array_merge($defaults, $meta));
-        $this->modified = $this->isModified($properties);
-        array_walk($properties, function ($value, $key) {
-            if (!property_exists($this, $key) || isset($this->$key)) {
+        $meta = array_merge( $defaults, Arr::unprefixArrayKeys( $meta ) );
+        $properties = glsr( CreateReviewDefaults::class )->restrict( array_merge( $defaults, $meta ) );
+        $this->modified = $this->isModified( $properties );
+        array_walk( $properties, function( $value, $key ) {
+            if( !property_exists( $this, $key ) || isset($this->$key) ) {
                 return;
             }
-            $this->$key = maybe_unserialize($value);
+            $this->$key = maybe_unserialize( $value );
         });
     }
 
     /**
      * @return void
      */
-    protected function setTermIds(WP_Post $post)
+    protected function setTermIds( WP_Post $post )
     {
         $this->term_ids = [];
-        if (!is_array($terms = get_the_terms($post, Application::TAXONOMY))) {
+        if( !is_array( $terms = get_the_terms( $post, Application::TAXONOMY ) ) ) {
             return;
         }
-        foreach ($terms as $term) {
+        foreach( $terms as $term ) {
             $this->term_ids[] = $term->term_id;
         }
     }

plugin/Modules/Email.php

Indentation +201 added lines, -201 removed lines

@@ -9,205 +9,205 @@
 
 class Email
 {
-    /**
-     * @var array
-     */
-    public $attachments;
-
-    /**
-     * @var array
-     */
-    public $email;
-
-    /**
-     * @var array
-     */
-    public $headers;
-
-    /**
-     * @var string
-     */
-    public $message;
-
-    /**
-     * @var string
-     */
-    public $subject;
-
-    /**
-     * @var string|array
-     */
-    public $to;
-
-    /**
-     * @return Email
-     */
-    public function compose(array $email)
-    {
-        $this->normalize($email);
-        $this->attachments = $this->email['attachments'];
-        $this->headers = $this->buildHeaders();
-        $this->message = $this->buildHtmlMessage();
-        $this->subject = $this->email['subject'];
-        $this->to = $this->email['to'];
-        add_action('phpmailer_init', [$this, 'buildPlainTextMessage']);
-        return $this;
-    }
-
-    /**
-     * @param string $format
-     * @return string|null
-     */
-    public function read($format = '')
-    {
-        if ('plaintext' == $format) {
-            $message = $this->stripHtmlTags($this->message);
-            return apply_filters('site-reviews/email/message', $message, 'text', $this);
-        }
-        return $this->message;
-    }
-
-    /**
-     * @return void|bool
-     */
-    public function send()
-    {
-        if (!$this->message || !$this->subject || !$this->to) {
-            return;
-        }
-        add_action('wp_mail_failed', [$this, 'logMailError']);
-        $sent = wp_mail(
-            $this->to,
-            $this->subject,
-            $this->message,
-            $this->headers,
-            $this->attachments
-        );
-        remove_action('wp_mail_failed', [$this, 'logMailError']);
-        $this->reset();
-        return $sent;
-    }
-
-    /**
-     * @return void
-     * @action phpmailer_init
-     */
-    public function buildPlainTextMessage(PHPMailer $phpmailer)
-    {
-        if (empty($this->email)) {
-            return;
-        }
-        if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
-            return;
-        }
-        $message = $this->stripHtmlTags($phpmailer->Body);
-        $phpmailer->AltBody = apply_filters('site-reviews/email/message', $message, 'text', $this);
-    }
-
-    /**
-     * @return array
-     */
-    protected function buildHeaders()
-    {
-        $allowed = [
-            'bcc', 'cc', 'from', 'reply-to',
-        ];
-        $headers = array_intersect_key($this->email, array_flip($allowed));
-        $headers = array_filter($headers);
-        foreach ($headers as $key => $value) {
-            unset($headers[$key]);
-            $headers[] = $key.': '.$value;
-        }
-        $headers[] = 'Content-Type: text/html';
-        return apply_filters('site-reviews/email/headers', $headers, $this);
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildHtmlMessage()
-    {
-        $template = trim(glsr(OptionManager::class)->get('settings.general.notification_message'));
-        if (!empty($template)) {
-            $message = glsr(Template::class)->interpolate(
-                $template, 
-                ['context' => $this->email['template-tags']], 
-                $this->email['template']
-            );
-        } elseif ($this->email['template']) {
-            $message = glsr(Template::class)->build('templates/'.$this->email['template'], [
-                'context' => $this->email['template-tags'],
-            ]);
-        }
-        if (!isset($message)) {
-            $message = $this->email['message'];
-        }
-        $message = $this->email['before'].$message.$this->email['after'];
-        $message = strip_shortcodes($message);
-        $message = wptexturize($message);
-        $message = wpautop($message);
-        $message = str_replace('<> ', '', $message);
-        $message = str_replace(']]>', ']]>', $message);
-        $message = glsr(Template::class)->build('partials/email/index', [
-            'context' => ['message' => $message],
-        ]);
-        return apply_filters('site-reviews/email/message', stripslashes($message), 'html', $this);
-    }
-
-    /**
-     * @param \WP_Error $error
-     * @return void
-     */
-    protected function logMailError($error)
-    {
-        glsr_log()->error('Email was not sent (wp_mail failed)')
-            ->debug($this)
-            ->debug($error);
-    }
-
-    /**
-     * @return void
-     */
-    protected function normalize(array $email = [])
-    {
-        $email = shortcode_atts(glsr(EmailDefaults::class)->defaults(), $email);
-        if (empty($email['reply-to'])) {
-            $email['reply-to'] = $email['from'];
-        }
-        $this->email = apply_filters('site-reviews/email/compose', $email, $this);
-    }
-
-    /**
-     * @return void
-     */
-    protected function reset()
-    {
-        $this->attachments = [];
-        $this->email = [];
-        $this->headers = [];
-        $this->message = null;
-        $this->subject = null;
-        $this->to = null;
-    }
-
-    /**
-     * @return string
-     */
-    protected function stripHtmlTags($string)
-    {
-        // remove invisible elements
-        $string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
-        // replace certain elements with a line-break
-        $string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
-        // replace other elements with a space
-        $string = preg_replace('@</(td|th)@iu', ' $0', $string);
-        // add a placeholder for plain-text bullets to list elements
-        $string = preg_replace('@<(li)[^>]*?>@siu', '$0-o-^-o-', $string);
-        // strip all remaining HTML tags
-        $string = wp_strip_all_tags($string);
-        $string = wp_specialchars_decode($string, ENT_QUOTES);
-        $string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
-        $string = str_replace('-o-^-o-', ' - ', $string);
-        return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
-    }
+	/**
+	 * @var array
+	 */
+	public $attachments;
+
+	/**
+	 * @var array
+	 */
+	public $email;
+
+	/**
+	 * @var array
+	 */
+	public $headers;
+
+	/**
+	 * @var string
+	 */
+	public $message;
+
+	/**
+	 * @var string
+	 */
+	public $subject;
+
+	/**
+	 * @var string|array
+	 */
+	public $to;
+
+	/**
+	 * @return Email
+	 */
+	public function compose(array $email)
+	{
+		$this->normalize($email);
+		$this->attachments = $this->email['attachments'];
+		$this->headers = $this->buildHeaders();
+		$this->message = $this->buildHtmlMessage();
+		$this->subject = $this->email['subject'];
+		$this->to = $this->email['to'];
+		add_action('phpmailer_init', [$this, 'buildPlainTextMessage']);
+		return $this;
+	}
+
+	/**
+	 * @param string $format
+	 * @return string|null
+	 */
+	public function read($format = '')
+	{
+		if ('plaintext' == $format) {
+			$message = $this->stripHtmlTags($this->message);
+			return apply_filters('site-reviews/email/message', $message, 'text', $this);
+		}
+		return $this->message;
+	}
+
+	/**
+	 * @return void|bool
+	 */
+	public function send()
+	{
+		if (!$this->message || !$this->subject || !$this->to) {
+			return;
+		}
+		add_action('wp_mail_failed', [$this, 'logMailError']);
+		$sent = wp_mail(
+			$this->to,
+			$this->subject,
+			$this->message,
+			$this->headers,
+			$this->attachments
+		);
+		remove_action('wp_mail_failed', [$this, 'logMailError']);
+		$this->reset();
+		return $sent;
+	}
+
+	/**
+	 * @return void
+	 * @action phpmailer_init
+	 */
+	public function buildPlainTextMessage(PHPMailer $phpmailer)
+	{
+		if (empty($this->email)) {
+			return;
+		}
+		if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
+			return;
+		}
+		$message = $this->stripHtmlTags($phpmailer->Body);
+		$phpmailer->AltBody = apply_filters('site-reviews/email/message', $message, 'text', $this);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function buildHeaders()
+	{
+		$allowed = [
+			'bcc', 'cc', 'from', 'reply-to',
+		];
+		$headers = array_intersect_key($this->email, array_flip($allowed));
+		$headers = array_filter($headers);
+		foreach ($headers as $key => $value) {
+			unset($headers[$key]);
+			$headers[] = $key.': '.$value;
+		}
+		$headers[] = 'Content-Type: text/html';
+		return apply_filters('site-reviews/email/headers', $headers, $this);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildHtmlMessage()
+	{
+		$template = trim(glsr(OptionManager::class)->get('settings.general.notification_message'));
+		if (!empty($template)) {
+			$message = glsr(Template::class)->interpolate(
+				$template, 
+				['context' => $this->email['template-tags']], 
+				$this->email['template']
+			);
+		} elseif ($this->email['template']) {
+			$message = glsr(Template::class)->build('templates/'.$this->email['template'], [
+				'context' => $this->email['template-tags'],
+			]);
+		}
+		if (!isset($message)) {
+			$message = $this->email['message'];
+		}
+		$message = $this->email['before'].$message.$this->email['after'];
+		$message = strip_shortcodes($message);
+		$message = wptexturize($message);
+		$message = wpautop($message);
+		$message = str_replace('&lt;&gt; ', '', $message);
+		$message = str_replace(']]>', ']]&gt;', $message);
+		$message = glsr(Template::class)->build('partials/email/index', [
+			'context' => ['message' => $message],
+		]);
+		return apply_filters('site-reviews/email/message', stripslashes($message), 'html', $this);
+	}
+
+	/**
+	 * @param \WP_Error $error
+	 * @return void
+	 */
+	protected function logMailError($error)
+	{
+		glsr_log()->error('Email was not sent (wp_mail failed)')
+			->debug($this)
+			->debug($error);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function normalize(array $email = [])
+	{
+		$email = shortcode_atts(glsr(EmailDefaults::class)->defaults(), $email);
+		if (empty($email['reply-to'])) {
+			$email['reply-to'] = $email['from'];
+		}
+		$this->email = apply_filters('site-reviews/email/compose', $email, $this);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function reset()
+	{
+		$this->attachments = [];
+		$this->email = [];
+		$this->headers = [];
+		$this->message = null;
+		$this->subject = null;
+		$this->to = null;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function stripHtmlTags($string)
+	{
+		// remove invisible elements
+		$string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
+		// replace certain elements with a line-break
+		$string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
+		// replace other elements with a space
+		$string = preg_replace('@</(td|th)@iu', ' $0', $string);
+		// add a placeholder for plain-text bullets to list elements
+		$string = preg_replace('@<(li)[^>]*?>@siu', '$0-o-^-o-', $string);
+		// strip all remaining HTML tags
+		$string = wp_strip_all_tags($string);
+		$string = wp_specialchars_decode($string, ENT_QUOTES);
+		$string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
+		$string = str_replace('-o-^-o-', ' - ', $string);
+		return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
+	}
 }

Spacing +52 added lines, -52 removed lines

@@ -42,15 +42,15 @@ 
     /**
      * @return Email
      */
-    public function compose(array $email)
+    public function compose( array $email )
     {
-        $this->normalize($email);
+        $this->normalize( $email );
         $this->attachments = $this->email['attachments'];
         $this->headers = $this->buildHeaders();
         $this->message = $this->buildHtmlMessage();
         $this->subject = $this->email['subject'];
         $this->to = $this->email['to'];
-        add_action('phpmailer_init', [$this, 'buildPlainTextMessage']);
+        add_action( 'phpmailer_init', [$this, 'buildPlainTextMessage'] );
         return $this;
     }
 
@@ -58,11 +58,11 @@ 
      * @param string $format
      * @return string|null
      */
-    public function read($format = '')
+    public function read( $format = '' )
     {
-        if ('plaintext' == $format) {
-            $message = $this->stripHtmlTags($this->message);
-            return apply_filters('site-reviews/email/message', $message, 'text', $this);
+        if( 'plaintext' == $format ) {
+            $message = $this->stripHtmlTags( $this->message );
+            return apply_filters( 'site-reviews/email/message', $message, 'text', $this );
         }
         return $this->message;
     }
@@ -72,10 +72,10 @@ 
      */
     public function send()
     {
-        if (!$this->message || !$this->subject || !$this->to) {
+        if( !$this->message || !$this->subject || !$this->to ) {
             return;
         }
-        add_action('wp_mail_failed', [$this, 'logMailError']);
+        add_action( 'wp_mail_failed', [$this, 'logMailError'] );
         $sent = wp_mail(
             $this->to,
             $this->subject,
@@ -83,7 +83,7 @@ 
             $this->headers,
             $this->attachments
         );
-        remove_action('wp_mail_failed', [$this, 'logMailError']);
+        remove_action( 'wp_mail_failed', [$this, 'logMailError'] );
         $this->reset();
         return $sent;
     }
@@ -92,16 +92,16 @@ 
      * @return void
      * @action phpmailer_init
      */
-    public function buildPlainTextMessage(PHPMailer $phpmailer)
+    public function buildPlainTextMessage( PHPMailer $phpmailer )
     {
-        if (empty($this->email)) {
+        if( empty($this->email) ) {
             return;
         }
-        if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
+        if( 'text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody) ) {
             return;
         }
-        $message = $this->stripHtmlTags($phpmailer->Body);
-        $phpmailer->AltBody = apply_filters('site-reviews/email/message', $message, 'text', $this);
+        $message = $this->stripHtmlTags( $phpmailer->Body );
+        $phpmailer->AltBody = apply_filters( 'site-reviews/email/message', $message, 'text', $this );
     }
 
     /**
@@ -112,14 +112,14 @@ 
         $allowed = [
             'bcc', 'cc', 'from', 'reply-to',
         ];
-        $headers = array_intersect_key($this->email, array_flip($allowed));
-        $headers = array_filter($headers);
-        foreach ($headers as $key => $value) {
+        $headers = array_intersect_key( $this->email, array_flip( $allowed ) );
+        $headers = array_filter( $headers );
+        foreach( $headers as $key => $value ) {
             unset($headers[$key]);
             $headers[] = $key.': '.$value;
         }
         $headers[] = 'Content-Type: text/html';
-        return apply_filters('site-reviews/email/headers', $headers, $this);
+        return apply_filters( 'site-reviews/email/headers', $headers, $this );
     }
 
     /**
@@ -127,54 +127,54 @@ 
      */
     protected function buildHtmlMessage()
     {
-        $template = trim(glsr(OptionManager::class)->get('settings.general.notification_message'));
-        if (!empty($template)) {
-            $message = glsr(Template::class)->interpolate(
+        $template = trim( glsr( OptionManager::class )->get( 'settings.general.notification_message' ) );
+        if( !empty($template) ) {
+            $message = glsr( Template::class )->interpolate(
                 $template, 
                 ['context' => $this->email['template-tags']], 
                 $this->email['template']
             );
-        } elseif ($this->email['template']) {
-            $message = glsr(Template::class)->build('templates/'.$this->email['template'], [
+        } elseif( $this->email['template'] ) {
+            $message = glsr( Template::class )->build( 'templates/'.$this->email['template'], [
                 'context' => $this->email['template-tags'],
-            ]);
+            ] );
         }
-        if (!isset($message)) {
+        if( !isset($message) ) {
             $message = $this->email['message'];
         }
         $message = $this->email['before'].$message.$this->email['after'];
-        $message = strip_shortcodes($message);
-        $message = wptexturize($message);
-        $message = wpautop($message);
-        $message = str_replace('<> ', '', $message);
-        $message = str_replace(']]>', ']]>', $message);
-        $message = glsr(Template::class)->build('partials/email/index', [
+        $message = strip_shortcodes( $message );
+        $message = wptexturize( $message );
+        $message = wpautop( $message );
+        $message = str_replace( '<> ', '', $message );
+        $message = str_replace( ']]>', ']]>', $message );
+        $message = glsr( Template::class )->build( 'partials/email/index', [
             'context' => ['message' => $message],
-        ]);
-        return apply_filters('site-reviews/email/message', stripslashes($message), 'html', $this);
+        ] );
+        return apply_filters( 'site-reviews/email/message', stripslashes( $message ), 'html', $this );
     }
 
     /**
      * @param \WP_Error $error
      * @return void
      */
-    protected function logMailError($error)
+    protected function logMailError( $error )
     {
-        glsr_log()->error('Email was not sent (wp_mail failed)')
-            ->debug($this)
-            ->debug($error);
+        glsr_log()->error( 'Email was not sent (wp_mail failed)' )
+            ->debug( $this )
+            ->debug( $error );
     }
 
     /**
      * @return void
      */
-    protected function normalize(array $email = [])
+    protected function normalize( array $email = [] )
     {
-        $email = shortcode_atts(glsr(EmailDefaults::class)->defaults(), $email);
-        if (empty($email['reply-to'])) {
+        $email = shortcode_atts( glsr( EmailDefaults::class )->defaults(), $email );
+        if( empty($email['reply-to']) ) {
             $email['reply-to'] = $email['from'];
         }
-        $this->email = apply_filters('site-reviews/email/compose', $email, $this);
+        $this->email = apply_filters( 'site-reviews/email/compose', $email, $this );
     }
 
     /**
@@ -193,21 +193,21 @@ 
     /**
      * @return string
      */
-    protected function stripHtmlTags($string)
+    protected function stripHtmlTags( $string )
     {
         // remove invisible elements
-        $string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
+        $string = preg_replace( '@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string );
         // replace certain elements with a line-break
-        $string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
+        $string = preg_replace( '@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string );
         // replace other elements with a space
-        $string = preg_replace('@</(td|th)@iu', ' $0', $string);
+        $string = preg_replace( '@</(td|th)@iu', ' $0', $string );
         // add a placeholder for plain-text bullets to list elements
-        $string = preg_replace('@<(li)[^>]*?>@siu', '$0-o-^-o-', $string);
+        $string = preg_replace( '@<(li)[^>]*?>@siu', '$0-o-^-o-', $string );
         // strip all remaining HTML tags
-        $string = wp_strip_all_tags($string);
-        $string = wp_specialchars_decode($string, ENT_QUOTES);
-        $string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
-        $string = str_replace('-o-^-o-', ' - ', $string);
-        return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
+        $string = wp_strip_all_tags( $string );
+        $string = wp_specialchars_decode( $string, ENT_QUOTES );
+        $string = preg_replace( '/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string );
+        $string = str_replace( '-o-^-o-', ' - ', $string );
+        return html_entity_decode( $string, ENT_QUOTES, 'UTF-8' );
     }
 }

Braces +2 added lines, -1 removed lines

@@ -134,7 +134,8 @@
                 ['context' => $this->email['template-tags']], 
                 $this->email['template']
             );
-        } elseif ($this->email['template']) {
+        }
+        elseif ($this->email['template']) {
             $message = glsr(Template::class)->build('templates/'.$this->email['template'], [
                 'context' => $this->email['template-tags'],
             ]);

views/pages/tools/sync.php

Spacing +17 added lines, -17 removed lines

@@ -1,37 +1,37 @@ 
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <form method="post" class="glsr-form-sync glsr-status">
-    <?php $selected = key($services); ?>
+    <?php $selected = key( $services ); ?>
     <table class="wp-list-table widefat fixed striped">
         <thead>
             <tr>
                 <td class="check-column glsr-radio-column"><span class="dashicons-before dashicons-update"></span></td>
-                <th scope="col" class="column-primary"><?= __('Service', 'site-reviews'); ?></th>
-                <th scope="col" class="column-total_fetched"><?= __('Reviews', 'site-reviews'); ?></th>
-                <th scope="col" class="column-last_sync"><?= __('Last Sync', 'site-reviews'); ?></th>
+                <th scope="col" class="column-primary"><?= __( 'Service', 'site-reviews' ); ?></th>
+                <th scope="col" class="column-total_fetched"><?= __( 'Reviews', 'site-reviews' ); ?></th>
+                <th scope="col" class="column-last_sync"><?= __( 'Last Sync', 'site-reviews' ); ?></th>
             </tr>
         </thead>
         <tbody>
-        <?php foreach ($services as $slug => $details) : ?>
+        <?php foreach( $services as $slug => $details ) : ?>
             <tr class="service-<?= $slug; ?>">
                 <th scope="row" class="check-column">
-                    <input type="radio" name="{{ id }}[service]" value="<?= $slug; ?>" <?php checked($slug, $selected); ?>>
+                    <input type="radio" name="{{ id }}[service]" value="<?= $slug; ?>" <?php checked( $slug, $selected ); ?>>
                 </th>
                 <td class="column-primary has-row-actions">
                     <strong><?= $details['name']; ?></strong>
                     <div class="row-actions">
-                        <span><a href="{{ base_url }}&page=settings#!addons"><?= __('Settings', 'site-reviews'); ?></a> | </span>
-                        <span><a href="{{ base_url }}&page=settings#!licenses"><?= __('License', 'site-reviews'); ?></a> | </span>
-                        <span><a href="{{ base_url }}&page=documentation#!addons"><?= __('Documentation', 'site-reviews'); ?></a></span>
+                        <span><a href="{{ base_url }}&page=settings#!addons"><?= __( 'Settings', 'site-reviews' ); ?></a> | </span>
+                        <span><a href="{{ base_url }}&page=settings#!licenses"><?= __( 'License', 'site-reviews' ); ?></a> | </span>
+                        <span><a href="{{ base_url }}&page=documentation#!addons"><?= __( 'Documentation', 'site-reviews' ); ?></a></span>
                     </div>
                     <button type="button" class="toggle-row">
-                        <span class="screen-reader-text"><?= __('Show more details', 'site-reviews'); ?></span>
+                        <span class="screen-reader-text"><?= __( 'Show more details', 'site-reviews' ); ?></span>
                     </button>
                 </td>
-                <td class="column-total_fetched" data-colname="<?= __('Reviews', 'site-reviews'); ?>">
+                <td class="column-total_fetched" data-colname="<?= __( 'Reviews', 'site-reviews' ); ?>">
                     <a href="<?= $details['reviews_url']; ?>"><?= $details['reviews_count']; ?></a>
                 </td>
-                <td class="column-last_sync" data-colname="<?= __('Last Sync', 'site-reviews'); ?>">
+                <td class="column-last_sync" data-colname="<?= __( 'Last Sync', 'site-reviews' ); ?>">
                     <?= $details['last_sync']; ?>
                 </td>
             </tr>
@@ -40,12 +40,12 @@ 
         <tfoot>
             <tr>
                 <td colspan="4" class="no-items" style="display:table-cell!important;">
-                    <div class="glsr-progress" data-active-text="<?= __('Please wait...', 'site-reviews'); ?>">
+                    <div class="glsr-progress" data-active-text="<?= __( 'Please wait...', 'site-reviews' ); ?>">
                         <div class="glsr-progress-bar" style="width: 0%;">
-                            <span class="glsr-progress-status"><?= __('Inactive', 'site-reviews'); ?></span>
+                            <span class="glsr-progress-status"><?= __( 'Inactive', 'site-reviews' ); ?></span>
                         </div>
                         <div class="glsr-progress-background">
-                            <span class="glsr-progress-status"><?= __('Inactive', 'site-reviews'); ?></span>
+                            <span class="glsr-progress-status"><?= __( 'Inactive', 'site-reviews' ); ?></span>
                         </div>
                     </div>
                 </td>
@@ -54,7 +54,7 @@ 
     </table>
     <div class="tablenav bottom">
         <button type="submit" class="glsr-button button" id="sync-reviews">
-            <span data-loading="<?= __('Syncing...', 'site-reviews'); ?>"><?= __('Sync Reviews', 'site-reviews'); ?></span>
+            <span data-loading="<?= __( 'Syncing...', 'site-reviews' ); ?>"><?= __( 'Sync Reviews', 'site-reviews' ); ?></span>
         </button>
     </div>
 </form>

plugin/Controllers/MainController.php

Indentation +90 added lines, -90 removed lines

@@ -10,97 +10,97 @@
 
 class MainController extends Controller
 {
-    /**
-     * @return void
-     * @action init
-     */
-    public function registerPostType()
-    {
-        if (!glsr()->hasPermission()) {
-            return;
-        }
-        $command = new RegisterPostType([
-            'capabilities' => ['create_posts' => 'create_'.Application::POST_TYPE],
-            'columns' => [
-                'title' => '',
-                'category' => '',
-                'assigned_to' => __('Assigned To', 'site-reviews'),
-                'reviewer' => __('Author', 'site-reviews'),
-                'email' => __('Email', 'site-reviews'),
-                'ip_address' => __('IP Address', 'site-reviews'),
-                'response' => __('Response', 'site-reviews'),
-                'review_type' => __('Type', 'site-reviews'),
-                'rating' => __('Rating', 'site-reviews'),
-                'pinned' => __('Pinned', 'site-reviews'),
-                'date' => '',
-            ],
-            'menu_icon' => 'dashicons-star-half',
-            'menu_name' => glsr()->name,
-            'map_meta_cap' => true,
-            'plural' => __('Reviews', 'site-reviews'),
-            'post_type' => Application::POST_TYPE,
-            'rest_controller_class' => RestReviewController::class,
-            'show_in_rest' => true,
-            'single' => __('Review', 'site-reviews'),
-        ]);
-        $this->execute($command);
-    }
+	/**
+	 * @return void
+	 * @action init
+	 */
+	public function registerPostType()
+	{
+		if (!glsr()->hasPermission()) {
+			return;
+		}
+		$command = new RegisterPostType([
+			'capabilities' => ['create_posts' => 'create_'.Application::POST_TYPE],
+			'columns' => [
+				'title' => '',
+				'category' => '',
+				'assigned_to' => __('Assigned To', 'site-reviews'),
+				'reviewer' => __('Author', 'site-reviews'),
+				'email' => __('Email', 'site-reviews'),
+				'ip_address' => __('IP Address', 'site-reviews'),
+				'response' => __('Response', 'site-reviews'),
+				'review_type' => __('Type', 'site-reviews'),
+				'rating' => __('Rating', 'site-reviews'),
+				'pinned' => __('Pinned', 'site-reviews'),
+				'date' => '',
+			],
+			'menu_icon' => 'dashicons-star-half',
+			'menu_name' => glsr()->name,
+			'map_meta_cap' => true,
+			'plural' => __('Reviews', 'site-reviews'),
+			'post_type' => Application::POST_TYPE,
+			'rest_controller_class' => RestReviewController::class,
+			'show_in_rest' => true,
+			'single' => __('Review', 'site-reviews'),
+		]);
+		$this->execute($command);
+	}
 
-    /**
-     * @return void
-     * @action init
-     */
-    public function registerShortcodes()
-    {
-        $command = new RegisterShortcodes([
-            'site_reviews',
-            'site_reviews_form',
-            'site_reviews_summary',
-        ]);
-        $this->execute($command);
-    }
+	/**
+	 * @return void
+	 * @action init
+	 */
+	public function registerShortcodes()
+	{
+		$command = new RegisterShortcodes([
+			'site_reviews',
+			'site_reviews_form',
+			'site_reviews_summary',
+		]);
+		$this->execute($command);
+	}
 
-    /**
-     * @return void
-     * @action init
-     */
-    public function registerTaxonomy()
-    {
-        $command = new RegisterTaxonomy([
-            'hierarchical' => true,
-            'meta_box_cb' => [glsr(EditorController::class), 'renderTaxonomyMetabox'],
-            'public' => false,
-            'rest_controller_class' => RestCategoryController::class,
-            'show_admin_column' => true,
-            'show_in_rest' => true,
-            'show_ui' => true,
-        ]);
-        $this->execute($command);
-    }
+	/**
+	 * @return void
+	 * @action init
+	 */
+	public function registerTaxonomy()
+	{
+		$command = new RegisterTaxonomy([
+			'hierarchical' => true,
+			'meta_box_cb' => [glsr(EditorController::class), 'renderTaxonomyMetabox'],
+			'public' => false,
+			'rest_controller_class' => RestCategoryController::class,
+			'show_admin_column' => true,
+			'show_in_rest' => true,
+			'show_ui' => true,
+		]);
+		$this->execute($command);
+	}
 
-    /**
-     * @return void
-     * @action widgets_init
-     */
-    public function registerWidgets()
-    {
-        $command = new RegisterWidgets([
-            'site-reviews' => [
-                'class' => 'glsr-widget glsr-widget-site-reviews',
-                'description' => __('Site Reviews: Display your recent reviews.', 'site-reviews'),
-                'title' => __('Recent Reviews', 'site-reviews'),
-            ],
-            'site-reviews-form' => [
-                'class' => 'glsr-widget glsr-widget-site-reviews-form',
-                'description' => __('Site Reviews: Display a form to submit reviews.', 'site-reviews'),
-                'title' => __('Submit a Review', 'site-reviews'),
-            ],
-            'site-reviews-summary' => [
-                'class' => 'glsr-widget glsr-widget-site-reviews-summary',
-                'description' => __('Site Reviews: Display a summary of your reviews.', 'site-reviews'),
-                'title' => __('Summary of Reviews', 'site-reviews'),
-            ],
-        ]);
-        $this->execute($command);
-    }
+	/**
+	 * @return void
+	 * @action widgets_init
+	 */
+	public function registerWidgets()
+	{
+		$command = new RegisterWidgets([
+			'site-reviews' => [
+				'class' => 'glsr-widget glsr-widget-site-reviews',
+				'description' => __('Site Reviews: Display your recent reviews.', 'site-reviews'),
+				'title' => __('Recent Reviews', 'site-reviews'),
+			],
+			'site-reviews-form' => [
+				'class' => 'glsr-widget glsr-widget-site-reviews-form',
+				'description' => __('Site Reviews: Display a form to submit reviews.', 'site-reviews'),
+				'title' => __('Submit a Review', 'site-reviews'),
+			],
+			'site-reviews-summary' => [
+				'class' => 'glsr-widget glsr-widget-site-reviews-summary',
+				'description' => __('Site Reviews: Display a summary of your reviews.', 'site-reviews'),
+				'title' => __('Summary of Reviews', 'site-reviews'),
+			],
+		]);
+		$this->execute($command);
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -16,34 +16,34 @@ 
      */
     public function registerPostType()
     {
-        if (!glsr()->hasPermission()) {
+        if( !glsr()->hasPermission() ) {
             return;
         }
-        $command = new RegisterPostType([
+        $command = new RegisterPostType( [
             'capabilities' => ['create_posts' => 'create_'.Application::POST_TYPE],
             'columns' => [
                 'title' => '',
                 'category' => '',
-                'assigned_to' => __('Assigned To', 'site-reviews'),
-                'reviewer' => __('Author', 'site-reviews'),
-                'email' => __('Email', 'site-reviews'),
-                'ip_address' => __('IP Address', 'site-reviews'),
-                'response' => __('Response', 'site-reviews'),
-                'review_type' => __('Type', 'site-reviews'),
-                'rating' => __('Rating', 'site-reviews'),
-                'pinned' => __('Pinned', 'site-reviews'),
+                'assigned_to' => __( 'Assigned To', 'site-reviews' ),
+                'reviewer' => __( 'Author', 'site-reviews' ),
+                'email' => __( 'Email', 'site-reviews' ),
+                'ip_address' => __( 'IP Address', 'site-reviews' ),
+                'response' => __( 'Response', 'site-reviews' ),
+                'review_type' => __( 'Type', 'site-reviews' ),
+                'rating' => __( 'Rating', 'site-reviews' ),
+                'pinned' => __( 'Pinned', 'site-reviews' ),
                 'date' => '',
             ],
             'menu_icon' => 'dashicons-star-half',
             'menu_name' => glsr()->name,
             'map_meta_cap' => true,
-            'plural' => __('Reviews', 'site-reviews'),
+            'plural' => __( 'Reviews', 'site-reviews' ),
             'post_type' => Application::POST_TYPE,
             'rest_controller_class' => RestReviewController::class,
             'show_in_rest' => true,
-            'single' => __('Review', 'site-reviews'),
-        ]);
-        $this->execute($command);
+            'single' => __( 'Review', 'site-reviews' ),
+        ] );
+        $this->execute( $command );
     }
 
     /**
@@ -52,12 +52,12 @@ 
      */
     public function registerShortcodes()
     {
-        $command = new RegisterShortcodes([
+        $command = new RegisterShortcodes( [
             'site_reviews',
             'site_reviews_form',
             'site_reviews_summary',
-        ]);
-        $this->execute($command);
+        ] );
+        $this->execute( $command );
     }
 
     /**
@@ -66,16 +66,16 @@ 
      */
     public function registerTaxonomy()
     {
-        $command = new RegisterTaxonomy([
+        $command = new RegisterTaxonomy( [
             'hierarchical' => true,
-            'meta_box_cb' => [glsr(EditorController::class), 'renderTaxonomyMetabox'],
+            'meta_box_cb' => [glsr( EditorController::class ), 'renderTaxonomyMetabox'],
             'public' => false,
             'rest_controller_class' => RestCategoryController::class,
             'show_admin_column' => true,
             'show_in_rest' => true,
             'show_ui' => true,
-        ]);
-        $this->execute($command);
+        ] );
+        $this->execute( $command );
     }
 
     /**
@@ -84,23 +84,23 @@ 
      */
     public function registerWidgets()
     {
-        $command = new RegisterWidgets([
+        $command = new RegisterWidgets( [
             'site-reviews' => [
                 'class' => 'glsr-widget glsr-widget-site-reviews',
-                'description' => __('Site Reviews: Display your recent reviews.', 'site-reviews'),
-                'title' => __('Recent Reviews', 'site-reviews'),
+                'description' => __( 'Site Reviews: Display your recent reviews.', 'site-reviews' ),
+                'title' => __( 'Recent Reviews', 'site-reviews' ),
             ],
             'site-reviews-form' => [
                 'class' => 'glsr-widget glsr-widget-site-reviews-form',
-                'description' => __('Site Reviews: Display a form to submit reviews.', 'site-reviews'),
-                'title' => __('Submit a Review', 'site-reviews'),
+                'description' => __( 'Site Reviews: Display a form to submit reviews.', 'site-reviews' ),
+                'title' => __( 'Submit a Review', 'site-reviews' ),
             ],
             'site-reviews-summary' => [
                 'class' => 'glsr-widget glsr-widget-site-reviews-summary',
-                'description' => __('Site Reviews: Display a summary of your reviews.', 'site-reviews'),
-                'title' => __('Summary of Reviews', 'site-reviews'),
+                'description' => __( 'Site Reviews: Display a summary of your reviews.', 'site-reviews' ),
+                'title' => __( 'Summary of Reviews', 'site-reviews' ),
             ],
-        ]);
-        $this->execute($command);
+        ] );
+        $this->execute( $command );
     }
 }

views/partials/notices/welcome.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <div class="notice notice-info is-dismissible glsr-notice" data-dismiss="welcome">
-    <p><?= $text; ?> &mdash; <a class="button button-small" href="<?= admin_url('edit.php?post_type='.glsr()->post_type.'&page=welcome#!whatsnew'); ?>">See what's new</a></p> 
+    <p><?= $text; ?> &mdash; <a class="button button-small" href="<?= admin_url( 'edit.php?post_type='.glsr()->post_type.'&page=welcome#!whatsnew' ); ?>">See what's new</a></p> 
 </div>

plugin/Widgets/SiteReviewsWidget.php

Indentation +86 added lines, -86 removed lines

@@ -7,92 +7,92 @@
 
 class SiteReviewsWidget extends Widget
 {
-    /**
-     * @param array $instance
-     * @return void
-     */
-    public function form($instance)
-    {
-        $this->widgetArgs = glsr(SiteReviewsShortcode::class)->normalizeAtts($instance);
-        $terms = glsr(Database::class)->getTerms();
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Title', 'site-reviews'),
-            'name' => 'title',
-        ]);
-        $this->renderField('number', [
-            'class' => 'small-text',
-            'default' => 10,
-            'label' => __('How many reviews would you like to display?', 'site-reviews'),
-            'max' => 100,
-            'name' => 'display',
-        ]);
-        $this->renderField('select', [
-            'label' => __('What is the minimum rating to display?', 'site-reviews'),
-            'name' => 'rating',
-            'options' => [
-                '5' => sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5),
-                '4' => sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4),
-                '3' => sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3),
-                '2' => sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2),
-                '1' => sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1),
-            ],
-        ]);
-        if (count(glsr()->reviewTypes) > 1) {
-            $this->renderField('select', [
-                'class' => 'widefat',
-                'label' => __('Which type of review would you like to display?', 'site-reviews'),
-                'name' => 'type',
-                'options' => ['' => __('All Reviews', 'site-reviews')] + glsr()->reviewTypes,
-            ]);
-        }
-        if (!empty($terms)) {
-            $this->renderField('select', [
-                'class' => 'widefat',
-                'label' => __('Limit reviews to this category', 'site-reviews'),
-                'name' => 'category',
-                'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
-            ]);
-        }
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'default' => '',
-            'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
-            'label' => __('Limit reviews to those assigned to this page/post ID', 'site-reviews'),
-            'name' => 'assigned_to',
-        ]);
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
-            'name' => 'class',
-        ]);
-        $this->renderField('checkbox', [
-            'name' => 'hide',
-            'options' => glsr(SiteReviewsShortcode::class)->getHideOptions(),
-        ]);
-    }
+	/**
+	 * @param array $instance
+	 * @return void
+	 */
+	public function form($instance)
+	{
+		$this->widgetArgs = glsr(SiteReviewsShortcode::class)->normalizeAtts($instance);
+		$terms = glsr(Database::class)->getTerms();
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Title', 'site-reviews'),
+			'name' => 'title',
+		]);
+		$this->renderField('number', [
+			'class' => 'small-text',
+			'default' => 10,
+			'label' => __('How many reviews would you like to display?', 'site-reviews'),
+			'max' => 100,
+			'name' => 'display',
+		]);
+		$this->renderField('select', [
+			'label' => __('What is the minimum rating to display?', 'site-reviews'),
+			'name' => 'rating',
+			'options' => [
+				'5' => sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5),
+				'4' => sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4),
+				'3' => sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3),
+				'2' => sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2),
+				'1' => sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1),
+			],
+		]);
+		if (count(glsr()->reviewTypes) > 1) {
+			$this->renderField('select', [
+				'class' => 'widefat',
+				'label' => __('Which type of review would you like to display?', 'site-reviews'),
+				'name' => 'type',
+				'options' => ['' => __('All Reviews', 'site-reviews')] + glsr()->reviewTypes,
+			]);
+		}
+		if (!empty($terms)) {
+			$this->renderField('select', [
+				'class' => 'widefat',
+				'label' => __('Limit reviews to this category', 'site-reviews'),
+				'name' => 'category',
+				'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
+			]);
+		}
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'default' => '',
+			'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
+			'label' => __('Limit reviews to those assigned to this page/post ID', 'site-reviews'),
+			'name' => 'assigned_to',
+		]);
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Enter any custom CSS classes here', 'site-reviews'),
+			'name' => 'class',
+		]);
+		$this->renderField('checkbox', [
+			'name' => 'hide',
+			'options' => glsr(SiteReviewsShortcode::class)->getHideOptions(),
+		]);
+	}
 
-    /**
-     * @param array $newInstance
-     * @param array $oldInstance
-     * @return array
-     */
-    public function update($newInstance, $oldInstance)
-    {
-        if (!is_numeric($newInstance['display'])) {
-            $newInstance['display'] = 10;
-        }
-        $newInstance['display'] = min(50, max(0, intval($newInstance['display'])));
-        return parent::update($newInstance, $oldInstance);
-    }
+	/**
+	 * @param array $newInstance
+	 * @param array $oldInstance
+	 * @return array
+	 */
+	public function update($newInstance, $oldInstance)
+	{
+		if (!is_numeric($newInstance['display'])) {
+			$newInstance['display'] = 10;
+		}
+		$newInstance['display'] = min(50, max(0, intval($newInstance['display'])));
+		return parent::update($newInstance, $oldInstance);
+	}
 
-    /**
-     * @param array $args
-     * @param array $instance
-     * @return void
-     */
-    public function widget($args, $instance)
-    {
-        echo glsr(SiteReviewsShortcode::class)->build($instance, $args, 'widget');
-    }
+	/**
+	 * @param array $args
+	 * @param array $instance
+	 * @return void
+	 */
+	public function widget($args, $instance)
+	{
+		echo glsr(SiteReviewsShortcode::class)->build($instance, $args, 'widget');
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -11,65 +11,65 @@ 
      * @param array $instance
      * @return void
      */
-    public function form($instance)
+    public function form( $instance )
     {
-        $this->widgetArgs = glsr(SiteReviewsShortcode::class)->normalizeAtts($instance);
-        $terms = glsr(Database::class)->getTerms();
-        $this->renderField('text', [
+        $this->widgetArgs = glsr( SiteReviewsShortcode::class )->normalizeAtts( $instance );
+        $terms = glsr( Database::class )->getTerms();
+        $this->renderField( 'text', [
             'class' => 'widefat',
-            'label' => __('Title', 'site-reviews'),
+            'label' => __( 'Title', 'site-reviews' ),
             'name' => 'title',
-        ]);
-        $this->renderField('number', [
+        ] );
+        $this->renderField( 'number', [
             'class' => 'small-text',
             'default' => 10,
-            'label' => __('How many reviews would you like to display?', 'site-reviews'),
+            'label' => __( 'How many reviews would you like to display?', 'site-reviews' ),
             'max' => 100,
             'name' => 'display',
-        ]);
-        $this->renderField('select', [
-            'label' => __('What is the minimum rating to display?', 'site-reviews'),
+        ] );
+        $this->renderField( 'select', [
+            'label' => __( 'What is the minimum rating to display?', 'site-reviews' ),
             'name' => 'rating',
             'options' => [
-                '5' => sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5),
-                '4' => sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4),
-                '3' => sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3),
-                '2' => sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2),
-                '1' => sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1),
+                '5' => sprintf( _n( '%s star', '%s stars', 5, 'site-reviews' ), 5 ),
+                '4' => sprintf( _n( '%s star', '%s stars', 4, 'site-reviews' ), 4 ),
+                '3' => sprintf( _n( '%s star', '%s stars', 3, 'site-reviews' ), 3 ),
+                '2' => sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 ),
+                '1' => sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 ),
             ],
-        ]);
-        if (count(glsr()->reviewTypes) > 1) {
-            $this->renderField('select', [
+        ] );
+        if( count( glsr()->reviewTypes ) > 1 ) {
+            $this->renderField( 'select', [
                 'class' => 'widefat',
-                'label' => __('Which type of review would you like to display?', 'site-reviews'),
+                'label' => __( 'Which type of review would you like to display?', 'site-reviews' ),
                 'name' => 'type',
-                'options' => ['' => __('All Reviews', 'site-reviews')] + glsr()->reviewTypes,
-            ]);
+                'options' => ['' => __( 'All Reviews', 'site-reviews' )] + glsr()->reviewTypes,
+            ] );
         }
-        if (!empty($terms)) {
-            $this->renderField('select', [
+        if( !empty($terms) ) {
+            $this->renderField( 'select', [
                 'class' => 'widefat',
-                'label' => __('Limit reviews to this category', 'site-reviews'),
+                'label' => __( 'Limit reviews to this category', 'site-reviews' ),
                 'name' => 'category',
-                'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
-            ]);
+                'options' => ['' => __( 'All Categories', 'site-reviews' )] + $terms,
+            ] );
         }
-        $this->renderField('text', [
+        $this->renderField( 'text', [
             'class' => 'widefat',
             'default' => '',
-            'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
-            'label' => __('Limit reviews to those assigned to this page/post ID', 'site-reviews'),
+            'description' => sprintf( __( "Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews' ), '<code>post_id</code>' ),
+            'label' => __( 'Limit reviews to those assigned to this page/post ID', 'site-reviews' ),
             'name' => 'assigned_to',
-        ]);
-        $this->renderField('text', [
+        ] );
+        $this->renderField( 'text', [
             'class' => 'widefat',
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
+            'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ),
             'name' => 'class',
-        ]);
-        $this->renderField('checkbox', [
+        ] );
+        $this->renderField( 'checkbox', [
             'name' => 'hide',
-            'options' => glsr(SiteReviewsShortcode::class)->getHideOptions(),
-        ]);
+            'options' => glsr( SiteReviewsShortcode::class )->getHideOptions(),
+        ] );
     }
 
     /**
@@ -77,13 +77,13 @@ 
      * @param array $oldInstance
      * @return array
      */
-    public function update($newInstance, $oldInstance)
+    public function update( $newInstance, $oldInstance )
     {
-        if (!is_numeric($newInstance['display'])) {
+        if( !is_numeric( $newInstance['display'] ) ) {
             $newInstance['display'] = 10;
         }
-        $newInstance['display'] = min(50, max(0, intval($newInstance['display'])));
-        return parent::update($newInstance, $oldInstance);
+        $newInstance['display'] = min( 50, max( 0, intval( $newInstance['display'] ) ) );
+        return parent::update( $newInstance, $oldInstance );
     }
 
     /**
@@ -91,8 +91,8 @@ 
      * @param array $instance
      * @return void
      */
-    public function widget($args, $instance)
+    public function widget( $args, $instance )
     {
-        echo glsr(SiteReviewsShortcode::class)->build($instance, $args, 'widget');
+        echo glsr( SiteReviewsShortcode::class )->build( $instance, $args, 'widget' );
     }
 }

plugin/Shortcodes/SiteReviewsPopup.php

Indentation +80 added lines, -80 removed lines

@@ -4,84 +4,84 @@
 
 class SiteReviewsPopup extends TinymcePopupGenerator
 {
-    /**
-     * @return array
-     */
-    public function fields()
-    {
-        return [[
-            'html' => sprintf('<p class="strong">%s</p>', esc_html__('All settings are optional.', 'site-reviews')),
-            'minWidth' => 320,
-            'type' => 'container',
-        ], [
-            'label' => esc_html__('Title', 'site-reviews'),
-            'name' => 'title',
-            'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
-            'type' => 'textbox',
-        ], [
-            'label' => esc_html__('Display', 'site-reviews'),
-            'maxLength' => 5,
-            'name' => 'display',
-            'size' => 3,
-            'text' => '10',
-            'tooltip' => __('How many reviews would you like to display (default: 10)?', 'site-reviews'),
-            'type' => 'textbox',
-        ], [
-            'label' => esc_html__('Rating', 'site-reviews'),
-            'name' => 'rating',
-            'options' => [
-                '5' => esc_html(sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5)),
-                '4' => esc_html(sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4)),
-                '3' => esc_html(sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3)),
-                '2' => esc_html(sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2)),
-                '1' => esc_html(sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1)),
-                '0' => esc_html(__('Unrated', 'site-reviews')),
-            ],
-            'tooltip' => __('What is the minimum rating to display (default: 1 star)?', 'site-reviews'),
-            'type' => 'listbox',
-        ], [
-            'label' => esc_html__('Pagination', 'site-reviews'),
-            'name' => 'pagination',
-            'options' => [
-                'true' => esc_html__('Enable', 'site-reviews'),
-                'ajax' => esc_html__('Enable (using ajax)', 'site-reviews'),
-                'false' => esc_html__('Disable', 'site-reviews'),
-            ],
-            'tooltip' => __('When using pagination this shortcode can only be used once on a page. (default: disable)', 'site-reviews'),
-            'type' => 'listbox',
-        ],
-        $this->getTypes(__('Which type of review would you like to display?', 'site-reviews')),
-        $this->getCategories(__('Limit reviews to this category.', 'site-reviews')),
-        [
-            'label' => esc_html__('Assigned To', 'site-reviews'),
-            'name' => 'assigned_to',
-            'tooltip' => __('Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page, or "parent_id" to use the ID of the parent page.', 'site-reviews'),
-            'type' => 'textbox',
-        ], [
-            'label' => esc_html__('Schema', 'site-reviews'),
-            'name' => 'schema',
-            'options' => [
-                'true' => esc_html__('Enable rich snippets', 'site-reviews'),
-                'false' => esc_html__('Disable rich snippets', 'site-reviews'),
-            ],
-            'tooltip' => __('Rich snippets are disabled by default.', 'site-reviews'),
-            'type' => 'listbox',
-        ], [
-            'label' => esc_html__('Classes', 'site-reviews'),
-            'name' => 'class',
-            'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
-            'type' => 'textbox',
-        ], [
-            'columns' => 2,
-            'items' => $this->getHideOptions(),
-            'label' => esc_html__('Hide', 'site-reviews'),
-            'layout' => 'grid',
-            'spacing' => 5,
-            'type' => 'container',
-        ], [
-            'hidden' => true,
-            'name' => 'id',
-            'type' => 'textbox',
-        ], ];
-    }
+	/**
+	 * @return array
+	 */
+	public function fields()
+	{
+		return [[
+			'html' => sprintf('<p class="strong">%s</p>', esc_html__('All settings are optional.', 'site-reviews')),
+			'minWidth' => 320,
+			'type' => 'container',
+		], [
+			'label' => esc_html__('Title', 'site-reviews'),
+			'name' => 'title',
+			'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
+			'type' => 'textbox',
+		], [
+			'label' => esc_html__('Display', 'site-reviews'),
+			'maxLength' => 5,
+			'name' => 'display',
+			'size' => 3,
+			'text' => '10',
+			'tooltip' => __('How many reviews would you like to display (default: 10)?', 'site-reviews'),
+			'type' => 'textbox',
+		], [
+			'label' => esc_html__('Rating', 'site-reviews'),
+			'name' => 'rating',
+			'options' => [
+				'5' => esc_html(sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5)),
+				'4' => esc_html(sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4)),
+				'3' => esc_html(sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3)),
+				'2' => esc_html(sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2)),
+				'1' => esc_html(sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1)),
+				'0' => esc_html(__('Unrated', 'site-reviews')),
+			],
+			'tooltip' => __('What is the minimum rating to display (default: 1 star)?', 'site-reviews'),
+			'type' => 'listbox',
+		], [
+			'label' => esc_html__('Pagination', 'site-reviews'),
+			'name' => 'pagination',
+			'options' => [
+				'true' => esc_html__('Enable', 'site-reviews'),
+				'ajax' => esc_html__('Enable (using ajax)', 'site-reviews'),
+				'false' => esc_html__('Disable', 'site-reviews'),
+			],
+			'tooltip' => __('When using pagination this shortcode can only be used once on a page. (default: disable)', 'site-reviews'),
+			'type' => 'listbox',
+		],
+		$this->getTypes(__('Which type of review would you like to display?', 'site-reviews')),
+		$this->getCategories(__('Limit reviews to this category.', 'site-reviews')),
+		[
+			'label' => esc_html__('Assigned To', 'site-reviews'),
+			'name' => 'assigned_to',
+			'tooltip' => __('Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page, or "parent_id" to use the ID of the parent page.', 'site-reviews'),
+			'type' => 'textbox',
+		], [
+			'label' => esc_html__('Schema', 'site-reviews'),
+			'name' => 'schema',
+			'options' => [
+				'true' => esc_html__('Enable rich snippets', 'site-reviews'),
+				'false' => esc_html__('Disable rich snippets', 'site-reviews'),
+			],
+			'tooltip' => __('Rich snippets are disabled by default.', 'site-reviews'),
+			'type' => 'listbox',
+		], [
+			'label' => esc_html__('Classes', 'site-reviews'),
+			'name' => 'class',
+			'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
+			'type' => 'textbox',
+		], [
+			'columns' => 2,
+			'items' => $this->getHideOptions(),
+			'label' => esc_html__('Hide', 'site-reviews'),
+			'layout' => 'grid',
+			'spacing' => 5,
+			'type' => 'container',
+		], [
+			'hidden' => true,
+			'name' => 'id',
+			'type' => 'textbox',
+		], ];
+	}
 }

Spacing +29 added lines, -29 removed lines

@@ -10,71 +10,71 @@
     public function fields()
     {
         return [[
-            'html' => sprintf('<p class="strong">%s</p>', esc_html__('All settings are optional.', 'site-reviews')),
+            'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' ) ),
             'minWidth' => 320,
             'type' => 'container',
         ], [
-            'label' => esc_html__('Title', 'site-reviews'),
+            'label' => esc_html__( 'Title', 'site-reviews' ),
             'name' => 'title',
-            'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
+            'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
             'type' => 'textbox',
         ], [
-            'label' => esc_html__('Display', 'site-reviews'),
+            'label' => esc_html__( 'Display', 'site-reviews' ),
             'maxLength' => 5,
             'name' => 'display',
             'size' => 3,
             'text' => '10',
-            'tooltip' => __('How many reviews would you like to display (default: 10)?', 'site-reviews'),
+            'tooltip' => __( 'How many reviews would you like to display (default: 10)?', 'site-reviews' ),
             'type' => 'textbox',
         ], [
-            'label' => esc_html__('Rating', 'site-reviews'),
+            'label' => esc_html__( 'Rating', 'site-reviews' ),
             'name' => 'rating',
             'options' => [
-                '5' => esc_html(sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5)),
-                '4' => esc_html(sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4)),
-                '3' => esc_html(sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3)),
-                '2' => esc_html(sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2)),
-                '1' => esc_html(sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1)),
-                '0' => esc_html(__('Unrated', 'site-reviews')),
+                '5' => esc_html( sprintf( _n( '%s star', '%s stars', 5, 'site-reviews' ), 5 ) ),
+                '4' => esc_html( sprintf( _n( '%s star', '%s stars', 4, 'site-reviews' ), 4 ) ),
+                '3' => esc_html( sprintf( _n( '%s star', '%s stars', 3, 'site-reviews' ), 3 ) ),
+                '2' => esc_html( sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 ) ),
+                '1' => esc_html( sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 ) ),
+                '0' => esc_html( __( 'Unrated', 'site-reviews' ) ),
             ],
-            'tooltip' => __('What is the minimum rating to display (default: 1 star)?', 'site-reviews'),
+            'tooltip' => __( 'What is the minimum rating to display (default: 1 star)?', 'site-reviews' ),
             'type' => 'listbox',
         ], [
-            'label' => esc_html__('Pagination', 'site-reviews'),
+            'label' => esc_html__( 'Pagination', 'site-reviews' ),
             'name' => 'pagination',
             'options' => [
-                'true' => esc_html__('Enable', 'site-reviews'),
-                'ajax' => esc_html__('Enable (using ajax)', 'site-reviews'),
-                'false' => esc_html__('Disable', 'site-reviews'),
+                'true' => esc_html__( 'Enable', 'site-reviews' ),
+                'ajax' => esc_html__( 'Enable (using ajax)', 'site-reviews' ),
+                'false' => esc_html__( 'Disable', 'site-reviews' ),
             ],
-            'tooltip' => __('When using pagination this shortcode can only be used once on a page. (default: disable)', 'site-reviews'),
+            'tooltip' => __( 'When using pagination this shortcode can only be used once on a page. (default: disable)', 'site-reviews' ),
             'type' => 'listbox',
         ],
-        $this->getTypes(__('Which type of review would you like to display?', 'site-reviews')),
-        $this->getCategories(__('Limit reviews to this category.', 'site-reviews')),
+        $this->getTypes( __( 'Which type of review would you like to display?', 'site-reviews' ) ),
+        $this->getCategories( __( 'Limit reviews to this category.', 'site-reviews' ) ),
         [
-            'label' => esc_html__('Assigned To', 'site-reviews'),
+            'label' => esc_html__( 'Assigned To', 'site-reviews' ),
             'name' => 'assigned_to',
-            'tooltip' => __('Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page, or "parent_id" to use the ID of the parent page.', 'site-reviews'),
+            'tooltip' => __( 'Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page, or "parent_id" to use the ID of the parent page.', 'site-reviews' ),
             'type' => 'textbox',
         ], [
-            'label' => esc_html__('Schema', 'site-reviews'),
+            'label' => esc_html__( 'Schema', 'site-reviews' ),
             'name' => 'schema',
             'options' => [
-                'true' => esc_html__('Enable rich snippets', 'site-reviews'),
-                'false' => esc_html__('Disable rich snippets', 'site-reviews'),
+                'true' => esc_html__( 'Enable rich snippets', 'site-reviews' ),
+                'false' => esc_html__( 'Disable rich snippets', 'site-reviews' ),
             ],
-            'tooltip' => __('Rich snippets are disabled by default.', 'site-reviews'),
+            'tooltip' => __( 'Rich snippets are disabled by default.', 'site-reviews' ),
             'type' => 'listbox',
         ], [
-            'label' => esc_html__('Classes', 'site-reviews'),
+            'label' => esc_html__( 'Classes', 'site-reviews' ),
             'name' => 'class',
-            'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
+            'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
             'type' => 'textbox',
         ], [
             'columns' => 2,
             'items' => $this->getHideOptions(),
-            'label' => esc_html__('Hide', 'site-reviews'),
+            'label' => esc_html__( 'Hide', 'site-reviews' ),
             'layout' => 'grid',
             'spacing' => 5,
             'type' => 'container',