pryley / site-reviews

plugin/Database/SqlQueries.php

Indentation +106 added lines, -106 removed lines

@@ -8,23 +8,23 @@ 
 
 class SqlQueries
 {
-    protected $db;
-    protected $postType;
+	protected $db;
+	protected $postType;
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->db = $wpdb;
-        $this->postType = Application::POST_TYPE;
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->db = $wpdb;
+		$this->postType = Application::POST_TYPE;
+	}
 
-    /**
-     * @param string $metaReviewId
-     * @return int
-     */
-    public function getPostIdFromReviewId($metaReviewId)
-    {
-        $postId = $this->db->get_var("
+	/**
+	 * @param string $metaReviewId
+	 * @return int
+	 */
+	public function getPostIdFromReviewId($metaReviewId)
+	{
+		$postId = $this->db->get_var("
             SELECT p.ID
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -32,17 +32,17 @@ 
             AND m.meta_key = '_review_id'
             AND m.meta_value = '{$metaReviewId}'
         ");
-        return intval($postId);
-    }
+		return intval($postId);
+	}
 
-    /**
-     * @param int $lastPostId
-     * @param int $limit
-     * @return array
-     */
-    public function getReviewCounts(array $args, $lastPostId = 0, $limit = 500)
-    {
-        return (array) $this->db->get_results("
+	/**
+	 * @param int $lastPostId
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getReviewCounts(array $args, $lastPostId = 0, $limit = 500)
+	{
+		return (array) $this->db->get_results("
             SELECT DISTINCT p.ID, m1.meta_value AS rating, m2.meta_value AS type
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
@@ -57,17 +57,17 @@ 
             ORDER By p.ID ASC
             LIMIT {$limit}
         ");
-    }
+	}
 
-    /**
-     * @todo remove this?
-     * @param string $metaKey
-     * @return array
-     */
-    public function getReviewCountsFor($metaKey)
-    {
-        $metaKey = Str::prefix('_', $metaKey);
-        return (array) $this->db->get_results("
+	/**
+	 * @todo remove this?
+	 * @param string $metaKey
+	 * @return array
+	 */
+	public function getReviewCountsFor($metaKey)
+	{
+		$metaKey = Str::prefix('_', $metaKey);
+		return (array) $this->db->get_results("
             SELECT DISTINCT m.meta_value AS name, COUNT(*) num_posts
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -75,16 +75,16 @@ 
             AND m.meta_key = '{$metaKey}'
             GROUP BY name
         ");
-    }
+	}
 
-    /**
-     * @todo remove this?
-     * @param string $reviewType
-     * @return array
-     */
-    public function getReviewIdsByType($reviewType)
-    {
-        $results = $this->db->get_col("
+	/**
+	 * @todo remove this?
+	 * @param string $reviewType
+	 * @return array
+	 */
+	public function getReviewIdsByType($reviewType)
+	{
+		$results = $this->db->get_col("
             SELECT DISTINCT m1.meta_value AS review_id
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
@@ -94,20 +94,20 @@ 
             AND m2.meta_key = '_review_type'
             AND m2.meta_value = '{$reviewType}'
         ");
-        return array_keys(array_flip($results));
-    }
+		return array_keys(array_flip($results));
+	}
 
-    /**
-     * @param int $greaterThanId
-     * @param int $limit
-     * @return array
-     */
-    public function getReviewRatingsFromIds(array $postIds, $greaterThanId = 0, $limit = 100)
-    {
-        sort($postIds);
-        $postIds = array_slice($postIds, intval(array_search($greaterThanId, $postIds)), $limit);
-        $postIds = implode(',', $postIds);
-        return (array) $this->db->get_results("
+	/**
+	 * @param int $greaterThanId
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getReviewRatingsFromIds(array $postIds, $greaterThanId = 0, $limit = 100)
+	{
+		sort($postIds);
+		$postIds = array_slice($postIds, intval(array_search($greaterThanId, $postIds)), $limit);
+		$postIds = implode(',', $postIds);
+		return (array) $this->db->get_results("
             SELECT p.ID, m.meta_value AS rating
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -120,20 +120,20 @@ 
             ORDER By p.ID ASC
             LIMIT {$limit}
         ");
-    }
+	}
 
-    /**
-     * @param string $key
-     * @param string $status
-     * @return array
-     */
-    public function getReviewsMeta($key, $status = 'publish')
-    {
-        $postStatusQuery = 'all' != $status && !empty($status)
-            ? "AND p.post_status = '{$status}'"
-            : '';
-        $key = Str::prefix('_', $key);
-        $values = $this->db->get_col("
+	/**
+	 * @param string $key
+	 * @param string $status
+	 * @return array
+	 */
+	public function getReviewsMeta($key, $status = 'publish')
+	{
+		$postStatusQuery = 'all' != $status && !empty($status)
+			? "AND p.post_status = '{$status}'"
+			: '';
+		$key = Str::prefix('_', $key);
+		$values = $this->db->get_col("
             SELECT DISTINCT m.meta_value
             FROM {$this->db->postmeta} m
             LEFT JOIN {$this->db->posts} p ON p.ID = m.post_id
@@ -144,42 +144,42 @@ 
             GROUP BY p.ID -- remove duplicate meta_value entries
             ORDER BY m.meta_id ASC -- sort by oldest meta_value
         ");
-        sort($values);
-        return $values;
-    }
+		sort($values);
+		return $values;
+	}
 
-    /**
-     * @param string $and
-     * @return string
-     */
-    protected function getAndForCounts(array $args, $and = '')
-    {
-        $postIds = implode(',', array_filter(Arr::get($args, 'post_ids', [])));
-        $termIds = implode(',', array_filter(Arr::get($args, 'term_ids', [])));
-        if (!empty($args['type'])) {
-            $and.= "AND m2.meta_value = '{$args['type']}' ";
-        }
-        if ($postIds) {
-            $and.= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) ";
-        }
-        if ($termIds) {
-            $and.= "AND tr.term_taxonomy_id IN ({$termIds}) ";
-        }
-        return apply_filters('site-reviews/query/and-for-counts', $and);
-    }
+	/**
+	 * @param string $and
+	 * @return string
+	 */
+	protected function getAndForCounts(array $args, $and = '')
+	{
+		$postIds = implode(',', array_filter(Arr::get($args, 'post_ids', [])));
+		$termIds = implode(',', array_filter(Arr::get($args, 'term_ids', [])));
+		if (!empty($args['type'])) {
+			$and.= "AND m2.meta_value = '{$args['type']}' ";
+		}
+		if ($postIds) {
+			$and.= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) ";
+		}
+		if ($termIds) {
+			$and.= "AND tr.term_taxonomy_id IN ({$termIds}) ";
+		}
+		return apply_filters('site-reviews/query/and-for-counts', $and);
+	}
 
-    /**
-     * @param string $innerJoin
-     * @return string
-     */
-    protected function getInnerJoinForCounts(array $args, $innerJoin = '')
-    {
-        if (!empty(Arr::get($args, 'post_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
-        }
-        if (!empty(Arr::get($args, 'term_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
-        }
-        return apply_filters('site-reviews/query/inner-join-for-counts', $innerJoin);
-    }
+	/**
+	 * @param string $innerJoin
+	 * @return string
+	 */
+	protected function getInnerJoinForCounts(array $args, $innerJoin = '')
+	{
+		if (!empty(Arr::get($args, 'post_ids'))) {
+			$innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
+		}
+		if (!empty(Arr::get($args, 'term_ids'))) {
+			$innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
+		}
+		return apply_filters('site-reviews/query/inner-join-for-counts', $innerJoin);
+	}
 }

Spacing +44 added lines, -44 removed lines

@@ -22,17 +22,17 @@ 
      * @param string $metaReviewId
      * @return int
      */
-    public function getPostIdFromReviewId($metaReviewId)
+    public function getPostIdFromReviewId( $metaReviewId )
     {
-        $postId = $this->db->get_var("
+        $postId = $this->db->get_var( "
             SELECT p.ID
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
             WHERE p.post_type = '{$this->postType}'
             AND m.meta_key = '_review_id'
             AND m.meta_value = '{$metaReviewId}'
-        ");
-        return intval($postId);
+        " );
+        return intval( $postId );
     }
 
     /**
@@ -40,23 +40,23 @@ 
      * @param int $limit
      * @return array
      */
-    public function getReviewCounts(array $args, $lastPostId = 0, $limit = 500)
+    public function getReviewCounts( array $args, $lastPostId = 0, $limit = 500 )
     {
-        return (array) $this->db->get_results("
+        return (array)$this->db->get_results( "
             SELECT DISTINCT p.ID, m1.meta_value AS rating, m2.meta_value AS type
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
             INNER JOIN {$this->db->postmeta} AS m2 ON p.ID = m2.post_id
-            {$this->getInnerJoinForCounts($args)}
+            {$this->getInnerJoinForCounts( $args )}
             WHERE p.ID > {$lastPostId}
             AND p.post_status = 'publish'
             AND p.post_type = '{$this->postType}'
             AND m1.meta_key = '_rating'
             AND m2.meta_key = '_review_type'
-            {$this->getAndForCounts($args)}
+            {$this->getAndForCounts( $args )}
             ORDER By p.ID ASC
             LIMIT {$limit}
-        ");
+        " );
     }
 
     /**
@@ -64,17 +64,17 @@ 
      * @param string $metaKey
      * @return array
      */
-    public function getReviewCountsFor($metaKey)
+    public function getReviewCountsFor( $metaKey )
     {
-        $metaKey = Str::prefix('_', $metaKey);
-        return (array) $this->db->get_results("
+        $metaKey = Str::prefix( '_', $metaKey );
+        return (array)$this->db->get_results( "
             SELECT DISTINCT m.meta_value AS name, COUNT(*) num_posts
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
             WHERE p.post_type = '{$this->postType}'
             AND m.meta_key = '{$metaKey}'
             GROUP BY name
-        ");
+        " );
     }
 
     /**
@@ -82,9 +82,9 @@ 
      * @param string $reviewType
      * @return array
      */
-    public function getReviewIdsByType($reviewType)
+    public function getReviewIdsByType( $reviewType )
     {
-        $results = $this->db->get_col("
+        $results = $this->db->get_col( "
             SELECT DISTINCT m1.meta_value AS review_id
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
@@ -93,8 +93,8 @@ 
             AND m1.meta_key = '_review_id'
             AND m2.meta_key = '_review_type'
             AND m2.meta_value = '{$reviewType}'
-        ");
-        return array_keys(array_flip($results));
+        " );
+        return array_keys( array_flip( $results ) );
     }
 
     /**
@@ -102,12 +102,12 @@ 
      * @param int $limit
      * @return array
      */
-    public function getReviewRatingsFromIds(array $postIds, $greaterThanId = 0, $limit = 100)
+    public function getReviewRatingsFromIds( array $postIds, $greaterThanId = 0, $limit = 100 )
     {
-        sort($postIds);
-        $postIds = array_slice($postIds, intval(array_search($greaterThanId, $postIds)), $limit);
-        $postIds = implode(',', $postIds);
-        return (array) $this->db->get_results("
+        sort( $postIds );
+        $postIds = array_slice( $postIds, intval( array_search( $greaterThanId, $postIds ) ), $limit );
+        $postIds = implode( ',', $postIds );
+        return (array)$this->db->get_results( "
             SELECT p.ID, m.meta_value AS rating
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -119,7 +119,7 @@ 
             GROUP BY p.ID
             ORDER By p.ID ASC
             LIMIT {$limit}
-        ");
+        " );
     }
 
     /**
@@ -127,13 +127,13 @@ 
      * @param string $status
      * @return array
      */
-    public function getReviewsMeta($key, $status = 'publish')
+    public function getReviewsMeta( $key, $status = 'publish' )
     {
         $postStatusQuery = 'all' != $status && !empty($status)
             ? "AND p.post_status = '{$status}'"
             : '';
-        $key = Str::prefix('_', $key);
-        $values = $this->db->get_col("
+        $key = Str::prefix( '_', $key );
+        $values = $this->db->get_col( "
             SELECT DISTINCT m.meta_value
             FROM {$this->db->postmeta} m
             LEFT JOIN {$this->db->posts} p ON p.ID = m.post_id
@@ -143,8 +143,8 @@ 
             $postStatusQuery
             GROUP BY p.ID -- remove duplicate meta_value entries
             ORDER BY m.meta_id ASC -- sort by oldest meta_value
-        ");
-        sort($values);
+        " );
+        sort( $values );
         return $values;
     }
 
@@ -152,34 +152,34 @@ 
      * @param string $and
      * @return string
      */
-    protected function getAndForCounts(array $args, $and = '')
+    protected function getAndForCounts( array $args, $and = '' )
     {
-        $postIds = implode(',', array_filter(Arr::get($args, 'post_ids', [])));
-        $termIds = implode(',', array_filter(Arr::get($args, 'term_ids', [])));
-        if (!empty($args['type'])) {
-            $and.= "AND m2.meta_value = '{$args['type']}' ";
+        $postIds = implode( ',', array_filter( Arr::get( $args, 'post_ids', [] ) ) );
+        $termIds = implode( ',', array_filter( Arr::get( $args, 'term_ids', [] ) ) );
+        if( !empty($args['type']) ) {
+            $and .= "AND m2.meta_value = '{$args['type']}' ";
         }
-        if ($postIds) {
-            $and.= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) ";
+        if( $postIds ) {
+            $and .= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) ";
         }
-        if ($termIds) {
-            $and.= "AND tr.term_taxonomy_id IN ({$termIds}) ";
+        if( $termIds ) {
+            $and .= "AND tr.term_taxonomy_id IN ({$termIds}) ";
         }
-        return apply_filters('site-reviews/query/and-for-counts', $and);
+        return apply_filters( 'site-reviews/query/and-for-counts', $and );
     }
 
     /**
      * @param string $innerJoin
      * @return string
      */
-    protected function getInnerJoinForCounts(array $args, $innerJoin = '')
+    protected function getInnerJoinForCounts( array $args, $innerJoin = '' )
     {
-        if (!empty(Arr::get($args, 'post_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
+        if( !empty(Arr::get( $args, 'post_ids' )) ) {
+            $innerJoin .= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
         }
-        if (!empty(Arr::get($args, 'term_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
+        if( !empty(Arr::get( $args, 'term_ids' )) ) {
+            $innerJoin .= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
         }
-        return apply_filters('site-reviews/query/inner-join-for-counts', $innerJoin);
+        return apply_filters( 'site-reviews/query/inner-join-for-counts', $innerJoin );
     }
 }

plugin/Controllers/ListTableController.php

Indentation +247 added lines, -247 removed lines

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

Spacing +71 added lines, -71 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,20 +37,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' );
     }
 
     /**
@@ -59,10 +59,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;
     }
@@ -73,13 +73,13 @@ 
      * @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);
-            $hidden = array_unique(array_merge($hidden, [
+        if( Arr::get( $screen, 'id' ) == 'edit-'.Application::POST_TYPE ) {
+            $hidden = Arr::consolidateArray( $hidden );
+            $hidden = array_unique( array_merge( $hidden, [
                 'email', 'ip_address', 'response', 'reviewer',
-            ]));
+            ] ) );
         }
         return $hidden;
     }
@@ -90,28 +90,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 );
     }
 
     /**
@@ -119,13 +119,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;
@@ -139,10 +139,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' );
         }
     }
 
@@ -151,9 +151,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 );
     }
 
     /**
@@ -162,9 +162,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 );
     }
 
     /**
@@ -172,14 +172,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 );
         }
     }
 
@@ -187,15 +187,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 );
     }
 
     /**
@@ -204,15 +204,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;
     }
 
@@ -221,7 +221,7 @@ 
      * @param string $domain
      * @return bool
      */
-    protected function canModifyTranslation($domain = 'default')
+    protected function canModifyTranslation( $domain = 'default' )
     {
         $screen = glsr_current_screen();
         return 'default' == $domain
@@ -232,48 +232,48 @@ 
     /**
      * @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) {
-            $value = (string) filter_input(INPUT_GET, $key);
-            if ('' === $value) {
+        foreach( $metaKeys as $key ) {
+            $value = (string)filter_input( INPUT_GET, $key );
+            if( '' === $value ) {
                 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', array_filter($metaQuery));
+            $query->set( 'meta_query', array_filter( $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', Str::prefix('_', $orderby, '_'));
-            $query->set('orderby', 'meta_value');
+            $query->set( 'meta_key', Str::prefix( '_', $orderby, '_' ) );
+            $query->set( 'orderby', 'meta_value' );
         }
     }
 }

plugin/Shortcodes/SiteReviewsFormShortcode.php

Indentation +24 added lines, -24 removed lines

@@ -6,29 +6,29 @@
 
 class SiteReviewsFormShortcode extends Shortcode
 {
-    protected function hideOptions()
-    {
-        return [
-            'rating' => __('Hide the rating field', 'site-reviews'),
-            'title' => __('Hide the title field', 'site-reviews'),
-            'content' => __('Hide the review field', 'site-reviews'),
-            'name' => __('Hide the name field', 'site-reviews'),
-            'email' => __('Hide the email field', 'site-reviews'),
-            'terms' => __('Hide the terms field', 'site-reviews'),
-        ];
-    }
+	protected function hideOptions()
+	{
+		return [
+			'rating' => __('Hide the rating field', 'site-reviews'),
+			'title' => __('Hide the title field', 'site-reviews'),
+			'content' => __('Hide the review field', 'site-reviews'),
+			'name' => __('Hide the name field', 'site-reviews'),
+			'email' => __('Hide the email field', 'site-reviews'),
+			'terms' => __('Hide the terms field', 'site-reviews'),
+		];
+	}
 
-    /**
-     * @param array|string $atts
-     * @param string $type
-     * @return array
-     */
-    public function normalizeAtts($atts, $type = 'shortcode')
-    {
-        $atts = parent::normalizeAtts($atts, $type);
-        if (empty($atts['id'])) {
-            $atts['id'] = Application::PREFIX.substr(md5(serialize($atts)), 0, 8);
-        }
-        return $atts;
-    }
+	/**
+	 * @param array|string $atts
+	 * @param string $type
+	 * @return array
+	 */
+	public function normalizeAtts($atts, $type = 'shortcode')
+	{
+		$atts = parent::normalizeAtts($atts, $type);
+		if (empty($atts['id'])) {
+			$atts['id'] = Application::PREFIX.substr(md5(serialize($atts)), 0, 8);
+		}
+		return $atts;
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -9,12 +9,12 @@ 
     protected function hideOptions()
     {
         return [
-            'rating' => __('Hide the rating field', 'site-reviews'),
-            'title' => __('Hide the title field', 'site-reviews'),
-            'content' => __('Hide the review field', 'site-reviews'),
-            'name' => __('Hide the name field', 'site-reviews'),
-            'email' => __('Hide the email field', 'site-reviews'),
-            'terms' => __('Hide the terms field', 'site-reviews'),
+            'rating' => __( 'Hide the rating field', 'site-reviews' ),
+            'title' => __( 'Hide the title field', 'site-reviews' ),
+            'content' => __( 'Hide the review field', 'site-reviews' ),
+            'name' => __( 'Hide the name field', 'site-reviews' ),
+            'email' => __( 'Hide the email field', 'site-reviews' ),
+            'terms' => __( 'Hide the terms field', 'site-reviews' ),
         ];
     }
 
@@ -23,11 +23,11 @@ 
      * @param string $type
      * @return array
      */
-    public function normalizeAtts($atts, $type = 'shortcode')
+    public function normalizeAtts( $atts, $type = 'shortcode' )
     {
-        $atts = parent::normalizeAtts($atts, $type);
-        if (empty($atts['id'])) {
-            $atts['id'] = Application::PREFIX.substr(md5(serialize($atts)), 0, 8);
+        $atts = parent::normalizeAtts( $atts, $type );
+        if( empty($atts['id']) ) {
+            $atts['id'] = Application::PREFIX.substr( md5( serialize( $atts ) ), 0, 8 );
         }
         return $atts;
     }