pryley / site-reviews

plugin/Controllers/ListTableController.php

Indentation +246 added lines, -246 removed lines

@@ -14,265 +14,265 @@
 
 class ListTableController extends Controller
 {
-    /**
-     * @return void
-     * @action admin_action_approve
-     */
-    public function approve()
-    {
-        if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
-            return;
-        }
-        check_admin_referer('approve-review_'.($postId = $this->getPostId()));
-        wp_update_post([
-            'ID' => $postId,
-            'post_status' => 'publish',
-        ]);
-        wp_safe_redirect(wp_get_referer());
-        exit;
-    }
+	/**
+	 * @return void
+	 * @action admin_action_approve
+	 */
+	public function approve()
+	{
+		if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
+			return;
+		}
+		check_admin_referer('approve-review_'.($postId = $this->getPostId()));
+		wp_update_post([
+			'ID' => $postId,
+			'post_status' => 'publish',
+		]);
+		wp_safe_redirect(wp_get_referer());
+		exit;
+	}
 
-    /**
-     * @param array $columns
-     * @return array
-     * @filter manage_.Application::POST_TYPE._posts_columns
-     */
-    public function filterColumnsForPostType($columns)
-    {
-        $columns = Arr::consolidateArray($columns);
-        $postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
-        foreach ($postTypeColumns as $key => &$value) {
-            if (!array_key_exists($key, $columns) || !empty($value)) {
-                continue;
-            }
-            $value = $columns[$key];
-        }
-        if (count(glsr(Database::class)->getReviewsMeta('review_type')) < 2) {
-            unset($postTypeColumns['review_type']);
-        }
-        return array_filter($postTypeColumns, 'strlen');
-    }
+	/**
+	 * @param array $columns
+	 * @return array
+	 * @filter manage_.Application::POST_TYPE._posts_columns
+	 */
+	public function filterColumnsForPostType($columns)
+	{
+		$columns = Arr::consolidateArray($columns);
+		$postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
+		foreach ($postTypeColumns as $key => &$value) {
+			if (!array_key_exists($key, $columns) || !empty($value)) {
+				continue;
+			}
+			$value = $columns[$key];
+		}
+		if (count(glsr(Database::class)->getReviewsMeta('review_type')) < 2) {
+			unset($postTypeColumns['review_type']);
+		}
+		return array_filter($postTypeColumns, 'strlen');
+	}
 
-    /**
-     * @param string $status
-     * @param WP_Post $post
-     * @return string
-     * @filter post_date_column_status
-     */
-    public function filterDateColumnStatus($status, $post)
-    {
-        if (Application::POST_TYPE == Arr::get($post, 'post_type')) {
-            $status = __('Submitted', 'site-reviews');
-        }
-        return $status;
-    }
+	/**
+	 * @param string $status
+	 * @param WP_Post $post
+	 * @return string
+	 * @filter post_date_column_status
+	 */
+	public function filterDateColumnStatus($status, $post)
+	{
+		if (Application::POST_TYPE == Arr::get($post, 'post_type')) {
+			$status = __('Submitted', 'site-reviews');
+		}
+		return $status;
+	}
 
-    /**
-     * @param array $hidden
-     * @param WP_Screen $post
-     * @return array
-     * @filter default_hidden_columns
-     */
-    public function filterDefaultHiddenColumns($hidden, $screen)
-    {
-        if (Arr::get($screen, 'id') == 'edit-'.Application::POST_TYPE) {
-            $hidden = Arr::consolidateArray($hidden);
-            $hidden = array_unique(array_merge($hidden, [
-                'email', 'ip_address', 'response', 'reviewer',
-            ]));
-        }
-        return $hidden;
-    }
+	/**
+	 * @param array $hidden
+	 * @param WP_Screen $post
+	 * @return array
+	 * @filter default_hidden_columns
+	 */
+	public function filterDefaultHiddenColumns($hidden, $screen)
+	{
+		if (Arr::get($screen, 'id') == 'edit-'.Application::POST_TYPE) {
+			$hidden = Arr::consolidateArray($hidden);
+			$hidden = array_unique(array_merge($hidden, [
+				'email', 'ip_address', 'response', 'reviewer',
+			]));
+		}
+		return $hidden;
+	}
 
-    /**
-     * @param array $actions
-     * @param WP_Post $post
-     * @return array
-     * @filter post_row_actions
-     */
-    public function filterRowActions($actions, $post)
-    {
-        if (Application::POST_TYPE != Arr::get($post, 'post_type') || 'trash' == $post->post_status) {
-            return $actions;
-        }
-        unset($actions['inline hide-if-no-js']); //Remove Quick-edit
-        $rowActions = [
-            'approve' => esc_attr__('Approve', 'site-reviews'),
-            'unapprove' => esc_attr__('Unapprove', 'site-reviews'),
-        ];
-        $newActions = [];
-        foreach ($rowActions as $key => $text) {
-            $newActions[$key] = glsr(Builder::class)->a($text, [
-                'aria-label' => sprintf(esc_attr_x('%s this review', 'Approve the review', 'site-reviews'), $text),
-                'class' => 'glsr-change-status',
-                'href' => wp_nonce_url(
-                    admin_url('post.php?post='.$post->ID.'&action='.$key.'&plugin='.Application::ID),
-                    $key.'-review_'.$post->ID
-                ),
-            ]);
-        }
-        return $newActions + Arr::consolidateArray($actions);
-    }
+	/**
+	 * @param array $actions
+	 * @param WP_Post $post
+	 * @return array
+	 * @filter post_row_actions
+	 */
+	public function filterRowActions($actions, $post)
+	{
+		if (Application::POST_TYPE != Arr::get($post, 'post_type') || 'trash' == $post->post_status) {
+			return $actions;
+		}
+		unset($actions['inline hide-if-no-js']); //Remove Quick-edit
+		$rowActions = [
+			'approve' => esc_attr__('Approve', 'site-reviews'),
+			'unapprove' => esc_attr__('Unapprove', 'site-reviews'),
+		];
+		$newActions = [];
+		foreach ($rowActions as $key => $text) {
+			$newActions[$key] = glsr(Builder::class)->a($text, [
+				'aria-label' => sprintf(esc_attr_x('%s this review', 'Approve the review', 'site-reviews'), $text),
+				'class' => 'glsr-change-status',
+				'href' => wp_nonce_url(
+					admin_url('post.php?post='.$post->ID.'&action='.$key.'&plugin='.Application::ID),
+					$key.'-review_'.$post->ID
+				),
+			]);
+		}
+		return $newActions + Arr::consolidateArray($actions);
+	}
 
-    /**
-     * @param array $columns
-     * @return array
-     * @filter manage_edit-.Application::POST_TYPE._sortable_columns
-     */
-    public function filterSortableColumns($columns)
-    {
-        $columns = Arr::consolidateArray($columns);
-        $postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
-        unset($postTypeColumns['cb']);
-        foreach ($postTypeColumns as $key => $value) {
-            if (Str::startsWith('taxonomy', $key)) {
-                continue;
-            }
-            $columns[$key] = $key;
-        }
-        return $columns;
-    }
+	/**
+	 * @param array $columns
+	 * @return array
+	 * @filter manage_edit-.Application::POST_TYPE._sortable_columns
+	 */
+	public function filterSortableColumns($columns)
+	{
+		$columns = Arr::consolidateArray($columns);
+		$postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
+		unset($postTypeColumns['cb']);
+		foreach ($postTypeColumns as $key => $value) {
+			if (Str::startsWith('taxonomy', $key)) {
+				continue;
+			}
+			$columns[$key] = $key;
+		}
+		return $columns;
+	}
 
-    /**
-     * @param string $columnName
-     * @param string $postType
-     * @return void
-     * @action bulk_edit_custom_box
-     */
-    public function renderBulkEditFields($columnName, $postType)
-    {
-        if ('assigned_to' == $columnName && Application::POST_TYPE == $postType) {
-            glsr()->render('partials/editor/bulk-edit-assigned-to');
-        }
-    }
+	/**
+	 * @param string $columnName
+	 * @param string $postType
+	 * @return void
+	 * @action bulk_edit_custom_box
+	 */
+	public function renderBulkEditFields($columnName, $postType)
+	{
+		if ('assigned_to' == $columnName && Application::POST_TYPE == $postType) {
+			glsr()->render('partials/editor/bulk-edit-assigned-to');
+		}
+	}
 
-    /**
-     * @param string $postType
-     * @return void
-     * @action restrict_manage_posts
-     */
-    public function renderColumnFilters($postType)
-    {
-        glsr(Columns::class)->renderFilters($postType);
-    }
+	/**
+	 * @param string $postType
+	 * @return void
+	 * @action restrict_manage_posts
+	 */
+	public function renderColumnFilters($postType)
+	{
+		glsr(Columns::class)->renderFilters($postType);
+	}
 
-    /**
-     * @param string $column
-     * @param string $postId
-     * @return void
-     * @action manage_posts_custom_column
-     */
-    public function renderColumnValues($column, $postId)
-    {
-        glsr(Columns::class)->renderValues($column, $postId);
-    }
+	/**
+	 * @param string $column
+	 * @param string $postId
+	 * @return void
+	 * @action manage_posts_custom_column
+	 */
+	public function renderColumnValues($column, $postId)
+	{
+		glsr(Columns::class)->renderValues($column, $postId);
+	}
 
-    /**
-     * @param int $postId
-     * @return void
-     * @action save_post_.Application::POST_TYPE
-     */
-    public function saveBulkEditFields($postId)
-    {
-        if (!current_user_can('edit_posts')) {
-            return;
-        }
-        $assignedTo = filter_input(INPUT_GET, 'assigned_to');
-        if ($assignedTo && get_post($assignedTo)) {
-            glsr(Database::class)->update($postId, 'assigned_to', $assignedTo);
-        }
-    }
+	/**
+	 * @param int $postId
+	 * @return void
+	 * @action save_post_.Application::POST_TYPE
+	 */
+	public function saveBulkEditFields($postId)
+	{
+		if (!current_user_can('edit_posts')) {
+			return;
+		}
+		$assignedTo = filter_input(INPUT_GET, 'assigned_to');
+		if ($assignedTo && get_post($assignedTo)) {
+			glsr(Database::class)->update($postId, 'assigned_to', $assignedTo);
+		}
+	}
 
-    /**
-     * @return void
-     * @action pre_get_posts
-     */
-    public function setQueryForColumn(WP_Query $query)
-    {
-        if (!$this->hasPermission($query)) {
-            return;
-        }
-        $this->setMetaQuery($query, [
-            'rating', 'review_type',
-        ]);
-        $this->setOrderby($query);
-    }
+	/**
+	 * @return void
+	 * @action pre_get_posts
+	 */
+	public function setQueryForColumn(WP_Query $query)
+	{
+		if (!$this->hasPermission($query)) {
+			return;
+		}
+		$this->setMetaQuery($query, [
+			'rating', 'review_type',
+		]);
+		$this->setOrderby($query);
+	}
 
-    /**
-     * @return void
-     * @action admin_action_unapprove
-     */
-    public function unapprove()
-    {
-        if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
-            return;
-        }
-        check_admin_referer('unapprove-review_'.($postId = $this->getPostId()));
-        wp_update_post([
-            'ID' => $postId,
-            'post_status' => 'pending',
-        ]);
-        wp_safe_redirect(wp_get_referer());
-        exit;
-    }
+	/**
+	 * @return void
+	 * @action admin_action_unapprove
+	 */
+	public function unapprove()
+	{
+		if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
+			return;
+		}
+		check_admin_referer('unapprove-review_'.($postId = $this->getPostId()));
+		wp_update_post([
+			'ID' => $postId,
+			'post_status' => 'pending',
+		]);
+		wp_safe_redirect(wp_get_referer());
+		exit;
+	}
 
