Inspection of "v4.6.0 release" - pryley/site-reviews - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 04b043...334ee0 )

by Paul

created 2020-04-22 18:03 UTC

Status

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -7,12 +7,12 @@
 block discarded – undo
 
 class RegisterTaxonomy
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        register_taxonomy(Application::TAXONOMY, Application::POST_TYPE, $command->args);
-        register_taxonomy_for_object_type(Application::TAXONOMY, Application::POST_TYPE);
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		register_taxonomy(Application::TAXONOMY, Application::POST_TYPE, $command->args);
+		register_taxonomy_for_object_type(Application::TAXONOMY, Application::POST_TYPE);
+	}
 }

Please login to merge, or discard this patch.

plugin/Handlers/RegisterPostType.php 1 patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -6,16 +6,16 @@
 block discarded – undo
 
 class RegisterPostType
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        if (!in_array($command->postType, get_post_types(['_builtin' => true]))) {
-            register_post_type($command->postType, $command->args);
-            glsr()->postTypeColumns = wp_parse_args(glsr()->postTypeColumns, [
-                $command->postType => $command->columns,
-            ]);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		if (!in_array($command->postType, get_post_types(['_builtin' => true]))) {
+			register_post_type($command->postType, $command->args);
+			glsr()->postTypeColumns = wp_parse_args(glsr()->postTypeColumns, [
+				$command->postType => $command->columns,
+			]);
+		}
+	}
 }

Please login to merge, or discard this patch.

plugin/Shortcodes/SiteReviewsFormPopup.php 1 patch

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

@@ -4,50 +4,50 @@
 block discarded – undo
 
 class SiteReviewsFormPopup extends TinymcePopupGenerator
 {
-    /**
-     * @return array
-     */
-    public function fields()
-    {
-        return [[
-            'type' => 'container',
-            'html' => '<p class="strong">'.esc_html__('All settings are optional.', 'site-reviews').'</p>',
-        ], [
-            'label' => esc_html__('Title', 'site-reviews'),
-            'name' => 'title',
-            'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
-            'type' => 'textbox',
-        ], [
-            'label' => esc_html__('Description', 'site-reviews'),
-            'minHeight' => 60,
-            'minWidth' => 240,
-            'multiline' => true,
-            'name' => 'description',
-            'tooltip' => __('Enter a custom shortcode description.', 'site-reviews'),
-            'type' => 'textbox',
-        ],
-        $this->getCategories(__('Automatically assign a category to reviews submitted with this shortcode.', 'site-reviews')),
-        [
-            'label' => esc_html__('Assign To', 'site-reviews'),
-            'name' => 'assign_to',
-            'tooltip' => __('Assign submitted reviews to a custom page/post ID. You can also enter "post_id" to assign reviews to the ID of the current page.', 'site-reviews'),
-            'type' => 'textbox',
-        ], [
-            'label' => esc_html__('Classes', 'site-reviews'),
-            'name' => 'class',
-            'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
-            'type' => 'textbox',
-        ], [
-            'columns' => 2,
-            'items' => $this->getHideOptions(),
-            'label' => esc_html__('Hide', 'site-reviews'),
-            'layout' => 'grid',
-            'spacing' => 5,
-            'type' => 'container',
-        ], [
-            'hidden' => true,
-            'name' => 'id',
-            'type' => 'textbox',
-        ], ];
-    }
+	/**
+	 * @return array
+	 */
+	public function fields()
+	{
+		return [[
+			'type' => 'container',
+			'html' => '<p class="strong">'.esc_html__('All settings are optional.', 'site-reviews').'</p>',
+		], [
+			'label' => esc_html__('Title', 'site-reviews'),
+			'name' => 'title',
+			'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
+			'type' => 'textbox',
+		], [
+			'label' => esc_html__('Description', 'site-reviews'),
+			'minHeight' => 60,
+			'minWidth' => 240,
+			'multiline' => true,
+			'name' => 'description',
+			'tooltip' => __('Enter a custom shortcode description.', 'site-reviews'),
+			'type' => 'textbox',
+		],
+		$this->getCategories(__('Automatically assign a category to reviews submitted with this shortcode.', 'site-reviews')),
+		[
+			'label' => esc_html__('Assign To', 'site-reviews'),
+			'name' => 'assign_to',
+			'tooltip' => __('Assign submitted reviews to a custom page/post ID. You can also enter "post_id" to assign reviews to the ID of the current page.', 'site-reviews'),
+			'type' => 'textbox',
+		], [
+			'label' => esc_html__('Classes', 'site-reviews'),
+			'name' => 'class',
+			'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
+			'type' => 'textbox',
+		], [
+			'columns' => 2,
+			'items' => $this->getHideOptions(),
+			'label' => esc_html__('Hide', 'site-reviews'),
+			'layout' => 'grid',
+			'spacing' => 5,
+			'type' => 'container',
+		], [
+			'hidden' => true,
+			'name' => 'id',
+			'type' => 'textbox',
+		], ];
+	}
 }

Please login to merge, or discard this patch.

plugin/Shortcodes/SiteReviewsSummaryPopup.php 1 patch

Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -4,49 +4,49 @@
 block discarded – undo
 
 class SiteReviewsSummaryPopup extends SiteReviewsPopup
 {
-    /**
-     * @return array
-     */
-    public function fields()
-    {
-        return [[
-            'html' => sprintf('<p class="strong">%s</p>', esc_html__('All settings are optional.', 'site-reviews')),
-            'minWidth' => 320,
-            'type' => 'container',
-        ], [
-            'label' => esc_html__('Title', 'site-reviews'),
-            'name' => 'title',
-            'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
-            'type' => 'textbox',
-        ],
-        $this->getTypes(__('Which type of review would you like to use?', 'site-reviews')),
-        $this->getCategories(__('Limit reviews to this category.', 'site-reviews')),
-        [
-            'label' => esc_html__('Assigned To', 'site-reviews'),
-            'name' => 'assigned_to',
-            'tooltip' => __('Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page, or "parent_id" to use the ID of the parent page.', 'site-reviews'),
-            'type' => 'textbox',
-        ], [
-            'label' => esc_html__('Schema', 'site-reviews'),
-            'name' => 'schema',
-            'options' => [
-                'true' => esc_html__('Enable rich snippets', 'site-reviews'),
-                'false' => esc_html__('Disable rich snippets', 'site-reviews'),
-            ],
-            'tooltip' => __('Rich snippets are disabled by default.', 'site-reviews'),
-            'type' => 'listbox',
-        ], [
-            'label' => esc_html__('Classes', 'site-reviews'),
-            'name' => 'class',
-            'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
-            'type' => 'textbox',
-        ], [
-            'columns' => 2,
-            'items' => $this->getHideOptions(),
-            'label' => esc_html__('Hide', 'site-reviews'),
-            'layout' => 'grid',
-            'spacing' => 5,
-            'type' => 'container',
-        ], ];
-    }
+	/**
+	 * @return array
+	 */
+	public function fields()
+	{
+		return [[
+			'html' => sprintf('<p class="strong">%s</p>', esc_html__('All settings are optional.', 'site-reviews')),
+			'minWidth' => 320,
+			'type' => 'container',
+		], [
+			'label' => esc_html__('Title', 'site-reviews'),
+			'name' => 'title',
+			'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
+			'type' => 'textbox',
+		],
+		$this->getTypes(__('Which type of review would you like to use?', 'site-reviews')),
+		$this->getCategories(__('Limit reviews to this category.', 'site-reviews')),
+		[
+			'label' => esc_html__('Assigned To', 'site-reviews'),
+			'name' => 'assigned_to',
+			'tooltip' => __('Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page, or "parent_id" to use the ID of the parent page.', 'site-reviews'),
+			'type' => 'textbox',
+		], [
+			'label' => esc_html__('Schema', 'site-reviews'),
+			'name' => 'schema',
+			'options' => [
+				'true' => esc_html__('Enable rich snippets', 'site-reviews'),
+				'false' => esc_html__('Disable rich snippets', 'site-reviews'),
+			],
+			'tooltip' => __('Rich snippets are disabled by default.', 'site-reviews'),
+			'type' => 'listbox',
+		], [
+			'label' => esc_html__('Classes', 'site-reviews'),
+			'name' => 'class',
+			'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
+			'type' => 'textbox',
+		], [
+			'columns' => 2,
+			'items' => $this->getHideOptions(),
+			'label' => esc_html__('Hide', 'site-reviews'),
+			'layout' => 'grid',
+			'spacing' => 5,
+			'type' => 'container',
+		], ];
+	}
 }

