pryley / site-reviews

plugin/Modules/Html/Partial.php

Indentation +26 added lines, -26 removed lines

@@ -6,31 +6,31 @@
 
 class Partial
 {
-    /**
-     * @param string $partialPath
-     * @return string
-     */
-    public function build($partialPath, array $args = [])
-    {
-        $className = Helper::buildClassName($partialPath, 'Modules\Html\Partials');
-        $className = apply_filters('site-reviews/partial/classname', $className, $partialPath);
-        if (!class_exists($className)) {
-            glsr_log()->error('Partial missing: '.$className);
-            return;
-        }
-        $args = apply_filters('site-reviews/partial/args/'.$partialPath, $args);
-        $partial = glsr($className)->build($args);
-        $partial = apply_filters('site-reviews/rendered/partial', $partial, $partialPath, $args);
-        $partial = apply_filters('site-reviews/rendered/partial/'.$partialPath, $partial, $args);
-        return $partial;
-    }
+	/**
+	 * @param string $partialPath
+	 * @return string
+	 */
+	public function build($partialPath, array $args = [])
+	{
+		$className = Helper::buildClassName($partialPath, 'Modules\Html\Partials');
+		$className = apply_filters('site-reviews/partial/classname', $className, $partialPath);
+		if (!class_exists($className)) {
+			glsr_log()->error('Partial missing: '.$className);
+			return;
+		}
+		$args = apply_filters('site-reviews/partial/args/'.$partialPath, $args);
+		$partial = glsr($className)->build($args);
+		$partial = apply_filters('site-reviews/rendered/partial', $partial, $partialPath, $args);
+		$partial = apply_filters('site-reviews/rendered/partial/'.$partialPath, $partial, $args);
+		return $partial;
+	}
 
-    /**
-     * @param string $partialPath
-     * @return void
-     */
-    public function render($partialPath, array $args = [])
-    {
-        echo $this->build($partialPath, $args);
-    }
+	/**
+	 * @param string $partialPath
+	 * @return void
+	 */
+	public function render($partialPath, array $args = [])
+	{
+		echo $this->build($partialPath, $args);
+	}
 }

plugin/Modules/Html/ReviewsHtml.php

Indentation +122 added lines, -122 removed lines

@@ -8,137 +8,137 @@
 
 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 $renderedReviews, $maxPageCount, array $args)
