pryley / site-reviews

templates/login-register.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div class="glsr-login-register">
     <p>{{ text }}</p>

templates/reviews.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div class="glsr-reviews-wrap">
     <div class="{{ class }}" id="{{ id }}">

plugin/Modules/Email.php

Indentation +197 added lines, -197 removed lines

@@ -9,201 +9,201 @@
 
 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, $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, $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,50 +127,50 @@ 
      */
     protected function buildHtmlMessage()
     {
-        $template = trim(glsr(OptionManager::class)->get('settings.general.notification_message'));
-        if (!empty($template)) {
-            $message = glsr(Template::class)->interpolate($template, $this->email['template-tags'], $this->email['template']);
-        } elseif ($this->email['template']) {
-            $message = glsr(Template::class)->build('templates/'.$this->email['template'], [
+        $template = trim( glsr( OptionManager::class )->get( 'settings.general.notification_message' ) );
+        if( !empty($template) ) {
+            $message = glsr( Template::class )->interpolate( $template, $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)) {
+        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 );
     }
 
     /**
@@ -189,21 +189,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

@@ -130,7 +130,8 @@
         $template = trim(glsr(OptionManager::class)->get('settings.general.notification_message'));
         if (!empty($template)) {
             $message = glsr(Template::class)->interpolate($template, $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'],
             ]);

plugin/Modules/Upgrader/Upgrade_3_0_0.php

Indentation +147 added lines, -147 removed lines

@@ -8,160 +8,160 @@
 
 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;
 
-    public function __construct()
-    {
-        $this->migrateSettings();
-    }
+	public function __construct()
+	{
+		$this->migrateSettings();
+	}
 
-    /**
-     * @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 = glsr(Helper::class)->convertDotNotationArray($this->oldSettings);
-        $newSettings = glsr(Helper::class)->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 = glsr(Helper::class)->convertDotNotationArray($this->oldSettings);
+		$newSettings = glsr(Helper::class)->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 array
-     */
-    protected function getNewSettings()
-    {
-        return wp_parse_args(
-            glsr(Helper::class)->flattenArray(glsr(OptionManager::class)->all()),
-            glsr(DefaultsManager::class)->defaults()
-        );
-    }
+	/**
+	 * @return array
+	 */
+	protected function getNewSettings()
+	{
+		return wp_parse_args(
+			glsr(Helper::class)->flattenArray(glsr(OptionManager::class)->all()),
+			glsr(DefaultsManager::class)->defaults()
+		);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getOldSettings()
-    {
-        $defaults = array_fill_keys(array_keys(static::MAPPED_SETTINGS), '');
-        $settings = glsr(Helper::class)->flattenArray(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 = glsr(Helper::class)->flattenArray(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';
+	}
 }

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 = glsr(Helper::class)->convertDotNotationArray($this->oldSettings);
-        $newSettings = glsr(Helper::class)->convertDotNotationArray($this->newSettings);
-        if (isset($oldSettings['settings']['strings']) && is_array($oldSettings['settings']['strings'])) {
+        $oldSettings = glsr( Helper::class )->convertDotNotationArray( $this->oldSettings );
+        $newSettings = glsr( Helper::class )->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(
-            glsr(Helper::class)->flattenArray(glsr(OptionManager::class)->all()),
-            glsr(DefaultsManager::class)->defaults()
+            glsr( Helper::class )->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 = glsr(Helper::class)->flattenArray(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 = glsr( Helper::class )->flattenArray( 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';
     }

plugin/Modules/Slack.php

Indentation +123 added lines, -123 removed lines

@@ -9,138 +9,138 @@
 
 class Slack
 {
-    /**
-     * @var string
-     */
-    public $endpoint;
+	/**
+	 * @var string
+	 */
+	public $endpoint;
 
-    /**
-     * @var array
-     */
-    public $notification;
+	/**
+	 * @var array
+	 */
+	public $notification;
 
-    /**
-     * @var Review
-     */
-    public $review;
+	/**
+	 * @var Review
+	 */
+	public $review;
 
-    public function __construct()
-    {
-        $this->endpoint = glsr(OptionManager::class)->get('settings.general.notification_slack');
-    }
+	public function __construct()
+	{
+		$this->endpoint = glsr(OptionManager::class)->get('settings.general.notification_slack');
+	}
 
-    /**
-     * @return Slack
-     */
-    public function compose(Review $review, array $notification)
-    {
-        if (empty($this->endpoint)) {
-            return $this;
-        }
-        $args = shortcode_atts(glsr(SlackDefaults::class)->defaults(), $notification);
-        $this->review = $review;
-        $notification = [
-            'icon_url' => $args['icon_url'],
-            'username' => $args['username'],
-            'attachments' => [[
-                'actions' => $this->buildAction($args),
-                'pretext' => $args['pretext'],
-                'color' => $args['color'],
-                'fallback' => $args['fallback'],
-                'fields' => $this->buildFields(),
-            ]],
-        ];
-        $this->notification = apply_filters('site-reviews/slack/compose', $notification, $this);
-        return $this;
-    }
+	/**
+	 * @return Slack
+	 */
+	public function compose(Review $review, array $notification)
+	{
+		if (empty($this->endpoint)) {
+			return $this;
+		}
+		$args = shortcode_atts(glsr(SlackDefaults::class)->defaults(), $notification);
+		$this->review = $review;
+		$notification = [
+			'icon_url' => $args['icon_url'],
+			'username' => $args['username'],
+			'attachments' => [[
+				'actions' => $this->buildAction($args),
+				'pretext' => $args['pretext'],
+				'color' => $args['color'],
+				'fallback' => $args['fallback'],
+				'fields' => $this->buildFields(),
+			]],
+		];
+		$this->notification = apply_filters('site-reviews/slack/compose', $notification, $this);
+		return $this;
+	}
 
-    /**
-     * @return WP_Error|array
-     */
-    public function send()
-    {
-        if (empty($this->endpoint)) {
-            return new WP_Error('slack', 'Slack notification was not sent: missing endpoint');
-        }
-        return wp_remote_post($this->endpoint, [
-            'blocking' => false,
-            'body' => json_encode($this->notification),
-            'headers' => ['Content-Type' => 'application/json'],
-            'httpversion' => '1.0',
-            'method' => 'POST',
-            'redirection' => 5,
-            'sslverify' => false,
-            'timeout' => 45,
-        ]);
-    }
+	/**
+	 * @return WP_Error|array
+	 */
+	public function send()
+	{
+		if (empty($this->endpoint)) {
+			return new WP_Error('slack', 'Slack notification was not sent: missing endpoint');
+		}
+		return wp_remote_post($this->endpoint, [
+			'blocking' => false,
+			'body' => json_encode($this->notification),
+			'headers' => ['Content-Type' => 'application/json'],
+			'httpversion' => '1.0',
+			'method' => 'POST',
+			'redirection' => 5,
+			'sslverify' => false,
+			'timeout' => 45,
+		]);
+	}
 
-    /**
-     * @return array
-     */
-    protected function buildAction(array $args)
-    {
-        return [[
-            'text' => $args['button_text'],
-            'type' => 'button',
-            'url' => $args['button_url'],
-        ]];
-    }
+	/**
+	 * @return array
+	 */
+	protected function buildAction(array $args)
+	{
+		return [[
+			'text' => $args['button_text'],
+			'type' => 'button',
+			'url' => $args['button_url'],
+		]];
+	}
 
-    /**
-     * @return array
-     */
-    protected function buildAuthorField()
-    {
-        $email = !empty($this->review->email)
-            ? '<'.$this->review->email.'>'
-            : '';
-        $author = trim(rtrim($this->review->author).' '.$email);
-        return ['value' => implode(' - ', array_filter([$author, $this->review->ip_address]))];
-    }
+	/**
+	 * @return array
+	 */
+	protected function buildAuthorField()
+	{
+		$email = !empty($this->review->email)
+			? '<'.$this->review->email.'>'
+			: '';
+		$author = trim(rtrim($this->review->author).' '.$email);
+		return ['value' => implode(' - ', array_filter([$author, $this->review->ip_address]))];
+	}
 
-    /**
-     * @return array
-     */
-    protected function buildContentField()
-    {
-        return !empty($this->review->content)
-            ? ['value' => $this->review->content]
-            : [];
-    }
+	/**
+	 * @return array
+	 */
+	protected function buildContentField()
+	{
+		return !empty($this->review->content)
+			? ['value' => $this->review->content]
+			: [];
+	}
 
-    /**
-     * @return array
-     */
-    protected function buildFields()
-    {
-        $fields = [
-            $this->buildStarsField(),
-            $this->buildTitleField(),
-            $this->buildContentField(),
-            $this->buildAuthorField(),
-        ];
-        return array_filter($fields);
-    }
+	/**
+	 * @return array
+	 */
+	protected function buildFields()
+	{
+		$fields = [
+			$this->buildStarsField(),
+			$this->buildTitleField(),
+			$this->buildContentField(),
+			$this->buildAuthorField(),
+		];
+		return array_filter($fields);
+	}
 
-    /**
-     * @return array
-     */
-    protected function buildStarsField()
-    {
-        $solidStars = str_repeat('★', $this->review->rating);
-        $emptyStars = str_repeat('☆', max(0, glsr()->constant('MAX_RATING', Rating::class) - $this->review->rating));
-        $stars = $solidStars.$emptyStars;
-        $stars = apply_filters('site-reviews/slack/stars', $stars, $this->review->rating, glsr()->constant('MAX_RATING', Rating::class));
-        return ['title' => $stars];
-    }
+	/**
+	 * @return array
+	 */
+	protected function buildStarsField()
+	{
+		$solidStars = str_repeat('★', $this->review->rating);
+		$emptyStars = str_repeat('☆', max(0, glsr()->constant('MAX_RATING', Rating::class) - $this->review->rating));
+		$stars = $solidStars.$emptyStars;
+		$stars = apply_filters('site-reviews/slack/stars', $stars, $this->review->rating, glsr()->constant('MAX_RATING', Rating::class));
+		return ['title' => $stars];
+	}
 
-    /**
-     * @return array
-     */
-    protected function buildTitleField()
-    {
-        return !empty($this->review->title)
-            ? ['title' => $this->review->title]
-            : [];
-    }
+	/**
+	 * @return array
+	 */
+	protected function buildTitleField()
+	{
+		return !empty($this->review->title)
+			? ['title' => $this->review->title]
+			: [];
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -26,31 +26,31 @@ 
 
     public function __construct()
     {
-        $this->endpoint = glsr(OptionManager::class)->get('settings.general.notification_slack');
+        $this->endpoint = glsr( OptionManager::class )->get( 'settings.general.notification_slack' );
     }
 
     /**
      * @return Slack
      */
-    public function compose(Review $review, array $notification)
+    public function compose( Review $review, array $notification )
     {
-        if (empty($this->endpoint)) {
+        if( empty($this->endpoint) ) {
             return $this;
         }
-        $args = shortcode_atts(glsr(SlackDefaults::class)->defaults(), $notification);
+        $args = shortcode_atts( glsr( SlackDefaults::class )->defaults(), $notification );
         $this->review = $review;
         $notification = [
             'icon_url' => $args['icon_url'],
             'username' => $args['username'],
             'attachments' => [[
-                'actions' => $this->buildAction($args),
+                'actions' => $this->buildAction( $args ),
                 'pretext' => $args['pretext'],
                 'color' => $args['color'],
                 'fallback' => $args['fallback'],
                 'fields' => $this->buildFields(),
             ]],
         ];
-        $this->notification = apply_filters('site-reviews/slack/compose', $notification, $this);
+        $this->notification = apply_filters( 'site-reviews/slack/compose', $notification, $this );
         return $this;
     }
 
@@ -59,25 +59,25 @@ 
      */
     public function send()
     {
-        if (empty($this->endpoint)) {
-            return new WP_Error('slack', 'Slack notification was not sent: missing endpoint');
+        if( empty($this->endpoint) ) {
+            return new WP_Error( 'slack', 'Slack notification was not sent: missing endpoint' );
         }
-        return wp_remote_post($this->endpoint, [
+        return wp_remote_post( $this->endpoint, [
             'blocking' => false,
-            'body' => json_encode($this->notification),
+            'body' => json_encode( $this->notification ),
             'headers' => ['Content-Type' => 'application/json'],
             'httpversion' => '1.0',
             'method' => 'POST',
             'redirection' => 5,
             'sslverify' => false,
             'timeout' => 45,
-        ]);
+        ] );
     }
 
     /**
      * @return array
      */
-    protected function buildAction(array $args)
+    protected function buildAction( array $args )
     {
         return [[
             'text' => $args['button_text'],
@@ -94,8 +94,8 @@ 
         $email = !empty($this->review->email)
             ? '<'.$this->review->email.'>'
             : '';
-        $author = trim(rtrim($this->review->author).' '.$email);
-        return ['value' => implode(' - ', array_filter([$author, $this->review->ip_address]))];
+        $author = trim( rtrim( $this->review->author ).' '.$email );
+        return ['value' => implode( ' - ', array_filter( [$author, $this->review->ip_address] ) )];
     }
 
     /**
@@ -119,7 +119,7 @@ 
             $this->buildContentField(),
             $this->buildAuthorField(),
         ];
-        return array_filter($fields);
+        return array_filter( $fields );
     }
 
     /**
@@ -127,10 +127,10 @@ 
      */
     protected function buildStarsField()
     {
-        $solidStars = str_repeat('★', $this->review->rating);
-        $emptyStars = str_repeat('☆', max(0, glsr()->constant('MAX_RATING', Rating::class) - $this->review->rating));
+        $solidStars = str_repeat( '★', $this->review->rating );
+        $emptyStars = str_repeat( '☆', max( 0, glsr()->constant( 'MAX_RATING', Rating::class ) - $this->review->rating ) );
         $stars = $solidStars.$emptyStars;
-        $stars = apply_filters('site-reviews/slack/stars', $stars, $this->review->rating, glsr()->constant('MAX_RATING', Rating::class));
+        $stars = apply_filters( 'site-reviews/slack/stars', $stars, $this->review->rating, glsr()->constant( 'MAX_RATING', Rating::class ) );
         return ['title' => $stars];
     }
 

plugin/Modules/Date.php

Indentation +44 added lines, -44 removed lines

@@ -4,49 +4,49 @@
 
 class Date
 {
-    /**
-     * [60, 1],
-     * [60 * 100, 60],
-     * [3600 * 70, 3600],
-     * [3600 * 24 * 10, 3600 * 24],
-     * [3600 * 24 * 30, 3600 * 24 * 7],
-     * [3600 * 24 * 30 * 30, 3600 * 24 * 30],
-     * [INF, 3600 * 24 * 265],.
-     */
-    protected static $TIME_PERIODS = [
-        [60, 1],
-        [6000, 60],
-        [252000, 3600],
-        [864000, 86400],
-        [2592000, 604800],
-        [77760000, 2592000],
-        [INF, 22896000],
-    ];
+	/**
+	 * [60, 1],
+	 * [60 * 100, 60],
+	 * [3600 * 70, 3600],
+	 * [3600 * 24 * 10, 3600 * 24],
+	 * [3600 * 24 * 30, 3600 * 24 * 7],
+	 * [3600 * 24 * 30 * 30, 3600 * 24 * 30],
+	 * [INF, 3600 * 24 * 265],.
+	 */
+	protected static $TIME_PERIODS = [
+		[60, 1],
+		[6000, 60],
+		[252000, 3600],
+		[864000, 86400],
+		[2592000, 604800],
+		[77760000, 2592000],
+		[INF, 22896000],
+	];
 
-    /**
-     * @return string
-     */
-    public function relative($date)
-    {
-        $diff = time() - strtotime($date);
-        foreach (static::$TIME_PERIODS as $i => $timePeriod) {
-            if ($diff > $timePeriod[0]) {
-                continue;
-            }
-            $unit = intval(floor($diff / $timePeriod[1]));
-            $relativeDates = [
-                _n('%s second ago', '%s seconds ago', $unit, 'site-reviews'),
-                _n('%s minute ago', '%s minutes ago', $unit, 'site-reviews'),
-                _n('an hour ago', '%s hours ago', $unit, 'site-reviews'),
-                _n('yesterday', '%s days ago', $unit, 'site-reviews'),
-                _n('a week ago', '%s weeks ago', $unit, 'site-reviews'),
-                _n('%s month ago', '%s months ago', $unit, 'site-reviews'),
-                _n('%s year ago', '%s years ago', $unit, 'site-reviews'),
-            ];
-            $relativeDate = $relativeDates[$i];
-            return false !== strpos($relativeDate, '%s')
-                ? sprintf($relativeDate, $unit)
-                : $relativeDate;
-        }
-    }
+	/**
+	 * @return string
+	 */
+	public function relative($date)
+	{
+		$diff = time() - strtotime($date);
+		foreach (static::$TIME_PERIODS as $i => $timePeriod) {
+			if ($diff > $timePeriod[0]) {
+				continue;
+			}
+			$unit = intval(floor($diff / $timePeriod[1]));
+			$relativeDates = [
+				_n('%s second ago', '%s seconds ago', $unit, 'site-reviews'),
+				_n('%s minute ago', '%s minutes ago', $unit, 'site-reviews'),
+				_n('an hour ago', '%s hours ago', $unit, 'site-reviews'),
+				_n('yesterday', '%s days ago', $unit, 'site-reviews'),
+				_n('a week ago', '%s weeks ago', $unit, 'site-reviews'),
+				_n('%s month ago', '%s months ago', $unit, 'site-reviews'),
+				_n('%s year ago', '%s years ago', $unit, 'site-reviews'),
+			];
+			$relativeDate = $relativeDates[$i];
+			return false !== strpos($relativeDate, '%s')
+				? sprintf($relativeDate, $unit)
+				: $relativeDate;
+		}
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -26,26 +26,26 @@
     /**
      * @return string
      */
-    public function relative($date)
+    public function relative( $date )
     {
-        $diff = time() - strtotime($date);
-        foreach (static::$TIME_PERIODS as $i => $timePeriod) {
-            if ($diff > $timePeriod[0]) {
+        $diff = time() - strtotime( $date );
+        foreach( static::$TIME_PERIODS as $i => $timePeriod ) {
+            if( $diff > $timePeriod[0] ) {
                 continue;
             }
-            $unit = intval(floor($diff / $timePeriod[1]));
+            $unit = intval( floor( $diff / $timePeriod[1] ) );
             $relativeDates = [
-                _n('%s second ago', '%s seconds ago', $unit, 'site-reviews'),
-                _n('%s minute ago', '%s minutes ago', $unit, 'site-reviews'),
-                _n('an hour ago', '%s hours ago', $unit, 'site-reviews'),
-                _n('yesterday', '%s days ago', $unit, 'site-reviews'),
-                _n('a week ago', '%s weeks ago', $unit, 'site-reviews'),
-                _n('%s month ago', '%s months ago', $unit, 'site-reviews'),
-                _n('%s year ago', '%s years ago', $unit, 'site-reviews'),
+                _n( '%s second ago', '%s seconds ago', $unit, 'site-reviews' ),
+                _n( '%s minute ago', '%s minutes ago', $unit, 'site-reviews' ),
+                _n( 'an hour ago', '%s hours ago', $unit, 'site-reviews' ),
+                _n( 'yesterday', '%s days ago', $unit, 'site-reviews' ),
+                _n( 'a week ago', '%s weeks ago', $unit, 'site-reviews' ),
+                _n( '%s month ago', '%s months ago', $unit, 'site-reviews' ),
+                _n( '%s year ago', '%s years ago', $unit, 'site-reviews' ),
             ];
             $relativeDate = $relativeDates[$i];
-            return false !== strpos($relativeDate, '%s')
-                ? sprintf($relativeDate, $unit)
+            return false !== strpos( $relativeDate, '%s' )
+                ? sprintf( $relativeDate, $unit )
                 : $relativeDate;
         }
     }

plugin/Modules/Translator.php

Indentation +139 added lines, -139 removed lines

@@ -6,151 +6,151 @@
 
 class Translator
 {
-    /**
-     * @param string $translation
-     * @param string $text
-     * @param string $domain
-     * @return string
-     */
-    public function filterGettext($translation, $text, $domain)
-    {
-        return $this->translate($translation, $domain, [
-            'single' => $text,
-        ]);
-    }
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @param string $domain
+	 * @return string
+	 */
+	public function filterGettext($translation, $text, $domain)
+	{
+		return $this->translate($translation, $domain, [
+			'single' => $text,
+		]);
+	}
 
-    /**
-     * @param string $translation
-     * @param string $text
-     * @param string $context
-     * @param string $domain
-     * @return string
-     */
-    public function filterGettextWithContext($translation, $text, $context, $domain)
-    {
-        return $this->translate($translation, $domain, [
-            'context' => $context,
-            'single' => $text,
-        ]);
-    }
+	/**
+	 * @param string $translation
+	 * @param string $text
+	 * @param string $context
+	 * @param string $domain
+	 * @return string
+	 */
+	public function filterGettextWithContext($translation, $text, $context, $domain)
+	{
+		return $this->translate($translation, $domain, [
+			'context' => $context,
+			'single' => $text,
+		]);
+	}
 
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @param string $domain
-     * @return string
-     */
-    public function filterNgettext($translation, $single, $plural, $number, $domain)
-    {
-        return $this->translate($translation, $domain, [
-            'number' => $number,
-            'plural' => $plural,
-            'single' => $single,
-        ]);
-    }
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @param string $domain
+	 * @return string
+	 */
+	public function filterNgettext($translation, $single, $plural, $number, $domain)
+	{
+		return $this->translate($translation, $domain, [
+			'number' => $number,
+			'plural' => $plural,
+			'single' => $single,
+		]);
+	}
 
-    /**
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @param string $context
-     * @param string $domain
-     * @return string
-     */
-    public function filterNgettextWithContext($translation, $single, $plural, $number, $context, $domain)
-    {
-        return $this->translate($translation, $domain, [
-            'context' => $context,
-            'number' => $number,
-            'plural' => $plural,
-            'single' => $single,
-        ]);
-    }
+	/**
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @param string $context
+	 * @param string $domain
+	 * @return string
+	 */
+	public function filterNgettextWithContext($translation, $single, $plural, $number, $context, $domain)
+	{
+		return $this->translate($translation, $domain, [
+			'context' => $context,
+			'number' => $number,
+			'plural' => $plural,
+			'single' => $single,
+		]);
+	}
 
-    /**
-     * @param string $original
-     * @param string $domain
-     * @return string
-     */
-    public function translate($original, $domain, array $args)
-    {
-        $domains = apply_filters('site-reviews/translator/domains', [Application::ID]);
-        if (!in_array($domain, $domains)) {
-            return $original;
-        }
-        $args = $this->normalizeTranslationArgs($args);
-        $strings = $this->getTranslationStrings($args['single'], $args['plural']);
-        if (empty($strings)) {
-            return $original;
-        }
-        $string = current($strings);
-        return 'plural' == $string['type']
-            ? $this->translatePlural($domain, $string, $args)
-            : $this->translateSingle($domain, $string, $args);
-    }
+	/**
+	 * @param string $original
+	 * @param string $domain
+	 * @return string
+	 */
+	public function translate($original, $domain, array $args)
+	{
+		$domains = apply_filters('site-reviews/translator/domains', [Application::ID]);
+		if (!in_array($domain, $domains)) {
+			return $original;
+		}
+		$args = $this->normalizeTranslationArgs($args);
+		$strings = $this->getTranslationStrings($args['single'], $args['plural']);
+		if (empty($strings)) {
+			return $original;
+		}
+		$string = current($strings);
+		return 'plural' == $string['type']
+			? $this->translatePlural($domain, $string, $args)
+			: $this->translateSingle($domain, $string, $args);
+	}
 
-    /**
-     * @param string $single
-     * @param string $plural
-     * @return array
-     */
-    protected function getTranslationStrings($single, $plural)
-    {
-        return array_filter(glsr(Translation::class)->translations(), function ($string) use ($single, $plural) {
-            return $string['s1'] == html_entity_decode($single, ENT_COMPAT, 'UTF-8')
-                && $string['p1'] == html_entity_decode($plural, ENT_COMPAT, 'UTF-8');
-        });
-    }
+	/**
+	 * @param string $single
+	 * @param string $plural
+	 * @return array
+	 */
+	protected function getTranslationStrings($single, $plural)
+	{
+		return array_filter(glsr(Translation::class)->translations(), function ($string) use ($single, $plural) {
+			return $string['s1'] == html_entity_decode($single, ENT_COMPAT, 'UTF-8')
+				&& $string['p1'] == html_entity_decode($plural, ENT_COMPAT, 'UTF-8');
+		});
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeTranslationArgs(array $args)
-    {
-        $defaults = [
-            'context' => '',
-            'number' => 1,
-            'plural' => '',
-            'single' => '',
-        ];
-        return shortcode_atts($defaults, $args);
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeTranslationArgs(array $args)
+	{
+		$defaults = [
+			'context' => '',
+			'number' => 1,
+			'plural' => '',
+			'single' => '',
+		];
+		return shortcode_atts($defaults, $args);
+	}
 
-    /**
-     * @param string $domain
-     * @return string
-     */
-    protected function translatePlural($domain, array $string, array $args)
-    {
-        if (!empty($string['s2'])) {
-            $args['single'] = $string['s2'];
-        }
-        if (!empty($string['p2'])) {
-            $args['plural'] = $string['p2'];
-        }
-        return get_translations_for_domain($domain)->translate_plural(
-            $args['single'],
-            $args['plural'],
-            $args['number'],
-            $args['context']
-        );
-    }
+	/**
+	 * @param string $domain
+	 * @return string
+	 */
+	protected function translatePlural($domain, array $string, array $args)
+	{
+		if (!empty($string['s2'])) {
+			$args['single'] = $string['s2'];
+		}
+		if (!empty($string['p2'])) {
+			$args['plural'] = $string['p2'];
+		}
+		return get_translations_for_domain($domain)->translate_plural(
+			$args['single'],
+			$args['plural'],
+			$args['number'],
+			$args['context']
+		);
+	}
 
-    /**
-     * @param string $domain
-     * @return string
-     */
-    protected function translateSingle($domain, array $string, array $args)
-    {
-        if (!empty($string['s2'])) {
-            $args['single'] = $string['s2'];
-        }
-        return get_translations_for_domain($domain)->translate(
-            $args['single'],
-            $args['context']
-        );
-    }
+	/**
+	 * @param string $domain
+	 * @return string
+	 */
+	protected function translateSingle($domain, array $string, array $args)
+	{
+		if (!empty($string['s2'])) {
+			$args['single'] = $string['s2'];
+		}
+		return get_translations_for_domain($domain)->translate(
+			$args['single'],
+			$args['context']
+		);
+	}
 }

Spacing +34 added lines, -34 removed lines

@@ -12,11 +12,11 @@ 
      * @param string $domain
      * @return string
      */
-    public function filterGettext($translation, $text, $domain)
+    public function filterGettext( $translation, $text, $domain )
     {
-        return $this->translate($translation, $domain, [
+        return $this->translate( $translation, $domain, [
             'single' => $text,
-        ]);
+        ] );
     }
 
     /**
@@ -26,12 +26,12 @@ 
      * @param string $domain
      * @return string
      */
-    public function filterGettextWithContext($translation, $text, $context, $domain)
+    public function filterGettextWithContext( $translation, $text, $context, $domain )
     {
-        return $this->translate($translation, $domain, [
+        return $this->translate( $translation, $domain, [
             'context' => $context,
             'single' => $text,
-        ]);
+        ] );
     }
 
     /**
@@ -42,13 +42,13 @@ 
      * @param string $domain
      * @return string
      */
-    public function filterNgettext($translation, $single, $plural, $number, $domain)
+    public function filterNgettext( $translation, $single, $plural, $number, $domain )
     {
-        return $this->translate($translation, $domain, [
+        return $this->translate( $translation, $domain, [
             'number' => $number,
             'plural' => $plural,
             'single' => $single,
-        ]);
+        ] );
     }
 
     /**
@@ -60,14 +60,14 @@ 
      * @param string $domain
      * @return string
      */
-    public function filterNgettextWithContext($translation, $single, $plural, $number, $context, $domain)
+    public function filterNgettextWithContext( $translation, $single, $plural, $number, $context, $domain )
     {
-        return $this->translate($translation, $domain, [
+        return $this->translate( $translation, $domain, [
             'context' => $context,
             'number' => $number,
             'plural' => $plural,
             'single' => $single,
-        ]);
+        ] );
     }
 
     /**
@@ -75,21 +75,21 @@ 
      * @param string $domain
      * @return string
      */
-    public function translate($original, $domain, array $args)
+    public function translate( $original, $domain, array $args )
     {
-        $domains = apply_filters('site-reviews/translator/domains', [Application::ID]);
-        if (!in_array($domain, $domains)) {
+        $domains = apply_filters( 'site-reviews/translator/domains', [Application::ID] );
+        if( !in_array( $domain, $domains ) ) {
             return $original;
         }
-        $args = $this->normalizeTranslationArgs($args);
-        $strings = $this->getTranslationStrings($args['single'], $args['plural']);
-        if (empty($strings)) {
+        $args = $this->normalizeTranslationArgs( $args );
+        $strings = $this->getTranslationStrings( $args['single'], $args['plural'] );
+        if( empty($strings) ) {
             return $original;
         }
-        $string = current($strings);
+        $string = current( $strings );
         return 'plural' == $string['type']
-            ? $this->translatePlural($domain, $string, $args)
-            : $this->translateSingle($domain, $string, $args);
+            ? $this->translatePlural( $domain, $string, $args )
+            : $this->translateSingle( $domain, $string, $args );
     }
 
     /**
@@ -97,18 +97,18 @@ 
      * @param string $plural
      * @return array
      */
-    protected function getTranslationStrings($single, $plural)
+    protected function getTranslationStrings( $single, $plural )
     {
-        return array_filter(glsr(Translation::class)->translations(), function ($string) use ($single, $plural) {
-            return $string['s1'] == html_entity_decode($single, ENT_COMPAT, 'UTF-8')
-                && $string['p1'] == html_entity_decode($plural, ENT_COMPAT, 'UTF-8');
+        return array_filter( glsr( Translation::class )->translations(), function( $string ) use ($single, $plural) {
+            return $string['s1'] == html_entity_decode( $single, ENT_COMPAT, 'UTF-8' )
+                && $string['p1'] == html_entity_decode( $plural, ENT_COMPAT, 'UTF-8' );
         });
     }
 
     /**
      * @return array
      */
-    protected function normalizeTranslationArgs(array $args)
+    protected function normalizeTranslationArgs( array $args )
     {
         $defaults = [
             'context' => '',
@@ -116,22 +116,22 @@ 
             'plural' => '',
             'single' => '',
         ];
-        return shortcode_atts($defaults, $args);
+        return shortcode_atts( $defaults, $args );
     }
 
     /**
      * @param string $domain
      * @return string
      */
-    protected function translatePlural($domain, array $string, array $args)
+    protected function translatePlural( $domain, array $string, array $args )
     {
-        if (!empty($string['s2'])) {
+        if( !empty($string['s2']) ) {
             $args['single'] = $string['s2'];
         }
-        if (!empty($string['p2'])) {
+        if( !empty($string['p2']) ) {
             $args['plural'] = $string['p2'];
         }
-        return get_translations_for_domain($domain)->translate_plural(
+        return get_translations_for_domain( $domain )->translate_plural(
             $args['single'],
             $args['plural'],
             $args['number'],
@@ -143,12 +143,12 @@ 
      * @param string $domain
      * @return string
      */
-    protected function translateSingle($domain, array $string, array $args)
+    protected function translateSingle( $domain, array $string, array $args )
     {
-        if (!empty($string['s2'])) {
+        if( !empty($string['s2']) ) {
             $args['single'] = $string['s2'];
         }
-        return get_translations_for_domain($domain)->translate(
+        return get_translations_for_domain( $domain )->translate(
             $args['single'],
             $args['context']
         );

plugin/Modules/Html/Attributes.php

Indentation +253 added lines, -253 removed lines

@@ -6,285 +6,285 @@
 
 class Attributes
 {
-    const ATTRIBUTES_A = [
-        'download', 'href', 'hreflang', 'ping', 'referrerpolicy', 'rel', 'target', 'type',
-    ];
+	const ATTRIBUTES_A = [
+		'download', 'href', 'hreflang', 'ping', 'referrerpolicy', 'rel', 'target', 'type',
+	];
 
-    const ATTRIBUTES_BUTTON = [
-        'autofocus', 'disabled', 'form', 'formaction', 'formenctype', 'formmethod',
-        'formnovalidate', 'formtarget', 'name', 'type', 'value',
-    ];
+	const ATTRIBUTES_BUTTON = [
+		'autofocus', 'disabled', 'form', 'formaction', 'formenctype', 'formmethod',
+		'formnovalidate', 'formtarget', 'name', 'type', 'value',
+	];
 
-    const ATTRIBUTES_FORM = [
-        'accept', 'accept-charset', 'action', 'autocapitalize', 'autocomplete', 'enctype', 'method',
-        'name', 'novalidate', 'target',
-    ];
+	const ATTRIBUTES_FORM = [
+		'accept', 'accept-charset', 'action', 'autocapitalize', 'autocomplete', 'enctype', 'method',
+		'name', 'novalidate', 'target',
+	];
 
-    const ATTRIBUTES_IMG = [
-        'alt', 'crossorigin', 'decoding', 'height', 'ismap', 'referrerpolicy', 'sizes', 'src',
-        'srcset', 'width', 'usemap',
-    ];
+	const ATTRIBUTES_IMG = [
+		'alt', 'crossorigin', 'decoding', 'height', 'ismap', 'referrerpolicy', 'sizes', 'src',
+		'srcset', 'width', 'usemap',
+	];
 
-    const ATTRIBUTES_INPUT = [
-        'accept', 'autocomplete', 'autocorrect', 'autofocus', 'capture', 'checked', 'disabled',
-        'form', 'formaction', 'formenctype', 'formmethod', 'formnovalidate', 'formtarget', 'height',
-        'incremental', 'inputmode', 'list', 'max', 'maxlength', 'min', 'minlength', 'multiple',
-        'name', 'pattern', 'placeholder', 'readonly', 'results', 'required', 'selectionDirection',
-        'selectionEnd', 'selectionStart', 'size', 'spellcheck', 'src', 'step', 'tabindex', 'type',
-        'value', 'webkitdirectory', 'width',
-    ];
+	const ATTRIBUTES_INPUT = [
+		'accept', 'autocomplete', 'autocorrect', 'autofocus', 'capture', 'checked', 'disabled',
+		'form', 'formaction', 'formenctype', 'formmethod', 'formnovalidate', 'formtarget', 'height',
+		'incremental', 'inputmode', 'list', 'max', 'maxlength', 'min', 'minlength', 'multiple',
+		'name', 'pattern', 'placeholder', 'readonly', 'results', 'required', 'selectionDirection',
+		'selectionEnd', 'selectionStart', 'size', 'spellcheck', 'src', 'step', 'tabindex', 'type',
+		'value', 'webkitdirectory', 'width',
+	];
 
-    const ATTRIBUTES_LABEL = [
-        'for',
-    ];
+	const ATTRIBUTES_LABEL = [
+		'for',
+	];
 
-    const ATTRIBUTES_OPTION = [
-        'disabled', 'label', 'selected', 'value',
-    ];
+	const ATTRIBUTES_OPTION = [
+		'disabled', 'label', 'selected', 'value',
+	];
 
-    const ATTRIBUTES_SELECT = [
-        'autofocus', 'disabled', 'form', 'multiple', 'name', 'required', 'size',
-    ];
+	const ATTRIBUTES_SELECT = [
+		'autofocus', 'disabled', 'form', 'multiple', 'name', 'required', 'size',
+	];
 
-    const ATTRIBUTES_TEXTAREA = [
-        'autocapitalize', 'autocomplete', 'autofocus', 'cols', 'disabled', 'form', 'maxlength',
-        'minlength', 'name', 'placeholder', 'readonly', 'required', 'rows', 'spellcheck', 'wrap',
-    ];
+	const ATTRIBUTES_TEXTAREA = [
+		'autocapitalize', 'autocomplete', 'autofocus', 'cols', 'disabled', 'form', 'maxlength',
+		'minlength', 'name', 'placeholder', 'readonly', 'required', 'rows', 'spellcheck', 'wrap',
+	];
 
-    const BOOLEAN_ATTRIBUTES = [
-        'autofocus', 'capture', 'checked', 'disabled', 'draggable', 'formnovalidate', 'hidden',
-        'multiple', 'novalidate', 'readonly', 'required', 'selected', 'spellcheck',
-        'webkitdirectory',
-    ];
+	const BOOLEAN_ATTRIBUTES = [
+		'autofocus', 'capture', 'checked', 'disabled', 'draggable', 'formnovalidate', 'hidden',
+		'multiple', 'novalidate', 'readonly', 'required', 'selected', 'spellcheck',
+		'webkitdirectory',
+	];
 
-    const GLOBAL_ATTRIBUTES = [
-        'accesskey', 'class', 'contenteditable', 'contextmenu', 'dir', 'draggable', 'dropzone',
-        'hidden', 'id', 'lang', 'spellcheck', 'style', 'tabindex', 'title',
-    ];
+	const GLOBAL_ATTRIBUTES = [
+		'accesskey', 'class', 'contenteditable', 'contextmenu', 'dir', 'draggable', 'dropzone',
+		'hidden', 'id', 'lang', 'spellcheck', 'style', 'tabindex', 'title',
+	];
 
-    const GLOBAL_WILDCARD_ATTRIBUTES = [
-        'aria-', 'data-', 'item', 'on',
-    ];
+	const GLOBAL_WILDCARD_ATTRIBUTES = [
+		'aria-', 'data-', 'item', 'on',
+	];
 
-    const INPUT_TYPES = [
-        'button', 'checkbox', 'color', 'date', 'datetime-local', 'email', 'file', 'hidden', 'image',
-        'month', 'number', 'password', 'radio', 'range', 'reset', 'search', 'submit', 'tel', 'text',
-        'time', 'url', 'week',
-    ];
+	const INPUT_TYPES = [
+		'button', 'checkbox', 'color', 'date', 'datetime-local', 'email', 'file', 'hidden', 'image',
+		'month', 'number', 'password', 'radio', 'range', 'reset', 'search', 'submit', 'tel', 'text',
+		'time', 'url', 'week',
+	];
 
-    /**
-     * @var array
-     */
-    protected $attributes = [];
+	/**
+	 * @var array
+	 */
+	protected $attributes = [];
 
-    /**
-     * @param string $method
-     * @param array $args
-     * @return static
-     */
-    public function __call($method, $args)
-    {
-        $args += [[], false];
-        $constant = 'static::ATTRIBUTES_'.strtoupper($method);
-        $allowedAttributeKeys = defined($constant)
-            ? constant($constant)
-            : [];
-        $this->normalize((array) $args[0], $allowedAttributeKeys);
-        $this->normalizeInputType($method);
-        return $this;
-    }
+	/**
+	 * @param string $method
+	 * @param array $args
+	 * @return static
+	 */
+	public function __call($method, $args)
+	{
+		$args += [[], false];
+		$constant = 'static::ATTRIBUTES_'.strtoupper($method);
+		$allowedAttributeKeys = defined($constant)
+			? constant($constant)
+			: [];
+		$this->normalize((array) $args[0], $allowedAttributeKeys);
+		$this->normalizeInputType($method);
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        return $this->attributes;
-    }
+	/**
+	 * @return array
+	 */
+	public function toArray()
+	{
+		return $this->attributes;
+	}
 
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        $attributes = [];
-        foreach ($this->attributes as $attribute => $value) {
-            $quote = $this->getQuoteChar($attribute);
-            $attributes[] = in_array($attribute, static::BOOLEAN_ATTRIBUTES)
-                ? $attribute
-                : $attribute.'='.$quote.implode(',', (array) $value).$quote;
-        }
-        return implode(' ', $attributes);
-    }
+	/**
+	 * @return string
+	 */
+	public function toString()
+	{
+		$attributes = [];
+		foreach ($this->attributes as $attribute => $value) {
+			$quote = $this->getQuoteChar($attribute);
+			$attributes[] = in_array($attribute, static::BOOLEAN_ATTRIBUTES)
+				? $attribute
+				: $attribute.'='.$quote.implode(',', (array) $value).$quote;
+		}
+		return implode(' ', $attributes);
+	}
 
-    /**
-     * @return array
-     */
-    protected function filterAttributes(array $allowedAttributeKeys)
-    {
-        return array_intersect_key($this->attributes, array_flip($allowedAttributeKeys));
-    }
+	/**
+	 * @return array
+	 */
+	protected function filterAttributes(array $allowedAttributeKeys)
+	{
+		return array_intersect_key($this->attributes, array_flip($allowedAttributeKeys));
+	}
 
-    /**
-     * @return array
-     */
-    protected function filterGlobalAttributes()
-    {
-        $globalAttributes = $this->filterAttributes(static::GLOBAL_ATTRIBUTES);
-        $wildcards = [];
-        foreach (static::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard) {
-            $newWildcards = array_filter($this->attributes, function ($key) use ($wildcard) {
-                return glsr(Helper::class)->startsWith($wildcard, $key);
-            }, ARRAY_FILTER_USE_KEY);
-            $wildcards = array_merge($wildcards, $newWildcards);
-        }
-        return array_merge($globalAttributes, $wildcards);
-    }
+	/**
+	 * @return array
+	 */
+	protected function filterGlobalAttributes()
+	{
+		$globalAttributes = $this->filterAttributes(static::GLOBAL_ATTRIBUTES);
+		$wildcards = [];
+		foreach (static::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard) {
+			$newWildcards = array_filter($this->attributes, function ($key) use ($wildcard) {
+				return glsr(Helper::class)->startsWith($wildcard, $key);
+			}, ARRAY_FILTER_USE_KEY);
+			$wildcards = array_merge($wildcards, $newWildcards);
+		}
+		return array_merge($globalAttributes, $wildcards);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getPermanentAttributes()
-    {
-        $permanentAttributes = [];
-        if (array_key_exists('value', $this->attributes)) {
-            $permanentAttributes['value'] = $this->attributes['value'];
-        }
-        return $permanentAttributes;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getPermanentAttributes()
+	{
+		$permanentAttributes = [];
+		if (array_key_exists('value', $this->attributes)) {
+			$permanentAttributes['value'] = $this->attributes['value'];
+		}
+		return $permanentAttributes;
+	}
 
-    /**
-     * @param string $attribute
-     * @return string
-     */
-    protected function getQuoteChar($attribute)
-    {
-        return glsr(Helper::class)->startsWith('data-', $attribute)
-            ? '\''
-            : '"';
-    }
+	/**
+	 * @param string $attribute
+	 * @return string
+	 */
+	protected function getQuoteChar($attribute)
+	{
+		return glsr(Helper::class)->startsWith('data-', $attribute)
+			? '\''
+			: '"';
+	}
 
-    /**
-     * @param string $key
-     * @param mixed $value
-     * @return bool
-     */
-    protected function isAttributeKeyNumeric($key, $value)
-    {
-        return is_string($value)
-            && is_numeric($key)
-            && !array_key_exists($value, $this->attributes);
-    }
+	/**
+	 * @param string $key
+	 * @param mixed $value
+	 * @return bool
+	 */
+	protected function isAttributeKeyNumeric($key, $value)
+	{
+		return is_string($value)
+			&& is_numeric($key)
+			&& !array_key_exists($value, $this->attributes);
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalize(array $args, array $allowedAttributeKeys)
-    {
-        $this->attributes = array_change_key_case($args, CASE_LOWER);
-        $this->normalizeBooleanAttributes();
-        $this->normalizeDataAttributes();
-        $this->normalizeStringAttributes();
-        $this->removeEmptyAttributes();
-        $this->removeIndexedAttributes();
-        $this->attributes = array_merge(
-            $this->filterGlobalAttributes(),
-            $this->filterAttributes($allowedAttributeKeys)
-        );
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalize(array $args, array $allowedAttributeKeys)
+	{
+		$this->attributes = array_change_key_case($args, CASE_LOWER);
+		$this->normalizeBooleanAttributes();
+		$this->normalizeDataAttributes();
+		$this->normalizeStringAttributes();
+		$this->removeEmptyAttributes();
+		$this->removeIndexedAttributes();
+		$this->attributes = array_merge(
+			$this->filterGlobalAttributes(),
+			$this->filterAttributes($allowedAttributeKeys)
+		);
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeBooleanAttributes()
-    {
-        foreach ($this->attributes as $key => $value) {
-            if ($this->isAttributeKeyNumeric($key, $value)) {
-                $key = $value;
-                $value = true;
-            }
-            if (!in_array($key, static::BOOLEAN_ATTRIBUTES)) {
-                continue;
-            }
-            $this->attributes[$key] = wp_validate_boolean($value);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeBooleanAttributes()
+	{
+		foreach ($this->attributes as $key => $value) {
+			if ($this->isAttributeKeyNumeric($key, $value)) {
+				$key = $value;
+				$value = true;
+			}
+			if (!in_array($key, static::BOOLEAN_ATTRIBUTES)) {
+				continue;
+			}
+			$this->attributes[$key] = wp_validate_boolean($value);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeDataAttributes()
-    {
-        foreach ($this->attributes as $key => $value) {
-            if ($this->isAttributeKeyNumeric($key, $value)) {
-                $key = $value;
-                $value = '';
-            }
-            if (!glsr(Helper::class)->startsWith('data-', $key)) {
-                continue;
-            }
-            if (is_array($value)) {
-                $value = json_encode($value, JSON_HEX_APOS | JSON_NUMERIC_CHECK | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-            }
-            $this->attributes[$key] = $value;
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeDataAttributes()
+	{
+		foreach ($this->attributes as $key => $value) {
+			if ($this->isAttributeKeyNumeric($key, $value)) {
+				$key = $value;
+				$value = '';
+			}
+			if (!glsr(Helper::class)->startsWith('data-', $key)) {
+				continue;
+			}
+			if (is_array($value)) {
+				$value = json_encode($value, JSON_HEX_APOS | JSON_NUMERIC_CHECK | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+			}
+			$this->attributes[$key] = $value;
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeStringAttributes()
-    {
-        foreach ($this->attributes as $key => $value) {
-            if (!is_string($value)) {
-                continue;
-            }
-            $this->attributes[$key] = trim($value);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeStringAttributes()
+	{
+		foreach ($this->attributes as $key => $value) {
+			if (!is_string($value)) {
+				continue;
+			}
+			$this->attributes[$key] = trim($value);
+		}
+	}
 
-    /**
-     * @param string $method
-     * @return void
-     */
-    protected function normalizeInputType($method)
-    {
-        if ('input' != $method) {
-            return;
-        }
-        $attributes = wp_parse_args($this->attributes, ['type' => '']);
-        if (!in_array($attributes['type'], static::INPUT_TYPES)) {
-            $this->attributes['type'] = 'text';
-        }
-    }
+	/**
+	 * @param string $method
+	 * @return void
+	 */
+	protected function normalizeInputType($method)
+	{
+		if ('input' != $method) {
+			return;
+		}
+		$attributes = wp_parse_args($this->attributes, ['type' => '']);
+		if (!in_array($attributes['type'], static::INPUT_TYPES)) {
+			$this->attributes['type'] = 'text';
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function removeEmptyAttributes()
-    {
-        $attributes = $this->attributes;
-        $permanentAttributes = $this->getPermanentAttributes();
-        foreach ($this->attributes as $key => $value) {
-            if (in_array($key, static::BOOLEAN_ATTRIBUTES) && !$value) {
-                unset($attributes[$key]);
-            }
-            if (glsr(Helper::class)->startsWith('data-', $key)) {
-                $permanentAttributes[$key] = $value;
-                unset($attributes[$key]);
-            }
-        }
-        $this->attributes = array_merge(array_filter($attributes), $permanentAttributes);
-    }
+	/**
+	 * @return void
+	 */
+	protected function removeEmptyAttributes()
+	{
+		$attributes = $this->attributes;
+		$permanentAttributes = $this->getPermanentAttributes();
+		foreach ($this->attributes as $key => $value) {
+			if (in_array($key, static::BOOLEAN_ATTRIBUTES) && !$value) {
+				unset($attributes[$key]);
+			}
+			if (glsr(Helper::class)->startsWith('data-', $key)) {
+				$permanentAttributes[$key] = $value;
+				unset($attributes[$key]);
+			}
+		}
+		$this->attributes = array_merge(array_filter($attributes), $permanentAttributes);
+	}
 
-    /**
-     * @return void
-     */
-    protected function removeIndexedAttributes()
-    {
-        $this->attributes = array_diff_key(
-            $this->attributes,
-            array_filter($this->attributes, 'is_numeric', ARRAY_FILTER_USE_KEY)
-        );
-    }
+	/**
+	 * @return void
+	 */
+	protected function removeIndexedAttributes()
+	{
+		$this->attributes = array_diff_key(
+			$this->attributes,
+			array_filter($this->attributes, 'is_numeric', ARRAY_FILTER_USE_KEY)
+		);
+	}
 }

Spacing +51 added lines, -51 removed lines

@@ -82,15 +82,15 @@ 
      * @param array $args
      * @return static
      */
-    public function __call($method, $args)
+    public function __call( $method, $args )
     {
         $args += [[], false];
-        $constant = 'static::ATTRIBUTES_'.strtoupper($method);
-        $allowedAttributeKeys = defined($constant)
-            ? constant($constant)
+        $constant = 'static::ATTRIBUTES_'.strtoupper( $method );
+        $allowedAttributeKeys = defined( $constant )
+            ? constant( $constant )
             : [];
-        $this->normalize((array) $args[0], $allowedAttributeKeys);
-        $this->normalizeInputType($method);
+        $this->normalize( (array)$args[0], $allowedAttributeKeys );
+        $this->normalizeInputType( $method );
         return $this;
     }
 
@@ -108,21 +108,21 @@ 
     public function toString()
     {
         $attributes = [];
-        foreach ($this->attributes as $attribute => $value) {
-            $quote = $this->getQuoteChar($attribute);
-            $attributes[] = in_array($attribute, static::BOOLEAN_ATTRIBUTES)
+        foreach( $this->attributes as $attribute => $value ) {
+            $quote = $this->getQuoteChar( $attribute );
+            $attributes[] = in_array( $attribute, static::BOOLEAN_ATTRIBUTES )
                 ? $attribute
-                : $attribute.'='.$quote.implode(',', (array) $value).$quote;
+                : $attribute.'='.$quote.implode( ',', (array)$value ).$quote;
         }
-        return implode(' ', $attributes);
+        return implode( ' ', $attributes );
     }
 
     /**
      * @return array
      */
-    protected function filterAttributes(array $allowedAttributeKeys)
+    protected function filterAttributes( array $allowedAttributeKeys )
     {
-        return array_intersect_key($this->attributes, array_flip($allowedAttributeKeys));
+        return array_intersect_key( $this->attributes, array_flip( $allowedAttributeKeys ) );
     }
 
     /**
@@ -130,15 +130,15 @@ 
      */
     protected function filterGlobalAttributes()
     {
-        $globalAttributes = $this->filterAttributes(static::GLOBAL_ATTRIBUTES);
+        $globalAttributes = $this->filterAttributes( static::GLOBAL_ATTRIBUTES );
         $wildcards = [];
-        foreach (static::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard) {
-            $newWildcards = array_filter($this->attributes, function ($key) use ($wildcard) {
-                return glsr(Helper::class)->startsWith($wildcard, $key);
-            }, ARRAY_FILTER_USE_KEY);
-            $wildcards = array_merge($wildcards, $newWildcards);
+        foreach( static::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard ) {
+            $newWildcards = array_filter( $this->attributes, function( $key ) use ($wildcard) {
+                return glsr( Helper::class )->startsWith( $wildcard, $key );
+            }, ARRAY_FILTER_USE_KEY );
+            $wildcards = array_merge( $wildcards, $newWildcards );
         }
-        return array_merge($globalAttributes, $wildcards);
+        return array_merge( $globalAttributes, $wildcards );
     }
 
     /**
@@ -147,7 +147,7 @@ 
     protected function getPermanentAttributes()
     {
         $permanentAttributes = [];
-        if (array_key_exists('value', $this->attributes)) {
+        if( array_key_exists( 'value', $this->attributes ) ) {
             $permanentAttributes['value'] = $this->attributes['value'];
         }
         return $permanentAttributes;
@@ -157,9 +157,9 @@ 
      * @param string $attribute
      * @return string
      */
-    protected function getQuoteChar($attribute)
+    protected function getQuoteChar( $attribute )
     {
-        return glsr(Helper::class)->startsWith('data-', $attribute)
+        return glsr( Helper::class )->startsWith( 'data-', $attribute )
             ? '\''
             : '"';
     }
@@ -169,19 +169,19 @@ 
      * @param mixed $value
      * @return bool
      */
-    protected function isAttributeKeyNumeric($key, $value)
+    protected function isAttributeKeyNumeric( $key, $value )
     {
-        return is_string($value)
-            && is_numeric($key)
-            && !array_key_exists($value, $this->attributes);
+        return is_string( $value )
+            && is_numeric( $key )
+            && !array_key_exists( $value, $this->attributes );
     }
 
     /**
      * @return void
      */
-    protected function normalize(array $args, array $allowedAttributeKeys)
+    protected function normalize( array $args, array $allowedAttributeKeys )
     {
-        $this->attributes = array_change_key_case($args, CASE_LOWER);
+        $this->attributes = array_change_key_case( $args, CASE_LOWER );
         $this->normalizeBooleanAttributes();
         $this->normalizeDataAttributes();
         $this->normalizeStringAttributes();
@@ -189,7 +189,7 @@ 
         $this->removeIndexedAttributes();
         $this->attributes = array_merge(
             $this->filterGlobalAttributes(),
-            $this->filterAttributes($allowedAttributeKeys)
+            $this->filterAttributes( $allowedAttributeKeys )
         );
     }
 
@@ -198,15 +198,15 @@ 
      */
     protected function normalizeBooleanAttributes()
     {
-        foreach ($this->attributes as $key => $value) {
-            if ($this->isAttributeKeyNumeric($key, $value)) {
+        foreach( $this->attributes as $key => $value ) {
+            if( $this->isAttributeKeyNumeric( $key, $value ) ) {
                 $key = $value;
                 $value = true;
             }
-            if (!in_array($key, static::BOOLEAN_ATTRIBUTES)) {
+            if( !in_array( $key, static::BOOLEAN_ATTRIBUTES ) ) {
                 continue;
             }
-            $this->attributes[$key] = wp_validate_boolean($value);
+            $this->attributes[$key] = wp_validate_boolean( $value );
         }
     }
 
@@ -215,16 +215,16 @@ 
      */
     protected function normalizeDataAttributes()
     {
-        foreach ($this->attributes as $key => $value) {
-            if ($this->isAttributeKeyNumeric($key, $value)) {
+        foreach( $this->attributes as $key => $value ) {
+            if( $this->isAttributeKeyNumeric( $key, $value ) ) {
                 $key = $value;
                 $value = '';
             }
-            if (!glsr(Helper::class)->startsWith('data-', $key)) {
+            if( !glsr( Helper::class )->startsWith( 'data-', $key ) ) {
                 continue;
             }
-            if (is_array($value)) {
-                $value = json_encode($value, JSON_HEX_APOS | JSON_NUMERIC_CHECK | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            if( is_array( $value ) ) {
+                $value = json_encode( $value, JSON_HEX_APOS | JSON_NUMERIC_CHECK | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE );
             }
             $this->attributes[$key] = $value;
         }
@@ -235,11 +235,11 @@ 
      */
     protected function normalizeStringAttributes()
     {
-        foreach ($this->attributes as $key => $value) {
-            if (!is_string($value)) {
+        foreach( $this->attributes as $key => $value ) {
+            if( !is_string( $value ) ) {
                 continue;
             }
-            $this->attributes[$key] = trim($value);
+            $this->attributes[$key] = trim( $value );
         }
     }
 
@@ -247,13 +247,13 @@ 
      * @param string $method
      * @return void
      */
-    protected function normalizeInputType($method)
+    protected function normalizeInputType( $method )
     {
-        if ('input' != $method) {
+        if( 'input' != $method ) {
             return;
         }
-        $attributes = wp_parse_args($this->attributes, ['type' => '']);
-        if (!in_array($attributes['type'], static::INPUT_TYPES)) {
+        $attributes = wp_parse_args( $this->attributes, ['type' => ''] );
+        if( !in_array( $attributes['type'], static::INPUT_TYPES ) ) {
             $this->attributes['type'] = 'text';
         }
     }
@@ -265,16 +265,16 @@ 
     {
         $attributes = $this->attributes;
         $permanentAttributes = $this->getPermanentAttributes();
-        foreach ($this->attributes as $key => $value) {
-            if (in_array($key, static::BOOLEAN_ATTRIBUTES) && !$value) {
+        foreach( $this->attributes as $key => $value ) {
+            if( in_array( $key, static::BOOLEAN_ATTRIBUTES ) && !$value ) {
                 unset($attributes[$key]);
             }
-            if (glsr(Helper::class)->startsWith('data-', $key)) {
+            if( glsr( Helper::class )->startsWith( 'data-', $key ) ) {
                 $permanentAttributes[$key] = $value;
                 unset($attributes[$key]);
             }
         }
-        $this->attributes = array_merge(array_filter($attributes), $permanentAttributes);
+        $this->attributes = array_merge( array_filter( $attributes ), $permanentAttributes );
     }
 
     /**
@@ -284,7 +284,7 @@ 
     {
         $this->attributes = array_diff_key(
             $this->attributes,
-            array_filter($this->attributes, 'is_numeric', ARRAY_FILTER_USE_KEY)
+            array_filter( $this->attributes, 'is_numeric', ARRAY_FILTER_USE_KEY )
         );
     }
 }

plugin/Modules/Html/Settings.php

Braces +2 added lines, -1 removed lines

@@ -216,7 +216,8 @@
         if (!empty($field['label'])) {
             $field['legend'] = $field['label'];
             unset($field['label']);
-        } else {
+        }
+        else {
             $field['is_valid'] = false;
             glsr_log()->warning('Setting field is missing a label')->debug($field);
         }

Indentation +235 added lines, -235 removed lines

@@ -9,239 +9,239 @@
 
 class Settings
 {
-    /**
-     * @var array
-     */
-    public $settings;
-
-    /**
-     * @param string $id
-     * @return string
-     */
-    public function buildFields($id)
-    {
-        $this->settings = glsr(DefaultsManager::class)->settings();
-        $method = glsr(Helper::class)->buildMethodName($id, 'getTemplateDataFor');
-        $data = !method_exists($this, $method)
-            ? $this->getTemplateData($id)
-            : $this->$method($id);
-        return glsr(Template::class)->build('pages/settings/'.$id, $data);
-    }
-
-    /**
-     * @return string
-     */
-    protected function getFieldDefault(array $field)
-    {
-        return glsr_get($field, 'default');
-    }
-
-    /**
-     * @return string
-     */
-    protected function getFieldNameForDependsOn($path)
-    {
-        $fieldName = glsr(Helper::class)->convertPathToName($path, OptionManager::databaseKey());
-        return $this->isMultiDependency($path)
-            ? $fieldName.'[]'
-            : $fieldName;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getSettingFields($path)
-    {
-        return array_filter($this->settings, function ($key) use ($path) {
-            return glsr(Helper::class)->startsWith($path, $key);
-        }, ARRAY_FILTER_USE_KEY);
-    }
-
-    /**
-     * @return string
-     */
-    protected function getSettingRows(array $fields)
-    {
-        $rows = '';
-        foreach ($fields as $name => $field) {
-            $field = wp_parse_args($field, [
-                'is_setting' => true,
-                'name' => $name,
-            ]);
-            $rows.= new Field($this->normalize($field));
-        }
-        return $rows;
-    }
-
-    /**
-     * @param string $id
-     * @return array
-     */
-    protected function getTemplateData($id)
-    {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
-        return [
-            'context' => [
-                'rows' => $this->getSettingRows($fields),
-            ],
-        ];
-    }
-
-    /**
-     * @param string $id
-     * @return array
-     */
-    protected function getTemplateDataForAddons($id)
-    {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
-        $settings = glsr(Helper::class)->convertDotNotationArray($fields);
-        $settingKeys = array_keys($settings['settings']['addons']);
-        $results = [];
-        foreach ($settingKeys as $key) {
-            $addonFields = array_filter($fields, function ($path) use ($key) {
-                return glsr(Helper::class)->startsWith('settings.addons.'.$key, $path);
-            }, ARRAY_FILTER_USE_KEY);
-            $results[$key] = $this->getSettingRows($addonFields);
-        }
-        ksort($results);
-        return [
-            'settings' => $results,
-        ];
-    }
-
-    /**
-     * @param string $id
-     * @return array
-     */
-    protected function getTemplateDataForLicenses($id)
-    {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
-        ksort($fields);
-        return [
-            'context' => [
-                'rows' => $this->getSettingRows($fields),
-            ],
-        ];
-    }
-
-    /**
-     * @return array
-     */
-    protected function getTemplateDataForTranslations()
-    {
-        $translations = glsr(Translation::class)->renderAll();
-        $class = empty($translations)
-            ? 'glsr-hidden'
-            : '';
-        return [
-            'context' => [
-                'class' => $class,
-                'database_key' => OptionManager::databaseKey(),
-                'translations' => $translations,
-            ],
-        ];
-    }
-
-    /**
-     * @param string $path
-     * @param string|array $expectedValue
-     * @return bool
-     */
-    protected function isFieldHidden($path, $expectedValue)
-    {
-        $optionValue = glsr(OptionManager::class)->get(
-            $path,
-            glsr(Helper::class)->dataGet(glsr()->defaults, $path)
-        );
-        if (is_array($expectedValue)) {
-            return is_array($optionValue)
-                ? 0 === count(array_intersect($optionValue, $expectedValue))
-                : !in_array($optionValue, $expectedValue);
-        }
-        return $optionValue != $expectedValue;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isMultiDependency($path)
-    {
-        if (isset($this->settings[$path])) {
-            $field = $this->settings[$path];
-            return ('checkbox' == $field['type'] && !empty($field['options']))
-                || !empty($field['multiple']);
-        }
-        return false;
-    }
-
-    /**
-     * @return array
-     */
-    protected function normalize(array $field)
-    {
-        $field = $this->normalizeDependsOn($field);
-        $field = $this->normalizeLabelAndLegend($field);
-        $field = $this->normalizeValue($field);
-        return $field;
-    }
-
-    /**
-     * @return array
-     */
-    protected function normalizeDependsOn(array $field)
-    {
-        if (!empty($field['depends_on']) && is_array($field['depends_on'])) {
-            $isFieldHidden = false;
-            $conditions = [];
-            foreach ($field['depends_on'] as $path => $value) {
-                $conditions[] = [
-                    'name' => $this->getFieldNameForDependsOn($path),
-                    'value' => $value,
-                ];
-                if ($this->isFieldHidden($path, $value)) {
-                    $isFieldHidden = true;
-                }
-            }
-            $field['data-depends'] = json_encode($conditions, JSON_HEX_APOS | JSON_HEX_QUOT);
-            $field['is_hidden'] = $isFieldHidden;
-        }
-        return $field;
-    }
-
-    /**
-     * @return array
-     */
-    protected function normalizeLabelAndLegend(array $field)
-    {
-        if (!empty($field['label'])) {
-            $field['legend'] = $field['label'];
-            unset($field['label']);
-        } else {
-            $field['is_valid'] = false;
-            glsr_log()->warning('Setting field is missing a label')->debug($field);
-        }
-        return $field;
-    }
-
-    /**
-     * @return array
-     */
-    protected function normalizeValue(array $field)
-    {
-        if (!isset($field['value'])) {
-            $field['value'] = glsr(OptionManager::class)->get(
-                $field['name'],
-                $this->getFieldDefault($field)
-            );
-        }
-        return $field;
-    }
-
-    /**
-     * @return string
-     */
-    protected function normalizeSettingPath($path)
-    {
-        return glsr(Helper::class)->prefix('settings.', rtrim($path, '.'));
-    }
+	/**
+	 * @var array
+	 */
+	public $settings;
+
+	/**
+	 * @param string $id
+	 * @return string
+	 */
+	public function buildFields($id)
+	{
+		$this->settings = glsr(DefaultsManager::class)->settings();
+		$method = glsr(Helper::class)->buildMethodName($id, 'getTemplateDataFor');
+		$data = !method_exists($this, $method)
+			? $this->getTemplateData($id)
+			: $this->$method($id);
+		return glsr(Template::class)->build('pages/settings/'.$id, $data);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getFieldDefault(array $field)
+	{
+		return glsr_get($field, 'default');
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getFieldNameForDependsOn($path)
+	{
+		$fieldName = glsr(Helper::class)->convertPathToName($path, OptionManager::databaseKey());
+		return $this->isMultiDependency($path)
+			? $fieldName.'[]'
+			: $fieldName;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getSettingFields($path)
+	{
+		return array_filter($this->settings, function ($key) use ($path) {
+			return glsr(Helper::class)->startsWith($path, $key);
+		}, ARRAY_FILTER_USE_KEY);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getSettingRows(array $fields)
+	{
+		$rows = '';
+		foreach ($fields as $name => $field) {
+			$field = wp_parse_args($field, [
+				'is_setting' => true,
+				'name' => $name,
+			]);
+			$rows.= new Field($this->normalize($field));
+		}
+		return $rows;
+	}
+
+	/**
+	 * @param string $id
+	 * @return array
+	 */
+	protected function getTemplateData($id)
+	{
+		$fields = $this->getSettingFields($this->normalizeSettingPath($id));
+		return [
+			'context' => [
+				'rows' => $this->getSettingRows($fields),
+			],
+		];
+	}
+
+	/**
+	 * @param string $id
+	 * @return array
+	 */
+	protected function getTemplateDataForAddons($id)
+	{
+		$fields = $this->getSettingFields($this->normalizeSettingPath($id));
+		$settings = glsr(Helper::class)->convertDotNotationArray($fields);
+		$settingKeys = array_keys($settings['settings']['addons']);
+		$results = [];
+		foreach ($settingKeys as $key) {
+			$addonFields = array_filter($fields, function ($path) use ($key) {
+				return glsr(Helper::class)->startsWith('settings.addons.'.$key, $path);
+			}, ARRAY_FILTER_USE_KEY);
+			$results[$key] = $this->getSettingRows($addonFields);
+		}
+		ksort($results);
+		return [
+			'settings' => $results,
+		];
+	}
+
+	/**
+	 * @param string $id
+	 * @return array
+	 */
+	protected function getTemplateDataForLicenses($id)
+	{
+		$fields = $this->getSettingFields($this->normalizeSettingPath($id));
+		ksort($fields);
+		return [
+			'context' => [
+				'rows' => $this->getSettingRows($fields),
+			],
+		];
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getTemplateDataForTranslations()
+	{
+		$translations = glsr(Translation::class)->renderAll();
+		$class = empty($translations)
+			? 'glsr-hidden'
+			: '';
+		return [
+			'context' => [
+				'class' => $class,
+				'database_key' => OptionManager::databaseKey(),
+				'translations' => $translations,
+			],
+		];
+	}
+
+	/**
+	 * @param string $path
+	 * @param string|array $expectedValue
+	 * @return bool
+	 */
+	protected function isFieldHidden($path, $expectedValue)
+	{
+		$optionValue = glsr(OptionManager::class)->get(
+			$path,
+			glsr(Helper::class)->dataGet(glsr()->defaults, $path)
+		);
+		if (is_array($expectedValue)) {
+			return is_array($optionValue)
+				? 0 === count(array_intersect($optionValue, $expectedValue))
+				: !in_array($optionValue, $expectedValue);
+		}
+		return $optionValue != $expectedValue;
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isMultiDependency($path)
+	{
+		if (isset($this->settings[$path])) {
+			$field = $this->settings[$path];
+			return ('checkbox' == $field['type'] && !empty($field['options']))
+				|| !empty($field['multiple']);
+		}
+		return false;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $field)
+	{
+		$field = $this->normalizeDependsOn($field);
+		$field = $this->normalizeLabelAndLegend($field);
+		$field = $this->normalizeValue($field);
+		return $field;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function normalizeDependsOn(array $field)
+	{
+		if (!empty($field['depends_on']) && is_array($field['depends_on'])) {
+			$isFieldHidden = false;
+			$conditions = [];
+			foreach ($field['depends_on'] as $path => $value) {
+				$conditions[] = [
+					'name' => $this->getFieldNameForDependsOn($path),
+					'value' => $value,
+				];
+				if ($this->isFieldHidden($path, $value)) {
+					$isFieldHidden = true;
+				}
+			}
+			$field['data-depends'] = json_encode($conditions, JSON_HEX_APOS | JSON_HEX_QUOT);
+			$field['is_hidden'] = $isFieldHidden;
+		}
+		return $field;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function normalizeLabelAndLegend(array $field)
+	{
+		if (!empty($field['label'])) {
+			$field['legend'] = $field['label'];
+			unset($field['label']);
+		} else {
+			$field['is_valid'] = false;
+			glsr_log()->warning('Setting field is missing a label')->debug($field);
+		}
+		return $field;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function normalizeValue(array $field)
+	{
+		if (!isset($field['value'])) {
+			$field['value'] = glsr(OptionManager::class)->get(
+				$field['name'],
+				$this->getFieldDefault($field)
+			);
+		}
+		return $field;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function normalizeSettingPath($path)
+	{
+		return glsr(Helper::class)->prefix('settings.', rtrim($path, '.'));
+	}
 }

Spacing +67 added lines, -67 removed lines

@@ -18,31 +18,31 @@ 
      * @param string $id
      * @return string
      */
-    public function buildFields($id)
+    public function buildFields( $id )
     {
-        $this->settings = glsr(DefaultsManager::class)->settings();
-        $method = glsr(Helper::class)->buildMethodName($id, 'getTemplateDataFor');
-        $data = !method_exists($this, $method)
-            ? $this->getTemplateData($id)
-            : $this->$method($id);
-        return glsr(Template::class)->build('pages/settings/'.$id, $data);
+        $this->settings = glsr( DefaultsManager::class )->settings();
+        $method = glsr( Helper::class )->buildMethodName( $id, 'getTemplateDataFor' );
+        $data = !method_exists( $this, $method )
+            ? $this->getTemplateData( $id )
+            : $this->$method( $id );
+        return glsr( Template::class )->build( 'pages/settings/'.$id, $data );
     }
 
     /**
      * @return string
      */
-    protected function getFieldDefault(array $field)
+    protected function getFieldDefault( array $field )
     {
-        return glsr_get($field, 'default');
+        return glsr_get( $field, 'default' );
     }
 
     /**
      * @return string
      */
-    protected function getFieldNameForDependsOn($path)
+    protected function getFieldNameForDependsOn( $path )
     {
-        $fieldName = glsr(Helper::class)->convertPathToName($path, OptionManager::databaseKey());
-        return $this->isMultiDependency($path)
+        $fieldName = glsr( Helper::class )->convertPathToName( $path, OptionManager::databaseKey() );
+        return $this->isMultiDependency( $path )
             ? $fieldName.'[]'
             : $fieldName;
     }
@@ -50,25 +50,25 @@ 
     /**
      * @return array
      */
-    protected function getSettingFields($path)
+    protected function getSettingFields( $path )
     {
-        return array_filter($this->settings, function ($key) use ($path) {
-            return glsr(Helper::class)->startsWith($path, $key);
-        }, ARRAY_FILTER_USE_KEY);
+        return array_filter( $this->settings, function( $key ) use ($path) {
+            return glsr( Helper::class )->startsWith( $path, $key );
+        }, ARRAY_FILTER_USE_KEY );
     }
 
     /**
      * @return string
      */
-    protected function getSettingRows(array $fields)
+    protected function getSettingRows( array $fields )
     {
         $rows = '';
-        foreach ($fields as $name => $field) {
-            $field = wp_parse_args($field, [
+        foreach( $fields as $name => $field ) {
+            $field = wp_parse_args( $field, [
                 'is_setting' => true,
                 'name' => $name,
-            ]);
-            $rows.= new Field($this->normalize($field));
+            ] );
+            $rows .= new Field( $this->normalize( $field ) );
         }
         return $rows;
     }
@@ -77,12 +77,12 @@ 
      * @param string $id
      * @return array
      */
-    protected function getTemplateData($id)
+    protected function getTemplateData( $id )
     {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
+        $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
         return [
             'context' => [
-                'rows' => $this->getSettingRows($fields),
+                'rows' => $this->getSettingRows( $fields ),
             ],
         ];
     }
@@ -91,19 +91,19 @@ 
      * @param string $id
      * @return array
      */
-    protected function getTemplateDataForAddons($id)
+    protected function getTemplateDataForAddons( $id )
     {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
-        $settings = glsr(Helper::class)->convertDotNotationArray($fields);
-        $settingKeys = array_keys($settings['settings']['addons']);
+        $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
+        $settings = glsr( Helper::class )->convertDotNotationArray( $fields );
+        $settingKeys = array_keys( $settings['settings']['addons'] );
         $results = [];
-        foreach ($settingKeys as $key) {
-            $addonFields = array_filter($fields, function ($path) use ($key) {
-                return glsr(Helper::class)->startsWith('settings.addons.'.$key, $path);
-            }, ARRAY_FILTER_USE_KEY);
-            $results[$key] = $this->getSettingRows($addonFields);
+        foreach( $settingKeys as $key ) {
+            $addonFields = array_filter( $fields, function( $path ) use ($key) {
+                return glsr( Helper::class )->startsWith( 'settings.addons.'.$key, $path );
+            }, ARRAY_FILTER_USE_KEY );
+            $results[$key] = $this->getSettingRows( $addonFields );
         }
-        ksort($results);
+        ksort( $results );
         return [
             'settings' => $results,
         ];
@@ -113,13 +113,13 @@ 
      * @param string $id
      * @return array
      */
-    protected function getTemplateDataForLicenses($id)
+    protected function getTemplateDataForLicenses( $id )
     {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
-        ksort($fields);
+        $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
+        ksort( $fields );
         return [
             'context' => [
-                'rows' => $this->getSettingRows($fields),
+                'rows' => $this->getSettingRows( $fields ),
             ],
         ];
     }
@@ -129,7 +129,7 @@ 
      */
     protected function getTemplateDataForTranslations()
     {
-        $translations = glsr(Translation::class)->renderAll();
+        $translations = glsr( Translation::class )->renderAll();
         $class = empty($translations)
             ? 'glsr-hidden'
             : '';
@@ -147,16 +147,16 @@ 
      * @param string|array $expectedValue
      * @return bool
      */
-    protected function isFieldHidden($path, $expectedValue)
+    protected function isFieldHidden( $path, $expectedValue )
     {
-        $optionValue = glsr(OptionManager::class)->get(
+        $optionValue = glsr( OptionManager::class )->get(
             $path,
-            glsr(Helper::class)->dataGet(glsr()->defaults, $path)
+            glsr( Helper::class )->dataGet( glsr()->defaults, $path )
         );
-        if (is_array($expectedValue)) {
-            return is_array($optionValue)
-                ? 0 === count(array_intersect($optionValue, $expectedValue))
-                : !in_array($optionValue, $expectedValue);
+        if( is_array( $expectedValue ) ) {
+            return is_array( $optionValue )
+                ? 0 === count( array_intersect( $optionValue, $expectedValue ) )
+                : !in_array( $optionValue, $expectedValue );
         }
         return $optionValue != $expectedValue;
     }
@@ -164,9 +164,9 @@ 
     /**
      * @return bool
      */
-    protected function isMultiDependency($path)
+    protected function isMultiDependency( $path )
     {
-        if (isset($this->settings[$path])) {
+        if( isset($this->settings[$path]) ) {
             $field = $this->settings[$path];
             return ('checkbox' == $field['type'] && !empty($field['options']))
                 || !empty($field['multiple']);
@@ -177,32 +177,32 @@ 
     /**
      * @return array
      */
-    protected function normalize(array $field)
+    protected function normalize( array $field )
     {
-        $field = $this->normalizeDependsOn($field);
-        $field = $this->normalizeLabelAndLegend($field);
-        $field = $this->normalizeValue($field);
+        $field = $this->normalizeDependsOn( $field );
+        $field = $this->normalizeLabelAndLegend( $field );
+        $field = $this->normalizeValue( $field );
         return $field;
     }
 
     /**
      * @return array
      */
-    protected function normalizeDependsOn(array $field)
+    protected function normalizeDependsOn( array $field )
     {
-        if (!empty($field['depends_on']) && is_array($field['depends_on'])) {
+        if( !empty($field['depends_on']) && is_array( $field['depends_on'] ) ) {
             $isFieldHidden = false;
             $conditions = [];
-            foreach ($field['depends_on'] as $path => $value) {
+            foreach( $field['depends_on'] as $path => $value ) {
                 $conditions[] = [
-                    'name' => $this->getFieldNameForDependsOn($path),
+                    'name' => $this->getFieldNameForDependsOn( $path ),
                     'value' => $value,
                 ];
-                if ($this->isFieldHidden($path, $value)) {
+                if( $this->isFieldHidden( $path, $value ) ) {
                     $isFieldHidden = true;
                 }
             }
-            $field['data-depends'] = json_encode($conditions, JSON_HEX_APOS | JSON_HEX_QUOT);
+            $field['data-depends'] = json_encode( $conditions, JSON_HEX_APOS | JSON_HEX_QUOT );
             $field['is_hidden'] = $isFieldHidden;
         }
         return $field;
@@ -211,14 +211,14 @@ 
     /**
      * @return array
      */
-    protected function normalizeLabelAndLegend(array $field)
+    protected function normalizeLabelAndLegend( array $field )
     {
-        if (!empty($field['label'])) {
+        if( !empty($field['label']) ) {
             $field['legend'] = $field['label'];
             unset($field['label']);
         } else {
             $field['is_valid'] = false;
-            glsr_log()->warning('Setting field is missing a label')->debug($field);
+            glsr_log()->warning( 'Setting field is missing a label' )->debug( $field );
         }
         return $field;
     }
@@ -226,12 +226,12 @@ 
     /**
      * @return array
      */
-    protected function normalizeValue(array $field)
+    protected function normalizeValue( array $field )
     {
-        if (!isset($field['value'])) {
-            $field['value'] = glsr(OptionManager::class)->get(
+        if( !isset($field['value']) ) {
+            $field['value'] = glsr( OptionManager::class )->get(
                 $field['name'],
-                $this->getFieldDefault($field)
+                $this->getFieldDefault( $field )
             );
         }
         return $field;
@@ -240,8 +240,8 @@ 
     /**
      * @return string
      */
-    protected function normalizeSettingPath($path)
+    protected function normalizeSettingPath( $path )
     {
-        return glsr(Helper::class)->prefix('settings.', rtrim($path, '.'));
+        return glsr( Helper::class )->prefix( 'settings.', rtrim( $path, '.' ) );
     }
 }