pryley / site-reviews

activate.php

Indentation +122 added lines, -122 removed lines

@@ -8,137 +8,137 @@
  */
 class GL_Plugin_Check_v3
 {
-    const MIN_PHP_VERSION = '5.6.0';
-    const MIN_WORDPRESS_VERSION = '4.7.0';
+	const MIN_PHP_VERSION = '5.6.0';
+	const MIN_WORDPRESS_VERSION = '4.7.0';
 
-    /**
-     * @var string
-     */
-    protected $file;
+	/**
+	 * @var string
+	 */
+	protected $file;
 
-    /**
-     * @var array
-     */
-    protected $versions;
+	/**
+	 * @var array
+	 */
+	protected $versions;
 
-    /**
-     * @param string $file
-     */
-    public function __construct($file, array $versions = array())
-    {
-        $this->file = realpath($file);
-        $this->versions = wp_parse_args($versions, array(
-            'php' => static::MIN_PHP_VERSION,
-            'wordpress' => static::MIN_WORDPRESS_VERSION,
-        ));
-    }
+	/**
+	 * @param string $file
+	 */
+	public function __construct($file, array $versions = array())
+	{
+		$this->file = realpath($file);
+		$this->versions = wp_parse_args($versions, array(
+			'php' => static::MIN_PHP_VERSION,
+			'wordpress' => static::MIN_WORDPRESS_VERSION,
+		));
+	}
 
-    /**
-     * @return bool
-     */
-    public function canProceed()
-    {
-        if ($this->isValid()) {
-            return true;
-        }
-        add_action('activated_plugin', array($this, 'deactivate'));
-        add_action('admin_notices', array($this, 'deactivate'));
-        return false;
-    }
+	/**
+	 * @return bool
+	 */
+	public function canProceed()
+	{
+		if ($this->isValid()) {
+			return true;
+		}
+		add_action('activated_plugin', array($this, 'deactivate'));
+		add_action('admin_notices', array($this, 'deactivate'));
+		return false;
+	}
 
-    /**
-     * @return bool
-     */
-    public function isPhpValid()
-    {
-        return !version_compare(PHP_VERSION, $this->versions['php'], '<');
-    }
+	/**
+	 * @return bool
+	 */
+	public function isPhpValid()
+	{
+		return !version_compare(PHP_VERSION, $this->versions['php'], '<');
+	}
 
-    /**
-     * @return bool
-     */
-    public function isValid()
-    {
-        return $this->isPhpValid() && $this->isWpValid();
-    }
+	/**
+	 * @return bool
+	 */
+	public function isValid()
+	{
+		return $this->isPhpValid() && $this->isWpValid();
+	}
 
-    /**
-     * @return bool
-     */
-    public function isWpValid()
-    {
-        global $wp_version;
-        return !version_compare($wp_version, $this->versions['wordpress'], '<');
-    }
+	/**
+	 * @return bool
+	 */
+	public function isWpValid()
+	{
+		global $wp_version;
+		return !version_compare($wp_version, $this->versions['wordpress'], '<');
+	}
 
-    /**
-     * @param string $plugin
-     * @return void
-     */
-    public function deactivate($plugin)
-    {
-        if ($this->isValid()) {
-            return;
-        }
-        $pluginSlug = plugin_basename($this->file);
-        if ($plugin == $pluginSlug) {
-            $this->redirect(); //exit
-        }
-        $pluginData = get_file_data($this->file, array('name' => 'Plugin Name'), 'plugin');
-        deactivate_plugins($pluginSlug);
-        $this->printNotice($pluginData['name']);
-    }
+	/**
+	 * @param string $plugin
+	 * @return void
+	 */
+	public function deactivate($plugin)
+	{
+		if ($this->isValid()) {
+			return;
+		}
+		$pluginSlug = plugin_basename($this->file);
+		if ($plugin == $pluginSlug) {
+			$this->redirect(); //exit
+		}
+		$pluginData = get_file_data($this->file, array('name' => 'Plugin Name'), 'plugin');
+		deactivate_plugins($pluginSlug);
+		$this->printNotice($pluginData['name']);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getMessages()
-    {
-        return array(
-            __('The %s plugin was deactivated.', 'site-reviews'),
-            __('This plugin requires %s or greater in order to work properly.', 'site-reviews'),
-            __('Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'site-reviews'),
-            __('PHP version', 'site-reviews'),
-            __('WordPress version', 'site-reviews'),
-            __('Update WordPress', 'site-reviews'),
-            __('You can use the %s plugin to restore %s to the previous version.', 'site-reviews'),
-        );
-    }
+	/**
+	 * @return array
+	 */
+	protected function getMessages()
+	{
+		return array(
+			__('The %s plugin was deactivated.', 'site-reviews'),
+			__('This plugin requires %s or greater in order to work properly.', 'site-reviews'),
+			__('Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'site-reviews'),
+			__('PHP version', 'site-reviews'),
+			__('WordPress version', 'site-reviews'),
+			__('Update WordPress', 'site-reviews'),
+			__('You can use the %s plugin to restore %s to the previous version.', 'site-reviews'),
+		);
+	}
 
-    /**
-     * @param string $pluginName
-     * @return void
-     */
-    protected function printNotice($pluginName)
-    {
-        $noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>';
-        $messages = $this->getMessages();
-        $rollbackMessage = sprintf('<strong>'.$messages[6].'</strong>', '<a href="https://wordpress.org/plugins/wp-rollback/">WP Rollback</a>', $pluginName);
-        if (!$this->isPhpValid()) {
-            printf($noticeTemplate,
-                sprintf($messages[0], $pluginName),
-                sprintf($messages[1], $messages[3].' '.$this->versions['php']),
-                sprintf($messages[2], PHP_VERSION).'</p><p>'.$rollbackMessage
-            );
-        } elseif (!$this->isWpValid()) {
-            printf($noticeTemplate,
-                sprintf($messages[0], $pluginName),
-                sprintf($messages[1], $messages[4].' '.$this->versions['wordpress']),
-                $rollbackMessage.'</p><p>'.sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages[5])
-            );
-        }
-    }
+	/**
+	 * @param string $pluginName
+	 * @return void
+	 */
+	protected function printNotice($pluginName)
+	{
+		$noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>';
+		$messages = $this->getMessages();
+		$rollbackMessage = sprintf('<strong>'.$messages[6].'</strong>', '<a href="https://wordpress.org/plugins/wp-rollback/">WP Rollback</a>', $pluginName);
+		if (!$this->isPhpValid()) {
+			printf($noticeTemplate,
+				sprintf($messages[0], $pluginName),
+				sprintf($messages[1], $messages[3].' '.$this->versions['php']),
+				sprintf($messages[2], PHP_VERSION).'</p><p>'.$rollbackMessage
+			);
+		} elseif (!$this->isWpValid()) {
+			printf($noticeTemplate,
+				sprintf($messages[0], $pluginName),
+				sprintf($messages[1], $messages[4].' '.$this->versions['wordpress']),
+				$rollbackMessage.'</p><p>'.sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages[5])
+			);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function redirect()
-    {
-        wp_safe_redirect(self_admin_url(sprintf('plugins.php?plugin_status=%s&paged=%s&s=%s',
-            filter_input(INPUT_GET, 'plugin_status'),
-            filter_input(INPUT_GET, 'paged'),
-            filter_input(INPUT_GET, 's')
-        )));
-        exit;
-    }
+	/**
+	 * @return void
+	 */
+	protected function redirect()
+	{
+		wp_safe_redirect(self_admin_url(sprintf('plugins.php?plugin_status=%s&paged=%s&s=%s',
+			filter_input(INPUT_GET, 'plugin_status'),
+			filter_input(INPUT_GET, 'paged'),
+			filter_input(INPUT_GET, 's')
+		)));
+		exit;
+	}
 }

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-defined('WPINC') || die;
+defined( 'WPINC' ) || die;
 
 /**
  * Check for minimum system requirments on plugin activation.
@@ -24,13 +24,13 @@ 
     /**
      * @param string $file
      */
-    public function __construct($file, array $versions = array())
+    public function __construct( $file, array $versions = array() )
     {
-        $this->file = realpath($file);
-        $this->versions = wp_parse_args($versions, array(
+        $this->file = realpath( $file );
+        $this->versions = wp_parse_args( $versions, array(
             'php' => static::MIN_PHP_VERSION,
             'wordpress' => static::MIN_WORDPRESS_VERSION,
-        ));
+        ) );
     }
 
     /**
@@ -38,11 +38,11 @@ 
      */
     public function canProceed()
     {
-        if ($this->isValid()) {
+        if( $this->isValid() ) {
             return true;
         }
-        add_action('activated_plugin', array($this, 'deactivate'));
-        add_action('admin_notices', array($this, 'deactivate'));
+        add_action( 'activated_plugin', array( $this, 'deactivate' ) );
+        add_action( 'admin_notices', array( $this, 'deactivate' ) );
         return false;
     }
 
@@ -51,7 +51,7 @@ 
      */
     public function isPhpValid()
     {
-        return !version_compare(PHP_VERSION, $this->versions['php'], '<');
+        return !version_compare( PHP_VERSION, $this->versions['php'], '<' );
     }
 
     /**
@@ -68,25 +68,25 @@ 
     public function isWpValid()
     {
         global $wp_version;
-        return !version_compare($wp_version, $this->versions['wordpress'], '<');
+        return !version_compare( $wp_version, $this->versions['wordpress'], '<' );
     }
 
     /**
      * @param string $plugin
      * @return void
      */
-    public function deactivate($plugin)
+    public function deactivate( $plugin )
     {
-        if ($this->isValid()) {
+        if( $this->isValid() ) {
             return;
         }
-        $pluginSlug = plugin_basename($this->file);
-        if ($plugin == $pluginSlug) {
+        $pluginSlug = plugin_basename( $this->file );
+        if( $plugin == $pluginSlug ) {
             $this->redirect(); //exit
         }
-        $pluginData = get_file_data($this->file, array('name' => 'Plugin Name'), 'plugin');
-        deactivate_plugins($pluginSlug);
-        $this->printNotice($pluginData['name']);
+        $pluginData = get_file_data( $this->file, array( 'name' => 'Plugin Name' ), 'plugin' );
+        deactivate_plugins( $pluginSlug );
+        $this->printNotice( $pluginData['name'] );
     }
 
     /**
@@ -95,13 +95,13 @@ 
     protected function getMessages()
     {
         return array(
-            __('The %s plugin was deactivated.', 'site-reviews'),
-            __('This plugin requires %s or greater in order to work properly.', 'site-reviews'),
-            __('Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'site-reviews'),
-            __('PHP version', 'site-reviews'),
-            __('WordPress version', 'site-reviews'),
-            __('Update WordPress', 'site-reviews'),
-            __('You can use the %s plugin to restore %s to the previous version.', 'site-reviews'),
+            __( 'The %s plugin was deactivated.', 'site-reviews' ),
+            __( 'This plugin requires %s or greater in order to work properly.', 'site-reviews' ),
+            __( 'Please contact your hosting provider or server administrator to upgrade the version of PHP on your server (your server is running PHP version %s), or try to find an alternative plugin.', 'site-reviews' ),
+            __( 'PHP version', 'site-reviews' ),
+            __( 'WordPress version', 'site-reviews' ),
+            __( 'Update WordPress', 'site-reviews' ),
+            __( 'You can use the %s plugin to restore %s to the previous version.', 'site-reviews' ),
         );
     }
 
@@ -109,22 +109,22 @@ 
      * @param string $pluginName
      * @return void
      */
-    protected function printNotice($pluginName)
+    protected function printNotice( $pluginName )
     {
         $noticeTemplate = '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s</p><p>%s</p></div>';
         $messages = $this->getMessages();
-        $rollbackMessage = sprintf('<strong>'.$messages[6].'</strong>', '<a href="https://wordpress.org/plugins/wp-rollback/">WP Rollback</a>', $pluginName);
-        if (!$this->isPhpValid()) {
-            printf($noticeTemplate,
-                sprintf($messages[0], $pluginName),
-                sprintf($messages[1], $messages[3].' '.$this->versions['php']),
-                sprintf($messages[2], PHP_VERSION).'</p><p>'.$rollbackMessage
+        $rollbackMessage = sprintf( '<strong>'.$messages[6].'</strong>', '<a href="https://wordpress.org/plugins/wp-rollback/">WP Rollback</a>', $pluginName );
+        if( !$this->isPhpValid() ) {
+            printf( $noticeTemplate,
+                sprintf( $messages[0], $pluginName ),
+                sprintf( $messages[1], $messages[3].' '.$this->versions['php'] ),
+                sprintf( $messages[2], PHP_VERSION ).'</p><p>'.$rollbackMessage
             );
-        } elseif (!$this->isWpValid()) {
-            printf($noticeTemplate,
-                sprintf($messages[0], $pluginName),
-                sprintf($messages[1], $messages[4].' '.$this->versions['wordpress']),
-                $rollbackMessage.'</p><p>'.sprintf('<a href="%s">%s</a>', admin_url('update-core.php'), $messages[5])
+        } elseif( !$this->isWpValid() ) {
+            printf( $noticeTemplate,
+                sprintf( $messages[0], $pluginName ),
+                sprintf( $messages[1], $messages[4].' '.$this->versions['wordpress'] ),
+                $rollbackMessage.'</p><p>'.sprintf( '<a href="%s">%s</a>', admin_url( 'update-core.php' ), $messages[5] )
             );
         }
     }
@@ -134,11 +134,11 @@ 
      */
     protected function redirect()
     {
-        wp_safe_redirect(self_admin_url(sprintf('plugins.php?plugin_status=%s&paged=%s&s=%s',
-            filter_input(INPUT_GET, 'plugin_status'),
-            filter_input(INPUT_GET, 'paged'),
-            filter_input(INPUT_GET, 's')
-        )));
+        wp_safe_redirect( self_admin_url( sprintf( 'plugins.php?plugin_status=%s&paged=%s&s=%s',
+            filter_input( INPUT_GET, 'plugin_status' ),
+            filter_input( INPUT_GET, 'paged' ),
+            filter_input( INPUT_GET, 's' )
+        ) ) );
         exit;
     }
 }

Braces +2 added lines, -1 removed lines

@@ -120,7 +120,8 @@
                 sprintf($messages[1], $messages[3].' '.$this->versions['php']),
                 sprintf($messages[2], PHP_VERSION).'</p><p>'.$rollbackMessage
             );
-        } elseif (!$this->isWpValid()) {
+        }
+        elseif (!$this->isWpValid()) {
             printf($noticeTemplate,
                 sprintf($messages[0], $pluginName),
                 sprintf($messages[1], $messages[4].' '.$this->versions['wordpress']),

plugin/Modules/Html/Settings.php

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)->prefixString(rtrim($path, '.'), '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)->prefixString(rtrim($path, '.'), 'settings.');
+	}
 }

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)->prefixString(rtrim($path, '.'), 'settings.');
+        return glsr( Helper::class )->prefixString( rtrim( $path, '.' ), 'settings.' );
     }
 }

plugin/Modules/Html/Builder.php

Indentation +342 added lines, -342 removed lines

@@ -18,346 +18,346 @@
  */
 class Builder
 {
-    const INPUT_TYPES = [
-        'checkbox', 'date', 'datetime-local', 'email', 'file', 'hidden', 'image', 'month',
-        'number', 'password', 'radio', 'range', 'reset', 'search', 'submit', 'tel', 'text', 'time',
-        'url', 'week',
-    ];
-
-    const TAGS_FORM = [
-        'input', 'select', 'textarea',
-    ];
-
-    const TAGS_SINGLE = [
-        'img',
-    ];
-
-    const TAGS_STRUCTURE = [
-        'div', 'form', 'nav', 'ol', 'section', 'ul',
-    ];
-
-    const TAGS_TEXT = [
-        'a', 'button', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'i', 'label', 'li', 'option', 'p', 'pre',
-        'small', 'span',
-    ];
-
-    /**
-     * @var array
-     */
-    public $args = [];
-
-    /**
-     * @var bool
-     */
-    public $render = false;
-
-    /**
-     * @var string
-     */
-    public $tag;
-
-    /**
-     * @param string $method
-     * @param array $args
-     * @return string|void
-     */
-    public function __call($method, $args)
-    {
-        $instance = new static();
-        $instance->setTagFromMethod($method);
-        call_user_func_array([$instance, 'normalize'], $args += ['', '']);
-        $tags = array_merge(static::TAGS_FORM, static::TAGS_SINGLE, static::TAGS_STRUCTURE, static::TAGS_TEXT);
-        do_action_ref_array('site-reviews/builder', [$instance]);
-        $generatedTag = in_array($instance->tag, $tags)
-            ? $instance->buildTag()
-            : $instance->buildCustomField();
-        $generatedTag = apply_filters('site-reviews/builder/result', $generatedTag, $instance);
-        if (!$this->render) {
-            return $generatedTag;
-        }
-        echo $generatedTag;
-    }
-
-    /**
-     * @param string $property
-     * @param mixed $value
-     * @return void
-     */
-    public function __set($property, $value)
-    {
-        $properties = [
-            'args' => 'is_array',
-            'render' => 'is_bool',
-            'tag' => 'is_string',
-        ];
-        if (!isset($properties[$property])
-            || empty(array_filter([$value], $properties[$property]))
-        ) {
-            return;
-        }
-        $this->$property = $value;
-    }
-
-    /**
-     * @return void|string
-     */
-    public function getClosingTag()
-    {
-        if (empty($this->tag)) {
-            return;
-        }
-        return '</'.$this->tag.'>';
-    }
-
-    /**
-     * @return void|string
-     */
-    public function getOpeningTag()
-    {
-        if (empty($this->tag)) {
-            return;
-        }
-        $attributes = glsr(Attributes::class)->{$this->tag}($this->args)->toString();
-        return '<'.trim($this->tag.' '.$attributes).'>';
-    }
-
-    /**
-     * @return void|string
-     */
-    public function getTag()
-    {
-        if (in_array($this->tag, static::TAGS_SINGLE)) {
-            return $this->getOpeningTag();
-        }
-        if (!in_array($this->tag, static::TAGS_FORM)) {
-            return $this->buildDefaultTag();
-        }
-        return call_user_func([$this, 'buildForm'.ucfirst($this->tag)]).$this->buildFieldDescription();
-    }
-
-    /**
-     * @return string
-     */
-    public function raw(array $field)
-    {
-        unset($field['label']);
-        return $this->{$field['type']}($field);
-    }
-
-    /**
-     * @return string|void
-     */
-    protected function buildCustomField()
-    {
-        $className = $this->getCustomFieldClassName();
-        if (class_exists($className)) {
-            return (new $className($this))->build();
-        }
-        glsr_log()->error('Field missing: '.$className);
-    }
-
-    /**
-     * @return string|void
-     */
-    protected function buildDefaultTag($text = '')
-    {
-        if (empty($text)) {
-            $text = $this->args['text'];
-        }
-        return $this->getOpeningTag().$text.$this->getClosingTag();
-    }
-
-    /**
-     * @return string|void
-     */
-    protected function buildFieldDescription()
-    {
-        if (empty($this->args['description'])) {
-            return;
-        }
-        if ($this->args['is_widget']) {
-            return $this->small($this->args['description']);
-        }
-        return $this->p($this->args['description'], ['class' => 'description']);
-    }
-
-    /**
-     * @return string|void
-     */
-    protected function buildFormInput()
-    {
-        if (!in_array($this->args['type'], ['checkbox', 'radio'])) {
-            if (isset($this->args['multiple'])) {
-                $this->args['name'].= '[]';
-            }
-            return $this->buildFormLabel().$this->getOpeningTag();
-        }
-        return empty($this->args['options'])
-            ? $this->buildFormInputChoice()
-            : $this->buildFormInputMultiChoice();
-    }
-
-    /**
-     * @return string|void
-     */
-    protected function buildFormInputChoice()
-    {
-        if (!empty($this->args['text'])) {
-            $this->args['label'] = $this->args['text'];
-        }
-        if (!$this->args['is_public']) {
-            return $this->buildFormLabel([
-                'class' => 'glsr-'.$this->args['type'].'-label',
-                'text' => $this->getOpeningTag().' '.$this->args['label'].'<span></span>',
-            ]);
-        }
-        return $this->getOpeningTag().$this->buildFormLabel([
-            'class' => 'glsr-'.$this->args['type'].'-label',
-            'text' => $this->args['label'].'<span></span>',
-        ]);
-    }
-
-    /**
-     * @return string|void
-     */
-    protected function buildFormInputMultiChoice()
-    {
-        if ('checkbox' == $this->args['type']) {
-            $this->args['name'].= '[]';
-        }
-        $index = 0;
-        $options = array_reduce(array_keys($this->args['options']), function ($carry, $key) use (&$index) {
-            return $carry.$this->li($this->{$this->args['type']}([
-                'checked' => in_array($key, (array) $this->args['value']),
-                'id' => $this->args['id'].'-'.$index++,
-                'name' => $this->args['name'],
-                'text' => $this->args['options'][$key],
-                'value' => $key,
-            ]));
-        });
-        return $this->ul($options, [
-            'class' => $this->args['class'],
-            'id' => $this->args['id'],
-        ]);
-    }
-
-    /**
-     * @return void|string
-     */
-    protected function buildFormLabel(array $customArgs = [])
-    {
-        if (empty($this->args['label']) || 'hidden' == $this->args['type']) {
-            return;
-        }
-        return $this->label(wp_parse_args($customArgs, [
-            'for' => $this->args['id'],
-            'is_public' => $this->args['is_public'],
-            'text' => $this->args['label'],
-            'type' => $this->args['type'],
-        ]));
-    }
-
-    /**
-     * @return string|void
-     */
-    protected function buildFormSelect()
-    {
-        return $this->buildFormLabel().$this->buildDefaultTag($this->buildFormSelectOptions());
-    }
-
-    /**
-     * @return string|void
-     */
-    protected function buildFormSelectOptions()
-    {
-        return array_reduce(array_keys($this->args['options']), function ($carry, $key) {
-            return $carry.$this->option([
-                'selected' => $this->args['value'] == $key,
-                'text' => $this->args['options'][$key],
-                'value' => $key,
-            ]);
-        });
-    }
-
-    /**
-     * @return string|void
-     */
-    protected function buildFormTextarea()
-    {
-        return $this->buildFormLabel().$this->buildDefaultTag($this->args['value']);
-    }
-
-    /**
-     * @return string|void
-     */
-    protected function buildTag()
-    {
-        $this->mergeArgsWithRequiredDefaults();
-        return $this->getTag();
-    }
-
-    /**
-     * @return string
-     */
-    protected function getCustomFieldClassName()
-    {
-        $classname = glsr(Helper::class)->buildClassName($this->tag, __NAMESPACE__.'\Fields');
-        return apply_filters('site-reviews/builder/field/'.$this->tag, $classname);
-    }
-
-    /**
-     * @return void
-     */
-    protected function mergeArgsWithRequiredDefaults()
-    {
-        $className = $this->getCustomFieldClassName();
-        if (class_exists($className)) {
-            $this->args = $className::merge($this->args);
-        }
-        $this->args = glsr(BuilderDefaults::class)->merge($this->args);
-    }
-
-    /**
-     * @param string|array ...$params
-     * @return void
-     */
-    protected function normalize(...$params)
-    {
-        if (is_string($params[0]) || is_numeric($params[0])) {
-            $this->setNameOrTextAttributeForTag($params[0]);
-        }
-        if (is_array($params[0])) {
-            $this->args += $params[0];
-        } elseif (is_array($params[1])) {
-            $this->args += $params[1];
-        }
-        if (!isset($this->args['is_public'])) {
-            $this->args['is_public'] = false;
-        }
-    }
-
-    /**
-     * @param string $value
-     * @return void
-     */
-    protected function setNameOrTextAttributeForTag($value)
-    {
-        $attribute = in_array($this->tag, static::TAGS_FORM)
-            ? 'name'
-            : 'text';
-        $this->args[$attribute] = $value;
-    }
-
-    /**
-     * @param string $method
-     * @return void
-     */
-    protected function setTagFromMethod($method)
-    {
-        $this->tag = strtolower($method);
-        if (in_array($this->tag, static::INPUT_TYPES)) {
-            $this->args['type'] = $this->tag;
-            $this->tag = 'input';
-        }
-    }
+	const INPUT_TYPES = [
+		'checkbox', 'date', 'datetime-local', 'email', 'file', 'hidden', 'image', 'month',
+		'number', 'password', 'radio', 'range', 'reset', 'search', 'submit', 'tel', 'text', 'time',
+		'url', 'week',
+	];
+
+	const TAGS_FORM = [
+		'input', 'select', 'textarea',
+	];
+
+	const TAGS_SINGLE = [
+		'img',
+	];
+
+	const TAGS_STRUCTURE = [
+		'div', 'form', 'nav', 'ol', 'section', 'ul',
+	];
+
+	const TAGS_TEXT = [
+		'a', 'button', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'i', 'label', 'li', 'option', 'p', 'pre',
+		'small', 'span',
+	];
+
+	/**
+	 * @var array
+	 */
+	public $args = [];
+
+	/**
+	 * @var bool
+	 */
+	public $render = false;
+
+	/**
+	 * @var string
+	 */
+	public $tag;
+
+	/**
+	 * @param string $method
+	 * @param array $args
+	 * @return string|void
+	 */
+	public function __call($method, $args)
+	{
+		$instance = new static();
+		$instance->setTagFromMethod($method);
+		call_user_func_array([$instance, 'normalize'], $args += ['', '']);
+		$tags = array_merge(static::TAGS_FORM, static::TAGS_SINGLE, static::TAGS_STRUCTURE, static::TAGS_TEXT);
+		do_action_ref_array('site-reviews/builder', [$instance]);
+		$generatedTag = in_array($instance->tag, $tags)
+			? $instance->buildTag()
+			: $instance->buildCustomField();
+		$generatedTag = apply_filters('site-reviews/builder/result', $generatedTag, $instance);
+		if (!$this->render) {
+			return $generatedTag;
+		}
+		echo $generatedTag;
+	}
+
+	/**
+	 * @param string $property
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function __set($property, $value)
+	{
+		$properties = [
+			'args' => 'is_array',
+			'render' => 'is_bool',
+			'tag' => 'is_string',
+		];
+		if (!isset($properties[$property])
+			|| empty(array_filter([$value], $properties[$property]))
+		) {
+			return;
+		}
+		$this->$property = $value;
+	}
+
+	/**
+	 * @return void|string
+	 */
+	public function getClosingTag()
+	{
+		if (empty($this->tag)) {
+			return;
+		}
+		return '</'.$this->tag.'>';
+	}
+
+	/**
+	 * @return void|string
+	 */
+	public function getOpeningTag()
+	{
+		if (empty($this->tag)) {
+			return;
+		}
+		$attributes = glsr(Attributes::class)->{$this->tag}($this->args)->toString();
+		return '<'.trim($this->tag.' '.$attributes).'>';
+	}
+
+	/**
+	 * @return void|string
+	 */
+	public function getTag()
+	{
+		if (in_array($this->tag, static::TAGS_SINGLE)) {
+			return $this->getOpeningTag();
+		}
+		if (!in_array($this->tag, static::TAGS_FORM)) {
+			return $this->buildDefaultTag();
+		}
+		return call_user_func([$this, 'buildForm'.ucfirst($this->tag)]).$this->buildFieldDescription();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function raw(array $field)
+	{
+		unset($field['label']);
+		return $this->{$field['type']}($field);
+	}
+
+	/**
+	 * @return string|void
+	 */
+	protected function buildCustomField()
+	{
+		$className = $this->getCustomFieldClassName();
+		if (class_exists($className)) {
+			return (new $className($this))->build();
+		}
+		glsr_log()->error('Field missing: '.$className);
+	}
+
+	/**
+	 * @return string|void
+	 */
+	protected function buildDefaultTag($text = '')
+	{
+		if (empty($text)) {
+			$text = $this->args['text'];
+		}
+		return $this->getOpeningTag().$text.$this->getClosingTag();
+	}
+
+	/**
+	 * @return string|void
+	 */
+	protected function buildFieldDescription()
+	{
+		if (empty($this->args['description'])) {
+			return;
+		}
+		if ($this->args['is_widget']) {
+			return $this->small($this->args['description']);
+		}
+		return $this->p($this->args['description'], ['class' => 'description']);
+	}
+
+	/**
+	 * @return string|void
+	 */
+	protected function buildFormInput()
+	{
+		if (!in_array($this->args['type'], ['checkbox', 'radio'])) {
+			if (isset($this->args['multiple'])) {
+				$this->args['name'].= '[]';
+			}
+			return $this->buildFormLabel().$this->getOpeningTag();
+		}
+		return empty($this->args['options'])
+			? $this->buildFormInputChoice()
+			: $this->buildFormInputMultiChoice();
+	}
+
+	/**
+	 * @return string|void
+	 */
+	protected function buildFormInputChoice()
+	{
+		if (!empty($this->args['text'])) {
+			$this->args['label'] = $this->args['text'];
+		}
+		if (!$this->args['is_public']) {
+			return $this->buildFormLabel([
+				'class' => 'glsr-'.$this->args['type'].'-label',
+				'text' => $this->getOpeningTag().' '.$this->args['label'].'<span></span>',
+			]);
+		}
+		return $this->getOpeningTag().$this->buildFormLabel([
+			'class' => 'glsr-'.$this->args['type'].'-label',
+			'text' => $this->args['label'].'<span></span>',
+		]);
+	}
+
+	/**
+	 * @return string|void
+	 */
+	protected function buildFormInputMultiChoice()
+	{
+		if ('checkbox' == $this->args['type']) {
+			$this->args['name'].= '[]';
+		}
+		$index = 0;
+		$options = array_reduce(array_keys($this->args['options']), function ($carry, $key) use (&$index) {
+			return $carry.$this->li($this->{$this->args['type']}([
+				'checked' => in_array($key, (array) $this->args['value']),
+				'id' => $this->args['id'].'-'.$index++,
+				'name' => $this->args['name'],
+				'text' => $this->args['options'][$key],
+				'value' => $key,
+			]));
+		});
+		return $this->ul($options, [
+			'class' => $this->args['class'],
+			'id' => $this->args['id'],
+		]);
+	}
+
+	/**
+	 * @return void|string
+	 */
+	protected function buildFormLabel(array $customArgs = [])
+	{
+		if (empty($this->args['label']) || 'hidden' == $this->args['type']) {
+			return;
+		}
+		return $this->label(wp_parse_args($customArgs, [
+			'for' => $this->args['id'],
+			'is_public' => $this->args['is_public'],
+			'text' => $this->args['label'],
+			'type' => $this->args['type'],
+		]));
+	}
+
+	/**
+	 * @return string|void
+	 */
+	protected function buildFormSelect()
+	{
+		return $this->buildFormLabel().$this->buildDefaultTag($this->buildFormSelectOptions());
+	}
+
+	/**
+	 * @return string|void
+	 */
+	protected function buildFormSelectOptions()
+	{
+		return array_reduce(array_keys($this->args['options']), function ($carry, $key) {
+			return $carry.$this->option([
+				'selected' => $this->args['value'] == $key,
+				'text' => $this->args['options'][$key],
+				'value' => $key,
+			]);
+		});
+	}
+
+	/**
+	 * @return string|void
+	 */
+	protected function buildFormTextarea()
+	{
+		return $this->buildFormLabel().$this->buildDefaultTag($this->args['value']);
+	}
+
+	/**
+	 * @return string|void
+	 */
+	protected function buildTag()
+	{
+		$this->mergeArgsWithRequiredDefaults();
+		return $this->getTag();
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getCustomFieldClassName()
+	{
+		$classname = glsr(Helper::class)->buildClassName($this->tag, __NAMESPACE__.'\Fields');
+		return apply_filters('site-reviews/builder/field/'.$this->tag, $classname);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function mergeArgsWithRequiredDefaults()
+	{
+		$className = $this->getCustomFieldClassName();
+		if (class_exists($className)) {
+			$this->args = $className::merge($this->args);
+		}
+		$this->args = glsr(BuilderDefaults::class)->merge($this->args);
+	}
+
+	/**
+	 * @param string|array ...$params
+	 * @return void
+	 */
+	protected function normalize(...$params)
+	{
+		if (is_string($params[0]) || is_numeric($params[0])) {
+			$this->setNameOrTextAttributeForTag($params[0]);
+		}
+		if (is_array($params[0])) {
+			$this->args += $params[0];
+		} elseif (is_array($params[1])) {
+			$this->args += $params[1];
+		}
+		if (!isset($this->args['is_public'])) {
+			$this->args['is_public'] = false;
+		}
+	}
+
+	/**
+	 * @param string $value
+	 * @return void
+	 */
+	protected function setNameOrTextAttributeForTag($value)
+	{
+		$attribute = in_array($this->tag, static::TAGS_FORM)
+			? 'name'
+			: 'text';
+		$this->args[$attribute] = $value;
+	}
+
+	/**
+	 * @param string $method
+	 * @return void
+	 */
+	protected function setTagFromMethod($method)
+	{
+		$this->tag = strtolower($method);
+		if (in_array($this->tag, static::INPUT_TYPES)) {
+			$this->args['type'] = $this->tag;
+			$this->tag = 'input';
+		}
+	}
 }

Spacing +70 added lines, -70 removed lines

@@ -61,18 +61,18 @@ 
      * @param array $args
      * @return string|void
      */
-    public function __call($method, $args)
+    public function __call( $method, $args )
     {
         $instance = new static();
-        $instance->setTagFromMethod($method);
-        call_user_func_array([$instance, 'normalize'], $args += ['', '']);
-        $tags = array_merge(static::TAGS_FORM, static::TAGS_SINGLE, static::TAGS_STRUCTURE, static::TAGS_TEXT);
-        do_action_ref_array('site-reviews/builder', [$instance]);
-        $generatedTag = in_array($instance->tag, $tags)
+        $instance->setTagFromMethod( $method );
+        call_user_func_array( [$instance, 'normalize'], $args += ['', ''] );
+        $tags = array_merge( static::TAGS_FORM, static::TAGS_SINGLE, static::TAGS_STRUCTURE, static::TAGS_TEXT );
+        do_action_ref_array( 'site-reviews/builder', [$instance] );
+        $generatedTag = in_array( $instance->tag, $tags )
             ? $instance->buildTag()
             : $instance->buildCustomField();
-        $generatedTag = apply_filters('site-reviews/builder/result', $generatedTag, $instance);
-        if (!$this->render) {
+        $generatedTag = apply_filters( 'site-reviews/builder/result', $generatedTag, $instance );
+        if( !$this->render ) {
             return $generatedTag;
         }
         echo $generatedTag;
@@ -83,15 +83,15 @@ 
      * @param mixed $value
      * @return void
      */
-    public function __set($property, $value)
+    public function __set( $property, $value )
     {
         $properties = [
             'args' => 'is_array',
             'render' => 'is_bool',
             'tag' => 'is_string',
         ];
-        if (!isset($properties[$property])
-            || empty(array_filter([$value], $properties[$property]))
+        if( !isset($properties[$property])
+            || empty(array_filter( [$value], $properties[$property] ))
         ) {
             return;
         }
@@ -103,7 +103,7 @@ 
      */
     public function getClosingTag()
     {
-        if (empty($this->tag)) {
+        if( empty($this->tag) ) {
             return;
         }
         return '</'.$this->tag.'>';
@@ -114,11 +114,11 @@ 
      */
     public function getOpeningTag()
     {
-        if (empty($this->tag)) {
+        if( empty($this->tag) ) {
             return;
         }
-        $attributes = glsr(Attributes::class)->{$this->tag}($this->args)->toString();
-        return '<'.trim($this->tag.' '.$attributes).'>';
+        $attributes = glsr( Attributes::class )->{$this->tag}($this->args)->toString();
+        return '<'.trim( $this->tag.' '.$attributes ).'>';
     }
 
     /**
@@ -126,19 +126,19 @@ 
      */
     public function getTag()
     {
-        if (in_array($this->tag, static::TAGS_SINGLE)) {
+        if( in_array( $this->tag, static::TAGS_SINGLE ) ) {
             return $this->getOpeningTag();
         }
-        if (!in_array($this->tag, static::TAGS_FORM)) {
+        if( !in_array( $this->tag, static::TAGS_FORM ) ) {
             return $this->buildDefaultTag();
         }
-        return call_user_func([$this, 'buildForm'.ucfirst($this->tag)]).$this->buildFieldDescription();
+        return call_user_func( [$this, 'buildForm'.ucfirst( $this->tag )] ).$this->buildFieldDescription();
     }
 
     /**
      * @return string
      */
-    public function raw(array $field)
+    public function raw( array $field )
     {
         unset($field['label']);
         return $this->{$field['type']}($field);
@@ -150,18 +150,18 @@ 
     protected function buildCustomField()
     {
         $className = $this->getCustomFieldClassName();
-        if (class_exists($className)) {
-            return (new $className($this))->build();
+        if( class_exists( $className ) ) {
+            return (new $className( $this ))->build();
         }
-        glsr_log()->error('Field missing: '.$className);
+        glsr_log()->error( 'Field missing: '.$className );
     }
 
     /**
      * @return string|void
      */
-    protected function buildDefaultTag($text = '')
+    protected function buildDefaultTag( $text = '' )
     {
-        if (empty($text)) {
+        if( empty($text) ) {
             $text = $this->args['text'];
         }
         return $this->getOpeningTag().$text.$this->getClosingTag();
@@ -172,13 +172,13 @@ 
      */
     protected function buildFieldDescription()
     {
-        if (empty($this->args['description'])) {
+        if( empty($this->args['description']) ) {
             return;
         }
-        if ($this->args['is_widget']) {
-            return $this->small($this->args['description']);
+        if( $this->args['is_widget'] ) {
+            return $this->small( $this->args['description'] );
         }
-        return $this->p($this->args['description'], ['class' => 'description']);
+        return $this->p( $this->args['description'], ['class' => 'description'] );
     }
 
     /**
@@ -186,9 +186,9 @@ 
      */
     protected function buildFormInput()
     {
-        if (!in_array($this->args['type'], ['checkbox', 'radio'])) {
-            if (isset($this->args['multiple'])) {
-                $this->args['name'].= '[]';
+        if( !in_array( $this->args['type'], ['checkbox', 'radio'] ) ) {
+            if( isset($this->args['multiple']) ) {
+                $this->args['name'] .= '[]';
             }
             return $this->buildFormLabel().$this->getOpeningTag();
         }
@@ -202,19 +202,19 @@ 
      */
     protected function buildFormInputChoice()
     {
-        if (!empty($this->args['text'])) {
+        if( !empty($this->args['text']) ) {
             $this->args['label'] = $this->args['text'];
         }
-        if (!$this->args['is_public']) {
-            return $this->buildFormLabel([
+        if( !$this->args['is_public'] ) {
+            return $this->buildFormLabel( [
                 'class' => 'glsr-'.$this->args['type'].'-label',
                 'text' => $this->getOpeningTag().' '.$this->args['label'].'<span></span>',
-            ]);
+            ] );
         }
-        return $this->getOpeningTag().$this->buildFormLabel([
+        return $this->getOpeningTag().$this->buildFormLabel( [
             'class' => 'glsr-'.$this->args['type'].'-label',
             'text' => $this->args['label'].'<span></span>',
-        ]);
+        ] );
     }
 
     /**
@@ -222,39 +222,39 @@ 
      */
     protected function buildFormInputMultiChoice()
     {
-        if ('checkbox' == $this->args['type']) {
-            $this->args['name'].= '[]';
+        if( 'checkbox' == $this->args['type'] ) {
+            $this->args['name'] .= '[]';
         }
         $index = 0;
-        $options = array_reduce(array_keys($this->args['options']), function ($carry, $key) use (&$index) {
-            return $carry.$this->li($this->{$this->args['type']}([
-                'checked' => in_array($key, (array) $this->args['value']),
+        $options = array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) use (&$index) {
+            return $carry.$this->li( $this->{$this->args['type']}([
+                'checked' => in_array( $key, (array)$this->args['value'] ),
                 'id' => $this->args['id'].'-'.$index++,
                 'name' => $this->args['name'],
                 'text' => $this->args['options'][$key],
                 'value' => $key,
-            ]));
+            ]) );
         });
-        return $this->ul($options, [
+        return $this->ul( $options, [
             'class' => $this->args['class'],
             'id' => $this->args['id'],
-        ]);
+        ] );
     }
 
     /**
      * @return void|string
      */
-    protected function buildFormLabel(array $customArgs = [])
+    protected function buildFormLabel( array $customArgs = [] )
     {
-        if (empty($this->args['label']) || 'hidden' == $this->args['type']) {
+        if( empty($this->args['label']) || 'hidden' == $this->args['type'] ) {
             return;
         }
-        return $this->label(wp_parse_args($customArgs, [
+        return $this->label( wp_parse_args( $customArgs, [
             'for' => $this->args['id'],
             'is_public' => $this->args['is_public'],
             'text' => $this->args['label'],
             'type' => $this->args['type'],
-        ]));
+        ] ) );
     }
 
     /**
@@ -262,7 +262,7 @@ 
      */
     protected function buildFormSelect()
     {
-        return $this->buildFormLabel().$this->buildDefaultTag($this->buildFormSelectOptions());
+        return $this->buildFormLabel().$this->buildDefaultTag( $this->buildFormSelectOptions() );
     }
 
     /**
@@ -270,12 +270,12 @@ 
      */
     protected function buildFormSelectOptions()
     {
-        return array_reduce(array_keys($this->args['options']), function ($carry, $key) {
-            return $carry.$this->option([
+        return array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) {
+            return $carry.$this->option( [
                 'selected' => $this->args['value'] == $key,
                 'text' => $this->args['options'][$key],
                 'value' => $key,
-            ]);
+            ] );
         });
     }
 
@@ -284,7 +284,7 @@ 
      */
     protected function buildFormTextarea()
     {
-        return $this->buildFormLabel().$this->buildDefaultTag($this->args['value']);
+        return $this->buildFormLabel().$this->buildDefaultTag( $this->args['value'] );
     }
 
     /**
@@ -301,8 +301,8 @@ 
      */
     protected function getCustomFieldClassName()
     {
-        $classname = glsr(Helper::class)->buildClassName($this->tag, __NAMESPACE__.'\Fields');
-        return apply_filters('site-reviews/builder/field/'.$this->tag, $classname);
+        $classname = glsr( Helper::class )->buildClassName( $this->tag, __NAMESPACE__.'\Fields' );
+        return apply_filters( 'site-reviews/builder/field/'.$this->tag, $classname );
     }
 
     /**
@@ -311,27 +311,27 @@ 
     protected function mergeArgsWithRequiredDefaults()
     {
         $className = $this->getCustomFieldClassName();
-        if (class_exists($className)) {
-            $this->args = $className::merge($this->args);
+        if( class_exists( $className ) ) {
+            $this->args = $className::merge( $this->args );
         }
-        $this->args = glsr(BuilderDefaults::class)->merge($this->args);
+        $this->args = glsr( BuilderDefaults::class )->merge( $this->args );
     }
 
     /**
      * @param string|array ...$params
      * @return void
      */
-    protected function normalize(...$params)
+    protected function normalize( ...$params )
     {
-        if (is_string($params[0]) || is_numeric($params[0])) {
-            $this->setNameOrTextAttributeForTag($params[0]);
+        if( is_string( $params[0] ) || is_numeric( $params[0] ) ) {
+            $this->setNameOrTextAttributeForTag( $params[0] );
         }
-        if (is_array($params[0])) {
+        if( is_array( $params[0] ) ) {
             $this->args += $params[0];
-        } elseif (is_array($params[1])) {
+        } elseif( is_array( $params[1] ) ) {
             $this->args += $params[1];
         }
-        if (!isset($this->args['is_public'])) {
+        if( !isset($this->args['is_public']) ) {
             $this->args['is_public'] = false;
         }
     }
@@ -340,9 +340,9 @@ 
      * @param string $value
      * @return void
      */
-    protected function setNameOrTextAttributeForTag($value)
+    protected function setNameOrTextAttributeForTag( $value )
     {
-        $attribute = in_array($this->tag, static::TAGS_FORM)
+        $attribute = in_array( $this->tag, static::TAGS_FORM )
             ? 'name'
             : 'text';
         $this->args[$attribute] = $value;
@@ -352,10 +352,10 @@ 
      * @param string $method
      * @return void
      */
-    protected function setTagFromMethod($method)
+    protected function setTagFromMethod( $method )
     {
-        $this->tag = strtolower($method);
-        if (in_array($this->tag, static::INPUT_TYPES)) {
+        $this->tag = strtolower( $method );
+        if( in_array( $this->tag, static::INPUT_TYPES ) ) {
             $this->args['type'] = $this->tag;
             $this->tag = 'input';
         }

plugin/Modules/Html/Partials/SiteReviewsForm.php

Indentation +272 added lines, -272 removed lines

@@ -13,297 +13,297 @@
 
 class SiteReviewsForm
 {
-    /**
-     * @var array
-     */
-    protected $args;
+	/**
+	 * @var array
+	 */
+	protected $args;
 
-    /**
-     * @var array
-     */
-    protected $errors;
+	/**
+	 * @var array
+	 */
+	protected $errors;
 
-    /**
-     * @var string
-     */
-    protected $message;
+	/**
+	 * @var string
+	 */
+	protected $message;
 
-    /**
-     * @var array
-     */
-    protected $required;
+	/**
+	 * @var array
+	 */
+	protected $required;
 
-    /**
-     * @var array
-     */
-    protected $values;
+	/**
+	 * @var array
+	 */
+	protected $values;
 
-    /**
-     * @return void|string
-     */
-    public function build(array $args = [])
-    {
-        $this->args = $args;
-        if (!is_user_logged_in() && glsr(OptionManager::class)->getBool('settings.general.require.login')) {
-            return $this->buildLoginRegister();
-        }
-        $this->errors = glsr(Session::class)->get($args['id'].'errors', [], true);
-        $this->message = glsr(Session::class)->get($args['id'].'message', '', true);
-        $this->required = glsr(OptionManager::class)->get('settings.submissions.required', []);
-        $this->values = glsr(Session::class)->get($args['id'].'values', [], true);
-        $fields = array_reduce($this->getFields(), function ($carry, $field) {
-            return $carry.$field;
-        });
-        return glsr(Template::class)->build('templates/reviews-form', [
-            'args' => $args,
-            'context' => [
-                'class' => $this->getClass(),
-                'fields' => $fields,
-                'id' => $this->args['id'],
-                'response' => $this->buildResponse(),
-                'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(),
-            ],
-        ]);
-    }
+	/**
+	 * @return void|string
+	 */
+	public function build(array $args = [])
+	{
+		$this->args = $args;
+		if (!is_user_logged_in() && glsr(OptionManager::class)->getBool('settings.general.require.login')) {
+			return $this->buildLoginRegister();
+		}
+		$this->errors = glsr(Session::class)->get($args['id'].'errors', [], true);
+		$this->message = glsr(Session::class)->get($args['id'].'message', '', true);
+		$this->required = glsr(OptionManager::class)->get('settings.submissions.required', []);
+		$this->values = glsr(Session::class)->get($args['id'].'values', [], true);
+		$fields = array_reduce($this->getFields(), function ($carry, $field) {
+			return $carry.$field;
+		});
+		return glsr(Template::class)->build('templates/reviews-form', [
+			'args' => $args,
+			'context' => [
+				'class' => $this->getClass(),
+				'fields' => $fields,
+				'id' => $this->args['id'],
+				'response' => $this->buildResponse(),
+				'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(),
+			],
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildLoginRegister()
-    {
-        return glsr(Template::class)->build('templates/login-register', [
-            'context' => [
-                'text' => trim($this->getLoginText().' '.$this->getRegisterText()),
-            ],
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildLoginRegister()
+	{
+		return glsr(Template::class)->build('templates/login-register', [
+			'context' => [
+				'text' => trim($this->getLoginText().' '.$this->getRegisterText()),
+			],
+		]);
+	}
 
-    /**
-     * @return void|string
-     */
-    protected function buildRecaptcha()
-    {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
-            return;
-        }
-        return glsr(Builder::class)->div([
-            'class' => 'glsr-recaptcha-holder',
-            'data-badge' => glsr(OptionManager::class)->get('settings.submissions.recaptcha.position'),
-            'data-sitekey' => sanitize_text_field(glsr(OptionManager::class)->get('settings.submissions.recaptcha.key')),
-            'data-size' => 'invisible',
-        ]);
-    }
+	/**
+	 * @return void|string
+	 */
+	protected function buildRecaptcha()
+	{
+		if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+			return;
+		}
+		return glsr(Builder::class)->div([
+			'class' => 'glsr-recaptcha-holder',
+			'data-badge' => glsr(OptionManager::class)->get('settings.submissions.recaptcha.position'),
+			'data-sitekey' => sanitize_text_field(glsr(OptionManager::class)->get('settings.submissions.recaptcha.key')),
+			'data-size' => 'invisible',
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildResponse()
-    {
-        $classes = !empty($this->errors)
-            ? glsr(StyleValidationDefaults::class)->defaults()['message_error_class']
-            : '';
-        return glsr(Template::class)->build('templates/form/response', [
-            'context' => [
-                'class' => $classes,
-                'message' => wpautop($this->message),
-            ],
-            'has_errors' => !empty($this->errors),
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildResponse()
+	{
+		$classes = !empty($this->errors)
+			? glsr(StyleValidationDefaults::class)->defaults()['message_error_class']
+			: '';
+		return glsr(Template::class)->build('templates/form/response', [
+			'context' => [
+				'class' => $classes,
+				'message' => wpautop($this->message),
+			],
+			'has_errors' => !empty($this->errors),
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildSubmitButton()
-    {
-        return glsr(Template::class)->build('templates/form/submit-button', [
-            'context' => [
-                'text' => __('Submit your review', 'site-reviews'),
-            ],
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildSubmitButton()
+	{
+		return glsr(Template::class)->build('templates/form/submit-button', [
+			'context' => [
+				'text' => __('Submit your review', 'site-reviews'),
+			],
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getClass()
-    {
-        return trim('glsr-form glsr-'.glsr(Style::class)->get().' '.$this->args['class']);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getClass()
+	{
+		return trim('glsr-form glsr-'.glsr(Style::class)->get().' '.$this->args['class']);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getFields()
-    {
-        $hiddenFields = $this->getHiddenFields();
-        $hiddenFields[] = $this->getHoneypotField();
-        $fields = $this->normalizeFields(glsr(Form::class)->getFields('submission-form'));
-        $paths = array_map(function ($obj) {
-            return $obj->field['path'];
-        }, $hiddenFields);
-        foreach ($fields as $field) {
-            $index = array_search($field->field['path'], $paths);
-            if (false === $index) {
-                continue;
-            }
-            unset($hiddenFields[$index]);
-        }
-        return array_merge($hiddenFields, $fields);
-    }
+	/**
+	 * @return array
+	 */
+	protected function getFields()
+	{
+		$hiddenFields = $this->getHiddenFields();
+		$hiddenFields[] = $this->getHoneypotField();
+		$fields = $this->normalizeFields(glsr(Form::class)->getFields('submission-form'));
+		$paths = array_map(function ($obj) {
+			return $obj->field['path'];
+		}, $hiddenFields);
+		foreach ($fields as $field) {
+			$index = array_search($field->field['path'], $paths);
+			if (false === $index) {
+				continue;
+			}
+			unset($hiddenFields[$index]);
+		}
+		return array_merge($hiddenFields, $fields);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getLoginText()
-    {
-        $loginLink = glsr(Builder::class)->a([
-            'href' => wp_login_url(strval(get_permalink())),
-            'text' => __('logged in', 'site-reviews'),
-        ]);
-        return sprintf(__('You must be %s to submit a review.', 'site-reviews'), $loginLink);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getLoginText()
+	{
+		$loginLink = glsr(Builder::class)->a([
+			'href' => wp_login_url(strval(get_permalink())),
+			'text' => __('logged in', 'site-reviews'),
+		]);
+		return sprintf(__('You must be %s to submit a review.', 'site-reviews'), $loginLink);
+	}
 
-    /**
-     * @return void|string
-     */
-    protected function getRegisterText()
-    {
-        if (!get_option('users_can_register') || !glsr(OptionManager::class)->getBool('settings.general.require.login')) {
-            return;
-        }
-        $registerLink = glsr(Builder::class)->a([
-            'href' => wp_registration_url(),
-            'text' => __('register', 'site-reviews'),
-        ]);
-        return sprintf(__('You may also %s for an account.', 'site-reviews'), $registerLink);
-    }
+	/**
+	 * @return void|string
+	 */
+	protected function getRegisterText()
+	{
+		if (!get_option('users_can_register') || !glsr(OptionManager::class)->getBool('settings.general.require.login')) {
+			return;
+		}
+		$registerLink = glsr(Builder::class)->a([
+			'href' => wp_registration_url(),
+			'text' => __('register', 'site-reviews'),
+		]);
+		return sprintf(__('You may also %s for an account.', 'site-reviews'), $registerLink);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getHiddenFields()
-    {
-        $fields = [[
-            'name' => '_action',
-            'value' => 'submit-review',
-        ], [
-            'name' => '_counter',
-        ], [
-            'name' => '_nonce',
-            'value' => wp_create_nonce('submit-review'),
-        ], [
-            'name' => '_post_id',
-            'value' => get_the_ID(),
-        ], [
-            'name' => '_referer',
-            'value' => wp_unslash(filter_input(INPUT_SERVER, 'REQUEST_URI')),
-        ], [
-            'name' => 'assign_to',
-            'value' => $this->args['assign_to'],
-        ], [
-            'name' => 'category',
-            'value' => $this->args['category'],
-        ], [
-            'name' => 'excluded',
-            'value' => $this->args['hide'],
-        ], [
-            'name' => 'form_id',
-            'value' => $this->args['id'],
-        ]];
-        return array_map(function ($field) {
-            return new Field(wp_parse_args($field, ['type' => 'hidden']));
-        }, $fields);
-    }
+	/**
+	 * @return array
+	 */
+	protected function getHiddenFields()
+	{
+		$fields = [[
+			'name' => '_action',
+			'value' => 'submit-review',
+		], [
+			'name' => '_counter',
+		], [
+			'name' => '_nonce',
+			'value' => wp_create_nonce('submit-review'),
+		], [
+			'name' => '_post_id',
+			'value' => get_the_ID(),
+		], [
+			'name' => '_referer',
+			'value' => wp_unslash(filter_input(INPUT_SERVER, 'REQUEST_URI')),
+		], [
+			'name' => 'assign_to',
+			'value' => $this->args['assign_to'],
+		], [
+			'name' => 'category',
+			'value' => $this->args['category'],
+		], [
+			'name' => 'excluded',
+			'value' => $this->args['hide'],
+		], [
+			'name' => 'form_id',
+			'value' => $this->args['id'],
+		]];
+		return array_map(function ($field) {
+			return new Field(wp_parse_args($field, ['type' => 'hidden']));
+		}, $fields);
+	}
 
-    /**
-     * @return Field
-     */
-    protected function getHoneypotField()
-    {
-        return new Field([
-            'name' => 'gotcha',
-            'type' => 'honeypot',
-        ]);
-    }
+	/**
+	 * @return Field
+	 */
+	protected function getHoneypotField()
+	{
+		return new Field([
+			'name' => 'gotcha',
+			'type' => 'honeypot',
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeFieldId(Field &$field)
-    {
-        if (empty($this->args['id']) || empty($field->field['id'])) {
-            return;
-        }
-        $field->field['id'].= '-'.$this->args['id'];
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldId(Field &$field)
+	{
+		if (empty($this->args['id']) || empty($field->field['id'])) {
+			return;
+		}
+		$field->field['id'].= '-'.$this->args['id'];
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeFieldClass(Field &$field)
-    {
-        if (!isset($field->field['class'])) {
-            $field->field['class'] = '';
-        }
-        $field->field['class'] = trim($field->field['class'].' glsr-field-control');
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldClass(Field &$field)
+	{
+		if (!isset($field->field['class'])) {
+			$field->field['class'] = '';
+		}
+		$field->field['class'] = trim($field->field['class'].' glsr-field-control');
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeFieldErrors(Field &$field)
-    {
-        if (!array_key_exists($field->field['path'], $this->errors)) {
-            return;
-        }
-        $field->field['errors'] = $this->errors[$field->field['path']];
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldErrors(Field &$field)
+	{
+		if (!array_key_exists($field->field['path'], $this->errors)) {
+			return;
+		}
+		$field->field['errors'] = $this->errors[$field->field['path']];
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeFieldRequired(Field &$field)
-    {
-        if (!in_array($field->field['path'], $this->required)) {
-            return;
-        }
-        $field->field['required'] = true;
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldRequired(Field &$field)
+	{
+		if (!in_array($field->field['path'], $this->required)) {
+			return;
+		}
+		$field->field['required'] = true;
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeFields($fields)
-    {
-        $normalizedFields = [];
-        foreach ($fields as $field) {
-            if (in_array($field->field['path'], $this->args['hide'])) {
-                continue;
-            }
-            $field->field['is_public'] = true;
-            $this->normalizeFieldClass($field);
-            $this->normalizeFieldErrors($field);
-            $this->normalizeFieldRequired($field);
-            $this->normalizeFieldValue($field);
-            $this->normalizeFieldId($field);
-            $normalizedFields[] = $field;
-        }
-        return $normalizedFields;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeFields($fields)
+	{
+		$normalizedFields = [];
+		foreach ($fields as $field) {
+			if (in_array($field->field['path'], $this->args['hide'])) {
+				continue;
+			}
+			$field->field['is_public'] = true;
+			$this->normalizeFieldClass($field);
+			$this->normalizeFieldErrors($field);
+			$this->normalizeFieldRequired($field);
+			$this->normalizeFieldValue($field);
+			$this->normalizeFieldId($field);
+			$normalizedFields[] = $field;
+		}
+		return $normalizedFields;
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeFieldValue(Field &$field)
-    {
-        if (!array_key_exists($field->field['path'], $this->values)) {
-            return;
-        }
-        if (in_array($field->field['type'], ['radio', 'checkbox'])) {
-            $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']];
-        } else {
-            $field->field['value'] = $this->values[$field->field['path']];
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldValue(Field &$field)
+	{
+		if (!array_key_exists($field->field['path'], $this->values)) {
+			return;
+		}
+		if (in_array($field->field['type'], ['radio', 'checkbox'])) {
+			$field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']];
+		} else {
+			$field->field['value'] = $this->values[$field->field['path']];
+		}
+	}
 }

Spacing +70 added lines, -70 removed lines

@@ -41,20 +41,20 @@ 
     /**
      * @return void|string
      */
-    public function build(array $args = [])
+    public function build( array $args = [] )
     {
         $this->args = $args;
-        if (!is_user_logged_in() && glsr(OptionManager::class)->getBool('settings.general.require.login')) {
+        if( !is_user_logged_in() && glsr( OptionManager::class )->getBool( 'settings.general.require.login' ) ) {
             return $this->buildLoginRegister();
         }
-        $this->errors = glsr(Session::class)->get($args['id'].'errors', [], true);
-        $this->message = glsr(Session::class)->get($args['id'].'message', '', true);
-        $this->required = glsr(OptionManager::class)->get('settings.submissions.required', []);
-        $this->values = glsr(Session::class)->get($args['id'].'values', [], true);
-        $fields = array_reduce($this->getFields(), function ($carry, $field) {
+        $this->errors = glsr( Session::class )->get( $args['id'].'errors', [], true );
+        $this->message = glsr( Session::class )->get( $args['id'].'message', '', true );
+        $this->required = glsr( OptionManager::class )->get( 'settings.submissions.required', [] );
+        $this->values = glsr( Session::class )->get( $args['id'].'values', [], true );
+        $fields = array_reduce( $this->getFields(), function( $carry, $field ) {
             return $carry.$field;
         });
-        return glsr(Template::class)->build('templates/reviews-form', [
+        return glsr( Template::class )->build( 'templates/reviews-form', [
             'args' => $args,
             'context' => [
                 'class' => $this->getClass(),
@@ -63,7 +63,7 @@ 
                 'response' => $this->buildResponse(),
                 'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(),
             ],
-        ]);
+        ] );
     }
 
     /**
@@ -71,11 +71,11 @@ 
      */
     protected function buildLoginRegister()
     {
-        return glsr(Template::class)->build('templates/login-register', [
+        return glsr( Template::class )->build( 'templates/login-register', [
             'context' => [
-                'text' => trim($this->getLoginText().' '.$this->getRegisterText()),
+                'text' => trim( $this->getLoginText().' '.$this->getRegisterText() ),
             ],
-        ]);
+        ] );
     }
 
     /**
@@ -83,15 +83,15 @@ 
      */
     protected function buildRecaptcha()
     {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
             return;
         }
-        return glsr(Builder::class)->div([
+        return glsr( Builder::class )->div( [
             'class' => 'glsr-recaptcha-holder',
-            'data-badge' => glsr(OptionManager::class)->get('settings.submissions.recaptcha.position'),
-            'data-sitekey' => sanitize_text_field(glsr(OptionManager::class)->get('settings.submissions.recaptcha.key')),
+            'data-badge' => glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' ),
+            'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' ) ),
             'data-size' => 'invisible',
-        ]);
+        ] );
     }
 
     /**
@@ -100,15 +100,15 @@ 
     protected function buildResponse()
     {
         $classes = !empty($this->errors)
-            ? glsr(StyleValidationDefaults::class)->defaults()['message_error_class']
+            ? glsr( StyleValidationDefaults::class )->defaults()['message_error_class']
             : '';
-        return glsr(Template::class)->build('templates/form/response', [
+        return glsr( Template::class )->build( 'templates/form/response', [
             'context' => [
                 'class' => $classes,
-                'message' => wpautop($this->message),
+                'message' => wpautop( $this->message ),
             ],
             'has_errors' => !empty($this->errors),
-        ]);
+        ] );
     }
 
     /**
@@ -116,11 +116,11 @@ 
      */
     protected function buildSubmitButton()
     {
-        return glsr(Template::class)->build('templates/form/submit-button', [
+        return glsr( Template::class )->build( 'templates/form/submit-button', [
             'context' => [
-                'text' => __('Submit your review', 'site-reviews'),
+                'text' => __( 'Submit your review', 'site-reviews' ),
             ],
-        ]);
+        ] );
     }
 
     /**
@@ -128,7 +128,7 @@ 
      */
     protected function getClass()
     {
-        return trim('glsr-form glsr-'.glsr(Style::class)->get().' '.$this->args['class']);
+        return trim( 'glsr-form glsr-'.glsr( Style::class )->get().' '.$this->args['class'] );
     }
 
     /**
@@ -138,18 +138,18 @@ 
     {
         $hiddenFields = $this->getHiddenFields();
         $hiddenFields[] = $this->getHoneypotField();
-        $fields = $this->normalizeFields(glsr(Form::class)->getFields('submission-form'));
-        $paths = array_map(function ($obj) {
+        $fields = $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) );
+        $paths = array_map( function( $obj ) {
             return $obj->field['path'];
-        }, $hiddenFields);
-        foreach ($fields as $field) {
-            $index = array_search($field->field['path'], $paths);
-            if (false === $index) {
+        }, $hiddenFields );
+        foreach( $fields as $field ) {
+            $index = array_search( $field->field['path'], $paths );
+            if( false === $index ) {
                 continue;
             }
             unset($hiddenFields[$index]);
         }
-        return array_merge($hiddenFields, $fields);
+        return array_merge( $hiddenFields, $fields );
     }
 
     /**
@@ -157,11 +157,11 @@ 
      */
     protected function getLoginText()
     {
-        $loginLink = glsr(Builder::class)->a([
-            'href' => wp_login_url(strval(get_permalink())),
-            'text' => __('logged in', 'site-reviews'),
-        ]);
-        return sprintf(__('You must be %s to submit a review.', 'site-reviews'), $loginLink);
+        $loginLink = glsr( Builder::class )->a( [
+            'href' => wp_login_url( strval( get_permalink() ) ),
+            'text' => __( 'logged in', 'site-reviews' ),
+        ] );
+        return sprintf( __( 'You must be %s to submit a review.', 'site-reviews' ), $loginLink );
     }
 
     /**
@@ -169,14 +169,14 @@ 
      */
     protected function getRegisterText()
     {
-        if (!get_option('users_can_register') || !glsr(OptionManager::class)->getBool('settings.general.require.login')) {
+        if( !get_option( 'users_can_register' ) || !glsr( OptionManager::class )->getBool( 'settings.general.require.login' ) ) {
             return;
         }
-        $registerLink = glsr(Builder::class)->a([
+        $registerLink = glsr( Builder::class )->a( [
             'href' => wp_registration_url(),
-            'text' => __('register', 'site-reviews'),
-        ]);
-        return sprintf(__('You may also %s for an account.', 'site-reviews'), $registerLink);
+            'text' => __( 'register', 'site-reviews' ),
+        ] );
+        return sprintf( __( 'You may also %s for an account.', 'site-reviews' ), $registerLink );
     }
 
     /**
@@ -191,13 +191,13 @@ 
             'name' => '_counter',
         ], [
             'name' => '_nonce',
-            'value' => wp_create_nonce('submit-review'),
+            'value' => wp_create_nonce( 'submit-review' ),
         ], [
             'name' => '_post_id',
             'value' => get_the_ID(),
         ], [
             'name' => '_referer',
-            'value' => wp_unslash(filter_input(INPUT_SERVER, 'REQUEST_URI')),
+            'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ),
         ], [
             'name' => 'assign_to',
             'value' => $this->args['assign_to'],
@@ -211,9 +211,9 @@ 
             'name' => 'form_id',
             'value' => $this->args['id'],
         ]];
-        return array_map(function ($field) {
-            return new Field(wp_parse_args($field, ['type' => 'hidden']));
-        }, $fields);
+        return array_map( function( $field ) {
+            return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) );
+        }, $fields );
     }
 
     /**
@@ -221,40 +221,40 @@ 
      */
     protected function getHoneypotField()
     {
-        return new Field([
+        return new Field( [
             'name' => 'gotcha',
             'type' => 'honeypot',
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    protected function normalizeFieldId(Field &$field)
+    protected function normalizeFieldId( Field &$field )
     {
-        if (empty($this->args['id']) || empty($field->field['id'])) {
+        if( empty($this->args['id']) || empty($field->field['id']) ) {
             return;
         }
-        $field->field['id'].= '-'.$this->args['id'];
+        $field->field['id'] .= '-'.$this->args['id'];
     }
 
     /**
      * @return void
      */
-    protected function normalizeFieldClass(Field &$field)
+    protected function normalizeFieldClass( Field &$field )
     {
-        if (!isset($field->field['class'])) {
+        if( !isset($field->field['class']) ) {
             $field->field['class'] = '';
         }
-        $field->field['class'] = trim($field->field['class'].' glsr-field-control');
+        $field->field['class'] = trim( $field->field['class'].' glsr-field-control' );
     }
 
     /**
      * @return void
      */
-    protected function normalizeFieldErrors(Field &$field)
+    protected function normalizeFieldErrors( Field &$field )
     {
-        if (!array_key_exists($field->field['path'], $this->errors)) {
+        if( !array_key_exists( $field->field['path'], $this->errors ) ) {
             return;
         }
         $field->field['errors'] = $this->errors[$field->field['path']];
@@ -263,9 +263,9 @@ 
     /**
      * @return void
      */
-    protected function normalizeFieldRequired(Field &$field)
+    protected function normalizeFieldRequired( Field &$field )
     {
-        if (!in_array($field->field['path'], $this->required)) {
+        if( !in_array( $field->field['path'], $this->required ) ) {
             return;
         }
         $field->field['required'] = true;
@@ -274,19 +274,19 @@ 
     /**
      * @return array
      */
-    protected function normalizeFields($fields)
+    protected function normalizeFields( $fields )
     {
         $normalizedFields = [];
-        foreach ($fields as $field) {
-            if (in_array($field->field['path'], $this->args['hide'])) {
+        foreach( $fields as $field ) {
+            if( in_array( $field->field['path'], $this->args['hide'] ) ) {
                 continue;
             }
             $field->field['is_public'] = true;
-            $this->normalizeFieldClass($field);
-            $this->normalizeFieldErrors($field);
-            $this->normalizeFieldRequired($field);
-            $this->normalizeFieldValue($field);
-            $this->normalizeFieldId($field);
+            $this->normalizeFieldClass( $field );
+            $this->normalizeFieldErrors( $field );
+            $this->normalizeFieldRequired( $field );
+            $this->normalizeFieldValue( $field );
+            $this->normalizeFieldId( $field );
             $normalizedFields[] = $field;
         }
         return $normalizedFields;
@@ -295,12 +295,12 @@ 
     /**
      * @return void
      */
-    protected function normalizeFieldValue(Field &$field)
+    protected function normalizeFieldValue( Field &$field )
     {
-        if (!array_key_exists($field->field['path'], $this->values)) {
+        if( !array_key_exists( $field->field['path'], $this->values ) ) {
             return;
         }
-        if (in_array($field->field['type'], ['radio', 'checkbox'])) {
+        if( in_array( $field->field['type'], ['radio', 'checkbox'] ) ) {
             $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']];
         } else {
             $field->field['value'] = $this->values[$field->field['path']];

plugin/Modules/Html/Partials/SiteReviews.php

Indentation +347 added lines, -347 removed lines

@@ -19,376 +19,376 @@
 
 class SiteReviews
 {
-    /**
-     * @var array
-     */
-    public $args;
+	/**
+	 * @var array
+	 */
+	public $args;
 
-    /**
-     * @var Review
-     */
-    public $current;
+	/**
+	 * @var Review
+	 */
+	public $current;
 
-    /**
-     * @var array
-     */
-    public $options;
+	/**
+	 * @var array
+	 */
+	public $options;
 
-    /**
-     * @var Reviews
-     */
-    protected $reviews;
+	/**
+	 * @var Reviews
+	 */
+	protected $reviews;
 
-    /**
-     * @param Reviews|null $reviews
-     * @return ReviewsHtml
-     */
-    public function build(array $args = [], $reviews = null)
-    {
-        $this->args = glsr(SiteReviewsDefaults::class)->merge($args);
-        $this->options = glsr(Helper::class)->flattenArray(glsr(OptionManager::class)->all());
-        $this->reviews = $reviews instanceof Reviews
-            ? $reviews
-            : glsr(ReviewManager::class)->get($args);
-        $this->generateSchema();
-        return $this->buildReviews();
-    }
+	/**
+	 * @param Reviews|null $reviews
+	 * @return ReviewsHtml
+	 */
+	public function build(array $args = [], $reviews = null)
+	{
+		$this->args = glsr(SiteReviewsDefaults::class)->merge($args);
+		$this->options = glsr(Helper::class)->flattenArray(glsr(OptionManager::class)->all());
+		$this->reviews = $reviews instanceof Reviews
+			? $reviews
+			: glsr(ReviewManager::class)->get($args);
+		$this->generateSchema();
+		return $this->buildReviews();
+	}
 
-    /**
-     * @return ReviewHtml
-     */
-    public function buildReview(Review $review)
-    {
-        $review = apply_filters('site-reviews/review/build/before', $review);
-        $this->current = $review;
-        $renderedFields = [];
-        foreach ($review as $key => $value) {
-            $method = glsr(Helper::class)->buildMethodName($key, 'buildOption');
-            $field = method_exists($this, $method)
-                ? $this->$method($key, $value)
-                : apply_filters('site-reviews/review/build/'.$key, false, $value, $this, $review);
-            if (false === $field) {
-                continue;
-            }
-            $renderedFields[$key] = $field;
-        }
-        $this->wrap($renderedFields, $review);
-        $renderedFields = apply_filters('site-reviews/review/build/after', $renderedFields, $review);
-        $this->current = null;
-        return new ReviewHtml($review, (array) $renderedFields);
-    }
+	/**
+	 * @return ReviewHtml
+	 */
+	public function buildReview(Review $review)
+	{
+		$review = apply_filters('site-reviews/review/build/before', $review);
+		$this->current = $review;
+		$renderedFields = [];
+		foreach ($review as $key => $value) {
+			$method = glsr(Helper::class)->buildMethodName($key, 'buildOption');
+			$field = method_exists($this, $method)
+				? $this->$method($key, $value)
+				: apply_filters('site-reviews/review/build/'.$key, false, $value, $this, $review);
+			if (false === $field) {
+				continue;
+			}
+			$renderedFields[$key] = $field;
+		}
+		$this->wrap($renderedFields, $review);
+		$renderedFields = apply_filters('site-reviews/review/build/after', $renderedFields, $review);
+		$this->current = null;
+		return new ReviewHtml($review, (array) $renderedFields);
+	}
 
-    /**
-     * @return ReviewsHtml
-     */
-    public function buildReviews()
-    {
-        $renderedReviews = [];
-        foreach ($this->reviews as $index => $review) {
-            $renderedReviews[] = $this->buildReview($review);
-        }
-        return new ReviewsHtml($renderedReviews, $this->reviews->max_num_pages, $this->args);
-    }
+	/**
+	 * @return ReviewsHtml
+	 */
+	public function buildReviews()
+	{
+		$renderedReviews = [];
+		foreach ($this->reviews as $index => $review) {
+			$renderedReviews[] = $this->buildReview($review);
+		}
+		return new ReviewsHtml($renderedReviews, $this->reviews->max_num_pages, $this->args);
+	}
 
-    /**
-     * @return void
-     */
-    public function generateSchema()
-    {
-        if (!wp_validate_boolean($this->args['schema'])) {
-            return;
-        }
-        glsr(Schema::class)->store(
-            glsr(Schema::class)->build($this->args)
-        );
-    }
+	/**
+	 * @return void
+	 */
+	public function generateSchema()
+	{
+		if (!wp_validate_boolean($this->args['schema'])) {
+			return;
+		}
+		glsr(Schema::class)->store(
+			glsr(Schema::class)->build($this->args)
+		);
+	}
 
-    /**
-     * @param string $key
-     * @param string $path
-     * @return bool
-     */
-    public function isHidden($key, $path = '')
-    {
-        $isOptionEnabled = !empty($path)
-            ? $this->isOptionEnabled($path)
-            : true;
-        return in_array($key, $this->args['hide']) || !$isOptionEnabled;
-    }
+	/**
+	 * @param string $key
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isHidden($key, $path = '')
+	{
+		$isOptionEnabled = !empty($path)
+			? $this->isOptionEnabled($path)
+			: true;
+		return in_array($key, $this->args['hide']) || !$isOptionEnabled;
+	}
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @return void|string
-     */
-    protected function buildOptionAssignedTo($key, $value)
-    {
-        if ($this->isHidden($key, 'settings.reviews.assigned_links')) {
-            return;
-        }
-        $post = glsr(Polylang::class)->getPost($value);
-        if (!($post instanceof WP_Post)) {
-            return;
-        }
-        $permalink = glsr(Builder::class)->a(get_the_title($post->ID), [
-            'href' => get_the_permalink($post->ID),
-        ]);
-        $assignedTo = sprintf(__('Review of %s', 'site-reviews'), $permalink);
-        return '<span>'.$assignedTo.'</span>';
-    }
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return void|string
+	 */
+	protected function buildOptionAssignedTo($key, $value)
+	{
+		if ($this->isHidden($key, 'settings.reviews.assigned_links')) {
+			return;
+		}
+		$post = glsr(Polylang::class)->getPost($value);
+		if (!($post instanceof WP_Post)) {
+			return;
+		}
+		$permalink = glsr(Builder::class)->a(get_the_title($post->ID), [
+			'href' => get_the_permalink($post->ID),
+		]);
+		$assignedTo = sprintf(__('Review of %s', 'site-reviews'), $permalink);
+		return '<span>'.$assignedTo.'</span>';
+	}
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @return void|string
-     */
-    protected function buildOptionAuthor($key, $value)
-    {
-        if (!$this->isHidden($key)) {
-            return '<span>'.$value.'</span>';
-        }
-    }
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return void|string
+	 */
+	protected function buildOptionAuthor($key, $value)
+	{
+		if (!$this->isHidden($key)) {
+			return '<span>'.$value.'</span>';
+		}
+	}
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @return void|string
-     */
-    protected function buildOptionAvatar($key, $value)
-    {
-        if ($this->isHidden($key, 'settings.reviews.avatars')) {
-            return;
-        }
-        $size = $this->getOption('settings.reviews.avatars_size', 40);
-        return glsr(Builder::class)->img([
-            'height' => $size,
-            'src' => $this->generateAvatar($value),
-            'style' => sprintf('width:%1$spx; height:%1$spx;', $size),
-            'width' => $size,
-        ]);
-    }
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return void|string
+	 */
+	protected function buildOptionAvatar($key, $value)
+	{
+		if ($this->isHidden($key, 'settings.reviews.avatars')) {
+			return;
+		}
+		$size = $this->getOption('settings.reviews.avatars_size', 40);
+		return glsr(Builder::class)->img([
+			'height' => $size,
+			'src' => $this->generateAvatar($value),
+			'style' => sprintf('width:%1$spx; height:%1$spx;', $size),
+			'width' => $size,
+		]);
+	}
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @return void|string
-     */
-    protected function buildOptionContent($key, $value)
-    {
-        $text = $this->normalizeText($value);
-        if (!$this->isHiddenOrEmpty($key, $text)) {
-            return '<p>'.$text.'</p>';
-        }
-    }
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return void|string
+	 */
+	protected function buildOptionContent($key, $value)
+	{
+		$text = $this->normalizeText($value);
+		if (!$this->isHiddenOrEmpty($key, $text)) {
+			return '<p>'.$text.'</p>';
+		}
+	}
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @return void|string
-     */
-    protected function buildOptionDate($key, $value)
-    {
-        if ($this->isHidden($key)) {
-            return;
-        }
-        $dateFormat = $this->getOption('settings.reviews.date.format', 'default');
-        if ('relative' == $dateFormat) {
-            $date = glsr(Date::class)->relative($value);
-        } else {
-            $format = 'custom' == $dateFormat
-                ? $this->getOption('settings.reviews.date.custom', 'M j, Y')
-                : (string) get_option('date_format');
-            $date = date_i18n($format, strtotime($value));
-        }
-        return '<span>'.$date.'</span>';
-    }
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return void|string
+	 */
+	protected function buildOptionDate($key, $value)
+	{
+		if ($this->isHidden($key)) {
+			return;
+		}
+		$dateFormat = $this->getOption('settings.reviews.date.format', 'default');
+		if ('relative' == $dateFormat) {
+			$date = glsr(Date::class)->relative($value);
+		} else {
+			$format = 'custom' == $dateFormat
+				? $this->getOption('settings.reviews.date.custom', 'M j, Y')
+				: (string) get_option('date_format');
+			$date = date_i18n($format, strtotime($value));
+		}
+		return '<span>'.$date.'</span>';
+	}
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @return void|string
-     */
-    protected function buildOptionRating($key, $value)
-    {
-        if (!$this->isHiddenOrEmpty($key, $value)) {
-            return glsr_star_rating($value);
-        }
-    }
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return void|string
+	 */
+	protected function buildOptionRating($key, $value)
+	{
+		if (!$this->isHiddenOrEmpty($key, $value)) {
+			return glsr_star_rating($value);
+		}
+	}
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @return void|string
-     */
-    protected function buildOptionResponse($key, $value)
-    {
-        if ($this->isHiddenOrEmpty($key, $value)) {
-            return;
-        }
-        $title = sprintf(__('Response from %s', 'site-reviews'), get_bloginfo('name'));
-        $text = $this->normalizeText($value);
-        $text = '<p><strong>'.$title.'</strong></p><p>'.$text.'</p>';
-        $response = glsr(Builder::class)->div($text, ['class' => 'glsr-review-response-inner']);
-        $background = glsr(Builder::class)->div(['class' => 'glsr-review-response-background']);
-        return $response.$background;
-    }
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return void|string
+	 */
+	protected function buildOptionResponse($key, $value)
+	{
+		if ($this->isHiddenOrEmpty($key, $value)) {
+			return;
+		}
+		$title = sprintf(__('Response from %s', 'site-reviews'), get_bloginfo('name'));
+		$text = $this->normalizeText($value);
+		$text = '<p><strong>'.$title.'</strong></p><p>'.$text.'</p>';
+		$response = glsr(Builder::class)->div($text, ['class' => 'glsr-review-response-inner']);
+		$background = glsr(Builder::class)->div(['class' => 'glsr-review-response-background']);
+		return $response.$background;
+	}
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @return void|string
-     */
-    protected function buildOptionTitle($key, $value)
-    {
-        if ($this->isHidden($key)) {
-            return;
-        }
-        if (empty($value)) {
-            $value = __('No Title', 'site-reviews');
-        }
-        return '<h3>'.$value.'</h3>';
-    }
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return void|string
+	 */
+	protected function buildOptionTitle($key, $value)
+	{
+		if ($this->isHidden($key)) {
+			return;
+		}
+		if (empty($value)) {
+			$value = __('No Title', 'site-reviews');
+		}
+		return '<h3>'.$value.'</h3>';
+	}
 
-    /**
-     * @param string $avatarUrl
-     * @return string
-     */
-    protected function generateAvatar($avatarUrl)
-    {
-        if (!$this->isOptionEnabled('settings.reviews.avatars_regenerate') || 'local' != $this->current->review_type) {
-            return $avatarUrl;
-        }
-        $authorIdOrEmail = get_the_author_meta('ID', $this->current->user_id);
-        if (empty($authorIdOrEmail)) {
-            $authorIdOrEmail = $this->current->email;
-        }
-        if ($newAvatar = get_avatar_url($authorIdOrEmail)) {
-            return $newAvatar;
-        }
-        return $avatarUrl;
-    }
+	/**
+	 * @param string $avatarUrl
+	 * @return string
+	 */
+	protected function generateAvatar($avatarUrl)
+	{
+		if (!$this->isOptionEnabled('settings.reviews.avatars_regenerate') || 'local' != $this->current->review_type) {
+			return $avatarUrl;
+		}
+		$authorIdOrEmail = get_the_author_meta('ID', $this->current->user_id);
+		if (empty($authorIdOrEmail)) {
+			$authorIdOrEmail = $this->current->email;
+		}
+		if ($newAvatar = get_avatar_url($authorIdOrEmail)) {
+			return $newAvatar;
+		}
+		return $avatarUrl;
+	}
 
-    /**
-     * @param string $text
-     * @return string
-     */
-    protected function getExcerpt($text)
-    {
-        $limit = intval($this->getOption('settings.reviews.excerpts_length', 55));
-        $split = extension_loaded('intl')
-            ? $this->getExcerptIntlSplit($text, $limit)
-            : $this->getExcerptSplit($text, $limit);
-        $hiddenText = substr($text, $split);
-        if (!empty($hiddenText)) {
-            $showMore = glsr(Builder::class)->span($hiddenText, [
-                'class' => 'glsr-hidden glsr-hidden-text',
-                'data-show-less' => __('Show less', 'site-reviews'),
-                'data-show-more' => __('Show more', 'site-reviews'),
-            ]);
-            $text = ltrim(substr($text, 0, $split)).$showMore;
-        }
-        return $text;
-    }
+	/**
+	 * @param string $text
+	 * @return string
+	 */
+	protected function getExcerpt($text)
+	{
+		$limit = intval($this->getOption('settings.reviews.excerpts_length', 55));
+		$split = extension_loaded('intl')
+			? $this->getExcerptIntlSplit($text, $limit)
+			: $this->getExcerptSplit($text, $limit);
+		$hiddenText = substr($text, $split);
+		if (!empty($hiddenText)) {
+			$showMore = glsr(Builder::class)->span($hiddenText, [
+				'class' => 'glsr-hidden glsr-hidden-text',
+				'data-show-less' => __('Show less', 'site-reviews'),
+				'data-show-more' => __('Show more', 'site-reviews'),
+			]);
+			$text = ltrim(substr($text, 0, $split)).$showMore;
+		}
+		return $text;
+	}
 
-    /**
-     * @param string $text
-     * @param int $limit
-     * @return int
-     */
-    protected function getExcerptIntlSplit($text, $limit)
-    {
-        $words = IntlRuleBasedBreakIterator::createWordInstance('');
-        $words->setText($text);
-        $count = 0;
-        foreach ($words as $offset) {
-            if (IntlRuleBasedBreakIterator::WORD_NONE === $words->getRuleStatus()) {
-                continue;
-            }
-            ++$count;
-            if ($count != $limit) {
-                continue;
-            }
-            return $offset;
-        }
-        return strlen($text);
-    }
+	/**
+	 * @param string $text
+	 * @param int $limit
+	 * @return int
+	 */
+	protected function getExcerptIntlSplit($text, $limit)
+	{
+		$words = IntlRuleBasedBreakIterator::createWordInstance('');
+		$words->setText($text);
+		$count = 0;
+		foreach ($words as $offset) {
+			if (IntlRuleBasedBreakIterator::WORD_NONE === $words->getRuleStatus()) {
+				continue;
+			}
+			++$count;
+			if ($count != $limit) {
+				continue;
+			}
+			return $offset;
+		}
+		return strlen($text);
+	}
 
-    /**
-     * @param string $text
-     * @param int $limit
-     * @return int
-     */
-    protected function getExcerptSplit($text, $limit)
-    {
-        if (str_word_count($text, 0) > $limit) {
-            $words = array_keys(str_word_count($text, 2));
-            return $words[$limit];
-        }
-        return strlen($text);
-    }
+	/**
+	 * @param string $text
+	 * @param int $limit
+	 * @return int
+	 */
+	protected function getExcerptSplit($text, $limit)
+	{
+		if (str_word_count($text, 0) > $limit) {
+			$words = array_keys(str_word_count($text, 2));
+			return $words[$limit];
+		}
+		return strlen($text);
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @return mixed
-     */
-    protected function getOption($path, $fallback = '')
-    {
-        if (array_key_exists($path, $this->options)) {
-            return $this->options[$path];
-        }
-        return $fallback;
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @return mixed
+	 */
+	protected function getOption($path, $fallback = '')
+	{
+		if (array_key_exists($path, $this->options)) {
+			return $this->options[$path];
+		}
+		return $fallback;
+	}
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @return bool
-     */
-    protected function isHiddenOrEmpty($key, $value)
-    {
-        return $this->isHidden($key) || empty($value);
-    }
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return bool
+	 */
+	protected function isHiddenOrEmpty($key, $value)
+	{
+		return $this->isHidden($key) || empty($value);
+	}
 
-    /**
-     * @param string $path
-     * @return bool
-     */
-    protected function isOptionEnabled($path)
-    {
-        return 'yes' == $this->getOption($path);
-    }
+	/**
+	 * @param string $path
+	 * @return bool
+	 */
+	protected function isOptionEnabled($path)
+	{
+		return 'yes' == $this->getOption($path);
+	}
 
-    /**
-     * @param string $text
-     * @return string
-     */
-    protected function normalizeText($text)
-    {
-        $text = wp_kses($text, wp_kses_allowed_html());
-        $text = convert_smilies(strip_shortcodes($text));
-        $text = str_replace(']]>', ']]&gt;', $text);
-        $text = preg_replace('/(\R){2,}/', '$1', $text);
-        if ($this->isOptionEnabled('settings.reviews.excerpts')) {
-            $text = $this->getExcerpt($text);
-        }
-        return wptexturize(nl2br($text));
-    }
+	/**
+	 * @param string $text
+	 * @return string
+	 */
+	protected function normalizeText($text)
+	{
+		$text = wp_kses($text, wp_kses_allowed_html());
+		$text = convert_smilies(strip_shortcodes($text));
+		$text = str_replace(']]>', ']]&gt;', $text);
+		$text = preg_replace('/(\R){2,}/', '$1', $text);
+		if ($this->isOptionEnabled('settings.reviews.excerpts')) {
+			$text = $this->getExcerpt($text);
+		}
+		return wptexturize(nl2br($text));
+	}
 
-    /**
-     * @return void
-     */
-    protected function wrap(array &$renderedFields, Review $review)
-    {
-        $renderedFields = apply_filters('site-reviews/review/wrap', $renderedFields, $review);
-        array_walk($renderedFields, function (&$value, $key) use ($review) {
-            $value = apply_filters('site-reviews/review/wrap/'.$key, $value, $review);
-            if (empty($value)) {
-                return;
-            }
-            $value = glsr(Builder::class)->div($value, [
-                'class' => 'glsr-review-'.$key,
-            ]);
-        });
-    }
+	/**
+	 * @return void
+	 */
+	protected function wrap(array &$renderedFields, Review $review)
+	{
+		$renderedFields = apply_filters('site-reviews/review/wrap', $renderedFields, $review);
+		array_walk($renderedFields, function (&$value, $key) use ($review) {
+			$value = apply_filters('site-reviews/review/wrap/'.$key, $value, $review);
+			if (empty($value)) {
+				return;
+			}
+			$value = glsr(Builder::class)->div($value, [
+				'class' => 'glsr-review-'.$key,
+			]);
+		});
+	}
 }

Spacing +114 added lines, -114 removed lines

@@ -43,13 +43,13 @@ 
      * @param Reviews|null $reviews
      * @return ReviewsHtml
      */
-    public function build(array $args = [], $reviews = null)
+    public function build( array $args = [], $reviews = null )
     {
-        $this->args = glsr(SiteReviewsDefaults::class)->merge($args);
-        $this->options = glsr(Helper::class)->flattenArray(glsr(OptionManager::class)->all());
+        $this->args = glsr( SiteReviewsDefaults::class )->merge( $args );
+        $this->options = glsr( Helper::class )->flattenArray( glsr( OptionManager::class )->all() );
         $this->reviews = $reviews instanceof Reviews
             ? $reviews
-            : glsr(ReviewManager::class)->get($args);
+            : glsr( ReviewManager::class )->get( $args );
         $this->generateSchema();
         return $this->buildReviews();
     }
@@ -57,25 +57,25 @@ 
     /**
      * @return ReviewHtml
      */
-    public function buildReview(Review $review)
+    public function buildReview( Review $review )
     {
-        $review = apply_filters('site-reviews/review/build/before', $review);
+        $review = apply_filters( 'site-reviews/review/build/before', $review );
         $this->current = $review;
         $renderedFields = [];
-        foreach ($review as $key => $value) {
-            $method = glsr(Helper::class)->buildMethodName($key, 'buildOption');
-            $field = method_exists($this, $method)
-                ? $this->$method($key, $value)
-                : apply_filters('site-reviews/review/build/'.$key, false, $value, $this, $review);
-            if (false === $field) {
+        foreach( $review as $key => $value ) {
+            $method = glsr( Helper::class )->buildMethodName( $key, 'buildOption' );
+            $field = method_exists( $this, $method )
+                ? $this->$method( $key, $value )
+                : apply_filters( 'site-reviews/review/build/'.$key, false, $value, $this, $review );
+            if( false === $field ) {
                 continue;
             }
             $renderedFields[$key] = $field;
         }
-        $this->wrap($renderedFields, $review);
-        $renderedFields = apply_filters('site-reviews/review/build/after', $renderedFields, $review);
+        $this->wrap( $renderedFields, $review );
+        $renderedFields = apply_filters( 'site-reviews/review/build/after', $renderedFields, $review );
         $this->current = null;
-        return new ReviewHtml($review, (array) $renderedFields);
+        return new ReviewHtml( $review, (array)$renderedFields );
     }
 
     /**
@@ -84,10 +84,10 @@ 
     public function buildReviews()
     {
         $renderedReviews = [];
-        foreach ($this->reviews as $index => $review) {
-            $renderedReviews[] = $this->buildReview($review);
+        foreach( $this->reviews as $index => $review ) {
+            $renderedReviews[] = $this->buildReview( $review );
         }
-        return new ReviewsHtml($renderedReviews, $this->reviews->max_num_pages, $this->args);
+        return new ReviewsHtml( $renderedReviews, $this->reviews->max_num_pages, $this->args );
     }
 
     /**
@@ -95,11 +95,11 @@ 
      */
     public function generateSchema()
     {
-        if (!wp_validate_boolean($this->args['schema'])) {
+        if( !wp_validate_boolean( $this->args['schema'] ) ) {
             return;
         }
-        glsr(Schema::class)->store(
-            glsr(Schema::class)->build($this->args)
+        glsr( Schema::class )->store(
+            glsr( Schema::class )->build( $this->args )
         );
     }
 
@@ -108,12 +108,12 @@ 
      * @param string $path
      * @return bool
      */
-    public function isHidden($key, $path = '')
+    public function isHidden( $key, $path = '' )
     {
         $isOptionEnabled = !empty($path)
-            ? $this->isOptionEnabled($path)
+            ? $this->isOptionEnabled( $path )
             : true;
-        return in_array($key, $this->args['hide']) || !$isOptionEnabled;
+        return in_array( $key, $this->args['hide'] ) || !$isOptionEnabled;
     }
 
     /**
@@ -121,19 +121,19 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionAssignedTo($key, $value)
+    protected function buildOptionAssignedTo( $key, $value )
     {
-        if ($this->isHidden($key, 'settings.reviews.assigned_links')) {
+        if( $this->isHidden( $key, 'settings.reviews.assigned_links' ) ) {
             return;
         }
-        $post = glsr(Polylang::class)->getPost($value);
-        if (!($post instanceof WP_Post)) {
+        $post = glsr( Polylang::class )->getPost( $value );
+        if( !($post instanceof WP_Post) ) {
             return;
         }
-        $permalink = glsr(Builder::class)->a(get_the_title($post->ID), [
-            'href' => get_the_permalink($post->ID),
-        ]);
-        $assignedTo = sprintf(__('Review of %s', 'site-reviews'), $permalink);
+        $permalink = glsr( Builder::class )->a( get_the_title( $post->ID ), [
+            'href' => get_the_permalink( $post->ID ),
+        ] );
+        $assignedTo = sprintf( __( 'Review of %s', 'site-reviews' ), $permalink );
         return '<span>'.$assignedTo.'</span>';
     }
 
@@ -142,9 +142,9 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionAuthor($key, $value)
+    protected function buildOptionAuthor( $key, $value )
     {
-        if (!$this->isHidden($key)) {
+        if( !$this->isHidden( $key ) ) {
             return '<span>'.$value.'</span>';
         }
     }
@@ -154,18 +154,18 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionAvatar($key, $value)
+    protected function buildOptionAvatar( $key, $value )
     {
-        if ($this->isHidden($key, 'settings.reviews.avatars')) {
+        if( $this->isHidden( $key, 'settings.reviews.avatars' ) ) {
             return;
         }
-        $size = $this->getOption('settings.reviews.avatars_size', 40);
-        return glsr(Builder::class)->img([
+        $size = $this->getOption( 'settings.reviews.avatars_size', 40 );
+        return glsr( Builder::class )->img( [
             'height' => $size,
-            'src' => $this->generateAvatar($value),
-            'style' => sprintf('width:%1$spx; height:%1$spx;', $size),
+            'src' => $this->generateAvatar( $value ),
+            'style' => sprintf( 'width:%1$spx; height:%1$spx;', $size ),
             'width' => $size,
-        ]);
+        ] );
     }
 
     /**
@@ -173,10 +173,10 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionContent($key, $value)
+    protected function buildOptionContent( $key, $value )
     {
-        $text = $this->normalizeText($value);
-        if (!$this->isHiddenOrEmpty($key, $text)) {
+        $text = $this->normalizeText( $value );
+        if( !$this->isHiddenOrEmpty( $key, $text ) ) {
             return '<p>'.$text.'</p>';
         }
     }
@@ -186,19 +186,19 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionDate($key, $value)
+    protected function buildOptionDate( $key, $value )
     {
-        if ($this->isHidden($key)) {
+        if( $this->isHidden( $key ) ) {
             return;
         }
-        $dateFormat = $this->getOption('settings.reviews.date.format', 'default');
-        if ('relative' == $dateFormat) {
-            $date = glsr(Date::class)->relative($value);
+        $dateFormat = $this->getOption( 'settings.reviews.date.format', 'default' );
+        if( 'relative' == $dateFormat ) {
+            $date = glsr( Date::class )->relative( $value );
         } else {
             $format = 'custom' == $dateFormat
-                ? $this->getOption('settings.reviews.date.custom', 'M j, Y')
-                : (string) get_option('date_format');
-            $date = date_i18n($format, strtotime($value));
+                ? $this->getOption( 'settings.reviews.date.custom', 'M j, Y' )
+                : (string)get_option( 'date_format' );
+            $date = date_i18n( $format, strtotime( $value ) );
         }
         return '<span>'.$date.'</span>';
     }
@@ -208,10 +208,10 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionRating($key, $value)
+    protected function buildOptionRating( $key, $value )
     {
-        if (!$this->isHiddenOrEmpty($key, $value)) {
-            return glsr_star_rating($value);
+        if( !$this->isHiddenOrEmpty( $key, $value ) ) {
+            return glsr_star_rating( $value );
         }
     }
 
@@ -220,16 +220,16 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionResponse($key, $value)
+    protected function buildOptionResponse( $key, $value )
     {
-        if ($this->isHiddenOrEmpty($key, $value)) {
+        if( $this->isHiddenOrEmpty( $key, $value ) ) {
             return;
         }
-        $title = sprintf(__('Response from %s', 'site-reviews'), get_bloginfo('name'));
-        $text = $this->normalizeText($value);
+        $title = sprintf( __( 'Response from %s', 'site-reviews' ), get_bloginfo( 'name' ) );
+        $text = $this->normalizeText( $value );
         $text = '<p><strong>'.$title.'</strong></p><p>'.$text.'</p>';
-        $response = glsr(Builder::class)->div($text, ['class' => 'glsr-review-response-inner']);
-        $background = glsr(Builder::class)->div(['class' => 'glsr-review-response-background']);
+        $response = glsr( Builder::class )->div( $text, ['class' => 'glsr-review-response-inner'] );
+        $background = glsr( Builder::class )->div( ['class' => 'glsr-review-response-background'] );
         return $response.$background;
     }
 
@@ -238,13 +238,13 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionTitle($key, $value)
+    protected function buildOptionTitle( $key, $value )
     {
-        if ($this->isHidden($key)) {
+        if( $this->isHidden( $key ) ) {
             return;
         }
-        if (empty($value)) {
-            $value = __('No Title', 'site-reviews');
+        if( empty($value) ) {
+            $value = __( 'No Title', 'site-reviews' );
         }
         return '<h3>'.$value.'</h3>';
     }
@@ -253,16 +253,16 @@ 
      * @param string $avatarUrl
      * @return string
      */
-    protected function generateAvatar($avatarUrl)
+    protected function generateAvatar( $avatarUrl )
     {
-        if (!$this->isOptionEnabled('settings.reviews.avatars_regenerate') || 'local' != $this->current->review_type) {
+        if( !$this->isOptionEnabled( 'settings.reviews.avatars_regenerate' ) || 'local' != $this->current->review_type ) {
             return $avatarUrl;
         }
-        $authorIdOrEmail = get_the_author_meta('ID', $this->current->user_id);
-        if (empty($authorIdOrEmail)) {
+        $authorIdOrEmail = get_the_author_meta( 'ID', $this->current->user_id );
+        if( empty($authorIdOrEmail) ) {
             $authorIdOrEmail = $this->current->email;
         }
-        if ($newAvatar = get_avatar_url($authorIdOrEmail)) {
+        if( $newAvatar = get_avatar_url( $authorIdOrEmail ) ) {
             return $newAvatar;
         }
         return $avatarUrl;
@@ -272,20 +272,20 @@ 
      * @param string $text
      * @return string
      */
-    protected function getExcerpt($text)
+    protected function getExcerpt( $text )
     {
-        $limit = intval($this->getOption('settings.reviews.excerpts_length', 55));
-        $split = extension_loaded('intl')
-            ? $this->getExcerptIntlSplit($text, $limit)
-            : $this->getExcerptSplit($text, $limit);
-        $hiddenText = substr($text, $split);
-        if (!empty($hiddenText)) {
-            $showMore = glsr(Builder::class)->span($hiddenText, [
+        $limit = intval( $this->getOption( 'settings.reviews.excerpts_length', 55 ) );
+        $split = extension_loaded( 'intl' )
+            ? $this->getExcerptIntlSplit( $text, $limit )
+            : $this->getExcerptSplit( $text, $limit );
+        $hiddenText = substr( $text, $split );
+        if( !empty($hiddenText) ) {
+            $showMore = glsr( Builder::class )->span( $hiddenText, [
                 'class' => 'glsr-hidden glsr-hidden-text',
-                'data-show-less' => __('Show less', 'site-reviews'),
-                'data-show-more' => __('Show more', 'site-reviews'),
-            ]);
-            $text = ltrim(substr($text, 0, $split)).$showMore;
+                'data-show-less' => __( 'Show less', 'site-reviews' ),
+                'data-show-more' => __( 'Show more', 'site-reviews' ),
+            ] );
+            $text = ltrim( substr( $text, 0, $split ) ).$showMore;
         }
         return $text;
     }
@@ -295,22 +295,22 @@ 
      * @param int $limit
      * @return int
      */
-    protected function getExcerptIntlSplit($text, $limit)
+    protected function getExcerptIntlSplit( $text, $limit )
     {
-        $words = IntlRuleBasedBreakIterator::createWordInstance('');
-        $words->setText($text);
+        $words = IntlRuleBasedBreakIterator::createWordInstance( '' );
+        $words->setText( $text );
         $count = 0;
-        foreach ($words as $offset) {
-            if (IntlRuleBasedBreakIterator::WORD_NONE === $words->getRuleStatus()) {
+        foreach( $words as $offset ) {
+            if( IntlRuleBasedBreakIterator::WORD_NONE === $words->getRuleStatus() ) {
                 continue;
             }
             ++$count;
-            if ($count != $limit) {
+            if( $count != $limit ) {
                 continue;
             }
             return $offset;
         }
-        return strlen($text);
+        return strlen( $text );
     }
 
     /**
@@ -318,13 +318,13 @@ 
      * @param int $limit
      * @return int
      */
-    protected function getExcerptSplit($text, $limit)
+    protected function getExcerptSplit( $text, $limit )
     {
-        if (str_word_count($text, 0) > $limit) {
-            $words = array_keys(str_word_count($text, 2));
+        if( str_word_count( $text, 0 ) > $limit ) {
+            $words = array_keys( str_word_count( $text, 2 ) );
             return $words[$limit];
         }
-        return strlen($text);
+        return strlen( $text );
     }
 
     /**
@@ -332,9 +332,9 @@ 
      * @param mixed $fallback
      * @return mixed
      */
-    protected function getOption($path, $fallback = '')
+    protected function getOption( $path, $fallback = '' )
     {
-        if (array_key_exists($path, $this->options)) {
+        if( array_key_exists( $path, $this->options ) ) {
             return $this->options[$path];
         }
         return $fallback;
@@ -345,50 +345,50 @@ 
      * @param string $value
      * @return bool
      */
-    protected function isHiddenOrEmpty($key, $value)
+    protected function isHiddenOrEmpty( $key, $value )
     {
-        return $this->isHidden($key) || empty($value);
+        return $this->isHidden( $key ) || empty($value);
     }
 
     /**
      * @param string $path
      * @return bool
      */
-    protected function isOptionEnabled($path)
+    protected function isOptionEnabled( $path )
     {
-        return 'yes' == $this->getOption($path);
+        return 'yes' == $this->getOption( $path );
     }
 
     /**
      * @param string $text
      * @return string
      */
-    protected function normalizeText($text)
+    protected function normalizeText( $text )
     {
-        $text = wp_kses($text, wp_kses_allowed_html());
-        $text = convert_smilies(strip_shortcodes($text));
-        $text = str_replace(']]>', ']]&gt;', $text);
-        $text = preg_replace('/(\R){2,}/', '$1', $text);
-        if ($this->isOptionEnabled('settings.reviews.excerpts')) {
-            $text = $this->getExcerpt($text);
+        $text = wp_kses( $text, wp_kses_allowed_html() );
+        $text = convert_smilies( strip_shortcodes( $text ) );
+        $text = str_replace( ']]>', ']]&gt;', $text );
+        $text = preg_replace( '/(\R){2,}/', '$1', $text );
+        if( $this->isOptionEnabled( 'settings.reviews.excerpts' ) ) {
+            $text = $this->getExcerpt( $text );
         }
-        return wptexturize(nl2br($text));
+        return wptexturize( nl2br( $text ) );
     }
 
     /**
      * @return void
      */
-    protected function wrap(array &$renderedFields, Review $review)
+    protected function wrap( array &$renderedFields, Review $review )
     {
-        $renderedFields = apply_filters('site-reviews/review/wrap', $renderedFields, $review);
-        array_walk($renderedFields, function (&$value, $key) use ($review) {
-            $value = apply_filters('site-reviews/review/wrap/'.$key, $value, $review);
-            if (empty($value)) {
+        $renderedFields = apply_filters( 'site-reviews/review/wrap', $renderedFields, $review );
+        array_walk( $renderedFields, function( &$value, $key ) use ($review) {
+            $value = apply_filters( 'site-reviews/review/wrap/'.$key, $value, $review );
+            if( empty($value) ) {
                 return;
             }
-            $value = glsr(Builder::class)->div($value, [
+            $value = glsr( Builder::class )->div( $value, [
                 'class' => 'glsr-review-'.$key,
-            ]);
+            ] );
         });
     }
 }

plugin/Modules/Html/ReviewsHtml.php

Indentation +120 added lines, -120 removed lines

@@ -7,135 +7,135 @@
 
 class ReviewsHtml extends ArrayObject
 {
-    /**
-     * @var array
-     */
-    public $args;
+	/**
+	 * @var array
+	 */
+	public $args;
 
-    /**
-     * @var int
-     */
-    public $max_num_pages;
+	/**
+	 * @var int
+	 */
+	public $max_num_pages;
 
-    /**
-     * @var string
-     */
-    public $pagination;
+	/**
+	 * @var string
+	 */
+	public $pagination;
 
-    /**
-     * @var array
-     */
-    public $reviews;
+	/**
+	 * @var array
+	 */
+	public $reviews;
 
-    public function __construct(array $reviews, $maxPageCount, array $args)
-    {
-        $this->args = $args;
-        $this->max_num_pages = $maxPageCount;
-        $this->reviews = $reviews;
-        $this->pagination = $this->buildPagination();
-        parent::__construct($reviews, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS);
-    }
+	public function __construct(array $reviews, $maxPageCount, array $args)
+	{
+		$this->args = $args;
+		$this->max_num_pages = $maxPageCount;
+		$this->reviews = $reviews;
+		$this->pagination = $this->buildPagination();
+		parent::__construct($reviews, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS);
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return glsr(Template::class)->build('templates/reviews', [
-            'args' => $this->args,
-            'context' => [
-                'assigned_to' => $this->args['assigned_to'],
-                'category' => $this->args['category'],
-                'class' => $this->getClass(),
-                'id' => $this->args['id'],
-                'pagination' => $this->getPagination(),
-                'reviews' => $this->getReviews(),
-            ],
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return glsr(Template::class)->build('templates/reviews', [
+			'args' => $this->args,
+			'context' => [
+				'assigned_to' => $this->args['assigned_to'],
+				'category' => $this->args['category'],
+				'class' => $this->getClass(),
+				'id' => $this->args['id'],
+				'pagination' => $this->getPagination(),
+				'reviews' => $this->getReviews(),
+			],
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    public function getPagination()
-    {
-        return wp_validate_boolean($this->args['pagination'])
-            ? $this->pagination
-            : '';
-    }
+	/**
+	 * @return string
+	 */
+	public function getPagination()
+	{
+		return wp_validate_boolean($this->args['pagination'])
+			? $this->pagination
+			: '';
+	}
 
-    /**
-     * @return string
-     */
-    public function getReviews()
-    {
-        $html = empty($this->reviews)
-            ? $this->getReviewsFallback()
-            : implode(PHP_EOL, $this->reviews);
-        $wrapper = '<div class="glsr-reviews">%s</div>';
-        $wrapper = apply_filters('site-reviews/reviews/reviews-wrapper', $wrapper);
-        return sprintf($wrapper, $html);
-    }
+	/**
+	 * @return string
+	 */
+	public function getReviews()
+	{
+		$html = empty($this->reviews)
+			? $this->getReviewsFallback()
+			: implode(PHP_EOL, $this->reviews);
+		$wrapper = '<div class="glsr-reviews">%s</div>';
+		$wrapper = apply_filters('site-reviews/reviews/reviews-wrapper', $wrapper);
+		return sprintf($wrapper, $html);
+	}
 
-    /**
-     * @param mixed $key
-     * @return mixed
-     */
-    public function offsetGet($key)
-    {
-        if ('navigation' == $key) {
-            glsr()->deprecated[] = 'The $reviewsHtml->navigation property has been been deprecated. Please use the $reviewsHtml->pagination property instead.';
-            return $this->pagination;
-        }
-        if (property_exists($this, $key)) {
-            return $this->{$key};
-        }
-        return array_key_exists($key, $this->reviews)
-            ? $this->reviews[$key]
-            : null;
-    }
+	/**
+	 * @param mixed $key
+	 * @return mixed
+	 */
+	public function offsetGet($key)
+	{
+		if ('navigation' == $key) {
+			glsr()->deprecated[] = 'The $reviewsHtml->navigation property has been been deprecated. Please use the $reviewsHtml->pagination property instead.';
+			return $this->pagination;
+		}
+		if (property_exists($this, $key)) {
+			return $this->{$key};
+		}
+		return array_key_exists($key, $this->reviews)
+			? $this->reviews[$key]
+			: null;
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildPagination()
-    {
-        $html = glsr(Partial::class)->build('pagination', [
-            'baseUrl' => glsr_get($this->args, 'pagedUrl'),
-            'current' => glsr_get($this->args, 'paged'),
-            'total' => $this->max_num_pages,
-        ]);
-        $html.= sprintf('<glsr-pagination hidden data-atts=\'%s\'></glsr-pagination>', $this->args['json']);
-        $wrapper = '<div class="glsr-pagination">%s</div>';
-        $wrapper = apply_filters('site-reviews/reviews/pagination-wrapper', $wrapper);
-        return sprintf($wrapper, $html);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildPagination()
+	{
+		$html = glsr(Partial::class)->build('pagination', [
+			'baseUrl' => glsr_get($this->args, 'pagedUrl'),
+			'current' => glsr_get($this->args, 'paged'),
+			'total' => $this->max_num_pages,
+		]);
+		$html.= sprintf('<glsr-pagination hidden data-atts=\'%s\'></glsr-pagination>', $this->args['json']);
+		$wrapper = '<div class="glsr-pagination">%s</div>';
+		$wrapper = apply_filters('site-reviews/reviews/pagination-wrapper', $wrapper);
+		return sprintf($wrapper, $html);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getClass()
-    {
-        $defaults = [
-            'glsr-default',
-        ];
-        if ('ajax' == $this->args['pagination']) {
-            $defaults[] = 'glsr-ajax-pagination';
-        }
-        $classes = explode(' ', $this->args['class']);
-        $classes = array_unique(array_merge($defaults, array_filter($classes)));
-        return implode(' ', $classes);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getClass()
+	{
+		$defaults = [
+			'glsr-default',
+		];
+		if ('ajax' == $this->args['pagination']) {
+			$defaults[] = 'glsr-ajax-pagination';
+		}
+		$classes = explode(' ', $this->args['class']);
+		$classes = array_unique(array_merge($defaults, array_filter($classes)));
+		return implode(' ', $classes);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getReviewsFallback()
-    {
-        if (empty($this->args['fallback']) && glsr(OptionManager::class)->getBool('settings.reviews.fallback')) {
-            $this->args['fallback'] = __('There are no reviews yet. Be the first one to write one.', 'site-reviews');
-        }
-        $fallback = '<p class="glsr-no-margins">'.$this->args['fallback'].'</p>';
-        return apply_filters('site-reviews/reviews/fallback', $fallback, $this->args);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getReviewsFallback()
+	{
+		if (empty($this->args['fallback']) && glsr(OptionManager::class)->getBool('settings.reviews.fallback')) {
+			$this->args['fallback'] = __('There are no reviews yet. Be the first one to write one.', 'site-reviews');
+		}
+		$fallback = '<p class="glsr-no-margins">'.$this->args['fallback'].'</p>';
+		return apply_filters('site-reviews/reviews/fallback', $fallback, $this->args);
+	}
 }

Spacing +26 added lines, -26 removed lines

@@ -27,13 +27,13 @@ 
      */
     public $reviews;
 
-    public function __construct(array $reviews, $maxPageCount, array $args)
+    public function __construct( array $reviews, $maxPageCount, array $args )
     {
         $this->args = $args;
         $this->max_num_pages = $maxPageCount;
         $this->reviews = $reviews;
         $this->pagination = $this->buildPagination();
-        parent::__construct($reviews, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS);
+        parent::__construct( $reviews, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS );
     }
 
     /**
@@ -41,7 +41,7 @@ 
      */
     public function __toString()
     {
-        return glsr(Template::class)->build('templates/reviews', [
+        return glsr( Template::class )->build( 'templates/reviews', [
             'args' => $this->args,
             'context' => [
                 'assigned_to' => $this->args['assigned_to'],
@@ -51,7 +51,7 @@ 
                 'pagination' => $this->getPagination(),
                 'reviews' => $this->getReviews(),
             ],
-        ]);
+        ] );
     }
 
     /**
@@ -59,7 +59,7 @@ 
      */
     public function getPagination()
     {
-        return wp_validate_boolean($this->args['pagination'])
+        return wp_validate_boolean( $this->args['pagination'] )
             ? $this->pagination
             : '';
     }
@@ -71,26 +71,26 @@ 
     {
         $html = empty($this->reviews)
             ? $this->getReviewsFallback()
-            : implode(PHP_EOL, $this->reviews);
+            : implode( PHP_EOL, $this->reviews );
         $wrapper = '<div class="glsr-reviews">%s</div>';
-        $wrapper = apply_filters('site-reviews/reviews/reviews-wrapper', $wrapper);
-        return sprintf($wrapper, $html);
+        $wrapper = apply_filters( 'site-reviews/reviews/reviews-wrapper', $wrapper );
+        return sprintf( $wrapper, $html );
     }
 
     /**
      * @param mixed $key
      * @return mixed
      */
-    public function offsetGet($key)
+    public function offsetGet( $key )
     {
-        if ('navigation' == $key) {
+        if( 'navigation' == $key ) {
             glsr()->deprecated[] = 'The $reviewsHtml->navigation property has been been deprecated. Please use the $reviewsHtml->pagination property instead.';
             return $this->pagination;
         }
-        if (property_exists($this, $key)) {
+        if( property_exists( $this, $key ) ) {
             return $this->{$key};
         }
-        return array_key_exists($key, $this->reviews)
+        return array_key_exists( $key, $this->reviews )
             ? $this->reviews[$key]
             : null;
     }
@@ -100,15 +100,15 @@ 
      */
     protected function buildPagination()
     {
-        $html = glsr(Partial::class)->build('pagination', [
-            'baseUrl' => glsr_get($this->args, 'pagedUrl'),
-            'current' => glsr_get($this->args, 'paged'),
+        $html = glsr( Partial::class )->build( 'pagination', [
+            'baseUrl' => glsr_get( $this->args, 'pagedUrl' ),
+            'current' => glsr_get( $this->args, 'paged' ),
             'total' => $this->max_num_pages,
-        ]);
-        $html.= sprintf('<glsr-pagination hidden data-atts=\'%s\'></glsr-pagination>', $this->args['json']);
+        ] );
+        $html .= sprintf( '<glsr-pagination hidden data-atts=\'%s\'></glsr-pagination>', $this->args['json'] );
         $wrapper = '<div class="glsr-pagination">%s</div>';
-        $wrapper = apply_filters('site-reviews/reviews/pagination-wrapper', $wrapper);
-        return sprintf($wrapper, $html);
+        $wrapper = apply_filters( 'site-reviews/reviews/pagination-wrapper', $wrapper );
+        return sprintf( $wrapper, $html );
     }
 
     /**
@@ -119,12 +119,12 @@ 
         $defaults = [
             'glsr-default',
         ];
-        if ('ajax' == $this->args['pagination']) {
+        if( 'ajax' == $this->args['pagination'] ) {
             $defaults[] = 'glsr-ajax-pagination';
         }
-        $classes = explode(' ', $this->args['class']);
-        $classes = array_unique(array_merge($defaults, array_filter($classes)));
-        return implode(' ', $classes);
+        $classes = explode( ' ', $this->args['class'] );
+        $classes = array_unique( array_merge( $defaults, array_filter( $classes ) ) );
+        return implode( ' ', $classes );
     }
 
     /**
@@ -132,10 +132,10 @@ 
      */
     protected function getReviewsFallback()
     {
-        if (empty($this->args['fallback']) && glsr(OptionManager::class)->getBool('settings.reviews.fallback')) {
-            $this->args['fallback'] = __('There are no reviews yet. Be the first one to write one.', 'site-reviews');
+        if( empty($this->args['fallback']) && glsr( OptionManager::class )->getBool( 'settings.reviews.fallback' ) ) {
+            $this->args['fallback'] = __( 'There are no reviews yet. Be the first one to write one.', 'site-reviews' );
         }
         $fallback = '<p class="glsr-no-margins">'.$this->args['fallback'].'</p>';
-        return apply_filters('site-reviews/reviews/fallback', $fallback, $this->args);
+        return apply_filters( 'site-reviews/reviews/fallback', $fallback, $this->args );
     }
 }

plugin/Modules/Notice.php

Indentation +103 added lines, -103 removed lines

@@ -8,114 +8,114 @@
 
 class Notice
 {
-    /**
-     * @param string $type
-     * @param string|array|WP_Error $message
-     * @return void
-     */
-    public function add($type, $message, array $args = [])
-    {
-        if (empty(array_filter([$message, $type]))) {
-            return;
-        }
-        $args['message'] = $message;
-        $args['type'] = $type;
-        add_settings_error(Application::ID, '', json_encode($this->normalize($args)));
-    }
+	/**
+	 * @param string $type
+	 * @param string|array|WP_Error $message
+	 * @return void
+	 */
+	public function add($type, $message, array $args = [])
+	{
+		if (empty(array_filter([$message, $type]))) {
+			return;
+		}
+		$args['message'] = $message;
+		$args['type'] = $type;
+		add_settings_error(Application::ID, '', json_encode($this->normalize($args)));
+	}
 
-    /**
-     * @param string|array|WP_Error $message
-     * @return void
-     */
-    public function addError($message, array $args = [])
-    {
-        $this->add('error', $message, $args);
-    }
+	/**
+	 * @param string|array|WP_Error $message
+	 * @return void
+	 */
+	public function addError($message, array $args = [])
+	{
+		$this->add('error', $message, $args);
+	}
 
-    /**
-     * @param string|array|WP_Error $message
-     * @return void
-     */
-    public function addSuccess($message, array $args = [])
-    {
-        $this->add('success', $message, $args);
-    }
+	/**
+	 * @param string|array|WP_Error $message
+	 * @return void
+	 */
+	public function addSuccess($message, array $args = [])
+	{
+		$this->add('success', $message, $args);
+	}
 
-    /**
-     * @param string|array|WP_Error $message
-     * @return void
-     */
-    public function addWarning($message, array $args = [])
-    {
-        $this->add('warning', $message, $args);
-    }
+	/**
+	 * @param string|array|WP_Error $message
+	 * @return void
+	 */
+	public function addWarning($message, array $args = [])
+	{
+		$this->add('warning', $message, $args);
+	}
 
-    /**
-     * @return static
-     */
-    public function clear()
-    {
-        global $wp_settings_errors;
-        $wp_settings_errors = [];
-        delete_transient('settings_errors');
-        return $this;
-    }
+	/**
+	 * @return static
+	 */
+	public function clear()
+	{
+		global $wp_settings_errors;
+		$wp_settings_errors = [];
+		delete_transient('settings_errors');
+		return $this;
+	}
 
-    /**
-     * @return string
-     */
-    public function get()
-    {
-        $notices = array_map('unserialize',
-            array_unique(array_map('serialize', get_settings_errors(Application::ID)))
-        );
-        if (empty($notices)) {
-            return;
-        }
-        return array_reduce($notices, function ($carry, $notice) {
-            return $carry.$this->buildNotice(json_decode($notice['message'], true));
-        });
-    }
+	/**
+	 * @return string
+	 */
+	public function get()
+	{
+		$notices = array_map('unserialize',
+			array_unique(array_map('serialize', get_settings_errors(Application::ID)))
+		);
+		if (empty($notices)) {
+			return;
+		}
+		return array_reduce($notices, function ($carry, $notice) {
+			return $carry.$this->buildNotice(json_decode($notice['message'], true));
+		});
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildNotice(array $args)
-    {
-        $messages = array_reduce($args['messages'], function ($carry, $message) {
-            return $carry.glsr(Builder::class)->p($message);
-        });
-        $class = 'notice notice-'.$args['type'];
-        if ($args['inline']) {
-            $class.= ' inline';
-        }
-        if ($args['dismissible']) {
-            $class.= ' is-dismissible';
-        }
-        return glsr(Builder::class)->div($messages, [
-            'class' => $class,
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildNotice(array $args)
+	{
+		$messages = array_reduce($args['messages'], function ($carry, $message) {
+			return $carry.glsr(Builder::class)->p($message);
+		});
+		$class = 'notice notice-'.$args['type'];
+		if ($args['inline']) {
+			$class.= ' inline';
+		}
+		if ($args['dismissible']) {
+			$class.= ' is-dismissible';
+		}
+		return glsr(Builder::class)->div($messages, [
+			'class' => $class,
+		]);
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $args)
-    {
-        $defaults = [
-            'dismissible' => true,
-            'inline' => true,
-            'message' => '',
-            'type' => '',
-        ];
-        $args = shortcode_atts($defaults, $args);
-        if (!in_array($args['type'], ['error', 'warning', 'success'])) {
-            $args['type'] = 'success';
-        }
-        $args['messages'] = is_wp_error($args['message'])
-            ? (array) $args['message']->get_error_message()
-            : (array) $args['message'];
-        unset($args['message']);
-        return $args;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $args)
+	{
+		$defaults = [
+			'dismissible' => true,
+			'inline' => true,
+			'message' => '',
+			'type' => '',
+		];
+		$args = shortcode_atts($defaults, $args);
+		if (!in_array($args['type'], ['error', 'warning', 'success'])) {
+			$args['type'] = 'success';
+		}
+		$args['messages'] = is_wp_error($args['message'])
+			? (array) $args['message']->get_error_message()
+			: (array) $args['message'];
+		unset($args['message']);
+		return $args;
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -13,41 +13,41 @@ 
      * @param string|array|WP_Error $message
      * @return void
      */
-    public function add($type, $message, array $args = [])
+    public function add( $type, $message, array $args = [] )
     {
-        if (empty(array_filter([$message, $type]))) {
+        if( empty(array_filter( [$message, $type] )) ) {
             return;
         }
         $args['message'] = $message;
         $args['type'] = $type;
-        add_settings_error(Application::ID, '', json_encode($this->normalize($args)));
+        add_settings_error( Application::ID, '', json_encode( $this->normalize( $args ) ) );
     }
 
     /**
      * @param string|array|WP_Error $message
      * @return void
      */
-    public function addError($message, array $args = [])
+    public function addError( $message, array $args = [] )
     {
-        $this->add('error', $message, $args);
+        $this->add( 'error', $message, $args );
     }
 
     /**
      * @param string|array|WP_Error $message
      * @return void
      */
-    public function addSuccess($message, array $args = [])
+    public function addSuccess( $message, array $args = [] )
     {
-        $this->add('success', $message, $args);
+        $this->add( 'success', $message, $args );
     }
 
     /**
      * @param string|array|WP_Error $message
      * @return void
      */
-    public function addWarning($message, array $args = [])
+    public function addWarning( $message, array $args = [] )
     {
-        $this->add('warning', $message, $args);
+        $this->add( 'warning', $message, $args );
     }
 
     /**
@@ -57,7 +57,7 @@ 
     {
         global $wp_settings_errors;
         $wp_settings_errors = [];
-        delete_transient('settings_errors');
+        delete_transient( 'settings_errors' );
         return $this;
     }
 
@@ -66,41 +66,41 @@ 
      */
     public function get()
     {
-        $notices = array_map('unserialize',
-            array_unique(array_map('serialize', get_settings_errors(Application::ID)))
+        $notices = array_map( 'unserialize',
+            array_unique( array_map( 'serialize', get_settings_errors( Application::ID ) ) )
         );
-        if (empty($notices)) {
+        if( empty($notices) ) {
             return;
         }
-        return array_reduce($notices, function ($carry, $notice) {
-            return $carry.$this->buildNotice(json_decode($notice['message'], true));
+        return array_reduce( $notices, function( $carry, $notice ) {
+            return $carry.$this->buildNotice( json_decode( $notice['message'], true ) );
         });
     }
 
     /**
      * @return string
      */
-    protected function buildNotice(array $args)
+    protected function buildNotice( array $args )
     {
-        $messages = array_reduce($args['messages'], function ($carry, $message) {
-            return $carry.glsr(Builder::class)->p($message);
+        $messages = array_reduce( $args['messages'], function( $carry, $message ) {
+            return $carry.glsr( Builder::class )->p( $message );
         });
         $class = 'notice notice-'.$args['type'];
-        if ($args['inline']) {
-            $class.= ' inline';
+        if( $args['inline'] ) {
+            $class .= ' inline';
         }
-        if ($args['dismissible']) {
-            $class.= ' is-dismissible';
+        if( $args['dismissible'] ) {
+            $class .= ' is-dismissible';
         }
-        return glsr(Builder::class)->div($messages, [
+        return glsr( Builder::class )->div( $messages, [
             'class' => $class,
-        ]);
+        ] );
     }
 
     /**
      * @return array
      */
-    protected function normalize(array $args)
+    protected function normalize( array $args )
     {
         $defaults = [
             'dismissible' => true,
@@ -108,13 +108,13 @@ 
             'message' => '',
             'type' => '',
         ];
-        $args = shortcode_atts($defaults, $args);
-        if (!in_array($args['type'], ['error', 'warning', 'success'])) {
+        $args = shortcode_atts( $defaults, $args );
+        if( !in_array( $args['type'], ['error', 'warning', 'success'] ) ) {
             $args['type'] = 'success';
         }
-        $args['messages'] = is_wp_error($args['message'])
-            ? (array) $args['message']->get_error_message()
-            : (array) $args['message'];
+        $args['messages'] = is_wp_error( $args['message'] )
+            ? (array)$args['message']->get_error_message()
+            : (array)$args['message'];
         unset($args['message']);
         return $args;
     }

plugin/Modules/Session.php

Indentation +212 added lines, -212 removed lines

@@ -10,216 +10,216 @@
  */
 class Session
 {
-    const DELIMITER = '__';
-
-    const SESSION_COOKIE = '_glsr_session';
-
-    /**
-     * @var int
-     */
-    protected $expiryTimestamp;
-
-    /**
-     * @var int
-     */
-    protected $expiryTimestampReset;
-
-    /**
-     * @var array
-     */
-    protected $sessionData;
-
-    /**
-     * @var string
-     */
-    protected $sessionId;
-
-    public function __construct()
-    {
-        $cookieId = filter_input(INPUT_COOKIE, static::SESSION_COOKIE);
-        if (false !== strpos($cookieId, static::DELIMITER)) {
-            $cookie = explode(static::DELIMITER, stripslashes($cookieId));
-            $this->sessionId = preg_replace('/[^A-Za-z0-9_]/', '', $cookie[0]);
-            $this->expiryTimestamp = absint($cookie[1]);
-            $this->expiryTimestampReset = absint($cookie[2]);
-            if (time() > $this->expiryTimestampReset) {
-                $this->setCookieExpiration();
-            }
-        } else {
-            $this->sessionId = $this->generateSessionId();
-            $this->setCookieExpiration();
-        }
-        $this->getSessionData();
-        $this->setCookie();
-    }
-
-    /**
-     * @return void
-     */
-    public function clear()
-    {
-        $this->setCookieExpiration();
-        $this->regenerateSessionId('and delete session!');
-    }
-
-    /**
-     * @return int|false
-     */
-    public function deleteAllSessions()
-    {
-        return glsr(SqlQueries::class)->deleteAllSessions(static::SESSION_COOKIE);
-    }
-
-    /**
-     * @param int $limit
-     * @return void
-     */
-    public function deleteExpiredSessions($limit = 1000)
-    {
-        if ($expiredSessions = implode("','", $this->getExpiredSessions($limit))) {
-            glsr(SqlQueries::class)->deleteExpiredSessions($expiredSessions);
-        }
-    }
-
-    /**
-     * @param string $key
-     * @param string|array $fallback
-     * @param bool|string $unset
-     * @return string|array
-     */
-    public function get($key, $fallback = '', $unset = false)
-    {
-        $key = sanitize_key($key);
-        $value = isset($this->sessionData[$key])
-            ? maybe_unserialize($this->sessionData[$key])
-            : $fallback;
-        if (isset($this->sessionData[$key]) && $unset) {
-            unset($this->sessionData[$key]);
-            $this->updateSession();
-        }
-        return $value;
-    }
-
-    /**
-     * @param string $key
-     * @param mixed $value
-     * @return mixed
-     */
-    public function set($key, $value)
-    {
-        $key = sanitize_key($key);
-        $this->sessionData[$key] = maybe_serialize($value);
-        $this->updateSession();
-        return $this->sessionData[$key];
-    }
-
-    /**
-     * @return void
-     */
-    protected function createSession()
-    {
-        add_option($this->getSessionId(), $this->sessionData, '', false);
-        add_option($this->getSessionId('expires'), $this->expiryTimestamp, '', false);
-    }
-
-    /**
-     * @return void
-     */
-    protected function deleteSession()
-    {
-        delete_option($this->getSessionId());
-        delete_option($this->getSessionId('expires'));
-    }
-
-    /**
-     * @return string
-     */
-    protected function generateSessionId()
-    {
-        return md5((new PasswordHash(8, false))->get_random_bytes(32));
-    }
-
-    /**
-     * @param int $limit
-     * @return array
-     */
-    protected function getExpiredSessions($limit)
-    {
-        $expiredSessions = [];
-        $sessions = glsr(SqlQueries::class)->getExpiredSessions(static::SESSION_COOKIE, absint($limit));
-        if (!empty($sessions)) {
-            $now = time();
-            foreach ($sessions as $session) {
-                if ($now <= $session->expiration) {
-                    continue;
-                }
-                $expiredSessions[] = $session->name;
-                $expiredSessions[] = str_replace('_expires_', '_', $session->name);
-            }
-        }
-        return $expiredSessions;
-    }
-
-    /**
-     * @param string $separator
-     * @return string
-     */
-    protected function getSessionId($separator = '')
-    {
-        return implode('_', array_filter([static::SESSION_COOKIE, $separator, $this->sessionId]));
-    }
-
-    /**
-     * @return array
-     */
-    protected function getSessionData()
-    {
-        return $this->sessionData = (array) get_option($this->getSessionId(), []);
-    }
-
-    /**
-     * @param bool|string $deleteOld
-     * @return void
-     */
-    protected function regenerateSessionId($deleteOld = false)
-    {
-        if ($deleteOld) {
-            $this->deleteSession();
-        }
-        $this->sessionId = $this->generateSessionId();
-        $this->setCookie();
-    }
-
-    /**
-     * @return void
-     */
-    protected function setCookie()
-    {
-        if (headers_sent()) {
-            return;
-        }
-        $cookie = $this->sessionId.static::DELIMITER.$this->expiryTimestamp.static::DELIMITER.$this->expiryTimestampReset;
-        $cookiePath = preg_replace('|https?://[^/]+|i', '', trailingslashit((string) get_option('home')));
-        setcookie(static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath);
-    }
-
-    /**
-     * @return void
-     */
-    protected function setCookieExpiration()
-    {
-        $this->expiryTimestampReset = time() + (24 * 60); // 24 minutes
-        $this->expiryTimestamp = time() + (30 * 60); // 30 minutes
-    }
-
-    /**
-     * @return void
-     */
-    protected function updateSession()
-    {
-        if (false === get_option($this->getSessionId())) {
-            return $this->createSession();
-        }
-        update_option($this->getSessionId(), $this->sessionData, false);
-    }
+	const DELIMITER = '__';
+
+	const SESSION_COOKIE = '_glsr_session';
+
+	/**
+	 * @var int
+	 */
+	protected $expiryTimestamp;
+
+	/**
+	 * @var int
+	 */
+	protected $expiryTimestampReset;
+
+	/**
+	 * @var array
+	 */
+	protected $sessionData;
+
+	/**
+	 * @var string
+	 */
+	protected $sessionId;
+
+	public function __construct()
+	{
+		$cookieId = filter_input(INPUT_COOKIE, static::SESSION_COOKIE);
+		if (false !== strpos($cookieId, static::DELIMITER)) {
+			$cookie = explode(static::DELIMITER, stripslashes($cookieId));
+			$this->sessionId = preg_replace('/[^A-Za-z0-9_]/', '', $cookie[0]);
+			$this->expiryTimestamp = absint($cookie[1]);
+			$this->expiryTimestampReset = absint($cookie[2]);
+			if (time() > $this->expiryTimestampReset) {
+				$this->setCookieExpiration();
+			}
+		} else {
+			$this->sessionId = $this->generateSessionId();
+			$this->setCookieExpiration();
+		}
+		$this->getSessionData();
+		$this->setCookie();
+	}
+
+	/**
+	 * @return void
+	 */
+	public function clear()
+	{
+		$this->setCookieExpiration();
+		$this->regenerateSessionId('and delete session!');
+	}
+
+	/**
+	 * @return int|false
+	 */
+	public function deleteAllSessions()
+	{
+		return glsr(SqlQueries::class)->deleteAllSessions(static::SESSION_COOKIE);
+	}
+
+	/**
+	 * @param int $limit
+	 * @return void
+	 */
+	public function deleteExpiredSessions($limit = 1000)
+	{
+		if ($expiredSessions = implode("','", $this->getExpiredSessions($limit))) {
+			glsr(SqlQueries::class)->deleteExpiredSessions($expiredSessions);
+		}
+	}
+
+	/**
+	 * @param string $key
+	 * @param string|array $fallback
+	 * @param bool|string $unset
+	 * @return string|array
+	 */
+	public function get($key, $fallback = '', $unset = false)
+	{
+		$key = sanitize_key($key);
+		$value = isset($this->sessionData[$key])
+			? maybe_unserialize($this->sessionData[$key])
+			: $fallback;
+		if (isset($this->sessionData[$key]) && $unset) {
+			unset($this->sessionData[$key]);
+			$this->updateSession();
+		}
+		return $value;
+	}
+
+	/**
+	 * @param string $key
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	public function set($key, $value)
+	{
+		$key = sanitize_key($key);
+		$this->sessionData[$key] = maybe_serialize($value);
+		$this->updateSession();
+		return $this->sessionData[$key];
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function createSession()
+	{
+		add_option($this->getSessionId(), $this->sessionData, '', false);
+		add_option($this->getSessionId('expires'), $this->expiryTimestamp, '', false);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function deleteSession()
+	{
+		delete_option($this->getSessionId());
+		delete_option($this->getSessionId('expires'));
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function generateSessionId()
+	{
+		return md5((new PasswordHash(8, false))->get_random_bytes(32));
+	}
+
+	/**
+	 * @param int $limit
+	 * @return array
+	 */
+	protected function getExpiredSessions($limit)
+	{
+		$expiredSessions = [];
+		$sessions = glsr(SqlQueries::class)->getExpiredSessions(static::SESSION_COOKIE, absint($limit));
+		if (!empty($sessions)) {
+			$now = time();
+			foreach ($sessions as $session) {
+				if ($now <= $session->expiration) {
+					continue;
+				}
+				$expiredSessions[] = $session->name;
+				$expiredSessions[] = str_replace('_expires_', '_', $session->name);
+			}
+		}
+		return $expiredSessions;
+	}
+
+	/**
+	 * @param string $separator
+	 * @return string
+	 */
+	protected function getSessionId($separator = '')
+	{
+		return implode('_', array_filter([static::SESSION_COOKIE, $separator, $this->sessionId]));
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getSessionData()
+	{
+		return $this->sessionData = (array) get_option($this->getSessionId(), []);
+	}
+
+	/**
+	 * @param bool|string $deleteOld
+	 * @return void
+	 */
+	protected function regenerateSessionId($deleteOld = false)
+	{
+		if ($deleteOld) {
+			$this->deleteSession();
+		}
+		$this->sessionId = $this->generateSessionId();
+		$this->setCookie();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function setCookie()
+	{
+		if (headers_sent()) {
+			return;
+		}
+		$cookie = $this->sessionId.static::DELIMITER.$this->expiryTimestamp.static::DELIMITER.$this->expiryTimestampReset;
+		$cookiePath = preg_replace('|https?://[^/]+|i', '', trailingslashit((string) get_option('home')));
+		setcookie(static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function setCookieExpiration()
+	{
+		$this->expiryTimestampReset = time() + (24 * 60); // 24 minutes
+		$this->expiryTimestamp = time() + (30 * 60); // 30 minutes
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function updateSession()
+	{
+		if (false === get_option($this->getSessionId())) {
+			return $this->createSession();
+		}
+		update_option($this->getSessionId(), $this->sessionData, false);
+	}
 }

Spacing +40 added lines, -40 removed lines

@@ -36,13 +36,13 @@ 
 
     public function __construct()
     {
-        $cookieId = filter_input(INPUT_COOKIE, static::SESSION_COOKIE);
-        if (false !== strpos($cookieId, static::DELIMITER)) {
-            $cookie = explode(static::DELIMITER, stripslashes($cookieId));
-            $this->sessionId = preg_replace('/[^A-Za-z0-9_]/', '', $cookie[0]);
-            $this->expiryTimestamp = absint($cookie[1]);
-            $this->expiryTimestampReset = absint($cookie[2]);
-            if (time() > $this->expiryTimestampReset) {
+        $cookieId = filter_input( INPUT_COOKIE, static::SESSION_COOKIE );
+        if( false !== strpos( $cookieId, static::DELIMITER ) ) {
+            $cookie = explode( static::DELIMITER, stripslashes( $cookieId ) );
+            $this->sessionId = preg_replace( '/[^A-Za-z0-9_]/', '', $cookie[0] );
+            $this->expiryTimestamp = absint( $cookie[1] );
+            $this->expiryTimestampReset = absint( $cookie[2] );
+            if( time() > $this->expiryTimestampReset ) {
                 $this->setCookieExpiration();
             }
         } else {
@@ -59,7 +59,7 @@ 
     public function clear()
     {
         $this->setCookieExpiration();
-        $this->regenerateSessionId('and delete session!');
+        $this->regenerateSessionId( 'and delete session!' );
     }
 
     /**
@@ -67,17 +67,17 @@ 
      */
     public function deleteAllSessions()
     {
-        return glsr(SqlQueries::class)->deleteAllSessions(static::SESSION_COOKIE);
+        return glsr( SqlQueries::class )->deleteAllSessions( static::SESSION_COOKIE );
     }
 
     /**
      * @param int $limit
      * @return void
      */
-    public function deleteExpiredSessions($limit = 1000)
+    public function deleteExpiredSessions( $limit = 1000 )
     {
-        if ($expiredSessions = implode("','", $this->getExpiredSessions($limit))) {
-            glsr(SqlQueries::class)->deleteExpiredSessions($expiredSessions);
+        if( $expiredSessions = implode( "','", $this->getExpiredSessions( $limit ) ) ) {
+            glsr( SqlQueries::class )->deleteExpiredSessions( $expiredSessions );
         }
     }
 
@@ -87,13 +87,13 @@ 
      * @param bool|string $unset
      * @return string|array
      */
-    public function get($key, $fallback = '', $unset = false)
+    public function get( $key, $fallback = '', $unset = false )
     {
-        $key = sanitize_key($key);
+        $key = sanitize_key( $key );
         $value = isset($this->sessionData[$key])
-            ? maybe_unserialize($this->sessionData[$key])
+            ? maybe_unserialize( $this->sessionData[$key] )
             : $fallback;
-        if (isset($this->sessionData[$key]) && $unset) {
+        if( isset($this->sessionData[$key]) && $unset ) {
             unset($this->sessionData[$key]);
             $this->updateSession();
         }
@@ -105,10 +105,10 @@ 
      * @param mixed $value
      * @return mixed
      */
-    public function set($key, $value)
+    public function set( $key, $value )
     {
-        $key = sanitize_key($key);
-        $this->sessionData[$key] = maybe_serialize($value);
+        $key = sanitize_key( $key );
+        $this->sessionData[$key] = maybe_serialize( $value );
         $this->updateSession();
         return $this->sessionData[$key];
     }
@@ -118,8 +118,8 @@ 
      */
     protected function createSession()
     {
-        add_option($this->getSessionId(), $this->sessionData, '', false);
-        add_option($this->getSessionId('expires'), $this->expiryTimestamp, '', false);
+        add_option( $this->getSessionId(), $this->sessionData, '', false );
+        add_option( $this->getSessionId( 'expires' ), $this->expiryTimestamp, '', false );
     }
 
     /**
@@ -127,8 +127,8 @@ 
      */
     protected function deleteSession()
     {
-        delete_option($this->getSessionId());
-        delete_option($this->getSessionId('expires'));
+        delete_option( $this->getSessionId() );
+        delete_option( $this->getSessionId( 'expires' ) );
     }
 
     /**
@@ -136,25 +136,25 @@ 
      */
     protected function generateSessionId()
     {
-        return md5((new PasswordHash(8, false))->get_random_bytes(32));
+        return md5( (new PasswordHash( 8, false ))->get_random_bytes( 32 ) );
     }
 
     /**
      * @param int $limit
      * @return array
      */
-    protected function getExpiredSessions($limit)
+    protected function getExpiredSessions( $limit )
     {
         $expiredSessions = [];
-        $sessions = glsr(SqlQueries::class)->getExpiredSessions(static::SESSION_COOKIE, absint($limit));
-        if (!empty($sessions)) {
+        $sessions = glsr( SqlQueries::class )->getExpiredSessions( static::SESSION_COOKIE, absint( $limit ) );
+        if( !empty($sessions) ) {
             $now = time();
-            foreach ($sessions as $session) {
-                if ($now <= $session->expiration) {
+            foreach( $sessions as $session ) {
+                if( $now <= $session->expiration ) {
                     continue;
                 }
                 $expiredSessions[] = $session->name;
-                $expiredSessions[] = str_replace('_expires_', '_', $session->name);
+                $expiredSessions[] = str_replace( '_expires_', '_', $session->name );
             }
         }
         return $expiredSessions;
@@ -164,9 +164,9 @@ 
      * @param string $separator
      * @return string
      */
-    protected function getSessionId($separator = '')
+    protected function getSessionId( $separator = '' )
     {
-        return implode('_', array_filter([static::SESSION_COOKIE, $separator, $this->sessionId]));
+        return implode( '_', array_filter( [static::SESSION_COOKIE, $separator, $this->sessionId] ) );
     }
 
     /**
@@ -174,16 +174,16 @@ 
      */
     protected function getSessionData()
     {
-        return $this->sessionData = (array) get_option($this->getSessionId(), []);
+        return $this->sessionData = (array)get_option( $this->getSessionId(), [] );
     }
 
     /**
      * @param bool|string $deleteOld
      * @return void
      */
-    protected function regenerateSessionId($deleteOld = false)
+    protected function regenerateSessionId( $deleteOld = false )
     {
-        if ($deleteOld) {
+        if( $deleteOld ) {
             $this->deleteSession();
         }
         $this->sessionId = $this->generateSessionId();
@@ -195,12 +195,12 @@ 
      */
     protected function setCookie()
     {
-        if (headers_sent()) {
+        if( headers_sent() ) {
             return;
         }
         $cookie = $this->sessionId.static::DELIMITER.$this->expiryTimestamp.static::DELIMITER.$this->expiryTimestampReset;
-        $cookiePath = preg_replace('|https?://[^/]+|i', '', trailingslashit((string) get_option('home')));
-        setcookie(static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath);
+        $cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' ) ) );
+        setcookie( static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath );
     }
 
     /**
@@ -217,9 +217,9 @@ 
      */
     protected function updateSession()
     {
-        if (false === get_option($this->getSessionId())) {
+        if( false === get_option( $this->getSessionId() ) ) {
             return $this->createSession();
         }
-        update_option($this->getSessionId(), $this->sessionData, false);
+        update_option( $this->getSessionId(), $this->sessionData, false );
     }
 }

plugin/Modules/Translation.php

Indentation +250 added lines, -250 removed lines

@@ -10,272 +10,272 @@
 
 class Translation
 {
-    const SEARCH_THRESHOLD = 3;
+	const SEARCH_THRESHOLD = 3;
 
-    /**
-     * @var array
-     */
-    protected $entries;
+	/**
+	 * @var array
+	 */
+	protected $entries;
 
-    /**
-     * @var array
-     */
-    protected $results;
+	/**
+	 * @var array
+	 */
+	protected $results;
 
-    /**
-     * Returns all saved custom translations with translation context.
-     * @return array
-     */
-    public function all()
-    {
-        $translations = $this->translations();
-        $entries = $this->filter($translations, $this->entries())->results();
-        array_walk($translations, function (&$entry) use ($entries) {
-            $entry['desc'] = array_key_exists($entry['id'], $entries)
-                ? $this->getEntryString($entries[$entry['id']], 'msgctxt')
-                : '';
-        });
-        return $translations;
-    }
+	/**
+	 * Returns all saved custom translations with translation context.
+	 * @return array
+	 */
+	public function all()
+	{
+		$translations = $this->translations();
+		$entries = $this->filter($translations, $this->entries())->results();
+		array_walk($translations, function (&$entry) use ($entries) {
+			$entry['desc'] = array_key_exists($entry['id'], $entries)
+				? $this->getEntryString($entries[$entry['id']], 'msgctxt')
+				: '';
+		});
+		return $translations;
+	}
 
-    /**
-     * @return array
-     */
-    public function entries()
-    {
-        if (!isset($this->entries)) {
-            $potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
-            $entries = $this->extractEntriesFromPotFile($potFile);
-            $entries = apply_filters('site-reviews/translation/entries', $entries);
-            $this->entries = $entries;
-        }
-        return $this->entries;
-    }
+	/**
+	 * @return array
+	 */
+	public function entries()
+	{
+		if (!isset($this->entries)) {
+			$potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
+			$entries = $this->extractEntriesFromPotFile($potFile);
+			$entries = apply_filters('site-reviews/translation/entries', $entries);
+			$this->entries = $entries;
+		}
+		return $this->entries;
+	}
 
-    /**
-     * @param array|null $entriesToExclude
-     * @param array|null $entries
-     * @return static
-     */
-    public function exclude($entriesToExclude = null, $entries = null)
-    {
-        return $this->filter($entriesToExclude, $entries, false);
-    }
+	/**
+	 * @param array|null $entriesToExclude
+	 * @param array|null $entries
+	 * @return static
+	 */
+	public function exclude($entriesToExclude = null, $entries = null)
+	{
+		return $this->filter($entriesToExclude, $entries, false);
+	}
 
-    /**
-     * @param string $potFile
-     * @return array
-     */
-    public function extractEntriesFromPotFile($potFile, array $entries = [])
-    {
-        try {
-            $potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
-            foreach ($potEntries as $key => $entry) {
-                $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
-            }
-        } catch (Exception $e) {
-            glsr_log()->error($e->getMessage());
-        }
-        return $entries;
-    }
+	/**
+	 * @param string $potFile
+	 * @return array
+	 */
+	public function extractEntriesFromPotFile($potFile, array $entries = [])
+	{
+		try {
+			$potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
+			foreach ($potEntries as $key => $entry) {
+				$entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
+			}
+		} catch (Exception $e) {
+			glsr_log()->error($e->getMessage());
+		}
+		return $entries;
+	}
 
-    /**
-     * @param array|null $filterWith
-     * @param array|null $entries
-     * @param bool $intersect
-     * @return static
-     */
-    public function filter($filterWith = null, $entries = null, $intersect = true)
-    {
-        if (!is_array($entries)) {
-            $entries = $this->results;
-        }
-        if (!is_array($filterWith)) {
-            $filterWith = $this->translations();
-        }
-        $keys = array_flip(glsr_array_column($filterWith, 'id'));
-        $this->results = $intersect
-            ? array_intersect_key($entries, $keys)
-            : array_diff_key($entries, $keys);
-        return $this;
-    }
+	/**
+	 * @param array|null $filterWith
+	 * @param array|null $entries
+	 * @param bool $intersect
+	 * @return static
+	 */
+	public function filter($filterWith = null, $entries = null, $intersect = true)
+	{
+		if (!is_array($entries)) {
+			$entries = $this->results;
+		}
+		if (!is_array($filterWith)) {
+			$filterWith = $this->translations();
+		}
+		$keys = array_flip(glsr_array_column($filterWith, 'id'));
+		$this->results = $intersect
+			? array_intersect_key($entries, $keys)
+			: array_diff_key($entries, $keys);
+		return $this;
+	}
 
-    /**
-     * @param string $template
-     * @return string
-     */
-    public function render($template, array $entry)
-    {
-        $data = array_combine(
-            array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
-            $entry
-        );
-        $data['data.class'] = $data['data.error'] = '';
-        if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
-            $data['data.class'] = 'is-invalid';
-            $data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
-        }
-        return glsr(Template::class)->build('partials/translations/'.$template, [
-            'context' => $data,
-        ]);
-    }
+	/**
+	 * @param string $template
+	 * @return string
+	 */
+	public function render($template, array $entry)
+	{
+		$data = array_combine(
+			array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
+			$entry
+		);
+		$data['data.class'] = $data['data.error'] = '';
+		if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
+			$data['data.class'] = 'is-invalid';
+			$data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
+		}
+		return glsr(Template::class)->build('partials/translations/'.$template, [
+			'context' => $data,
+		]);
+	}
 
-    /**
-     * Returns a rendered string of all saved custom translations with translation context.
-     * @return string
-     */
-    public function renderAll()
-    {
-        $rendered = '';
-        foreach ($this->all() as $index => $entry) {
-            $entry['index'] = $index;
-            $entry['prefix'] = OptionManager::databaseKey();
-            $rendered.= $this->render($entry['type'], $entry);
-        }
-        return $rendered;
-    }
+	/**
+	 * Returns a rendered string of all saved custom translations with translation context.
+	 * @return string
+	 */
+	public function renderAll()
+	{
+		$rendered = '';
+		foreach ($this->all() as $index => $entry) {
+			$entry['index'] = $index;
+			$entry['prefix'] = OptionManager::databaseKey();
+			$rendered.= $this->render($entry['type'], $entry);
+		}
+		return $rendered;
+	}
 
-    /**
-     * @param bool $resetAfterRender
-     * @return string
-     */
-    public function renderResults($resetAfterRender = true)
-    {
-        $rendered = '';
-        foreach ($this->results as $id => $entry) {
-            $data = [
-                'desc' => $this->getEntryString($entry, 'msgctxt'),
-                'id' => $id,
-                'p1' => $this->getEntryString($entry, 'msgid_plural'),
-                's1' => $this->getEntryString($entry, 'msgid'),
-            ];
-            $text = !empty($data['p1'])
-                ? sprintf('%s | %s', $data['s1'], $data['p1'])
-                : $data['s1'];
-            $rendered.= $this->render('result', [
-                'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
-                'text' => wp_strip_all_tags($text),
-            ]);
-        }
-        if ($resetAfterRender) {
-            $this->reset();
-        }
-        return $rendered;
-    }
+	/**
+	 * @param bool $resetAfterRender
+	 * @return string
+	 */
+	public function renderResults($resetAfterRender = true)
+	{
+		$rendered = '';
+		foreach ($this->results as $id => $entry) {
+			$data = [
+				'desc' => $this->getEntryString($entry, 'msgctxt'),
+				'id' => $id,
+				'p1' => $this->getEntryString($entry, 'msgid_plural'),
+				's1' => $this->getEntryString($entry, 'msgid'),
+			];
+			$text = !empty($data['p1'])
+				? sprintf('%s | %s', $data['s1'], $data['p1'])
+				: $data['s1'];
+			$rendered.= $this->render('result', [
+				'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
+				'text' => wp_strip_all_tags($text),
+			]);
+		}
+		if ($resetAfterRender) {
+			$this->reset();
+		}
+		return $rendered;
+	}
 
-    /**
-     * @return void
-     */
-    public function reset()
-    {
-        $this->results = [];
-    }
+	/**
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->results = [];
+	}
 
-    /**
-     * @return array
-     */
-    public function results()
-    {
-        $results = $this->results;
-        $this->reset();
-        return $results;
-    }
+	/**
+	 * @return array
+	 */
+	public function results()
+	{
+		$results = $this->results;
+		$this->reset();
+		return $results;
+	}
 
-    /**
-     * @param string $needle
-     * @return static
-     */
-    public function search($needle = '')
-    {
-        $this->reset();
-        $needle = trim(strtolower($needle));
-        foreach ($this->entries() as $key => $entry) {
-            $single = strtolower($this->getEntryString($entry, 'msgid'));
-            $plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
-            if (strlen($needle) < static::SEARCH_THRESHOLD) {
-                if (in_array($needle, [$single, $plural])) {
-                    $this->results[$key] = $entry;
-                }
-            } elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
-                $this->results[$key] = $entry;
-            }
-        }
-        return $this;
-    }
+	/**
+	 * @param string $needle
+	 * @return static
+	 */
+	public function search($needle = '')
+	{
+		$this->reset();
+		$needle = trim(strtolower($needle));
+		foreach ($this->entries() as $key => $entry) {
+			$single = strtolower($this->getEntryString($entry, 'msgid'));
+			$plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
+			if (strlen($needle) < static::SEARCH_THRESHOLD) {
+				if (in_array($needle, [$single, $plural])) {
+					$this->results[$key] = $entry;
+				}
+			} elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
+				$this->results[$key] = $entry;
+			}
+		}
+		return $this;
+	}
 
-    /**
-     * Store the translations to avoid unnecessary loops.
-     * @return array
-     */
-    public function translations()
-    {
-        static $translations;
-        if (empty($translations)) {
-            $settings = glsr(OptionManager::class)->get('settings');
-            $translations = isset($settings['strings'])
-                ? $this->normalizeSettings((array) $settings['strings'])
-                : [];
-        }
-        return $translations;
-    }
+	/**
+	 * Store the translations to avoid unnecessary loops.
+	 * @return array
+	 */
+	public function translations()
+	{
+		static $translations;
+		if (empty($translations)) {
+			$settings = glsr(OptionManager::class)->get('settings');
+			$translations = isset($settings['strings'])
+				? $this->normalizeSettings((array) $settings['strings'])
+				: [];
+		}
+		return $translations;
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getEntryString(array $entry, $key)
-    {
-        return isset($entry[$key])
-            ? implode('', (array) $entry[$key])
-            : '';
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getEntryString(array $entry, $key)
+	{
+		return isset($entry[$key])
+			? implode('', (array) $entry[$key])
+			: '';
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $entries)
-    {
-        $keys = [
-            'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
-        ];
-        array_walk($entries, function (&$entry) use ($keys) {
-            foreach ($keys as $key) {
-                try {
-                    $entry = $this->normalizeEntryString($entry, $key);
-                } catch (\TypeError $error) {
-                    glsr_log()->once('error', 'Translation/normalize', $error);
-                    glsr_log()->once('debug', 'Translation/normalize', $entry);
-                }
-            }
-        });
-        return $entries;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $entries)
+	{
+		$keys = [
+			'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
+		];
+		array_walk($entries, function (&$entry) use ($keys) {
+			foreach ($keys as $key) {
+				try {
+					$entry = $this->normalizeEntryString($entry, $key);
+				} catch (\TypeError $error) {
+					glsr_log()->once('error', 'Translation/normalize', $error);
+					glsr_log()->once('debug', 'Translation/normalize', $entry);
+				}
+			}
+		});
+		return $entries;
+	}
 
-    /**
-     * @param string $key
-     * @return array
-     */
-    protected function normalizeEntryString(array $entry, $key)
-    {
-        if (isset($entry[$key])) {
-            $entry[$key] = $this->getEntryString($entry, $key);
-        }
-        return $entry;
-    }
+	/**
+	 * @param string $key
+	 * @return array
+	 */
+	protected function normalizeEntryString(array $entry, $key)
+	{
+		if (isset($entry[$key])) {
+			$entry[$key] = $this->getEntryString($entry, $key);
+		}
+		return $entry;
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeSettings(array $strings)
-    {
-        $defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
-        $strings = array_filter($strings, 'is_array');
-        foreach ($strings as &$string) {
-            $string['type'] = isset($string['p1']) ? 'plural' : 'single';
-            $string = wp_parse_args($string, $defaultString);
-        }
-        return array_filter($strings, function ($string) {
-            return !empty($string['id']);
-        });
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeSettings(array $strings)
+	{
+		$defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
+		$strings = array_filter($strings, 'is_array');
+		foreach ($strings as &$string) {
+			$string['type'] = isset($string['p1']) ? 'plural' : 'single';
+			$string = wp_parse_args($string, $defaultString);
+		}
+		return array_filter($strings, function ($string) {
+			return !empty($string['id']);
+		});
+	}
 }

Spacing +70 added lines, -70 removed lines

@@ -29,10 +29,10 @@ 
     public function all()
     {
         $translations = $this->translations();
-        $entries = $this->filter($translations, $this->entries())->results();
-        array_walk($translations, function (&$entry) use ($entries) {
-            $entry['desc'] = array_key_exists($entry['id'], $entries)
-                ? $this->getEntryString($entries[$entry['id']], 'msgctxt')
+        $entries = $this->filter( $translations, $this->entries() )->results();
+        array_walk( $translations, function( &$entry ) use ($entries) {
+            $entry['desc'] = array_key_exists( $entry['id'], $entries )
+                ? $this->getEntryString( $entries[$entry['id']], 'msgctxt' )
                 : '';
         });
         return $translations;
@@ -43,10 +43,10 @@ 
      */
     public function entries()
     {
-        if (!isset($this->entries)) {
-            $potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
-            $entries = $this->extractEntriesFromPotFile($potFile);
-            $entries = apply_filters('site-reviews/translation/entries', $entries);
+        if( !isset($this->entries) ) {
+            $potFile = glsr()->path( glsr()->languages.'/'.Application::ID.'.pot' );
+            $entries = $this->extractEntriesFromPotFile( $potFile );
+            $entries = apply_filters( 'site-reviews/translation/entries', $entries );
             $this->entries = $entries;
         }
         return $this->entries;
@@ -57,24 +57,24 @@ 
      * @param array|null $entries
      * @return static
      */
-    public function exclude($entriesToExclude = null, $entries = null)
+    public function exclude( $entriesToExclude = null, $entries = null )
     {
-        return $this->filter($entriesToExclude, $entries, false);
+        return $this->filter( $entriesToExclude, $entries, false );
     }
 
     /**
      * @param string $potFile
      * @return array
      */
-    public function extractEntriesFromPotFile($potFile, array $entries = [])
+    public function extractEntriesFromPotFile( $potFile, array $entries = [] )
     {
         try {
-            $potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
-            foreach ($potEntries as $key => $entry) {
-                $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
+            $potEntries = $this->normalize( Parser::parseFile( $potFile )->getEntries() );
+            foreach( $potEntries as $key => $entry ) {
+                $entries[html_entity_decode( $key, ENT_COMPAT, 'UTF-8' )] = $entry;
             }
-        } catch (Exception $e) {
-            glsr_log()->error($e->getMessage());
+        } catch( Exception $e ) {
+            glsr_log()->error( $e->getMessage() );
         }
         return $entries;
     }
@@ -85,18 +85,18 @@ 
      * @param bool $intersect
      * @return static
      */
-    public function filter($filterWith = null, $entries = null, $intersect = true)
+    public function filter( $filterWith = null, $entries = null, $intersect = true )
     {
-        if (!is_array($entries)) {
+        if( !is_array( $entries ) ) {
             $entries = $this->results;
         }
-        if (!is_array($filterWith)) {
+        if( !is_array( $filterWith ) ) {
             $filterWith = $this->translations();
         }
-        $keys = array_flip(glsr_array_column($filterWith, 'id'));
+        $keys = array_flip( glsr_array_column( $filterWith, 'id' ) );
         $this->results = $intersect
-            ? array_intersect_key($entries, $keys)
-            : array_diff_key($entries, $keys);
+            ? array_intersect_key( $entries, $keys )
+            : array_diff_key( $entries, $keys );
         return $this;
     }
 
@@ -104,20 +104,20 @@ 
      * @param string $template
      * @return string
      */
-    public function render($template, array $entry)
+    public function render( $template, array $entry )
     {
         $data = array_combine(
-            array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
+            array_map( function( $key ) { return 'data.'.$key; }, array_keys( $entry ) ),
             $entry
         );
         $data['data.class'] = $data['data.error'] = '';
-        if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
+        if( false === array_search( $entry['s1'], glsr_array_column( $this->entries(), 'msgid' ) ) ) {
             $data['data.class'] = 'is-invalid';
-            $data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
+            $data['data.error'] = __( 'This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews' );
         }
-        return glsr(Template::class)->build('partials/translations/'.$template, [
+        return glsr( Template::class )->build( 'partials/translations/'.$template, [
             'context' => $data,
-        ]);
+        ] );
     }
 
     /**
@@ -127,10 +127,10 @@ 
     public function renderAll()
     {
         $rendered = '';
-        foreach ($this->all() as $index => $entry) {
+        foreach( $this->all() as $index => $entry ) {
             $entry['index'] = $index;
             $entry['prefix'] = OptionManager::databaseKey();
-            $rendered.= $this->render($entry['type'], $entry);
+            $rendered .= $this->render( $entry['type'], $entry );
         }
         return $rendered;
     }
@@ -139,25 +139,25 @@ 
      * @param bool $resetAfterRender
      * @return string
      */
-    public function renderResults($resetAfterRender = true)
+    public function renderResults( $resetAfterRender = true )
     {
         $rendered = '';
-        foreach ($this->results as $id => $entry) {
+        foreach( $this->results as $id => $entry ) {
             $data = [
-                'desc' => $this->getEntryString($entry, 'msgctxt'),
+                'desc' => $this->getEntryString( $entry, 'msgctxt' ),
                 'id' => $id,
-                'p1' => $this->getEntryString($entry, 'msgid_plural'),
-                's1' => $this->getEntryString($entry, 'msgid'),
+                'p1' => $this->getEntryString( $entry, 'msgid_plural' ),
+                's1' => $this->getEntryString( $entry, 'msgid' ),
             ];
             $text = !empty($data['p1'])
-                ? sprintf('%s | %s', $data['s1'], $data['p1'])
+                ? sprintf( '%s | %s', $data['s1'], $data['p1'] )
                 : $data['s1'];
-            $rendered.= $this->render('result', [
-                'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
-                'text' => wp_strip_all_tags($text),
-            ]);
+            $rendered .= $this->render( 'result', [
+                'entry' => json_encode( $data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ),
+                'text' => wp_strip_all_tags( $text ),
+            ] );
         }
-        if ($resetAfterRender) {
+        if( $resetAfterRender ) {
             $this->reset();
         }
         return $rendered;
@@ -185,18 +185,18 @@ 
      * @param string $needle
      * @return static
      */
-    public function search($needle = '')
+    public function search( $needle = '' )
     {
         $this->reset();
-        $needle = trim(strtolower($needle));
-        foreach ($this->entries() as $key => $entry) {
-            $single = strtolower($this->getEntryString($entry, 'msgid'));
-            $plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
-            if (strlen($needle) < static::SEARCH_THRESHOLD) {
-                if (in_array($needle, [$single, $plural])) {
+        $needle = trim( strtolower( $needle ) );
+        foreach( $this->entries() as $key => $entry ) {
+            $single = strtolower( $this->getEntryString( $entry, 'msgid' ) );
+            $plural = strtolower( $this->getEntryString( $entry, 'msgid_plural' ) );
+            if( strlen( $needle ) < static::SEARCH_THRESHOLD ) {
+                if( in_array( $needle, [$single, $plural] ) ) {
                     $this->results[$key] = $entry;
                 }
-            } elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
+            } elseif( false !== strpos( sprintf( '%s %s', $single, $plural ), $needle ) ) {
                 $this->results[$key] = $entry;
             }
         }
@@ -210,10 +210,10 @@ 
     public function translations()
     {
         static $translations;
-        if (empty($translations)) {
-            $settings = glsr(OptionManager::class)->get('settings');
+        if( empty($translations) ) {
+            $settings = glsr( OptionManager::class )->get( 'settings' );
             $translations = isset($settings['strings'])
-                ? $this->normalizeSettings((array) $settings['strings'])
+                ? $this->normalizeSettings( (array)$settings['strings'] )
                 : [];
         }
         return $translations;
@@ -223,28 +223,28 @@ 
      * @param string $key
      * @return string
      */
-    protected function getEntryString(array $entry, $key)
+    protected function getEntryString( array $entry, $key )
     {
         return isset($entry[$key])
-            ? implode('', (array) $entry[$key])
+            ? implode( '', (array)$entry[$key] )
             : '';
     }
 
     /**
      * @return array
      */
-    protected function normalize(array $entries)
+    protected function normalize( array $entries )
     {
         $keys = [
             'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
         ];
-        array_walk($entries, function (&$entry) use ($keys) {
-            foreach ($keys as $key) {
+        array_walk( $entries, function( &$entry ) use ($keys) {
+            foreach( $keys as $key ) {
                 try {
-                    $entry = $this->normalizeEntryString($entry, $key);
-                } catch (\TypeError $error) {
-                    glsr_log()->once('error', 'Translation/normalize', $error);
-                    glsr_log()->once('debug', 'Translation/normalize', $entry);
+                    $entry = $this->normalizeEntryString( $entry, $key );
+                } catch( \TypeError $error ) {
+                    glsr_log()->once( 'error', 'Translation/normalize', $error );
+                    glsr_log()->once( 'debug', 'Translation/normalize', $entry );
                 }
             }
         });
@@ -255,10 +255,10 @@ 
      * @param string $key
      * @return array
      */
-    protected function normalizeEntryString(array $entry, $key)
+    protected function normalizeEntryString( array $entry, $key )
     {
-        if (isset($entry[$key])) {
-            $entry[$key] = $this->getEntryString($entry, $key);
+        if( isset($entry[$key]) ) {
+            $entry[$key] = $this->getEntryString( $entry, $key );
         }
         return $entry;
     }
@@ -266,15 +266,15 @@ 
     /**
      * @return array
      */
-    protected function normalizeSettings(array $strings)
+    protected function normalizeSettings( array $strings )
     {
-        $defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
-        $strings = array_filter($strings, 'is_array');
-        foreach ($strings as &$string) {
+        $defaultString = array_fill_keys( ['id', 's1', 's2', 'p1', 'p2'], '' );
+        $strings = array_filter( $strings, 'is_array' );
+        foreach( $strings as &$string ) {
             $string['type'] = isset($string['p1']) ? 'plural' : 'single';
-            $string = wp_parse_args($string, $defaultString);
+            $string = wp_parse_args( $string, $defaultString );
         }
-        return array_filter($strings, function ($string) {
+        return array_filter( $strings, function( $string ) {
             return !empty($string['id']);
         });
     }