-    {
-        $this->args = $args;
-        $this->max_num_pages = $maxPageCount;
-        $this->reviews = $renderedReviews;
-        $this->pagination = $this->buildPagination();
-        parent::__construct($renderedReviews, ArrayObject::STD_PROP_LIST | ArrayObject::ARRAY_AS_PROPS);
-    }
+	public function __construct(array $renderedReviews, $maxPageCount, array $args)
+	{
+		$this->args = $args;
+		$this->max_num_pages = $maxPageCount;
+		$this->reviews = $renderedReviews;
+		$this->pagination = $this->buildPagination();
+		parent::__construct($renderedReviews, 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);
-        return glsr(Builder::class)->div($html, [
-            'class' => 'glsr-reviews-list',
-            'data-reviews' => '',
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	public function getReviews()
+	{
+		$html = empty($this->reviews)
+			? $this->getReviewsFallback()
+			: implode(PHP_EOL, $this->reviews);
+		return glsr(Builder::class)->div($html, [
+			'class' => 'glsr-reviews-list',
+			'data-reviews' => '',
+		]);
+	}
 
-    /**
-     * @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 (array_key_exists($key, $this->reviews)) {
-            return $this->reviews[$key];
-        }
-        return property_exists($this, $key)
-            ? $this->$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 (array_key_exists($key, $this->reviews)) {
+			return $this->reviews[$key];
+		}
+		return property_exists($this, $key)
+			? $this->$key
+			: null;
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildPagination()
-    {
-        $html = glsr(Partial::class)->build('pagination', [
-            'baseUrl' => Arr::get($this->args, 'pagedUrl'),
-            'current' => Arr::get($this->args, 'paged'),
-            'total' => $this->max_num_pages,
-        ]);
-        return glsr(Builder::class)->div($html, [
-            'class' => 'glsr-pagination',
-            'data-atts' => $this->args['json'],
-            'data-pagination' => '',
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildPagination()
+	{
+		$html = glsr(Partial::class)->build('pagination', [
+			'baseUrl' => Arr::get($this->args, 'pagedUrl'),
+			'current' => Arr::get($this->args, 'paged'),
+			'total' => $this->max_num_pages,
+		]);
+		return glsr(Builder::class)->div($html, [
+			'class' => 'glsr-pagination',
+			'data-atts' => $this->args['json'],
+			'data-pagination' => '',
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getClass()
-    {
-        $defaults = [
-            'glsr-reviews',
-        ];
-        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-reviews',
+		];
+		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);
+	}
 }

plugin/Modules/Html/Builder.php

Indentation +339 added lines, -339 removed lines

@@ -19,343 +19,343 @@
  */
 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 (array_key_exists($property, $properties) && !empty($value)) {
-            $this->$property = $value;
-        }
-    }
-
-    /**
-     * @return void|string
-     */
-    public function getClosingTag()
-    {
-        if (!empty($this->tag)) {
-            return '</'.$this->tag.'>';
-        }
-    }
-
-    /**
-     * @return void|string
-     */
-    public function getOpeningTag()
-    {
-        if (!empty($this->tag)) {
-            $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 class 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'] === (string) $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 = Helper::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)
-    {
-        $parameter1 = Arr::get($params, 0);
-        $parameter2 = Arr::get($params, 1);
-        if (is_string($parameter1) || is_numeric($parameter1)) {
-            $this->setNameOrTextAttributeForTag($parameter1);
-        }
-        if (is_array($parameter1)) {
-            $this->args += $parameter1;
-        } elseif (is_array($parameter2)) {
-            $this->args += $parameter2;
-        }
-        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 (array_key_exists($property, $properties) && !empty($value)) {
+			$this->$property = $value;
+		}
+	}
+
+	/**
+	 * @return void|string
+	 */
+	public function getClosingTag()
+	{
+		if (!empty($this->tag)) {
+			return '</'.$this->tag.'>';
+		}
+	}
+
+	/**
+	 * @return void|string
+	 */
+	public function getOpeningTag()
+	{
+		if (!empty($this->tag)) {
+			$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 class 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'] === (string) $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 = Helper::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)
+	{
+		$parameter1 = Arr::get($params, 0);
+		$parameter2 = Arr::get($params, 1);
+		if (is_string($parameter1) || is_numeric($parameter1)) {
+			$this->setNameOrTextAttributeForTag($parameter1);
+		}
+		if (is_array($parameter1)) {
+			$this->args += $parameter1;
+		} elseif (is_array($parameter2)) {
+			$this->args += $parameter2;
+		}
+		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';
+		}
+	}
 }

plugin/Modules/Html/Settings.php

Indentation +235 added lines, -235 removed lines

@@ -11,239 +11,239 @@
 
 class Settings
 {
-    /**
-     * @var array
-     */
-    public $settings;
-
-    /**
-     * @param string $id
-     * @return string
-     */
-    public function buildFields($id)
-    {
-        $this->settings = glsr(DefaultsManager::class)->settings();
-        $method = Helper::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 Arr::get($field, 'default');
-    }
-
-    /**
-     * @return string
-     */
-    protected function getFieldNameForDependsOn($path)
-    {
-        $fieldName = Str::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 Str::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 = Arr::convertFromDotNotation($fields);
-        $settingKeys = array_keys($settings['settings']['addons']);
-        $results = [];
-        foreach ($settingKeys as $key) {
-            $addonFields = array_filter($fields, function ($path) use ($key) {
-                return Str::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,
-            Arr::get(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 Str::prefix('settings.', rtrim($path, '.'));
-    }
+	/**
+	 * @var array
+	 */
+	public $settings;
+
+	/**
+	 * @param string $id
+	 * @return string
+	 */
+	public function buildFields($id)
+	{
+		$this->settings = glsr(DefaultsManager::class)->settings();
+		$method = Helper::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 Arr::get($field, 'default');
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getFieldNameForDependsOn($path)
+	{
+		$fieldName = Str::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 Str::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 = Arr::convertFromDotNotation($fields);
+		$settingKeys = array_keys($settings['settings']['addons']);
+		$results = [];
+		foreach ($settingKeys as $key) {
+			$addonFields = array_filter($fields, function ($path) use ($key) {
+				return Str::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,
+			Arr::get(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 Str::prefix('settings.', rtrim($path, '.'));
+	}
 }

plugin/Modules/Html/Attributes.php

Indentation +288 added lines, -288 removed lines

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

plugin/Modules/System.php

Indentation +352 added lines, -352 removed lines

@@ -13,378 +13,378 @@
 
 class System
 {
-    const PAD = 40;
+	const PAD = 40;
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->get();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->get();
+	}
 
-    /**
-     * @return string
-     */
-    public function get()
-    {
-        $details = [
-            'plugin' => 'Plugin Details',
-            'addon' => 'Addon Details',
-            'browser' => 'Browser Details',
-            'server' => 'Server Details',
-            'php' => 'PHP Configuration',
-            'wordpress' => 'WordPress Configuration',
-            'mu-plugin' => 'Must-Use Plugins',
-            'multisite-plugin' => 'Network Active Plugins',
-            'active-plugin' => 'Active Plugins',
-            'inactive-plugin' => 'Inactive Plugins',
-            'setting' => 'Plugin Settings',
-            'reviews' => 'Review Counts',
-        ];
-        $systemInfo = array_reduce(array_keys($details), function ($carry, $key) use ($details) {
-            $methodName = Helper::buildMethodName('get-'.$key.'-details');
-            if (method_exists($this, $methodName) && $systemDetails = $this->$methodName()) {
-                return $carry.$this->implode(
-                    strtoupper($details[$key]),
-                    apply_filters('site-reviews/system/'.$key, $systemDetails)
-                );
-            }
-            return $carry;
-        });
-        return trim($systemInfo);
-    }
+	/**
+	 * @return string
+	 */
+	public function get()
+	{
+		$details = [
+			'plugin' => 'Plugin Details',
+			'addon' => 'Addon Details',
+			'browser' => 'Browser Details',
+			'server' => 'Server Details',
+			'php' => 'PHP Configuration',
+			'wordpress' => 'WordPress Configuration',
+			'mu-plugin' => 'Must-Use Plugins',
+			'multisite-plugin' => 'Network Active Plugins',
+			'active-plugin' => 'Active Plugins',
+			'inactive-plugin' => 'Inactive Plugins',
+			'setting' => 'Plugin Settings',
+			'reviews' => 'Review Counts',
+		];
+		$systemInfo = array_reduce(array_keys($details), function ($carry, $key) use ($details) {
+			$methodName = Helper::buildMethodName('get-'.$key.'-details');
+			if (method_exists($this, $methodName) && $systemDetails = $this->$methodName()) {
+				return $carry.$this->implode(
+					strtoupper($details[$key]),
+					apply_filters('site-reviews/system/'.$key, $systemDetails)
+				);
+			}
+			return $carry;
+		});
+		return trim($systemInfo);
+	}
 
-    /**
-     * @return array
-     */
-    public function getActivePluginDetails()
-    {
-        $plugins = get_plugins();
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactive = array_diff_key($plugins, array_flip($activePlugins));
-        return $this->normalizePluginList(array_diff_key($plugins, $inactive));
-    }
+	/**
+	 * @return array
+	 */
+	public function getActivePluginDetails()
+	{
+		$plugins = get_plugins();
+		$activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
+		$inactive = array_diff_key($plugins, array_flip($activePlugins));
+		return $this->normalizePluginList(array_diff_key($plugins, $inactive));
+	}
 
-    /**
-     * @return array
-     */
-    public function getAddonDetails()
-    {
-        $details = apply_filters('site-reviews/addon/system-info', []);
-        ksort($details);
-        return $details;
-    }
+	/**
+	 * @return array
+	 */
+	public function getAddonDetails()
+	{
+		$details = apply_filters('site-reviews/addon/system-info', []);
+		ksort($details);
+		return $details;
+	}
 
-    /**
-     * @return array
-     */
-    public function getBrowserDetails()
-    {
-        $browser = new Browser();
-        $name = esc_attr($browser->getName());
-        $userAgent = esc_attr($browser->getUserAgent()->getUserAgentString());
-        $version = esc_attr($browser->getVersion());
-        return [
-            'Browser Name' => sprintf('%s %s', $name, $version),
-            'Browser UA' => $userAgent,
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getBrowserDetails()
+	{
+		$browser = new Browser();
+		$name = esc_attr($browser->getName());
+		$userAgent = esc_attr($browser->getUserAgent()->getUserAgentString());
+		$version = esc_attr($browser->getVersion());
+		return [
+			'Browser Name' => sprintf('%s %s', $name, $version),
+			'Browser UA' => $userAgent,
+		];
+	}
 
-    /**
-     * @return array
-     */
-    public function getInactivePluginDetails()
-    {
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactivePlugins = $this->normalizePluginList(array_diff_key(get_plugins(), array_flip($activePlugins)));
-        $multisitePlugins = $this->getMultisitePluginDetails();
-        return empty($multisitePlugins)
-            ? $inactivePlugins
-            : array_diff($inactivePlugins, $multisitePlugins);
-    }
+	/**
+	 * @return array
+	 */
+	public function getInactivePluginDetails()
+	{
+		$activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
+		$inactivePlugins = $this->normalizePluginList(array_diff_key(get_plugins(), array_flip($activePlugins)));
+		$multisitePlugins = $this->getMultisitePluginDetails();
+		return empty($multisitePlugins)
+			? $inactivePlugins
+			: array_diff($inactivePlugins, $multisitePlugins);
+	}
 
-    /**
-     * @return array
-     */
-    public function getMuPluginDetails()
-    {
-        if (empty($plugins = get_mu_plugins())) {
-            return [];
-        }
-        return $this->normalizePluginList($plugins);
-    }
+	/**
+	 * @return array
+	 */
+	public function getMuPluginDetails()
+	{
+		if (empty($plugins = get_mu_plugins())) {
+			return [];
+		}
+		return $this->normalizePluginList($plugins);
+	}
 
-    /**
-     * @return array
-     */
-    public function getMultisitePluginDetails()
-    {
-        $activePlugins = (array) get_site_option('active_sitewide_plugins', []);
-        if (!is_multisite() || empty($activePlugins)) {
-            return [];
-        }
-        return $this->normalizePluginList(array_intersect_key(get_plugins(), $activePlugins));
-    }
+	/**
+	 * @return array
+	 */
+	public function getMultisitePluginDetails()
+	{
+		$activePlugins = (array) get_site_option('active_sitewide_plugins', []);
+		if (!is_multisite() || empty($activePlugins)) {
+			return [];
+		}
+		return $this->normalizePluginList(array_intersect_key(get_plugins(), $activePlugins));
+	}
 
-    /**
-     * @return array
-     */
-    public function getPhpDetails()
-    {
-        $displayErrors = $this->getINI('display_errors', null)
-            ? 'On ('.$this->getINI('display_errors').')'
-            : 'N/A';
-        $intlSupport = extension_loaded('intl')
-            ? phpversion('intl')
-            : 'false';
-        return [
-            'cURL' => var_export(function_exists('curl_init'), true),
-            'Default Charset' => $this->getINI('default_charset'),
-            'Display Errors' => $displayErrors,
-            'fsockopen' => var_export(function_exists('fsockopen'), true),
-            'Intl' => $intlSupport,
-            'IPv6' => var_export(defined('AF_INET6'), true),
-            'Max Execution Time' => $this->getINI('max_execution_time'),
-            'Max Input Nesting Level' => $this->getINI('max_input_nesting_level'),
-            'Max Input Vars' => $this->getINI('max_input_vars'),
-            'Memory Limit' => $this->getINI('memory_limit'),
-            'Post Max Size' => $this->getINI('post_max_size'),
-            'Sendmail Path' => $this->getINI('sendmail_path'),
-            'Session Cookie Path' => esc_html($this->getINI('session.cookie_path')),
-            'Session Name' => esc_html($this->getINI('session.name')),
-            'Session Save Path' => esc_html($this->getINI('session.save_path')),
-            'Session Use Cookies' => var_export(wp_validate_boolean($this->getINI('session.use_cookies', false)), true),
-            'Session Use Only Cookies' => var_export(wp_validate_boolean($this->getINI('session.use_only_cookies', false)), true),
-            'Upload Max Filesize' => $this->getINI('upload_max_filesize'),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getPhpDetails()
+	{
+		$displayErrors = $this->getINI('display_errors', null)
+			? 'On ('.$this->getINI('display_errors').')'
+			: 'N/A';
+		$intlSupport = extension_loaded('intl')
+			? phpversion('intl')
+			: 'false';
+		return [
+			'cURL' => var_export(function_exists('curl_init'), true),
+			'Default Charset' => $this->getINI('default_charset'),
+			'Display Errors' => $displayErrors,
+			'fsockopen' => var_export(function_exists('fsockopen'), true),
+			'Intl' => $intlSupport,
+			'IPv6' => var_export(defined('AF_INET6'), true),
+			'Max Execution Time' => $this->getINI('max_execution_time'),
+			'Max Input Nesting Level' => $this->getINI('max_input_nesting_level'),
+			'Max Input Vars' => $this->getINI('max_input_vars'),
+			'Memory Limit' => $this->getINI('memory_limit'),
+			'Post Max Size' => $this->getINI('post_max_size'),
+			'Sendmail Path' => $this->getINI('sendmail_path'),
+			'Session Cookie Path' => esc_html($this->getINI('session.cookie_path')),
+			'Session Name' => esc_html($this->getINI('session.name')),
+			'Session Save Path' => esc_html($this->getINI('session.save_path')),
+			'Session Use Cookies' => var_export(wp_validate_boolean($this->getINI('session.use_cookies', false)), true),
+			'Session Use Only Cookies' => var_export(wp_validate_boolean($this->getINI('session.use_only_cookies', false)), true),
+			'Upload Max Filesize' => $this->getINI('upload_max_filesize'),
+		];
+	}
 
-    /**
-     * @return array
-     */
-    public function getReviewsDetails()
-    {
-        $counts = glsr(CountsManager::class)->getCounts();
-        $counts = Arr::flatten($counts);
-        array_walk($counts, function (&$ratings) use ($counts) {
-            if (is_array($ratings)) {
-                $ratings = array_sum($ratings).' ('.implode(', ', $ratings).')';
-                return;
-            }
-            glsr_log()
-                ->error('$ratings is not an array, possibly due to incorrectly imported reviews.')
-                ->debug($ratings)
-                ->debug($counts);
-        });
-        ksort($counts);
-        return $counts;
-    }
+	/**
+	 * @return array
+	 */
+	public function getReviewsDetails()
+	{
+		$counts = glsr(CountsManager::class)->getCounts();
+		$counts = Arr::flatten($counts);
+		array_walk($counts, function (&$ratings) use ($counts) {
+			if (is_array($ratings)) {
+				$ratings = array_sum($ratings).' ('.implode(', ', $ratings).')';
+				return;
+			}
+			glsr_log()
+				->error('$ratings is not an array, possibly due to incorrectly imported reviews.')
+				->debug($ratings)
+				->debug($counts);
+		});
+		ksort($counts);
+		return $counts;
+	}
 
-    /**
-     * @return array
-     */
-    public function getServerDetails()
-    {
-        global $wpdb;
-        return [
-            'Host Name' => $this->getHostName(),
-            'MySQL Version' => $wpdb->db_version(),
-            'PHP Version' => PHP_VERSION,
-            'Server Software' => filter_input(INPUT_SERVER, 'SERVER_SOFTWARE'),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getServerDetails()
+	{
+		global $wpdb;
+		return [
+			'Host Name' => $this->getHostName(),
+			'MySQL Version' => $wpdb->db_version(),
+			'PHP Version' => PHP_VERSION,
+			'Server Software' => filter_input(INPUT_SERVER, 'SERVER_SOFTWARE'),
+		];
+	}
 
-    /**
-     * @return array
-     */
-    public function getSettingDetails()
-    {
-        $settings = glsr(OptionManager::class)->get('settings', []);
-        $settings = Arr::flatten($settings, true);
-        $settings = $this->purgeSensitiveData($settings);
-        ksort($settings);
-        $details = [];
-        foreach ($settings as $key => $value) {
-            if (Str::startsWith('strings', $key) && Str::endsWith('id', $key)) {
-                continue;
-            }
-            $value = htmlspecialchars(trim(preg_replace('/\s\s+/', '\\n', $value)), ENT_QUOTES, 'UTF-8');
-            $details[$key] = $value;
-        }
-        return $details;
-    }
+	/**
+	 * @return array
+	 */
+	public function getSettingDetails()
+	{
+		$settings = glsr(OptionManager::class)->get('settings', []);
+		$settings = Arr::flatten($settings, true);
+		$settings = $this->purgeSensitiveData($settings);
+		ksort($settings);
+		$details = [];
+		foreach ($settings as $key => $value) {
+			if (Str::startsWith('strings', $key) && Str::endsWith('id', $key)) {
+				continue;
+			}
+			$value = htmlspecialchars(trim(preg_replace('/\s\s+/', '\\n', $value)), ENT_QUOTES, 'UTF-8');
+			$details[$key] = $value;
+		}
+		return $details;
+	}
 
-    /**
-     * @return array
-     */
-    public function getPluginDetails()
-    {
-        return [
-            'Console level' => glsr(Console::class)->humanLevel(),
-            'Console size' => glsr(Console::class)->humanSize('0'),
-            'Last Migration Run' => glsr(Date::class)->localized(glsr(OptionManager::class)->get('last_migration_run'), 'unknown'),
-            'Last Rating Count' => glsr(Date::class)->localized(glsr(OptionManager::class)->get('last_review_count'), 'unknown'),
-            'Version (current)' => glsr()->version,
-            'Version (previous)' => glsr(OptionManager::class)->get('version_upgraded_from'),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getPluginDetails()
+	{
+		return [
+			'Console level' => glsr(Console::class)->humanLevel(),
+			'Console size' => glsr(Console::class)->humanSize('0'),
+			'Last Migration Run' => glsr(Date::class)->localized(glsr(OptionManager::class)->get('last_migration_run'), 'unknown'),
+			'Last Rating Count' => glsr(Date::class)->localized(glsr(OptionManager::class)->get('last_review_count'), 'unknown'),
+			'Version (current)' => glsr()->version,
+			'Version (previous)' => glsr(OptionManager::class)->get('version_upgraded_from'),
+		];
+	}
 
-    /**
-     * @return array
-     */
-    public function getWordpressDetails()
-    {
-        global $wpdb;
-        $theme = wp_get_theme();
-        return [
-            'Active Theme' => sprintf('%s v%s', (string) $theme->Name, (string) $theme->Version),
-            'Email Domain' => substr(strrchr(glsr(OptionManager::class)->getWP('admin_email'), '@'), 1),
-            'Home URL' => home_url(),
-            'Language' => get_locale(),
-            'Memory Limit' => WP_MEMORY_LIMIT,
-            'Multisite' => var_export(is_multisite(), true),
-            'Page For Posts ID' => glsr(OptionManager::class)->getWP('page_for_posts'),
-            'Page On Front ID' => glsr(OptionManager::class)->getWP('page_on_front'),
-            'Permalink Structure' => glsr(OptionManager::class)->getWP('permalink_structure', 'default'),
-            'Post Stati' => implode(', ', get_post_stati()),
-            'Remote Post' => glsr(Cache::class)->getRemotePostTest(),
-            'Show On Front' => glsr(OptionManager::class)->getWP('show_on_front'),
-            'Site URL' => site_url(),
-            'Timezone' => glsr(OptionManager::class)->getWP('timezone_string', $this->getINI('date.timezone').' (PHP)'),
-            'Version' => get_bloginfo('version'),
-            'WP Debug' => var_export(defined('WP_DEBUG'), true),
-            'WP Max Upload Size' => size_format(wp_max_upload_size()),
-            'WP Memory Limit' => WP_MEMORY_LIMIT,
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getWordpressDetails()
+	{
+		global $wpdb;
+		$theme = wp_get_theme();
+		return [
+			'Active Theme' => sprintf('%s v%s', (string) $theme->Name, (string) $theme->Version),
+			'Email Domain' => substr(strrchr(glsr(OptionManager::class)->getWP('admin_email'), '@'), 1),
+			'Home URL' => home_url(),
+			'Language' => get_locale(),
+			'Memory Limit' => WP_MEMORY_LIMIT,
+			'Multisite' => var_export(is_multisite(), true),
+			'Page For Posts ID' => glsr(OptionManager::class)->getWP('page_for_posts'),
+			'Page On Front ID' => glsr(OptionManager::class)->getWP('page_on_front'),
+			'Permalink Structure' => glsr(OptionManager::class)->getWP('permalink_structure', 'default'),
+			'Post Stati' => implode(', ', get_post_stati()),
+			'Remote Post' => glsr(Cache::class)->getRemotePostTest(),
+			'Show On Front' => glsr(OptionManager::class)->getWP('show_on_front'),
+			'Site URL' => site_url(),
+			'Timezone' => glsr(OptionManager::class)->getWP('timezone_string', $this->getINI('date.timezone').' (PHP)'),
+			'Version' => get_bloginfo('version'),
+			'WP Debug' => var_export(defined('WP_DEBUG'), true),
+			'WP Max Upload Size' => size_format(wp_max_upload_size()),
+			'WP Memory Limit' => WP_MEMORY_LIMIT,
+		];
+	}
 
-    /**
-     * @return string
-     */
-    protected function detectWebhostProvider()
-    {
-        $checks = [
-            '.accountservergroup.com' => 'Site5',
-            '.gridserver.com' => 'MediaTemple Grid',
-            '.inmotionhosting.com' => 'InMotion Hosting',
-            '.ovh.net' => 'OVH',
-            '.pair.com' => 'pair Networks',
-            '.stabletransit.com' => 'Rackspace Cloud',
-            '.stratoserver.net' => 'STRATO',
-            '.sysfix.eu' => 'SysFix.eu Power Hosting',
-            'bluehost.com' => 'Bluehost',
-            'DH_USER' => 'DreamHost',
-            'Flywheel' => 'Flywheel',
-            'ipagemysql.com' => 'iPage',
-            'ipowermysql.com' => 'IPower',
-            'localhost:/tmp/mysql5.sock' => 'ICDSoft',
-            'mysqlv5' => 'NetworkSolutions',
-            'PAGELYBIN' => 'Pagely',
-            'secureserver.net' => 'GoDaddy',
-            'WPE_APIKEY' => 'WP Engine',
-        ];
-        foreach ($checks as $key => $value) {
-            if (!$this->isWebhostCheckValid($key)) {
-                continue;
-            }
-            return $value;
-        }
-        return implode(',', array_filter([DB_HOST, filter_input(INPUT_SERVER, 'SERVER_NAME')]));
-    }
+	/**
+	 * @return string
+	 */
+	protected function detectWebhostProvider()
+	{
+		$checks = [
+			'.accountservergroup.com' => 'Site5',
+			'.gridserver.com' => 'MediaTemple Grid',
+			'.inmotionhosting.com' => 'InMotion Hosting',
+			'.ovh.net' => 'OVH',
+			'.pair.com' => 'pair Networks',
+			'.stabletransit.com' => 'Rackspace Cloud',
+			'.stratoserver.net' => 'STRATO',
+			'.sysfix.eu' => 'SysFix.eu Power Hosting',
+			'bluehost.com' => 'Bluehost',
+			'DH_USER' => 'DreamHost',
+			'Flywheel' => 'Flywheel',
+			'ipagemysql.com' => 'iPage',
+			'ipowermysql.com' => 'IPower',
+			'localhost:/tmp/mysql5.sock' => 'ICDSoft',
+			'mysqlv5' => 'NetworkSolutions',
+			'PAGELYBIN' => 'Pagely',
+			'secureserver.net' => 'GoDaddy',
+			'WPE_APIKEY' => 'WP Engine',
+		];
+		foreach ($checks as $key => $value) {
+			if (!$this->isWebhostCheckValid($key)) {
+				continue;
+			}
+			return $value;
+		}
+		return implode(',', array_filter([DB_HOST, filter_input(INPUT_SERVER, 'SERVER_NAME')]));
+	}
 
-    /**
-     * @return string
-     */
-    protected function getHostName()
-    {
-        return sprintf('%s (%s)',
-            $this->detectWebhostProvider(),
-            Helper::getIpAddress()
-        );
-    }
+	/**
+	 * @return string
+	 */
+	protected function getHostName()
+	{
+		return sprintf('%s (%s)',
+			$this->detectWebhostProvider(),
+			Helper::getIpAddress()
+		);
+	}
 
-    protected function getINI($name, $disabledValue = 'ini_get() is disabled.')
-    {
-        return function_exists('ini_get')
-            ? ini_get($name)
-            : $disabledValue;
-    }
+	protected function getINI($name, $disabledValue = 'ini_get() is disabled.')
+	{
+		return function_exists('ini_get')
+			? ini_get($name)
+			: $disabledValue;
+	}
 
-    /**
-     * @return array
-     */
-    protected function getWordpressPlugins()
-    {
-        $plugins = get_plugins();
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactive = $this->normalizePluginList(array_diff_key($plugins, array_flip($activePlugins)));
-        $active = $this->normalizePluginList(array_diff_key($plugins, $inactive));
-        return $active + $inactive;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getWordpressPlugins()
+	{
+		$plugins = get_plugins();
+		$activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
+		$inactive = $this->normalizePluginList(array_diff_key($plugins, array_flip($activePlugins)));
+		$active = $this->normalizePluginList(array_diff_key($plugins, $inactive));
+		return $active + $inactive;
+	}
 
-    /**
-     * @param string $title
-     * @return string
-     */
-    protected function implode($title, array $details)
-    {
-        $strings = ['['.$title.']'];
-        $padding = max(array_map('strlen', array_keys($details)));
-        $padding = max([$padding, static::PAD]);
-        foreach ($details as $key => $value) {
-            $strings[] = is_string($key)
-                ? sprintf('%s : %s', str_pad($key, $padding, '.'), $value)
-                : ' - '.$value;
-        }
-        return implode(PHP_EOL, $strings).PHP_EOL.PHP_EOL;
-    }
+	/**
+	 * @param string $title
+	 * @return string
+	 */
+	protected function implode($title, array $details)
+	{
+		$strings = ['['.$title.']'];
+		$padding = max(array_map('strlen', array_keys($details)));
+		$padding = max([$padding, static::PAD]);
+		foreach ($details as $key => $value) {
+			$strings[] = is_string($key)
+				? sprintf('%s : %s', str_pad($key, $padding, '.'), $value)
+				: ' - '.$value;
+		}
+		return implode(PHP_EOL, $strings).PHP_EOL.PHP_EOL;
+	}
 
-    /**
-     * @param string $key
-     * @return bool
-     */
-    protected function isWebhostCheckValid($key)
-    {
-        return defined($key)
-            || filter_input(INPUT_SERVER, $key)
-            || Str::contains(filter_input(INPUT_SERVER, 'SERVER_NAME'), $key)
-            || Str::contains(DB_HOST, $key)
-            || Str::contains(php_uname(), $key);
-    }
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+	protected function isWebhostCheckValid($key)
+	{
+		return defined($key)
+			|| filter_input(INPUT_SERVER, $key)
+			|| Str::contains(filter_input(INPUT_SERVER, 'SERVER_NAME'), $key)
+			|| Str::contains(DB_HOST, $key)
+			|| Str::contains(php_uname(), $key);
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizePluginList(array $plugins)
-    {
-        $plugins = array_map(function ($plugin) {
-            return sprintf('%s v%s', Arr::get($plugin, 'Name'), Arr::get($plugin, 'Version'));
-        }, $plugins);
-        natcasesort($plugins);
-        return array_flip($plugins);
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizePluginList(array $plugins)
+	{
+		$plugins = array_map(function ($plugin) {
+			return sprintf('%s v%s', Arr::get($plugin, 'Name'), Arr::get($plugin, 'Version'));
+		}, $plugins);
+		natcasesort($plugins);
+		return array_flip($plugins);
+	}
 
-    /**
-     * @return array
-     */
-    protected function purgeSensitiveData(array $settings)
-    {
-        $keys = [
-            'general.trustalyze_serial',
-            'licenses.',
-            'submissions.recaptcha.key',
-            'submissions.recaptcha.secret',
-        ];
-        array_walk($settings, function (&$value, $setting) use ($keys) {
-            foreach ($keys as $key) {
-                if (!Str::startsWith($key, $setting) || empty($value)) {
-                    continue;
-                }
-                $value = str_repeat('•', 13);
-                return;
-            }
-        });
-        return $settings;
-    }
+	/**
+	 * @return array
+	 */
+	protected function purgeSensitiveData(array $settings)
+	{
+		$keys = [
+			'general.trustalyze_serial',
+			'licenses.',
+			'submissions.recaptcha.key',
+			'submissions.recaptcha.secret',
+		];
+		array_walk($settings, function (&$value, $setting) use ($keys) {
+			foreach ($keys as $key) {
+				if (!Str::startsWith($key, $setting) || empty($value)) {
+					continue;
+				}
+				$value = str_repeat('•', 13);
+				return;
+			}
+		});
+		return $settings;
+	}
 }

plugin/Modules/Migrations/Migrate_3_0_0.php

Indentation +147 added lines, -147 removed lines

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

plugin/Modules/Migrations/Migrate_4_6_0.php

Indentation +71 added lines, -71 removed lines

@@ -8,84 +8,84 @@
 
 class Migrate_4_6_0
 {
-    /**
-     * @return void
-     */
-    public function migrateSidebarWidgets()
-    {
-        $sidebars = get_option('sidebars_widgets');
-        if ($this->widgetsExist($sidebars)) {
-            $sidebars = $this->updateWidgetNames($sidebars);
-            update_option('sidebars_widgets', $sidebars);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function migrateSidebarWidgets()
+	{
+		$sidebars = get_option('sidebars_widgets');
+		if ($this->widgetsExist($sidebars)) {
+			$sidebars = $this->updateWidgetNames($sidebars);
+			update_option('sidebars_widgets', $sidebars);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function migrateThemeModWidgets()
-    {
-        $themes = $this->queryThemeMods();
-        foreach ($themes as $theme) {
-            $themeMod = get_option($theme);
-            $sidebars = Arr::get($themeMod, 'sidebars_widgets.data');
-            if ($this->widgetsExist($sidebars)) {
-                $themeMod['sidebars_widgets']['data'] = $this->updateWidgetNames($sidebars);
-                update_option($theme, $themeMod);
-            }
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function migrateThemeModWidgets()
+	{
+		$themes = $this->queryThemeMods();
+		foreach ($themes as $theme) {
+			$themeMod = get_option($theme);
+			$sidebars = Arr::get($themeMod, 'sidebars_widgets.data');
+			if ($this->widgetsExist($sidebars)) {
+				$themeMod['sidebars_widgets']['data'] = $this->updateWidgetNames($sidebars);
+				update_option($theme, $themeMod);
+			}
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function run()
-    {
-        $this->migrateSidebarWidgets();
-        $this->migrateThemeModWidgets();
-    }
+	/**
+	 * @return void
+	 */
+	public function run()
+	{
+		$this->migrateSidebarWidgets();
+		$this->migrateThemeModWidgets();
+	}
 
-    /**
-     * @return array
-     */
-    protected function queryThemeMods()
-    {
-        global $wpdb;
-        return $wpdb->get_col("
+	/**
+	 * @return array
+	 */
+	protected function queryThemeMods()
+	{
+		global $wpdb;
+		return $wpdb->get_col("
             SELECT option_name 
             FROM {$wpdb->options} 
             WHERE option_name LIKE '%theme_mods_%'
         ");
-    }
+	}
 
-    /**
-     * @param array $sidebars
-     * @return array
-     */
-    protected function updateWidgetNames(array $sidebars)
-    {
-        array_walk($sidebars, function(&$widgets) {
-            array_walk($widgets, function(&$widget) {
-                if (Str::startsWith(Application::ID.'_', $widget)) {
-                    $widget = Str::replaceFirst(Application::ID.'_', Application::PREFIX, $widget);
-                }
-            });
-        });
-        return $sidebars;
-    }
+	/**
+	 * @param array $sidebars
+	 * @return array
+	 */
+	protected function updateWidgetNames(array $sidebars)
+	{
+		array_walk($sidebars, function(&$widgets) {
+			array_walk($widgets, function(&$widget) {
+				if (Str::startsWith(Application::ID.'_', $widget)) {
+					$widget = Str::replaceFirst(Application::ID.'_', Application::PREFIX, $widget);
+				}
+			});
+		});
+		return $sidebars;
+	}
 
-    /**
-     * @param array $sidebars
-     * @return bool
-     */
-    protected function widgetsExist($sidebars)
-    {
-        $widgets = call_user_func_array('array_merge', array_filter(Arr::consolidate($sidebars), 'is_array'));
-        foreach ($widgets as $widget) {
-            if (Str::startsWith(Application::ID.'_', $widget)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * @param array $sidebars
+	 * @return bool
+	 */
+	protected function widgetsExist($sidebars)
+	{
+		$widgets = call_user_func_array('array_merge', array_filter(Arr::consolidate($sidebars), 'is_array'));
+		foreach ($widgets as $widget) {
+			if (Str::startsWith(Application::ID.'_', $widget)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

plugin/Modules/Style.php

Indentation +128 added lines, -128 removed lines

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