pryley / site-reviews

plugin/Controllers/ListTableController.php

Indentation +323 added lines, -323 removed lines

@@ -14,346 +14,346 @@
 
 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 $messages
-     * @return array
-     * @filter bulk_post_updated_messages
-     */
-    public function filterBulkUpdateMessages($messages, array $counts)
-    {
-        $messages = Arr::consolidateArray($messages);
-        $messages[Application::POST_TYPE] = [
-            'updated' => _n('%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews'),
-            'locked' => _n('%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews'),
-            'deleted' => _n('%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews'),
-            'trashed' => _n('%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews'),
-            'untrashed' => _n('%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews'),
-        ];
-        return $messages;
-    }
+	/**
+	 * @param array $messages
+	 * @return array
+	 * @filter bulk_post_updated_messages
+	 */
+	public function filterBulkUpdateMessages($messages, array $counts)
+	{
+		$messages = Arr::consolidateArray($messages);
+		$messages[Application::POST_TYPE] = [
+			'updated' => _n('%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews'),
+			'locked' => _n('%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews'),
+			'deleted' => _n('%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews'),
+			'trashed' => _n('%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews'),
+			'untrashed' => _n('%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews'),
+		];
+		return $messages;
+	}
 
-    /**
-     * @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 = ['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 = ['reviewer'];
+		}
+		return $hidden;
+	}
 
-    /**
-     * @param array $postStates
-     * @param WP_Post $post
-     * @return array
-     * @filter display_post_states
-     */
-    public function filterPostStates($postStates, $post)
-    {
-        $postStates = Arr::consolidateArray($postStates);
-        if (Application::POST_TYPE == Arr::get($post, 'post_type') && array_key_exists('pending', $postStates)) {
-            $postStates['pending'] = __('Unapproved', 'site-reviews');
-        }
-        return $postStates;
-    }
+	/**
+	 * @param array $postStates
+	 * @param WP_Post $post
+	 * @return array
+	 * @filter display_post_states
+	 */
+	public function filterPostStates($postStates, $post)
+	{
+		$postStates = Arr::consolidateArray($postStates);
+		if (Application::POST_TYPE == Arr::get($post, 'post_type') && array_key_exists('pending', $postStates)) {
+			$postStates['pending'] = __('Unapproved', 'site-reviews');
+		}
+		return $postStates;
+	}
 
-    /**
-     * @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;
+	}
 
-    /**
-     * Customize the post_type status text.
-     * @param string $translation
-     * @param string $single
-     * @param string $plural
-     * @param int $number
-     * @param string $domain
-     * @return string
-     * @filter ngettext
-     */
-    public function filterStatusText($translation, $single, $plural, $number, $domain)
-    {
-        if ($this->canModifyTranslation($domain)) {
-            $strings = [
-                'Published' => __('Approved', 'site-reviews'),
-                'Pending' => __('Unapproved', 'site-reviews'),
-            ];
-            foreach ($strings as $search => $replace) {
-                if (false === strpos($single, $search)) {
-                    continue;
-                }
-                $translation = $this->getTranslation([
-                    'number' => $number,
-                    'plural' => str_replace($search, $replace, $plural),
-                    'single' => str_replace($search, $replace, $single),
-                ]);
-            }
-        }
-        return $translation;
-    }
+	/**
+	 * Customize the post_type status text.
+	 * @param string $translation
+	 * @param string $single
+	 * @param string $plural
+	 * @param int $number
+	 * @param string $domain
+	 * @return string
+	 * @filter ngettext
+	 */
+	public function filterStatusText($translation, $single, $plural, $number, $domain)
+	{
+		if ($this->canModifyTranslation($domain)) {
+			$strings = [
+				'Published' => __('Approved', 'site-reviews'),
+				'Pending' => __('Unapproved', 'site-reviews'),
+			];
+			foreach ($strings as $search => $replace) {
+				if (false === strpos($single, $search)) {
+					continue;
+				}
+				$translation = $this->getTranslation([
+					'number' => $number,
+					'plural' => str_replace($search, $replace, $plural),
+					'single' => str_replace($search, $replace, $single),
+				]);
+			}
+		}
+		return $translation;
+	}
 
-    /**
-     * @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;
+	}
 
-    /**
-     * Get the modified translation string.
-     * @return string
-     */
-    protected function getTranslation(array $args)
-    {
-        $defaults = [
-            'number' => 0,
-            'plural' => '',
-            'single' => '',
-            'text' => '',
-        ];
-        $args = (object) wp_parse_args($args, $defaults);
-        $translations = get_translations_for_domain(Application::ID);
-        return $args->text
-            ? $translations->translate($args->text)
-            : $translations->translate_plural($args->single, $args->plural, $args->number);
-    }
+	/**
+	 * Get the modified translation string.
+	 * @return string
+	 */
+	protected function getTranslation(array $args)
+	{
+		$defaults = [
+			'number' => 0,
+			'plural' => '',
+			'single' => '',
+			'text' => '',
+		];
+		$args = (object) wp_parse_args($args, $defaults);
+		$translations = get_translations_for_domain(Application::ID);
+		return $args->text
+			? $translations->translate($args->text)
+			: $translations->translate_plural($args->single, $args->plural, $args->number);
+	}
 
-    /**
-     * @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', $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', $orderby);
+			$query->set('orderby', 'meta_value');
+		}
+	}
 }

Spacing +94 added lines, -94 removed lines

@@ -20,15 +20,15 @@ 
      */
     public function approve()
     {
-        if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
+        if( Application::ID != filter_input( INPUT_GET, 'plugin' ) ) {
             return;
         }
-        check_admin_referer('approve-review_'.($postId = $this->getPostId()));
-        wp_update_post([
+        check_admin_referer( 'approve-review_'.($postId = $this->getPostId()) );
+        wp_update_post( [
             'ID' => $postId,
             'post_status' => 'publish',
-        ]);
-        wp_safe_redirect(wp_get_referer());
+        ] );
+        wp_safe_redirect( wp_get_referer() );
         exit;
     }
 
@@ -37,15 +37,15 @@ 
      * @return array
      * @filter bulk_post_updated_messages
      */
-    public function filterBulkUpdateMessages($messages, array $counts)
+    public function filterBulkUpdateMessages( $messages, array $counts )
     {
-        $messages = Arr::consolidateArray($messages);
+        $messages = Arr::consolidateArray( $messages );
         $messages[Application::POST_TYPE] = [
-            'updated' => _n('%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews'),
-            'locked' => _n('%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews'),
-            'deleted' => _n('%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews'),
-            'trashed' => _n('%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews'),
-            'untrashed' => _n('%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews'),
+            'updated' => _n( '%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews' ),
+            'locked' => _n( '%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews' ),
+            'deleted' => _n( '%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews' ),
+            'trashed' => _n( '%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews' ),
+            'untrashed' => _n( '%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews' ),
         ];
         return $messages;
     }
@@ -55,20 +55,20 @@ 
      * @return array
      * @filter manage_.Application::POST_TYPE._posts_columns
      */
-    public function filterColumnsForPostType($columns)
+    public function filterColumnsForPostType( $columns )
     {
-        $columns = Arr::consolidateArray($columns);
+        $columns = Arr::consolidateArray( $columns );
         $postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
-        foreach ($postTypeColumns as $key => &$value) {
-            if (!array_key_exists($key, $columns) || !empty($value)) {
+        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) {
+        if( count( glsr( Database::class )->getReviewsMeta( 'review_type' ) ) < 2 ) {
             unset($postTypeColumns['review_type']);
         }
-        return array_filter($postTypeColumns, 'strlen');
+        return array_filter( $postTypeColumns, 'strlen' );
     }
 
     /**
@@ -77,10 +77,10 @@ 
      * @return string
      * @filter post_date_column_status
      */
-    public function filterDateColumnStatus($status, $post)
+    public function filterDateColumnStatus( $status, $post )
     {
-        if (Application::POST_TYPE == Arr::get($post, 'post_type')) {
-            $status = __('Submitted', 'site-reviews');
+        if( Application::POST_TYPE == Arr::get( $post, 'post_type' ) ) {
+            $status = __( 'Submitted', 'site-reviews' );
         }
         return $status;
     }
@@ -91,10 +91,10 @@ 
      * @return array
      * @filter default_hidden_columns
      */
-    public function filterDefaultHiddenColumns($hidden, $screen)
+    public function filterDefaultHiddenColumns( $hidden, $screen )
     {
-        if (Arr::get($screen, 'id') == 'edit-'.Application::POST_TYPE) {
-            $hidden = Arr::consolidateArray($hidden);
+        if( Arr::get( $screen, 'id' ) == 'edit-'.Application::POST_TYPE ) {
+            $hidden = Arr::consolidateArray( $hidden );
             $hidden = ['reviewer'];
         }
         return $hidden;
@@ -106,11 +106,11 @@ 
      * @return array
      * @filter display_post_states
      */
-    public function filterPostStates($postStates, $post)
+    public function filterPostStates( $postStates, $post )
     {
-        $postStates = Arr::consolidateArray($postStates);
-        if (Application::POST_TYPE == Arr::get($post, 'post_type') && array_key_exists('pending', $postStates)) {
-            $postStates['pending'] = __('Unapproved', 'site-reviews');
+        $postStates = Arr::consolidateArray( $postStates );
+        if( Application::POST_TYPE == Arr::get( $post, 'post_type' ) && array_key_exists( 'pending', $postStates ) ) {
+            $postStates['pending'] = __( 'Unapproved', 'site-reviews' );
         }
         return $postStates;
     }
@@ -121,28 +121,28 @@ 
      * @return array
      * @filter post_row_actions
      */
-    public function filterRowActions($actions, $post)
+    public function filterRowActions( $actions, $post )
     {
-        if (Application::POST_TYPE != Arr::get($post, 'post_type') || 'trash' == $post->post_status) {
+        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'),
+            '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),
+        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),
+                    admin_url( 'post.php?post='.$post->ID.'&action='.$key.'&plugin='.Application::ID ),
                     $key.'-review_'.$post->ID
                 ),
-            ]);
+            ] );
         }
-        return $newActions + Arr::consolidateArray($actions);
+        return $newActions + Arr::consolidateArray( $actions );
     }
 
     /**
@@ -150,13 +150,13 @@ 
      * @return array
      * @filter manage_edit-.Application::POST_TYPE._sortable_columns
      */
