pryley / site-reviews

plugin/Database/CountsManager.php

Braces +2 added lines, -1 removed lines

@@ -158,7 +158,8 @@
         $counts = [];
         if ($this->isMixedCount($args)) {
             $counts = [$this->buildCounts($args)]; // force query the database
-        } else {
+        }
+        else {
             foreach ($args['post_ids'] as $postId) {
                 $counts[] = $this->getPostCounts($postId);
         }

Indentation +354 added lines, -354 removed lines

@@ -12,385 +12,385 @@
 
 class CountsManager
 {
-    const LIMIT = 500;
-    const META_AVERAGE = '_glsr_average';
-    const META_COUNT = '_glsr_count';
-    const META_RANKING = '_glsr_ranking';
+	const LIMIT = 500;
+	const META_AVERAGE = '_glsr_average';
+	const META_COUNT = '_glsr_count';
+	const META_RANKING = '_glsr_ranking';
 
-    /**
-     * @return array
-     * @todo verify the additional type checks are needed
-     */
-    public function buildCounts(array $args = [])
-    {
-        $counts = [];
-        $query = $this->queryReviews($args);
-        while ($query) {
-            $types = array_keys(array_flip(glsr_array_column($query->reviews, 'type')));
-            $types = array_unique(array_merge(['local'], $types));
-            foreach ($types as $type) {
-                $type = $this->normalizeType($type);
-                if (isset($counts[$type])) {
-                    continue;
-            }
-                $counts[$type] = array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
-            }
-            foreach ($query->reviews as $review) {
-                $type = $this->normalizeType($review->type);
-                ++$counts[$type][$review->rating];
-            }
-            $query = $query->has_more
-                ? $this->queryReviews($args, end($query->reviews)->ID)
-                : false;
-        }
-        return $counts;
-    }
+	/**
+	 * @return array
+	 * @todo verify the additional type checks are needed
+	 */
+	public function buildCounts(array $args = [])
+	{
+		$counts = [];
+		$query = $this->queryReviews($args);
+		while ($query) {
+			$types = array_keys(array_flip(glsr_array_column($query->reviews, 'type')));
+			$types = array_unique(array_merge(['local'], $types));
+			foreach ($types as $type) {
+				$type = $this->normalizeType($type);
+				if (isset($counts[$type])) {
+					continue;
+			}
+				$counts[$type] = array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
+			}
+			foreach ($query->reviews as $review) {
+				$type = $this->normalizeType($review->type);
+				++$counts[$type][$review->rating];
+			}
+			$query = $query->has_more
+				? $this->queryReviews($args, end($query->reviews)->ID)
+				: false;
+		}
+		return $counts;
+	}
 
-    /**
-     * @param int $postId
-     * @return array
-     */
-    public function buildPostCounts($postId)
-    {
-        return $this->buildCounts(['post_ids' => [$postId]]);
-    }
+	/**
+	 * @param int $postId
+	 * @return array
+	 */
+	public function buildPostCounts($postId)
+	{
+		return $this->buildCounts(['post_ids' => [$postId]]);
+	}
 
-    /**
-     * @param int $termTaxonomyId
-     * @return array
-     */
-    public function buildTermCounts($termTaxonomyId)
-    {
-        return $this->buildCounts(['term_ids' => [$termTaxonomyId]]);
-    }
+	/**
+	 * @param int $termTaxonomyId
+	 * @return array
+	 */
+	public function buildTermCounts($termTaxonomyId)
+	{
+		return $this->buildCounts(['term_ids' => [$termTaxonomyId]]);
+	}
 
-    /**
-     * @return void
-     */
-    public function countAll()
-    {
-        $terms = glsr(Database::class)->getTerms(['fields' => 'all']);
-        foreach ($terms as $term) {
-            $this->setTermCounts($term->term_id, $this->buildTermCounts($term->term_taxonomy_id));
-        }
-        $postIds = glsr(SqlQueries::class)->getReviewsMeta('assigned_to');
-        foreach ($postIds as $postId) {
-            $this->setPostCounts($postId, $this->buildPostCounts($postId));
-        }
-        $this->setCounts($this->buildCounts());
-    }
+	/**
+	 * @return void
+	 */
+	public function countAll()
+	{
+		$terms = glsr(Database::class)->getTerms(['fields' => 'all']);
+		foreach ($terms as $term) {
+			$this->setTermCounts($term->term_id, $this->buildTermCounts($term->term_taxonomy_id));
+		}
+		$postIds = glsr(SqlQueries::class)->getReviewsMeta('assigned_to');
+		foreach ($postIds as $postId) {
+			$this->setPostCounts($postId, $this->buildPostCounts($postId));
+		}
+		$this->setCounts($this->buildCounts());
+	}
 
-    /**
-     * @return void
-     */
-    public function decrease(Review $review)
-    {
-        $this->decreaseCounts($review);
-        $this->decreasePostCounts($review);
-        $this->decreaseTermCounts($review);
-    }
+	/**
+	 * @return void
+	 */
+	public function decrease(Review $review)
+	{
+		$this->decreaseCounts($review);
+		$this->decreasePostCounts($review);
+		$this->decreaseTermCounts($review);
+	}
 
-    /**
-     * @return void
-     */
-    public function decreaseCounts(Review $review)
-    {
-        $this->setCounts($this->decreaseRating(
-            $this->getCounts(),
-            $review->review_type,
-            $review->rating
-        ));
-    }
+	/**
+	 * @return void
+	 */
+	public function decreaseCounts(Review $review)
+	{
+		$this->setCounts($this->decreaseRating(
+			$this->getCounts(),
+			$review->review_type,
+			$review->rating
+		));
+	}
 
-    /**
-     * @return void
-     */
-    public function decreasePostCounts(Review $review)
-    {
-        if (empty($counts = $this->getPostCounts($review->assigned_to))) {
-            return;
-        }
-        $counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
-        $this->setPostCounts($review->assigned_to, $counts);
-    }
+	/**
+	 * @return void
+	 */
+	public function decreasePostCounts(Review $review)
+	{
+		if (empty($counts = $this->getPostCounts($review->assigned_to))) {
+			return;
+		}
+		$counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
+		$this->setPostCounts($review->assigned_to, $counts);
+	}
 
-    /**
-     * @return void
-     */
-    public function decreaseTermCounts(Review $review)
-    {
-        foreach ($review->term_ids as $termId) {
-            if (empty($counts = $this->getTermCounts($termId))) {
-                continue;
-            }
-            $counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
-            $this->setTermCounts($termId, $counts);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function decreaseTermCounts(Review $review)
+	{
+		foreach ($review->term_ids as $termId) {
+			if (empty($counts = $this->getTermCounts($termId))) {
+				continue;
+			}
+			$counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
+			$this->setTermCounts($termId, $counts);
+		}
+	}
 
-    /**
-     * @return array
-     */
-    public function flatten(array $reviewCounts, array $args = [])
-    {
-        $counts = [];
-        array_walk_recursive($reviewCounts, function ($num, $index) use (&$counts) {
-            $counts[$index] = $num + intval(Arr::get($counts, $index, 0));
-        });
-        $args = wp_parse_args($args, [
-            'max' => glsr()->constant('MAX_RATING', Rating::class),
-            'min' => glsr()->constant('MIN_RATING', Rating::class),
-        ]);
-        foreach ($counts as $index => &$num) {
-            if ($index >= intval($args['min']) && $index <= intval($args['max'])) {
-                continue;
-            }
-            $num = 0;
-        }
-        return $counts;
-    }
+	/**
+	 * @return array
+	 */
+	public function flatten(array $reviewCounts, array $args = [])
+	{
+		$counts = [];
+		array_walk_recursive($reviewCounts, function ($num, $index) use (&$counts) {
+			$counts[$index] = $num + intval(Arr::get($counts, $index, 0));
+		});
+		$args = wp_parse_args($args, [
+			'max' => glsr()->constant('MAX_RATING', Rating::class),
+			'min' => glsr()->constant('MIN_RATING', Rating::class),
+		]);
+		foreach ($counts as $index => &$num) {
+			if ($index >= intval($args['min']) && $index <= intval($args['max'])) {
+				continue;
+			}
+			$num = 0;
+		}
+		return $counts;
+	}
 
-    /**
-     * @return array
-     */
-    public function get(array $args = [])
-    {
-        $args = $this->normalizeArgs($args);
-        $counts = [];
-        if ($this->isMixedCount($args)) {
-            $counts = [$this->buildCounts($args)]; // force query the database
-        } else {
-            foreach ($args['post_ids'] as $postId) {
-                $counts[] = $this->getPostCounts($postId);
-        }
-            foreach ($args['term_ids'] as $termId) {
-                $counts[] = $this->getTermCounts($termId);
-            }
-            if (empty($counts)) {
-                $counts[] = $this->getCounts();
-            }
-        }
-        return in_array($args['type'], ['', 'all'])
-            ? $this->normalize([$this->flatten($counts)])
-            : $this->normalize(glsr_array_column($counts, $args['type']));
-    }
+	/**
+	 * @return array
+	 */
+	public function get(array $args = [])
+	{
+		$args = $this->normalizeArgs($args);
+		$counts = [];
+		if ($this->isMixedCount($args)) {
+			$counts = [$this->buildCounts($args)]; // force query the database
+		} else {
+			foreach ($args['post_ids'] as $postId) {
+				$counts[] = $this->getPostCounts($postId);
+		}
+			foreach ($args['term_ids'] as $termId) {
+				$counts[] = $this->getTermCounts($termId);
+			}
+			if (empty($counts)) {
+				$counts[] = $this->getCounts();
+			}
+		}
+		return in_array($args['type'], ['', 'all'])
+			? $this->normalize([$this->flatten($counts)])
+			: $this->normalize(glsr_array_column($counts, $args['type']));
+	}
 
-    /**
-     * @return array
-     */
-    public function getCounts()
-    {
-        $counts = glsr(OptionManager::class)->get('counts', []);
-        if (!is_array($counts)) {
-            glsr_log()->error('Review counts is not an array; possibly due to incorrectly imported reviews.')->debug($counts);
-            return [];
-        }
-        return $counts;
-    }
+	/**
+	 * @return array
+	 */
+	public function getCounts()
+	{
+		$counts = glsr(OptionManager::class)->get('counts', []);
+		if (!is_array($counts)) {
+			glsr_log()->error('Review counts is not an array; possibly due to incorrectly imported reviews.')->debug($counts);
+			return [];
+		}
+		return $counts;
+	}
 
-    /**
-     * @param int $postId
-     * @return array
-     */
-    public function getPostCounts($postId)
-    {
-        return array_filter((array) get_post_meta($postId, static::META_COUNT, true));
-    }
+	/**
+	 * @param int $postId
+	 * @return array
+	 */
+	public function getPostCounts($postId)
+	{
+		return array_filter((array) get_post_meta($postId, static::META_COUNT, true));
+	}
 
-    /**
-     * @param int $termId
-     * @return array
-     */
-    public function getTermCounts($termId)
-    {
-        return array_filter((array) get_term_meta($termId, static::META_COUNT, true));
-    }
+	/**
+	 * @param int $termId
+	 * @return array
+	 */
+	public function getTermCounts($termId)
+	{
+		return array_filter((array) get_term_meta($termId, static::META_COUNT, true));
+	}
 
-    /**
-     * @return void
-     */
-    public function increase(Review $review)
-    {
-        $this->increaseCounts($review);
-        $this->increasePostCounts($review);
-        $this->increaseTermCounts($review);
-    }
+	/**
+	 * @return void
+	 */
+	public function increase(Review $review)
+	{
+		$this->increaseCounts($review);
+		$this->increasePostCounts($review);
+		$this->increaseTermCounts($review);
+	}
 
-    /**
-     * @return void
-     */
-    public function increaseCounts(Review $review)
-    {
-        if (empty($counts = $this->getCounts())) {
-            $counts = $this->buildCounts();
-        }
-        $this->setCounts($this->increaseRating($counts, $review->review_type, $review->rating));
-    }
+	/**
+	 * @return void
+	 */
+	public function increaseCounts(Review $review)
+	{
+		if (empty($counts = $this->getCounts())) {
+			$counts = $this->buildCounts();
+		}
+		$this->setCounts($this->increaseRating($counts, $review->review_type, $review->rating));
+	}
 
-    /**
-     * @return void
-     */
-    public function increasePostCounts(Review $review)
-    {
-        if (!(get_post($review->assigned_to) instanceof WP_Post)) {
-            return;
-        }
-        $counts = $this->getPostCounts($review->assigned_to);
-        $counts = empty($counts)
-            ? $this->buildPostCounts($review->assigned_to)
-            : $this->increaseRating($counts, $review->review_type, $review->rating);
-        $this->setPostCounts($review->assigned_to, $counts);
-    }
+	/**
+	 * @return void
+	 */
+	public function increasePostCounts(Review $review)
+	{
+		if (!(get_post($review->assigned_to) instanceof WP_Post)) {
+			return;
+		}
+		$counts = $this->getPostCounts($review->assigned_to);
+		$counts = empty($counts)
+			? $this->buildPostCounts($review->assigned_to)
+			: $this->increaseRating($counts, $review->review_type, $review->rating);
+		$this->setPostCounts($review->assigned_to, $counts);
+	}
 
-    /**
-     * @return void
-     */
-    public function increaseTermCounts(Review $review)
-    {
-        $terms = glsr(ReviewManager::class)->normalizeTerms(implode(',', $review->term_ids));
-        foreach ($terms as $term) {
-            $counts = $this->getTermCounts($term['term_id']);
-            $counts = empty($counts)
-                ? $this->buildTermCounts($term['term_taxonomy_id'])
-                : $this->increaseRating($counts, $review->review_type, $review->rating);
-            $this->setTermCounts($term['term_id'], $counts);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function increaseTermCounts(Review $review)
+	{
+		$terms = glsr(ReviewManager::class)->normalizeTerms(implode(',', $review->term_ids));
+		foreach ($terms as $term) {
+			$counts = $this->getTermCounts($term['term_id']);
+			$counts = empty($counts)
+				? $this->buildTermCounts($term['term_taxonomy_id'])
+				: $this->increaseRating($counts, $review->review_type, $review->rating);
+			$this->setTermCounts($term['term_id'], $counts);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function setCounts(array $reviewCounts)
-    {
-        glsr(OptionManager::class)->set('counts', $reviewCounts);
-    }
+	/**
+	 * @return void
+	 */
+	public function setCounts(array $reviewCounts)
+	{
+		glsr(OptionManager::class)->set('counts', $reviewCounts);
+	}
 
-    /**
-     * @param int $postId
-     * @return void
-     */
-    public function setPostCounts($postId, array $reviewCounts)
-    {
-        $ratingCounts = $this->flatten($reviewCounts);
-        update_post_meta($postId, static::META_COUNT, $reviewCounts);
-        update_post_meta($postId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
-        update_post_meta($postId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
-    }
+	/**
+	 * @param int $postId
+	 * @return void
+	 */
+	public function setPostCounts($postId, array $reviewCounts)
+	{
+		$ratingCounts = $this->flatten($reviewCounts);
+		update_post_meta($postId, static::META_COUNT, $reviewCounts);
+		update_post_meta($postId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
+		update_post_meta($postId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
+	}
 
-    /**
-     * @param int $termId
-     * @return void
-     */
-    public function setTermCounts($termId, array $reviewCounts)
-    {
-        $term = get_term($termId, Application::TAXONOMY);
-        if (!isset($term->term_id)) {
-            return;
-        }
-        $ratingCounts = $this->flatten($reviewCounts);
-        update_term_meta($termId, static::META_COUNT, $reviewCounts);
-        update_term_meta($termId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
-        update_term_meta($termId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
-    }
+	/**
+	 * @param int $termId
+	 * @return void
+	 */
+	public function setTermCounts($termId, array $reviewCounts)
+	{
+		$term = get_term($termId, Application::TAXONOMY);
+		if (!isset($term->term_id)) {
+			return;
+		}
+		$ratingCounts = $this->flatten($reviewCounts);
+		update_term_meta($termId, static::META_COUNT, $reviewCounts);
+		update_term_meta($termId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
+		update_term_meta($termId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
+	}
 
-    /**
-     * @param string $type
-     * @param int $rating
-     * @return array
-     */
-    protected function decreaseRating(array $reviewCounts, $type, $rating)
-    {
-        if (isset($reviewCounts[$type][$rating])) {
-            $reviewCounts[$type][$rating] = max(0, $reviewCounts[$type][$rating] - 1);
-        }
-        return $reviewCounts;
-    }
+	/**
+	 * @param string $type
+	 * @param int $rating
+	 * @return array
+	 */
+	protected function decreaseRating(array $reviewCounts, $type, $rating)
+	{
+		if (isset($reviewCounts[$type][$rating])) {
+			$reviewCounts[$type][$rating] = max(0, $reviewCounts[$type][$rating] - 1);
+		}
+		return $reviewCounts;
+	}
 
-    /**
-     * @param string $type
-     * @param int $rating
-     * @return array
-     */
-    protected function increaseRating(array $reviewCounts, $type, $rating)
-    {
-        if (!array_key_exists($type, glsr()->reviewTypes)) {
-            return $reviewCounts;
-        }
-        if (!array_key_exists($type, $reviewCounts)) {
-            $reviewCounts[$type] = [];
-        }
-        $reviewCounts = $this->normalize($reviewCounts);
-        $reviewCounts[$type][$rating] = intval($reviewCounts[$type][$rating]) + 1;
-        return $reviewCounts;
-    }
+	/**
+	 * @param string $type
+	 * @param int $rating
+	 * @return array
+	 */
+	protected function increaseRating(array $reviewCounts, $type, $rating)
+	{
+		if (!array_key_exists($type, glsr()->reviewTypes)) {
+			return $reviewCounts;
+		}
+		if (!array_key_exists($type, $reviewCounts)) {
+			$reviewCounts[$type] = [];
+		}
+		$reviewCounts = $this->normalize($reviewCounts);
+		$reviewCounts[$type][$rating] = intval($reviewCounts[$type][$rating]) + 1;
+		return $reviewCounts;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isMixedCount(array $args)
-    {
-        return !empty($args['post_ids']) && !empty($args['term_ids']);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isMixedCount(array $args)
+	{
+		return !empty($args['post_ids']) && !empty($args['term_ids']);
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $reviewCounts)
-    {
-        if (empty($reviewCounts)) {
-            $reviewCounts = [[]];
-        }
-        foreach ($reviewCounts as &$counts) {
-            foreach (range(0, glsr()->constant('MAX_RATING', Rating::class)) as $index) {
-                if (isset($counts[$index])) {
-                    continue;
-                }
-                $counts[$index] = 0;
-            }
-            ksort($counts);
-        }
-        return $reviewCounts;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $reviewCounts)
+	{
+		if (empty($reviewCounts)) {
+			$reviewCounts = [[]];
+		}
+		foreach ($reviewCounts as &$counts) {
+			foreach (range(0, glsr()->constant('MAX_RATING', Rating::class)) as $index) {
+				if (isset($counts[$index])) {
+					continue;
+				}
+				$counts[$index] = 0;
+			}
+			ksort($counts);
+		}
+		return $reviewCounts;
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeArgs(array $args)
-    {
-        $args = wp_parse_args(array_filter($args), [
-            'post_ids' => [],
-            'term_ids' => [],
-            'type' => 'local',
-        ]);
-        $args['post_ids'] = glsr(Multilingual::class)->getPostIds($args['post_ids']);
-        $args['type'] = $this->normalizeType($args['type']);
-        return $args;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeArgs(array $args)
+	{
+		$args = wp_parse_args(array_filter($args), [
+			'post_ids' => [],
+			'term_ids' => [],
+			'type' => 'local',
+		]);
+		$args['post_ids'] = glsr(Multilingual::class)->getPostIds($args['post_ids']);
+		$args['type'] = $this->normalizeType($args['type']);
+		return $args;
+	}
 
-    /**
-     * @param string $type
-     * @return string
-     */
-    protected function normalizeType($type)
-    {
-        return empty($type) || !is_string($type)
-            ? 'local'
-            : $type;
-    }
+	/**
+	 * @param string $type
+	 * @return string
+	 */
+	protected function normalizeType($type)
+	{
+		return empty($type) || !is_string($type)
+			? 'local'
+			: $type;
+	}
 
-    /**
-     * @param int $lastPostId
-     * @return object
-     */
-    protected function queryReviews(array $args = [], $lastPostId = 0)
-    {
-        $reviews = glsr(SqlQueries::class)->getReviewCounts($args, $lastPostId, static::LIMIT);
-        $hasMore = is_array($reviews)
-            ? count($reviews) == static::LIMIT
-            : false;
-        return (object) [
-            'has_more' => $hasMore,
-            'reviews' => $reviews,
-        ];
-    }
+	/**
+	 * @param int $lastPostId
+	 * @return object
+	 */
+	protected function queryReviews(array $args = [], $lastPostId = 0)
+	{
+		$reviews = glsr(SqlQueries::class)->getReviewCounts($args, $lastPostId, static::LIMIT);
+		$hasMore = is_array($reviews)
+			? count($reviews) == static::LIMIT
+			: false;
+		return (object) [
+			'has_more' => $hasMore,
+			'reviews' => $reviews,
+		];
+	}
 }

Spacing +128 added lines, -128 removed lines

@@ -21,26 +21,26 @@ 
      * @return array
      * @todo verify the additional type checks are needed
      */
-    public function buildCounts(array $args = [])
+    public function buildCounts( array $args = [] )
     {
         $counts = [];
-        $query = $this->queryReviews($args);
-        while ($query) {
-            $types = array_keys(array_flip(glsr_array_column($query->reviews, 'type')));
-            $types = array_unique(array_merge(['local'], $types));
-            foreach ($types as $type) {
-                $type = $this->normalizeType($type);
-                if (isset($counts[$type])) {
+        $query = $this->queryReviews( $args );
+        while( $query ) {
+            $types = array_keys( array_flip( glsr_array_column( $query->reviews, 'type' ) ) );
+            $types = array_unique( array_merge( ['local'], $types ) );
+            foreach( $types as $type ) {
+                $type = $this->normalizeType( $type );
+                if( isset($counts[$type]) ) {
                     continue;
             }
-                $counts[$type] = array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
+                $counts[$type] = array_fill_keys( range( 0, glsr()->constant( 'MAX_RATING', Rating::class ) ), 0 );
             }
-            foreach ($query->reviews as $review) {
-                $type = $this->normalizeType($review->type);
+            foreach( $query->reviews as $review ) {
+                $type = $this->normalizeType( $review->type );
                 ++$counts[$type][$review->rating];
             }
             $query = $query->has_more
-                ? $this->queryReviews($args, end($query->reviews)->ID)
+                ? $this->queryReviews( $args, end( $query->reviews )->ID )
                 : false;
         }
         return $counts;
@@ -50,18 +50,18 @@ 
      * @param int $postId
      * @return array
      */
-    public function buildPostCounts($postId)
+    public function buildPostCounts( $postId )
     {
-        return $this->buildCounts(['post_ids' => [$postId]]);
+        return $this->buildCounts( ['post_ids' => [$postId]] );
     }
 
     /**
      * @param int $termTaxonomyId
      * @return array
      */
-    public function buildTermCounts($termTaxonomyId)
+    public function buildTermCounts( $termTaxonomyId )
     {
-        return $this->buildCounts(['term_ids' => [$termTaxonomyId]]);
+        return $this->buildCounts( ['term_ids' => [$termTaxonomyId]] );
     }
 
     /**
@@ -69,80 +69,80 @@ 
      */
     public function countAll()
     {
-        $terms = glsr(Database::class)->getTerms(['fields' => 'all']);
-        foreach ($terms as $term) {
-            $this->setTermCounts($term->term_id, $this->buildTermCounts($term->term_taxonomy_id));
+        $terms = glsr( Database::class )->getTerms( ['fields' => 'all'] );
+        foreach( $terms as $term ) {
+            $this->setTermCounts( $term->term_id, $this->buildTermCounts( $term->term_taxonomy_id ) );
         }
-        $postIds = glsr(SqlQueries::class)->getReviewsMeta('assigned_to');
-        foreach ($postIds as $postId) {
-            $this->setPostCounts($postId, $this->buildPostCounts($postId));
+        $postIds = glsr( SqlQueries::class )->getReviewsMeta( 'assigned_to' );
+        foreach( $postIds as $postId ) {
+            $this->setPostCounts( $postId, $this->buildPostCounts( $postId ) );
         }
-        $this->setCounts($this->buildCounts());
+        $this->setCounts( $this->buildCounts() );
     }
 
     /**
      * @return void
      */
-    public function decrease(Review $review)
+    public function decrease( Review $review )
     {
-        $this->decreaseCounts($review);
-        $this->decreasePostCounts($review);
-        $this->decreaseTermCounts($review);
+        $this->decreaseCounts( $review );
+        $this->decreasePostCounts( $review );
+        $this->decreaseTermCounts( $review );
     }
 
     /**
      * @return void
      */
-    public function decreaseCounts(Review $review)
+    public function decreaseCounts( Review $review )
     {
-        $this->setCounts($this->decreaseRating(
+        $this->setCounts( $this->decreaseRating(
             $this->getCounts(),
             $review->review_type,
             $review->rating
-        ));
+        ) );
     }
 
     /**
      * @return void
      */
-    public function decreasePostCounts(Review $review)
+    public function decreasePostCounts( Review $review )
     {
-        if (empty($counts = $this->getPostCounts($review->assigned_to))) {
+        if( empty($counts = $this->getPostCounts( $review->assigned_to )) ) {
             return;
         }
-        $counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
-        $this->setPostCounts($review->assigned_to, $counts);
+        $counts = $this->decreaseRating( $counts, $review->review_type, $review->rating );
+        $this->setPostCounts( $review->assigned_to, $counts );
     }
 
     /**
      * @return void
      */
-    public function decreaseTermCounts(Review $review)
+    public function decreaseTermCounts( Review $review )
     {
-        foreach ($review->term_ids as $termId) {
-            if (empty($counts = $this->getTermCounts($termId))) {
+        foreach( $review->term_ids as $termId ) {
+            if( empty($counts = $this->getTermCounts( $termId )) ) {
                 continue;
             }
-            $counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
-            $this->setTermCounts($termId, $counts);
+            $counts = $this->decreaseRating( $counts, $review->review_type, $review->rating );
+            $this->setTermCounts( $termId, $counts );
         }
     }
 
     /**
      * @return array
      */
-    public function flatten(array $reviewCounts, array $args = [])
+    public function flatten( array $reviewCounts, array $args = [] )
     {
         $counts = [];
-        array_walk_recursive($reviewCounts, function ($num, $index) use (&$counts) {
-            $counts[$index] = $num + intval(Arr::get($counts, $index, 0));
+        array_walk_recursive( $reviewCounts, function( $num, $index ) use (&$counts) {
+            $counts[$index] = $num + intval( Arr::get( $counts, $index, 0 ) );
         });
-        $args = wp_parse_args($args, [
-            'max' => glsr()->constant('MAX_RATING', Rating::class),
-            'min' => glsr()->constant('MIN_RATING', Rating::class),
-        ]);
-        foreach ($counts as $index => &$num) {
-            if ($index >= intval($args['min']) && $index <= intval($args['max'])) {
+        $args = wp_parse_args( $args, [
+            'max' => glsr()->constant( 'MAX_RATING', Rating::class ),
+            'min' => glsr()->constant( 'MIN_RATING', Rating::class ),
+        ] );
+        foreach( $counts as $index => &$num ) {
+            if( $index >= intval( $args['min'] ) && $index <= intval( $args['max'] ) ) {
                 continue;
             }
             $num = 0;
@@ -153,26 +153,26 @@ 
     /**
      * @return array
      */
-    public function get(array $args = [])
+    public function get( array $args = [] )
     {
-        $args = $this->normalizeArgs($args);
+        $args = $this->normalizeArgs( $args );
         $counts = [];
-        if ($this->isMixedCount($args)) {
-            $counts = [$this->buildCounts($args)]; // force query the database
+        if( $this->isMixedCount( $args ) ) {
+            $counts = [$this->buildCounts( $args )]; // force query the database
         } else {
-            foreach ($args['post_ids'] as $postId) {
-                $counts[] = $this->getPostCounts($postId);
+            foreach( $args['post_ids'] as $postId ) {
+                $counts[] = $this->getPostCounts( $postId );
         }
-            foreach ($args['term_ids'] as $termId) {
-                $counts[] = $this->getTermCounts($termId);
+            foreach( $args['term_ids'] as $termId ) {
+                $counts[] = $this->getTermCounts( $termId );
             }
-            if (empty($counts)) {
+            if( empty($counts) ) {
                 $counts[] = $this->getCounts();
             }
         }
-        return in_array($args['type'], ['', 'all'])
-            ? $this->normalize([$this->flatten($counts)])
-            : $this->normalize(glsr_array_column($counts, $args['type']));
+        return in_array( $args['type'], ['', 'all'] )
+            ? $this->normalize( [$this->flatten( $counts )] )
+            : $this->normalize( glsr_array_column( $counts, $args['type'] ) );
     }
 
     /**
@@ -180,9 +180,9 @@ 
      */
     public function getCounts()
     {
-        $counts = glsr(OptionManager::class)->get('counts', []);
-        if (!is_array($counts)) {
-            glsr_log()->error('Review counts is not an array; possibly due to incorrectly imported reviews.')->debug($counts);
+        $counts = glsr( OptionManager::class )->get( 'counts', [] );
+        if( !is_array( $counts ) ) {
+            glsr_log()->error( 'Review counts is not an array; possibly due to incorrectly imported reviews.' )->debug( $counts );
             return [];
         }
         return $counts;
@@ -192,105 +192,105 @@ 
      * @param int $postId
      * @return array
      */
-    public function getPostCounts($postId)
+    public function getPostCounts( $postId )
     {
-        return array_filter((array) get_post_meta($postId, static::META_COUNT, true));
+        return array_filter( (array)get_post_meta( $postId, static::META_COUNT, true ) );
     }
 
     /**
      * @param int $termId
      * @return array
      */
-    public function getTermCounts($termId)
+    public function getTermCounts( $termId )
     {
-        return array_filter((array) get_term_meta($termId, static::META_COUNT, true));
+        return array_filter( (array)get_term_meta( $termId, static::META_COUNT, true ) );
     }
 
     /**
      * @return void
      */
-    public function increase(Review $review)
+    public function increase( Review $review )
     {
-        $this->increaseCounts($review);
-        $this->increasePostCounts($review);
-        $this->increaseTermCounts($review);
+        $this->increaseCounts( $review );
+        $this->increasePostCounts( $review );
+        $this->increaseTermCounts( $review );
     }
 
     /**
      * @return void
      */
-    public function increaseCounts(Review $review)
+    public function increaseCounts( Review $review )
     {
-        if (empty($counts = $this->getCounts())) {
+        if( empty($counts = $this->getCounts()) ) {
             $counts = $this->buildCounts();
         }
-        $this->setCounts($this->increaseRating($counts, $review->review_type, $review->rating));
+        $this->setCounts( $this->increaseRating( $counts, $review->review_type, $review->rating ) );
     }
 
     /**
      * @return void
      */
-    public function increasePostCounts(Review $review)
+    public function increasePostCounts( Review $review )
     {
-        if (!(get_post($review->assigned_to) instanceof WP_Post)) {
+        if( !(get_post( $review->assigned_to ) instanceof WP_Post) ) {
             return;
         }
-        $counts = $this->getPostCounts($review->assigned_to);
+        $counts = $this->getPostCounts( $review->assigned_to );
         $counts = empty($counts)
-            ? $this->buildPostCounts($review->assigned_to)
-            : $this->increaseRating($counts, $review->review_type, $review->rating);
-        $this->setPostCounts($review->assigned_to, $counts);
+            ? $this->buildPostCounts( $review->assigned_to )
+            : $this->increaseRating( $counts, $review->review_type, $review->rating );
+        $this->setPostCounts( $review->assigned_to, $counts );
     }
 
     /**
      * @return void
      */
-    public function increaseTermCounts(Review $review)
+    public function increaseTermCounts( Review $review )
     {
-        $terms = glsr(ReviewManager::class)->normalizeTerms(implode(',', $review->term_ids));
-        foreach ($terms as $term) {
-            $counts = $this->getTermCounts($term['term_id']);
+        $terms = glsr( ReviewManager::class )->normalizeTerms( implode( ',', $review->term_ids ) );
+        foreach( $terms as $term ) {
+            $counts = $this->getTermCounts( $term['term_id'] );
             $counts = empty($counts)
-                ? $this->buildTermCounts($term['term_taxonomy_id'])
-                : $this->increaseRating($counts, $review->review_type, $review->rating);
-            $this->setTermCounts($term['term_id'], $counts);
+                ? $this->buildTermCounts( $term['term_taxonomy_id'] )
+                : $this->increaseRating( $counts, $review->review_type, $review->rating );
+            $this->setTermCounts( $term['term_id'], $counts );
         }
     }
 
     /**
      * @return void
      */
-    public function setCounts(array $reviewCounts)
+    public function setCounts( array $reviewCounts )
     {
-        glsr(OptionManager::class)->set('counts', $reviewCounts);
+        glsr( OptionManager::class )->set( 'counts', $reviewCounts );
     }
 
     /**
      * @param int $postId
      * @return void
      */
-    public function setPostCounts($postId, array $reviewCounts)
+    public function setPostCounts( $postId, array $reviewCounts )
     {
-        $ratingCounts = $this->flatten($reviewCounts);
-        update_post_meta($postId, static::META_COUNT, $reviewCounts);
-        update_post_meta($postId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
-        update_post_meta($postId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
+        $ratingCounts = $this->flatten( $reviewCounts );
+        update_post_meta( $postId, static::META_COUNT, $reviewCounts );
+        update_post_meta( $postId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ) );
+        update_post_meta( $postId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts ) );
     }
 
     /**
      * @param int $termId
      * @return void
      */
-    public function setTermCounts($termId, array $reviewCounts)
+    public function setTermCounts( $termId, array $reviewCounts )
     {
-        $term = get_term($termId, Application::TAXONOMY);
-        if (!isset($term->term_id)) {
+        $term = get_term( $termId, Application::TAXONOMY );
+        if( !isset($term->term_id) ) {
             return;
         }
-        $ratingCounts = $this->flatten($reviewCounts);
-        update_term_meta($termId, static::META_COUNT, $reviewCounts);
-        update_term_meta($termId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
-        update_term_meta($termId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
+        $ratingCounts = $this->flatten( $reviewCounts );
+        update_term_meta( $termId, static::META_COUNT, $reviewCounts );
+        update_term_meta( $termId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ) );
+        update_term_meta( $termId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts ) );
     }
 
     /**
@@ -298,10 +298,10 @@ 
      * @param int $rating
      * @return array
      */
-    protected function decreaseRating(array $reviewCounts, $type, $rating)
+    protected function decreaseRating( array $reviewCounts, $type, $rating )
     {
-        if (isset($reviewCounts[$type][$rating])) {
-            $reviewCounts[$type][$rating] = max(0, $reviewCounts[$type][$rating] - 1);
+        if( isset($reviewCounts[$type][$rating]) ) {
+            $reviewCounts[$type][$rating] = max( 0, $reviewCounts[$type][$rating] - 1 );
         }
         return $reviewCounts;
     }
@@ -311,23 +311,23 @@ 
      * @param int $rating
      * @return array
      */
-    protected function increaseRating(array $reviewCounts, $type, $rating)
+    protected function increaseRating( array $reviewCounts, $type, $rating )
     {
-        if (!array_key_exists($type, glsr()->reviewTypes)) {
+        if( !array_key_exists( $type, glsr()->reviewTypes ) ) {
             return $reviewCounts;
         }
-        if (!array_key_exists($type, $reviewCounts)) {
+        if( !array_key_exists( $type, $reviewCounts ) ) {
             $reviewCounts[$type] = [];
         }
-        $reviewCounts = $this->normalize($reviewCounts);
-        $reviewCounts[$type][$rating] = intval($reviewCounts[$type][$rating]) + 1;
+        $reviewCounts = $this->normalize( $reviewCounts );
+        $reviewCounts[$type][$rating] = intval( $reviewCounts[$type][$rating] ) + 1;
         return $reviewCounts;
     }
 
     /**
      * @return bool
      */
-    protected function isMixedCount(array $args)
+    protected function isMixedCount( array $args )
     {
         return !empty($args['post_ids']) && !empty($args['term_ids']);
     }
@@ -335,19 +335,19 @@ 
     /**
      * @return array
      */
-    protected function normalize(array $reviewCounts)
+    protected function normalize( array $reviewCounts )
     {
-        if (empty($reviewCounts)) {
+        if( empty($reviewCounts) ) {
             $reviewCounts = [[]];
         }
-        foreach ($reviewCounts as &$counts) {
-            foreach (range(0, glsr()->constant('MAX_RATING', Rating::class)) as $index) {
-                if (isset($counts[$index])) {
+        foreach( $reviewCounts as &$counts ) {
+            foreach( range( 0, glsr()->constant( 'MAX_RATING', Rating::class ) ) as $index ) {
+                if( isset($counts[$index]) ) {
                     continue;
                 }
                 $counts[$index] = 0;
             }
-            ksort($counts);
+            ksort( $counts );
         }
         return $reviewCounts;
     }
@@ -355,15 +355,15 @@ 
     /**
      * @return array
      */
-    protected function normalizeArgs(array $args)
+    protected function normalizeArgs( array $args )
     {
-        $args = wp_parse_args(array_filter($args), [
+        $args = wp_parse_args( array_filter( $args ), [
             'post_ids' => [],
             'term_ids' => [],
             'type' => 'local',
-        ]);
-        $args['post_ids'] = glsr(Multilingual::class)->getPostIds($args['post_ids']);
-        $args['type'] = $this->normalizeType($args['type']);
+        ] );
+        $args['post_ids'] = glsr( Multilingual::class )->getPostIds( $args['post_ids'] );
+        $args['type'] = $this->normalizeType( $args['type'] );
         return $args;
     }
 
@@ -371,9 +371,9 @@ 
      * @param string $type
      * @return string
      */
-    protected function normalizeType($type)
+    protected function normalizeType( $type )
     {
-        return empty($type) || !is_string($type)
+        return empty($type) || !is_string( $type )
             ? 'local'
             : $type;
     }
@@ -382,13 +382,13 @@ 
      * @param int $lastPostId
      * @return object
      */
-    protected function queryReviews(array $args = [], $lastPostId = 0)
+    protected function queryReviews( array $args = [], $lastPostId = 0 )
     {
-        $reviews = glsr(SqlQueries::class)->getReviewCounts($args, $lastPostId, static::LIMIT);
-        $hasMore = is_array($reviews)
-            ? count($reviews) == static::LIMIT
+        $reviews = glsr( SqlQueries::class )->getReviewCounts( $args, $lastPostId, static::LIMIT );
+        $hasMore = is_array( $reviews )
+            ? count( $reviews ) == static::LIMIT
             : false;
-        return (object) [
+        return (object)[
             'has_more' => $hasMore,
             'reviews' => $reviews,
         ];

views/pages/welcome/support.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <p class="about-description">
-    Still need help with <?= glsr()->name; ?>? We offer excellent support for you. But don't forget to check our <a href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!shortcodes'); ?>">documentation</a> first.
+    Still need help with <?= glsr()->name; ?>? We offer excellent support for you. But don't forget to check our <a href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!shortcodes' ); ?>">documentation</a> first.
 </p>
 <div class="is-fullwidth">
     <div class="glsr-flex-row glsr-has-2-columns">

views/pages/welcome/getting-started.php

Spacing +26 added lines, -26 removed lines

@@ -1,17 +1,17 @@ 
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div class="is-fullwidth">
     <div class="glsr-flex-row glsr-has-2-columns">
         <div class="glsr-column">
             <h3>Editor Blocks</h3>
             <p>The fastest way to getting started with Site Reviews is use the three provided blocks in the WordPress Block Editor. Each block comes with multiple settings which let you configure the block exactly as needed. To add a block to your page, click the "Add Block" button and search for "Site Reviews".</p>
-            <img class="screenshot" src="<?= glsr()->url('assets/images/blocks.png'); ?>" alt="Editor Blocks" />
+            <img class="screenshot" src="<?= glsr()->url( 'assets/images/blocks.png' ); ?>" alt="Editor Blocks" />
         </div>
         <div class="glsr-column">
             <h3>Shortcodes and Widgets</h3>
             <p>You can also use the shortcodes or widgets on your page. Keep in mind, however, that widgets are limited in options compared to the shortcodes (for example, the "Latest Reviews" widget does not allow pagination). If you are using the Classic Editor in WordPress, you can click on the Site Reviews shortcode button above the editor (next to the media button) to add a shortcode via a friendly popup.</p>
             <p>To learn more about the shortcodes and the available shortcode options, please see the Shortcode Documentation page of the plugin.</p>
-            <a class="button" href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!shortcodes'); ?>">View Shortcode Documentation</a>
+            <a class="button" href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!shortcodes' ); ?>">View Shortcode Documentation</a>
         </div>
     </div>
 </div>
@@ -20,31 +20,31 @@ 
     <h2>Features</h2>
     <ul class="glsr-flex-row glsr-has-3-columns">
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=addons'); ?>">Add-ons</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=addons' ); ?>">Add-ons</a></h3>
             <p>Extend Site Reviews with add-ons that provide additional features.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!reviews'); ?>">Avatars</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!reviews' ); ?>">Avatars</a></h3>
             <p>Enable avatars to generate images using the WordPress Gravatar service.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=tools#!general'); ?>">Backup/Restore</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=tools#!general' ); ?>">Backup/Restore</a></h3>
             <p>Backup and restore your plugin settings as needed.</p>
         </li>
         <li class="glsr-column">
-            <h3><a data-expand="#faq-14" href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!faq'); ?>">Bayesian Ranking</a></h3>
+            <h3><a data-expand="#faq-14" href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!faq' ); ?>">Bayesian Ranking</a></h3>
             <p>Easily rank pages with assigned reviews using the bayesian algorithm.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!submissions'); ?>">Blacklist</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!submissions' ); ?>">Blacklist</a></h3>
             <p>Blacklist words, phrases, IP addresses, names, and emails.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!general'); ?>">Blockchain Validation</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!general' ); ?>">Blockchain Validation</a></h3>
             <p>Verify your reviews on the Blockchain with <a href="https://rebusify.com?ref=105">Rebusify</a>.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit-tags.php?taxonomy=site-review-category&post_type=site-review'); ?>">Categories</a></h3>
+            <h3><a href="<?= admin_url( 'edit-tags.php?taxonomy=site-review-category&post_type=site-review' ); ?>">Categories</a></h3>
             <p>Add your own categories and assign reviews to them.</p>
         </li>
         <li class="glsr-column">
@@ -52,7 +52,7 @@ 
             <p>Designed for WordPress developers with over 100 filter hooks and convenient functions.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!faq'); ?>">Documentation</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!faq' ); ?>">Documentation</a></h3>
             <p>Provides FAQ and documenation for hooks and all shortcodes and functions.</p>
         </li>
         <li class="glsr-column">
@@ -60,11 +60,11 @@ 
             <p>Use configurable editor blocks in the new WordPress 5.0 editor.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!schema'); ?>">JSON-LD Schema</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!schema' ); ?>">JSON-LD Schema</a></h3>
             <p>Enable JSON-LD schema to display your reviews and ratings in search results.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!general'); ?>">Multilingual</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!general' ); ?>">Multilingual</a></h3>
             <p>Integrates with Polylang and WPML and provides easy search/replace translation.</p>
         </li>
         <li class="glsr-column">
@@ -72,47 +72,47 @@ 
             <p>Provides full support for the WordPress multisite feature.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!general'); ?>">Notifications</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!general' ); ?>">Notifications</a></h3>
             <p>Send notifications to one or more emails when a review is submitted.</p>
         </li>
         <li class="glsr-column">
-            <h3><a data-expand="#faq-03" href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!faq'); ?>">Page Assignment</a></h3>
+            <h3><a data-expand="#faq-03" href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!faq' ); ?>">Page Assignment</a></h3>
             <p>Assign reviews to Posts, Pages, and Custom Post Types.</p>
         </li>
         <li class="glsr-column">
-            <h3><a data-expand="#faq-02" href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!faq'); ?>">Pagination</a></h3>
+            <h3><a data-expand="#faq-02" href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!faq' ); ?>">Pagination</a></h3>
             <p>Enable AJAX pagination to display a custom number of reviews per-page.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review'); ?>">Responses</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review' ); ?>">Responses</a></h3>
             <p>Write a response to reviews that require a response.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!general'); ?>">Restrictions</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!general' ); ?>">Restrictions</a></h3>
             <p>Require approval before publishing reviews and limit to registered users.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!submissions'); ?>">Review Limits</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!submissions' ); ?>">Review Limits</a></h3>
             <p>Limit review submissions by email address, IP address, or username.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!shortcodes'); ?>">Review Summaries</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!shortcodes' ); ?>">Review Summaries</a></h3>
             <p>Display a summary of your review ratings from high to low.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!shortcodes'); ?>">Shortcodes</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!shortcodes' ); ?>">Shortcodes</a></h3>
             <p>Use the configurable shortcodes complete with documentation.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!general'); ?>">Slack</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!general' ); ?>">Slack</a></h3>
             <p>Receive notifications in Slack when a review is submitted.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!submissions'); ?>">SPAM Protection</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!submissions' ); ?>">SPAM Protection</a></h3>
             <p>Uses a Honeypot and integrates with Invisible reCAPTCHA and Akismet.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!general'); ?>">Styles</a></h3>
+            <h3><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!general' ); ?>">Styles</a></h3>
             <p>Change the submission form style to match popular themes and form plugins.</p>
         </li>
         <li class="glsr-column">
@@ -120,11 +120,11 @@ 
             <p>Free premium-level support included on the WordPress support forum.</p>
         </li>
         <li class="glsr-column">
-            <h3><a data-expand="#faq-17" href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!faq'); ?>">Templates</a></h3>
+            <h3><a data-expand="#faq-17" href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!faq' ); ?>">Templates</a></h3>
             <p>Use the Site Reviews templates in your theme for full control over the HTML.</p>
         </li>
         <li class="glsr-column">
-            <h3><a href="<?= admin_url('widgets.php'); ?>">Widgets</a></h3>
+            <h3><a href="<?= admin_url( 'widgets.php' ); ?>">Widgets</a></h3>
             <p>Use the configurable widgets in your sidebars.</p>
         </li>
     </ul>

views/pages/settings/index.php

Spacing +6 added lines, -6 removed lines

@@ -1,21 +1,21 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div class="wrap">
-    <h1 class="wp-heading-inline"><?= esc_html(get_admin_page_title()); ?></h1>
+    <h1 class="wp-heading-inline"><?= esc_html( get_admin_page_title() ); ?></h1>
     <?= $notices; ?>
     <h2 class="glsr-nav-tab-wrapper nav-tab-wrapper">
-        <?php foreach ($tabs as $id => $title) : ?>
+        <?php foreach( $tabs as $id => $title ) : ?>
         <a class="glsr-nav-tab nav-tab" href="#<?= $id; ?>"><?= $title; ?></a>
         <?php endforeach; ?>
     </h2>
     <form class="glsr-form" action="options.php" enctype="multipart/form-data" method="post">
-        <?php foreach ($tabs as $id => $title) : ?>
+        <?php foreach( $tabs as $id => $title ) : ?>
         <div class="glsr-nav-view ui-tabs-hide" id="<?= $id; ?>">
-            <?= $settings->buildFields($id); ?>
+            <?= $settings->buildFields( $id ); ?>
         </div>
         <?php endforeach; ?>
         <input type="hidden" name="_active_tab">
-        <?php settings_fields(glsr()->id.'-settings'); ?>
+        <?php settings_fields( glsr()->id.'-settings' ); ?>
         <?php submit_button(); ?>
     </form>
 </div>

views/pages/tools/index.php

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div class="wrap">
-    <h1 class="wp-heading-inline"><?= esc_html(get_admin_page_title()); ?></h1>
+    <h1 class="wp-heading-inline"><?= esc_html( get_admin_page_title() ); ?></h1>
     <?= $notices; ?>
     <h2 class="glsr-nav-tab-wrapper nav-tab-wrapper">
-        <?php foreach ($tabs as $id => $title) : ?>
+        <?php foreach( $tabs as $id => $title ) : ?>
         <a class="glsr-nav-tab nav-tab" href="#<?= $id; ?>"><?= $title; ?></a>
         <?php endforeach; ?>
     </h2>
-    <?php foreach ($tabs as $id => $title) : ?>
+    <?php foreach( $tabs as $id => $title ) : ?>
     <div class="glsr-nav-view ui-tabs-hide" id="<?= $id; ?>">
-        <?php $template->render('pages/tools/'.$id, $data); ?>
+        <?php $template->render( 'pages/tools/'.$id, $data ); ?>
     </div>
     <?php endforeach; ?>
     <input type="hidden" name="_active_tab">

views/pages/documentation/faq.php

Spacing +29 added lines, -29 removed lines

@@ -1,15 +1,15 @@ 
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div id="faq-01" class="glsr-card postbox">
     <div class="glsr-card-header">
         <h3>How do I add additional values to the schema?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
     <div class="inside">
-        <p>To add additional values to the generated schema, use the <code><a href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!hooks'); ?>" data-expand="#hooks-07">site-reviews/schema/[SCHEMA_TYPE]</a></code> hook in your theme's functions.php file.</p>
+        <p>To add additional values to the generated schema, use the <code><a href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!hooks' ); ?>" data-expand="#hooks-07">site-reviews/schema/[SCHEMA_TYPE]</a></code> hook in your theme's functions.php file.</p>
         <p>Make sure to use Google's <a href="https://search.google.com/structured-data/testing-tool">Structured Data Testing Tool</a> to test the schema after any custom modifications have been made.</p>
         <pre><code class="php">/**
  * Modifies the schema created by Site Reviews.
@@ -34,7 +34,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I add pagination to my reviews?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -43,7 +43,7 @@ 
         <p>If you are using the shortcodes, then use the <code>pagination</code> and <code>count</code> options.</p>
         <p>For example, this will paginate reviews to 10 reviews per-page:</p>
         <pre><code class="php">[site_reviews pagination=ajax count=10]</code></pre>
-        <p>To lean more about the available shortcode options and how to use them, please see the <code><a href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!shortcodes'); ?>">Documentation > Shortcodes</a></code> page.</p>
+        <p>To lean more about the available shortcode options and how to use them, please see the <code><a href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!shortcodes' ); ?>">Documentation > Shortcodes</a></code> page.</p>
     </div>
 </div>
 
@@ -51,7 +51,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I assign reviews to a page?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -69,7 +69,7 @@ 
         <p>If you use <code>post_id</code> as the value, then Site Reviews will know to automatically use the Page ID of the current page.</p>
         <p>If you use <code>parent_id</code> as the value, then Site Reviews will know to automatically use the Page ID of the current page's Parent.</p>
         <p>You can, of course, also directly enter the numerical WordPress Page ID of the page instead if your prefer.</p>
-        <p>To lean more about the available shortcode options and how to use them, please see the <code><a href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!shortcodes'); ?>">Documentation > Shortcodes</a></code> page.</p>
+        <p>To lean more about the available shortcode options and how to use them, please see the <code><a href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!shortcodes' ); ?>">Documentation > Shortcodes</a></code> page.</p>
     </div>
 </div>
 
@@ -77,7 +77,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I change the font?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -93,7 +93,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I change the order of the review fields?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -121,7 +121,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I change the order of the reviews summary fields?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -147,12 +147,12 @@ 
     <div class="glsr-card-header">
         <h3>How do I change the order of the submission form fields?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
     <div class="inside">
-        <p>To customise the order of the fields in the review submission form, use the <code><a href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!hooks'); ?>" data-expand="#hooks-01">site-reviews/submission-form/order</a></code> filter hook in your theme's <code>functions.php</code> file.</p>
+        <p>To customise the order of the fields in the review submission form, use the <code><a href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!hooks' ); ?>" data-expand="#hooks-01">site-reviews/submission-form/order</a></code> filter hook in your theme's <code>functions.php</code> file.</p>
         <pre><code class="php">/**
  * Customises the order of the fields used in the Site Reviews submission form.
  * Paste this in your active theme's functions.php file.
@@ -171,7 +171,7 @@ 
         'terms',
     ];
 });</code></pre>
-        <p>If you have used the example above and the submission-form fields are not working correctly, check the <code><a href="<?= admin_url('edit.php?post_type=site-review&page=tools#!console'); ?>">Tools &rarr; Console</a></code> for errors.</p>
+        <p>If you have used the example above and the submission-form fields are not working correctly, check the <code><a href="<?= admin_url( 'edit.php?post_type=site-review&page=tools#!console' ); ?>">Tools &rarr; Console</a></code> for errors.</p>
     </div>
 </div>
 
@@ -179,7 +179,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I change the pagination query string?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -201,12 +201,12 @@ 
     <div class="glsr-card-header">
         <h3>How do I change the text of...?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
     <div class="inside">
-        <p>You can change any text in the plugin on the <code><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!translations'); ?>">Settings &rarr; Translations</a></code> page.</p>
+        <p>You can change any text in the plugin on the <code><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!translations' ); ?>">Settings &rarr; Translations</a></code> page.</p>
     </div>
 </div>
 
@@ -214,12 +214,12 @@ 
     <div class="glsr-card-header">
         <h3>How do I create a review programmatically?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
     <div class="inside">
-        <p>Site Reviews provides a <code><a href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!functions'); ?>" data-expand="#functions-02">glsr_create_review()</a></code> helper function to easily create a review.</p>
+        <p>Site Reviews provides a <code><a href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!functions' ); ?>" data-expand="#functions-02">glsr_create_review()</a></code> helper function to easily create a review.</p>
         <p>Here is an example:</p>
         <pre><code class="php">if (function_exists('glsr_create_review')) {
     $review = glsr_create_review([
@@ -239,12 +239,12 @@ 
     <div class="glsr-card-header">
         <h3>How do I customise the stars?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
     <div class="inside">
-        <p>To customise the star images used by the plugin, use the <code><a href="<?= admin_url('edit.php?post_type=site-review&page=documentation#!hooks'); ?>" data-expand="#hooks-02">site-reviews/config/inline-styles</a></code> filter hook in your theme's <code>functions.php</code> file.</p>
+        <p>To customise the star images used by the plugin, use the <code><a href="<?= admin_url( 'edit.php?post_type=site-review&page=documentation#!hooks' ); ?>" data-expand="#hooks-02">site-reviews/config/inline-styles</a></code> filter hook in your theme's <code>functions.php</code> file.</p>
         <p>Here is an example:</p>
         <pre><code class="php">/**
  * Customises the stars used by Site Reviews.
@@ -266,7 +266,7 @@ 
             <li>Open the SVG images that you copied with a text editor</li>
             <li>Change the <a target="_blank" href="https://www.hexcolortool.com">hex colour code</a> to the one you want</li>
             <li>Install and activate the <a target="_blank" href="https://wordpress.org/plugins/safe-svg/">Safe SVG</a> plugin</li>
-            <li>Upload the edited SVG images to your <a href="<?= admin_url('upload.php'); ?>">Media Library</a></li>
+            <li>Upload the edited SVG images to your <a href="<?= admin_url( 'upload.php' ); ?>">Media Library</a></li>
             <li>Copy the File URL of the uploaded SVG images and paste them into the snippet above</li>
         </ol>
     </div>
@@ -276,7 +276,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I hide the form after a review is submitted?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -298,7 +298,7 @@ 
     });";
 });</code></pre>
         <p>You can also hide the form from registered users who have already submitted a review.</p>
-        <p>To do this, you will need to first make sure that the "Limit Reviews" setting on the <code><a href="<?= admin_url('edit.php?post_type=site-review&page=settings#!submissions'); ?>">Settings &rarr; Submissions</a></code> page is set to "By Username". Once that is done, you can use the following code snippet:</p>
+        <p>To do this, you will need to first make sure that the "Limit Reviews" setting on the <code><a href="<?= admin_url( 'edit.php?post_type=site-review&page=settings#!submissions' ); ?>">Settings &rarr; Submissions</a></code> page is set to "By Username". Once that is done, you can use the following code snippet:</p>
         <pre><code class="php">/**
  * Hides the submission form from registered users who have already submitted a review
  * Paste this in your active theme's functions.php file
@@ -319,7 +319,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I limit the submitted review length?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -357,7 +357,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I order pages with assigned reviews by rating or ranking?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -413,7 +413,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I redirect to a custom URL after a form is submitted?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -426,7 +426,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I remove the dash in front of the author's name?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -442,7 +442,7 @@ 
     <div class="glsr-card-header">
         <h3>How do I use the plugin templates in my theme?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>
@@ -460,7 +460,7 @@ 
     <div class="glsr-card-header">
         <h3>Why are the IP Addresses being detected as 127.0.0.1?</h3>
         <button type="button" class="handlediv" aria-expanded="true">
-            <span class="screen-reader-text"><?= __('Toggle documentation panel', 'site-reviews'); ?></span>
+            <span class="screen-reader-text"><?= __( 'Toggle documentation panel', 'site-reviews' ); ?></span>
             <span class="toggle-indicator" aria-hidden="true"></span>
         </button>
     </div>

views/pages/documentation/index.php

Spacing +7 added lines, -7 removed lines

@@ -1,20 +1,20 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div class="wrap">
     <h1 class="wp-heading-inline">
-        <?= esc_html(get_admin_page_title()); ?>
-        <a href="<?= admin_url('edit.php?post_type=site-review&page=welcome'); ?>" class="page-title-action"><?= __('About', 'site-reviews'); ?></a>
+        <?= esc_html( get_admin_page_title() ); ?>
+        <a href="<?= admin_url( 'edit.php?post_type=site-review&page=welcome' ); ?>" class="page-title-action"><?= __( 'About', 'site-reviews' ); ?></a>
     </h1>
     <?= $notices; ?>
-    <p><?= __('Click an active tab to expand/collapse all sections.', 'site-reviews'); ?></p>
+    <p><?= __( 'Click an active tab to expand/collapse all sections.', 'site-reviews' ); ?></p>
     <h2 class="glsr-nav-tab-wrapper nav-tab-wrapper">
-        <?php foreach ($tabs as $id => $title) : ?>
+        <?php foreach( $tabs as $id => $title ) : ?>
         <a class="glsr-nav-tab nav-tab" href="#<?= $id; ?>"><?= $title; ?></a>
         <?php endforeach; ?>
     </h2>
-    <?php foreach ($tabs as $id => $title) : ?>
+    <?php foreach( $tabs as $id => $title ) : ?>
     <div class="glsr-nav-view ui-tabs-hide" id="<?= $id; ?>">
-        <?php glsr()->render('pages/documentation/'.$id, $data); ?>
+        <?php glsr()->render( 'pages/documentation/'.$id, $data ); ?>
     </div>
     <?php endforeach; ?>
     <input type="hidden" name="_active_tab">

plugin/Helpers/Arr.php

Spacing +54 added lines, -54 removed lines

@@ -7,10 +7,10 @@ 
     /**
      * @return bool
      */
-    public static function compareArrays(array $arr1, array $arr2)
+    public static function compareArrays( array $arr1, array $arr2 )
     {
-        sort($arr1);
-        sort($arr2);
+        sort( $arr1 );
+        sort( $arr2 );
         return $arr1 == $arr2;
     }
 
@@ -18,21 +18,21 @@ 
      * @param mixed $array
      * @return array
      */
-    public static function consolidateArray($array)
+    public static function consolidateArray( $array )
     {
-        return is_array($array) || is_object($array)
-            ? (array) $array
+        return is_array( $array ) || is_object( $array )
+            ? (array)$array
             : [];
     }
 
     /**
      * @return array
      */
-    public static function convertDotNotationArray(array $array)
+    public static function convertDotNotationArray( array $array )
     {
         $results = [];
-        foreach ($array as $path => $value) {
-            $results = static::set($results, $path, $value);
+        foreach( $array as $path => $value ) {
+            $results = static::set( $results, $path, $value );
         }
         return $results;
     }
@@ -42,12 +42,12 @@ 
      * @param mixed $callback
      * @return array
      */
-    public static function convertStringToArray($string, $callback = null)
+    public static function convertStringToArray( $string, $callback = null )
     {
-        $array = array_map('trim', explode(',', $string));
+        $array = array_map( 'trim', explode( ',', $string ) );
         return $callback
-            ? array_filter($array, $callback)
-            : array_filter($array);
+            ? array_filter( $array, $callback )
+            : array_filter( $array );
     }
 
     /**
@@ -55,17 +55,17 @@ 
      * @param string $prefix
      * @return array
      */
-    public static function flattenArray(array $array, $flattenValue = false, $prefix = '')
+    public static function flattenArray( array $array, $flattenValue = false, $prefix = '' )
     {
         $result = [];
-        foreach ($array as $key => $value) {
-            $newKey = ltrim($prefix.'.'.$key, '.');
-            if (static::isIndexedFlatArray($value)) {
-                if ($flattenValue) {
-                    $value = '['.implode(', ', $value).']';
+        foreach( $array as $key => $value ) {
+            $newKey = ltrim( $prefix.'.'.$key, '.' );
+            if( static::isIndexedFlatArray( $value ) ) {
+                if( $flattenValue ) {
+                    $value = '['.implode( ', ', $value ).']';
                 }
-            } elseif (is_array($value)) {
-                $result = array_merge($result, static::flattenArray($value, $flattenValue, $newKey));
+            } elseif( is_array( $value ) ) {
+                $result = array_merge( $result, static::flattenArray( $value, $flattenValue, $newKey ) );
                 continue;
             }
             $result[$newKey] = $value;
@@ -80,12 +80,12 @@ 
      * @param mixed $fallback
      * @return mixed
      */
-    public static function get($data, $path = '', $fallback = '')
+    public static function get( $data, $path = '', $fallback = '' )
     {
-        $data = static::consolidateArray($data);
-        $keys = explode('.', $path);
-        foreach ($keys as $key) {
-            if (!isset($data[$key])) {
+        $data = static::consolidateArray( $data );
+        $keys = explode( '.', $path );
+        foreach( $keys as $key ) {
+            if( !isset($data[$key]) ) {
                 return $fallback;
             }
             $data = $data[$key];
@@ -98,47 +98,47 @@ 
      * @param string $position
      * @return array
      */
-    public static function insertInArray(array $array, array $insert, $key, $position = 'before')
+    public static function insertInArray( array $array, array $insert, $key, $position = 'before' )
     {
-        $keyPosition = intval(array_search($key, array_keys($array)));
-        if ('after' == $position) {
+        $keyPosition = intval( array_search( $key, array_keys( $array ) ) );
+        if( 'after' == $position ) {
             ++$keyPosition;
         }
-        if (false !== $keyPosition) {
-            $result = array_slice($array, 0, $keyPosition);
-            $result = array_merge($result, $insert);
-            return array_merge($result, array_slice($array, $keyPosition));
+        if( false !== $keyPosition ) {
+            $result = array_slice( $array, 0, $keyPosition );
+            $result = array_merge( $result, $insert );
+            return array_merge( $result, array_slice( $array, $keyPosition ) );
         }
-        return array_merge($array, $insert);
+        return array_merge( $array, $insert );
     }
 
     /**
      * @param mixed $array
      * @return bool
      */
-    public static function isIndexedFlatArray($array)
+    public static function isIndexedFlatArray( $array )
     {
-        if (!is_array($array) || array_filter($array, 'is_array')) {
+        if( !is_array( $array ) || array_filter( $array, 'is_array' ) ) {
             return false;
         }
-        return wp_is_numeric_array($array);
+        return wp_is_numeric_array( $array );
     }
 
     /**
      * @param bool $prefixed
      * @return array
      */
-    public static function prefixArrayKeys(array $values, $prefixed = true)
+    public static function prefixArrayKeys( array $values, $prefixed = true )
     {
         $trim = '_';
         $prefix = $prefixed
             ? $trim
             : '';
         $prefixed = [];
-        foreach ($values as $key => $value) {
-            $key = trim($key);
-            if (0 === strpos($key, $trim)) {
-                $key = substr($key, strlen($trim));
+        foreach( $values as $key => $value ) {
+            $key = trim( $key );
+            if( 0 === strpos( $key, $trim ) ) {
+                $key = substr( $key, strlen( $trim ) );
             }
             $prefixed[$prefix.$key] = $value;
         }
@@ -148,15 +148,15 @@ 
     /**
      * @return array
      */
-    public static function removeEmptyArrayValues(array $array)
+    public static function removeEmptyArrayValues( array $array )
     {
         $result = [];
-        foreach ($array as $key => $value) {
-            if (!$value) {
+        foreach( $array as $key => $value ) {
+            if( !$value ) {
                 continue;
             }
-            $result[$key] = is_array($value)
-                ? static::removeEmptyArrayValues($value)
+            $result[$key] = is_array( $value )
+                ? static::removeEmptyArrayValues( $value )
                 : $value;
         }
         return $result;
@@ -169,14 +169,14 @@ 
      * @param mixed $value
      * @return array
      */
-    public static function set(array $data, $path, $value)
+    public static function set( array $data, $path, $value )
     {
-        $token = strtok($path, '.');
+        $token = strtok( $path, '.' );
         $ref = &$data;
-        while (false !== $token) {
-            $ref = static::consolidateArray($ref);
+        while( false !== $token ) {
+            $ref = static::consolidateArray( $ref );
             $ref = &$ref[$token];
-            $token = strtok('.');
+            $token = strtok( '.' );
         }
         $ref = $value;
         return $data;
@@ -185,8 +185,8 @@ 
     /**
      * @return array
      */
-    public static function unprefixArrayKeys(array $values)
+    public static function unprefixArrayKeys( array $values )
     {
-        return static::prefixArrayKeys($values, false);
+        return static::prefixArrayKeys( $values, false );
     }
 }

Braces +2 added lines, -1 removed lines

@@ -64,7 +64,8 @@
                 if ($flattenValue) {
                     $value = '['.implode(', ', $value).']';
                 }
-            } elseif (is_array($value)) {
+            }
+            elseif (is_array($value)) {
                 $result = array_merge($result, static::flattenArray($value, $flattenValue, $newKey));
                 continue;
             }

Indentation +173 added lines, -173 removed lines

@@ -4,189 +4,189 @@
 
 class Arr
 {
-    /**
-     * @return bool
-     */
-    public static function compareArrays(array $arr1, array $arr2)
-    {
-        sort($arr1);
-        sort($arr2);
-        return $arr1 == $arr2;
-    }
+	/**
+	 * @return bool
+	 */
+	public static function compareArrays(array $arr1, array $arr2)
+	{
+		sort($arr1);
+		sort($arr2);
+		return $arr1 == $arr2;
+	}
 
-    /**
-     * @param mixed $array
-     * @return array
-     */
-    public static function consolidateArray($array)
-    {
-        return is_array($array) || is_object($array)
-            ? (array) $array
-            : [];
-    }
+	/**
+	 * @param mixed $array
+	 * @return array
+	 */
+	public static function consolidateArray($array)
+	{
+		return is_array($array) || is_object($array)
+			? (array) $array
+			: [];
+	}
 
-    /**
-     * @return array
-     */
-    public static function convertDotNotationArray(array $array)
-    {
-        $results = [];
-        foreach ($array as $path => $value) {
-            $results = static::set($results, $path, $value);
-        }
-        return $results;
-    }
+	/**
+	 * @return array
+	 */
+	public static function convertDotNotationArray(array $array)
+	{
+		$results = [];
+		foreach ($array as $path => $value) {
+			$results = static::set($results, $path, $value);
+		}
+		return $results;
+	}
 
-    /**
-     * @param string $string
-     * @param mixed $callback
-     * @return array
-     */
-    public static function convertStringToArray($string, $callback = null)
-    {
-        $array = array_map('trim', explode(',', $string));
-        return $callback
-            ? array_filter($array, $callback)
-            : array_filter($array);
-    }
+	/**
+	 * @param string $string
+	 * @param mixed $callback
+	 * @return array
+	 */
+	public static function convertStringToArray($string, $callback = null)
+	{
+		$array = array_map('trim', explode(',', $string));
+		return $callback
+			? array_filter($array, $callback)
+			: array_filter($array);
+	}
 
-    /**
-     * @param bool $flattenValue
-     * @param string $prefix
-     * @return array
-     */
-    public static function flattenArray(array $array, $flattenValue = false, $prefix = '')
-    {
-        $result = [];
-        foreach ($array as $key => $value) {
-            $newKey = ltrim($prefix.'.'.$key, '.');
-            if (static::isIndexedFlatArray($value)) {
-                if ($flattenValue) {
-                    $value = '['.implode(', ', $value).']';
-                }
-            } elseif (is_array($value)) {
-                $result = array_merge($result, static::flattenArray($value, $flattenValue, $newKey));
-                continue;
-            }
-            $result[$newKey] = $value;
-        }
-        return $result;
-    }
+	/**
+	 * @param bool $flattenValue
+	 * @param string $prefix
+	 * @return array
+	 */
+	public static function flattenArray(array $array, $flattenValue = false, $prefix = '')
+	{
+		$result = [];
+		foreach ($array as $key => $value) {
+			$newKey = ltrim($prefix.'.'.$key, '.');
+			if (static::isIndexedFlatArray($value)) {
+				if ($flattenValue) {
+					$value = '['.implode(', ', $value).']';
+				}
+			} elseif (is_array($value)) {
+				$result = array_merge($result, static::flattenArray($value, $flattenValue, $newKey));
+				continue;
+			}
+			$result[$newKey] = $value;
+		}
+		return $result;
+	}
 
-    /**
-     * Get a value from an array of values using a dot-notation path as reference.
-     * @param mixed $data
-     * @param string $path
-     * @param mixed $fallback
-     * @return mixed
-     */
-    public static function get($data, $path = '', $fallback = '')
-    {
-        $data = static::consolidateArray($data);
-        $keys = explode('.', $path);
-        foreach ($keys as $key) {
-            if (!isset($data[$key])) {
-                return $fallback;
-            }
-            $data = $data[$key];
-        }
-        return $data;
-    }
+	/**
+	 * Get a value from an array of values using a dot-notation path as reference.
+	 * @param mixed $data
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @return mixed
+	 */
+	public static function get($data, $path = '', $fallback = '')
+	{
+		$data = static::consolidateArray($data);
+		$keys = explode('.', $path);
+		foreach ($keys as $key) {
+			if (!isset($data[$key])) {
+				return $fallback;
+			}
+			$data = $data[$key];
+		}
+		return $data;
+	}
 
-    /**
-     * @param string $key
-     * @param string $position
-     * @return array
-     */
-    public static function insertInArray(array $array, array $insert, $key, $position = 'before')
-    {
-        $keyPosition = intval(array_search($key, array_keys($array)));
-        if ('after' == $position) {
-            ++$keyPosition;
-        }
-        if (false !== $keyPosition) {
-            $result = array_slice($array, 0, $keyPosition);
-            $result = array_merge($result, $insert);
-            return array_merge($result, array_slice($array, $keyPosition));
-        }
-        return array_merge($array, $insert);
-    }
+	/**
+	 * @param string $key
+	 * @param string $position
+	 * @return array
+	 */
+	public static function insertInArray(array $array, array $insert, $key, $position = 'before')
+	{
+		$keyPosition = intval(array_search($key, array_keys($array)));
+		if ('after' == $position) {
+			++$keyPosition;
+		}
+		if (false !== $keyPosition) {
+			$result = array_slice($array, 0, $keyPosition);
+			$result = array_merge($result, $insert);
+			return array_merge($result, array_slice($array, $keyPosition));
+		}
+		return array_merge($array, $insert);
+	}
 
-    /**
-     * @param mixed $array
-     * @return bool
-     */
-    public static function isIndexedFlatArray($array)
-    {
-        if (!is_array($array) || array_filter($array, 'is_array')) {
-            return false;
-        }
-        return wp_is_numeric_array($array);
-    }
+	/**
+	 * @param mixed $array
+	 * @return bool
+	 */
+	public static function isIndexedFlatArray($array)
+	{
+		if (!is_array($array) || array_filter($array, 'is_array')) {
+			return false;
+		}
+		return wp_is_numeric_array($array);
+	}
 
-    /**
-     * @param bool $prefixed
-     * @return array
-     */
-    public static function prefixArrayKeys(array $values, $prefixed = true)
-    {
-        $trim = '_';
-        $prefix = $prefixed
-            ? $trim
-            : '';
-        $prefixed = [];
-        foreach ($values as $key => $value) {
-            $key = trim($key);
-            if (0 === strpos($key, $trim)) {
-                $key = substr($key, strlen($trim));
-            }
-            $prefixed[$prefix.$key] = $value;
-        }
-        return $prefixed;
-    }
+	/**
+	 * @param bool $prefixed
+	 * @return array
+	 */
+	public static function prefixArrayKeys(array $values, $prefixed = true)
+	{
+		$trim = '_';
+		$prefix = $prefixed
+			? $trim
+			: '';
+		$prefixed = [];
+		foreach ($values as $key => $value) {
+			$key = trim($key);
+			if (0 === strpos($key, $trim)) {
+				$key = substr($key, strlen($trim));
+			}
+			$prefixed[$prefix.$key] = $value;
+		}
+		return $prefixed;
+	}
 
-    /**
-     * @return array
-     */
-    public static function removeEmptyArrayValues(array $array)
-    {
-        $result = [];
-        foreach ($array as $key => $value) {
-            if (!$value) {
-                continue;
-            }
-            $result[$key] = is_array($value)
-                ? static::removeEmptyArrayValues($value)
-                : $value;
-        }
-        return $result;
-    }
+	/**
+	 * @return array
+	 */
+	public static function removeEmptyArrayValues(array $array)
+	{
+		$result = [];
+		foreach ($array as $key => $value) {
+			if (!$value) {
+				continue;
+			}
+			$result[$key] = is_array($value)
+				? static::removeEmptyArrayValues($value)
+				: $value;
+		}
+		return $result;
+	}
 
 
-    /**
-     * Set a value to an array of values using a dot-notation path as reference.
-     * @param string $path
-     * @param mixed $value
-     * @return array
-     */
-    public static function set(array $data, $path, $value)
-    {
-        $token = strtok($path, '.');
-        $ref = &$data;
-        while (false !== $token) {
-            $ref = static::consolidateArray($ref);
-            $ref = &$ref[$token];
-            $token = strtok('.');
-        }
-        $ref = $value;
-        return $data;
-    }
+	/**
+	 * Set a value to an array of values using a dot-notation path as reference.
+	 * @param string $path
+	 * @param mixed $value
+	 * @return array
+	 */
+	public static function set(array $data, $path, $value)
+	{
+		$token = strtok($path, '.');
+		$ref = &$data;
+		while (false !== $token) {
+			$ref = static::consolidateArray($ref);
+			$ref = &$ref[$token];
+			$token = strtok('.');
+		}
+		$ref = $value;
+		return $data;
+	}
 
-    /**
-     * @return array
-     */
-    public static function unprefixArrayKeys(array $values)
-    {
-        return static::prefixArrayKeys($values, false);
-    }
+	/**
+	 * @return array
+	 */
+	public static function unprefixArrayKeys(array $values)
+	{
+		return static::prefixArrayKeys($values, false);
+	}
 }

plugin/Modules/Html/Field.php

Indentation +237 added lines, -237 removed lines

@@ -9,241 +9,241 @@
 
 class Field
 {
-    /**
-     * @var array
-     */
-    public $field;
-
-    public function __construct(array $field = [])
-    {
-        $this->field = wp_parse_args($field, [
-            'errors' => false,
-            'is_hidden' => false,
-            'is_multi' => false,
-            'is_public' => false,
-            'is_raw' => false,
-            'is_setting' => false,
-            'is_valid' => true,
-            'is_widget' => false,
-            'path' => '',
-        ]);
-        $this->normalize();
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->build();
-    }
-
-    /**
-     * @return void|string
-     */
-    public function build()
-    {
-        if (!$this->field['is_valid']) {
-            return;
-        }
-        if ($this->field['is_raw']) {
-            return glsr(Builder::class)->{$this->field['type']}($this->field);
-        }
-        if (!$this->field['is_setting']) {
-            return $this->buildField();
-        }
-        if (!$this->field['is_multi']) {
-            return $this->buildSettingField();
-        }
-        return $this->buildSettingMultiField();
-    }
-
-    /**
-     * @return void
-     */
-    public function render()
-    {
-        echo $this->build();
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildField()
-    {
-        $field = glsr(Template::class)->build('templates/form/field_'.$this->field['type'], [
-            'context' => [
-                'class' => $this->getFieldClass(),
-                'errors' => $this->getFieldErrors(),
-                'field' => glsr(Builder::class)->raw($this->field),
-                'label' => glsr(Builder::class)->label([
-                    'class' => 'glsr-'.$this->field['type'].'-label',
-                    'for' => $this->field['id'],
-                    'is_public' => $this->field['is_public'],
-                    'text' => $this->field['label'].'<span></span>',
-                    'type' => $this->field['type'],
-                ]),
-            ],
-            'field' => $this->field,
-        ]);
-        return apply_filters('site-reviews/rendered/field', $field, $this->field['type'], $this->field);
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildSettingField()
-    {
-        return glsr(Template::class)->build('partials/form/table-row', [
-            'context' => [
-                'class' => $this->getFieldClass(),
-                'field' => glsr(Builder::class)->{$this->field['type']}($this->field),
-                'label' => glsr(Builder::class)->label($this->field['legend'], ['for' => $this->field['id']]),
-            ],
-            'field' => $this->field,
-        ]);
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildSettingMultiField()
-    {
-        $dependsOn = $this->getFieldDependsOn();
-        unset($this->field['data-depends']);
-        return glsr(Template::class)->build('partials/form/table-row-multiple', [
-            'context' => [
-                'class' => $this->getFieldClass(),
-                'depends_on' => $dependsOn,
-                'field' => glsr(Builder::class)->{$this->field['type']}($this->field),
-                'label' => glsr(Builder::class)->label($this->field['legend'], ['for' => $this->field['id']]),
-                'legend' => $this->field['legend'],
-            ],
-            'field' => $this->field,
-        ]);
-    }
-
-    /**
-     * @return string
-     */
-    protected function getFieldClass()
-    {
-        $classes = [];
-        if (!empty($this->field['errors'])) {
-            $classes[] = 'glsr-has-error';
-        }
-        if ($this->field['is_hidden']) {
-            $classes[] = 'hidden';
-        }
-        if (!empty($this->field['required'])) {
-            $classes[] = 'glsr-required';
-        }
-        $classes = apply_filters('site-reviews/rendered/field/classes', $classes, $this->field);
-        return implode(' ', $classes);
-    }
-
-    /**
-     * @return string
-     */
-    protected function getFieldDependsOn()
-    {
-        return !empty($this->field['data-depends'])
-            ? $this->field['data-depends']
-            : '';
-    }
-
-    /**
-     * @return void|string
-     */
-    protected function getFieldErrors()
-    {
-        if (empty($this->field['errors']) || !is_array($this->field['errors'])) {
-            return;
-        }
-        $errors = array_reduce($this->field['errors'], function ($carry, $error) {
-            return $carry.glsr(Builder::class)->span($error, ['class' => 'glsr-field-error']);
-        });
-        return glsr(Template::class)->build('templates/form/field-errors', [
-            'context' => [
-                'errors' => $errors,
-            ],
-            'field' => $this->field,
-        ]);
-    }
-
-    /**
-     * @return string
-     */
-    protected function getFieldPrefix()
-    {
-        return $this->field['is_setting']
-            ? OptionManager::databaseKey()
-            : Application::ID;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isFieldValid()
-    {
-        $missingValues = [];
-        $requiredValues = [
-            'name', 'type',
-        ];
-        foreach ($requiredValues as $value) {
-            if (isset($this->field[$value])) {
-                continue;
-            }
-            $missingValues[] = $value;
-            $this->field['is_valid'] = false;
-        }
-        if (!empty($missingValues)) {
-            glsr_log()
-                ->warning('Field is missing: '.implode(', ', $missingValues))
-                ->debug($this->field);
-        }
-        return $this->field['is_valid'];
-    }
-
-    /**
-     * @return void
-     */
-    protected function normalize()
-    {
-        if (!$this->isFieldValid()) {
-            return;
-        }
-        $this->field['path'] = $this->field['name'];
-        $className = Helper::buildClassName($this->field['type'], __NAMESPACE__.'\Fields');
-        if (class_exists($className)) {
-            $this->field = $className::merge($this->field);
-        }
-        $this->normalizeFieldId();
-        $this->normalizeFieldName();
-    }
-
-    /**
-     * @return void
-     */
-    protected function normalizeFieldId()
-    {
-        if (isset($this->field['id']) || $this->field['is_raw']) {
-            return;
-        }
-        $this->field['id'] = Str::convertPathToId(
-            $this->field['path'],
-            $this->getFieldPrefix()
-        );
-    }
-
-    /**
-     * @return void
-     */
-    protected function normalizeFieldName()
-    {
-        $this->field['name'] = Str::convertPathToName(
-            $this->field['path'],
-            $this->getFieldPrefix()
-        );
-    }
+	/**
+	 * @var array
+	 */
+	public $field;
+
+	public function __construct(array $field = [])
+	{
+		$this->field = wp_parse_args($field, [
+			'errors' => false,
+			'is_hidden' => false,
+			'is_multi' => false,
+			'is_public' => false,
+			'is_raw' => false,
+			'is_setting' => false,
+			'is_valid' => true,
+			'is_widget' => false,
+			'path' => '',
+		]);
+		$this->normalize();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return (string) $this->build();
+	}
+
+	/**
+	 * @return void|string
+	 */
+	public function build()
+	{
+		if (!$this->field['is_valid']) {
+			return;
+		}
+		if ($this->field['is_raw']) {
+			return glsr(Builder::class)->{$this->field['type']}($this->field);
+		}
+		if (!$this->field['is_setting']) {
+			return $this->buildField();
+		}
+		if (!$this->field['is_multi']) {
+			return $this->buildSettingField();
+		}
+		return $this->buildSettingMultiField();
+	}
+
+	/**
+	 * @return void
+	 */
+	public function render()
+	{
+		echo $this->build();
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildField()
+	{
+		$field = glsr(Template::class)->build('templates/form/field_'.$this->field['type'], [
+			'context' => [
+				'class' => $this->getFieldClass(),
+				'errors' => $this->getFieldErrors(),
+				'field' => glsr(Builder::class)->raw($this->field),
+				'label' => glsr(Builder::class)->label([
+					'class' => 'glsr-'.$this->field['type'].'-label',
+					'for' => $this->field['id'],
+					'is_public' => $this->field['is_public'],
+					'text' => $this->field['label'].'<span></span>',
+					'type' => $this->field['type'],
+				]),
+			],
+			'field' => $this->field,
+		]);
+		return apply_filters('site-reviews/rendered/field', $field, $this->field['type'], $this->field);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildSettingField()
+	{
+		return glsr(Template::class)->build('partials/form/table-row', [
+			'context' => [
+				'class' => $this->getFieldClass(),
+				'field' => glsr(Builder::class)->{$this->field['type']}($this->field),
+				'label' => glsr(Builder::class)->label($this->field['legend'], ['for' => $this->field['id']]),
+			],
+			'field' => $this->field,
+		]);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildSettingMultiField()
+	{
+		$dependsOn = $this->getFieldDependsOn();
+		unset($this->field['data-depends']);
+		return glsr(Template::class)->build('partials/form/table-row-multiple', [
+			'context' => [
+				'class' => $this->getFieldClass(),
+				'depends_on' => $dependsOn,
+				'field' => glsr(Builder::class)->{$this->field['type']}($this->field),
+				'label' => glsr(Builder::class)->label($this->field['legend'], ['for' => $this->field['id']]),
+				'legend' => $this->field['legend'],
+			],
+			'field' => $this->field,
+		]);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getFieldClass()
+	{
+		$classes = [];
+		if (!empty($this->field['errors'])) {
+			$classes[] = 'glsr-has-error';
+		}
+		if ($this->field['is_hidden']) {
+			$classes[] = 'hidden';
+		}
+		if (!empty($this->field['required'])) {
+			$classes[] = 'glsr-required';
+		}
+		$classes = apply_filters('site-reviews/rendered/field/classes', $classes, $this->field);
+		return implode(' ', $classes);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getFieldDependsOn()
+	{
+		return !empty($this->field['data-depends'])
+			? $this->field['data-depends']
+			: '';
+	}
+
+	/**
+	 * @return void|string
+	 */
+	protected function getFieldErrors()
+	{
+		if (empty($this->field['errors']) || !is_array($this->field['errors'])) {
+			return;
+		}
+		$errors = array_reduce($this->field['errors'], function ($carry, $error) {
+			return $carry.glsr(Builder::class)->span($error, ['class' => 'glsr-field-error']);
+		});
+		return glsr(Template::class)->build('templates/form/field-errors', [
+			'context' => [
+				'errors' => $errors,
+			],
+			'field' => $this->field,
+		]);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getFieldPrefix()
+	{
+		return $this->field['is_setting']
+			? OptionManager::databaseKey()
+			: Application::ID;
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isFieldValid()
+	{
+		$missingValues = [];
+		$requiredValues = [
+			'name', 'type',
+		];
+		foreach ($requiredValues as $value) {
+			if (isset($this->field[$value])) {
+				continue;
+			}
+			$missingValues[] = $value;
+			$this->field['is_valid'] = false;
+		}
+		if (!empty($missingValues)) {
+			glsr_log()
+				->warning('Field is missing: '.implode(', ', $missingValues))
+				->debug($this->field);
+		}
+		return $this->field['is_valid'];
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function normalize()
+	{
+		if (!$this->isFieldValid()) {
+			return;
+		}
+		$this->field['path'] = $this->field['name'];
+		$className = Helper::buildClassName($this->field['type'], __NAMESPACE__.'\Fields');
+		if (class_exists($className)) {
+			$this->field = $className::merge($this->field);
+		}
+		$this->normalizeFieldId();
+		$this->normalizeFieldName();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldId()
+	{
+		if (isset($this->field['id']) || $this->field['is_raw']) {
+			return;
+		}
+		$this->field['id'] = Str::convertPathToId(
+			$this->field['path'],
+			$this->getFieldPrefix()
+		);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldName()
+	{
+		$this->field['name'] = Str::convertPathToName(
+			$this->field['path'],
+			$this->getFieldPrefix()
+		);
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -14,9 +14,9 @@ 
      */
     public $field;
 
-    public function __construct(array $field = [])
+    public function __construct( array $field = [] )
     {
-        $this->field = wp_parse_args($field, [
+        $this->field = wp_parse_args( $field, [
             'errors' => false,
             'is_hidden' => false,
             'is_multi' => false,
@@ -26,7 +26,7 @@ 
             'is_valid' => true,
             'is_widget' => false,
             'path' => '',
-        ]);
+        ] );
         $this->normalize();
     }
 
@@ -35,7 +35,7 @@ 
      */
     public function __toString()
     {
-        return (string) $this->build();
+        return (string)$this->build();
     }
 
     /**
@@ -43,16 +43,16 @@ 
      */
     public function build()
     {
-        if (!$this->field['is_valid']) {
+        if( !$this->field['is_valid'] ) {
             return;
         }
-        if ($this->field['is_raw']) {
-            return glsr(Builder::class)->{$this->field['type']}($this->field);
+        if( $this->field['is_raw'] ) {
+            return glsr( Builder::class )->{$this->field['type']}($this->field);
         }
-        if (!$this->field['is_setting']) {
+        if( !$this->field['is_setting'] ) {
             return $this->buildField();
         }
-        if (!$this->field['is_multi']) {
+        if( !$this->field['is_multi'] ) {
             return $this->buildSettingField();
         }
         return $this->buildSettingMultiField();
@@ -71,22 +71,22 @@ 
      */
     protected function buildField()
     {
-        $field = glsr(Template::class)->build('templates/form/field_'.$this->field['type'], [
+        $field = glsr( Template::class )->build( 'templates/form/field_'.$this->field['type'], [
             'context' => [
                 'class' => $this->getFieldClass(),
                 'errors' => $this->getFieldErrors(),
-                'field' => glsr(Builder::class)->raw($this->field),
-                'label' => glsr(Builder::class)->label([
+                'field' => glsr( Builder::class )->raw( $this->field ),
+                'label' => glsr( Builder::class )->label( [
                     'class' => 'glsr-'.$this->field['type'].'-label',
                     'for' => $this->field['id'],
                     'is_public' => $this->field['is_public'],
                     'text' => $this->field['label'].'<span></span>',
                     'type' => $this->field['type'],
-                ]),
+                ] ),
             ],
             'field' => $this->field,
-        ]);
-        return apply_filters('site-reviews/rendered/field', $field, $this->field['type'], $this->field);
+        ] );
+        return apply_filters( 'site-reviews/rendered/field', $field, $this->field['type'], $this->field );
     }
 
     /**
@@ -94,14 +94,14 @@ 
      */
     protected function buildSettingField()
     {
-        return glsr(Template::class)->build('partials/form/table-row', [
+        return glsr( Template::class )->build( 'partials/form/table-row', [
             'context' => [
                 'class' => $this->getFieldClass(),
-                'field' => glsr(Builder::class)->{$this->field['type']}($this->field),
-                'label' => glsr(Builder::class)->label($this->field['legend'], ['for' => $this->field['id']]),
+                'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
+                'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ),
             ],
             'field' => $this->field,
-        ]);
+        ] );
     }
 
     /**
@@ -111,16 +111,16 @@ 
     {
         $dependsOn = $this->getFieldDependsOn();
         unset($this->field['data-depends']);
-        return glsr(Template::class)->build('partials/form/table-row-multiple', [
+        return glsr( Template::class )->build( 'partials/form/table-row-multiple', [
             'context' => [
                 'class' => $this->getFieldClass(),
                 'depends_on' => $dependsOn,
-                'field' => glsr(Builder::class)->{$this->field['type']}($this->field),
-                'label' => glsr(Builder::class)->label($this->field['legend'], ['for' => $this->field['id']]),
+                'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
+                'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ),
                 'legend' => $this->field['legend'],
             ],
             'field' => $this->field,
-        ]);
+        ] );
     }
 
     /**
@@ -129,17 +129,17 @@ 
     protected function getFieldClass()
     {
         $classes = [];
-        if (!empty($this->field['errors'])) {
+        if( !empty($this->field['errors']) ) {
             $classes[] = 'glsr-has-error';
         }
-        if ($this->field['is_hidden']) {
+        if( $this->field['is_hidden'] ) {
             $classes[] = 'hidden';
         }
-        if (!empty($this->field['required'])) {
+        if( !empty($this->field['required']) ) {
             $classes[] = 'glsr-required';
         }
-        $classes = apply_filters('site-reviews/rendered/field/classes', $classes, $this->field);
-        return implode(' ', $classes);
+        $classes = apply_filters( 'site-reviews/rendered/field/classes', $classes, $this->field );
+        return implode( ' ', $classes );
     }
 
     /**
@@ -157,18 +157,18 @@ 
      */
     protected function getFieldErrors()
     {
-        if (empty($this->field['errors']) || !is_array($this->field['errors'])) {
+        if( empty($this->field['errors']) || !is_array( $this->field['errors'] ) ) {
             return;
         }
-        $errors = array_reduce($this->field['errors'], function ($carry, $error) {
-            return $carry.glsr(Builder::class)->span($error, ['class' => 'glsr-field-error']);
+        $errors = array_reduce( $this->field['errors'], function( $carry, $error ) {
+            return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] );
         });
-        return glsr(Template::class)->build('templates/form/field-errors', [
+        return glsr( Template::class )->build( 'templates/form/field-errors', [
             'context' => [
                 'errors' => $errors,
             ],
             'field' => $this->field,
-        ]);
+        ] );
     }
 
     /**
@@ -190,17 +190,17 @@ 
         $requiredValues = [
             'name', 'type',
         ];
-        foreach ($requiredValues as $value) {
-            if (isset($this->field[$value])) {
+        foreach( $requiredValues as $value ) {
+            if( isset($this->field[$value]) ) {
                 continue;
             }
             $missingValues[] = $value;
             $this->field['is_valid'] = false;
         }
-        if (!empty($missingValues)) {
+        if( !empty($missingValues) ) {
             glsr_log()
-                ->warning('Field is missing: '.implode(', ', $missingValues))
-                ->debug($this->field);
+                ->warning( 'Field is missing: '.implode( ', ', $missingValues ) )
+                ->debug( $this->field );
         }
         return $this->field['is_valid'];
     }
@@ -210,13 +210,13 @@ 
      */
     protected function normalize()
     {
-        if (!$this->isFieldValid()) {
+        if( !$this->isFieldValid() ) {
             return;
         }
         $this->field['path'] = $this->field['name'];
-        $className = Helper::buildClassName($this->field['type'], __NAMESPACE__.'\Fields');
-        if (class_exists($className)) {
-            $this->field = $className::merge($this->field);
+        $className = Helper::buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' );
+        if( class_exists( $className ) ) {
+            $this->field = $className::merge( $this->field );
         }
         $this->normalizeFieldId();
         $this->normalizeFieldName();
@@ -227,7 +227,7 @@ 
      */
     protected function normalizeFieldId()
     {
-        if (isset($this->field['id']) || $this->field['is_raw']) {
+        if( isset($this->field['id']) || $this->field['is_raw'] ) {
             return;
         }
         $this->field['id'] = Str::convertPathToId(