-    /**
-     * Check if the translation string can be modified.
-     * @param string $domain
-     * @return bool
-     */
-    protected function canModifyTranslation($domain = 'default')
-    {
-        $screen = glsr_current_screen();
-        return 'default' == $domain
-            && 'edit' == $screen->base
-            && Application::POST_TYPE == $screen->post_type;
-    }
+	/**
+	 * Check if the translation string can be modified.
+	 * @param string $domain
+	 * @return bool
+	 */
+	protected function canModifyTranslation($domain = 'default')
+	{
+		$screen = glsr_current_screen();
+		return 'default' == $domain
+			&& 'edit' == $screen->base
+			&& Application::POST_TYPE == $screen->post_type;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function hasPermission(WP_Query $query)
-    {
-        global $pagenow;
-        return is_admin()
-            && $query->is_main_query()
-            && Application::POST_TYPE == $query->get('post_type')
-            && 'edit.php' == $pagenow;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function hasPermission(WP_Query $query)
+	{
+		global $pagenow;
+		return is_admin()
+			&& $query->is_main_query()
+			&& Application::POST_TYPE == $query->get('post_type')
+			&& 'edit.php' == $pagenow;
+	}
 
-    /**
-     * @return void
-     */
-    protected function setMetaQuery(WP_Query $query, array $metaKeys)
-    {
-        foreach ($metaKeys as $key) {
-            if (!($value = filter_input(INPUT_GET, $key))) {
-                continue;
-            }
-            $metaQuery = (array) $query->get('meta_query');
-            $metaQuery[] = [
-                'key' => Str::prefix('_', $key, '_'),
-                'value' => $value,
-            ];
-            $query->set('meta_query', $metaQuery);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function setMetaQuery(WP_Query $query, array $metaKeys)
+	{
+		foreach ($metaKeys as $key) {
+			if (!($value = filter_input(INPUT_GET, $key))) {
+				continue;
+			}
+			$metaQuery = (array) $query->get('meta_query');
+			$metaQuery[] = [
+				'key' => Str::prefix('_', $key, '_'),
+				'value' => $value,
+			];
+			$query->set('meta_query', $metaQuery);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function setOrderby(WP_Query $query)
-    {
-        $orderby = $query->get('orderby');
-        $columns = glsr()->postTypeColumns[Application::POST_TYPE];
-        unset($columns['cb'], $columns['title'], $columns['date']);
-        if (in_array($orderby, array_keys($columns))) {
-            if ('reviewer' == $orderby) {
-                $orderby = 'author';
-            }
-            $query->set('meta_key', Str::prefix('_', $orderby, '_'));
-            $query->set('orderby', 'meta_value');
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function setOrderby(WP_Query $query)
+	{
+		$orderby = $query->get('orderby');
+		$columns = glsr()->postTypeColumns[Application::POST_TYPE];
+		unset($columns['cb'], $columns['title'], $columns['date']);
+		if (in_array($orderby, array_keys($columns))) {
+			if ('reviewer' == $orderby) {
+				$orderby = 'author';
+			}
+			$query->set('meta_key', Str::prefix('_', $orderby, '_'));
+			$query->set('orderby', 'meta_value');
+		}
+	}
 }

plugin/Controllers/EditorController/Labels.php

Indentation +98 added lines, -98 removed lines

@@ -7,106 +7,106 @@
 
 class Labels
 {
-    /**
-     * @param string $translation
-     * @param string $test
-     * @return string
-     */
-    public function filterPostStatusLabels($translation, $text)
-    {
-        $replacements = $this->getStatusLabels();
-        return array_key_exists($text, $replacements)
-            ? $replacements[$text]
-            : $translation;
-    }
+	/**
+	 * @param string $translation
+	 * @param string $test
+	 * @return string
+	 */
+	public function filterPostStatusLabels($translation, $text)
+	{
+		$replacements = $this->getStatusLabels();
+		return array_key_exists($text, $replacements)
+			? $replacements[$text]
+			: $translation;
+	}
 
-    /**
-     * @return array
-     */
-    public function filterUpdateMessages(array $messages)
-    {
-        $post = get_post();
-        if (!($post instanceof WP_Post)) {
-            return;
-        }
-        $strings = $this->getReviewLabels();
-        $restored = filter_input(INPUT_GET, 'revision');
-        if ($revisionTitle = wp_post_revision_title(intval($restored), false)) {
-            $restored = sprintf($strings['restored'], $revisionTitle);
-        }
-        $scheduled_date = date_i18n('M j, Y @ H:i', strtotime($post->post_date));
-        $messages[Application::POST_TYPE] = [
-             1 => $strings['updated'],
-             4 => $strings['updated'],
-             5 => $restored,
-             6 => $strings['published'],
-             7 => $strings['saved'],
-             8 => $strings['submitted'],
-             9 => sprintf($strings['scheduled'], '<strong>'.$scheduled_date.'</strong>'),
-            10 => $strings['draft_updated'],
-            50 => $strings['approved'],
-            51 => $strings['unapproved'],
-            52 => $strings['reverted'],
-        ];
-        return $messages;
-    }
+	/**
+	 * @return array
+	 */
+	public function filterUpdateMessages(array $messages)
+	{
+		$post = get_post();
+		if (!($post instanceof WP_Post)) {
+			return;
+		}
+		$strings = $this->getReviewLabels();
+		$restored = filter_input(INPUT_GET, 'revision');
+		if ($revisionTitle = wp_post_revision_title(intval($restored), false)) {
+			$restored = sprintf($strings['restored'], $revisionTitle);
+		}
+		$scheduled_date = date_i18n('M j, Y @ H:i', strtotime($post->post_date));
+		$messages[Application::POST_TYPE] = [
+			 1 => $strings['updated'],
+			 4 => $strings['updated'],
+			 5 => $restored,
+			 6 => $strings['published'],
+			 7 => $strings['saved'],
+			 8 => $strings['submitted'],
+			 9 => sprintf($strings['scheduled'], '<strong>'.$scheduled_date.'</strong>'),
+			10 => $strings['draft_updated'],
+			50 => $strings['approved'],
+			51 => $strings['unapproved'],
+			52 => $strings['reverted'],
+		];
+		return $messages;
+	}
 
-    /**
-     * @return void
-     */
-    public function translatePostStatusLabels()
-    {
-        global $wp_scripts;
-        $strings = [
-            'savePending' => __('Save as Unapproved', 'site-reviews'),
-            'published' => __('Approved', 'site-reviews'),
-        ];
-        if (isset($wp_scripts->registered['post']->extra['data'])) {
-            $l10n = &$wp_scripts->registered['post']->extra['data'];
-            foreach ($strings as $search => $replace) {
-                $l10n = preg_replace('/("'.$search.'":")([^"]+)/', '$1'.$replace, $l10n);
-            }
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function translatePostStatusLabels()
+	{
+		global $wp_scripts;
+		$strings = [
+			'savePending' => __('Save as Unapproved', 'site-reviews'),
+			'published' => __('Approved', 'site-reviews'),
+		];
+		if (isset($wp_scripts->registered['post']->extra['data'])) {
+			$l10n = &$wp_scripts->registered['post']->extra['data'];
+			foreach ($strings as $search => $replace) {
+				$l10n = preg_replace('/("'.$search.'":")([^"]+)/', '$1'.$replace, $l10n);
+			}
+		}
+	}
 
-    /**
-     * @return array
-     */
-    protected function getReviewLabels()
-    {
-        return [
-            'approved' => __('Review has been approved and published.', 'site-reviews'),
-            'draft_updated' => __('Review draft updated.', 'site-reviews'),
-            'preview' => __('Preview review', 'site-reviews'),
-            'published' => __('Review approved and published.', 'site-reviews'),
-            'restored' => __('Review restored to revision from %s.', 'site-reviews'),
-            'reverted' => __('Review has been reverted to its original submission state (title, content, and submission date).', 'site-reviews'),
-            'saved' => __('Review saved.', 'site-reviews'),
-            'scheduled' => __('Review scheduled for: %s.', 'site-reviews'),
-            'submitted' => __('Review submitted.', 'site-reviews'),
-            'unapproved' => __('Review has been unapproved and is now pending.', 'site-reviews'),
-            'updated' => __('Review updated.', 'site-reviews'),
-            'view' => __('View review', 'site-reviews'),
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getReviewLabels()
+	{
+		return [
+			'approved' => __('Review has been approved and published.', 'site-reviews'),
+			'draft_updated' => __('Review draft updated.', 'site-reviews'),
+			'preview' => __('Preview review', 'site-reviews'),
+			'published' => __('Review approved and published.', 'site-reviews'),
+			'restored' => __('Review restored to revision from %s.', 'site-reviews'),
+			'reverted' => __('Review has been reverted to its original submission state (title, content, and submission date).', 'site-reviews'),
+			'saved' => __('Review saved.', 'site-reviews'),
+			'scheduled' => __('Review scheduled for: %s.', 'site-reviews'),
+			'submitted' => __('Review submitted.', 'site-reviews'),
+			'unapproved' => __('Review has been unapproved and is now pending.', 'site-reviews'),
+			'updated' => __('Review updated.', 'site-reviews'),
+			'view' => __('View review', 'site-reviews'),
+		];
+	}
 
-    /**
-     * Store the labels to avoid unnecessary loops.
-     * @return array
-     */
-    protected function getStatusLabels()
-    {
-        static $labels;
-        if (empty($labels)) {
-            $labels = [
-                'Pending' => __('Unapproved', 'site-reviews'),
-                'Pending Review' => __('Unapproved', 'site-reviews'),
-                'Privately Published' => __('Privately Approved', 'site-reviews'),
-                'Publish' => __('Approve', 'site-reviews'),
-                'Published' => __('Approved', 'site-reviews'),
-                'Save as Pending' => __('Save as Unapproved', 'site-reviews'),
-            ];
-        }
-        return $labels;
-    }
+	/**
+	 * Store the labels to avoid unnecessary loops.
+	 * @return array
+	 */
+	protected function getStatusLabels()
+	{
+		static $labels;
+		if (empty($labels)) {
+			$labels = [
+				'Pending' => __('Unapproved', 'site-reviews'),
+				'Pending Review' => __('Unapproved', 'site-reviews'),
+				'Privately Published' => __('Privately Approved', 'site-reviews'),
+				'Publish' => __('Approve', 'site-reviews'),
+				'Published' => __('Approved', 'site-reviews'),
+				'Save as Pending' => __('Save as Unapproved', 'site-reviews'),
+			];
+		}
+		return $labels;
+	}
 }

plugin/Controllers/EditorController.php

Indentation +373 added lines, -373 removed lines

@@ -20,401 +20,401 @@
 
 class EditorController extends Controller
 {
-    /**
-     * @param array $settings
-     * @return array
-     * @filter wp_editor_settings
-     */
-    public function filterEditorSettings($settings)
-    {
-        return glsr(Customization::class)->filterEditorSettings(
-            Arr::consolidateArray($settings)
-        );
-    }
+	/**
+	 * @param array $settings
+	 * @return array
+	 * @filter wp_editor_settings
+	 */
+	public function filterEditorSettings($settings)
+	{
+		return glsr(Customization::class)->filterEditorSettings(
+			Arr::consolidateArray($settings)
+		);
+	}
 
-    /**
-     * Modify the WP_Editor html to allow autosizing without breaking the `editor-expand` script.
-     * @param string $html
-     * @return string
-     * @filter the_editor
-     */
-    public function filterEditorTextarea($html)
-    {
-        return glsr(Customization::class)->filterEditorTextarea($html);
-    }
+	/**
+	 * Modify the WP_Editor html to allow autosizing without breaking the `editor-expand` script.
+	 * @param string $html
+	 * @return string
+	 * @filter the_editor
+	 */
+	public function filterEditorTextarea($html)
+	{
+		return glsr(Customization::class)->filterEditorTextarea($html);
+	}
 
-    /**
-     * @param bool $protected
-     * @param string $metaKey
-     * @param string $metaType
-     * @return bool
-     * @filter is_protected_meta
-     */
-    public function filterIsProtectedMeta($protected, $metaKey, $metaType)
-    {
-        if ('post' == $metaType && Application::POST_TYPE == get_post_type()) {
-            $values = glsr(CreateReviewDefaults::class)->unguarded();
-            $values = Arr::prefixArrayKeys($values);
-            if (array_key_exists($metaKey, $values)) {
-                $protected = false;
-            }
-        }
-        return $protected;
-    }
+	/**
+	 * @param bool $protected
+	 * @param string $metaKey
+	 * @param string $metaType
+	 * @return bool
+	 * @filter is_protected_meta
+	 */
+	public function filterIsProtectedMeta($protected, $metaKey, $metaType)
+	{
+		if ('post' == $metaType && Application::POST_TYPE == get_post_type()) {
+			$values = glsr(CreateReviewDefaults::class)->unguarded();
+			$values = Arr::prefixArrayKeys($values);
+			if (array_key_exists($metaKey, $values)) {
+				$protected = false;
+			}
+		}
+		return $protected;
+	}
 
-    /**
-     * @param array $messages
-     * @return array
-     * @filter post_updated_messages
-     */
-    public function filterUpdateMessages($messages)
-    {
-        return glsr(Labels::class)->filterUpdateMessages(
-            Arr::consolidateArray($messages)
-        );
-    }
+	/**
+	 * @param array $messages
+	 * @return array
+	 * @filter post_updated_messages
+	 */
+	public function filterUpdateMessages($messages)
+	{
+		return glsr(Labels::class)->filterUpdateMessages(
+			Arr::consolidateArray($messages)
+		);
+	}
 
-    /**
-     * @return void
-     * @action add_meta_boxes_{Application::POST_TYPE}
-     */
-    public function registerMetaBoxes($post)
-    {
-        add_meta_box(Application::ID.'_assigned_to', __('Assigned To', 'site-reviews'), [$this, 'renderAssignedToMetabox'], null, 'side');
-        add_meta_box(Application::ID.'_review', __('Details', 'site-reviews'), [$this, 'renderDetailsMetaBox'], null, 'side');
-        if ('local' != glsr(Database::class)->get($post->ID, 'review_type')) {
-            return;
-        }
-        add_meta_box(Application::ID.'_response', __('Respond Publicly', 'site-reviews'), [$this, 'renderResponseMetaBox'], null, 'normal');
-    }
+	/**
+	 * @return void
+	 * @action add_meta_boxes_{Application::POST_TYPE}
+	 */
+	public function registerMetaBoxes($post)
+	{
+		add_meta_box(Application::ID.'_assigned_to', __('Assigned To', 'site-reviews'), [$this, 'renderAssignedToMetabox'], null, 'side');
+		add_meta_box(Application::ID.'_review', __('Details', 'site-reviews'), [$this, 'renderDetailsMetaBox'], null, 'side');
+		if ('local' != glsr(Database::class)->get($post->ID, 'review_type')) {
+			return;
+		}
+		add_meta_box(Application::ID.'_response', __('Respond Publicly', 'site-reviews'), [$this, 'renderResponseMetaBox'], null, 'normal');
+	}
 
-    /**
-     * @return void
-     * @action admin_print_scripts
-     */
-    public function removeAutosave()
-    {
-        glsr(Customization::class)->removeAutosave();
-    }
+	/**
+	 * @return void
+	 * @action admin_print_scripts
+	 */
+	public function removeAutosave()
+	{
+		glsr(Customization::class)->removeAutosave();
+	}
 
-    /**
-     * @return void
-     * @action admin_menu
-     */
-    public function removeMetaBoxes()
-    {
-        glsr(Customization::class)->removeMetaBoxes();
-    }
+	/**
+	 * @return void
+	 * @action admin_menu
+	 */
+	public function removeMetaBoxes()
+	{
+		glsr(Customization::class)->removeMetaBoxes();
+	}
 
-    /**
-     * @return void
-     */
-    public function removePostTypeSupport()
-    {
-        glsr(Customization::class)->removePostTypeSupport();
-    }
+	/**
+	 * @return void
+	 */
+	public function removePostTypeSupport()
+	{
+		glsr(Customization::class)->removePostTypeSupport();
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @callback add_meta_box
-     */
-    public function renderAssignedToMetabox($post)
-    {
-        if (!$this->isReviewPostType($post)) {
-            return;
-        }
-        $assignedTo = (string) glsr(Database::class)->get($post->ID, 'assigned_to');
-        wp_nonce_field('assigned_to', '_nonce-assigned-to', false);
-        glsr()->render('partials/editor/metabox-assigned-to', [
-            'id' => $assignedTo,
-            'template' => $this->buildAssignedToTemplate($assignedTo, $post),
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @callback add_meta_box
+	 */
+	public function renderAssignedToMetabox($post)
+	{
+		if (!$this->isReviewPostType($post)) {
+			return;
+		}
+		$assignedTo = (string) glsr(Database::class)->get($post->ID, 'assigned_to');
+		wp_nonce_field('assigned_to', '_nonce-assigned-to', false);
+		glsr()->render('partials/editor/metabox-assigned-to', [
+			'id' => $assignedTo,
+			'template' => $this->buildAssignedToTemplate($assignedTo, $post),
+		]);
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @callback add_meta_box
-     */
-    public function renderDetailsMetaBox($post)
-    {
-        if (!$this->isReviewPostType($post)) {
-            return;
-        }
-        $review = glsr_get_review($post);
-        glsr()->render('partials/editor/metabox-details', [
-            'button' => $this->buildDetailsMetaBoxRevertButton($review, $post),
-            'metabox' => $this->normalizeDetailsMetaBox($review),
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @callback add_meta_box
+	 */
+	public function renderDetailsMetaBox($post)
+	{
+		if (!$this->isReviewPostType($post)) {
+			return;
+		}
+		$review = glsr_get_review($post);
+		glsr()->render('partials/editor/metabox-details', [
+			'button' => $this->buildDetailsMetaBoxRevertButton($review, $post),
+			'metabox' => $this->normalizeDetailsMetaBox($review),
+		]);
+	}
 
-    /**
-     * @return void
-     * @action post_submitbox_misc_actions
-     */
-    public function renderPinnedInPublishMetaBox()
-    {
-        if (!$this->isReviewPostType(get_post())) {
-            return;
-        }
-        glsr(Template::class)->render('partials/editor/pinned', [
-            'context' => [
-                'no' => __('No', 'site-reviews'),
-                'yes' => __('Yes', 'site-reviews'),
-            ],
-            'pinned' => wp_validate_boolean(glsr(Database::class)->get(get_the_ID(), 'pinned')),
-        ]);
-    }
+	/**
+	 * @return void
+	 * @action post_submitbox_misc_actions
+	 */
+	public function renderPinnedInPublishMetaBox()
+	{
+		if (!$this->isReviewPostType(get_post())) {
+			return;
+		}
+		glsr(Template::class)->render('partials/editor/pinned', [
+			'context' => [
+				'no' => __('No', 'site-reviews'),
+				'yes' => __('Yes', 'site-reviews'),
+			],
+			'pinned' => wp_validate_boolean(glsr(Database::class)->get(get_the_ID(), 'pinned')),
+		]);
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @callback add_meta_box
-     */
-    public function renderResponseMetaBox($post)
-    {
-        if (!$this->isReviewPostType($post)) {
-            return;
-        }
-        wp_nonce_field('response', '_nonce-response', false);
-        glsr()->render('partials/editor/metabox-response', [
-            'response' => glsr(Database::class)->get($post->ID, 'response'),
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @callback add_meta_box
+	 */
+	public function renderResponseMetaBox($post)
+	{
+		if (!$this->isReviewPostType($post)) {
+			return;
+		}
+		wp_nonce_field('response', '_nonce-response', false);
+		glsr()->render('partials/editor/metabox-response', [
+			'response' => glsr(Database::class)->get($post->ID, 'response'),
+		]);
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @action edit_form_after_title
-     */
-    public function renderReviewEditor($post)
-    {
-        if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) {
-            return;
-        }
-        glsr()->render('partials/editor/review', [
-            'post' => $post,
-            'response' => glsr(Database::class)->get($post->ID, 'response'),
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @action edit_form_after_title
+	 */
+	public function renderReviewEditor($post)
+	{
+		if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) {
+			return;
+		}
+		glsr()->render('partials/editor/review', [
+			'post' => $post,
+			'response' => glsr(Database::class)->get($post->ID, 'response'),
+		]);
+	}
 
-    /**
-     * @return void
-     * @action admin_head
-     */
-    public function renderReviewFields()
-    {
-        $screen = glsr_current_screen();
-        if ('post' != $screen->base || Application::POST_TYPE != $screen->post_type) {
-            return;
-        }
-        add_action('edit_form_after_title', [$this, 'renderReviewEditor']);
-        add_action('edit_form_top', [$this, 'renderReviewNotice']);
-    }
+	/**
+	 * @return void
+	 * @action admin_head
+	 */
+	public function renderReviewFields()
+	{
+		$screen = glsr_current_screen();
+		if ('post' != $screen->base || Application::POST_TYPE != $screen->post_type) {
+			return;
+		}
+		add_action('edit_form_after_title', [$this, 'renderReviewEditor']);
+		add_action('edit_form_top', [$this, 'renderReviewNotice']);
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @action edit_form_top
-     */
-    public function renderReviewNotice($post)
-    {
-        if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) {
-            return;
-        }
-        glsr(Notice::class)->addWarning(sprintf(
-            __('%s reviews are read-only.', 'site-reviews'),
-            glsr(Columns::class)->buildColumnReviewType($post->ID)
-        ));
-        glsr(Template::class)->render('partials/editor/notice', [
-            'context' => [
-                'notices' => glsr(Notice::class)->get(),
-            ],
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @action edit_form_top
+	 */
+	public function renderReviewNotice($post)
+	{
+		if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) {
+			return;
+		}
+		glsr(Notice::class)->addWarning(sprintf(
+			__('%s reviews are read-only.', 'site-reviews'),
+			glsr(Columns::class)->buildColumnReviewType($post->ID)
+		));
+		glsr(Template::class)->render('partials/editor/notice', [
+			'context' => [
+				'notices' => glsr(Notice::class)->get(),
+			],
+		]);
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @see glsr_categories_meta_box()
-     * @callback register_taxonomy
-     */
-    public function renderTaxonomyMetabox($post)
-    {
-        if (!$this->isReviewPostType($post)) {
-            return;
-        }
-        glsr()->render('partials/editor/metabox-categories', [
-            'post' => $post,
-            'tax_name' => Application::TAXONOMY,
-            'taxonomy' => get_taxonomy(Application::TAXONOMY),
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @see glsr_categories_meta_box()
+	 * @callback register_taxonomy
+	 */
+	public function renderTaxonomyMetabox($post)
+	{
+		if (!$this->isReviewPostType($post)) {
+			return;
+		}
+		glsr()->render('partials/editor/metabox-categories', [
+			'post' => $post,
+			'tax_name' => Application::TAXONOMY,
+			'taxonomy' => get_taxonomy(Application::TAXONOMY),
+		]);
+	}
 
-    /**
-     * @return void
-     * @see $this->filterUpdateMessages()
-     * @action admin_action_revert
-     */
-    public function revertReview()
-    {
-        if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
-            return;
-        }
-        check_admin_referer('revert-review_'.($postId = $this->getPostId()));
-        glsr(ReviewManager::class)->revert($postId);
-        $this->redirect($postId, 52);
-    }
+	/**
+	 * @return void
+	 * @see $this->filterUpdateMessages()
+	 * @action admin_action_revert
+	 */
+	public function revertReview()
+	{
+		if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
+			return;
+		}
+		check_admin_referer('revert-review_'.($postId = $this->getPostId()));
+		glsr(ReviewManager::class)->revert($postId);
+		$this->redirect($postId, 52);
+	}
 
-    /**
-     * @param int $postId
-     * @param \WP_Post $post
-     * @param bool $isUpdate
-     * @return void
-     * @action save_post_.Application::POST_TYPE
-     */
-    public function saveMetaboxes($postId, $post, $isUpdating)
-    {
-        glsr(Metaboxes::class)->saveAssignedToMetabox($postId);
-        glsr(Metaboxes::class)->saveResponseMetabox($postId);
-        if ($isUpdating) {
-            do_action('site-reviews/review/saved', glsr_get_review($postId));
-        }
-    }
+	/**
+	 * @param int $postId
+	 * @param \WP_Post $post
+	 * @param bool $isUpdate
+	 * @return void
+	 * @action save_post_.Application::POST_TYPE
+	 */
+	public function saveMetaboxes($postId, $post, $isUpdating)
+	{
+		glsr(Metaboxes::class)->saveAssignedToMetabox($postId);
+		glsr(Metaboxes::class)->saveResponseMetabox($postId);
+		if ($isUpdating) {
+			do_action('site-reviews/review/saved', glsr_get_review($postId));
+		}
+	}
 
-    /**
-     * @param string $assignedTo
-     * @return string
-     */
-    protected function buildAssignedToTemplate($assignedTo, WP_Post $post)
-    {
-        $assignedPost = glsr(Database::class)->getAssignedToPost($post->ID, $assignedTo);
-        if (!($assignedPost instanceof WP_Post)) {
-            return;
-        }
-        return glsr(Template::class)->build('partials/editor/assigned-post', [
-            'context' => [
-                'data.url' => (string) get_permalink($assignedPost),
-                'data.title' => get_the_title($assignedPost),
-            ],
-        ]);
-    }
+	/**
+	 * @param string $assignedTo
+	 * @return string
+	 */
+	protected function buildAssignedToTemplate($assignedTo, WP_Post $post)
+	{
+		$assignedPost = glsr(Database::class)->getAssignedToPost($post->ID, $assignedTo);
+		if (!($assignedPost instanceof WP_Post)) {
+			return;
+		}
+		return glsr(Template::class)->build('partials/editor/assigned-post', [
+			'context' => [
+				'data.url' => (string) get_permalink($assignedPost),
+				'data.title' => get_the_title($assignedPost),
+			],
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildDetailsMetaBoxRevertButton(Review $review, WP_Post $post)
-    {
-        $isModified = !Arr::compareArrays(
-            [$review->title, $review->content, $review->date],
-            [
-                glsr(Database::class)->get($post->ID, 'title'),
-                glsr(Database::class)->get($post->ID, 'content'),
-                glsr(Database::class)->get($post->ID, 'date'),
-            ]
-        );
-        if ($isModified) {
-            $revertUrl = wp_nonce_url(
-                admin_url('post.php?post='.$post->ID.'&action=revert&plugin='.Application::ID),
-                'revert-review_'.$post->ID
-            );
-            return glsr(Builder::class)->a(__('Revert Changes', 'site-reviews'), [
-                'class' => 'button button-large',
-                'href' => $revertUrl,
-                'id' => 'revert',
-            ]);
-        }
-        return glsr(Builder::class)->button(__('Nothing to Revert', 'site-reviews'), [
-            'class' => 'button-large',
-            'disabled' => true,
-            'id' => 'revert',
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildDetailsMetaBoxRevertButton(Review $review, WP_Post $post)
+	{
+		$isModified = !Arr::compareArrays(
+			[$review->title, $review->content, $review->date],
+			[
+				glsr(Database::class)->get($post->ID, 'title'),
+				glsr(Database::class)->get($post->ID, 'content'),
+				glsr(Database::class)->get($post->ID, 'date'),
+			]
+		);
+		if ($isModified) {
+			$revertUrl = wp_nonce_url(
+				admin_url('post.php?post='.$post->ID.'&action=revert&plugin='.Application::ID),
+				'revert-review_'.$post->ID
+			);
+			return glsr(Builder::class)->a(__('Revert Changes', 'site-reviews'), [
+				'class' => 'button button-large',
+				'href' => $revertUrl,
+				'id' => 'revert',
+			]);
+		}
+		return glsr(Builder::class)->button(__('Nothing to Revert', 'site-reviews'), [
+			'class' => 'button-large',
+			'disabled' => true,
+			'id' => 'revert',
+		]);
+	}
 
-    /**
-     * @param object $review
-     * @return string|void
-     */
-    protected function getReviewType($review)
-    {
-        if (count(glsr()->reviewTypes) < 2) {
-            return;
-        }
-        $reviewType = array_key_exists($review->review_type, glsr()->reviewTypes)
-            ? glsr()->reviewTypes[$review->review_type]
-            : __('Unknown', 'site-reviews');
-        if (!empty($review->url)) {
-            $reviewType = glsr(Builder::class)->a($reviewType, [
-                'href' => $review->url,
-                'target' => '_blank',
-            ]);
-        }
-        return $reviewType;
-    }
+	/**
+	 * @param object $review
+	 * @return string|void
+	 */
+	protected function getReviewType($review)
+	{
+		if (count(glsr()->reviewTypes) < 2) {
+			return;
+		}
+		$reviewType = array_key_exists($review->review_type, glsr()->reviewTypes)
+			? glsr()->reviewTypes[$review->review_type]
+			: __('Unknown', 'site-reviews');
+		if (!empty($review->url)) {
+			$reviewType = glsr(Builder::class)->a($reviewType, [
+				'href' => $review->url,
+				'target' => '_blank',
+			]);
+		}
+		return $reviewType;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isReviewEditable($post)
-    {
-        return $this->isReviewPostType($post)
-            && post_type_supports(Application::POST_TYPE, 'title')
-            && 'local' == glsr(Database::class)->get($post->ID, 'review_type');
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isReviewEditable($post)
+	{
+		return $this->isReviewPostType($post)
+			&& post_type_supports(Application::POST_TYPE, 'title')
+			&& 'local' == glsr(Database::class)->get($post->ID, 'review_type');
+	}
 
-    /**
-     * @param mixed $post
-     * @return bool
-     */
-    protected function isReviewPostType($post)
-    {
-        return $post instanceof WP_Post && Application::POST_TYPE == $post->post_type;
-    }
+	/**
+	 * @param mixed $post
+	 * @return bool
+	 */
+	protected function isReviewPostType($post)
+	{
+		return $post instanceof WP_Post && Application::POST_TYPE == $post->post_type;
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeDetailsMetaBox(Review $review)
-    {
-        $user = empty($review->user_id)
-            ? __('Unregistered user', 'site-reviews')
-            : glsr(Builder::class)->a(get_the_author_meta('display_name', $review->user_id), [
-                'href' => get_author_posts_url($review->user_id),
-            ]);
-        $email = empty($review->email)
-            ? '&mdash;'
-            : glsr(Builder::class)->a($review->email, [
-                'href' => 'mailto:'.$review->email.'?subject='.esc_attr(__('RE:', 'site-reviews').' '.$review->title),
-            ]);
-        $metabox = [
-            __('Rating', 'site-reviews') => glsr_star_rating($review->rating),
-            __('Type', 'site-reviews') => $this->getReviewType($review),
-            __('Date', 'site-reviews') => get_date_from_gmt($review->date, 'F j, Y'),
-            __('Name', 'site-reviews') => $review->author,
-            __('Email', 'site-reviews') => $email,
-            __('User', 'site-reviews') => $user,
-            __('IP Address', 'site-reviews') => $review->ip_address,
-            __('Avatar', 'site-reviews') => sprintf('<img src="%s" width="96">', $review->avatar),
-        ];
-        return array_filter(apply_filters('site-reviews/metabox/details', $metabox, $review));
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeDetailsMetaBox(Review $review)
+	{
+		$user = empty($review->user_id)
+			? __('Unregistered user', 'site-reviews')
+			: glsr(Builder::class)->a(get_the_author_meta('display_name', $review->user_id), [
+				'href' => get_author_posts_url($review->user_id),
+			]);
+		$email = empty($review->email)
+			? '&mdash;'
+			: glsr(Builder::class)->a($review->email, [
+				'href' => 'mailto:'.$review->email.'?subject='.esc_attr(__('RE:', 'site-reviews').' '.$review->title),
+			]);
+		$metabox = [
+			__('Rating', 'site-reviews') => glsr_star_rating($review->rating),
+			__('Type', 'site-reviews') => $this->getReviewType($review),
+			__('Date', 'site-reviews') => get_date_from_gmt($review->date, 'F j, Y'),
+			__('Name', 'site-reviews') => $review->author,
+			__('Email', 'site-reviews') => $email,
+			__('User', 'site-reviews') => $user,
+			__('IP Address', 'site-reviews') => $review->ip_address,
+			__('Avatar', 'site-reviews') => sprintf('<img src="%s" width="96">', $review->avatar),
+		];
+		return array_filter(apply_filters('site-reviews/metabox/details', $metabox, $review));
+	}
 
-    /**
-     * @param int $postId
-     * @param int $messageIndex
-     * @return void
-     */
-    protected function redirect($postId, $messageIndex)
-    {
-        $referer = wp_get_referer();
-        $hasReferer = !$referer
-            || Str::contains($referer, 'post.php')
-            || Str::contains($referer, 'post-new.php');
-        $redirectUri = $hasReferer
-            ? remove_query_arg(['deleted', 'ids', 'trashed', 'untrashed'], $referer)
-            : get_edit_post_link($postId);
-        wp_safe_redirect(add_query_arg(['message' => $messageIndex], $redirectUri));
-        exit;
-    }
+	/**
+	 * @param int $postId
+	 * @param int $messageIndex
+	 * @return void
+	 */
+	protected function redirect($postId, $messageIndex)
+	{
+		$referer = wp_get_referer();
+		$hasReferer = !$referer
+			|| Str::contains($referer, 'post.php')
+			|| Str::contains($referer, 'post-new.php');
+		$redirectUri = $hasReferer
+			? remove_query_arg(['deleted', 'ids', 'trashed', 'untrashed'], $referer)
+			: get_edit_post_link($postId);
+		wp_safe_redirect(add_query_arg(['message' => $messageIndex], $redirectUri));
+		exit;
+	}
 }

plugin/Container.php

Indentation +222 added lines, -222 removed lines

@@ -11,226 +11,226 @@
 
 abstract class Container
 {
-    const PROTECTED_PROPERTIES = [
-        'instance',
-        'services',
-        'session',
-        'storage',
-    ];
-
-    /**
-     * @var static
-     */
-    protected static $instance;
-
-    /**
-     * The container's bound services.
-     * @var array
-     */
-    protected $services = [];
-
-    /**
-     * @var array
-     */
-    protected $session = [];
-
-    /**
-     * The container's storage items.
-     * @var array
-     */
-    protected $storage = [];
-
-    /**
-     * @return static
-     */
-    public static function load()
-    {
-        if (empty(static::$instance)) {
-            static::$instance = new static();
-        }
-        return static::$instance;
-    }
-
-    /**
-     * @param string $property
-     * @return mixed
-     */
-    public function __get($property)
-    {
-        if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) {
-            return $this->$property;
-        }
-        $constant = 'static::'.strtoupper(Str::snakeCase($property));
-        if (defined($constant)) {
-            return constant($constant);
-        }
-        return Arr::get($this->storage, $property, null);
-    }
-
-    /**
-     * @param string $property
-     * @param string $value
-     * @return void
-     */
-    public function __set($property, $value)
-    {
-        if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) {
-            $this->storage[$property] = $value;
-        } elseif (!isset($this->$property)) {
-            $this->$property = $value;
-        } else {
-            throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property));
-        }
-    }
-
-    /**
-     * Bind a service to the container.
-     * @param string $alias
-     * @param mixed $concrete
-     * @return mixed
-     */
-    public function bind($alias, $concrete)
-    {
-        $this->services[$alias] = $concrete;
-    }
-
-    /**
-     * Request a service from the container.
-     * @param mixed $abstract
-     * @return mixed
-     */
-    public function make($abstract)
-    {
-        if (!isset($this->services[$abstract])) {
-            $abstract = $this->addNamespace($abstract);
-        }
-        if (isset($this->services[$abstract])) {
-            $abstract = $this->services[$abstract];
-        }
-        if (is_callable($abstract)) {
-            return call_user_func_array($abstract, [$this]);
-        }
-        if (is_object($abstract)) {
-            return $abstract;
-        }
-        return $this->resolve($abstract);
-    }
-
-    /**
-     * @return void
-     */
-    public function sessionClear()
-    {
-        $this->session = [];
-    }
-
-    /**
-     * @return mixed
-     */
-    public function sessionGet($key, $fallback = '')
-    {
-        $value = Arr::get($this->session, $key, $fallback);
-        unset($this->session[$key]);
-        return $value;
-    }
-
-    /**
-     * @return void
-     */
-    public function sessionSet($key, $value)
-    {
-        $this->session[$key] = $value;
-    }
-
-    /**
-     * Bind a singleton instance to the container.
-     * @param string $alias
-     * @param callable|string|null $binding
-     * @return void
-     */
-    public function singleton($alias, $binding)
-    {
-        $this->bind($alias, $this->make($binding));
-    }
-
-    /**
-     * Prefix the current namespace to the abstract if absent.
-     * @param string $abstract
-     * @return string
-     */
-    protected function addNamespace($abstract)
-    {
-        if (!Str::contains($abstract, __NAMESPACE__) && !class_exists($abstract)) {
-            $abstract = __NAMESPACE__.'\\'.$abstract;
-        }
-        return $abstract;
-    }
-
-    /**
-     * Resolve a service from the container.
-     * @param mixed $concrete
-     * @return mixed
-     * @throws Exception
-     */
-    protected function resolve($concrete)
-    {
-        if ($concrete instanceof Closure) {
-            return $concrete($this);
-        }
-        $reflector = new ReflectionClass($concrete);
-        if (!$reflector->isInstantiable()) {
-            throw new Exception('Target ['.$concrete.'] is not instantiable.');
-        }
-        $constructor = $reflector->getConstructor();
-        if (empty($constructor)) {
-            return new $concrete();
-        }
-        return $reflector->newInstanceArgs(
-            $this->resolveDependencies($constructor->getParameters())
-        );
-    }
-
-    /**
-     * Resolve a class based dependency from the container.
-     * @return mixed
-     * @throws Exception
-     */
-    protected function resolveClass(ReflectionParameter $parameter)
-    {
-        try {
-            return $this->make($parameter->getClass()->name);
-        } catch (Exception $error) {
-            if ($parameter->isOptional()) {
-                return $parameter->getDefaultValue();
-            }
-            throw $error;
-        }
-    }
-
-    /**
-     * Resolve all of the dependencies from the ReflectionParameters.
-     * @return array
-     */
-    protected function resolveDependencies(array $dependencies)
-    {
-        $results = [];
-        foreach ($dependencies as $dependency) {
-            $results[] = !is_null($class = $dependency->getClass())
-                ? $this->resolveClass($dependency)
-                : $this->resolveDependency($dependency);
-        }
-        return $results;
-    }
-
-    /**
-     * Resolve a single ReflectionParameter dependency.
-     * @return array|null
-     */
-    protected function resolveDependency(ReflectionParameter $parameter)
-    {
-        if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) {
-            return $parameter->getDefaultValue();
-        }
-        return null;
-    }
+	const PROTECTED_PROPERTIES = [
+		'instance',
+		'services',
+		'session',
+		'storage',
+	];
+
+	/**
+	 * @var static
+	 */
+	protected static $instance;
+
+	/**
+	 * The container's bound services.
+	 * @var array
+	 */
+	protected $services = [];
+
+	/**
+	 * @var array
+	 */
+	protected $session = [];
+
+	/**
+	 * The container's storage items.
+	 * @var array
+	 */
+	protected $storage = [];
+
+	/**
+	 * @return static
+	 */
+	public static function load()
+	{
+		if (empty(static::$instance)) {
+			static::$instance = new static();
+		}
+		return static::$instance;
+	}
+
+	/**
+	 * @param string $property
+	 * @return mixed
+	 */
+	public function __get($property)
+	{
+		if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) {
+			return $this->$property;
+		}
+		$constant = 'static::'.strtoupper(Str::snakeCase($property));
+		if (defined($constant)) {
+			return constant($constant);
+		}
+		return Arr::get($this->storage, $property, null);
+	}
+
+	/**
+	 * @param string $property
+	 * @param string $value
+	 * @return void
+	 */
+	public function __set($property, $value)
+	{
+		if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) {
+			$this->storage[$property] = $value;
+		} elseif (!isset($this->$property)) {
+			$this->$property = $value;
+		} else {
+			throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property));
+		}
+	}
+
+	/**
+	 * Bind a service to the container.
+	 * @param string $alias
+	 * @param mixed $concrete
+	 * @return mixed
+	 */
+	public function bind($alias, $concrete)
+	{
+		$this->services[$alias] = $concrete;
+	}
+
+	/**
+	 * Request a service from the container.
+	 * @param mixed $abstract
+	 * @return mixed
+	 */
+	public function make($abstract)
+	{
+		if (!isset($this->services[$abstract])) {
+			$abstract = $this->addNamespace($abstract);
+		}
+		if (isset($this->services[$abstract])) {
+			$abstract = $this->services[$abstract];
+		}
+		if (is_callable($abstract)) {
+			return call_user_func_array($abstract, [$this]);
+		}
+		if (is_object($abstract)) {
+			return $abstract;
+		}
+		return $this->resolve($abstract);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function sessionClear()
+	{
+		$this->session = [];
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function sessionGet($key, $fallback = '')
+	{
+		$value = Arr::get($this->session, $key, $fallback);
+		unset($this->session[$key]);
+		return $value;
+	}
+
+	/**
+	 * @return void
+	 */
+	public function sessionSet($key, $value)
+	{
+		$this->session[$key] = $value;
+	}
+
+	/**
+	 * Bind a singleton instance to the container.
+	 * @param string $alias
+	 * @param callable|string|null $binding
+	 * @return void
+	 */
+	public function singleton($alias, $binding)
+	{
+		$this->bind($alias, $this->make($binding));
+	}
+
+	/**
+	 * Prefix the current namespace to the abstract if absent.
+	 * @param string $abstract
+	 * @return string
+	 */
+	protected function addNamespace($abstract)
+	{
+		if (!Str::contains($abstract, __NAMESPACE__) && !class_exists($abstract)) {
+			$abstract = __NAMESPACE__.'\\'.$abstract;
+		}
+		return $abstract;
+	}
+
+	/**
+	 * Resolve a service from the container.
+	 * @param mixed $concrete
+	 * @return mixed
+	 * @throws Exception
+	 */
+	protected function resolve($concrete)
+	{
+		if ($concrete instanceof Closure) {
+			return $concrete($this);
+		}
+		$reflector = new ReflectionClass($concrete);
+		if (!$reflector->isInstantiable()) {
+			throw new Exception('Target ['.$concrete.'] is not instantiable.');
+		}
+		$constructor = $reflector->getConstructor();
+		if (empty($constructor)) {
+			return new $concrete();
+		}
+		return $reflector->newInstanceArgs(
+			$this->resolveDependencies($constructor->getParameters())
+		);
+	}
+
+	/**
+	 * Resolve a class based dependency from the container.
+	 * @return mixed
+	 * @throws Exception
+	 */
+	protected function resolveClass(ReflectionParameter $parameter)
+	{
+		try {
+			return $this->make($parameter->getClass()->name);
+		} catch (Exception $error) {
+			if ($parameter->isOptional()) {
+				return $parameter->getDefaultValue();
+			}
+			throw $error;
+		}
+	}
+
+	/**
+	 * Resolve all of the dependencies from the ReflectionParameters.
+	 * @return array
+	 */
+	protected function resolveDependencies(array $dependencies)
+	{
+		$results = [];
+		foreach ($dependencies as $dependency) {
+			$results[] = !is_null($class = $dependency->getClass())
+				? $this->resolveClass($dependency)
+				: $this->resolveDependency($dependency);
+		}
+		return $results;
+	}
+
+	/**
+	 * Resolve a single ReflectionParameter dependency.
+	 * @return array|null
+	 */
+	protected function resolveDependency(ReflectionParameter $parameter)
+	{
+		if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) {
+			return $parameter->getDefaultValue();
+		}
+		return null;
+	}
 }

plugin/Actions.php

Indentation +104 added lines, -104 removed lines

@@ -21,110 +21,110 @@
 
 class Actions implements HooksContract
 {
-    protected $about;
-    protected $admin;
-    protected $app;
-    protected $blocks;
-    protected $console;
-    protected $editor;
-    protected $listtable;
-    protected $menu;
-    protected $main;
-    protected $notices;
-    protected $public;
-    protected $rebusify;
-    protected $review;
-    protected $router;
-    protected $settings;
-    protected $taxonomy;
-    protected $translator;
-    protected $welcome;
+	protected $about;
+	protected $admin;
+	protected $app;
+	protected $blocks;
+	protected $console;
+	protected $editor;
+	protected $listtable;
+	protected $menu;
+	protected $main;
+	protected $notices;
+	protected $public;
+	protected $rebusify;
+	protected $review;
+	protected $router;
+	protected $settings;
+	protected $taxonomy;
+	protected $translator;
+	protected $welcome;
 
-    public function __construct(Application $app ) {
-        $this->app = $app;
-        $this->admin = $app->make(AdminController::class);
-        $this->blocks = $app->make(BlocksController::class);
-        $this->console = $app->make(Console::class);
-        $this->editor = $app->make(EditorController::class);
-        $this->listtable = $app->make(ListTableController::class);
-        $this->main = $app->make(MainController::class);
-        $this->menu = $app->make(MenuController::class);
-        $this->notices = $app->make(NoticeController::class);
-        $this->public = $app->make(PublicController::class);
-        $this->rebusify = $app->make(RebusifyController::class);
-        $this->review = $app->make(ReviewController::class);
-        $this->router = $app->make(Router::class);
-        $this->settings = $app->make(SettingsController::class);
-        $this->taxonomy = $app->make(TaxonomyController::class);
-        $this->translator = $app->make(TranslationController::class);
-        $this->welcome = $app->make(WelcomeController::class);
-    }
+	public function __construct(Application $app ) {
+		$this->app = $app;
+		$this->admin = $app->make(AdminController::class);
+		$this->blocks = $app->make(BlocksController::class);
+		$this->console = $app->make(Console::class);
+		$this->editor = $app->make(EditorController::class);
+		$this->listtable = $app->make(ListTableController::class);
+		$this->main = $app->make(MainController::class);
+		$this->menu = $app->make(MenuController::class);
+		$this->notices = $app->make(NoticeController::class);
+		$this->public = $app->make(PublicController::class);
+		$this->rebusify = $app->make(RebusifyController::class);
+		$this->review = $app->make(ReviewController::class);
+		$this->router = $app->make(Router::class);
+		$this->settings = $app->make(SettingsController::class);
+		$this->taxonomy = $app->make(TaxonomyController::class);
+		$this->translator = $app->make(TranslationController::class);
+		$this->welcome = $app->make(WelcomeController::class);
+	}
 
-    /**
-     * @return void
-     */
-    public function run()
-    {
-        add_action('admin_enqueue_scripts',                                 [$this->admin, 'enqueueAssets']);
-        add_action('admin_init',                                            [$this->admin, 'registerTinymcePopups']);
-        add_action('media_buttons',                                         [$this->admin, 'renderTinymceButton'], 11);
-        add_action('plugins_loaded',                                        [$this->app, 'getDefaults'], 11);
-        add_action('plugins_loaded',                                        [$this->app, 'registerAddons']);
-        add_action('plugins_loaded',                                        [$this->app, 'registerLanguages']);
-        add_action('plugins_loaded',                                        [$this->app, 'registerReviewTypes']);
-        add_action('upgrader_process_complete',                             [$this->app, 'upgraded'], 10, 2);
-        add_action('init',                                                  [$this->blocks, 'registerAssets'], 9);
-        add_action('init',                                                  [$this->blocks, 'registerBlocks']);
-        add_action('admin_footer',                                          [$this->console, 'logOnce']);
-        add_action('wp_footer',                                             [$this->console, 'logOnce']);
-        add_action('add_meta_boxes_'.Application::POST_TYPE,                [$this->editor, 'registerMetaBoxes']);
-        add_action('admin_print_scripts',                                   [$this->editor, 'removeAutosave'], 999);
-        add_action('admin_menu',                                            [$this->editor, 'removeMetaBoxes']);
-        add_action('current_screen',                                        [$this->editor, 'removePostTypeSupport']);
-        add_action('post_submitbox_misc_actions',                           [$this->editor, 'renderPinnedInPublishMetaBox']);
-        add_action('admin_head',                                            [$this->editor, 'renderReviewFields']);
-        add_action('admin_action_revert',                                   [$this->editor, 'revertReview']);
-        add_action('save_post_'.Application::POST_TYPE,                     [$this->editor, 'saveMetaboxes'], 10, 3);
-        add_action('admin_action_approve',                                  [$this->listtable, 'approve']);
-        add_action('bulk_edit_custom_box',                                  [$this->listtable, 'renderBulkEditFields'], 10, 2);
-        add_action('restrict_manage_posts',                                 [$this->listtable, 'renderColumnFilters']);
-        add_action('manage_'.Application::POST_TYPE.'_posts_custom_column', [$this->listtable, 'renderColumnValues'], 10, 2);
-        add_action('save_post_'.Application::POST_TYPE,                     [$this->listtable, 'saveBulkEditFields']);
-        add_action('pre_get_posts',                                         [$this->listtable, 'setQueryForColumn']);
-        add_action('admin_action_unapprove',                                [$this->listtable, 'unapprove']);
-        add_action('init',                                                  [$this->main, 'registerPostType'], 8);
-        add_action('init',                                                  [$this->main, 'registerShortcodes']);
-        add_action('init',                                                  [$this->main, 'registerTaxonomy']);
-        add_action('widgets_init',                                          [$this->main, 'registerWidgets']);
-        add_action('admin_menu',                                            [$this->menu, 'registerMenuCount']);
-        add_action('admin_menu',                                            [$this->menu, 'registerSubMenus']);
-        add_action('admin_init',                                            [$this->menu, 'setCustomPermissions'], 999);
-        add_action('admin_notices',                                         [$this->notices, 'filterAdminNotices']);
-        add_action('wp_enqueue_scripts',                                    [$this->public, 'enqueueAssets'], 999);
-        add_filter('site-reviews/builder',                                  [$this->public, 'modifyBuilder']);
-        add_action('wp_footer',                                             [$this->public, 'renderSchema']);
-        add_action('site-reviews/review/created',                           [$this->rebusify, 'onCreated']);
-        add_action('site-reviews/review/reverted',                          [$this->rebusify, 'onReverted']);
-        add_action('site-reviews/review/saved',                             [$this->rebusify, 'onSaved']);
-        add_action('updated_postmeta',                                      [$this->rebusify, 'onUpdatedMeta'], 10, 3);
-        add_action('set_object_terms',                                      [$this->review, 'onAfterChangeCategory'], 10, 6);
-        add_action('transition_post_status',                                [$this->review, 'onAfterChangeStatus'], 10, 3);
-        add_action('site-reviews/review/created',                           [$this->review, 'onAfterCreate']);
-        add_action('before_delete_post',                                    [$this->review, 'onBeforeDelete']);
-        add_action('update_postmeta',                                       [$this->review, 'onBeforeUpdate'], 10, 4);
-        add_action('admin_init',                                            [$this->router, 'routeAdminPostRequest']);
-        add_action('wp_ajax_'.Application::PREFIX.'action',                 [$this->router, 'routeAjaxRequest']);
-        add_action('wp_ajax_nopriv_'.Application::PREFIX.'action',          [$this->router, 'routeAjaxRequest']);
-        add_action('init',                                                  [$this->router, 'routePublicPostRequest']);
-        add_action('admin_init',                                            [$this->settings, 'registerSettings']);
-        add_action(Application::TAXONOMY.'_term_edit_form_top',             [$this->taxonomy, 'disableParents']);
-        add_action(Application::TAXONOMY.'_term_new_form_tag',              [$this->taxonomy, 'disableParents']);
-        add_action(Application::TAXONOMY.'_add_form_fields',                [$this->taxonomy, 'enableParents']);
-        add_action(Application::TAXONOMY.'_edit_form',                      [$this->taxonomy, 'enableParents']);
-        add_action('restrict_manage_posts',                                 [$this->taxonomy, 'renderTaxonomyFilter'], 9);
-        add_action('set_object_terms',                                      [$this->taxonomy, 'restrictTermSelection'], 9, 6);
-        add_action('admin_enqueue_scripts',                                 [$this->translator, 'translatePostStatusLabels']);
-        add_action('activated_plugin',                                      [$this->welcome, 'redirectOnActivation'], 10, 2);
-        add_action('admin_menu',                                            [$this->welcome, 'registerPage']);
-    }
+	/**
+	 * @return void
+	 */
+	public function run()
+	{
+		add_action('admin_enqueue_scripts',                                 [$this->admin, 'enqueueAssets']);
+		add_action('admin_init',                                            [$this->admin, 'registerTinymcePopups']);
+		add_action('media_buttons',                                         [$this->admin, 'renderTinymceButton'], 11);
+		add_action('plugins_loaded',                                        [$this->app, 'getDefaults'], 11);
+		add_action('plugins_loaded',                                        [$this->app, 'registerAddons']);
+		add_action('plugins_loaded',                                        [$this->app, 'registerLanguages']);
+		add_action('plugins_loaded',                                        [$this->app, 'registerReviewTypes']);
+		add_action('upgrader_process_complete',                             [$this->app, 'upgraded'], 10, 2);
+		add_action('init',                                                  [$this->blocks, 'registerAssets'], 9);
+		add_action('init',                                                  [$this->blocks, 'registerBlocks']);
+		add_action('admin_footer',                                          [$this->console, 'logOnce']);
+		add_action('wp_footer',                                             [$this->console, 'logOnce']);
+		add_action('add_meta_boxes_'.Application::POST_TYPE,                [$this->editor, 'registerMetaBoxes']);
+		add_action('admin_print_scripts',                                   [$this->editor, 'removeAutosave'], 999);
+		add_action('admin_menu',                                            [$this->editor, 'removeMetaBoxes']);
+		add_action('current_screen',                                        [$this->editor, 'removePostTypeSupport']);
+		add_action('post_submitbox_misc_actions',                           [$this->editor, 'renderPinnedInPublishMetaBox']);
+		add_action('admin_head',                                            [$this->editor, 'renderReviewFields']);
+		add_action('admin_action_revert',                                   [$this->editor, 'revertReview']);
+		add_action('save_post_'.Application::POST_TYPE,                     [$this->editor, 'saveMetaboxes'], 10, 3);
+		add_action('admin_action_approve',                                  [$this->listtable, 'approve']);
+		add_action('bulk_edit_custom_box',                                  [$this->listtable, 'renderBulkEditFields'], 10, 2);
+		add_action('restrict_manage_posts',                                 [$this->listtable, 'renderColumnFilters']);
+		add_action('manage_'.Application::POST_TYPE.'_posts_custom_column', [$this->listtable, 'renderColumnValues'], 10, 2);
+		add_action('save_post_'.Application::POST_TYPE,                     [$this->listtable, 'saveBulkEditFields']);
+		add_action('pre_get_posts',                                         [$this->listtable, 'setQueryForColumn']);
+		add_action('admin_action_unapprove',                                [$this->listtable, 'unapprove']);
+		add_action('init',                                                  [$this->main, 'registerPostType'], 8);
+		add_action('init',                                                  [$this->main, 'registerShortcodes']);
+		add_action('init',                                                  [$this->main, 'registerTaxonomy']);
+		add_action('widgets_init',                                          [$this->main, 'registerWidgets']);
+		add_action('admin_menu',                                            [$this->menu, 'registerMenuCount']);
+		add_action('admin_menu',                                            [$this->menu, 'registerSubMenus']);
+		add_action('admin_init',                                            [$this->menu, 'setCustomPermissions'], 999);
+		add_action('admin_notices',                                         [$this->notices, 'filterAdminNotices']);
+		add_action('wp_enqueue_scripts',                                    [$this->public, 'enqueueAssets'], 999);
+		add_filter('site-reviews/builder',                                  [$this->public, 'modifyBuilder']);
+		add_action('wp_footer',                                             [$this->public, 'renderSchema']);
+		add_action('site-reviews/review/created',                           [$this->rebusify, 'onCreated']);
+		add_action('site-reviews/review/reverted',                          [$this->rebusify, 'onReverted']);
+		add_action('site-reviews/review/saved',                             [$this->rebusify, 'onSaved']);
+		add_action('updated_postmeta',                                      [$this->rebusify, 'onUpdatedMeta'], 10, 3);
+		add_action('set_object_terms',                                      [$this->review, 'onAfterChangeCategory'], 10, 6);
+		add_action('transition_post_status',                                [$this->review, 'onAfterChangeStatus'], 10, 3);
+		add_action('site-reviews/review/created',                           [$this->review, 'onAfterCreate']);
+		add_action('before_delete_post',                                    [$this->review, 'onBeforeDelete']);
+		add_action('update_postmeta',                                       [$this->review, 'onBeforeUpdate'], 10, 4);
+		add_action('admin_init',                                            [$this->router, 'routeAdminPostRequest']);
+		add_action('wp_ajax_'.Application::PREFIX.'action',                 [$this->router, 'routeAjaxRequest']);
+		add_action('wp_ajax_nopriv_'.Application::PREFIX.'action',          [$this->router, 'routeAjaxRequest']);
+		add_action('init',                                                  [$this->router, 'routePublicPostRequest']);
+		add_action('admin_init',                                            [$this->settings, 'registerSettings']);
+		add_action(Application::TAXONOMY.'_term_edit_form_top',             [$this->taxonomy, 'disableParents']);
+		add_action(Application::TAXONOMY.'_term_new_form_tag',              [$this->taxonomy, 'disableParents']);
+		add_action(Application::TAXONOMY.'_add_form_fields',                [$this->taxonomy, 'enableParents']);
+		add_action(Application::TAXONOMY.'_edit_form',                      [$this->taxonomy, 'enableParents']);
+		add_action('restrict_manage_posts',                                 [$this->taxonomy, 'renderTaxonomyFilter'], 9);
+		add_action('set_object_terms',                                      [$this->taxonomy, 'restrictTermSelection'], 9, 6);
+		add_action('admin_enqueue_scripts',                                 [$this->translator, 'translatePostStatusLabels']);
+		add_action('activated_plugin',                                      [$this->welcome, 'redirectOnActivation'], 10, 2);
+		add_action('admin_menu',                                            [$this->welcome, 'registerPage']);
+	}
 }

plugin/Modules/Translation.php

Indentation +250 added lines, -250 removed lines

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

plugin/Modules/Date.php

Indentation +44 added lines, -44 removed lines

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

plugin/Modules/Validator.php

Indentation +274 added lines, -274 removed lines

@@ -12,302 +12,302 @@
  */
 class Validator
 {
-    use ValidationRules;
+	use ValidationRules;
 
-    /**
-     * @var array
-     */
-    public $errors = [];
+	/**
+	 * @var array
+	 */
+	public $errors = [];
 
-    /**
-     * The data under validation.
-     * @var array
-     */
-    protected $data = [];
+	/**
+	 * The data under validation.
+	 * @var array
+	 */
+	protected $data = [];
 
-    /**
-     * The failed validation rules.
-     * @var array
-     */
-    protected $failedRules = [];
+	/**
+	 * The failed validation rules.
+	 * @var array
+	 */
+	protected $failedRules = [];
 
-    /**
-     * The rules to be applied to the data.
-     * @var array
-     */
-    protected $rules = [];
+	/**
+	 * The rules to be applied to the data.
+	 * @var array
+	 */
+	protected $rules = [];
 
-    /**
-     * The size related validation rules.
-     * @var array
-     */
-    protected $sizeRules = [
-        'Between', 'Max', 'Min',
-    ];
+	/**
+	 * The size related validation rules.
+	 * @var array
+	 */
+	protected $sizeRules = [
+		'Between', 'Max', 'Min',
+	];
 
-    /**
-     * The validation rules that imply the field is required.
-     * @var array
-     */
-    protected $implicitRules = [
-        'Required',
-    ];
+	/**
+	 * The validation rules that imply the field is required.
+	 * @var array
+	 */
+	protected $implicitRules = [
+		'Required',
+	];
 
-    /**
-     * The numeric related validation rules.
-     * @var array
-     */
-    protected $numericRules = [
-        'Number',
-    ];
+	/**
+	 * The numeric related validation rules.
+	 * @var array
+	 */
+	protected $numericRules = [
+		'Number',
+	];
 
-    /**
-     * Run the validator's rules against its data.
-     * @param mixed $data
-     * @return array
-     */
-    public function validate($data, array $rules = [])
-    {
-        $this->normalizeData($data);
-        $this->setRules($rules);
-        foreach ($this->rules as $attribute => $rules) {
-            foreach ($rules as $rule) {
-                $this->validateAttribute($attribute, $rule);
-                if ($this->shouldStopValidating($attribute)) {
-                    break;
-                }
-            }
-        }
-        return $this->errors;
-    }
+	/**
+	 * Run the validator's rules against its data.
+	 * @param mixed $data
+	 * @return array
+	 */
+	public function validate($data, array $rules = [])
+	{
+		$this->normalizeData($data);
+		$this->setRules($rules);
+		foreach ($this->rules as $attribute => $rules) {
+			foreach ($rules as $rule) {
+				$this->validateAttribute($attribute, $rule);
+				if ($this->shouldStopValidating($attribute)) {
+					break;
+				}
+			}
+		}
+		return $this->errors;
+	}
 
-    /**
-     * Validate a given attribute against a rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     * @throws BadMethodCallException
-     */
-    public function validateAttribute($attribute, $rule)
-    {
-        list($rule, $parameters) = $this->parseRule($rule);
-        if ('' == $rule) {
-            return;
-        }
-        $value = $this->getValue($attribute);
-        if (!method_exists($this, $method = 'validate'.$rule)) {
-            throw new BadMethodCallException("Method [$method] does not exist.");
-        }
-        if (!$this->$method($value, $attribute, $parameters)) {
-            $this->addFailure($attribute, $rule, $parameters);
-        }
-    }
+	/**
+	 * Validate a given attribute against a rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 * @throws BadMethodCallException
+	 */
+	public function validateAttribute($attribute, $rule)
+	{
+		list($rule, $parameters) = $this->parseRule($rule);
+		if ('' == $rule) {
+			return;
+		}
+		$value = $this->getValue($attribute);
+		if (!method_exists($this, $method = 'validate'.$rule)) {
+			throw new BadMethodCallException("Method [$method] does not exist.");
+		}
+		if (!$this->$method($value, $attribute, $parameters)) {
+			$this->addFailure($attribute, $rule, $parameters);
+		}
+	}
 
-    /**
-     * Add an error message to the validator's collection of errors.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     */
-    protected function addError($attribute, $rule, array $parameters)
-    {
-        $message = $this->getMessage($attribute, $rule, $parameters);
-        $this->errors[$attribute][] = $message;
-    }
+	/**
+	 * Add an error message to the validator's collection of errors.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 */
+	protected function addError($attribute, $rule, array $parameters)
+	{
+		$message = $this->getMessage($attribute, $rule, $parameters);
+		$this->errors[$attribute][] = $message;
+	}
 
-    /**
-     * Add a failed rule and error message to the collection.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     */
-    protected function addFailure($attribute, $rule, array $parameters)
-    {
-        $this->addError($attribute, $rule, $parameters);
-        $this->failedRules[$attribute][$rule] = $parameters;
-    }
+	/**
+	 * Add a failed rule and error message to the collection.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 */
+	protected function addFailure($attribute, $rule, array $parameters)
+	{
+		$this->addError($attribute, $rule, $parameters);
+		$this->failedRules[$attribute][$rule] = $parameters;
+	}
 
-    /**
-     * Get the data type of the given attribute.
-     * @param string $attribute
-     * @return string
-     */
-    protected function getAttributeType($attribute)
-    {
-        return !$this->hasRule($attribute, $this->numericRules)
-            ? 'length'
-            : '';
-    }
+	/**
+	 * Get the data type of the given attribute.
+	 * @param string $attribute
+	 * @return string
+	 */
+	protected function getAttributeType($attribute)
+	{
+		return !$this->hasRule($attribute, $this->numericRules)
+			? 'length'
+			: '';
+	}
 
-    /**
-     * Get the validation message for an attribute and rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return string|null
-     */
-    protected function getMessage($attribute, $rule, array $parameters)
-    {
-        if (in_array($rule, $this->sizeRules)) {
-            return $this->getSizeMessage($attribute, $rule, $parameters);
-        }
-        $lowerRule = Str::snakeCase($rule);
-        return $this->translator($lowerRule, $parameters);
-    }
+	/**
+	 * Get the validation message for an attribute and rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return string|null
+	 */
+	protected function getMessage($attribute, $rule, array $parameters)
+	{
+		if (in_array($rule, $this->sizeRules)) {
+			return $this->getSizeMessage($attribute, $rule, $parameters);
+		}
+		$lowerRule = Str::snakeCase($rule);
+		return $this->translator($lowerRule, $parameters);
+	}
 
-    /**
-     * Get a rule and its parameters for a given attribute.
-     * @param string $attribute
-     * @param string|array $rules
-     * @return array|null
-     */
-    protected function getRule($attribute, $rules)
-    {
-        if (!array_key_exists($attribute, $this->rules)) {
-            return;
-        }
-        $rules = (array) $rules;
-        foreach ($this->rules[$attribute] as $rule) {
-            list($rule, $parameters) = $this->parseRule($rule);
-            if (in_array($rule, $rules)) {
-                return [$rule, $parameters];
-            }
-        }
-    }
+	/**
+	 * Get a rule and its parameters for a given attribute.
+	 * @param string $attribute
+	 * @param string|array $rules
+	 * @return array|null
+	 */
+	protected function getRule($attribute, $rules)
+	{
+		if (!array_key_exists($attribute, $this->rules)) {
+			return;
+		}
+		$rules = (array) $rules;
+		foreach ($this->rules[$attribute] as $rule) {
+			list($rule, $parameters) = $this->parseRule($rule);
+			if (in_array($rule, $rules)) {
+				return [$rule, $parameters];
+			}
+		}
+	}
 
-    /**
-     * Get the size of an attribute.
-     * @param string $attribute
-     * @param mixed $value
-     * @return mixed
-     */
-    protected function getSize($attribute, $value)
-    {
-        $hasNumeric = $this->hasRule($attribute, $this->numericRules);
-        if (is_numeric($value) && $hasNumeric) {
-            return $value;
-        } elseif (is_array($value)) {
-            return count($value);
-        }
-        return function_exists('mb_strlen')
-            ? mb_strlen($value)
-            : strlen($value);
-    }
+	/**
+	 * Get the size of an attribute.
+	 * @param string $attribute
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	protected function getSize($attribute, $value)
+	{
+		$hasNumeric = $this->hasRule($attribute, $this->numericRules);
+		if (is_numeric($value) && $hasNumeric) {
+			return $value;
+		} elseif (is_array($value)) {
+			return count($value);
+		}
+		return function_exists('mb_strlen')
+			? mb_strlen($value)
+			: strlen($value);
+	}
 
-    /**
-     * Get the proper error message for an attribute and size rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return string|null
-     */
-    protected function getSizeMessage($attribute, $rule, array $parameters)
-    {
-        $type = $this->getAttributeType($attribute);
-        $lowerRule = Str::snakeCase($rule.$type);
-        return $this->translator($lowerRule, $parameters);
-    }
+	/**
+	 * Get the proper error message for an attribute and size rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return string|null
+	 */
+	protected function getSizeMessage($attribute, $rule, array $parameters)
+	{
+		$type = $this->getAttributeType($attribute);
+		$lowerRule = Str::snakeCase($rule.$type);
+		return $this->translator($lowerRule, $parameters);
+	}
 
-    /**
-     * Get the value of a given attribute.
-     * @param string $attribute
-     * @return mixed
-     */
-    protected function getValue($attribute)
-    {
-        if (isset($this->data[$attribute])) {
-            return $this->data[$attribute];
-        }
-    }
+	/**
+	 * Get the value of a given attribute.
+	 * @param string $attribute
+	 * @return mixed
+	 */
+	protected function getValue($attribute)
+	{
+		if (isset($this->data[$attribute])) {
+			return $this->data[$attribute];
+		}
+	}
 
-    /**
-     * Determine if the given attribute has a rule in the given set.
-     * @param string $attribute
-     * @param string|array $rules
-     * @return bool
-     */
-    protected function hasRule($attribute, $rules)
-    {
-        return !is_null($this->getRule($attribute, $rules));
-    }
+	/**
+	 * Determine if the given attribute has a rule in the given set.
+	 * @param string $attribute
+	 * @param string|array $rules
+	 * @return bool
+	 */
+	protected function hasRule($attribute, $rules)
+	{
+		return !is_null($this->getRule($attribute, $rules));
+	}
 
-    /**
-     * Normalize the provided data to an array.
-     * @param mixed $data
-     * @return void
-     */
-    protected function normalizeData($data)
-    {
-        $this->data = is_object($data)
-            ? get_object_vars($data)
-            : $data;
-    }
+	/**
+	 * Normalize the provided data to an array.
+	 * @param mixed $data
+	 * @return void
+	 */
+	protected function normalizeData($data)
+	{
+		$this->data = is_object($data)
+			? get_object_vars($data)
+			: $data;
+	}
 
-    /**
-     * Parse a parameter list.
-     * @param string $rule
-     * @param string $parameter
-     * @return array
-     */
-    protected function parseParameters($rule, $parameter)
-    {
-        return 'regex' == strtolower($rule)
-            ? [$parameter]
-            : str_getcsv($parameter);
-    }
+	/**
+	 * Parse a parameter list.
+	 * @param string $rule
+	 * @param string $parameter
+	 * @return array
+	 */
+	protected function parseParameters($rule, $parameter)
+	{
+		return 'regex' == strtolower($rule)
+			? [$parameter]
+			: str_getcsv($parameter);
+	}
 
-    /**
-     * Extract the rule name and parameters from a rule.
-     * @param string $rule
-     * @return array
-     */
-    protected function parseRule($rule)
-    {
-        $parameters = [];
-        if (Str::contains($rule, ':')) {
-            list($rule, $parameter) = explode(':', $rule, 2);
-            $parameters = $this->parseParameters($rule, $parameter);
-        }
-        $rule = Str::camelCase($rule);
-        return [$rule, $parameters];
-    }
+	/**
+	 * Extract the rule name and parameters from a rule.
+	 * @param string $rule
+	 * @return array
+	 */
+	protected function parseRule($rule)
+	{
+		$parameters = [];
+		if (Str::contains($rule, ':')) {
+			list($rule, $parameter) = explode(':', $rule, 2);
+			$parameters = $this->parseParameters($rule, $parameter);
+		}
+		$rule = Str::camelCase($rule);
+		return [$rule, $parameters];
+	}
 
-    /**
-     * Set the validation rules.
-     * @return void
-     */
-    protected function setRules(array $rules)
-    {
-        foreach ($rules as $key => $rule) {
-            $rules[$key] = is_string($rule)
-                ? explode('|', $rule)
-                : $rule;
-        }
-        $this->rules = $rules;
-    }
+	/**
+	 * Set the validation rules.
+	 * @return void
+	 */
+	protected function setRules(array $rules)
+	{
+		foreach ($rules as $key => $rule) {
+			$rules[$key] = is_string($rule)
+				? explode('|', $rule)
+				: $rule;
+		}
+		$this->rules = $rules;
+	}
 
-    /**
-     * Check if we should stop further validations on a given attribute.
-     * @param string $attribute
-     * @return bool
-     */
-    protected function shouldStopValidating($attribute)
-    {
-        return $this->hasRule($attribute, $this->implicitRules)
-            && isset($this->failedRules[$attribute])
-            && array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
-    }
+	/**
+	 * Check if we should stop further validations on a given attribute.
+	 * @param string $attribute
+	 * @return bool
+	 */
+	protected function shouldStopValidating($attribute)
+	{
+		return $this->hasRule($attribute, $this->implicitRules)
+			&& isset($this->failedRules[$attribute])
+			&& array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
+	}
 
-    /**
-     * Returns a translated message for the attribute.
-     * @param string $key
-     * @param string $attribute
-     * @return void|string
-     */
-    protected function translator($key, array $parameters)
-    {
-        $strings = glsr(ValidationStringsDefaults::class)->defaults();
-        if (isset($strings[$key])) {
-            return $this->replace($strings[$key], $parameters);
-        }
-        return 'error';
-    }
+	/**
+	 * Returns a translated message for the attribute.
+	 * @param string $key
+	 * @param string $attribute
+	 * @return void|string
+	 */
+	protected function translator($key, array $parameters)
+	{
+		$strings = glsr(ValidationStringsDefaults::class)->defaults();
+		if (isset($strings[$key])) {
+			return $this->replace($strings[$key], $parameters);
+		}
+		return 'error';
+	}
 }

plugin/Modules/Validator/ValidationRules.php

Indentation +113 added lines, -113 removed lines

@@ -10,126 +10,126 @@
  */
 trait ValidationRules
 {
-    /**
-     * Get the size of an attribute.
-     * @param string $attribute
-     * @param mixed $value
-     * @return mixed
-     */
-    abstract protected function getSize($attribute, $value);
+	/**
+	 * Get the size of an attribute.
+	 * @param string $attribute
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	abstract protected function getSize($attribute, $value);
 
-    /**
-     * Replace all placeholders.
-     * @param string $message
-     * @return string
-     */
-    protected function replace($message, array $parameters)
-    {
-        if (!Str::contains($message, '%s')) {
-            return $message;
-        }
-        return preg_replace_callback('/(%s)/', function () use (&$parameters) {
-            foreach ($parameters as $key => $value) {
-                return array_shift($parameters);
-            }
-        }, $message);
-    }
+	/**
+	 * Replace all placeholders.
+	 * @param string $message
+	 * @return string
+	 */
+	protected function replace($message, array $parameters)
+	{
+		if (!Str::contains($message, '%s')) {
+			return $message;
+		}
+		return preg_replace_callback('/(%s)/', function () use (&$parameters) {
+			foreach ($parameters as $key => $value) {
+				return array_shift($parameters);
+			}
+		}, $message);
+	}
 
-    /**
-     * Validate that an attribute was "accepted".
-     * This validation rule implies the attribute is "required".
-     * @param string $attribute
-     * @param mixed $value
-     * @return bool
-     */
-    public function validateAccepted($value)
-    {
-        $acceptable = ['yes', 'on', '1', 1, true, 'true'];
-        return $this->validateRequired($value) && in_array($value, $acceptable, true);
-    }
+	/**
+	 * Validate that an attribute was "accepted".
+	 * This validation rule implies the attribute is "required".
+	 * @param string $attribute
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function validateAccepted($value)
+	{
+		$acceptable = ['yes', 'on', '1', 1, true, 'true'];
+		return $this->validateRequired($value) && in_array($value, $acceptable, true);
+	}
 
-    /**
-     * Validate the size of an attribute is between a set of values.
-     * @param string $attribute
-     * @param mixed $value
-     * @return bool
-     */
-    public function validateBetween($value, $attribute, array $parameters)
-    {
-        $this->requireParameterCount(2, $parameters, 'between');
-        $size = $this->getSize($attribute, $value);
-        return $size >= $parameters[0] && $size <= $parameters[1];
-    }
+	/**
+	 * Validate the size of an attribute is between a set of values.
+	 * @param string $attribute
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function validateBetween($value, $attribute, array $parameters)
+	{
+		$this->requireParameterCount(2, $parameters, 'between');
+		$size = $this->getSize($attribute, $value);
+		return $size >= $parameters[0] && $size <= $parameters[1];
+	}
 
-    /**
-     * Validate that an attribute is a valid e-mail address.
-     * @param mixed $value
-     * @return bool
-     */
-    public function validateEmail($value)
-    {
-        return false !== filter_var($value, FILTER_VALIDATE_EMAIL);
-    }
+	/**
+	 * Validate that an attribute is a valid e-mail address.
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function validateEmail($value)
+	{
+		return false !== filter_var($value, FILTER_VALIDATE_EMAIL);
+	}
 
-    /**
-     * Validate the size of an attribute is less than a maximum value.
-     * @param string $attribute
-     * @param mixed $value
-     * @return bool
-     */
-    public function validateMax($value, $attribute, array $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'max');
-        return $this->getSize($attribute, $value) <= $parameters[0];
-    }
+	/**
+	 * Validate the size of an attribute is less than a maximum value.
+	 * @param string $attribute
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function validateMax($value, $attribute, array $parameters)
+	{
+		$this->requireParameterCount(1, $parameters, 'max');
+		return $this->getSize($attribute, $value) <= $parameters[0];
+	}
 
-    /**
-     * Validate the size of an attribute is greater than a minimum value.
-     * @param string $attribute
-     * @param mixed $value
-     * @return bool
-     */
-    public function validateMin($value, $attribute, array $parameters)
-    {
-        $this->requireParameterCount(1, $parameters, 'min');
-        return $this->getSize($attribute, $value) >= $parameters[0];
-    }
+	/**
+	 * Validate the size of an attribute is greater than a minimum value.
+	 * @param string $attribute
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function validateMin($value, $attribute, array $parameters)
+	{
+		$this->requireParameterCount(1, $parameters, 'min');
+		return $this->getSize($attribute, $value) >= $parameters[0];
+	}
 
-    /**
-     * Validate that an attribute is numeric.
-     * @param mixed $value
-     * @return bool
-     */
-    public function validateNumber($value)
-    {
-        return is_numeric($value);
-    }
+	/**
+	 * Validate that an attribute is numeric.
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function validateNumber($value)
+	{
+		return is_numeric($value);
+	}
 
-    /**
-     * Validate that a required attribute exists.
-     * @param mixed $value
-     * @return bool
-     */
-    public function validateRequired($value)
-    {
-        return is_null($value)
-            || (is_string($value) && '' === trim($value))
-            || (is_array($value) && count($value) < 1)
-            ? false
-            : true;
-    }
+	/**
+	 * Validate that a required attribute exists.
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function validateRequired($value)
+	{
+		return is_null($value)
+			|| (is_string($value) && '' === trim($value))
+			|| (is_array($value) && count($value) < 1)
+			? false
+			: true;
+	}
 
-    /**
-     * Require a certain number of parameters to be present.
-     * @param int $count
-     * @param string $rule
-     * @return void
-     * @throws InvalidArgumentException
-     */
-    protected function requireParameterCount($count, array $parameters, $rule)
-    {
-        if (count($parameters) < $count) {
-            throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
-        }
-    }
+	/**
+	 * Require a certain number of parameters to be present.
+	 * @param int $count
+	 * @param string $rule
+	 * @return void
+	 * @throws InvalidArgumentException
+	 */
+	protected function requireParameterCount($count, array $parameters, $rule)
+	{
+		if (count($parameters) < $count) {
+			throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
+		}
+	}
 }