Please login to merge, or discard this patch.

plugin/Shortcodes/SiteReviewsShortcode.php 1 patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -4,17 +4,17 @@
 block discarded – undo
 
 class SiteReviewsShortcode extends Shortcode
 {
-    protected function hideOptions()
-    {
-        return [
-            'title' => __('Hide the title', 'site-reviews'),
-            'rating' => __('Hide the rating', 'site-reviews'),
-            'date' => __('Hide the date', 'site-reviews'),
-            'assigned_to' => __('Hide the assigned to link (if shown)', 'site-reviews'),
-            'content' => __('Hide the content', 'site-reviews'),
-            'avatar' => __('Hide the avatar (if shown)', 'site-reviews'),
-            'author' => __('Hide the author', 'site-reviews'),
-            'response' => __('Hide the response', 'site-reviews'),
-        ];
-    }
+	protected function hideOptions()
+	{
+		return [
+			'title' => __('Hide the title', 'site-reviews'),
+			'rating' => __('Hide the rating', 'site-reviews'),
+			'date' => __('Hide the date', 'site-reviews'),
+			'assigned_to' => __('Hide the assigned to link (if shown)', 'site-reviews'),
+			'content' => __('Hide the content', 'site-reviews'),
+			'avatar' => __('Hide the avatar (if shown)', 'site-reviews'),
+			'author' => __('Hide the author', 'site-reviews'),
+			'response' => __('Hide the response', 'site-reviews'),
+		];
+	}
 }

Please login to merge, or discard this patch.

plugin/Shortcodes/SiteReviewsSummaryShortcode.php 1 patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -4,14 +4,14 @@
 block discarded – undo
 
 class SiteReviewsSummaryShortcode extends Shortcode
 {
-    protected function hideOptions()
-    {
-        return [
-            'rating' => __('Hide the rating', 'site-reviews'),
-            'stars' => __('Hide the stars', 'site-reviews'),
-            'summary' => __('Hide the summary', 'site-reviews'),
-            'bars' => __('Hide the percentage bars', 'site-reviews'),
-            'if_empty' => __('Hide if no reviews are found', 'site-reviews'),
-        ];
-    }
+	protected function hideOptions()
+	{
+		return [
+			'rating' => __('Hide the rating', 'site-reviews'),
+			'stars' => __('Hide the stars', 'site-reviews'),
+			'summary' => __('Hide the summary', 'site-reviews'),
+			'bars' => __('Hide the percentage bars', 'site-reviews'),
+			'if_empty' => __('Hide if no reviews are found', 'site-reviews'),
+		];
+	}
 }

Please login to merge, or discard this patch.

plugin/Shortcodes/TinymcePopupGenerator.php 1 patch

Indentation +301 added lines, -301 removed lines patch added patch discarded remove patch