-    public function filterSortableColumns($columns)
+    public function filterSortableColumns( $columns )
     {
-        $columns = Arr::consolidateArray($columns);
+        $columns = Arr::consolidateArray( $columns );
         $postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
         unset($postTypeColumns['cb']);
-        foreach ($postTypeColumns as $key => $value) {
-            if (Str::startsWith('taxonomy', $key)) {
+        foreach( $postTypeColumns as $key => $value ) {
+            if( Str::startsWith( 'taxonomy', $key ) ) {
                 continue;
             }
             $columns[$key] = $key;
@@ -174,22 +174,22 @@ 
      * @return string
      * @filter ngettext
      */
-    public function filterStatusText($translation, $single, $plural, $number, $domain)
+    public function filterStatusText( $translation, $single, $plural, $number, $domain )
     {
-        if ($this->canModifyTranslation($domain)) {
+        if( $this->canModifyTranslation( $domain ) ) {
             $strings = [
-                'Published' => __('Approved', 'site-reviews'),
-                'Pending' => __('Unapproved', 'site-reviews'),
+                'Published' => __( 'Approved', 'site-reviews' ),
+                'Pending' => __( 'Unapproved', 'site-reviews' ),
             ];
-            foreach ($strings as $search => $replace) {
-                if (false === strpos($single, $search)) {
+            foreach( $strings as $search => $replace ) {
+                if( false === strpos( $single, $search ) ) {
                     continue;
                 }
-                $translation = $this->getTranslation([
+                $translation = $this->getTranslation( [
                     'number' => $number,
-                    'plural' => str_replace($search, $replace, $plural),
-                    'single' => str_replace($search, $replace, $single),
-                ]);
+                    'plural' => str_replace( $search, $replace, $plural ),
+                    'single' => str_replace( $search, $replace, $single ),
+                ] );
             }
         }
         return $translation;
@@ -201,10 +201,10 @@ 
      * @return void
      * @action bulk_edit_custom_box
      */
-    public function renderBulkEditFields($columnName, $postType)
+    public function renderBulkEditFields( $columnName, $postType )
     {
-        if ('assigned_to' == $columnName && Application::POST_TYPE == $postType) {
-            glsr()->render('partials/editor/bulk-edit-assigned-to');
+        if( 'assigned_to' == $columnName && Application::POST_TYPE == $postType ) {
+            glsr()->render( 'partials/editor/bulk-edit-assigned-to' );
         }
     }
 
@@ -213,9 +213,9 @@ 
      * @return void
      * @action restrict_manage_posts
      */
-    public function renderColumnFilters($postType)
+    public function renderColumnFilters( $postType )
     {
-        glsr(Columns::class)->renderFilters($postType);
+        glsr( Columns::class )->renderFilters( $postType );
     }
 
     /**
@@ -224,9 +224,9 @@ 
      * @return void
      * @action manage_posts_custom_column
      */
-    public function renderColumnValues($column, $postId)
+    public function renderColumnValues( $column, $postId )
     {
-        glsr(Columns::class)->renderValues($column, $postId);
+        glsr( Columns::class )->renderValues( $column, $postId );
     }
 
     /**
@@ -234,14 +234,14 @@ 
      * @return void
      * @action save_post_.Application::POST_TYPE
      */
-    public function saveBulkEditFields($postId)
+    public function saveBulkEditFields( $postId )
     {
-        if (!current_user_can('edit_posts')) {
+        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);
+        $assignedTo = filter_input( INPUT_GET, 'assigned_to' );
+        if( $assignedTo && get_post( $assignedTo ) ) {
+            glsr( Database::class )->update( $postId, 'assigned_to', $assignedTo );
         }
     }
 
@@ -249,15 +249,15 @@ 
      * @return void
      * @action pre_get_posts
      */
-    public function setQueryForColumn(WP_Query $query)
+    public function setQueryForColumn( WP_Query $query )
     {
-        if (!$this->hasPermission($query)) {
+        if( !$this->hasPermission( $query ) ) {
             return;
         }
-        $this->setMetaQuery($query, [
+        $this->setMetaQuery( $query, [
             'rating', 'review_type',
-        ]);
-        $this->setOrderby($query);
+        ] );
+        $this->setOrderby( $query );
     }
 
     /**
@@ -266,15 +266,15 @@ 
      */
     public function unapprove()
     {
-        if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
+        if( Application::ID != filter_input( INPUT_GET, 'plugin' ) ) {
             return;
         }
-        check_admin_referer('unapprove-review_'.($postId = $this->getPostId()));
-        wp_update_post([
+        check_admin_referer( 'unapprove-review_'.($postId = $this->getPostId()) );
+        wp_update_post( [
             'ID' => $postId,
             'post_status' => 'pending',
-        ]);
-        wp_safe_redirect(wp_get_referer());
+        ] );
+        wp_safe_redirect( wp_get_referer() );
         exit;
     }
 
@@ -283,7 +283,7 @@ 
      * @param string $domain
      * @return bool
      */
-    protected function canModifyTranslation($domain = 'default')
+    protected function canModifyTranslation( $domain = 'default' )
     {
         $screen = glsr_current_screen();
         return 'default' == $domain
@@ -295,7 +295,7 @@ 
      * Get the modified translation string.
      * @return string
      */
-    protected function getTranslation(array $args)
+    protected function getTranslation( array $args )
     {
         $defaults = [
             'number' => 0,
@@ -303,57 +303,57 @@ 
             'single' => '',
             'text' => '',
         ];
-        $args = (object) wp_parse_args($args, $defaults);
-        $translations = get_translations_for_domain(Application::ID);
+        $args = (object)wp_parse_args( $args, $defaults );
+        $translations = get_translations_for_domain( Application::ID );
         return $args->text
-            ? $translations->translate($args->text)
-            : $translations->translate_plural($args->single, $args->plural, $args->number);
+            ? $translations->translate( $args->text )
+            : $translations->translate_plural( $args->single, $args->plural, $args->number );
     }
 
     /**
      * @return bool
      */
-    protected function hasPermission(WP_Query $query)
+    protected function hasPermission( WP_Query $query )
     {
         global $pagenow;
         return is_admin()
             && $query->is_main_query()
-            && Application::POST_TYPE == $query->get('post_type')
+            && Application::POST_TYPE == $query->get( 'post_type' )
             && 'edit.php' == $pagenow;
     }
 
     /**
      * @return void
      */
-    protected function setMetaQuery(WP_Query $query, array $metaKeys)
+    protected function setMetaQuery( WP_Query $query, array $metaKeys )
     {
-        foreach ($metaKeys as $key) {
-            if (!($value = filter_input(INPUT_GET, $key))) {
+        foreach( $metaKeys as $key ) {
+            if( !($value = filter_input( INPUT_GET, $key )) ) {
                 continue;
             }
-            $metaQuery = (array) $query->get('meta_query');
+            $metaQuery = (array)$query->get( 'meta_query' );
             $metaQuery[] = [
-                'key' => Str::prefix('_', $key),
+                'key' => Str::prefix( '_', $key ),
                 'value' => $value,
             ];
-            $query->set('meta_query', $metaQuery);
+            $query->set( 'meta_query', $metaQuery );
         }
     }
 
     /**
      * @return void
      */
-    protected function setOrderby(WP_Query $query)
+    protected function setOrderby( WP_Query $query )
     {
-        $orderby = $query->get('orderby');
+        $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) {
+        if( in_array( $orderby, array_keys( $columns ) ) ) {
+            if( 'reviewer' == $orderby ) {
                 $orderby = '_author';
             }
-            $query->set('meta_key', $orderby);
-            $query->set('orderby', 'meta_value');
+            $query->set( 'meta_key', $orderby );
+            $query->set( 'orderby', 'meta_value' );
         }
     }
 }

plugin/Controllers/AdminController.php

Indentation +218 added lines, -218 removed lines

@@ -16,222 +16,222 @@
 
 class AdminController extends Controller
 {
-    /**
-     * @return void
-     * @action admin_enqueue_scripts
-     */
-    public function enqueueAssets()
-    {
-        $command = new EnqueueAdminAssets([
-            'pointers' => [[
-                'content' => __('You can pin exceptional reviews so that they are always shown first.', 'site-reviews'),
-                'id' => 'glsr-pointer-pinned',
-                'position' => [
-                    'edge' => 'right',
-                    'align' => 'middle',
-                ],
-                'screen' => Application::POST_TYPE,
-                'target' => '#misc-pub-pinned',
-                'title' => __('Pin Your Reviews', 'site-reviews'),
-            ]],
-        ]);
-        $this->execute($command);
-    }
-
-    /**
-     * @return array
-     * @filter plugin_action_links_site-reviews/site-reviews.php
-     */
-    public function filterActionLinks(array $links)
-    {
-        $links['documentation'] = glsr(Builder::class)->a(__('Help', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=documentation'),
-        ]);
-        $links['settings'] = glsr(Builder::class)->a(__('Settings', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=settings'),
-        ]);
-        return $links;
-    }
-
-    /**
-     * @param array $capabilities
-     * @param string $capability
-     * @return array
-     * @filter map_meta_cap
-     */
-    public function filterCreateCapability($capabilities, $capability)
-    {
-        if ($capability == 'create_'.Application::POST_TYPE) {
-            $capabilities[] = 'do_not_allow';
-        }
-        return $capabilities;
-    }
-
-    /**
-     * @param array $items
-     * @return array
-     * @filter dashboard_glance_items
-     */
-    public function filterDashboardGlanceItems($items)
-    {
-        $postCount = wp_count_posts(Application::POST_TYPE);
-        if (empty($postCount->publish)) {
-            return $items;
-        }
-        $text = _n('%s Review', '%s Reviews', $postCount->publish, 'site-reviews');
-        $text = sprintf($text, number_format_i18n($postCount->publish));
-        $items = Arr::consolidateArray($items);
-        $items[] = current_user_can(get_post_type_object(Application::POST_TYPE)->cap->edit_posts)
-            ? glsr(Builder::class)->a($text, [
-                'class' => 'glsr-review-count',
-                'href' => 'edit.php?post_type='.Application::POST_TYPE,
-            ])
-            : glsr(Builder::class)->span($text, [
-                'class' => 'glsr-review-count',
-            ]);
-        return $items;
-    }
-
-    /**
-     * @param array $plugins
-     * @return array
-     * @filter mce_external_plugins
-     */
-    public function filterTinymcePlugins($plugins)
-    {
-        if (current_user_can('edit_posts') || current_user_can('edit_pages')) {
-            $plugins = Arr::consolidateArray($plugins);
-            $plugins['glsr_shortcode'] = glsr()->url('assets/scripts/mce-plugin.js');
-        }
-        return $plugins;
-    }
-
-    /**
-     * @return void
-     * @action admin_init
-     */
-    public function registerTinymcePopups()
-    {
-        $command = new RegisterTinymcePopups([
-            'site_reviews' => esc_html__('Recent Reviews', 'site-reviews'),
-            'site_reviews_form' => esc_html__('Submit a Review', 'site-reviews'),
-            'site_reviews_summary' => esc_html__('Summary of Reviews', 'site-reviews'),
-        ]);
-        $this->execute($command);
-    }
-
-    /**
-     * @param string $editorId
-     * @return void|null
-     * @action media_buttons
-     */
-    public function renderTinymceButton($editorId)
-    {
-        $allowedEditors = apply_filters('site-reviews/tinymce/editor-ids', ['content'], $editorId);
-        if ('post' != glsr_current_screen()->base || !in_array($editorId, $allowedEditors)) {
-            return;
-        }
-        $shortcodes = [];
-        foreach (glsr()->mceShortcodes as $shortcode => $values) {
-            $shortcodes[$shortcode] = $values;
-        }
-        if (empty($shortcodes)) {
-            return;
-        }
-        glsr()->render('partials/editor/tinymce', [
-            'shortcodes' => $shortcodes,
-        ]);
-    }
-
-    /**
-     * @return void
-     */
-    public function routerClearConsole()
-    {
-        glsr(Console::class)->clear();
-        glsr(Notice::class)->addSuccess(__('Console cleared.', 'site-reviews'));
-    }
-
-    /**
-     * @return void
-     */
-    public function routerFetchConsole()
-    {
-        glsr(Notice::class)->addSuccess(__('Console reloaded.', 'site-reviews'));
-    }
-
-    /**
-     * @param bool $showNotice
-     * @return void
-     */
-    public function routerCountReviews($showNotice = true)
-    {
-        glsr(CountsManager::class)->countAll();
-        glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
-        if ($showNotice) {
-            glsr(Notice::class)->clear()->addSuccess(__('Recalculated rating counts.', 'site-reviews'));
-        }
-    }
-
-    /**
-     * @return void
-     */
-    public function routerDownloadConsole()
-    {
-        $this->download(Application::ID.'-console.txt', glsr(Console::class)->get());
-    }
-
-    /**
-     * @return void
-     */
-    public function routerDownloadSystemInfo()
-    {
-        $this->download(Application::ID.'-system-info.txt', glsr(System::class)->get());
-    }
-
-    /**
-     * @return void
-     */
-    public function routerExportSettings()
-    {
-        $this->download(Application::ID.'-settings.json', glsr(OptionManager::class)->json());
-    }
-
-    /**
-     * @return void
-     */
-    public function routerImportSettings()
-    {
-        $file = $_FILES['import-file'];
-        if (UPLOAD_ERR_OK !== $file['error']) {
-            return glsr(Notice::class)->addError($this->getUploadError($file['error']));
-        }
-        if ('application/json' !== $file['type'] || !Str::endsWith('.json', $file['name'])) {
-            return glsr(Notice::class)->addError(__('Please use a valid Site Reviews settings file.', 'site-reviews'));
-        }
-        $settings = json_decode(file_get_contents($file['tmp_name']), true);
-        if (empty($settings)) {
-            return glsr(Notice::class)->addWarning(__('There were no settings found to import.', 'site-reviews'));
-        }
-        glsr(OptionManager::class)->set(glsr(OptionManager::class)->normalize($settings));
-        glsr(Notice::class)->addSuccess(__('Settings imported.', 'site-reviews'));
-    }
-
-    /**
-     * @param int $errorCode
-     * @return string
-     */
-    protected function getUploadError($errorCode)
-    {
-        $errors = [
-            UPLOAD_ERR_INI_SIZE => __('The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews'),
-            UPLOAD_ERR_FORM_SIZE => __('The uploaded file is too big.', 'site-reviews'),
-            UPLOAD_ERR_PARTIAL => __('The uploaded file was only partially uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_FILE => __('No file was uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_TMP_DIR => __('Missing a temporary folder.', 'site-reviews'),
-            UPLOAD_ERR_CANT_WRITE => __('Failed to write file to disk.', 'site-reviews'),
-            UPLOAD_ERR_EXTENSION => __('A PHP extension stopped the file upload.', 'site-reviews'),
-        ];
-        return Arr::get($errors, $errorCode, __('Unknown upload error.', 'site-reviews'));
-    }
+	/**
+	 * @return void
+	 * @action admin_enqueue_scripts
+	 */
+	public function enqueueAssets()
+	{
+		$command = new EnqueueAdminAssets([
+			'pointers' => [[
+				'content' => __('You can pin exceptional reviews so that they are always shown first.', 'site-reviews'),
+				'id' => 'glsr-pointer-pinned',
+				'position' => [
+					'edge' => 'right',
+					'align' => 'middle',
+				],
+				'screen' => Application::POST_TYPE,
+				'target' => '#misc-pub-pinned',
+				'title' => __('Pin Your Reviews', 'site-reviews'),
+			]],
+		]);
+		$this->execute($command);
+	}
+
+	/**
+	 * @return array
+	 * @filter plugin_action_links_site-reviews/site-reviews.php
+	 */
+	public function filterActionLinks(array $links)
+	{
+		$links['documentation'] = glsr(Builder::class)->a(__('Help', 'site-reviews'), [
+			'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=documentation'),
+		]);
+		$links['settings'] = glsr(Builder::class)->a(__('Settings', 'site-reviews'), [
+			'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=settings'),
+		]);
+		return $links;
+	}
+
+	/**
+	 * @param array $capabilities
+	 * @param string $capability
+	 * @return array
+	 * @filter map_meta_cap
+	 */
+	public function filterCreateCapability($capabilities, $capability)
+	{
+		if ($capability == 'create_'.Application::POST_TYPE) {
+			$capabilities[] = 'do_not_allow';
+		}
+		return $capabilities;
+	}
+
+	/**
+	 * @param array $items
+	 * @return array
+	 * @filter dashboard_glance_items
+	 */
+	public function filterDashboardGlanceItems($items)
+	{
+		$postCount = wp_count_posts(Application::POST_TYPE);
+		if (empty($postCount->publish)) {
+			return $items;
+		}
+		$text = _n('%s Review', '%s Reviews', $postCount->publish, 'site-reviews');
+		$text = sprintf($text, number_format_i18n($postCount->publish));
+		$items = Arr::consolidateArray($items);
+		$items[] = current_user_can(get_post_type_object(Application::POST_TYPE)->cap->edit_posts)
+			? glsr(Builder::class)->a($text, [
+				'class' => 'glsr-review-count',
+				'href' => 'edit.php?post_type='.Application::POST_TYPE,
+			])
+			: glsr(Builder::class)->span($text, [
+				'class' => 'glsr-review-count',
+			]);
+		return $items;
+	}
+
+	/**
+	 * @param array $plugins
+	 * @return array
+	 * @filter mce_external_plugins
+	 */
+	public function filterTinymcePlugins($plugins)
+	{
+		if (current_user_can('edit_posts') || current_user_can('edit_pages')) {
+			$plugins = Arr::consolidateArray($plugins);
+			$plugins['glsr_shortcode'] = glsr()->url('assets/scripts/mce-plugin.js');
+		}
+		return $plugins;
+	}
+
+	/**
+	 * @return void
+	 * @action admin_init
+	 */
+	public function registerTinymcePopups()
+	{
+		$command = new RegisterTinymcePopups([
+			'site_reviews' => esc_html__('Recent Reviews', 'site-reviews'),
+			'site_reviews_form' => esc_html__('Submit a Review', 'site-reviews'),
+			'site_reviews_summary' => esc_html__('Summary of Reviews', 'site-reviews'),
+		]);
+		$this->execute($command);
+	}
+
+	/**
+	 * @param string $editorId
+	 * @return void|null
+	 * @action media_buttons
+	 */
+	public function renderTinymceButton($editorId)
+	{
+		$allowedEditors = apply_filters('site-reviews/tinymce/editor-ids', ['content'], $editorId);
+		if ('post' != glsr_current_screen()->base || !in_array($editorId, $allowedEditors)) {
+			return;
+		}
+		$shortcodes = [];
+		foreach (glsr()->mceShortcodes as $shortcode => $values) {
+			$shortcodes[$shortcode] = $values;
+		}
+		if (empty($shortcodes)) {
+			return;
+		}
+		glsr()->render('partials/editor/tinymce', [
+			'shortcodes' => $shortcodes,
+		]);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerClearConsole()
+	{
+		glsr(Console::class)->clear();
+		glsr(Notice::class)->addSuccess(__('Console cleared.', 'site-reviews'));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerFetchConsole()
+	{
+		glsr(Notice::class)->addSuccess(__('Console reloaded.', 'site-reviews'));
+	}
+
+	/**
+	 * @param bool $showNotice
+	 * @return void
+	 */
+	public function routerCountReviews($showNotice = true)
+	{
+		glsr(CountsManager::class)->countAll();
+		glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
+		if ($showNotice) {
+			glsr(Notice::class)->clear()->addSuccess(__('Recalculated rating counts.', 'site-reviews'));
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerDownloadConsole()
+	{
+		$this->download(Application::ID.'-console.txt', glsr(Console::class)->get());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerDownloadSystemInfo()
+	{
+		$this->download(Application::ID.'-system-info.txt', glsr(System::class)->get());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerExportSettings()
+	{
+		$this->download(Application::ID.'-settings.json', glsr(OptionManager::class)->json());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerImportSettings()
+	{
+		$file = $_FILES['import-file'];
+		if (UPLOAD_ERR_OK !== $file['error']) {
+			return glsr(Notice::class)->addError($this->getUploadError($file['error']));
+		}
+		if ('application/json' !== $file['type'] || !Str::endsWith('.json', $file['name'])) {
+			return glsr(Notice::class)->addError(__('Please use a valid Site Reviews settings file.', 'site-reviews'));
+		}
+		$settings = json_decode(file_get_contents($file['tmp_name']), true);
+		if (empty($settings)) {
+			return glsr(Notice::class)->addWarning(__('There were no settings found to import.', 'site-reviews'));
+		}
+		glsr(OptionManager::class)->set(glsr(OptionManager::class)->normalize($settings));
+		glsr(Notice::class)->addSuccess(__('Settings imported.', 'site-reviews'));
+	}
+
+	/**
+	 * @param int $errorCode
+	 * @return string
+	 */
+	protected function getUploadError($errorCode)
+	{
+		$errors = [
+			UPLOAD_ERR_INI_SIZE => __('The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews'),
+			UPLOAD_ERR_FORM_SIZE => __('The uploaded file is too big.', 'site-reviews'),
+			UPLOAD_ERR_PARTIAL => __('The uploaded file was only partially uploaded.', 'site-reviews'),
+			UPLOAD_ERR_NO_FILE => __('No file was uploaded.', 'site-reviews'),
+			UPLOAD_ERR_NO_TMP_DIR => __('Missing a temporary folder.', 'site-reviews'),
+			UPLOAD_ERR_CANT_WRITE => __('Failed to write file to disk.', 'site-reviews'),
+			UPLOAD_ERR_EXTENSION => __('A PHP extension stopped the file upload.', 'site-reviews'),
+		];
+		return Arr::get($errors, $errorCode, __('Unknown upload error.', 'site-reviews'));
+	}
 }

Spacing +71 added lines, -71 removed lines

@@ -22,9 +22,9 @@ 
      */
     public function enqueueAssets()
     {
-        $command = new EnqueueAdminAssets([
+        $command = new EnqueueAdminAssets( [
             'pointers' => [[
-                'content' => __('You can pin exceptional reviews so that they are always shown first.', 'site-reviews'),
+                'content' => __( 'You can pin exceptional reviews so that they are always shown first.', 'site-reviews' ),
                 'id' => 'glsr-pointer-pinned',
                 'position' => [
                     'edge' => 'right',
@@ -32,24 +32,24 @@ 
                 ],
                 'screen' => Application::POST_TYPE,
                 'target' => '#misc-pub-pinned',
-                'title' => __('Pin Your Reviews', 'site-reviews'),
+                'title' => __( 'Pin Your Reviews', 'site-reviews' ),
             ]],
-        ]);
-        $this->execute($command);
+        ] );
+        $this->execute( $command );
     }
 
     /**
      * @return array
      * @filter plugin_action_links_site-reviews/site-reviews.php
      */
-    public function filterActionLinks(array $links)
+    public function filterActionLinks( array $links )
     {
-        $links['documentation'] = glsr(Builder::class)->a(__('Help', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=documentation'),
-        ]);
-        $links['settings'] = glsr(Builder::class)->a(__('Settings', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=settings'),
-        ]);
+        $links['documentation'] = glsr( Builder::class )->a( __( 'Help', 'site-reviews' ), [
+            'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=documentation' ),
+        ] );
+        $links['settings'] = glsr( Builder::class )->a( __( 'Settings', 'site-reviews' ), [
+            'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=settings' ),
+        ] );
         return $links;
     }
 
@@ -59,9 +59,9 @@ 
      * @return array
      * @filter map_meta_cap
      */
-    public function filterCreateCapability($capabilities, $capability)
+    public function filterCreateCapability( $capabilities, $capability )
     {
-        if ($capability == 'create_'.Application::POST_TYPE) {
+        if( $capability == 'create_'.Application::POST_TYPE ) {
             $capabilities[] = 'do_not_allow';
         }
         return $capabilities;
@@ -72,23 +72,23 @@ 
      * @return array
      * @filter dashboard_glance_items
      */
-    public function filterDashboardGlanceItems($items)
+    public function filterDashboardGlanceItems( $items )
     {
-        $postCount = wp_count_posts(Application::POST_TYPE);
-        if (empty($postCount->publish)) {
+        $postCount = wp_count_posts( Application::POST_TYPE );
+        if( empty($postCount->publish) ) {
             return $items;
         }
-        $text = _n('%s Review', '%s Reviews', $postCount->publish, 'site-reviews');
-        $text = sprintf($text, number_format_i18n($postCount->publish));
-        $items = Arr::consolidateArray($items);
-        $items[] = current_user_can(get_post_type_object(Application::POST_TYPE)->cap->edit_posts)
-            ? glsr(Builder::class)->a($text, [
+        $text = _n( '%s Review', '%s Reviews', $postCount->publish, 'site-reviews' );
+        $text = sprintf( $text, number_format_i18n( $postCount->publish ) );
+        $items = Arr::consolidateArray( $items );
+        $items[] = current_user_can( get_post_type_object( Application::POST_TYPE )->cap->edit_posts )
+            ? glsr( Builder::class )->a( $text, [
                 'class' => 'glsr-review-count',
                 'href' => 'edit.php?post_type='.Application::POST_TYPE,
-            ])
-            : glsr(Builder::class)->span($text, [
+            ] )
+            : glsr( Builder::class )->span( $text, [
                 'class' => 'glsr-review-count',
-            ]);
+            ] );
         return $items;
     }
 
@@ -97,11 +97,11 @@ 
      * @return array
      * @filter mce_external_plugins
      */
-    public function filterTinymcePlugins($plugins)
+    public function filterTinymcePlugins( $plugins )
     {
-        if (current_user_can('edit_posts') || current_user_can('edit_pages')) {
-            $plugins = Arr::consolidateArray($plugins);
-            $plugins['glsr_shortcode'] = glsr()->url('assets/scripts/mce-plugin.js');
+        if( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) {
+            $plugins = Arr::consolidateArray( $plugins );
+            $plugins['glsr_shortcode'] = glsr()->url( 'assets/scripts/mce-plugin.js' );
         }
         return $plugins;
     }
@@ -112,12 +112,12 @@ 
      */
     public function registerTinymcePopups()
     {
-        $command = new RegisterTinymcePopups([
-            'site_reviews' => esc_html__('Recent Reviews', 'site-reviews'),
-            'site_reviews_form' => esc_html__('Submit a Review', 'site-reviews'),
-            'site_reviews_summary' => esc_html__('Summary of Reviews', 'site-reviews'),
-        ]);
-        $this->execute($command);
+        $command = new RegisterTinymcePopups( [
+            'site_reviews' => esc_html__( 'Recent Reviews', 'site-reviews' ),
+            'site_reviews_form' => esc_html__( 'Submit a Review', 'site-reviews' ),
+            'site_reviews_summary' => esc_html__( 'Summary of Reviews', 'site-reviews' ),
+        ] );
+        $this->execute( $command );
     }
 
     /**
@@ -125,22 +125,22 @@ 
      * @return void|null
      * @action media_buttons
      */
-    public function renderTinymceButton($editorId)
+    public function renderTinymceButton( $editorId )
     {
-        $allowedEditors = apply_filters('site-reviews/tinymce/editor-ids', ['content'], $editorId);
-        if ('post' != glsr_current_screen()->base || !in_array($editorId, $allowedEditors)) {
+        $allowedEditors = apply_filters( 'site-reviews/tinymce/editor-ids', ['content'], $editorId );
+        if( 'post' != glsr_current_screen()->base || !in_array( $editorId, $allowedEditors ) ) {
             return;
         }
         $shortcodes = [];
-        foreach (glsr()->mceShortcodes as $shortcode => $values) {
+        foreach( glsr()->mceShortcodes as $shortcode => $values ) {
             $shortcodes[$shortcode] = $values;
         }
-        if (empty($shortcodes)) {
+        if( empty($shortcodes) ) {
             return;
         }
-        glsr()->render('partials/editor/tinymce', [
+        glsr()->render( 'partials/editor/tinymce', [
             'shortcodes' => $shortcodes,
-        ]);
+        ] );
     }
 
     /**
@@ -148,8 +148,8 @@ 
      */
     public function routerClearConsole()
     {
-        glsr(Console::class)->clear();
-        glsr(Notice::class)->addSuccess(__('Console cleared.', 'site-reviews'));
+        glsr( Console::class )->clear();
+        glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ) );
     }
 
     /**
@@ -157,19 +157,19 @@ 
      */
     public function routerFetchConsole()
     {
-        glsr(Notice::class)->addSuccess(__('Console reloaded.', 'site-reviews'));
+        glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ) );
     }
 
     /**
      * @param bool $showNotice
      * @return void
      */
-    public function routerCountReviews($showNotice = true)
+    public function routerCountReviews( $showNotice = true )
     {
-        glsr(CountsManager::class)->countAll();
-        glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
-        if ($showNotice) {
-            glsr(Notice::class)->clear()->addSuccess(__('Recalculated rating counts.', 'site-reviews'));
+        glsr( CountsManager::class )->countAll();
+        glsr( OptionManager::class )->set( 'last_review_count', current_time( 'timestamp' ) );
+        if( $showNotice ) {
+            glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ) );
         }
     }
 
@@ -178,7 +178,7 @@ 
      */
     public function routerDownloadConsole()
     {
-        $this->download(Application::ID.'-console.txt', glsr(Console::class)->get());
+        $this->download( Application::ID.'-console.txt', glsr( Console::class )->get() );
     }
 
     /**
@@ -186,7 +186,7 @@ 
      */
     public function routerDownloadSystemInfo()
     {
-        $this->download(Application::ID.'-system-info.txt', glsr(System::class)->get());
+        $this->download( Application::ID.'-system-info.txt', glsr( System::class )->get() );
     }
 
     /**
@@ -194,7 +194,7 @@ 
      */
     public function routerExportSettings()
     {
-        $this->download(Application::ID.'-settings.json', glsr(OptionManager::class)->json());
+        $this->download( Application::ID.'-settings.json', glsr( OptionManager::class )->json() );
     }
 
     /**
@@ -203,35 +203,35 @@ 
     public function routerImportSettings()
     {
         $file = $_FILES['import-file'];
-        if (UPLOAD_ERR_OK !== $file['error']) {
-            return glsr(Notice::class)->addError($this->getUploadError($file['error']));
+        if( UPLOAD_ERR_OK !== $file['error'] ) {
+            return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ) );
         }
-        if ('application/json' !== $file['type'] || !Str::endsWith('.json', $file['name'])) {
-            return glsr(Notice::class)->addError(__('Please use a valid Site Reviews settings file.', 'site-reviews'));
+        if( 'application/json' !== $file['type'] || !Str::endsWith( '.json', $file['name'] ) ) {
+            return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ) );
         }
-        $settings = json_decode(file_get_contents($file['tmp_name']), true);
-        if (empty($settings)) {
-            return glsr(Notice::class)->addWarning(__('There were no settings found to import.', 'site-reviews'));
+        $settings = json_decode( file_get_contents( $file['tmp_name'] ), true );
+        if( empty($settings) ) {
+            return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ) );
         }
-        glsr(OptionManager::class)->set(glsr(OptionManager::class)->normalize($settings));
-        glsr(Notice::class)->addSuccess(__('Settings imported.', 'site-reviews'));
+        glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ) );
+        glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ) );
     }
 
     /**
      * @param int $errorCode
      * @return string
      */
-    protected function getUploadError($errorCode)
+    protected function getUploadError( $errorCode )
     {
         $errors = [
-            UPLOAD_ERR_INI_SIZE => __('The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews'),
-            UPLOAD_ERR_FORM_SIZE => __('The uploaded file is too big.', 'site-reviews'),
-            UPLOAD_ERR_PARTIAL => __('The uploaded file was only partially uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_FILE => __('No file was uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_TMP_DIR => __('Missing a temporary folder.', 'site-reviews'),
-            UPLOAD_ERR_CANT_WRITE => __('Failed to write file to disk.', 'site-reviews'),
-            UPLOAD_ERR_EXTENSION => __('A PHP extension stopped the file upload.', 'site-reviews'),
+            UPLOAD_ERR_INI_SIZE => __( 'The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews' ),
+            UPLOAD_ERR_FORM_SIZE => __( 'The uploaded file is too big.', 'site-reviews' ),
+            UPLOAD_ERR_PARTIAL => __( 'The uploaded file was only partially uploaded.', 'site-reviews' ),
+            UPLOAD_ERR_NO_FILE => __( 'No file was uploaded.', 'site-reviews' ),
+            UPLOAD_ERR_NO_TMP_DIR => __( 'Missing a temporary folder.', 'site-reviews' ),
+            UPLOAD_ERR_CANT_WRITE => __( 'Failed to write file to disk.', 'site-reviews' ),
+            UPLOAD_ERR_EXTENSION => __( 'A PHP extension stopped the file upload.', 'site-reviews' ),
         ];
-        return Arr::get($errors, $errorCode, __('Unknown upload error.', 'site-reviews'));
+        return Arr::get( $errors, $errorCode, __( 'Unknown upload error.', 'site-reviews' ) );
     }
 }

plugin/Application.php

Indentation +279 added lines, -279 removed lines

@@ -9,308 +9,308 @@
 
 final class Application extends Container
 {
-    const CAPABILITY = 'edit_others_posts';
-    const CRON_EVENT = 'site-reviews/schedule/session/purge';
-    const ID = 'site-reviews';
-    const PAGED_QUERY_VAR = 'reviews-page';
-    const POST_TYPE = 'site-review';
-    const PREFIX = 'glsr_';
-    const TAXONOMY = 'site-review-category';
+	const CAPABILITY = 'edit_others_posts';
+	const CRON_EVENT = 'site-reviews/schedule/session/purge';
+	const ID = 'site-reviews';
+	const PAGED_QUERY_VAR = 'reviews-page';
+	const POST_TYPE = 'site-review';
+	const PREFIX = 'glsr_';
+	const TAXONOMY = 'site-review-category';
 
-    public $defaults;
-    public $deprecated = [];
-    public $file;
-    public $languages;
-    public $mceShortcodes = []; //defined elsewhere
-    public $name;
-    public $reviewTypes;
-    public $schemas = []; //defined elsewhere
-    public $version;
+	public $defaults;
+	public $deprecated = [];
+	public $file;
+	public $languages;
+	public $mceShortcodes = []; //defined elsewhere
+	public $name;
+	public $reviewTypes;
+	public $schemas = []; //defined elsewhere
+	public $version;
 
-    public function __construct()
-    {
-        static::$instance = $this;
-        $this->file = realpath(trailingslashit(dirname(__DIR__)).static::ID.'.php');
-        $plugin = get_file_data($this->file, [
-            'languages' => 'Domain Path',
-            'name' => 'Plugin Name',
-            'version' => 'Version',
-        ], 'plugin');
-        array_walk($plugin, function ($value, $key) {
-            $this->$key = $value;
-        });
-    }
+	public function __construct()
+	{
+		static::$instance = $this;
+		$this->file = realpath(trailingslashit(dirname(__DIR__)).static::ID.'.php');
+		$plugin = get_file_data($this->file, [
+			'languages' => 'Domain Path',
+			'name' => 'Plugin Name',
+			'version' => 'Version',
+		], 'plugin');
+		array_walk($plugin, function ($value, $key) {
+			$this->$key = $value;
+		});
+	}
 
-    /**
-     * @return void
-     */
-    public function activate()
-    {
-        $this->make(DefaultsManager::class)->set();
-        $this->scheduleCronJob();
-        $this->upgrade();
-    }
+	/**
+	 * @return void
+	 */
+	public function activate()
+	{
+		$this->make(DefaultsManager::class)->set();
+		$this->scheduleCronJob();
+		$this->upgrade();
+	}
 
-    /**
-     * @return void
-     */
-    public function catchFatalError()
-    {
-        $error = error_get_last();
-        if (E_ERROR !== $error['type'] || false === strpos($error['message'], $this->path())) {
-            return;
-        }
-        glsr_log()->error($error['message']);
-    }
+	/**
+	 * @return void
+	 */
+	public function catchFatalError()
+	{
+		$error = error_get_last();
+		if (E_ERROR !== $error['type'] || false === strpos($error['message'], $this->path())) {
+			return;
+		}
+		glsr_log()->error($error['message']);
+	}
 
-    /**
-     * @param string $name
-     * @return array
-     */
-    public function config($name)
-    {
-        $configFile = $this->path('config/'.$name.'.php');
-        $config = file_exists($configFile)
-            ? include $configFile
-            : [];
-        return apply_filters('site-reviews/config/'.$name, $config);
-    }
+	/**
+	 * @param string $name
+	 * @return array
+	 */
+	public function config($name)
+	{
+		$configFile = $this->path('config/'.$name.'.php');
+		$config = file_exists($configFile)
+			? include $configFile
+			: [];
+		return apply_filters('site-reviews/config/'.$name, $config);
+	}
 
-    /**
-     * @param string $property
-     * @return string
-     */
-    public function constant($property, $className = 'static')
-    {
-        $constant = $className.'::'.$property;
-        return defined($constant)
-            ? apply_filters('site-reviews/const/'.$property, constant($constant))
-            : '';
-    }
+	/**
+	 * @param string $property
+	 * @return string
+	 */
+	public function constant($property, $className = 'static')
+	{
+		$constant = $className.'::'.$property;
+		return defined($constant)
+			? apply_filters('site-reviews/const/'.$property, constant($constant))
+			: '';
+	}
 
-    /**
-     * @return void
-     */
-    public function deactivate()
-    {
-        $this->unscheduleCronJob();
-    }
+	/**
+	 * @return void
+	 */
+	public function deactivate()
+	{
+		$this->unscheduleCronJob();
+	}
 
-    /**
-     * @param string $view
-     * @return void|string
-     */
-    public function file($view)
-    {
-        $view.= '.php';
-        $filePaths = [];
-        if (Str::startsWith('templates/', $view)) {
-            $filePaths[] = $this->themePath(Str::removePrefix('templates/', $view));
-        }
-        $filePaths[] = $this->path($view);
-        $filePaths[] = $this->path('views/'.$view);
-        foreach ($filePaths as $file) {
-            if (!file_exists($file)) {
-                continue;
-            }
-            return $file;
-        }
-    }
+	/**
+	 * @param string $view
+	 * @return void|string
+	 */
+	public function file($view)
+	{
+		$view.= '.php';
+		$filePaths = [];
+		if (Str::startsWith('templates/', $view)) {
+			$filePaths[] = $this->themePath(Str::removePrefix('templates/', $view));
+		}
+		$filePaths[] = $this->path($view);
+		$filePaths[] = $this->path('views/'.$view);
+		foreach ($filePaths as $file) {
+			if (!file_exists($file)) {
+				continue;
+			}
+			return $file;
+		}
+	}
 
-    /**
-     * @return array
-     */
-    public function getDefaults()
-    {
-        if (empty($this->defaults)) {
-            $this->defaults = $this->make(DefaultsManager::class)->get();
-            $this->upgrade();
-        }
-        return apply_filters('site-reviews/get/defaults', $this->defaults);
-    }
+	/**
+	 * @return array
+	 */
+	public function getDefaults()
+	{
+		if (empty($this->defaults)) {
+			$this->defaults = $this->make(DefaultsManager::class)->get();
+			$this->upgrade();
+		}
+		return apply_filters('site-reviews/get/defaults', $this->defaults);
+	}
 
-    /**
-     * @return string
-     */
-    public function getPermission($page = '')
-    {
-        $permissions = [
-            'addons' => 'install_plugins',
-            'settings' => 'manage_options',
-            // 'welcome' => 'activate_plugins',
-        ];
-        return Arr::get($permissions, $page, $this->constant('CAPABILITY'));
-    }
+	/**
+	 * @return string
+	 */
+	public function getPermission($page = '')
+	{
+		$permissions = [
+			'addons' => 'install_plugins',
+			'settings' => 'manage_options',
+			// 'welcome' => 'activate_plugins',
+		];
+		return Arr::get($permissions, $page, $this->constant('CAPABILITY'));
+	}
 
-    /**
-     * @return bool
-     */
-    public function hasPermission($page = '')
-    {
-        $isAdmin = $this->isAdmin();
-        return !$isAdmin || ($isAdmin && current_user_can($this->getPermission($page)));
-    }
+	/**
+	 * @return bool
+	 */
+	public function hasPermission($page = '')
+	{
+		$isAdmin = $this->isAdmin();
+		return !$isAdmin || ($isAdmin && current_user_can($this->getPermission($page)));
+	}
 
-    /**
-     * @return void
-     */
-    public function init()
-    {
-        $this->make(Actions::class)->run();
-        $this->make(Filters::class)->run();
-    }
+	/**
+	 * @return void
+	 */
+	public function init()
+	{
+		$this->make(Actions::class)->run();
+		$this->make(Filters::class)->run();
+	}
 
-    /**
-     * @return bool
-     */
-    public function isAdmin()
-    {
-        return is_admin() && !wp_doing_ajax();
-    }
+	/**
+	 * @return bool
+	 */
+	public function isAdmin()
+	{
+		return is_admin() && !wp_doing_ajax();
+	}
 
-    /**
-     * @param string $file
-     * @return string
-     */
-    public function path($file = '', $realpath = true)
-    {
-        $path = plugin_dir_path($this->file);
-        if (!$realpath) {
-            $path = trailingslashit(WP_PLUGIN_DIR).basename(dirname($this->file));
-        }
-        $path = trailingslashit($path).ltrim(trim($file), '/');
-        return apply_filters('site-reviews/path', $path, $file);
-    }
+	/**
+	 * @param string $file
+	 * @return string
+	 */
+	public function path($file = '', $realpath = true)
+	{
+		$path = plugin_dir_path($this->file);
+		if (!$realpath) {
+			$path = trailingslashit(WP_PLUGIN_DIR).basename(dirname($this->file));
+		}
+		$path = trailingslashit($path).ltrim(trim($file), '/');
+		return apply_filters('site-reviews/path', $path, $file);
+	}
 
-    /**
-     * @return void
-     */
-    public function registerAddons()
-    {
-        do_action('site-reviews/addon/register', $this);
-    }
+	/**
+	 * @return void
+	 */
+	public function registerAddons()
+	{
+		do_action('site-reviews/addon/register', $this);
+	}
 
-    /**
-     * @return void
-     */
-    public function registerLanguages()
-    {
-        load_plugin_textdomain(static::ID, false,
-            trailingslashit(plugin_basename($this->path()).'/'.$this->languages)
-        );
-    }
+	/**
+	 * @return void
+	 */
+	public function registerLanguages()
+	{
+		load_plugin_textdomain(static::ID, false,
+			trailingslashit(plugin_basename($this->path()).'/'.$this->languages)
+		);
+	}
 
-    /**
-     * @return void
-     */
-    public function registerReviewTypes()
-    {
-        $types = apply_filters('site-reviews/addon/types', []);
-        $this->reviewTypes = wp_parse_args($types, [
-            'local' => __('Local', 'site-reviews'),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function registerReviewTypes()
+	{
+		$types = apply_filters('site-reviews/addon/types', []);
+		$this->reviewTypes = wp_parse_args($types, [
+			'local' => __('Local', 'site-reviews'),
+		]);
+	}
 
-    /**
-     * @param string $view
-     * @return void
-     */
-    public function render($view, array $data = [])
-    {
-        $view = apply_filters('site-reviews/render/view', $view, $data);
-        $file = apply_filters('site-reviews/views/file', $this->file($view), $view, $data);
-        if (!file_exists($file)) {
-            glsr_log()->error('File not found: '.$file);
-            return;
-        }
-        $data = apply_filters('site-reviews/views/data', $data, $view);
-        extract($data);
-        include $file;
-    }
+	/**
+	 * @param string $view
+	 * @return void
+	 */
+	public function render($view, array $data = [])
+	{
+		$view = apply_filters('site-reviews/render/view', $view, $data);
+		$file = apply_filters('site-reviews/views/file', $this->file($view), $view, $data);
+		if (!file_exists($file)) {
+			glsr_log()->error('File not found: '.$file);
+			return;
+		}
+		$data = apply_filters('site-reviews/views/data', $data, $view);
+		extract($data);
+		include $file;
+	}
 
-    /**
-     * @return void
-     */
-    public function scheduleCronJob()
-    {
-        if (wp_next_scheduled(static::CRON_EVENT)) {
-            return;
-        }
-        wp_schedule_event(time(), 'twicedaily', static::CRON_EVENT);
-    }
+	/**
+	 * @return void
+	 */
+	public function scheduleCronJob()
+	{
+		if (wp_next_scheduled(static::CRON_EVENT)) {
+			return;
+		}
+		wp_schedule_event(time(), 'twicedaily', static::CRON_EVENT);
+	}
 
-    /**
-     * @param string $file
-     * @return string
-     */
-    public function themePath($file = '')
-    {
-        return get_stylesheet_directory().'/'.static::ID.'/'.ltrim(trim($file), '/');
-    }
+	/**
+	 * @param string $file
+	 * @return string
+	 */
+	public function themePath($file = '')
+	{
+		return get_stylesheet_directory().'/'.static::ID.'/'.ltrim(trim($file), '/');
+	}
 
-    /**
-     * @return void
-     */
-    public function unscheduleCronJob()
-    {
-        wp_unschedule_event(intval(wp_next_scheduled(static::CRON_EVENT)), static::CRON_EVENT);
-    }
+	/**
+	 * @return void
+	 */
+	public function unscheduleCronJob()
+	{
+		wp_unschedule_event(intval(wp_next_scheduled(static::CRON_EVENT)), static::CRON_EVENT);
+	}
 
-    /**
-     * @return void
-     */
-    public function upgrade()
-    {
-        $this->make(Upgrader::class)->run();
-    }
+	/**
+	 * @return void
+	 */
+	public function upgrade()
+	{
+		$this->make(Upgrader::class)->run();
+	}
 
-    /**
-     * @param mixed $upgrader
-     * @return void
-     * @action upgrader_process_complete
-     */
-    public function upgraded($upgrader, array $data)
-    {
-        if (array_key_exists('plugins', $data)
-            && in_array(plugin_basename($this->file), $data['plugins'])
-            && 'update' === $data['action']
-            && 'plugin' === $data['type']
-        ) {
-            $this->upgrade();
-        }
-    }
+	/**
+	 * @param mixed $upgrader
+	 * @return void
+	 * @action upgrader_process_complete
+	 */
+	public function upgraded($upgrader, array $data)
+	{
+		if (array_key_exists('plugins', $data)
+			&& in_array(plugin_basename($this->file), $data['plugins'])
+			&& 'update' === $data['action']
+			&& 'plugin' === $data['type']
+		) {
+			$this->upgrade();
+		}
+	}
 
-    /**
-     * @param string $path
-     * @return string
-     */
-    public function url($path = '')
-    {
-        $url = esc_url(plugin_dir_url($this->file).ltrim(trim($path), '/'));
-        return apply_filters('site-reviews/url', $url, $path);
-    }
+	/**
+	 * @param string $path
+	 * @return string
+	 */
+	public function url($path = '')
+	{
+		$url = esc_url(plugin_dir_url($this->file).ltrim(trim($path), '/'));
+		return apply_filters('site-reviews/url', $url, $path);
+	}
 
-    /**
-     * @param string $versionLevel
-     * @return string
-     */
-    public function version($versionLevel = '')
-    {
-        $pattern = '/^v?(\d{1,5})(\.\d++)?(\.\d++)?(.+)?$/i';
-        preg_match($pattern, $this->version, $matches);
-        switch ($versionLevel) {
-            case 'major':
-                $version = Arr::get($matches, 1);
-                break;
-            case 'minor':
-                $version = Arr::get($matches, 1).Arr::get($matches, 2);
-                break;
-            case 'patch':
-                $version = Arr::get($matches, 1).Arr::get($matches, 2).Arr::get($matches, 3);
-                break;
-        }
-        return empty($version)
-            ? $this->version
-            : $version;
-    }
+	/**
+	 * @param string $versionLevel
+	 * @return string
+	 */
+	public function version($versionLevel = '')
+	{
+		$pattern = '/^v?(\d{1,5})(\.\d++)?(\.\d++)?(.+)?$/i';
+		preg_match($pattern, $this->version, $matches);
+		switch ($versionLevel) {
+			case 'major':
+				$version = Arr::get($matches, 1);
+				break;
+			case 'minor':
+				$version = Arr::get($matches, 1).Arr::get($matches, 2);
+				break;
+			case 'patch':
+				$version = Arr::get($matches, 1).Arr::get($matches, 2).Arr::get($matches, 3);
+				break;
+		}
+		return empty($version)
+			? $this->version
+			: $version;
+	}
 }

Spacing +69 added lines, -69 removed lines

@@ -30,13 +30,13 @@ 
     public function __construct()
     {
         static::$instance = $this;
-        $this->file = realpath(trailingslashit(dirname(__DIR__)).static::ID.'.php');
-        $plugin = get_file_data($this->file, [
+        $this->file = realpath( trailingslashit( dirname( __DIR__ ) ).static::ID.'.php' );
+        $plugin = get_file_data( $this->file, [
             'languages' => 'Domain Path',
             'name' => 'Plugin Name',
             'version' => 'Version',
-        ], 'plugin');
-        array_walk($plugin, function ($value, $key) {
+        ], 'plugin' );
+        array_walk( $plugin, function( $value, $key ) {
             $this->$key = $value;
         });
     }
@@ -46,7 +46,7 @@ 
      */
     public function activate()
     {
-        $this->make(DefaultsManager::class)->set();
+        $this->make( DefaultsManager::class )->set();
         $this->scheduleCronJob();
         $this->upgrade();
     }
@@ -57,34 +57,34 @@ 
     public function catchFatalError()
     {
         $error = error_get_last();
-        if (E_ERROR !== $error['type'] || false === strpos($error['message'], $this->path())) {
+        if( E_ERROR !== $error['type'] || false === strpos( $error['message'], $this->path() ) ) {
             return;
         }
-        glsr_log()->error($error['message']);
+        glsr_log()->error( $error['message'] );
     }
 
     /**
      * @param string $name
      * @return array
      */
-    public function config($name)
+    public function config( $name )
     {
-        $configFile = $this->path('config/'.$name.'.php');
-        $config = file_exists($configFile)
+        $configFile = $this->path( 'config/'.$name.'.php' );
+        $config = file_exists( $configFile )
             ? include $configFile
             : [];
-        return apply_filters('site-reviews/config/'.$name, $config);
+        return apply_filters( 'site-reviews/config/'.$name, $config );
     }
 
     /**
      * @param string $property
      * @return string
      */
-    public function constant($property, $className = 'static')
+    public function constant( $property, $className = 'static' )
     {
         $constant = $className.'::'.$property;
-        return defined($constant)
-            ? apply_filters('site-reviews/const/'.$property, constant($constant))
+        return defined( $constant )
+            ? apply_filters( 'site-reviews/const/'.$property, constant( $constant ) )
             : '';
     }
 
@@ -100,17 +100,17 @@ 
      * @param string $view
      * @return void|string
      */
-    public function file($view)
+    public function file( $view )
     {
-        $view.= '.php';
+        $view .= '.php';
         $filePaths = [];
-        if (Str::startsWith('templates/', $view)) {
-            $filePaths[] = $this->themePath(Str::removePrefix('templates/', $view));
+        if( Str::startsWith( 'templates/', $view ) ) {
+            $filePaths[] = $this->themePath( Str::removePrefix( 'templates/', $view ) );
         }
-        $filePaths[] = $this->path($view);
-        $filePaths[] = $this->path('views/'.$view);
-        foreach ($filePaths as $file) {
-            if (!file_exists($file)) {
+        $filePaths[] = $this->path( $view );
+        $filePaths[] = $this->path( 'views/'.$view );
+        foreach( $filePaths as $file ) {
+            if( !file_exists( $file ) ) {
                 continue;
             }
             return $file;
@@ -122,33 +122,33 @@ 
      */
     public function getDefaults()
     {
-        if (empty($this->defaults)) {
-            $this->defaults = $this->make(DefaultsManager::class)->get();
+        if( empty($this->defaults) ) {
+            $this->defaults = $this->make( DefaultsManager::class )->get();
             $this->upgrade();
         }
-        return apply_filters('site-reviews/get/defaults', $this->defaults);
+        return apply_filters( 'site-reviews/get/defaults', $this->defaults );
     }
 
     /**
      * @return string
      */
-    public function getPermission($page = '')
+    public function getPermission( $page = '' )
     {
         $permissions = [
             'addons' => 'install_plugins',
             'settings' => 'manage_options',
             // 'welcome' => 'activate_plugins',
         ];
-        return Arr::get($permissions, $page, $this->constant('CAPABILITY'));
+        return Arr::get( $permissions, $page, $this->constant( 'CAPABILITY' ) );
     }
 
     /**
      * @return bool
      */
-    public function hasPermission($page = '')
+    public function hasPermission( $page = '' )
     {
         $isAdmin = $this->isAdmin();
-        return !$isAdmin || ($isAdmin && current_user_can($this->getPermission($page)));
+        return !$isAdmin || ($isAdmin && current_user_can( $this->getPermission( $page ) ));
     }
 
     /**
@@ -156,8 +156,8 @@ 
      */
     public function init()
     {
-        $this->make(Actions::class)->run();
-        $this->make(Filters::class)->run();
+        $this->make( Actions::class )->run();
+        $this->make( Filters::class )->run();
     }
 
     /**
@@ -172,14 +172,14 @@ 
      * @param string $file
      * @return string
      */
-    public function path($file = '', $realpath = true)
+    public function path( $file = '', $realpath = true )
     {
-        $path = plugin_dir_path($this->file);
-        if (!$realpath) {
-            $path = trailingslashit(WP_PLUGIN_DIR).basename(dirname($this->file));
+        $path = plugin_dir_path( $this->file );
+        if( !$realpath ) {
+            $path = trailingslashit( WP_PLUGIN_DIR ).basename( dirname( $this->file ) );
         }
-        $path = trailingslashit($path).ltrim(trim($file), '/');
-        return apply_filters('site-reviews/path', $path, $file);
+        $path = trailingslashit( $path ).ltrim( trim( $file ), '/' );
+        return apply_filters( 'site-reviews/path', $path, $file );
     }
 
     /**
@@ -187,7 +187,7 @@ 
      */
     public function registerAddons()
     {
-        do_action('site-reviews/addon/register', $this);
+        do_action( 'site-reviews/addon/register', $this );
     }
 
     /**
@@ -195,8 +195,8 @@ 
      */
     public function registerLanguages()
     {
-        load_plugin_textdomain(static::ID, false,
-            trailingslashit(plugin_basename($this->path()).'/'.$this->languages)
+        load_plugin_textdomain( static::ID, false,
+            trailingslashit( plugin_basename( $this->path() ).'/'.$this->languages )
         );
     }
 
@@ -205,26 +205,26 @@ 
      */
     public function registerReviewTypes()
     {
-        $types = apply_filters('site-reviews/addon/types', []);
-        $this->reviewTypes = wp_parse_args($types, [
-            'local' => __('Local', 'site-reviews'),
-        ]);
+        $types = apply_filters( 'site-reviews/addon/types', [] );
+        $this->reviewTypes = wp_parse_args( $types, [
+            'local' => __( 'Local', 'site-reviews' ),
+        ] );
     }
 
     /**
      * @param string $view
      * @return void
      */
-    public function render($view, array $data = [])
+    public function render( $view, array $data = [] )
     {
-        $view = apply_filters('site-reviews/render/view', $view, $data);
-        $file = apply_filters('site-reviews/views/file', $this->file($view), $view, $data);
-        if (!file_exists($file)) {
-            glsr_log()->error('File not found: '.$file);
+        $view = apply_filters( 'site-reviews/render/view', $view, $data );
+        $file = apply_filters( 'site-reviews/views/file', $this->file( $view ), $view, $data );
+        if( !file_exists( $file ) ) {
+            glsr_log()->error( 'File not found: '.$file );
             return;
         }
-        $data = apply_filters('site-reviews/views/data', $data, $view);
-        extract($data);
+        $data = apply_filters( 'site-reviews/views/data', $data, $view );
+        extract( $data );
         include $file;
     }
 
@@ -233,19 +233,19 @@ 
      */
     public function scheduleCronJob()
     {
-        if (wp_next_scheduled(static::CRON_EVENT)) {
+        if( wp_next_scheduled( static::CRON_EVENT ) ) {
             return;
         }
-        wp_schedule_event(time(), 'twicedaily', static::CRON_EVENT);
+        wp_schedule_event( time(), 'twicedaily', static::CRON_EVENT );
     }
 
     /**
      * @param string $file
      * @return string
      */
-    public function themePath($file = '')
+    public function themePath( $file = '' )
     {
-        return get_stylesheet_directory().'/'.static::ID.'/'.ltrim(trim($file), '/');
+        return get_stylesheet_directory().'/'.static::ID.'/'.ltrim( trim( $file ), '/' );
     }
 
     /**
@@ -253,7 +253,7 @@ 
      */
     public function unscheduleCronJob()
     {
-        wp_unschedule_event(intval(wp_next_scheduled(static::CRON_EVENT)), static::CRON_EVENT);
+        wp_unschedule_event( intval( wp_next_scheduled( static::CRON_EVENT ) ), static::CRON_EVENT );
     }
 
     /**
@@ -261,7 +261,7 @@ 
      */
     public function upgrade()
     {
-        $this->make(Upgrader::class)->run();
+        $this->make( Upgrader::class )->run();
     }
 
     /**
@@ -269,10 +269,10 @@ 
      * @return void
      * @action upgrader_process_complete
      */
-    public function upgraded($upgrader, array $data)
+    public function upgraded( $upgrader, array $data )
     {
-        if (array_key_exists('plugins', $data)
-            && in_array(plugin_basename($this->file), $data['plugins'])
+        if( array_key_exists( 'plugins', $data )
+            && in_array( plugin_basename( $this->file ), $data['plugins'] )
             && 'update' === $data['action']
             && 'plugin' === $data['type']
         ) {
@@ -284,29 +284,29 @@ 
      * @param string $path
      * @return string
      */
-    public function url($path = '')
+    public function url( $path = '' )
     {
-        $url = esc_url(plugin_dir_url($this->file).ltrim(trim($path), '/'));
-        return apply_filters('site-reviews/url', $url, $path);
+        $url = esc_url( plugin_dir_url( $this->file ).ltrim( trim( $path ), '/' ) );
+        return apply_filters( 'site-reviews/url', $url, $path );
     }
 
     /**
      * @param string $versionLevel
      * @return string
      */
-    public function version($versionLevel = '')
+    public function version( $versionLevel = '' )
     {
         $pattern = '/^v?(\d{1,5})(\.\d++)?(\.\d++)?(.+)?$/i';
-        preg_match($pattern, $this->version, $matches);
-        switch ($versionLevel) {
+        preg_match( $pattern, $this->version, $matches );
+        switch( $versionLevel ) {
             case 'major':
-                $version = Arr::get($matches, 1);
+                $version = Arr::get( $matches, 1 );
                 break;
             case 'minor':
-                $version = Arr::get($matches, 1).Arr::get($matches, 2);
+                $version = Arr::get( $matches, 1 ).Arr::get( $matches, 2 );
                 break;
             case 'patch':
-                $version = Arr::get($matches, 1).Arr::get($matches, 2).Arr::get($matches, 3);
+                $version = Arr::get( $matches, 1 ).Arr::get( $matches, 2 ).Arr::get( $matches, 3 );
                 break;
         }
         return empty($version)

plugin/Modules/ReviewLimits.php

Indentation +91 added lines, -91 removed lines

@@ -8,103 +8,103 @@
 
 class ReviewLimits
 {
-    protected $request;
+	protected $request;
 
-    /**
-     * @return array
-     * @filter site-reviews/get/reviews/query
-     */
-    public function filterReviewsQuery(array $parameters, array $args)
-    {
-        if ($authorId = get_current_user_id()) {
-            $parameters['author'] = $authorId;
-        }
-        $parameters['post_status'] = ['pending', 'publish'];
-        return apply_filters('site-reviews/reviews-limits/query', $parameters, $args);
-    }
+	/**
+	 * @return array
+	 * @filter site-reviews/get/reviews/query
+	 */
+	public function filterReviewsQuery(array $parameters, array $args)
+	{
+		if ($authorId = get_current_user_id()) {
+			$parameters['author'] = $authorId;
+		}
+		$parameters['post_status'] = ['pending', 'publish'];
+		return apply_filters('site-reviews/reviews-limits/query', $parameters, $args);
+	}
 
-    /**
-     * @return bool
-     */
-    public function hasReachedLimit(array $request = [])
-    {
-        $this->request = $request;
-        $method = Helper::buildMethodName(
-            glsr(OptionManager::class)->get('settings.submissions.limit'), 'validateBy'
-        );
-        return method_exists($this, $method)
-            ? !call_user_func([$this, $method])
-            : false;
-    }
+	/**
+	 * @return bool
+	 */
+	public function hasReachedLimit(array $request = [])
+	{
+		$this->request = $request;
+		$method = Helper::buildMethodName(
+			glsr(OptionManager::class)->get('settings.submissions.limit'), 'validateBy'
+		);
+		return method_exists($this, $method)
+			? !call_user_func([$this, $method])
+			: false;
+	}
 
-    /**
-     * @param string $value
-     * @param string $whitelist
-     * @return bool
-     */
-    public function isWhitelisted($value, $whitelist)
-    {
-        if (empty($whitelist)) {
-            return false;
-        }
-        return in_array($value, array_filter(explode("\n", $whitelist), 'trim'));
-    }
+	/**
+	 * @param string $value
+	 * @param string $whitelist
+	 * @return bool
+	 */
+	public function isWhitelisted($value, $whitelist)
+	{
+		if (empty($whitelist)) {
+			return false;
+		}
+		return in_array($value, array_filter(explode("\n", $whitelist), 'trim'));
+	}
 
-    /**
-     * @param string $whitelistName
-     * @return string
-     */
-    protected function getWhitelist($whitelistName)
-    {
-        return glsr(OptionManager::class)->get('settings.submissions.limit_whitelist.'.$whitelistName);
-    }
+	/**
+	 * @param string $whitelistName
+	 * @return string
+	 */
+	protected function getWhitelist($whitelistName)
+	{
+		return glsr(OptionManager::class)->get('settings.submissions.limit_whitelist.'.$whitelistName);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validate($key, $value, $addMetaQuery = true)
-    {
-        if ($this->isWhitelisted($value, $this->getWhitelist($key))) {
-            return true;
-        }
-        add_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5, 2);
-        $args = ['assigned_to' => Arr::get($this->request, 'assign_to')];
-        if ($addMetaQuery) {
-            $args[$key] = $value;
-        }
-        $reviews = glsr_get_reviews($args);
-        remove_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5);
-        return 0 === count($reviews);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validate($key, $value, $addMetaQuery = true)
+	{
+		if ($this->isWhitelisted($value, $this->getWhitelist($key))) {
+			return true;
+		}
+		add_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5, 2);
+		$args = ['assigned_to' => Arr::get($this->request, 'assign_to')];
+		if ($addMetaQuery) {
+			$args[$key] = $value;
+		}
+		$reviews = glsr_get_reviews($args);
+		remove_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5);
+		return 0 === count($reviews);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validateByEmail()
-    {
-        glsr_log()->debug('Email is: '.Arr::get($this->request, 'email'));
-        return $this->validate('email', Arr::get($this->request, 'email'));
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validateByEmail()
+	{
+		glsr_log()->debug('Email is: '.Arr::get($this->request, 'email'));
+		return $this->validate('email', Arr::get($this->request, 'email'));
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validateByIpAddress()
-    {
-        glsr_log()->debug('IP Address is: '.Arr::get($this->request, 'ip_address'));
-        return $this->validate('ip_address', Arr::get($this->request, 'ip_address'));
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validateByIpAddress()
+	{
+		glsr_log()->debug('IP Address is: '.Arr::get($this->request, 'ip_address'));
+		return $this->validate('ip_address', Arr::get($this->request, 'ip_address'));
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validateByUsername()
-    {
-        $user = wp_get_current_user();
-        if (!$user->exists()) {
-            return true;
-        }
-        glsr_log()->debug('Username is: '.$user->user_login);
-        return $this->validate('username', $user->user_login, false);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validateByUsername()
+	{
+		$user = wp_get_current_user();
+		if (!$user->exists()) {
+			return true;
+		}
+		glsr_log()->debug('Username is: '.$user->user_login);
+		return $this->validate('username', $user->user_login, false);
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -14,26 +14,26 @@ 
      * @return array
      * @filter site-reviews/get/reviews/query
      */
-    public function filterReviewsQuery(array $parameters, array $args)
+    public function filterReviewsQuery( array $parameters, array $args )
     {
-        if ($authorId = get_current_user_id()) {
+        if( $authorId = get_current_user_id() ) {
             $parameters['author'] = $authorId;
         }
         $parameters['post_status'] = ['pending', 'publish'];
-        return apply_filters('site-reviews/reviews-limits/query', $parameters, $args);
+        return apply_filters( 'site-reviews/reviews-limits/query', $parameters, $args );
     }
 
     /**
      * @return bool
      */
-    public function hasReachedLimit(array $request = [])
+    public function hasReachedLimit( array $request = [] )
     {
         $this->request = $request;
         $method = Helper::buildMethodName(
-            glsr(OptionManager::class)->get('settings.submissions.limit'), 'validateBy'
+            glsr( OptionManager::class )->get( 'settings.submissions.limit' ), 'validateBy'
         );
-        return method_exists($this, $method)
-            ? !call_user_func([$this, $method])
+        return method_exists( $this, $method )
+            ? !call_user_func( [$this, $method] )
             : false;
     }
 
@@ -42,39 +42,39 @@ 
      * @param string $whitelist
      * @return bool
      */
-    public function isWhitelisted($value, $whitelist)
+    public function isWhitelisted( $value, $whitelist )
     {
-        if (empty($whitelist)) {
+        if( empty($whitelist) ) {
             return false;
         }
-        return in_array($value, array_filter(explode("\n", $whitelist), 'trim'));
+        return in_array( $value, array_filter( explode( "\n", $whitelist ), 'trim' ) );
     }
 
     /**
      * @param string $whitelistName
      * @return string
      */
-    protected function getWhitelist($whitelistName)
+    protected function getWhitelist( $whitelistName )
     {
-        return glsr(OptionManager::class)->get('settings.submissions.limit_whitelist.'.$whitelistName);
+        return glsr( OptionManager::class )->get( 'settings.submissions.limit_whitelist.'.$whitelistName );
     }
 
     /**
      * @return bool
      */
-    protected function validate($key, $value, $addMetaQuery = true)
+    protected function validate( $key, $value, $addMetaQuery = true )
     {
-        if ($this->isWhitelisted($value, $this->getWhitelist($key))) {
+        if( $this->isWhitelisted( $value, $this->getWhitelist( $key ) ) ) {
             return true;
         }
-        add_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5, 2);
-        $args = ['assigned_to' => Arr::get($this->request, 'assign_to')];
-        if ($addMetaQuery) {
+        add_filter( 'site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5, 2 );
+        $args = ['assigned_to' => Arr::get( $this->request, 'assign_to' )];
+        if( $addMetaQuery ) {
             $args[$key] = $value;
         }
-        $reviews = glsr_get_reviews($args);
-        remove_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5);
-        return 0 === count($reviews);
+        $reviews = glsr_get_reviews( $args );
+        remove_filter( 'site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5 );
+        return 0 === count( $reviews );
     }
 
     /**
@@ -82,8 +82,8 @@ 
      */
     protected function validateByEmail()
     {
-        glsr_log()->debug('Email is: '.Arr::get($this->request, 'email'));
-        return $this->validate('email', Arr::get($this->request, 'email'));
+        glsr_log()->debug( 'Email is: '.Arr::get( $this->request, 'email' ) );
+        return $this->validate( 'email', Arr::get( $this->request, 'email' ) );
     }
 
     /**
@@ -91,8 +91,8 @@ 
      */
     protected function validateByIpAddress()
     {
-        glsr_log()->debug('IP Address is: '.Arr::get($this->request, 'ip_address'));
-        return $this->validate('ip_address', Arr::get($this->request, 'ip_address'));
+        glsr_log()->debug( 'IP Address is: '.Arr::get( $this->request, 'ip_address' ) );
+        return $this->validate( 'ip_address', Arr::get( $this->request, 'ip_address' ) );
     }
 
     /**
@@ -101,10 +101,10 @@ 
     protected function validateByUsername()
     {
         $user = wp_get_current_user();
-        if (!$user->exists()) {
+        if( !$user->exists() ) {
             return true;
         }
-        glsr_log()->debug('Username is: '.$user->user_login);
-        return $this->validate('username', $user->user_login, false);
+        glsr_log()->debug( 'Username is: '.$user->user_login );
+        return $this->validate( 'username', $user->user_login, false );
     }
 }

plugin/Modules/Validator/ValidateReview.php

Indentation +262 added lines, -262 removed lines

@@ -13,288 +13,288 @@
 
 class ValidateReview
 {
-    const RECAPTCHA_ENDPOINT = 'https://www.google.com/recaptcha/api/siteverify';
+	const RECAPTCHA_ENDPOINT = 'https://www.google.com/recaptcha/api/siteverify';
 
-    const RECAPTCHA_DISABLED = 0;
-    const RECAPTCHA_EMPTY = 1;
-    const RECAPTCHA_FAILED = 2;
-    const RECAPTCHA_INVALID = 3;
-    const RECAPTCHA_VALID = 4;
+	const RECAPTCHA_DISABLED = 0;
+	const RECAPTCHA_EMPTY = 1;
+	const RECAPTCHA_FAILED = 2;
+	const RECAPTCHA_INVALID = 3;
+	const RECAPTCHA_VALID = 4;
 
-    const VALIDATION_RULES = [
-        'content' => 'required',
-        'email' => 'required|email',
-        'name' => 'required',
-        'rating' => 'required|number|between:1,5',
-        'terms' => 'accepted',
-        'title' => 'required',
-    ];
+	const VALIDATION_RULES = [
+		'content' => 'required',
+		'email' => 'required|email',
+		'name' => 'required',
+		'rating' => 'required|number|between:1,5',
+		'terms' => 'accepted',
+		'title' => 'required',
+	];
 
-    /**
-     * @var string|void
-     */
-    public $error;
+	/**
+	 * @var string|void
+	 */
+	public $error;
 
-    /**
-     * @var string
-     */
-    public $form_id;
+	/**
+	 * @var string
+	 */
+	public $form_id;
 
-    /**
-     * @var bool
-     */
-    public $recaptchaIsUnset = false;
+	/**
+	 * @var bool
+	 */
+	public $recaptchaIsUnset = false;
 
-    /**
-     * @var array
-     */
-    public $request;
+	/**
+	 * @var array
+	 */
+	public $request;
 
-    /**
-     * @var array
-     */
-    protected $options;
+	/**
+	 * @var array
+	 */
+	protected $options;
 
-    /**
-     * @return static
-     */
-    public function validate(array $request)
-    {
-        $this->form_id = $request['form_id'];
-        $this->options = glsr(OptionManager::class)->all();
-        $this->request = $this->validateRequest($request);
-        $this->validateCustom();
-        $this->validateHoneyPot();
-        $this->validateReviewLimits();
-        $this->validateBlacklist();
-        $this->validateAkismet();
-        $this->validateRecaptcha();
-        if (!empty($this->error)) {
-            $this->setSessionValues('message', $this->error);
-        }
-        return $this;
-    }
+	/**
+	 * @return static
+	 */
+	public function validate(array $request)
+	{
+		$this->form_id = $request['form_id'];
+		$this->options = glsr(OptionManager::class)->all();
+		$this->request = $this->validateRequest($request);
+		$this->validateCustom();
+		$this->validateHoneyPot();
+		$this->validateReviewLimits();
+		$this->validateBlacklist();
+		$this->validateAkismet();
+		$this->validateRecaptcha();
+		if (!empty($this->error)) {
+			$this->setSessionValues('message', $this->error);
+		}
+		return $this;
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @return mixed
-     */
-    protected function getOption($path, $fallback = '')
-    {
-        return Arr::get($this->options, $path, $fallback);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @return mixed
+	 */
+	protected function getOption($path, $fallback = '')
+	{
+		return Arr::get($this->options, $path, $fallback);
+	}
 
-    /**
-     * @return int
-     */
-    protected function getRecaptchaStatus()
-    {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
-            return static::RECAPTCHA_DISABLED;
-        }
-        if (empty($this->request['_recaptcha-token'])) {
-            return $this->request['_counter'] < intval(apply_filters('site-reviews/recaptcha/timeout', 5))
-                ? static::RECAPTCHA_EMPTY
-                : static::RECAPTCHA_FAILED;
-        }
-        return $this->getRecaptchaTokenStatus();
-    }
+	/**
+	 * @return int
+	 */
+	protected function getRecaptchaStatus()
+	{
+		if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+			return static::RECAPTCHA_DISABLED;
+		}
+		if (empty($this->request['_recaptcha-token'])) {
+			return $this->request['_counter'] < intval(apply_filters('site-reviews/recaptcha/timeout', 5))
+				? static::RECAPTCHA_EMPTY
+				: static::RECAPTCHA_FAILED;
+		}
+		return $this->getRecaptchaTokenStatus();
+	}
 
-    /**
-     * @return int
-     */
-    protected function getRecaptchaTokenStatus()
-    {
-        $endpoint = add_query_arg([
-            'remoteip' => Helper::getIpAddress(),
-            'response' => $this->request['_recaptcha-token'],
-            'secret' => $this->getOption('settings.submissions.recaptcha.secret'),
-        ], static::RECAPTCHA_ENDPOINT);
-        if (is_wp_error($response = wp_remote_get($endpoint))) {
-            glsr_log()->error($response->get_error_message());
-            return static::RECAPTCHA_FAILED;
-        }
-        $response = json_decode(wp_remote_retrieve_body($response));
-        if (!empty($response->success)) {
-            return boolval($response->success)
-                ? static::RECAPTCHA_VALID
-                : static::RECAPTCHA_INVALID;
-        }
-        foreach ($response->{'error-codes'} as $error) {
-            glsr_log()->error('reCAPTCHA error: '.$error);
-        }
-        return static::RECAPTCHA_INVALID;
-    }
+	/**
+	 * @return int
+	 */
+	protected function getRecaptchaTokenStatus()
+	{
+		$endpoint = add_query_arg([
+			'remoteip' => Helper::getIpAddress(),
+			'response' => $this->request['_recaptcha-token'],
+			'secret' => $this->getOption('settings.submissions.recaptcha.secret'),
+		], static::RECAPTCHA_ENDPOINT);
+		if (is_wp_error($response = wp_remote_get($endpoint))) {
+			glsr_log()->error($response->get_error_message());
+			return static::RECAPTCHA_FAILED;
+		}
+		$response = json_decode(wp_remote_retrieve_body($response));
+		if (!empty($response->success)) {
+			return boolval($response->success)
+				? static::RECAPTCHA_VALID
+				: static::RECAPTCHA_INVALID;
+		}
+		foreach ($response->{'error-codes'} as $error) {
+			glsr_log()->error('reCAPTCHA error: '.$error);
+		}
+		return static::RECAPTCHA_INVALID;
+	}
 
-    /**
-     * @return array
-     */
-    protected function getValidationRules(array $request)
-    {
-        $rules = array_intersect_key(
-            apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
-            array_flip($this->getOption('settings.submissions.required', []))
-        );
-        $excluded = explode(',', Arr::get($request, 'excluded'));
-        return array_diff_key($rules, array_flip($excluded));
-    }
+	/**
+	 * @return array
+	 */
+	protected function getValidationRules(array $request)
+	{
+		$rules = array_intersect_key(
+			apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
+			array_flip($this->getOption('settings.submissions.required', []))
+		);
+		$excluded = explode(',', Arr::get($request, 'excluded'));
+		return array_diff_key($rules, array_flip($excluded));
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isRequestValid(array $request)
-    {
-        $rules = $this->getValidationRules($request);
-        $errors = glsr(Validator::class)->validate($request, $rules);
-        if (empty($errors)) {
-            return true;
-        }
-        $this->setSessionValues('errors', $errors);
-        $this->setSessionValues('values', $request);
-        return false;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isRequestValid(array $request)
+	{
+		$rules = $this->getValidationRules($request);
+		$errors = glsr(Validator::class)->validate($request, $rules);
+		if (empty($errors)) {
+			return true;
+		}
+		$this->setSessionValues('errors', $errors);
+		$this->setSessionValues('values', $request);
+		return false;
+	}
 
-    protected function setError($message, $loggedMessage = '')
-    {
-        $this->setSessionValues('errors', [], $loggedMessage);
-        $this->error = $message;
-    }
+	protected function setError($message, $loggedMessage = '')
+	{
+		$this->setSessionValues('errors', [], $loggedMessage);
+		$this->error = $message;
+	}
 
-    /**
-     * @param string $type
-     * @param mixed $value
-     * @param string $loggedMessage
-     * @return void
-     */
-    protected function setSessionValues($type, $value, $loggedMessage = '')
-    {
-        glsr()->sessionSet($this->form_id.$type, $value);
-        if (!empty($loggedMessage)) {
-            glsr_log()->warning($loggedMessage)->debug($this->request);
-        }
-    }
+	/**
+	 * @param string $type
+	 * @param mixed $value
+	 * @param string $loggedMessage
+	 * @return void
+	 */
+	protected function setSessionValues($type, $value, $loggedMessage = '')
+	{
+		glsr()->sessionSet($this->form_id.$type, $value);
+		if (!empty($loggedMessage)) {
+			glsr_log()->warning($loggedMessage)->debug($this->request);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateAkismet()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (!glsr(Akismet::class)->isSpam($this->request)) {
-            return;
-        }
-        $this->setError(__('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews'),
-            'Akismet caught a spam submission (consider adding the IP address to the blacklist):'
-        );
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateAkismet()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (!glsr(Akismet::class)->isSpam($this->request)) {
+			return;
+		}
+		$this->setError(__('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews'),
+			'Akismet caught a spam submission (consider adding the IP address to the blacklist):'
+		);
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateBlacklist()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
-            return;
-        }
-        $blacklistAction = $this->getOption('settings.submissions.blacklist.action');
-        if ('reject' != $blacklistAction) {
-            $this->request['blacklisted'] = true;
-            return;
-        }
-        $this->setError(__('Your review cannot be submitted at this time.', 'site-reviews'),
-            'Blacklisted submission detected:'
-        );
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateBlacklist()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
+			return;
+		}
+		$blacklistAction = $this->getOption('settings.submissions.blacklist.action');
+		if ('reject' != $blacklistAction) {
+			$this->request['blacklisted'] = true;
+			return;
+		}
+		$this->setError(__('Your review cannot be submitted at this time.', 'site-reviews'),
+			'Blacklisted submission detected:'
+		);
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateCustom()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        $validated = apply_filters('site-reviews/validate/custom', true, $this->request);
-        if (true === $validated) {
-            return;
-        }
-        $errorMessage = is_string($validated)
-            ? $validated
-            : __('The review submission failed. Please notify the site administrator.', 'site-reviews');
-        $this->setError($errorMessage);
-        $this->setSessionValues('values', $this->request);
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateCustom()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		$validated = apply_filters('site-reviews/validate/custom', true, $this->request);
+		if (true === $validated) {
+			return;
+		}
+		$errorMessage = is_string($validated)
+			? $validated
+			: __('The review submission failed. Please notify the site administrator.', 'site-reviews');
+		$this->setError($errorMessage);
+		$this->setSessionValues('values', $this->request);
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateHoneyPot()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (empty($this->request['gotcha'])) {
-            return;
-        }
-        $this->setError(__('The review submission failed. Please notify the site administrator.', 'site-reviews'),
-            'The Honeypot caught a bad submission:'
-        );
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateHoneyPot()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (empty($this->request['gotcha'])) {
+			return;
+		}
+		$this->setError(__('The review submission failed. Please notify the site administrator.', 'site-reviews'),
+			'The Honeypot caught a bad submission:'
+		);
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateReviewLimits()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (!glsr(ReviewLimits::class)->hasReachedLimit($this->request)) {
-            return;
-        }
-        $this->setError(__('You have already submitted a review.', 'site-reviews'));
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateReviewLimits()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (!glsr(ReviewLimits::class)->hasReachedLimit($this->request)) {
+			return;
+		}
+		$this->setError(__('You have already submitted a review.', 'site-reviews'));
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateRecaptcha()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        $status = $this->getRecaptchaStatus();
-        if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
-            return;
-        }
-        if (static::RECAPTCHA_EMPTY === $status) {
-            $this->setSessionValues('recaptcha', 'unset');
-            $this->recaptchaIsUnset = true;
-            return;
-        }
-        $this->setSessionValues('recaptcha', 'reset');
-        $errors = [
-            static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
-            static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
-        ];
-        $this->setError($errors[$status]);
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateRecaptcha()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		$status = $this->getRecaptchaStatus();
+		if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
+			return;
+		}
+		if (static::RECAPTCHA_EMPTY === $status) {
+			$this->setSessionValues('recaptcha', 'unset');
+			$this->recaptchaIsUnset = true;
+			return;
+		}
+		$this->setSessionValues('recaptcha', 'reset');
+		$errors = [
+			static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
+			static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
+		];
+		$this->setError($errors[$status]);
+	}
 
-    /**
-     * @return array
-     */
-    protected function validateRequest(array $request)
-    {
-        if (!$this->isRequestValid($request)) {
-            $this->error = __('Please fix the submission errors.', 'site-reviews');
-            return $request;
-        }
-        return array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request);
-    }
+	/**
+	 * @return array
+	 */
+	protected function validateRequest(array $request)
+	{
+		if (!$this->isRequestValid($request)) {
+			$this->error = __('Please fix the submission errors.', 'site-reviews');
+			return $request;
+		}
+		return array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request);
+	}
 }

Spacing +70 added lines, -70 removed lines

@@ -58,19 +58,19 @@ 
     /**
      * @return static
      */
-    public function validate(array $request)
+    public function validate( array $request )
     {
         $this->form_id = $request['form_id'];
-        $this->options = glsr(OptionManager::class)->all();
-        $this->request = $this->validateRequest($request);
+        $this->options = glsr( OptionManager::class )->all();
+        $this->request = $this->validateRequest( $request );
         $this->validateCustom();
         $this->validateHoneyPot();
         $this->validateReviewLimits();
         $this->validateBlacklist();
         $this->validateAkismet();
         $this->validateRecaptcha();
-        if (!empty($this->error)) {
-            $this->setSessionValues('message', $this->error);
+        if( !empty($this->error) ) {
+            $this->setSessionValues( 'message', $this->error );
         }
         return $this;
     }
@@ -80,9 +80,9 @@ 
      * @param mixed $fallback
      * @return mixed
      */
-    protected function getOption($path, $fallback = '')
+    protected function getOption( $path, $fallback = '' )
     {
-        return Arr::get($this->options, $path, $fallback);
+        return Arr::get( $this->options, $path, $fallback );
     }
 
     /**
@@ -90,11 +90,11 @@ 
      */
     protected function getRecaptchaStatus()
     {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
             return static::RECAPTCHA_DISABLED;
         }
-        if (empty($this->request['_recaptcha-token'])) {
-            return $this->request['_counter'] < intval(apply_filters('site-reviews/recaptcha/timeout', 5))
+        if( empty($this->request['_recaptcha-token']) ) {
+            return $this->request['_counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ) )
                 ? static::RECAPTCHA_EMPTY
                 : static::RECAPTCHA_FAILED;
         }
@@ -106,23 +106,23 @@ 
      */
     protected function getRecaptchaTokenStatus()
     {
-        $endpoint = add_query_arg([
+        $endpoint = add_query_arg( [
             'remoteip' => Helper::getIpAddress(),
             'response' => $this->request['_recaptcha-token'],
-            'secret' => $this->getOption('settings.submissions.recaptcha.secret'),
-        ], static::RECAPTCHA_ENDPOINT);
-        if (is_wp_error($response = wp_remote_get($endpoint))) {
-            glsr_log()->error($response->get_error_message());
+            'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ),
+        ], static::RECAPTCHA_ENDPOINT );
+        if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) {
+            glsr_log()->error( $response->get_error_message() );
             return static::RECAPTCHA_FAILED;
         }
-        $response = json_decode(wp_remote_retrieve_body($response));
-        if (!empty($response->success)) {
-            return boolval($response->success)
+        $response = json_decode( wp_remote_retrieve_body( $response ) );
+        if( !empty($response->success) ) {
+            return boolval( $response->success )
                 ? static::RECAPTCHA_VALID
                 : static::RECAPTCHA_INVALID;
         }
-        foreach ($response->{'error-codes'} as $error) {
-            glsr_log()->error('reCAPTCHA error: '.$error);
+        foreach( $response->{'error-codes'} as $error ) {
+            glsr_log()->error( 'reCAPTCHA error: '.$error );
         }
         return static::RECAPTCHA_INVALID;
     }
@@ -130,34 +130,34 @@ 
     /**
      * @return array
      */
-    protected function getValidationRules(array $request)
+    protected function getValidationRules( array $request )
     {
         $rules = array_intersect_key(
-            apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
-            array_flip($this->getOption('settings.submissions.required', []))
+            apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES, $request ),
+            array_flip( $this->getOption( 'settings.submissions.required', [] ) )
         );
-        $excluded = explode(',', Arr::get($request, 'excluded'));
-        return array_diff_key($rules, array_flip($excluded));
+        $excluded = explode( ',', Arr::get( $request, 'excluded' ) );
+        return array_diff_key( $rules, array_flip( $excluded ) );
     }
 
     /**
      * @return bool
      */
-    protected function isRequestValid(array $request)
+    protected function isRequestValid( array $request )
     {
-        $rules = $this->getValidationRules($request);
-        $errors = glsr(Validator::class)->validate($request, $rules);
-        if (empty($errors)) {
+        $rules = $this->getValidationRules( $request );
+        $errors = glsr( Validator::class )->validate( $request, $rules );
+        if( empty($errors) ) {
             return true;
         }
-        $this->setSessionValues('errors', $errors);
-        $this->setSessionValues('values', $request);
+        $this->setSessionValues( 'errors', $errors );
+        $this->setSessionValues( 'values', $request );
         return false;
     }
 
-    protected function setError($message, $loggedMessage = '')
+    protected function setError( $message, $loggedMessage = '' )
     {
-        $this->setSessionValues('errors', [], $loggedMessage);
+        $this->setSessionValues( 'errors', [], $loggedMessage );
         $this->error = $message;
     }
 
@@ -167,11 +167,11 @@ 
      * @param string $loggedMessage
      * @return void
      */
-    protected function setSessionValues($type, $value, $loggedMessage = '')
+    protected function setSessionValues( $type, $value, $loggedMessage = '' )
     {
-        glsr()->sessionSet($this->form_id.$type, $value);
-        if (!empty($loggedMessage)) {
-            glsr_log()->warning($loggedMessage)->debug($this->request);
+        glsr()->sessionSet( $this->form_id.$type, $value );
+        if( !empty($loggedMessage) ) {
+            glsr_log()->warning( $loggedMessage )->debug( $this->request );
         }
     }
 
@@ -180,13 +180,13 @@ 
      */
     protected function validateAkismet()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!glsr(Akismet::class)->isSpam($this->request)) {
+        if( !glsr( Akismet::class )->isSpam( $this->request ) ) {
             return;
         }
-        $this->setError(__('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews'),
+        $this->setError( __( 'This review has been flagged as possible spam and cannot be submitted.', 'site-reviews' ),
             'Akismet caught a spam submission (consider adding the IP address to the blacklist):'
         );
     }
@@ -196,18 +196,18 @@ 
      */
     protected function validateBlacklist()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
+        if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) ) {
             return;
         }
-        $blacklistAction = $this->getOption('settings.submissions.blacklist.action');
-        if ('reject' != $blacklistAction) {
+        $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
+        if( 'reject' != $blacklistAction ) {
             $this->request['blacklisted'] = true;
             return;
         }
-        $this->setError(__('Your review cannot be submitted at this time.', 'site-reviews'),
+        $this->setError( __( 'Your review cannot be submitted at this time.', 'site-reviews' ),
             'Blacklisted submission detected:'
         );
     }
@@ -217,18 +217,18 @@ 
      */
     protected function validateCustom()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        $validated = apply_filters('site-reviews/validate/custom', true, $this->request);
-        if (true === $validated) {
+        $validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
+        if( true === $validated ) {
             return;
         }
-        $errorMessage = is_string($validated)
+        $errorMessage = is_string( $validated )
             ? $validated
-            : __('The review submission failed. Please notify the site administrator.', 'site-reviews');
-        $this->setError($errorMessage);
-        $this->setSessionValues('values', $this->request);
+            : __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
+        $this->setError( $errorMessage );
+        $this->setSessionValues( 'values', $this->request );
     }
 
     /**
@@ -236,13 +236,13 @@ 
      */
     protected function validateHoneyPot()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (empty($this->request['gotcha'])) {
+        if( empty($this->request['gotcha']) ) {
             return;
         }
-        $this->setError(__('The review submission failed. Please notify the site administrator.', 'site-reviews'),
+        $this->setError( __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ),
             'The Honeypot caught a bad submission:'
         );
     }
@@ -252,13 +252,13 @@ 
      */
     protected function validateReviewLimits()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!glsr(ReviewLimits::class)->hasReachedLimit($this->request)) {
+        if( !glsr( ReviewLimits::class )->hasReachedLimit( $this->request ) ) {
             return;
         }
-        $this->setError(__('You have already submitted a review.', 'site-reviews'));
+        $this->setError( __( 'You have already submitted a review.', 'site-reviews' ) );
     }
 
     /**
@@ -266,35 +266,35 @@ 
      */
     protected function validateRecaptcha()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
         $status = $this->getRecaptchaStatus();
-        if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
+        if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ) ) {
             return;
         }
-        if (static::RECAPTCHA_EMPTY === $status) {
-            $this->setSessionValues('recaptcha', 'unset');
+        if( static::RECAPTCHA_EMPTY === $status ) {
+            $this->setSessionValues( 'recaptcha', 'unset' );
             $this->recaptchaIsUnset = true;
             return;
         }
-        $this->setSessionValues('recaptcha', 'reset');
+        $this->setSessionValues( 'recaptcha', 'reset' );
         $errors = [
-            static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
-            static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
+            static::RECAPTCHA_FAILED => __( 'The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews' ),
+            static::RECAPTCHA_INVALID => __( 'The reCAPTCHA verification failed, please try again.', 'site-reviews' ),
         ];
-        $this->setError($errors[$status]);
+        $this->setError( $errors[$status] );
     }
 
     /**
      * @return array
      */
-    protected function validateRequest(array $request)
+    protected function validateRequest( array $request )
     {
-        if (!$this->isRequestValid($request)) {
-            $this->error = __('Please fix the submission errors.', 'site-reviews');
+        if( !$this->isRequestValid( $request ) ) {
+            $this->error = __( 'Please fix the submission errors.', 'site-reviews' );
             return $request;
         }
-        return array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request);
+        return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request );
     }
 }

plugin/Modules/System.php

Indentation +345 added lines, -345 removed lines

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

Spacing +108 added lines, -108 removed lines

@@ -41,17 +41,17 @@ 
             'setting' => 'Plugin Settings',
             'reviews' => 'Review Counts',
         ];
-        $systemInfo = array_reduce(array_keys($details), function ($carry, $key) use ($details) {
-            $methodName = Helper::buildMethodName('get-'.$key.'-details');
-            if (method_exists($this, $methodName) && $systemDetails = $this->$methodName()) {
+        $systemInfo = array_reduce( array_keys( $details ), function( $carry, $key ) use ($details) {
+            $methodName = Helper::buildMethodName( 'get-'.$key.'-details' );
+            if( method_exists( $this, $methodName ) && $systemDetails = $this->$methodName() ) {
                 return $carry.$this->implode(
-                    strtoupper($details[$key]),
-                    apply_filters('site-reviews/system/'.$key, $systemDetails)
+                    strtoupper( $details[$key] ),
+                    apply_filters( 'site-reviews/system/'.$key, $systemDetails )
                 );
             }
             return $carry;
         });
-        return trim($systemInfo);
+        return trim( $systemInfo );
     }
 
     /**
@@ -60,9 +60,9 @@ 
     public function getActivePluginDetails()
     {
         $plugins = get_plugins();
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactive = array_diff_key($plugins, array_flip($activePlugins));
-        return $this->normalizePluginList(array_diff_key($plugins, $inactive));
+        $activePlugins = glsr( OptionManager::class )->getWP( 'active_plugins', [], 'array' );
+        $inactive = array_diff_key( $plugins, array_flip( $activePlugins ) );
+        return $this->normalizePluginList( array_diff_key( $plugins, $inactive ) );
     }
 
     /**
@@ -70,8 +70,8 @@ 
      */
     public function getAddonDetails()
     {
-        $details = apply_filters('site-reviews/addon/system-info', []);
-        ksort($details);
+        $details = apply_filters( 'site-reviews/addon/system-info', [] );
+        ksort( $details );
         return $details;
     }
 
@@ -81,11 +81,11 @@ 
     public function getBrowserDetails()
     {
         $browser = new Browser();
-        $name = esc_attr($browser->getName());
-        $userAgent = esc_attr($browser->getUserAgent()->getUserAgentString());
-        $version = esc_attr($browser->getVersion());
+        $name = esc_attr( $browser->getName() );
+        $userAgent = esc_attr( $browser->getUserAgent()->getUserAgentString() );
+        $version = esc_attr( $browser->getVersion() );
         return [
-            'Browser Name' => sprintf('%s %s', $name, $version),
+            'Browser Name' => sprintf( '%s %s', $name, $version ),
             'Browser UA' => $userAgent,
         ];
     }
@@ -95,12 +95,12 @@ 
      */
     public function getInactivePluginDetails()
     {
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactivePlugins = $this->normalizePluginList(array_diff_key(get_plugins(), array_flip($activePlugins)));
+        $activePlugins = glsr( OptionManager::class )->getWP( 'active_plugins', [], 'array' );
+        $inactivePlugins = $this->normalizePluginList( array_diff_key( get_plugins(), array_flip( $activePlugins ) ) );
         $multisitePlugins = $this->getMultisitePluginDetails();
         return empty($multisitePlugins)
             ? $inactivePlugins
-            : array_diff($inactivePlugins, $multisitePlugins);
+            : array_diff( $inactivePlugins, $multisitePlugins );
     }
 
     /**
@@ -108,10 +108,10 @@ 
      */
     public function getMuPluginDetails()
     {
-        if (empty($plugins = get_mu_plugins())) {
+        if( empty($plugins = get_mu_plugins()) ) {
             return [];
         }
-        return $this->normalizePluginList($plugins);
+        return $this->normalizePluginList( $plugins );
     }
 
     /**
@@ -119,11 +119,11 @@ 
      */
     public function getMultisitePluginDetails()
     {
-        $activePlugins = (array) get_site_option('active_sitewide_plugins', []);
-        if (!is_multisite() || empty($activePlugins)) {
+        $activePlugins = (array)get_site_option( 'active_sitewide_plugins', [] );
+        if( !is_multisite() || empty($activePlugins) ) {
             return [];
         }
-        return $this->normalizePluginList(array_intersect_key(get_plugins(), $activePlugins));
+        return $this->normalizePluginList( array_intersect_key( get_plugins(), $activePlugins ) );
     }
 
     /**
@@ -131,31 +131,31 @@ 
      */
     public function getPhpDetails()
     {
-        $displayErrors = ini_get('display_errors')
-            ? 'On ('.ini_get('display_errors').')'
+        $displayErrors = ini_get( 'display_errors' )
+            ? 'On ('.ini_get( 'display_errors' ).')'
             : 'N/A';
-        $intlSupport = extension_loaded('intl')
-            ? phpversion('intl')
+        $intlSupport = extension_loaded( 'intl' )
+            ? phpversion( 'intl' )
             : 'false';
         return [
-            'cURL' => var_export(function_exists('curl_init'), true),
-            'Default Charset' => ini_get('default_charset'),
+            'cURL' => var_export( function_exists( 'curl_init' ), true ),
+            'Default Charset' => ini_get( 'default_charset' ),
             'Display Errors' => $displayErrors,
-            'fsockopen' => var_export(function_exists('fsockopen'), true),
+            'fsockopen' => var_export( function_exists( 'fsockopen' ), true ),
             'Intl' => $intlSupport,
-            'IPv6' => var_export(defined('AF_INET6'), true),
-            'Max Execution Time' => ini_get('max_execution_time'),
-            'Max Input Nesting Level' => ini_get('max_input_nesting_level'),
-            'Max Input Vars' => ini_get('max_input_vars'),
-            'Memory Limit' => ini_get('memory_limit'),
-            'Post Max Size' => ini_get('post_max_size'),
-            'Sendmail Path' => ini_get('sendmail_path'),
-            'Session Cookie Path' => esc_html(ini_get('session.cookie_path')),
-            'Session Name' => esc_html(ini_get('session.name')),
-            'Session Save Path' => esc_html(ini_get('session.save_path')),
-            'Session Use Cookies' => var_export(wp_validate_boolean(ini_get('session.use_cookies')), true),
-            'Session Use Only Cookies' => var_export(wp_validate_boolean(ini_get('session.use_only_cookies')), true),
-            'Upload Max Filesize' => ini_get('upload_max_filesize'),
+            'IPv6' => var_export( defined( 'AF_INET6' ), true ),
+            'Max Execution Time' => ini_get( 'max_execution_time' ),
+            'Max Input Nesting Level' => ini_get( 'max_input_nesting_level' ),
+            'Max Input Vars' => ini_get( 'max_input_vars' ),
+            'Memory Limit' => ini_get( 'memory_limit' ),
+            'Post Max Size' => ini_get( 'post_max_size' ),
+            'Sendmail Path' => ini_get( 'sendmail_path' ),
+            'Session Cookie Path' => esc_html( ini_get( 'session.cookie_path' ) ),
+            'Session Name' => esc_html( ini_get( 'session.name' ) ),
+            'Session Save Path' => esc_html( ini_get( 'session.save_path' ) ),
+            'Session Use Cookies' => var_export( wp_validate_boolean( ini_get( 'session.use_cookies' ) ), true ),
+            'Session Use Only Cookies' => var_export( wp_validate_boolean( ini_get( 'session.use_only_cookies' ) ), true ),
+            'Upload Max Filesize' => ini_get( 'upload_max_filesize' ),
         ];
     }
 
@@ -164,19 +164,19 @@ 
      */
     public function getReviewsDetails()
     {
-        $counts = glsr(CountsManager::class)->getCounts();
-        $counts = Arr::flattenArray($counts);
-        array_walk($counts, function (&$ratings) use ($counts) {
-            if (!is_array($ratings)) {
+        $counts = glsr( CountsManager::class )->getCounts();
+        $counts = Arr::flattenArray( $counts );
+        array_walk( $counts, function( &$ratings ) use ($counts) {
+            if( !is_array( $ratings ) ) {
                 glsr_log()
-                    ->error('$ratings is not an array, possibly due to incorrectly imported reviews.')
-                    ->debug($ratings)
-                    ->debug($counts);
+                    ->error( '$ratings is not an array, possibly due to incorrectly imported reviews.' )
+                    ->debug( $ratings )
+                    ->debug( $counts );
                 return;
             }
-            $ratings = array_sum($ratings).' ('.implode(', ', $ratings).')';
+            $ratings = array_sum( $ratings ).' ('.implode( ', ', $ratings ).')';
         });
-        ksort($counts);
+        ksort( $counts );
         return $counts;
     }
 
@@ -190,7 +190,7 @@ 
             'Host Name' => $this->getHostName(),
             'MySQL Version' => $wpdb->db_version(),
             'PHP Version' => PHP_VERSION,
-            'Server Software' => filter_input(INPUT_SERVER, 'SERVER_SOFTWARE'),
+            'Server Software' => filter_input( INPUT_SERVER, 'SERVER_SOFTWARE' ),
         ];
     }
 
@@ -199,16 +199,16 @@ 
      */
     public function getSettingDetails()
     {
-        $settings = glsr(OptionManager::class)->get('settings', []);
-        $settings = Arr::flattenArray($settings, true);
-        $settings = $this->purgeSensitiveData($settings);
-        ksort($settings);
+        $settings = glsr( OptionManager::class )->get( 'settings', [] );
+        $settings = Arr::flattenArray( $settings, true );
+        $settings = $this->purgeSensitiveData( $settings );
+        ksort( $settings );
         $details = [];
-        foreach ($settings as $key => $value) {
-            if (Str::startsWith('strings', $key) && Str::endsWith('id', $key)) {
+        foreach( $settings as $key => $value ) {
+            if( Str::startsWith( 'strings', $key ) && Str::endsWith( 'id', $key ) ) {
                 continue;
             }
-            $value = htmlspecialchars(trim(preg_replace('/\s\s+/', '\\n', $value)), ENT_QUOTES, 'UTF-8');
+            $value = htmlspecialchars( trim( preg_replace( '/\s\s+/', '\\n', $value ) ), ENT_QUOTES, 'UTF-8' );
             $details[$key] = $value;
         }
         return $details;
@@ -220,11 +220,11 @@ 
     public function getPluginDetails()
     {
         return [
-            'Console level' => glsr(Console::class)->humanLevel(),
-            'Console size' => glsr(Console::class)->humanSize('0'),
-            'Last Rating Count' => date_i18n('Y-m-d H:i', glsr(OptionManager::class)->get('last_review_count')),
+            'Console level' => glsr( Console::class )->humanLevel(),
+            'Console size' => glsr( Console::class )->humanSize( '0' ),
+            'Last Rating Count' => date_i18n( 'Y-m-d H:i', glsr( OptionManager::class )->get( 'last_review_count' ) ),
             'Version (current)' => glsr()->version,
-            'Version (previous)' => glsr(OptionManager::class)->get('version_upgraded_from'),
+            'Version (previous)' => glsr( OptionManager::class )->get( 'version_upgraded_from' ),
         ];
     }
 
@@ -236,23 +236,23 @@ 
         global $wpdb;
         $theme = wp_get_theme();
         return [
-            'Active Theme' => sprintf('%s v%s', (string) $theme->Name, (string) $theme->Version),
-            'Email Domain' => substr(strrchr(glsr(OptionManager::class)->getWP('admin_email'), '@'), 1),
+            'Active Theme' => sprintf( '%s v%s', (string)$theme->Name, (string)$theme->Version ),
+            'Email Domain' => substr( strrchr( glsr( OptionManager::class )->getWP( 'admin_email' ), '@' ), 1 ),
             'Home URL' => home_url(),
             'Language' => get_locale(),
             'Memory Limit' => WP_MEMORY_LIMIT,
-            'Multisite' => var_export(is_multisite(), true),
-            'Page For Posts ID' => glsr(OptionManager::class)->getWP('page_for_posts'),
-            'Page On Front ID' => glsr(OptionManager::class)->getWP('page_on_front'),
-            'Permalink Structure' => glsr(OptionManager::class)->getWP('permalink_structure', 'default'),
-            'Post Stati' => implode(', ', get_post_stati()),
-            'Remote Post' => glsr(Cache::class)->getRemotePostTest(),
-            'Show On Front' => glsr(OptionManager::class)->getWP('show_on_front'),
+            'Multisite' => var_export( is_multisite(), true ),
+            'Page For Posts ID' => glsr( OptionManager::class )->getWP( 'page_for_posts' ),
+            'Page On Front ID' => glsr( OptionManager::class )->getWP( 'page_on_front' ),
+            'Permalink Structure' => glsr( OptionManager::class )->getWP( 'permalink_structure', 'default' ),
+            'Post Stati' => implode( ', ', get_post_stati() ),
+            'Remote Post' => glsr( Cache::class )->getRemotePostTest(),
+            'Show On Front' => glsr( OptionManager::class )->getWP( 'show_on_front' ),
             'Site URL' => site_url(),
-            'Timezone' => glsr(OptionManager::class)->getWP('timezone_string', ini_get('date.timezone').' (PHP)'),
-            'Version' => get_bloginfo('version'),
-            'WP Debug' => var_export(defined('WP_DEBUG'), true),
-            'WP Max Upload Size' => size_format(wp_max_upload_size()),
+            'Timezone' => glsr( OptionManager::class )->getWP( 'timezone_string', ini_get( 'date.timezone' ).' (PHP)' ),
+            'Version' => get_bloginfo( 'version' ),
+            'WP Debug' => var_export( defined( 'WP_DEBUG' ), true ),
+            'WP Max Upload Size' => size_format( wp_max_upload_size() ),
             'WP Memory Limit' => WP_MEMORY_LIMIT,
         ];
     }
@@ -282,13 +282,13 @@ 
             'secureserver.net' => 'GoDaddy',
             'WPE_APIKEY' => 'WP Engine',
         ];
-        foreach ($checks as $key => $value) {
-            if (!$this->isWebhostCheckValid($key)) {
+        foreach( $checks as $key => $value ) {
+            if( !$this->isWebhostCheckValid( $key ) ) {
                 continue;
             }
             return $value;
         }
-        return implode(',', array_filter([DB_HOST, filter_input(INPUT_SERVER, 'SERVER_NAME')]));
+        return implode( ',', array_filter( [DB_HOST, filter_input( INPUT_SERVER, 'SERVER_NAME' )] ) );
     }
 
     /**
@@ -296,7 +296,7 @@ 
      */
     protected function getHostName()
     {
-        return sprintf('%s (%s)',
+        return sprintf( '%s (%s)',
             $this->detectWebhostProvider(),
             Helper::getIpAddress()
         );
@@ -308,9 +308,9 @@ 
     protected function getWordpressPlugins()
     {
         $plugins = get_plugins();
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactive = $this->normalizePluginList(array_diff_key($plugins, array_flip($activePlugins)));
-        $active = $this->normalizePluginList(array_diff_key($plugins, $inactive));
+        $activePlugins = glsr( OptionManager::class )->getWP( 'active_plugins', [], 'array' );
+        $inactive = $this->normalizePluginList( array_diff_key( $plugins, array_flip( $activePlugins ) ) );
+        $active = $this->normalizePluginList( array_diff_key( $plugins, $inactive ) );
         return $active + $inactive;
     }
 
@@ -318,48 +318,48 @@ 
      * @param string $title
      * @return string
      */
-    protected function implode($title, array $details)
+    protected function implode( $title, array $details )
     {
         $strings = ['['.$title.']'];
-        $padding = max(array_map('strlen', array_keys($details)));
-        $padding = max([$padding, static::PAD]);
-        foreach ($details as $key => $value) {
-            $strings[] = is_string($key)
-                ? sprintf('%s : %s', str_pad($key, $padding, '.'), $value)
+        $padding = max( array_map( 'strlen', array_keys( $details ) ) );
+        $padding = max( [$padding, static::PAD] );
+        foreach( $details as $key => $value ) {
+            $strings[] = is_string( $key )
+                ? sprintf( '%s : %s', str_pad( $key, $padding, '.' ), $value )
                 : ' - '.$value;
         }
-        return implode(PHP_EOL, $strings).PHP_EOL.PHP_EOL;
+        return implode( PHP_EOL, $strings ).PHP_EOL.PHP_EOL;
     }
 
     /**
      * @param string $key
      * @return bool
      */
-    protected function isWebhostCheckValid($key)
+    protected function isWebhostCheckValid( $key )
     {
-        return defined($key)
-            || filter_input(INPUT_SERVER, $key)
-            || false !== strpos(filter_input(INPUT_SERVER, 'SERVER_NAME'), $key)
-            || false !== strpos(DB_HOST, $key)
-            || false !== strpos(php_uname(), $key);
+        return defined( $key )
+            || filter_input( INPUT_SERVER, $key )
+            || false !== strpos( filter_input( INPUT_SERVER, 'SERVER_NAME' ), $key )
+            || false !== strpos( DB_HOST, $key )
+            || false !== strpos( php_uname(), $key );
     }
 
     /**
      * @return array
      */
-    protected function normalizePluginList(array $plugins)
+    protected function normalizePluginList( array $plugins )
     {
-        $plugins = array_map(function ($plugin) {
-            return sprintf('%s v%s', Arr::get($plugin, 'Name'), Arr::get($plugin, 'Version'));
-        }, $plugins);
-        natcasesort($plugins);
-        return array_flip($plugins);
+        $plugins = array_map( function( $plugin ) {
+            return sprintf( '%s v%s', Arr::get( $plugin, 'Name' ), Arr::get( $plugin, 'Version' ) );
+        }, $plugins );
+        natcasesort( $plugins );
+        return array_flip( $plugins );
     }
 
     /**
      * @return array
      */
-    protected function purgeSensitiveData(array $settings)
+    protected function purgeSensitiveData( array $settings )
     {
         $keys = [
             'general.rebusify_serial',
@@ -367,12 +367,12 @@ 
             'submissions.recaptcha.key',
             'submissions.recaptcha.secret',
         ];
-        array_walk($settings, function (&$value, $setting) use ($keys) {
-            foreach ($keys as $key) {
-                if (!Str::startsWith($key, $setting) || empty($value)) {
+        array_walk( $settings, function( &$value, $setting ) use ($keys) {
+            foreach( $keys as $key ) {
+                if( !Str::startsWith( $key, $setting ) || empty($value) ) {
                     continue;
                 }
-                $value = str_repeat('•', 13);
+                $value = str_repeat( '•', 13 );
                 return;
             }
         });

plugin/Modules/Schema/BaseType.php

Indentation +221 added lines, -221 removed lines

@@ -13,248 +13,248 @@
 
 abstract class BaseType implements ArrayAccess, JsonSerializable, Type
 {
-    /**
-     * @var array
-     */
-    public $allowed = [];
+	/**
+	 * @var array
+	 */
+	public $allowed = [];
 
-    /**
-     * @var array
-     */
-    public $parents = [];
+	/**
+	 * @var array
+	 */
+	public $parents = [];
 
-    /**
-     * @var array
-     */
-    protected $properties = [];
+	/**
+	 * @var array
+	 */
+	protected $properties = [];
 
-    /**
-     * @var string
-     */
-    protected $type;
+	/**
+	 * @var string
+	 */
+	protected $type;
 
-    /**
-     * @param string $method
-     * @return static
-     */
-    public function __call($method, array $arguments)
-    {
-        return $this->setProperty($method, Arr::get($arguments, 0));
-    }
+	/**
+	 * @param string $method
+	 * @return static
+	 */
+	public function __call($method, array $arguments)
+	{
+		return $this->setProperty($method, Arr::get($arguments, 0));
+	}
 
-    /**
-     * @param string $type
-     */
-    public function __construct($type = null)
-    {
-        $this->type = !is_string($type)
-            ? (new ReflectionClass($this))->getShortName()
-            : $type;
-        $this->setAllowedProperties();
-    }
+	/**
+	 * @param string $type
+	 */
+	public function __construct($type = null)
+	{
+		$this->type = !is_string($type)
+			? (new ReflectionClass($this))->getShortName()
+			: $type;
+		$this->setAllowedProperties();
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toScript();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toScript();
+	}
 
-    /**
-     * @return static
-     */
-    public function addProperties(array $properties)
-    {
-        foreach ($properties as $property => $value) {
-            $this->setProperty($property, $value);
-        }
-        return $this;
-    }
+	/**
+	 * @return static
+	 */
+	public function addProperties(array $properties)
+	{
+		foreach ($properties as $property => $value) {
+			$this->setProperty($property, $value);
+		}
+		return $this;
+	}
 
-    /**
-     * @return string
-     */
-    public function getContext()
-    {
-        return 'https://schema.org';
-    }
+	/**
+	 * @return string
+	 */
+	public function getContext()
+	{
+		return 'https://schema.org';
+	}
 
-    /**
-     * @return array
-     */
-    public function getProperties()
-    {
-        return $this->properties;
-    }
+	/**
+	 * @return array
+	 */
+	public function getProperties()
+	{
+		return $this->properties;
+	}
 
-    /**
-     * @param string $property
-     * @param mixed $default
-     * @return mixed
-     */
-    public function getProperty($property, $default = null)
-    {
-        return Arr::get($this->properties, $property, $default);
-    }
+	/**
+	 * @param string $property
+	 * @param mixed $default
+	 * @return mixed
+	 */
+	public function getProperty($property, $default = null)
+	{
+		return Arr::get($this->properties, $property, $default);
+	}
 
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
+	/**
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
 
-    /**
-     * @param bool $condition
-     * @param mixed $callback
-     * @return static
-     */
-    public function doIf($condition, $callback)
-    {
-        if ($condition) {
-            $callback($this);
-        }
-        return $this;
-    }
+	/**
+	 * @param bool $condition
+	 * @param mixed $callback
+	 * @return static
+	 */
+	public function doIf($condition, $callback)
+	{
+		if ($condition) {
+			$callback($this);
+		}
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    public function jsonSerialize()
-    {
-        return $this->toArray();
-    }
+	/**
+	 * @return array
+	 */
+	public function jsonSerialize()
+	{
+		return $this->toArray();
+	}
 
-    /**
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return array_key_exists($offset, $this->properties);
-    }
+	/**
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset)
+	{
+		return array_key_exists($offset, $this->properties);
+	}
 
-    /**
-     * @param string $offset
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return $this->getProperty($offset);
-    }
+	/**
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->getProperty($offset);
+	}
 
-    /**
-     * @param string $offset
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->setProperty($offset, $value);
-    }
+	/**
+	 * @param string $offset
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$this->setProperty($offset, $value);
+	}
 
-    /**
-     * @param string $offset
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->properties[$offset]);
-    }
+	/**
+	 * @param string $offset
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		unset($this->properties[$offset]);
+	}
 
-    /**
-     * @param string $property
-     * @param mixed $value
-     * @return static
-     */
-    public function setProperty($property, $value)
-    {
-        if (!in_array($property, $this->allowed)
-            && 'UnknownType' != (new ReflectionClass($this))->getShortName()) {
-            glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property');
-            return $this;
-        }
-        $this->properties[$property] = $value;
-        return $this;
-    }
+	/**
+	 * @param string $property
+	 * @param mixed $value
+	 * @return static
+	 */
+	public function setProperty($property, $value)
+	{
+		if (!in_array($property, $this->allowed)
+			&& 'UnknownType' != (new ReflectionClass($this))->getShortName()) {
+			glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property');
+			return $this;
+		}
+		$this->properties[$property] = $value;
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        return [
-            '@context' => $this->getContext(),
-            '@type' => $this->getType(),
-        ] + $this->serializeProperty($this->getProperties());
-    }
+	/**
+	 * @return array
+	 */
+	public function toArray()
+	{
+		return [
+			'@context' => $this->getContext(),
+			'@type' => $this->getType(),
+		] + $this->serializeProperty($this->getProperties());
+	}
 
-    /**
-     * @return string
-     */
-    public function toScript()
-    {
-        return sprintf('<script type="application/ld+json">%s</script>',
-            json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
-        );
-    }
+	/**
+	 * @return string
+	 */
+	public function toScript()
+	{
+		return sprintf('<script type="application/ld+json">%s</script>',
+			json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
+		);
+	}
 
-    /**
-     * @param array|null $parents
-     * @return array
-     */
-    protected function getParents($parents = null)
-    {
-        if (!isset($parents)) {
-            $parents = $this->parents;
-        }
-        $newParents = $parents;
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
-                continue;
-            }
-            $newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents));
-        }
-        return array_values(array_unique($newParents));
-    }
+	/**
+	 * @param array|null $parents
+	 * @return array
+	 */
+	protected function getParents($parents = null)
+	{
+		if (!isset($parents)) {
+			$parents = $this->parents;
+		}
+		$newParents = $parents;
+		foreach ($parents as $parent) {
+			$parentClass = Helper::buildClassName($parent, __NAMESPACE__);
+			if (!class_exists($parentClass)) {
+				continue;
+			}
+			$newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents));
+		}
+		return array_values(array_unique($newParents));
+	}
 
-    /**
-     * @return void
-     */
-    protected function setAllowedProperties()
-    {
-        $parents = $this->getParents();
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
-                continue;
-            }
-            $this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed)));
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function setAllowedProperties()
+	{
+		$parents = $this->getParents();
+		foreach ($parents as $parent) {
+			$parentClass = Helper::buildClassName($parent, __NAMESPACE__);
+			if (!class_exists($parentClass)) {
+				continue;
+			}
+			$this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed)));
+		}
+	}
 
-    /**
-     * @param mixed $property
-     * @return array|string
-     */
-    protected function serializeProperty($property)
-    {
-        if (is_array($property)) {
-            return array_map([$this, 'serializeProperty'], $property);
-        }
-        if ($property instanceof Type) {
-            $property = $property->toArray();
-            unset($property['@context']);
-        }
-        if ($property instanceof DateTimeInterface) {
-            $property = $property->format(DateTime::ATOM);
-        }
-        if (is_object($property)) {
-            throw new InvalidProperty();
-        }
-        return $property;
-    }
+	/**
+	 * @param mixed $property
+	 * @return array|string
+	 */
+	protected function serializeProperty($property)
+	{
+		if (is_array($property)) {
+			return array_map([$this, 'serializeProperty'], $property);
+		}
+		if ($property instanceof Type) {
+			$property = $property->toArray();
+			unset($property['@context']);
+		}
+		if ($property instanceof DateTimeInterface) {
+			$property = $property->format(DateTime::ATOM);
+		}
+		if (is_object($property)) {
+			throw new InvalidProperty();
+		}
+		return $property;
+	}
 }

Spacing +45 added lines, -45 removed lines

@@ -37,18 +37,18 @@ 
      * @param string $method
      * @return static
      */
-    public function __call($method, array $arguments)
+    public function __call( $method, array $arguments )
     {
-        return $this->setProperty($method, Arr::get($arguments, 0));
+        return $this->setProperty( $method, Arr::get( $arguments, 0 ) );
     }
 
     /**
      * @param string $type
      */
-    public function __construct($type = null)
+    public function __construct( $type = null )
     {
-        $this->type = !is_string($type)
-            ? (new ReflectionClass($this))->getShortName()
+        $this->type = !is_string( $type )
+            ? (new ReflectionClass( $this ))->getShortName()
             : $type;
         $this->setAllowedProperties();
     }
@@ -64,10 +64,10 @@ 
     /**
      * @return static
      */
-    public function addProperties(array $properties)
+    public function addProperties( array $properties )
     {
-        foreach ($properties as $property => $value) {
-            $this->setProperty($property, $value);
+        foreach( $properties as $property => $value ) {
+            $this->setProperty( $property, $value );
         }
         return $this;
     }
@@ -93,9 +93,9 @@ 
      * @param mixed $default
      * @return mixed
      */
-    public function getProperty($property, $default = null)
+    public function getProperty( $property, $default = null )
     {
-        return Arr::get($this->properties, $property, $default);
+        return Arr::get( $this->properties, $property, $default );
     }
 
     /**
@@ -111,10 +111,10 @@ 
      * @param mixed $callback
      * @return static
      */
-    public function doIf($condition, $callback)
+    public function doIf( $condition, $callback )
     {
-        if ($condition) {
-            $callback($this);
+        if( $condition ) {
+            $callback( $this );
         }
         return $this;
     }
@@ -131,18 +131,18 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        return array_key_exists($offset, $this->properties);
+        return array_key_exists( $offset, $this->properties );
     }
 
     /**
      * @param string $offset
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet( $offset )
     {
-        return $this->getProperty($offset);
+        return $this->getProperty( $offset );
     }
 
     /**
@@ -150,16 +150,16 @@ 
      * @param mixed $value
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet( $offset, $value )
     {
-        $this->setProperty($offset, $value);
+        $this->setProperty( $offset, $value );
     }
 
     /**
      * @param string $offset
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
         unset($this->properties[$offset]);
     }
@@ -169,11 +169,11 @@ 
      * @param mixed $value
      * @return static
      */
-    public function setProperty($property, $value)
+    public function setProperty( $property, $value )
     {
-        if (!in_array($property, $this->allowed)
-            && 'UnknownType' != (new ReflectionClass($this))->getShortName()) {
-            glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property');
+        if( !in_array( $property, $this->allowed )
+            && 'UnknownType' != (new ReflectionClass( $this ))->getShortName() ) {
+            glsr_log()->warning( $this->getType().' does not allow the "'.$property.'" property' );
             return $this;
         }
         $this->properties[$property] = $value;
@@ -188,7 +188,7 @@ 
         return [
             '@context' => $this->getContext(),
             '@type' => $this->getType(),
-        ] + $this->serializeProperty($this->getProperties());
+        ] + $this->serializeProperty( $this->getProperties() );
     }
 
     /**
@@ -196,8 +196,8 @@ 
      */
     public function toScript()
     {
-        return sprintf('<script type="application/ld+json">%s</script>',
-            json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
+        return sprintf( '<script type="application/ld+json">%s</script>',
+            json_encode( $this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES )
         );
     }
 
@@ -205,20 +205,20 @@ 
      * @param array|null $parents
      * @return array
      */
-    protected function getParents($parents = null)
+    protected function getParents( $parents = null )
     {
-        if (!isset($parents)) {
+        if( !isset($parents) ) {
             $parents = $this->parents;
         }
         $newParents = $parents;
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
+        foreach( $parents as $parent ) {
+            $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ );
+            if( !class_exists( $parentClass ) ) {
                 continue;
             }
-            $newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents));
+            $newParents = array_merge( $newParents, $this->getParents( (new $parentClass())->parents ) );
         }
-        return array_values(array_unique($newParents));
+        return array_values( array_unique( $newParents ) );
     }
 
     /**
@@ -227,12 +227,12 @@ 
     protected function setAllowedProperties()
     {
         $parents = $this->getParents();
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
+        foreach( $parents as $parent ) {
+            $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ );
+            if( !class_exists( $parentClass ) ) {
                 continue;
             }
-            $this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed)));
+            $this->allowed = array_values( array_unique( array_merge( (new $parentClass())->allowed, $this->allowed ) ) );
         }
     }
 
@@ -240,19 +240,19 @@ 
      * @param mixed $property
      * @return array|string
      */
-    protected function serializeProperty($property)
+    protected function serializeProperty( $property )
     {
-        if (is_array($property)) {
-            return array_map([$this, 'serializeProperty'], $property);
+        if( is_array( $property ) ) {
+            return array_map( [$this, 'serializeProperty'], $property );
         }
-        if ($property instanceof Type) {
+        if( $property instanceof Type ) {
             $property = $property->toArray();
             unset($property['@context']);
         }
-        if ($property instanceof DateTimeInterface) {
-            $property = $property->format(DateTime::ATOM);
+        if( $property instanceof DateTimeInterface ) {
+            $property = $property->format( DateTime::ATOM );
         }
-        if (is_object($property)) {
+        if( is_object( $property ) ) {
             throw new InvalidProperty();
         }
         return $property;

plugin/Modules/Html/ReviewsHtml.php

Indentation +120 added lines, -120 removed lines

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

Spacing +26 added lines, -26 removed lines

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

plugin/Modules/Html/Fields/Field.php

Indentation +62 added lines, -62 removed lines

@@ -7,73 +7,73 @@
 
 abstract class Field
 {
-    /**
-     * @var Builder
-     */
-    protected $builder;
+	/**
+	 * @var Builder
+	 */
+	protected $builder;
 
-    public function __construct(Builder $builder)
-    {
-        $this->builder = $builder;
-    }
+	public function __construct(Builder $builder)
+	{
+		$this->builder = $builder;
+	}
 
-    /**
-     * @return string|void
-     */
-    public function build()
-    {
-        glsr_log()->error('Build method is not implemented for '.get_class($this));
-    }
+	/**
+	 * @return string|void
+	 */
+	public function build()
+	{
+		glsr_log()->error('Build method is not implemented for '.get_class($this));
+	}
 
-    /**
-     * @return array
-     */
-    public static function defaults()
-    {
-        return [];
-    }
+	/**
+	 * @return array
+	 */
+	public static function defaults()
+	{
+		return [];
+	}
 
-    /**
-     * @return array
-     */
-    public static function merge(array $args)
-    {
-        $merged = array_merge(
-            wp_parse_args($args, static::defaults()),
-            static::required()
-        );
-        $merged['class'] = implode(' ', static::mergedAttribute('class', ' ', $args));
-        $merged['style'] = implode(';', static::mergedAttribute('style', ';', $args));
-        return $merged;
-    }
+	/**
+	 * @return array
+	 */
+	public static function merge(array $args)
+	{
+		$merged = array_merge(
+			wp_parse_args($args, static::defaults()),
+			static::required()
+		);
+		$merged['class'] = implode(' ', static::mergedAttribute('class', ' ', $args));
+		$merged['style'] = implode(';', static::mergedAttribute('style', ';', $args));
+		return $merged;
+	}
 
-    /**
-     * @param string $delimiter
-     * @param string $key
-     * @return array
-     */
-    public static function mergedAttribute($key, $delimiter, array $args)
-    {
-        return array_filter(array_merge(
-            explode($delimiter, Arr::get($args, $key)),
-            explode($delimiter, Arr::get(static::defaults(), $key)),
-            explode($delimiter, Arr::get(static::required(), $key))
-        ));
-    }
+	/**
+	 * @param string $delimiter
+	 * @param string $key
+	 * @return array
+	 */
+	public static function mergedAttribute($key, $delimiter, array $args)
+	{
+		return array_filter(array_merge(
+			explode($delimiter, Arr::get($args, $key)),
+			explode($delimiter, Arr::get(static::defaults(), $key)),
+			explode($delimiter, Arr::get(static::required(), $key))
+		));
+	}
 
-    /**
-     * @return array
-     */
-    public static function required()
-    {
-        return [];
-    }
+	/**
+	 * @return array
+	 */
+	public static function required()
+	{
+		return [];
+	}
 
-    /**
-     * @return void
-     */
-    protected function mergeFieldArgs()
-    {
-        $this->builder->args = static::merge($this->builder->args);
-    }
+	/**
+	 * @return void
+	 */
+	protected function mergeFieldArgs()
+	{
+		$this->builder->args = static::merge($this->builder->args);
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -12,7 +12,7 @@ 
      */
     protected $builder;
 
-    public function __construct(Builder $builder)
+    public function __construct( Builder $builder )
     {
         $this->builder = $builder;
     }
@@ -22,7 +22,7 @@ 
      */
     public function build()
     {
-        glsr_log()->error('Build method is not implemented for '.get_class($this));
+        glsr_log()->error( 'Build method is not implemented for '.get_class( $this ) );
     }
 
     /**
@@ -36,14 +36,14 @@ 
     /**
      * @return array
      */
-    public static function merge(array $args)
+    public static function merge( array $args )
     {
         $merged = array_merge(
-            wp_parse_args($args, static::defaults()),
+            wp_parse_args( $args, static::defaults() ),
             static::required()
         );
-        $merged['class'] = implode(' ', static::mergedAttribute('class', ' ', $args));
-        $merged['style'] = implode(';', static::mergedAttribute('style', ';', $args));
+        $merged['class'] = implode( ' ', static::mergedAttribute( 'class', ' ', $args ) );
+        $merged['style'] = implode( ';', static::mergedAttribute( 'style', ';', $args ) );
         return $merged;
     }
 
@@ -52,13 +52,13 @@ 
      * @param string $key
      * @return array
      */
-    public static function mergedAttribute($key, $delimiter, array $args)
+    public static function mergedAttribute( $key, $delimiter, array $args )
     {
-        return array_filter(array_merge(
-            explode($delimiter, Arr::get($args, $key)),
-            explode($delimiter, Arr::get(static::defaults(), $key)),
-            explode($delimiter, Arr::get(static::required(), $key))
-        ));
+        return array_filter( array_merge(
+            explode( $delimiter, Arr::get( $args, $key ) ),
+            explode( $delimiter, Arr::get( static::defaults(), $key ) ),
+            explode( $delimiter, Arr::get( static::required(), $key ) )
+        ) );
     }
 
     /**
@@ -74,6 +74,6 @@ 
      */
     protected function mergeFieldArgs()
     {
-        $this->builder->args = static::merge($this->builder->args);
+        $this->builder->args = static::merge( $this->builder->args );
     }
 }