@@ -6,325 +6,325 @@
 block discarded – undo
 
 abstract class TinymcePopupGenerator
 {
-    /**
-     * @var array
-     */
-    public $properties;
+	/**
+	 * @var array
+	 */
+	public $properties;
 
-    /**
-     * @var string
-     */
-    public $tag;
+	/**
+	 * @var string
+	 */
+	public $tag;
 
-    /**
-     * @var array
-     */
-    protected $errors = [];
+	/**
+	 * @var array
+	 */
+	protected $errors = [];
 
-    /**
-     * @var array
-     */
-    protected $required = [];
+	/**
+	 * @var array
+	 */
+	protected $required = [];
 
-    /**
-     * @return array
-     */
-    abstract public function fields();
+	/**
+	 * @return array
+	 */
+	abstract public function fields();
 
-    /**
-     * @param string $tag
-     * @return static
-     */
-    public function register($tag, array $args)
-    {
-        $this->tag = $tag;
-        $this->properties = wp_parse_args($args, [
-            'btn_close' => esc_html__('Close', 'site-reviews'),
-            'btn_okay' => esc_html__('Insert Shortcode', 'site-reviews'),
-            'errors' => $this->errors,
-            'fields' => $this->getFields(),
-            'label' => '['.$tag.']',
-            'required' => $this->required,
-            'title' => esc_html__('Shortcode', 'site-reviews'),
-        ]);
-        return $this;
-    }
+	/**
+	 * @param string $tag
+	 * @return static
+	 */
+	public function register($tag, array $args)
+	{
+		$this->tag = $tag;
+		$this->properties = wp_parse_args($args, [
+			'btn_close' => esc_html__('Close', 'site-reviews'),
+			'btn_okay' => esc_html__('Insert Shortcode', 'site-reviews'),
+			'errors' => $this->errors,
+			'fields' => $this->getFields(),
+			'label' => '['.$tag.']',
+			'required' => $this->required,
+			'title' => esc_html__('Shortcode', 'site-reviews'),
+		]);
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    protected function generateFields(array $fields)
-    {
-        $generatedFields = array_map(function ($field) {
-            if (empty($field)) {
-                return;
-            }
-            $field = $this->normalize($field);
-            if (!method_exists($this, $method = 'normalize'.ucfirst($field['type']))) {
-                return;
-            }
-            return $this->$method($field);
-        }, $fields);
-        return array_values(array_filter($generatedFields));
-    }
+	/**
+	 * @return array
+	 */
+	protected function generateFields(array $fields)
+	{
+		$generatedFields = array_map(function ($field) {
+			if (empty($field)) {
+				return;
+			}
+			$field = $this->normalize($field);
+			if (!method_exists($this, $method = 'normalize'.ucfirst($field['type']))) {
+				return;
+			}
+			return $this->$method($field);
+		}, $fields);
+		return array_values(array_filter($generatedFields));
+	}
 
-    /**
-     * @param string $tooltip
-     * @return array
-     */
-    protected function getCategories($tooltip = '')
-    {
-        $terms = glsr(Database::class)->getTerms();
-        if (empty($terms)) {
-            return [];
-        }
-        return [
-            'label' => esc_html__('Category', 'site-reviews'),
-            'name' => 'category',
-            'options' => $terms,
-            'tooltip' => $tooltip,
-            'type' => 'listbox',
-        ];
-    }
+	/**
+	 * @param string $tooltip
+	 * @return array
+	 */
+	protected function getCategories($tooltip = '')
+	{
+		$terms = glsr(Database::class)->getTerms();
+		if (empty($terms)) {
+			return [];
+		}
+		return [
+			'label' => esc_html__('Category', 'site-reviews'),
+			'name' => 'category',
+			'options' => $terms,
+			'tooltip' => $tooltip,
+			'type' => 'listbox',
+		];
+	}
 
-    /**
-     * @return array
-     */
-    protected function getFields()
-    {
-        $fields = $this->generateFields($this->fields());
-        if (!empty($this->errors)) {
-            $errors = [];
-            foreach ($this->required as $name => $alert) {
-                if (false !== array_search($name, glsr_array_column($fields, 'name'))) {
-                    continue;
-                }
-                $errors[] = $this->errors[$name];
-            }
-            $this->errors = $errors;
-        }
-        return empty($this->errors)
-            ? $fields
-            : $this->errors;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getFields()
+	{
+		$fields = $this->generateFields($this->fields());
+		if (!empty($this->errors)) {
+			$errors = [];
+			foreach ($this->required as $name => $alert) {
+				if (false !== array_search($name, glsr_array_column($fields, 'name'))) {
+					continue;
+				}
+				$errors[] = $this->errors[$name];
+			}
+			$this->errors = $errors;
+		}
+		return empty($this->errors)
+			? $fields
+			: $this->errors;
+	}
 
-    /**
-     * @return array
-     */
-    protected function getHideOptions()
-    {
-        $classname = str_replace('Popup', 'Shortcode', get_class($this));
-        $hideOptions = glsr($classname)->getHideOptions();
-        $options = [];
-        foreach ($hideOptions as $name => $tooltip) {
-            $options[] = [
-                'name' => 'hide_'.$name,
-                'text' => $name,
-                'tooltip' => $tooltip,
-                'type' => 'checkbox',
-            ];
-        }
-        return $options;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getHideOptions()
+	{
+		$classname = str_replace('Popup', 'Shortcode', get_class($this));
+		$hideOptions = glsr($classname)->getHideOptions();
+		$options = [];
+		foreach ($hideOptions as $name => $tooltip) {
+			$options[] = [
+				'name' => 'hide_'.$name,
+				'text' => $name,
+				'tooltip' => $tooltip,
+				'type' => 'checkbox',
+			];
+		}
+		return $options;
+	}
 
-    /**
-     * @param string $tooltip
-     * @return array
-     */
-    protected function getTypes($tooltip = '')
-    {
-        if (count(glsr()->reviewTypes) < 2) {
-            return [];
-        }
-        return [
-            'label' => esc_html__('Type', 'site-reviews'),
-            'name' => 'type',
-            'options' => glsr()->reviewTypes,
-            'tooltip' => $tooltip,
-            'type' => 'listbox',
-        ];
-    }
+	/**
+	 * @param string $tooltip
+	 * @return array
+	 */
+	protected function getTypes($tooltip = '')
+	{
+		if (count(glsr()->reviewTypes) < 2) {
+			return [];
+		}
+		return [
+			'label' => esc_html__('Type', 'site-reviews'),
+			'name' => 'type',
+			'options' => glsr()->reviewTypes,
+			'tooltip' => $tooltip,
+			'type' => 'listbox',
+		];
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $field)
-    {
-        return wp_parse_args($field, [
-            'items' => [],
-            'type' => '',
-        ]);
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $field)
+	{
+		return wp_parse_args($field, [
+			'items' => [],
+			'type' => '',
+		]);
+	}
 
-    /**
-     * @return void|array
-     */
-    protected function normalizeCheckbox(array $field)
-    {
-        return $this->normalizeField($field, [
-            'checked' => false,
-            'label' => '',
-            'minHeight' => '',
-            'minWidth' => '',
-            'name' => false,
-            'text' => '',
-            'tooltip' => '',
-            'type' => '',
-            'value' => '',
-        ]);
-    }
+	/**
+	 * @return void|array
+	 */
+	protected function normalizeCheckbox(array $field)
+	{
+		return $this->normalizeField($field, [
+			'checked' => false,
+			'label' => '',
+			'minHeight' => '',
+			'minWidth' => '',
+			'name' => false,
+			'text' => '',
+			'tooltip' => '',
+			'type' => '',
+			'value' => '',
+		]);
+	}
 
-    /**
-     * @return void|array
-     */
-    protected function normalizeContainer(array $field)
-    {
-        if (!array_key_exists('html', $field) && !array_key_exists('items', $field)) {
-            return;
-        }
-        $field['items'] = $this->generateFields($field['items']);
-        return $field;
-    }
+	/**
+	 * @return void|array
+	 */
+	protected function normalizeContainer(array $field)
+	{
+		if (!array_key_exists('html', $field) && !array_key_exists('items', $field)) {
+			return;
+		}
+		$field['items'] = $this->generateFields($field['items']);
+		return $field;
+	}
 
-    /**
-     * @return void|array
-     */
-    protected function normalizeField(array $field, array $defaults)
-    {
-        if (!$this->validate($field)) {
-            return;
-        }
-        return array_filter(shortcode_atts($defaults, $field), function ($value) {
-            return '' !== $value;
-        });
-    }
+	/**
+	 * @return void|array
+	 */
+	protected function normalizeField(array $field, array $defaults)
+	{
+		if (!$this->validate($field)) {
+			return;
+		}
+		return array_filter(shortcode_atts($defaults, $field), function ($value) {
+			return '' !== $value;
+		});
+	}
 
-    /**
-     * @return void|array
-     */
-    protected function normalizeListbox(array $field)
-    {
-        $listbox = $this->normalizeField($field, [
-            'label' => '',
-            'minWidth' => '',
-            'name' => false,
-            'options' => [],
-            'placeholder' => esc_attr__('- Select -', 'site-reviews'),
-            'tooltip' => '',
-            'type' => '',
-            'value' => '',
-        ]);
-        if (!is_array($listbox)) {
-            return;
-        }
-        if (!array_key_exists('', $listbox['options'])) {
-            $listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
-        }
-        foreach ($listbox['options'] as $value => $text) {
-            $listbox['values'][] = [
-                'text' => $text,
-                'value' => $value,
-            ];
-        }
-        return $listbox;
-    }
+	/**
+	 * @return void|array
+	 */
+	protected function normalizeListbox(array $field)
+	{
+		$listbox = $this->normalizeField($field, [
+			'label' => '',
+			'minWidth' => '',
+			'name' => false,
+			'options' => [],
+			'placeholder' => esc_attr__('- Select -', 'site-reviews'),
+			'tooltip' => '',
+			'type' => '',
+			'value' => '',
+		]);
+		if (!is_array($listbox)) {
+			return;
+		}
+		if (!array_key_exists('', $listbox['options'])) {
+			$listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
+		}
+		foreach ($listbox['options'] as $value => $text) {
+			$listbox['values'][] = [
+				'text' => $text,
+				'value' => $value,
+			];
+		}
+		return $listbox;
+	}
 
-    /**
-     * @return void|array
-     */
-    protected function normalizePost(array $field)
-    {
-        if (!is_array($field['query_args'])) {
-            $field['query_args'] = [];
-        }
-        $posts = get_posts(wp_parse_args($field['query_args'], [
-            'order' => 'ASC',
-            'orderby' => 'title',
-            'post_type' => 'post',
-            'posts_per_page' => 30,
-        ]));
-        if (!empty($posts)) {
-            $options = [];
-            foreach ($posts as $post) {
-                $options[$post->ID] = esc_html($post->post_title);
-            }
-            $field['options'] = $options;
-            $field['type'] = 'listbox';
-            return $this->normalizeListbox($field);
-        }
-        $this->validate($field);
-    }
+	/**
+	 * @return void|array
+	 */
+	protected function normalizePost(array $field)
+	{
+		if (!is_array($field['query_args'])) {
+			$field['query_args'] = [];
+		}
+		$posts = get_posts(wp_parse_args($field['query_args'], [
+			'order' => 'ASC',
+			'orderby' => 'title',
+			'post_type' => 'post',
+			'posts_per_page' => 30,
+		]));
+		if (!empty($posts)) {
+			$options = [];
+			foreach ($posts as $post) {
+				$options[$post->ID] = esc_html($post->post_title);
+			}
+			$field['options'] = $options;
+			$field['type'] = 'listbox';
+			return $this->normalizeListbox($field);
+		}
+		$this->validate($field);
+	}
 
-    /**
-     * @return void|array
-     */
-    protected function normalizeTextbox(array $field)
-    {
-        return $this->normalizeField($field, [
-            'hidden' => false,
-            'label' => '',
-            'maxLength' => '',
-            'minHeight' => '',
-            'minWidth' => '',
-            'multiline' => false,
-            'name' => false,
-            'size' => '',
-            'text' => '',
-            'tooltip' => '',
-            'type' => '',
-            'value' => '',
-        ]);
-    }
+	/**
+	 * @return void|array
+	 */
+	protected function normalizeTextbox(array $field)
+	{
+		return $this->normalizeField($field, [
+			'hidden' => false,
+			'label' => '',
+			'maxLength' => '',
+			'minHeight' => '',
+			'minWidth' => '',
+			'multiline' => false,
+			'name' => false,
+			'size' => '',
+			'text' => '',
+			'tooltip' => '',
+			'type' => '',
+			'value' => '',
+		]);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validate(array $field)
-    {
-        $args = shortcode_atts([
-            'label' => '',
-            'name' => false,
-            'required' => false,
-        ], $field);
-        if (!$args['name']) {
-            return false;
-        }
-        return $this->validateErrors($args) && $this->validateRequired($args);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validate(array $field)
+	{
+		$args = shortcode_atts([
+			'label' => '',
+			'name' => false,
+			'required' => false,
+		], $field);
+		if (!$args['name']) {
+			return false;
+		}
+		return $this->validateErrors($args) && $this->validateRequired($args);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validateErrors(array $args)
-    {
-        if (!isset($args['required']['error'])) {
-            return true;
-        }
-        $this->errors[$args['name']] = $this->normalizeContainer([
-            'html' => $args['required']['error'],
-            'type' => 'container',
-        ]);
-        return false;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validateErrors(array $args)
+	{
+		if (!isset($args['required']['error'])) {
+			return true;
+		}
+		$this->errors[$args['name']] = $this->normalizeContainer([
+			'html' => $args['required']['error'],
+			'type' => 'container',
+		]);
+		return false;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validateRequired(array $args)
-    {
-        if (false == $args['required']) {
-            return true;
-        }
-        $alert = esc_html__('Some of the shortcode options are required.', 'site-reviews');
-        if (isset($args['required']['alert'])) {
-            $alert = $args['required']['alert'];
-        } elseif (!empty($args['label'])) {
-            $alert = sprintf(
-                esc_html_x('The "%s" option is required.', 'the option label', 'site-reviews'),
-                str_replace(':', '', $args['label'])
-            );
-        }
-        $this->required[$args['name']] = $alert;
-        return false;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validateRequired(array $args)
+	{
+		if (false == $args['required']) {
+			return true;
+		}
+		$alert = esc_html__('Some of the shortcode options are required.', 'site-reviews');
+		if (isset($args['required']['alert'])) {
+			$alert = $args['required']['alert'];
+		} elseif (!empty($args['label'])) {
+			$alert = sprintf(
+				esc_html_x('The "%s" option is required.', 'the option label', 'site-reviews'),
+				str_replace(':', '', $args['label'])
+			);
+		}
+		$this->required[$args['name']] = $alert;
+		return false;
+	}
 }

Please login to merge, or discard this patch.

plugin/Defaults/PaginationDefaults.php 1 patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -6,18 +6,18 @@
 block discarded – undo
 
 class PaginationDefaults extends Defaults
 {
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'before_page_number' => '<span class="meta-nav screen-reader-text">'.__('Page', 'site-reviews').' </span>',
-            'format' => '?'.glsr()->constant('PAGED_QUERY_VAR').'=%#%',
-            'mid_size' => 1,
-            'next_text' => __('Next &rarr;', 'site-reviews'),
-            'prev_text' => __('&larr; Previous', 'site-reviews'),
-            'type' => 'plain',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'before_page_number' => '<span class="meta-nav screen-reader-text">'.__('Page', 'site-reviews').' </span>',
+			'format' => '?'.glsr()->constant('PAGED_QUERY_VAR').'=%#%',
+			'mid_size' => 1,
+			'next_text' => __('Next &rarr;', 'site-reviews'),
+			'prev_text' => __('&larr; Previous', 'site-reviews'),
+			'type' => 'plain',
+		];
+	}
 }

Please login to merge, or discard this patch.

plugin/Defaults/SiteReviewsSummaryDefaults.php 1 patch

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -6,32 +6,32 @@
 block discarded – undo
 
 class SiteReviewsSummaryDefaults extends Defaults
 {
-    /**
-     * @var array
-     */
-    protected $guarded = [
-        'labels',
-        'text',
-        'title',
-    ];
+	/**
+	 * @var array
+	 */
+	protected $guarded = [
+		'labels',
+		'text',
+		'title',
+	];
 
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'assigned_to' => '',
-            'category' => '',
-            'class' => '',
-            'hide' => '',
-            'id' => '',
-            'labels' => '',
-            'rating' => 1,
-            'schema' => false,
-            'text' => '',
-            'title' => '',
-            'type' => 'local',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'assigned_to' => '',
+			'category' => '',
+			'class' => '',
+			'hide' => '',
+			'id' => '',
+			'labels' => '',
+			'rating' => 1,
+			'schema' => false,
+			'text' => '',
+			'title' => '',
+			'type' => 'local',
+		];
+	}
 }

Please login to merge, or discard this patch.

		@@ -7,12 +7,12 @@
		block discarded – undo
7	7
8	8	class RegisterTaxonomy
9	9	{
10		- /**
11		- * @return void
12		- */
13		- public function handle(Command $command)
14		- {
15		- register_taxonomy(Application::TAXONOMY, Application::POST_TYPE, $command->args);
16		- register_taxonomy_for_object_type(Application::TAXONOMY, Application::POST_TYPE);
17		- }
	10	+ /**
	11	+ * @return void
	12	+ */
	13	+ public function handle(Command $command)
	14	+ {
	15	+ register_taxonomy(Application::TAXONOMY, Application::POST_TYPE, $command->args);
	16	+ register_taxonomy_for_object_type(Application::TAXONOMY, Application::POST_TYPE);
	17	+ }
18	18	}

		@@ -6,16 +6,16 @@
		block discarded – undo
6	6
7	7	class RegisterPostType
8	8	{
9		- /**
10		- * @return void
11		- */
12		- public function handle(Command $command)
13		- {
14		- if (!in_array($command->postType, get_post_types(['_builtin' => true]))) {
15		- register_post_type($command->postType, $command->args);
16		- glsr()->postTypeColumns = wp_parse_args(glsr()->postTypeColumns, [
17		- $command->postType => $command->columns,
18		- ]);
19		- }
20		- }
	9	+ /**
	10	+ * @return void
	11	+ */
	12	+ public function handle(Command $command)
	13	+ {
	14	+ if (!in_array($command->postType, get_post_types(['_builtin' => true]))) {
	15	+ register_post_type($command->postType, $command->args);
	16	+ glsr()->postTypeColumns = wp_parse_args(glsr()->postTypeColumns, [
	17	+ $command->postType => $command->columns,
	18	+ ]);
	19	+ }
	20	+ }
21	21	}

		@@ -4,50 +4,50 @@
		block discarded – undo
4	4
5	5	class SiteReviewsFormPopup extends TinymcePopupGenerator
6	6	{
7		- /**
8		- * @return array
9		- */
10		- public function fields()
11		- {
12		- return [[
13		- 'type' => 'container',
14		- 'html' => '<p class="strong">'.esc_html__('All settings are optional.', 'site-reviews').'</p>',
15		- ], [
16		- 'label' => esc_html__('Title', 'site-reviews'),
17		- 'name' => 'title',
18		- 'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
19		- 'type' => 'textbox',
20		- ], [
21		- 'label' => esc_html__('Description', 'site-reviews'),
22		- 'minHeight' => 60,
23		- 'minWidth' => 240,
24		- 'multiline' => true,
25		- 'name' => 'description',
26		- 'tooltip' => __('Enter a custom shortcode description.', 'site-reviews'),
27		- 'type' => 'textbox',
28		- ],
29		- $this->getCategories(__('Automatically assign a category to reviews submitted with this shortcode.', 'site-reviews')),
30		- [
31		- 'label' => esc_html__('Assign To', 'site-reviews'),
32		- 'name' => 'assign_to',
33		- 'tooltip' => __('Assign submitted reviews to a custom page/post ID. You can also enter "post_id" to assign reviews to the ID of the current page.', 'site-reviews'),
34		- 'type' => 'textbox',
35		- ], [
36		- 'label' => esc_html__('Classes', 'site-reviews'),
37		- 'name' => 'class',
38		- 'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
39		- 'type' => 'textbox',
40		- ], [
41		- 'columns' => 2,
42		- 'items' => $this->getHideOptions(),
43		- 'label' => esc_html__('Hide', 'site-reviews'),
44		- 'layout' => 'grid',
45		- 'spacing' => 5,
46		- 'type' => 'container',
47		- ], [
48		- 'hidden' => true,
49		- 'name' => 'id',
50		- 'type' => 'textbox',
51		- ], ];
52		- }
	7	+ /**
	8	+ * @return array
	9	+ */
	10	+ public function fields()
	11	+ {
	12	+ return [[
	13	+ 'type' => 'container',
	14	+ 'html' => '<p class="strong">'.esc_html__('All settings are optional.', 'site-reviews').'</p>',
	15	+ ], [
	16	+ 'label' => esc_html__('Title', 'site-reviews'),
	17	+ 'name' => 'title',
	18	+ 'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
	19	+ 'type' => 'textbox',
	20	+ ], [
	21	+ 'label' => esc_html__('Description', 'site-reviews'),
	22	+ 'minHeight' => 60,
	23	+ 'minWidth' => 240,
	24	+ 'multiline' => true,
	25	+ 'name' => 'description',
	26	+ 'tooltip' => __('Enter a custom shortcode description.', 'site-reviews'),
	27	+ 'type' => 'textbox',
	28	+ ],
	29	+ $this->getCategories(__('Automatically assign a category to reviews submitted with this shortcode.', 'site-reviews')),
	30	+ [
	31	+ 'label' => esc_html__('Assign To', 'site-reviews'),
	32	+ 'name' => 'assign_to',
	33	+ 'tooltip' => __('Assign submitted reviews to a custom page/post ID. You can also enter "post_id" to assign reviews to the ID of the current page.', 'site-reviews'),
	34	+ 'type' => 'textbox',
	35	+ ], [
	36	+ 'label' => esc_html__('Classes', 'site-reviews'),
	37	+ 'name' => 'class',
	38	+ 'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
	39	+ 'type' => 'textbox',
	40	+ ], [
	41	+ 'columns' => 2,
	42	+ 'items' => $this->getHideOptions(),
	43	+ 'label' => esc_html__('Hide', 'site-reviews'),
	44	+ 'layout' => 'grid',
	45	+ 'spacing' => 5,
	46	+ 'type' => 'container',
	47	+ ], [
	48	+ 'hidden' => true,
	49	+ 'name' => 'id',
	50	+ 'type' => 'textbox',
	51	+ ], ];
	52	+ }
53	53	}

		@@ -4,49 +4,49 @@
		block discarded – undo
4	4
5	5	class SiteReviewsSummaryPopup extends SiteReviewsPopup
6	6	{
7		- /**
8		- * @return array
9		- */
10		- public function fields()
11		- {
12		- return [[
13		- 'html' => sprintf('<p class="strong">%s</p>', esc_html__('All settings are optional.', 'site-reviews')),
14		- 'minWidth' => 320,
15		- 'type' => 'container',
16		- ], [
17		- 'label' => esc_html__('Title', 'site-reviews'),
18		- 'name' => 'title',
19		- 'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
20		- 'type' => 'textbox',
21		- ],
22		- $this->getTypes(__('Which type of review would you like to use?', 'site-reviews')),
23		- $this->getCategories(__('Limit reviews to this category.', 'site-reviews')),
24		- [
25		- 'label' => esc_html__('Assigned To', 'site-reviews'),
26		- 'name' => 'assigned_to',
27		- 'tooltip' => __('Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page, or "parent_id" to use the ID of the parent page.', 'site-reviews'),
28		- 'type' => 'textbox',
29		- ], [
30		- 'label' => esc_html__('Schema', 'site-reviews'),
31		- 'name' => 'schema',
32		- 'options' => [
33		- 'true' => esc_html__('Enable rich snippets', 'site-reviews'),
34		- 'false' => esc_html__('Disable rich snippets', 'site-reviews'),
35		- ],
36		- 'tooltip' => __('Rich snippets are disabled by default.', 'site-reviews'),
37		- 'type' => 'listbox',
38		- ], [
39		- 'label' => esc_html__('Classes', 'site-reviews'),
40		- 'name' => 'class',
41		- 'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
42		- 'type' => 'textbox',
43		- ], [
44		- 'columns' => 2,
45		- 'items' => $this->getHideOptions(),
46		- 'label' => esc_html__('Hide', 'site-reviews'),
47		- 'layout' => 'grid',
48		- 'spacing' => 5,
49		- 'type' => 'container',
50		- ], ];
51		- }
	7	+ /**
	8	+ * @return array
	9	+ */
	10	+ public function fields()
	11	+ {
	12	+ return [[
	13	+ 'html' => sprintf('<p class="strong">%s</p>', esc_html__('All settings are optional.', 'site-reviews')),
	14	+ 'minWidth' => 320,
	15	+ 'type' => 'container',
	16	+ ], [
	17	+ 'label' => esc_html__('Title', 'site-reviews'),
	18	+ 'name' => 'title',
	19	+ 'tooltip' => __('Enter a custom shortcode heading.', 'site-reviews'),
	20	+ 'type' => 'textbox',
	21	+ ],
	22	+ $this->getTypes(__('Which type of review would you like to use?', 'site-reviews')),
	23	+ $this->getCategories(__('Limit reviews to this category.', 'site-reviews')),
	24	+ [
	25	+ 'label' => esc_html__('Assigned To', 'site-reviews'),
	26	+ 'name' => 'assigned_to',
	27	+ 'tooltip' => __('Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page, or "parent_id" to use the ID of the parent page.', 'site-reviews'),
	28	+ 'type' => 'textbox',
	29	+ ], [
	30	+ 'label' => esc_html__('Schema', 'site-reviews'),
	31	+ 'name' => 'schema',
	32	+ 'options' => [
	33	+ 'true' => esc_html__('Enable rich snippets', 'site-reviews'),
	34	+ 'false' => esc_html__('Disable rich snippets', 'site-reviews'),
	35	+ ],
	36	+ 'tooltip' => __('Rich snippets are disabled by default.', 'site-reviews'),
	37	+ 'type' => 'listbox',
	38	+ ], [
	39	+ 'label' => esc_html__('Classes', 'site-reviews'),
	40	+ 'name' => 'class',
	41	+ 'tooltip' => __('Add custom CSS classes to the shortcode.', 'site-reviews'),
	42	+ 'type' => 'textbox',
	43	+ ], [
	44	+ 'columns' => 2,
	45	+ 'items' => $this->getHideOptions(),
	46	+ 'label' => esc_html__('Hide', 'site-reviews'),
	47	+ 'layout' => 'grid',
	48	+ 'spacing' => 5,
	49	+ 'type' => 'container',
	50	+ ], ];
	51	+ }
52	52	}

		@@ -4,17 +4,17 @@
		block discarded – undo
4	4
5	5	class SiteReviewsShortcode extends Shortcode
6	6	{
7		- protected function hideOptions()
8		- {
9		- return [
10		- 'title' => __('Hide the title', 'site-reviews'),
11		- 'rating' => __('Hide the rating', 'site-reviews'),
12		- 'date' => __('Hide the date', 'site-reviews'),
13		- 'assigned_to' => __('Hide the assigned to link (if shown)', 'site-reviews'),
14		- 'content' => __('Hide the content', 'site-reviews'),
15		- 'avatar' => __('Hide the avatar (if shown)', 'site-reviews'),
16		- 'author' => __('Hide the author', 'site-reviews'),
17		- 'response' => __('Hide the response', 'site-reviews'),
18		- ];
19		- }
	7	+ protected function hideOptions()
	8	+ {
	9	+ return [
	10	+ 'title' => __('Hide the title', 'site-reviews'),
	11	+ 'rating' => __('Hide the rating', 'site-reviews'),
	12	+ 'date' => __('Hide the date', 'site-reviews'),
	13	+ 'assigned_to' => __('Hide the assigned to link (if shown)', 'site-reviews'),
	14	+ 'content' => __('Hide the content', 'site-reviews'),
	15	+ 'avatar' => __('Hide the avatar (if shown)', 'site-reviews'),
	16	+ 'author' => __('Hide the author', 'site-reviews'),
	17	+ 'response' => __('Hide the response', 'site-reviews'),
	18	+ ];
	19	+ }
20	20	}

		@@ -4,14 +4,14 @@
		block discarded – undo
4	4
5	5	class SiteReviewsSummaryShortcode extends Shortcode
6	6	{
7		- protected function hideOptions()
8		- {
9		- return [
10		- 'rating' => __('Hide the rating', 'site-reviews'),
11		- 'stars' => __('Hide the stars', 'site-reviews'),
12		- 'summary' => __('Hide the summary', 'site-reviews'),
13		- 'bars' => __('Hide the percentage bars', 'site-reviews'),
14		- 'if_empty' => __('Hide if no reviews are found', 'site-reviews'),
15		- ];
16		- }
	7	+ protected function hideOptions()
	8	+ {
	9	+ return [
	10	+ 'rating' => __('Hide the rating', 'site-reviews'),
	11	+ 'stars' => __('Hide the stars', 'site-reviews'),
	12	+ 'summary' => __('Hide the summary', 'site-reviews'),
	13	+ 'bars' => __('Hide the percentage bars', 'site-reviews'),
	14	+ 'if_empty' => __('Hide if no reviews are found', 'site-reviews'),
	15	+ ];
	16	+ }
17	17	}

		@@ -6,325 +6,325 @@
		block discarded – undo
6	6
7	7	abstract class TinymcePopupGenerator
8	8	{
9		- /**
10		- * @var array
11		- */
12		- public $properties;
	9	+ /**
	10	+ * @var array
	11	+ */
	12	+ public $properties;
13	13
14		- /**
15		- * @var string
16		- */
17		- public $tag;
	14	+ /**
	15	+ * @var string
	16	+ */
	17	+ public $tag;
18	18
19		- /**
20		- * @var array
21		- */
22		- protected $errors = [];
	19	+ /**
	20	+ * @var array
	21	+ */
	22	+ protected $errors = [];
23	23
24		- /**
25		- * @var array
26		- */
27		- protected $required = [];
	24	+ /**
	25	+ * @var array
	26	+ */
	27	+ protected $required = [];
28	28
29		- /**
30		- * @return array
31		- */
32		- abstract public function fields();
	29	+ /**
	30	+ * @return array
	31	+ */
	32	+ abstract public function fields();
33	33
34		- /**
35		- * @param string $tag
36		- * @return static
37		- */
38		- public function register($tag, array $args)
39		- {
40		- $this->tag = $tag;
41		- $this->properties = wp_parse_args($args, [
42		- 'btn_close' => esc_html__('Close', 'site-reviews'),
43		- 'btn_okay' => esc_html__('Insert Shortcode', 'site-reviews'),
44		- 'errors' => $this->errors,
45		- 'fields' => $this->getFields(),
46		- 'label' => '['.$tag.']',
47		- 'required' => $this->required,
48		- 'title' => esc_html__('Shortcode', 'site-reviews'),
49		- ]);
50		- return $this;
51		- }
	34	+ /**
	35	+ * @param string $tag
	36	+ * @return static
	37	+ */
	38	+ public function register($tag, array $args)
	39	+ {
	40	+ $this->tag = $tag;
	41	+ $this->properties = wp_parse_args($args, [
	42	+ 'btn_close' => esc_html__('Close', 'site-reviews'),
	43	+ 'btn_okay' => esc_html__('Insert Shortcode', 'site-reviews'),
	44	+ 'errors' => $this->errors,
	45	+ 'fields' => $this->getFields(),
	46	+ 'label' => '['.$tag.']',
	47	+ 'required' => $this->required,
	48	+ 'title' => esc_html__('Shortcode', 'site-reviews'),
	49	+ ]);
	50	+ return $this;
	51	+ }
52	52
53		- /**
54		- * @return array
55		- */
56		- protected function generateFields(array $fields)
57		- {
58		- $generatedFields = array_map(function ($field) {
59		- if (empty($field)) {
60		- return;
61		- }
62		- $field = $this->normalize($field);
63		- if (!method_exists($this, $method = 'normalize'.ucfirst($field['type']))) {
64		- return;
65		- }
66		- return $this->$method($field);
67		- }, $fields);
68		- return array_values(array_filter($generatedFields));
69		- }
	53	+ /**
	54	+ * @return array
	55	+ */
	56	+ protected function generateFields(array $fields)
	57	+ {
	58	+ $generatedFields = array_map(function ($field) {
	59	+ if (empty($field)) {
	60	+ return;
	61	+ }
	62	+ $field = $this->normalize($field);
	63	+ if (!method_exists($this, $method = 'normalize'.ucfirst($field['type']))) {
	64	+ return;
	65	+ }
	66	+ return $this->$method($field);
	67	+ }, $fields);
	68	+ return array_values(array_filter($generatedFields));
	69	+ }
70	70
71		- /**
72		- * @param string $tooltip
73		- * @return array
74		- */
75		- protected function getCategories($tooltip = '')
76		- {
77		- $terms = glsr(Database::class)->getTerms();
78		- if (empty($terms)) {
79		- return [];
80		- }
81		- return [
82		- 'label' => esc_html__('Category', 'site-reviews'),
83		- 'name' => 'category',
84		- 'options' => $terms,
85		- 'tooltip' => $tooltip,
86		- 'type' => 'listbox',
87		- ];
88		- }
	71	+ /**
	72	+ * @param string $tooltip
	73	+ * @return array
	74	+ */
	75	+ protected function getCategories($tooltip = '')
	76	+ {
	77	+ $terms = glsr(Database::class)->getTerms();
	78	+ if (empty($terms)) {
	79	+ return [];
	80	+ }
	81	+ return [
	82	+ 'label' => esc_html__('Category', 'site-reviews'),
	83	+ 'name' => 'category',
	84	+ 'options' => $terms,
	85	+ 'tooltip' => $tooltip,
	86	+ 'type' => 'listbox',
	87	+ ];
	88	+ }
89	89
90		- /**
91		- * @return array
92		- */
93		- protected function getFields()
94		- {
95		- $fields = $this->generateFields($this->fields());
96		- if (!empty($this->errors)) {
97		- $errors = [];
98		- foreach ($this->required as $name => $alert) {
99		- if (false !== array_search($name, glsr_array_column($fields, 'name'))) {
100		- continue;
101		- }
102		- $errors[] = $this->errors[$name];
103		- }
104		- $this->errors = $errors;
105		- }
106		- return empty($this->errors)
107		- ? $fields
108		- : $this->errors;
109		- }
	90	+ /**
	91	+ * @return array
	92	+ */
	93	+ protected function getFields()
	94	+ {
	95	+ $fields = $this->generateFields($this->fields());
	96	+ if (!empty($this->errors)) {
	97	+ $errors = [];
	98	+ foreach ($this->required as $name => $alert) {
	99	+ if (false !== array_search($name, glsr_array_column($fields, 'name'))) {
	100	+ continue;
	101	+ }
	102	+ $errors[] = $this->errors[$name];
	103	+ }
	104	+ $this->errors = $errors;
	105	+ }
	106	+ return empty($this->errors)
	107	+ ? $fields
	108	+ : $this->errors;
	109	+ }
110	110
111		- /**
112		- * @return array
113		- */
114		- protected function getHideOptions()
115		- {
116		- $classname = str_replace('Popup', 'Shortcode', get_class($this));
117		- $hideOptions = glsr($classname)->getHideOptions();
118		- $options = [];
119		- foreach ($hideOptions as $name => $tooltip) {
120		- $options[] = [
121		- 'name' => 'hide_'.$name,
122		- 'text' => $name,
123		- 'tooltip' => $tooltip,
124		- 'type' => 'checkbox',
125		- ];
126		- }
127		- return $options;
128		- }
	111	+ /**
	112	+ * @return array
	113	+ */
	114	+ protected function getHideOptions()
	115	+ {
	116	+ $classname = str_replace('Popup', 'Shortcode', get_class($this));
	117	+ $hideOptions = glsr($classname)->getHideOptions();
	118	+ $options = [];
	119	+ foreach ($hideOptions as $name => $tooltip) {
	120	+ $options[] = [
	121	+ 'name' => 'hide_'.$name,
	122	+ 'text' => $name,
	123	+ 'tooltip' => $tooltip,
	124	+ 'type' => 'checkbox',
	125	+ ];
	126	+ }
	127	+ return $options;
	128	+ }
129	129
130		- /**
131		- * @param string $tooltip
132		- * @return array
133		- */
134		- protected function getTypes($tooltip = '')
135		- {
136		- if (count(glsr()->reviewTypes) < 2) {
137		- return [];
138		- }
139		- return [
140		- 'label' => esc_html__('Type', 'site-reviews'),
141		- 'name' => 'type',
142		- 'options' => glsr()->reviewTypes,
143		- 'tooltip' => $tooltip,
144		- 'type' => 'listbox',
145		- ];
146		- }
	130	+ /**
	131	+ * @param string $tooltip
	132	+ * @return array
	133	+ */
	134	+ protected function getTypes($tooltip = '')
	135	+ {
	136	+ if (count(glsr()->reviewTypes) < 2) {
	137	+ return [];
	138	+ }
	139	+ return [
	140	+ 'label' => esc_html__('Type', 'site-reviews'),
	141	+ 'name' => 'type',
	142	+ 'options' => glsr()->reviewTypes,
	143	+ 'tooltip' => $tooltip,
	144	+ 'type' => 'listbox',
	145	+ ];
	146	+ }
147	147
148		- /**
149		- * @return array
150		- */
151		- protected function normalize(array $field)
152		- {
153		- return wp_parse_args($field, [
154		- 'items' => [],
155		- 'type' => '',
156		- ]);
157		- }
	148	+ /**
	149	+ * @return array
	150	+ */
	151	+ protected function normalize(array $field)
	152	+ {
	153	+ return wp_parse_args($field, [
	154	+ 'items' => [],
	155	+ 'type' => '',
	156	+ ]);
	157	+ }
158	158
159		- /**
160		- * @return void\|array
161		- */
162		- protected function normalizeCheckbox(array $field)
163		- {
164		- return $this->normalizeField($field, [
165		- 'checked' => false,
166		- 'label' => '',
167		- 'minHeight' => '',
168		- 'minWidth' => '',
169		- 'name' => false,
170		- 'text' => '',
171		- 'tooltip' => '',
172		- 'type' => '',
173		- 'value' => '',
174		- ]);
175		- }
	159	+ /**
	160	+ * @return void\|array
	161	+ */
	162	+ protected function normalizeCheckbox(array $field)
	163	+ {
	164	+ return $this->normalizeField($field, [
	165	+ 'checked' => false,
	166	+ 'label' => '',
	167	+ 'minHeight' => '',
	168	+ 'minWidth' => '',
	169	+ 'name' => false,
	170	+ 'text' => '',
	171	+ 'tooltip' => '',
	172	+ 'type' => '',
	173	+ 'value' => '',
	174	+ ]);
	175	+ }
176	176
177		- /**
178		- * @return void\|array
179		- */
180		- protected function normalizeContainer(array $field)
181		- {
182		- if (!array_key_exists('html', $field) && !array_key_exists('items', $field)) {
183		- return;
184		- }
185		- $field['items'] = $this->generateFields($field['items']);
186		- return $field;
187		- }
	177	+ /**
	178	+ * @return void\|array
	179	+ */
	180	+ protected function normalizeContainer(array $field)
	181	+ {
	182	+ if (!array_key_exists('html', $field) && !array_key_exists('items', $field)) {
	183	+ return;
	184	+ }
	185	+ $field['items'] = $this->generateFields($field['items']);
	186	+ return $field;
	187	+ }
188	188
189		- /**
190		- * @return void\|array
191		- */
192		- protected function normalizeField(array $field, array $defaults)
193		- {
194		- if (!$this->validate($field)) {
195		- return;
196		- }
197		- return array_filter(shortcode_atts($defaults, $field), function ($value) {
198		- return '' !== $value;
199		- });
200		- }
	189	+ /**
	190	+ * @return void\|array
	191	+ */
	192	+ protected function normalizeField(array $field, array $defaults)
	193	+ {
	194	+ if (!$this->validate($field)) {
	195	+ return;
	196	+ }
	197	+ return array_filter(shortcode_atts($defaults, $field), function ($value) {
	198	+ return '' !== $value;
	199	+ });
	200	+ }
201	201
202		- /**
203		- * @return void\|array
204		- */
205		- protected function normalizeListbox(array $field)
206		- {
207		- $listbox = $this->normalizeField($field, [
208		- 'label' => '',
209		- 'minWidth' => '',
210		- 'name' => false,
211		- 'options' => [],
212		- 'placeholder' => esc_attr__('- Select -', 'site-reviews'),
213		- 'tooltip' => '',
214		- 'type' => '',
215		- 'value' => '',
216		- ]);
217		- if (!is_array($listbox)) {
218		- return;
219		- }
220		- if (!array_key_exists('', $listbox['options'])) {
221		- $listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
222		- }
223		- foreach ($listbox['options'] as $value => $text) {
224		- $listbox['values'][] = [
225		- 'text' => $text,
226		- 'value' => $value,
227		- ];
228		- }
229		- return $listbox;
230		- }
	202	+ /**
	203	+ * @return void\|array
	204	+ */
	205	+ protected function normalizeListbox(array $field)
	206	+ {
	207	+ $listbox = $this->normalizeField($field, [
	208	+ 'label' => '',
	209	+ 'minWidth' => '',
	210	+ 'name' => false,
	211	+ 'options' => [],
	212	+ 'placeholder' => esc_attr__('- Select -', 'site-reviews'),
	213	+ 'tooltip' => '',
	214	+ 'type' => '',
	215	+ 'value' => '',
	216	+ ]);
	217	+ if (!is_array($listbox)) {
	218	+ return;
	219	+ }
	220	+ if (!array_key_exists('', $listbox['options'])) {
	221	+ $listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
	222	+ }
	223	+ foreach ($listbox['options'] as $value => $text) {
	224	+ $listbox['values'][] = [
	225	+ 'text' => $text,
	226	+ 'value' => $value,
	227	+ ];
	228	+ }
	229	+ return $listbox;
	230	+ }
231	231
232		- /**
233		- * @return void\|array
234		- */
235		- protected function normalizePost(array $field)
236		- {
237		- if (!is_array($field['query_args'])) {
238		- $field['query_args'] = [];
239		- }
240		- $posts = get_posts(wp_parse_args($field['query_args'], [
241		- 'order' => 'ASC',
242		- 'orderby' => 'title',
243		- 'post_type' => 'post',
244		- 'posts_per_page' => 30,
245		- ]));
246		- if (!empty($posts)) {
247		- $options = [];
248		- foreach ($posts as $post) {
249		- $options[$post->ID] = esc_html($post->post_title);
250		- }
251		- $field['options'] = $options;
252		- $field['type'] = 'listbox';
253		- return $this->normalizeListbox($field);
254		- }
255		- $this->validate($field);
256		- }
	232	+ /**
	233	+ * @return void\|array
	234	+ */
	235	+ protected function normalizePost(array $field)
	236	+ {
	237	+ if (!is_array($field['query_args'])) {
	238	+ $field['query_args'] = [];
	239	+ }
	240	+ $posts = get_posts(wp_parse_args($field['query_args'], [
	241	+ 'order' => 'ASC',
	242	+ 'orderby' => 'title',
	243	+ 'post_type' => 'post',
	244	+ 'posts_per_page' => 30,
	245	+ ]));
	246	+ if (!empty($posts)) {
	247	+ $options = [];
	248	+ foreach ($posts as $post) {
	249	+ $options[$post->ID] = esc_html($post->post_title);
	250	+ }
	251	+ $field['options'] = $options;
	252	+ $field['type'] = 'listbox';
	253	+ return $this->normalizeListbox($field);
	254	+ }
	255	+ $this->validate($field);
	256	+ }
257	257
258		- /**
259		- * @return void\|array
260		- */
261		- protected function normalizeTextbox(array $field)
262		- {
263		- return $this->normalizeField($field, [
264		- 'hidden' => false,
265		- 'label' => '',
266		- 'maxLength' => '',
267		- 'minHeight' => '',
268		- 'minWidth' => '',
269		- 'multiline' => false,
270		- 'name' => false,
271		- 'size' => '',
272		- 'text' => '',
273		- 'tooltip' => '',
274		- 'type' => '',
275		- 'value' => '',
276		- ]);
277		- }
	258	+ /**
	259	+ * @return void\|array
	260	+ */
	261	+ protected function normalizeTextbox(array $field)
	262	+ {
	263	+ return $this->normalizeField($field, [
	264	+ 'hidden' => false,
	265	+ 'label' => '',
	266	+ 'maxLength' => '',
	267	+ 'minHeight' => '',
	268	+ 'minWidth' => '',
	269	+ 'multiline' => false,
	270	+ 'name' => false,
	271	+ 'size' => '',
	272	+ 'text' => '',
	273	+ 'tooltip' => '',
	274	+ 'type' => '',
	275	+ 'value' => '',
	276	+ ]);
	277	+ }
278	278
279		- /**
280		- * @return bool
281		- */
282		- protected function validate(array $field)
283		- {
284		- $args = shortcode_atts([
285		- 'label' => '',
286		- 'name' => false,
287		- 'required' => false,
288		- ], $field);
289		- if (!$args['name']) {
290		- return false;
291		- }
292		- return $this->validateErrors($args) && $this->validateRequired($args);
293		- }
	279	+ /**
	280	+ * @return bool
	281	+ */
	282	+ protected function validate(array $field)
	283	+ {
	284	+ $args = shortcode_atts([
	285	+ 'label' => '',
	286	+ 'name' => false,
	287	+ 'required' => false,
	288	+ ], $field);
	289	+ if (!$args['name']) {
	290	+ return false;
	291	+ }
	292	+ return $this->validateErrors($args) && $this->validateRequired($args);
	293	+ }
294	294
295		- /**
296		- * @return bool
297		- */
298		- protected function validateErrors(array $args)
299		- {
300		- if (!isset($args['required']['error'])) {
301		- return true;
302		- }
303		- $this->errors[$args['name']] = $this->normalizeContainer([
304		- 'html' => $args['required']['error'],
305		- 'type' => 'container',
306		- ]);
307		- return false;
308		- }
	295	+ /**
	296	+ * @return bool
	297	+ */
	298	+ protected function validateErrors(array $args)
	299	+ {
	300	+ if (!isset($args['required']['error'])) {
	301	+ return true;
	302	+ }
	303	+ $this->errors[$args['name']] = $this->normalizeContainer([
	304	+ 'html' => $args['required']['error'],
	305	+ 'type' => 'container',
	306	+ ]);
	307	+ return false;
	308	+ }
309	309
310		- /**
311		- * @return bool
312		- */
313		- protected function validateRequired(array $args)
314		- {
315		- if (false == $args['required']) {
316		- return true;
317		- }
318		- $alert = esc_html__('Some of the shortcode options are required.', 'site-reviews');
319		- if (isset($args['required']['alert'])) {
320		- $alert = $args['required']['alert'];
321		- } elseif (!empty($args['label'])) {
322		- $alert = sprintf(
323		- esc_html_x('The "%s" option is required.', 'the option label', 'site-reviews'),
324		- str_replace(':', '', $args['label'])
325		- );
326		- }
327		- $this->required[$args['name']] = $alert;
328		- return false;
329		- }
	310	+ /**
	311	+ * @return bool
	312	+ */
	313	+ protected function validateRequired(array $args)
	314	+ {
	315	+ if (false == $args['required']) {
	316	+ return true;
	317	+ }
	318	+ $alert = esc_html__('Some of the shortcode options are required.', 'site-reviews');
	319	+ if (isset($args['required']['alert'])) {
	320	+ $alert = $args['required']['alert'];
	321	+ } elseif (!empty($args['label'])) {
	322	+ $alert = sprintf(
	323	+ esc_html_x('The "%s" option is required.', 'the option label', 'site-reviews'),
	324	+ str_replace(':', '', $args['label'])
	325	+ );
	326	+ }
	327	+ $this->required[$args['name']] = $alert;
	328	+ return false;
	329	+ }
330	330	}

		@@ -6,18 +6,18 @@
		block discarded – undo
6	6
7	7	class PaginationDefaults extends Defaults
8	8	{
9		- /**
10		- * @return array
11		- */
12		- protected function defaults()
13		- {
14		- return [
15		- 'before_page_number' => '<span class="meta-nav screen-reader-text">'.__('Page', 'site-reviews').' </span>',
16		- 'format' => '?'.glsr()->constant('PAGED_QUERY_VAR').'=%#%',
17		- 'mid_size' => 1,
18		- 'next_text' => __('Next →', 'site-reviews'),
19		- 'prev_text' => __('← Previous', 'site-reviews'),
20		- 'type' => 'plain',
21		- ];
22		- }
	9	+ /**
	10	+ * @return array
	11	+ */
	12	+ protected function defaults()
	13	+ {
	14	+ return [
	15	+ 'before_page_number' => '<span class="meta-nav screen-reader-text">'.__('Page', 'site-reviews').' </span>',
	16	+ 'format' => '?'.glsr()->constant('PAGED_QUERY_VAR').'=%#%',
	17	+ 'mid_size' => 1,
	18	+ 'next_text' => __('Next →', 'site-reviews'),
	19	+ 'prev_text' => __('← Previous', 'site-reviews'),
	20	+ 'type' => 'plain',
	21	+ ];
	22	+ }
23	23	}

		@@ -6,32 +6,32 @@
		block discarded – undo
6	6
7	7	class SiteReviewsSummaryDefaults extends Defaults
8	8	{
9		- /**
10		- * @var array
11		- */
12		- protected $guarded = [
13		- 'labels',
14		- 'text',
15		- 'title',
16		- ];
	9	+ /**
	10	+ * @var array
	11	+ */
	12	+ protected $guarded = [
	13	+ 'labels',
	14	+ 'text',
	15	+ 'title',
	16	+ ];
17	17
18		- /**
19		- * @return array
20		- */
21		- protected function defaults()
22		- {
23		- return [
24		- 'assigned_to' => '',
25		- 'category' => '',
26		- 'class' => '',
27		- 'hide' => '',
28		- 'id' => '',
29		- 'labels' => '',
30		- 'rating' => 1,
31		- 'schema' => false,
32		- 'text' => '',
33		- 'title' => '',
34		- 'type' => 'local',
35		- ];
36		- }
	18	+ /**
	19	+ * @return array
	20	+ */
	21	+ protected function defaults()
	22	+ {
	23	+ return [
	24	+ 'assigned_to' => '',
	25	+ 'category' => '',
	26	+ 'class' => '',
	27	+ 'hide' => '',
	28	+ 'id' => '',
	29	+ 'labels' => '',
	30	+ 'rating' => 1,
	31	+ 'schema' => false,
	32	+ 'text' => '',
	33	+ 'title' => '',
	34	+ 'type' => 'local',
	35	+ ];
	36	+ }
37	37	}

pryley / site-reviews

Push — master ( 04b043...334ee0 )

Status

Category

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +301 added lines, -301 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch