pryley / site-reviews

plugin/Database/CountsManager.php

Indentation +226 added lines, -226 removed lines

@@ -13,247 +13,247 @@
 
 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
-     */
-    public function buildCounts(array $args = [])
-    {
-        $counts = [
-            'local' => $this->generateEmptyCountsArray(),
-        ];
-        $query = $this->queryReviews($args);
-        while ($query) {
-            $counts = $this->populateCountsFromQuery($query, $counts);
-            $query = $query->has_more
-                ? $this->queryReviews($args, end($query->reviews)->ID)
-                : false;
-        }
-        return $counts;
-    }
+	/**
+	 * @return array
+	 */
+	public function buildCounts(array $args = [])
+	{
+		$counts = [
+			'local' => $this->generateEmptyCountsArray(),
+		];
+		$query = $this->queryReviews($args);
+		while ($query) {
+			$counts = $this->populateCountsFromQuery($query, $counts);
+			$query = $query->has_more
+				? $this->queryReviews($args, end($query->reviews)->ID)
+				: false;
+		}
+		return $counts;
+	}
 
-    /**
-     * @return void
-     */
-    public function decreaseAll(Review $review)
-    {
-        glsr(GlobalCountsManager::class)->decrease($review);
-        glsr(PostCountsManager::class)->decrease($review);
-        glsr(TermCountsManager::class)->decrease($review);
-    }
+	/**
+	 * @return void
+	 */
+	public function decreaseAll(Review $review)
+	{
+		glsr(GlobalCountsManager::class)->decrease($review);
+		glsr(PostCountsManager::class)->decrease($review);
+		glsr(TermCountsManager::class)->decrease($review);
+	}
 
-    /**
-     * @param string $type
-     * @param int $rating
-     * @return array
-     */
-    public 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
+	 */
+	public function decreaseRating(array $reviewCounts, $type, $rating)
+	{
+		if (isset($reviewCounts[$type][$rating])) {
+			$reviewCounts[$type][$rating] = max(0, $reviewCounts[$type][$rating] - 1);
+		}
+		return $reviewCounts;
+	}
 
-    /**
-     * @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));
-        });
-        $min = Arr::get($args, 'min', glsr()->constant('MIN_RATING', Rating::class));
-        $max = Arr::get($args, 'max', glsr()->constant('MAX_RATING', Rating::class));
-        foreach ($counts as $index => &$num) {
-            if (!Helper::inRange($index, $min, $max)) {
-                $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));
+		});
+		$min = Arr::get($args, 'min', glsr()->constant('MIN_RATING', Rating::class));
+		$max = Arr::get($args, 'max', glsr()->constant('MAX_RATING', Rating::class));
+		foreach ($counts as $index => &$num) {
+			if (!Helper::inRange($index, $min, $max)) {
+				$num = 0;
+			}
+		}
+		return $counts;
+	}
 
-    /**
-     * @return array
-     */
-    public function getCounts(array $args = [])
-    {
-        $args = $this->normalizeArgs($args);
-        $counts = $this->hasMixedAssignment($args)
-            ? $this->buildCounts($args) // force query the database
-            : $this->get($args);
-        return $this->normalize($counts);
-    }
+	/**
+	 * @return array
+	 */
+	public function getCounts(array $args = [])
+	{
+		$args = $this->normalizeArgs($args);
+		$counts = $this->hasMixedAssignment($args)
+			? $this->buildCounts($args) // force query the database
+			: $this->get($args);
+		return $this->normalize($counts);
+	}
 
-    /**
-     * @return void
-     */
-    public function increaseAll(Review $review)
-    {
-        glsr(GlobalCountsManager::class)->increase($review);
-        glsr(PostCountsManager::class)->increase($review);
-        glsr(TermCountsManager::class)->increase($review);
-    }
+	/**
+	 * @return void
+	 */
+	public function increaseAll(Review $review)
+	{
+		glsr(GlobalCountsManager::class)->increase($review);
+		glsr(PostCountsManager::class)->increase($review);
+		glsr(TermCountsManager::class)->increase($review);
+	}
 
-    /**
-     * @param string $type
-     * @param int $rating
-     * @return array
-     */
-    public 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
+	 */
+	public 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 void
-     */
-    public function updateAll()
-    {
-        glsr(GlobalCountsManager::class)->updateAll();
-        glsr(PostCountsManager::class)->updateAll();
-        glsr(TermCountsManager::class)->updateAll();
-    }
+	/**
+	 * @return void
+	 */
+	public function updateAll()
+	{
+		glsr(GlobalCountsManager::class)->updateAll();
+		glsr(PostCountsManager::class)->updateAll();
+		glsr(TermCountsManager::class)->updateAll();
+	}
 
-    /**
-     * @return array
-     */
-    protected function combine(array $results)
-    {
-        if (!wp_is_numeric_array($results)) {
-            return $results;
-        }
-        $mergedKeys = array_keys(array_merge(...$results));
-        $counts = array_fill_keys($mergedKeys, $this->generateEmptyCountsArray());
-        foreach ($results as $typeRatings) {
-            foreach ($typeRatings as $type => $ratings) {
-                foreach ($ratings as $index => $rating) {
-                    $counts[$type][$index] = intval($rating) + $counts[$type][$index];
-                }
-            }
-        }
-        return $counts;
-    }
+	/**
+	 * @return array
+	 */
+	protected function combine(array $results)
+	{
+		if (!wp_is_numeric_array($results)) {
+			return $results;
+		}
+		$mergedKeys = array_keys(array_merge(...$results));
+		$counts = array_fill_keys($mergedKeys, $this->generateEmptyCountsArray());
+		foreach ($results as $typeRatings) {
+			foreach ($typeRatings as $type => $ratings) {
+				foreach ($ratings as $index => $rating) {
+					$counts[$type][$index] = intval($rating) + $counts[$type][$index];
+				}
+			}
+		}
+		return $counts;
+	}
 
-    /**
-     * @return array
-     */
-    protected function generateEmptyCountsArray()
-    {
-        return array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
-    }
+	/**
+	 * @return array
+	 */
+	protected function generateEmptyCountsArray()
+	{
+		return array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
+	}
 
-    /**
-     * @return array
-     */
-    protected function get($args)
-    {
-        $results = [];
-        foreach ($args['post_ids'] as $postId) {
-            $results[] = glsr(PostCountsManager::class)->get($postId);
-        }
-        foreach ($args['term_ids'] as $termId) {
-            $results[] = glsr(TermCountsManager::class)->get($termId);
-        }
-        if (empty($results)) {
-            $results[] = glsr(GlobalCountsManager::class)->get();
-        }
-        $results[] = ['local' => $this->generateEmptyCountsArray()]; // make sure there is a fallback
-        return $this->combine($results);
-    }
+	/**
+	 * @return array
+	 */
+	protected function get($args)
+	{
+		$results = [];
+		foreach ($args['post_ids'] as $postId) {
+			$results[] = glsr(PostCountsManager::class)->get($postId);
+		}
+		foreach ($args['term_ids'] as $termId) {
+			$results[] = glsr(TermCountsManager::class)->get($termId);
+		}
+		if (empty($results)) {
+			$results[] = glsr(GlobalCountsManager::class)->get();
+		}
+		$results[] = ['local' => $this->generateEmptyCountsArray()]; // make sure there is a fallback
+		return $this->combine($results);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function hasMixedAssignment(array $args)
-    {
-        return !empty($args['post_ids']) && !empty($args['term_ids']);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function hasMixedAssignment(array $args)
+	{
+		return !empty($args['post_ids']) && !empty($args['term_ids']);
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $reviewCounts)
-    {
-        foreach ($reviewCounts as &$counts) {
-            foreach (array_keys($this->generateEmptyCountsArray()) as $index) {
-                if (!isset($counts[$index])) {
-                    $counts[$index] = 0;
-                }
-            }
-            ksort($counts);
-        }
-        return $reviewCounts;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $reviewCounts)
+	{
+		foreach ($reviewCounts as &$counts) {
+			foreach (array_keys($this->generateEmptyCountsArray()) as $index) {
+				if (!isset($counts[$index])) {
+					$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 object $query
-     * @return array
-     */
-    protected function populateCountsFromQuery($query, array $counts)
-    {
-        foreach ($query->reviews as $review) {
-            $type = $this->normalizeType($review->type);
-            if (!array_key_exists($type, $counts)) {
-                $counts[$type] = $this->generateEmptyCountsArray();
-            }
-            ++$counts[$type][$review->rating];
-        }
-        return $counts;
-    }
+	/**
+	 * @param object $query
+	 * @return array
+	 */
+	protected function populateCountsFromQuery($query, array $counts)
+	{
+		foreach ($query->reviews as $review) {
+			$type = $this->normalizeType($review->type);
+			if (!array_key_exists($type, $counts)) {
+				$counts[$type] = $this->generateEmptyCountsArray();
+			}
+			++$counts[$type][$review->rating];
+		}
+		return $counts;
+	}
 
-    /**
-     * @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 +76 added lines, -76 removed lines

@@ -21,16 +21,16 @@ 
     /**
      * @return array
      */
-    public function buildCounts(array $args = [])
+    public function buildCounts( array $args = [] )
     {
         $counts = [
             'local' => $this->generateEmptyCountsArray(),
         ];
-        $query = $this->queryReviews($args);
-        while ($query) {
-            $counts = $this->populateCountsFromQuery($query, $counts);
+        $query = $this->queryReviews( $args );
+        while( $query ) {
+            $counts = $this->populateCountsFromQuery( $query, $counts );
             $query = $query->has_more
-                ? $this->queryReviews($args, end($query->reviews)->ID)
+                ? $this->queryReviews( $args, end( $query->reviews )->ID )
                 : false;
         }
         return $counts;
@@ -39,11 +39,11 @@ 
     /**
      * @return void
      */
-    public function decreaseAll(Review $review)
+    public function decreaseAll( Review $review )
     {
-        glsr(GlobalCountsManager::class)->decrease($review);
-        glsr(PostCountsManager::class)->decrease($review);
-        glsr(TermCountsManager::class)->decrease($review);
+        glsr( GlobalCountsManager::class )->decrease( $review );
+        glsr( PostCountsManager::class )->decrease( $review );
+        glsr( TermCountsManager::class )->decrease( $review );
     }
 
     /**
@@ -51,10 +51,10 @@ 
      * @param int $rating
      * @return array
      */
-    public function decreaseRating(array $reviewCounts, $type, $rating)
+    public 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;
     }
@@ -62,16 +62,16 @@ 
     /**
      * @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 ) );
         });
-        $min = Arr::get($args, 'min', glsr()->constant('MIN_RATING', Rating::class));
-        $max = Arr::get($args, 'max', glsr()->constant('MAX_RATING', Rating::class));
-        foreach ($counts as $index => &$num) {
-            if (!Helper::inRange($index, $min, $max)) {
+        $min = Arr::get( $args, 'min', glsr()->constant( 'MIN_RATING', Rating::class ) );
+        $max = Arr::get( $args, 'max', glsr()->constant( 'MAX_RATING', Rating::class ) );
+        foreach( $counts as $index => &$num ) {
+            if( !Helper::inRange( $index, $min, $max ) ) {
                 $num = 0;
             }
         }
@@ -81,23 +81,23 @@ 
     /**
      * @return array
      */
-    public function getCounts(array $args = [])
+    public function getCounts( array $args = [] )
     {
-        $args = $this->normalizeArgs($args);
-        $counts = $this->hasMixedAssignment($args)
-            ? $this->buildCounts($args) // force query the database
-            : $this->get($args);
-        return $this->normalize($counts);
+        $args = $this->normalizeArgs( $args );
+        $counts = $this->hasMixedAssignment( $args )
+            ? $this->buildCounts( $args ) // force query the database
+            : $this->get( $args );
+        return $this->normalize( $counts );
     }
 
     /**
      * @return void
      */
-    public function increaseAll(Review $review)
+    public function increaseAll( Review $review )
     {
-        glsr(GlobalCountsManager::class)->increase($review);
-        glsr(PostCountsManager::class)->increase($review);
-        glsr(TermCountsManager::class)->increase($review);
+        glsr( GlobalCountsManager::class )->increase( $review );
+        glsr( PostCountsManager::class )->increase( $review );
+        glsr( TermCountsManager::class )->increase( $review );
     }
 
     /**
@@ -105,16 +105,16 @@ 
      * @param int $rating
      * @return array
      */
-    public function increaseRating(array $reviewCounts, $type, $rating)
+    public 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;
     }
 
@@ -123,25 +123,25 @@ 
      */
     public function updateAll()
     {
-        glsr(GlobalCountsManager::class)->updateAll();
-        glsr(PostCountsManager::class)->updateAll();
-        glsr(TermCountsManager::class)->updateAll();
+        glsr( GlobalCountsManager::class )->updateAll();
+        glsr( PostCountsManager::class )->updateAll();
+        glsr( TermCountsManager::class )->updateAll();
     }
 
     /**
      * @return array
      */
-    protected function combine(array $results)
+    protected function combine( array $results )
     {
-        if (!wp_is_numeric_array($results)) {
+        if( !wp_is_numeric_array( $results ) ) {
             return $results;
         }
-        $mergedKeys = array_keys(array_merge(...$results));
-        $counts = array_fill_keys($mergedKeys, $this->generateEmptyCountsArray());
-        foreach ($results as $typeRatings) {
-            foreach ($typeRatings as $type => $ratings) {
-                foreach ($ratings as $index => $rating) {
-                    $counts[$type][$index] = intval($rating) + $counts[$type][$index];
+        $mergedKeys = array_keys( array_merge( ...$results ) );
+        $counts = array_fill_keys( $mergedKeys, $this->generateEmptyCountsArray() );
+        foreach( $results as $typeRatings ) {
+            foreach( $typeRatings as $type => $ratings ) {
+                foreach( $ratings as $index => $rating ) {
+                    $counts[$type][$index] = intval( $rating ) + $counts[$type][$index];
                 }
             }
         }
@@ -153,32 +153,32 @@ 
      */
     protected function generateEmptyCountsArray()
     {
-        return array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
+        return array_fill_keys( range( 0, glsr()->constant( 'MAX_RATING', Rating::class ) ), 0 );
     }
 
     /**
      * @return array
      */
-    protected function get($args)
+    protected function get( $args )
     {
         $results = [];
-        foreach ($args['post_ids'] as $postId) {
-            $results[] = glsr(PostCountsManager::class)->get($postId);
+        foreach( $args['post_ids'] as $postId ) {
+            $results[] = glsr( PostCountsManager::class )->get( $postId );
         }
-        foreach ($args['term_ids'] as $termId) {
-            $results[] = glsr(TermCountsManager::class)->get($termId);
+        foreach( $args['term_ids'] as $termId ) {
+            $results[] = glsr( TermCountsManager::class )->get( $termId );
         }
-        if (empty($results)) {
-            $results[] = glsr(GlobalCountsManager::class)->get();
+        if( empty($results) ) {
+            $results[] = glsr( GlobalCountsManager::class )->get();
         }
         $results[] = ['local' => $this->generateEmptyCountsArray()]; // make sure there is a fallback
-        return $this->combine($results);
+        return $this->combine( $results );
     }
 
     /**
      * @return bool
      */
-    protected function hasMixedAssignment(array $args)
+    protected function hasMixedAssignment( array $args )
     {
         return !empty($args['post_ids']) && !empty($args['term_ids']);
     }
@@ -186,15 +186,15 @@ 
     /**
      * @return array
      */
-    protected function normalize(array $reviewCounts)
+    protected function normalize( array $reviewCounts )
     {
-        foreach ($reviewCounts as &$counts) {
-            foreach (array_keys($this->generateEmptyCountsArray()) as $index) {
-                if (!isset($counts[$index])) {
+        foreach( $reviewCounts as &$counts ) {
+            foreach( array_keys( $this->generateEmptyCountsArray() ) as $index ) {
+                if( !isset($counts[$index]) ) {
                     $counts[$index] = 0;
                 }
             }
-            ksort($counts);
+            ksort( $counts );
         }
         return $reviewCounts;
     }
@@ -202,15 +202,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;
     }
 
@@ -218,9 +218,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;
     }
@@ -229,11 +229,11 @@ 
      * @param object $query
      * @return array
      */
-    protected function populateCountsFromQuery($query, array $counts)
+    protected function populateCountsFromQuery( $query, array $counts )
     {
-        foreach ($query->reviews as $review) {
-            $type = $this->normalizeType($review->type);
-            if (!array_key_exists($type, $counts)) {
+        foreach( $query->reviews as $review ) {
+            $type = $this->normalizeType( $review->type );
+            if( !array_key_exists( $type, $counts ) ) {
                 $counts[$type] = $this->generateEmptyCountsArray();
             }
             ++$counts[$type][$review->rating];
@@ -245,13 +245,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/tools/general.php

Spacing +12 added lines, -12 removed lines

@@ -1,25 +1,25 @@ 
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
-<?php if (glsr()->hasPermission('settings')) : ?>
+<?php if( glsr()->hasPermission( 'settings' ) ) : ?>
 <div class="glsr-card card">
     <h3>Export Settings</h3>
     <p>Export the Site Reviews settings for this site to a <code>*.json</code> file. This allows you to easily import the plugin settings into another site.</p>
-    <p>To export your Site Reviews reviews and categories, please use the WordPress <a href="<?= admin_url('export.php'); ?>">Export</a> tool.</p>
+    <p>To export your Site Reviews reviews and categories, please use the WordPress <a href="<?= admin_url( 'export.php' ); ?>">Export</a> tool.</p>
     <form method="post">
         <input type="hidden" name="{{ id }}[_action]" value="export-settings">
-        <?php wp_nonce_field('export-settings'); ?>
-        <?php submit_button(__('Export Settings', 'site-reviews'), 'secondary'); ?>
+        <?php wp_nonce_field( 'export-settings' ); ?>
+        <?php submit_button( __( 'Export Settings', 'site-reviews' ), 'secondary' ); ?>
     </form>
 </div>
 <div class="glsr-card card">
     <h3>Import Settings</h3>
     <p>Import the Site Reviews settings from a <code>*.json</code> file. This file can be obtained by exporting the settings on another site using the export tool below.</p>
-    <p>To import your Site Reviews reviews and categories from another website, please use the WordPress <a href="<?= admin_url('import.php'); ?>">Import</a> tool.</p>
+    <p>To import your Site Reviews reviews and categories from another website, please use the WordPress <a href="<?= admin_url( 'import.php' ); ?>">Import</a> tool.</p>
     <form method="post" enctype="multipart/form-data">
         <input type="file" name="import-file">
         <input type="hidden" name="{{ id }}[_action]" value="import-settings">
-        <?php wp_nonce_field('import-settings'); ?>
-        <?php submit_button(__('Import Settings', 'site-reviews'), 'secondary'); ?>
+        <?php wp_nonce_field( 'import-settings' ); ?>
+        <?php submit_button( __( 'Import Settings', 'site-reviews' ), 'secondary' ); ?>
     </form>
 </div>
 <?php endif; ?>
@@ -29,10 +29,10 @@ 
     <p>Run this tool if your reviews stopped working correctly after upgrading the plugin to version 4 (i.e. read-only reviews, zero-star ratings, etc.).</p>
     <form method="post">
         <input type="hidden" name="{{ id }}[_action]" value="migrate-reviews">
-        <?php wp_nonce_field('migrate-reviews'); ?>
+        <?php wp_nonce_field( 'migrate-reviews' ); ?>
         <p class="submit">
             <button type="submit" class="glsr-button button" name="migrate-reviews" id="migrate-reviews">
-                <span data-loading="<?= __('Migrating Reviews...', 'site-reviews'); ?>"><?= __('Run Migration', 'site-reviews'); ?></span>
+                <span data-loading="<?= __( 'Migrating Reviews...', 'site-reviews' ); ?>"><?= __( 'Run Migration', 'site-reviews' ); ?></span>
             </button>
         </p>
     </form>
@@ -44,10 +44,10 @@ 
     <p>If you suspect that the rating counts are incorrect (perhaps you have edited reviews directly in your database), you can recalculate them here.</p>
     <form method="post">
         <input type="hidden" name="{{ id }}[_action]" value="count-reviews">
-        <?php wp_nonce_field('count-reviews'); ?>
+        <?php wp_nonce_field( 'count-reviews' ); ?>
         <p class="submit">
             <button type="submit" class="glsr-button button" name="count-reviews" id="count-reviews">
-                <span data-loading="<?= __('Recalculating Counts...', 'site-reviews'); ?>"><?= __('Recalculate Counts', 'site-reviews'); ?></span>
+                <span data-loading="<?= __( 'Recalculating Counts...', 'site-reviews' ); ?>"><?= __( 'Recalculate Counts', 'site-reviews' ); ?></span>
             </button>
         </p>
     </form>

plugin/Modules/Upgrader/Upgrade_4_0_2.php

Indentation +53 added lines, -53 removed lines

@@ -9,70 +9,70 @@
 
 class Upgrade_4_0_2
 {
-    /**
-     * @return void
-     */
-    public function deleteSessions()
-    {
-        global $wpdb;
-        $wpdb->query("
+	/**
+	 * @return void
+	 */
+	public function deleteSessions()
+	{
+		global $wpdb;
+		$wpdb->query("
             DELETE
             FROM {$wpdb->options}
             WHERE option_name LIKE '_glsr_session%'
         ");
-    }
+	}
 
-    /**
-     * @return void
-     */
-    public function migrateSettings()
-    {
-        if ($settings = get_option(OptionManager::databaseKey(3))) {
-            $multilingual = 'yes' == Arr::get($settings, 'settings.general.support.polylang')
-                ? 'polylang'
-                : '';
-            $settings = Arr::set($settings, 'settings.general.multilingual', $multilingual);
-            $settings = Arr::set($settings, 'settings.general.rebusify', 'no');
-            $settings = Arr::set($settings, 'settings.general.rebusify_email', '');
-            $settings = Arr::set($settings, 'settings.general.rebusify_serial', '');
-            $settings = Arr::set($settings, 'settings.reviews.name.format', '');
-            $settings = Arr::set($settings, 'settings.reviews.name.initial', '');
-            $settings = Arr::set($settings, 'settings.submissions.blacklist.integration', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.email', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.ip_address', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.username', '');
-            unset($settings['settings']['general']['support']);
-            update_option(OptionManager::databaseKey(4), $settings);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function migrateSettings()
+	{
+		if ($settings = get_option(OptionManager::databaseKey(3))) {
+			$multilingual = 'yes' == Arr::get($settings, 'settings.general.support.polylang')
+				? 'polylang'
+				: '';
+			$settings = Arr::set($settings, 'settings.general.multilingual', $multilingual);
+			$settings = Arr::set($settings, 'settings.general.rebusify', 'no');
+			$settings = Arr::set($settings, 'settings.general.rebusify_email', '');
+			$settings = Arr::set($settings, 'settings.general.rebusify_serial', '');
+			$settings = Arr::set($settings, 'settings.reviews.name.format', '');
+			$settings = Arr::set($settings, 'settings.reviews.name.initial', '');
+			$settings = Arr::set($settings, 'settings.submissions.blacklist.integration', '');
+			$settings = Arr::set($settings, 'settings.submissions.limit', '');
+			$settings = Arr::set($settings, 'settings.submissions.limit_whitelist.email', '');
+			$settings = Arr::set($settings, 'settings.submissions.limit_whitelist.ip_address', '');
+			$settings = Arr::set($settings, 'settings.submissions.limit_whitelist.username', '');
+			unset($settings['settings']['general']['support']);
+			update_option(OptionManager::databaseKey(4), $settings);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    public function protectMetaKeys()
-    {
-        global $wpdb;
-        $keys = array_keys(glsr(CreateReviewDefaults::class)->defaults());
-        $keys = implode("','", $keys);
-        $postType = Application::POST_TYPE;
-        $wpdb->query("
+	/**
+	 * @return void
+	 */
+	public function protectMetaKeys()
+	{
+		global $wpdb;
+		$keys = array_keys(glsr(CreateReviewDefaults::class)->defaults());
+		$keys = implode("','", $keys);
+		$postType = Application::POST_TYPE;
+		$wpdb->query("
             UPDATE {$wpdb->postmeta} pm
             INNER JOIN {$wpdb->posts} p ON p.id = pm.post_id
             SET pm.meta_key = CONCAT('_', pm.meta_key)
             WHERE pm.meta_key IN ('{$keys}')
             AND p.post_type = '{$postType}'
         ");
-    }
+	}
 
-    /**
-     * @return void
-     */
-    public function run()
-    {
-        $this->migrateSettings();
-        $this->protectMetaKeys();
-        $this->deleteSessions();
-        delete_transient(Application::ID.'_cloudflare_ips');
-    }
+	/**
+	 * @return void
+	 */
+	public function run()
+	{
+		$this->migrateSettings();
+		$this->protectMetaKeys();
+		$this->deleteSessions();
+		delete_transient(Application::ID.'_cloudflare_ips');
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -15,11 +15,11 @@ 
     public function deleteSessions()
     {
         global $wpdb;
-        $wpdb->query("
+        $wpdb->query( "
             DELETE
             FROM {$wpdb->options}
             WHERE option_name LIKE '_glsr_session%'
-        ");
+        " );
     }
 
     /**
@@ -27,23 +27,23 @@ 
      */
     public function migrateSettings()
     {
-        if ($settings = get_option(OptionManager::databaseKey(3))) {
-            $multilingual = 'yes' == Arr::get($settings, 'settings.general.support.polylang')
+        if( $settings = get_option( OptionManager::databaseKey( 3 ) ) ) {
+            $multilingual = 'yes' == Arr::get( $settings, 'settings.general.support.polylang' )
                 ? 'polylang'
                 : '';
-            $settings = Arr::set($settings, 'settings.general.multilingual', $multilingual);
-            $settings = Arr::set($settings, 'settings.general.rebusify', 'no');
-            $settings = Arr::set($settings, 'settings.general.rebusify_email', '');
-            $settings = Arr::set($settings, 'settings.general.rebusify_serial', '');
-            $settings = Arr::set($settings, 'settings.reviews.name.format', '');
-            $settings = Arr::set($settings, 'settings.reviews.name.initial', '');
-            $settings = Arr::set($settings, 'settings.submissions.blacklist.integration', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.email', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.ip_address', '');
-            $settings = Arr::set($settings, 'settings.submissions.limit_whitelist.username', '');
+            $settings = Arr::set( $settings, 'settings.general.multilingual', $multilingual );
+            $settings = Arr::set( $settings, 'settings.general.rebusify', 'no' );
+            $settings = Arr::set( $settings, 'settings.general.rebusify_email', '' );
+            $settings = Arr::set( $settings, 'settings.general.rebusify_serial', '' );
+            $settings = Arr::set( $settings, 'settings.reviews.name.format', '' );
+            $settings = Arr::set( $settings, 'settings.reviews.name.initial', '' );
+            $settings = Arr::set( $settings, 'settings.submissions.blacklist.integration', '' );
+            $settings = Arr::set( $settings, 'settings.submissions.limit', '' );
+            $settings = Arr::set( $settings, 'settings.submissions.limit_whitelist.email', '' );
+            $settings = Arr::set( $settings, 'settings.submissions.limit_whitelist.ip_address', '' );
+            $settings = Arr::set( $settings, 'settings.submissions.limit_whitelist.username', '' );
             unset($settings['settings']['general']['support']);
-            update_option(OptionManager::databaseKey(4), $settings);
+            update_option( OptionManager::databaseKey( 4 ), $settings );
         }
     }
 
@@ -53,16 +53,16 @@ 
     public function protectMetaKeys()
     {
         global $wpdb;
-        $keys = array_keys(glsr(CreateReviewDefaults::class)->defaults());
-        $keys = implode("','", $keys);
+        $keys = array_keys( glsr( CreateReviewDefaults::class )->defaults() );
+        $keys = implode( "','", $keys );
         $postType = Application::POST_TYPE;
-        $wpdb->query("
+        $wpdb->query( "
             UPDATE {$wpdb->postmeta} pm
             INNER JOIN {$wpdb->posts} p ON p.id = pm.post_id
             SET pm.meta_key = CONCAT('_', pm.meta_key)
             WHERE pm.meta_key IN ('{$keys}')
             AND p.post_type = '{$postType}'
-        ");
+        " );
     }
 
     /**
@@ -73,6 +73,6 @@ 
         $this->migrateSettings();
         $this->protectMetaKeys();
         $this->deleteSessions();
-        delete_transient(Application::ID.'_cloudflare_ips');
+        delete_transient( Application::ID.'_cloudflare_ips' );
     }
 }

plugin/Controllers/AdminController.php

Indentation +227 added lines, -227 removed lines

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

Spacing +73 added lines, -73 removed lines

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

plugin/Controllers/AjaxController.php

Indentation +165 added lines, -165 removed lines

@@ -14,180 +14,180 @@
 
 class AjaxController extends Controller
 {
-    /**
-     * @return void
-     */
-    public function routerChangeStatus(array $request)
-    {
-        wp_send_json_success($this->execute(new ChangeStatus($request)));
-    }
+	/**
+	 * @return void
+	 */
+	public function routerChangeStatus(array $request)
+	{
+		wp_send_json_success($this->execute(new ChangeStatus($request)));
+	}
 
-    /**
-     * @return void
-     */
-    public function routerClearConsole()
-    {
-        glsr(AdminController::class)->routerClearConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerClearConsole()
+	{
+		glsr(AdminController::class)->routerClearConsole();
+		wp_send_json_success([
+			'console' => glsr(Console::class)->get(),
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerCountReviews()
-    {
-        glsr(AdminController::class)->routerCountReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerCountReviews()
+	{
+		glsr(AdminController::class)->routerCountReviews();
+		wp_send_json_success([
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerMigrateReviews()
-    {
-        glsr(AdminController::class)->routerMigrateReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerMigrateReviews()
+	{
+		glsr(AdminController::class)->routerMigrateReviews();
+		wp_send_json_success([
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerDismissNotice(array $request)
-    {
-        glsr(NoticeController::class)->routerDismissNotice($request);
-        wp_send_json_success();
-    }
+	/**
+	 * @return void
+	 */
+	public function routerDismissNotice(array $request)
+	{
+		glsr(NoticeController::class)->routerDismissNotice($request);
+		wp_send_json_success();
+	}
 
-    /**
-     * @return void
-     */
-    public function routerMceShortcode(array $request)
-    {
-        $shortcode = $request['shortcode'];
-        $response = false;
-        if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
-            $data = glsr()->mceShortcodes[$shortcode];
-            if (!empty($data['errors'])) {
-                $data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
-            }
-            $response = [
-                'body' => $data['fields'],
-                'close' => $data['btn_close'],
-                'ok' => $data['btn_okay'],
-                'shortcode' => $shortcode,
-                'title' => $data['title'],
-            ];
-        }
-        wp_send_json_success($response);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerMceShortcode(array $request)
+	{
+		$shortcode = $request['shortcode'];
+		$response = false;
+		if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
+			$data = glsr()->mceShortcodes[$shortcode];
+			if (!empty($data['errors'])) {
+				$data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
+			}
+			$response = [
+				'body' => $data['fields'],
+				'close' => $data['btn_close'],
+				'ok' => $data['btn_okay'],
+				'shortcode' => $shortcode,
+				'title' => $data['title'],
+			];
+		}
+		wp_send_json_success($response);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerFetchConsole()
-    {
-        glsr(AdminController::class)->routerFetchConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerFetchConsole()
+	{
+		glsr(AdminController::class)->routerFetchConsole();
+		wp_send_json_success([
+			'console' => glsr(Console::class)->get(),
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerSearchPosts(array $request)
-    {
-        $results = glsr(Database::class)->searchPosts($request['search']);
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
-            'items' => $results,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerSearchPosts(array $request)
+	{
+		$results = glsr(Database::class)->searchPosts($request['search']);
+		wp_send_json_success([
+			'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+			'items' => $results,
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerSearchTranslations(array $request)
-    {
-        if (empty($request['exclude'])) {
-            $request['exclude'] = [];
-        }
-        $results = glsr(Translation::class)
-            ->search($request['search'])
-            ->exclude()
-            ->exclude($request['exclude'])
-            ->renderResults();
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
-            'items' => $results,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerSearchTranslations(array $request)
+	{
+		if (empty($request['exclude'])) {
+			$request['exclude'] = [];
+		}
+		$results = glsr(Translation::class)
+			->search($request['search'])
+			->exclude()
+			->exclude($request['exclude'])
+			->renderResults();
+		wp_send_json_success([
+			'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+			'items' => $results,
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerSubmitReview(array $request)
-    {
-        $command = glsr(PublicController::class)->routerSubmitReview($request);
-        $redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
-        $data = [
-            'errors' => glsr()->sessionGet($command->form_id.'errors', false),
-            'message' => glsr()->sessionGet($command->form_id.'message', ''),
-            'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
-            'redirect' => $redirect,
-        ];
-        if (false === $data['errors']) {
-            glsr()->sessionClear();
-            wp_send_json_success($data);
-        }
-        wp_send_json_error($data);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerSubmitReview(array $request)
+	{
+		$command = glsr(PublicController::class)->routerSubmitReview($request);
+		$redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
+		$redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
+		$data = [
+			'errors' => glsr()->sessionGet($command->form_id.'errors', false),
+			'message' => glsr()->sessionGet($command->form_id.'message', ''),
+			'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
+			'redirect' => $redirect,
+		];
+		if (false === $data['errors']) {
+			glsr()->sessionClear();
+			wp_send_json_success($data);
+		}
+		wp_send_json_error($data);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerFetchPagedReviews(array $request)
-    {
-        $homePath = untrailingslashit(parse_url(home_url(), PHP_URL_PATH));
-        $urlPath = untrailingslashit(parse_url(Arr::get($request, 'url'), PHP_URL_PATH));
-        $urlQuery = [];
-        parse_str(parse_url(Arr::get($request, 'url'), PHP_URL_QUERY), $urlQuery);
-        $pagedUrl = $homePath === $urlPath
-            ? home_url()
-            : home_url($urlPath);
-        $args = [
-            'paged' => (int) Arr::get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
-            'pagedUrl' => trailingslashit($pagedUrl),
-            'pagination' => 'ajax',
-            'schema' => false,
-        ];
-        $atts = (array) json_decode(Arr::get($request, 'atts'));
-        $atts = glsr(SiteReviewsShortcode::class)->normalizeAtts($atts);
-        $html = glsr(SiteReviewsPartial::class)->build(wp_parse_args($args, $atts));
-        return wp_send_json_success([
-            'pagination' => $html->getPagination(),
-            'reviews' => $html->getReviews(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerFetchPagedReviews(array $request)
+	{
+		$homePath = untrailingslashit(parse_url(home_url(), PHP_URL_PATH));
+		$urlPath = untrailingslashit(parse_url(Arr::get($request, 'url'), PHP_URL_PATH));
+		$urlQuery = [];
+		parse_str(parse_url(Arr::get($request, 'url'), PHP_URL_QUERY), $urlQuery);
+		$pagedUrl = $homePath === $urlPath
+			? home_url()
+			: home_url($urlPath);
+		$args = [
+			'paged' => (int) Arr::get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
+			'pagedUrl' => trailingslashit($pagedUrl),
+			'pagination' => 'ajax',
+			'schema' => false,
+		];
+		$atts = (array) json_decode(Arr::get($request, 'atts'));
+		$atts = glsr(SiteReviewsShortcode::class)->normalizeAtts($atts);
+		$html = glsr(SiteReviewsPartial::class)->build(wp_parse_args($args, $atts));
+		return wp_send_json_success([
+			'pagination' => $html->getPagination(),
+			'reviews' => $html->getReviews(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerTogglePinned(array $request)
-    {
-        $isPinned = $this->execute(new TogglePinned($request));
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-            'pinned' => $isPinned,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerTogglePinned(array $request)
+	{
+		$isPinned = $this->execute(new TogglePinned($request));
+		wp_send_json_success([
+			'notices' => glsr(Notice::class)->get(),
+			'pinned' => $isPinned,
+		]);
+	}
 }

Spacing +67 added lines, -67 removed lines

@@ -17,9 +17,9 @@ 
     /**
      * @return void
      */
-    public function routerChangeStatus(array $request)
+    public function routerChangeStatus( array $request )
     {
-        wp_send_json_success($this->execute(new ChangeStatus($request)));
+        wp_send_json_success( $this->execute( new ChangeStatus( $request ) ) );
     }
 
     /**
@@ -27,11 +27,11 @@ 
      */
     public function routerClearConsole()
     {
-        glsr(AdminController::class)->routerClearConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerClearConsole();
+        wp_send_json_success( [
+            'console' => glsr( Console::class )->get(),
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
@@ -39,10 +39,10 @@ 
      */
     public function routerCountReviews()
     {
-        glsr(AdminController::class)->routerCountReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerCountReviews();
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
@@ -50,32 +50,32 @@ 
      */
     public function routerMigrateReviews()
     {
-        glsr(AdminController::class)->routerMigrateReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerMigrateReviews();
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerDismissNotice(array $request)
+    public function routerDismissNotice( array $request )
     {
-        glsr(NoticeController::class)->routerDismissNotice($request);
+        glsr( NoticeController::class )->routerDismissNotice( $request );
         wp_send_json_success();
     }
 
     /**
      * @return void
      */
-    public function routerMceShortcode(array $request)
+    public function routerMceShortcode( array $request )
     {
         $shortcode = $request['shortcode'];
         $response = false;
-        if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
+        if( array_key_exists( $shortcode, glsr()->mceShortcodes ) ) {
             $data = glsr()->mceShortcodes[$shortcode];
-            if (!empty($data['errors'])) {
-                $data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
+            if( !empty($data['errors']) ) {
+                $data['btn_okay'] = [esc_html__( 'Okay', 'site-reviews' )];
             }
             $response = [
                 'body' => $data['fields'],
@@ -85,7 +85,7 @@ 
                 'title' => $data['title'],
             ];
         }
-        wp_send_json_success($response);
+        wp_send_json_success( $response );
     }
 
     /**
@@ -93,101 +93,101 @@ 
      */
     public function routerFetchConsole()
     {
-        glsr(AdminController::class)->routerFetchConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerFetchConsole();
+        wp_send_json_success( [
+            'console' => glsr( Console::class )->get(),
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSearchPosts(array $request)
+    public function routerSearchPosts( array $request )
     {
-        $results = glsr(Database::class)->searchPosts($request['search']);
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+        $results = glsr( Database::class )->searchPosts( $request['search'] );
+        wp_send_json_success( [
+            'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
             'items' => $results,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSearchTranslations(array $request)
+    public function routerSearchTranslations( array $request )
     {
-        if (empty($request['exclude'])) {
+        if( empty($request['exclude']) ) {
             $request['exclude'] = [];
         }
-        $results = glsr(Translation::class)
-            ->search($request['search'])
+        $results = glsr( Translation::class )
+            ->search( $request['search'] )
             ->exclude()
-            ->exclude($request['exclude'])
+            ->exclude( $request['exclude'] )
             ->renderResults();
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+        wp_send_json_success( [
+            'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
             'items' => $results,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSubmitReview(array $request)
+    public function routerSubmitReview( array $request )
     {
-        $command = glsr(PublicController::class)->routerSubmitReview($request);
-        $redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
+        $command = glsr( PublicController::class )->routerSubmitReview( $request );
+        $redirect = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ) ) );
+        $redirect = apply_filters( 'site-reviews/review/redirect', $redirect, $command );
         $data = [
-            'errors' => glsr()->sessionGet($command->form_id.'errors', false),
-            'message' => glsr()->sessionGet($command->form_id.'message', ''),
-            'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
+            'errors' => glsr()->sessionGet( $command->form_id.'errors', false ),
+            'message' => glsr()->sessionGet( $command->form_id.'message', '' ),
+            'recaptcha' => glsr()->sessionGet( $command->form_id.'recaptcha', false ),
             'redirect' => $redirect,
         ];
-        if (false === $data['errors']) {
+        if( false === $data['errors'] ) {
             glsr()->sessionClear();
-            wp_send_json_success($data);
+            wp_send_json_success( $data );
         }
-        wp_send_json_error($data);
+        wp_send_json_error( $data );
     }
 
     /**
      * @return void
      */
-    public function routerFetchPagedReviews(array $request)
+    public function routerFetchPagedReviews( array $request )
     {
-        $homePath = untrailingslashit(parse_url(home_url(), PHP_URL_PATH));
-        $urlPath = untrailingslashit(parse_url(Arr::get($request, 'url'), PHP_URL_PATH));
+        $homePath = untrailingslashit( parse_url( home_url(), PHP_URL_PATH ) );
+        $urlPath = untrailingslashit( parse_url( Arr::get( $request, 'url' ), PHP_URL_PATH ) );
         $urlQuery = [];
-        parse_str(parse_url(Arr::get($request, 'url'), PHP_URL_QUERY), $urlQuery);
+        parse_str( parse_url( Arr::get( $request, 'url' ), PHP_URL_QUERY ), $urlQuery );
         $pagedUrl = $homePath === $urlPath
             ? home_url()
-            : home_url($urlPath);
+            : home_url( $urlPath );
         $args = [
-            'paged' => (int) Arr::get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
-            'pagedUrl' => trailingslashit($pagedUrl),
+            'paged' => (int)Arr::get( $urlQuery, glsr()->constant( 'PAGED_QUERY_VAR' ), 1 ),
+            'pagedUrl' => trailingslashit( $pagedUrl ),
             'pagination' => 'ajax',
             'schema' => false,
         ];
-        $atts = (array) json_decode(Arr::get($request, 'atts'));
-        $atts = glsr(SiteReviewsShortcode::class)->normalizeAtts($atts);
-        $html = glsr(SiteReviewsPartial::class)->build(wp_parse_args($args, $atts));
-        return wp_send_json_success([
+        $atts = (array)json_decode( Arr::get( $request, 'atts' ) );
+        $atts = glsr( SiteReviewsShortcode::class )->normalizeAtts( $atts );
+        $html = glsr( SiteReviewsPartial::class )->build( wp_parse_args( $args, $atts ) );
+        return wp_send_json_success( [
             'pagination' => $html->getPagination(),
             'reviews' => $html->getReviews(),
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerTogglePinned(array $request)
+    public function routerTogglePinned( array $request )
     {
-        $isPinned = $this->execute(new TogglePinned($request));
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
+        $isPinned = $this->execute( new TogglePinned( $request ) );
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
             'pinned' => $isPinned,
-        ]);
+        ] );
     }
 }

plugin/Database/OptionManager.php

Indentation +138 added lines, -138 removed lines

@@ -9,153 +9,153 @@
 
 class OptionManager
 {
-    /**
-     * @var array
-     */
-    protected $options;
+	/**
+	 * @var array
+	 */
+	protected $options;
 
-    /**
-     * @return string
-     */
-    public static function databaseKey($version = null)
-    {
-        if (null === $version) {
-            $version = explode('.', glsr()->version);
-            $version = array_shift($version);
-        }
-        return Str::snakeCase(
-            Application::ID.'-v'.intval($version)
-        );
-    }
+	/**
+	 * @return string
+	 */
+	public static function databaseKey($version = null)
+	{
+		if (null === $version) {
+			$version = explode('.', glsr()->version);
+			$version = array_shift($version);
+		}
+		return Str::snakeCase(
+			Application::ID.'-v'.intval($version)
+		);
+	}
 
-    /**
-     * @return array
-     */
-    public function all()
-    {
-        if (empty($this->options)) {
-            $this->reset();
-        }
-        return $this->options;
-    }
+	/**
+	 * @return array
+	 */
+	public function all()
+	{
+		if (empty($this->options)) {
+			$this->reset();
+		}
+		return $this->options;
+	}
 
-    /**
-     * @param string $path
-     * @return bool
-     */
-    public function delete($path)
-    {
-        $keys = explode('.', $path);
-        $last = array_pop($keys);
-        $options = $this->all();
-        $pointer = &$options;
-        foreach ($keys as $key) {
-            if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
-                continue;
-            }
-            $pointer = &$pointer[$key];
-        }
-        unset($pointer[$last]);
-        return $this->set($options);
-    }
+	/**
+	 * @param string $path
+	 * @return bool
+	 */
+	public function delete($path)
+	{
+		$keys = explode('.', $path);
+		$last = array_pop($keys);
+		$options = $this->all();
+		$pointer = &$options;
+		foreach ($keys as $key) {
+			if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
+				continue;
+			}
+			$pointer = &$pointer[$key];
+		}
+		unset($pointer[$last]);
+		return $this->set($options);
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @param string $cast
-     * @return mixed
-     */
-    public function get($path = '', $fallback = '', $cast = '')
-    {
-        $result = Arr::get($this->all(), $path, $fallback);
-        return Helper::castTo($cast, $result);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @param string $cast
+	 * @return mixed
+	 */
+	public function get($path = '', $fallback = '', $cast = '')
+	{
+		$result = Arr::get($this->all(), $path, $fallback);
+		return Helper::castTo($cast, $result);
+	}
 
-    /**
-     * @param string $path
-     * @return bool
-     */
-    public function getBool($path)
-    {
-        return Helper::castToBool($this->get($path));
-    }
+	/**
+	 * @param string $path
+	 * @return bool
+	 */
+	public function getBool($path)
+	{
+		return Helper::castToBool($this->get($path));
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @param string $cast
-     * @return mixed
-     */
-    public function getWP($path, $fallback = '', $cast = '')
-    {
-        $option = get_option($path, $fallback);
-        if (empty($option)) {
-            $option = $fallback;
-        }
-        return Helper::castTo($cast, $option);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @param string $cast
+	 * @return mixed
+	 */
+	public function getWP($path, $fallback = '', $cast = '')
+	{
+		$option = get_option($path, $fallback);
+		if (empty($option)) {
+			$option = $fallback;
+		}
+		return Helper::castTo($cast, $option);
+	}
 
-    /**
-     * @return string
-     */
-    public function json()
-    {
-        return json_encode($this->all());
-    }
+	/**
+	 * @return string
+	 */
+	public function json()
+	{
+		return json_encode($this->all());
+	}
 
-    /**
-     * @return array
-     */
-    public function normalize(array $options = [])
-    {
-        $options = wp_parse_args(
-            Arr::flattenArray($options),
-            glsr(DefaultsManager::class)->defaults()
-        );
-        array_walk($options, function (&$value) {
-            if (!is_string($value)) {
-                return;
-            }
-            $value = wp_kses($value, wp_kses_allowed_html('post'));
-        });
-        return Arr::convertDotNotationArray($options);
-    }
+	/**
+	 * @return array
+	 */
+	public function normalize(array $options = [])
+	{
+		$options = wp_parse_args(
+			Arr::flattenArray($options),
+			glsr(DefaultsManager::class)->defaults()
+		);
+		array_walk($options, function (&$value) {
+			if (!is_string($value)) {
+				return;
+			}
+			$value = wp_kses($value, wp_kses_allowed_html('post'));
+		});
+		return Arr::convertDotNotationArray($options);
+	}
 
-    /**
-     * @return bool
-     */
-    public function isRecaptchaEnabled()
-    {
-        $integration = $this->get('settings.submissions.recaptcha.integration');
-        return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
-    }
+	/**
+	 * @return bool
+	 */
+	public function isRecaptchaEnabled()
+	{
+		$integration = $this->get('settings.submissions.recaptcha.integration');
+		return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
+	}
 
-    /**
-     * @return array
-     */
-    public function reset()
-    {
-        $options = $this->getWP(static::databaseKey(), []);
-        if (!is_array($options) || empty($options)) {
-            delete_option(static::databaseKey());
-            $options = glsr()->defaults ?: [];
-        }
-        $this->options = $options;
-    }
+	/**
+	 * @return array
+	 */
+	public function reset()
+	{
+		$options = $this->getWP(static::databaseKey(), []);
+		if (!is_array($options) || empty($options)) {
+			delete_option(static::databaseKey());
+			$options = glsr()->defaults ?: [];
+		}
+		$this->options = $options;
+	}
 
-    /**
-     * @param string|array $pathOrOptions
-     * @param mixed $value
-     * @return bool
-     */
-    public function set($pathOrOptions, $value = '')
-    {
-        if (is_string($pathOrOptions)) {
-            $pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value);
-        }
-        if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
-            $this->reset();
-        }
-        return $result;
-    }
+	/**
+	 * @param string|array $pathOrOptions
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function set($pathOrOptions, $value = '')
+	{
+		if (is_string($pathOrOptions)) {
+			$pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value);
+		}
+		if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
+			$this->reset();
+		}
+		return $result;
+	}
 }

Spacing +37 added lines, -37 removed lines

@@ -17,14 +17,14 @@ 
     /**
      * @return string
      */
-    public static function databaseKey($version = null)
+    public static function databaseKey( $version = null )
     {
-        if (null === $version) {
-            $version = explode('.', glsr()->version);
-            $version = array_shift($version);
+        if( null === $version ) {
+            $version = explode( '.', glsr()->version );
+            $version = array_shift( $version );
         }
         return Str::snakeCase(
-            Application::ID.'-v'.intval($version)
+            Application::ID.'-v'.intval( $version )
         );
     }
 
@@ -33,7 +33,7 @@ 
      */
     public function all()
     {
-        if (empty($this->options)) {
+        if( empty($this->options) ) {
             $this->reset();
         }
         return $this->options;
@@ -43,20 +43,20 @@ 
      * @param string $path
      * @return bool
      */
-    public function delete($path)
+    public function delete( $path )
     {
-        $keys = explode('.', $path);
-        $last = array_pop($keys);
+        $keys = explode( '.', $path );
+        $last = array_pop( $keys );
         $options = $this->all();
         $pointer = &$options;
-        foreach ($keys as $key) {
-            if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
+        foreach( $keys as $key ) {
+            if( !isset($pointer[$key]) || !is_array( $pointer[$key] ) ) {
                 continue;
             }
             $pointer = &$pointer[$key];
         }
         unset($pointer[$last]);
-        return $this->set($options);
+        return $this->set( $options );
     }
 
     /**
@@ -65,19 +65,19 @@ 
      * @param string $cast
      * @return mixed
      */
-    public function get($path = '', $fallback = '', $cast = '')
+    public function get( $path = '', $fallback = '', $cast = '' )
     {
-        $result = Arr::get($this->all(), $path, $fallback);
-        return Helper::castTo($cast, $result);
+        $result = Arr::get( $this->all(), $path, $fallback );
+        return Helper::castTo( $cast, $result );
     }
 
     /**
      * @param string $path
      * @return bool
      */
-    public function getBool($path)
+    public function getBool( $path )
     {
-        return Helper::castToBool($this->get($path));
+        return Helper::castToBool( $this->get( $path ) );
     }
 
     /**
@@ -86,13 +86,13 @@ 
      * @param string $cast
      * @return mixed
      */
-    public function getWP($path, $fallback = '', $cast = '')
+    public function getWP( $path, $fallback = '', $cast = '' )
     {
-        $option = get_option($path, $fallback);
-        if (empty($option)) {
+        $option = get_option( $path, $fallback );
+        if( empty($option) ) {
             $option = $fallback;
         }
-        return Helper::castTo($cast, $option);
+        return Helper::castTo( $cast, $option );
     }
 
     /**
@@ -100,25 +100,25 @@ 
      */
     public function json()
     {
-        return json_encode($this->all());
+        return json_encode( $this->all() );
     }
 
     /**
      * @return array
      */
-    public function normalize(array $options = [])
+    public function normalize( array $options = [] )
     {
         $options = wp_parse_args(
-            Arr::flattenArray($options),
-            glsr(DefaultsManager::class)->defaults()
+            Arr::flattenArray( $options ),
+            glsr( DefaultsManager::class )->defaults()
         );
-        array_walk($options, function (&$value) {
-            if (!is_string($value)) {
+        array_walk( $options, function( &$value ) {
+            if( !is_string( $value ) ) {
                 return;
             }
-            $value = wp_kses($value, wp_kses_allowed_html('post'));
+            $value = wp_kses( $value, wp_kses_allowed_html( 'post' ) );
         });
-        return Arr::convertDotNotationArray($options);
+        return Arr::convertDotNotationArray( $options );
     }
 
     /**
@@ -126,7 +126,7 @@ 
      */
     public function isRecaptchaEnabled()
     {
-        $integration = $this->get('settings.submissions.recaptcha.integration');
+        $integration = $this->get( 'settings.submissions.recaptcha.integration' );
         return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
     }
 
@@ -135,9 +135,9 @@ 
      */
     public function reset()
     {
-        $options = $this->getWP(static::databaseKey(), []);
-        if (!is_array($options) || empty($options)) {
-            delete_option(static::databaseKey());
+        $options = $this->getWP( static::databaseKey(), [] );
+        if( !is_array( $options ) || empty($options) ) {
+            delete_option( static::databaseKey() );
             $options = glsr()->defaults ?: [];
         }
         $this->options = $options;
@@ -148,12 +148,12 @@ 
      * @param mixed $value
      * @return bool
      */
-    public function set($pathOrOptions, $value = '')
+    public function set( $pathOrOptions, $value = '' )
     {
-        if (is_string($pathOrOptions)) {
-            $pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value);
+        if( is_string( $pathOrOptions ) ) {
+            $pathOrOptions = Arr::set( $this->all(), $pathOrOptions, $value );
         }
-        if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
+        if( $result = update_option( static::databaseKey(), (array)$pathOrOptions ) ) {
             $this->reset();
         }
         return $result;

plugin/Helper.php

Indentation +174 added lines, -174 removed lines

@@ -8,178 +8,178 @@
 
 class Helper
 {
-    /**
-     * @param string $name
-     * @param string $path
-     * @return string
-     */
-    public static function buildClassName($name, $path = '')
-    {
-        $className = Str::camelCase($name);
-        $path = ltrim(str_replace(__NAMESPACE__, '', $path), '\\');
-        return !empty($path)
-            ? __NAMESPACE__.'\\'.$path.'\\'.$className
-            : $className;
-    }
-
-    /**
-     * @param string $name
-     * @param string $prefix
-     * @return string
-     */
-    public static function buildMethodName($name, $prefix = '')
-    {
-        return lcfirst($prefix.static::buildClassName($name));
-    }
-
-    /**
-     * @param string $name
-     * @return string
-     */
-    public static function buildPropertyName($name)
-    {
-        return static::buildMethodName($name);
-    }
-
-    /**
-     * @param string $cast
-     * @param mixed $value
-     * @return mixed
-     */
-    public static function castTo($cast = '', $value)
-    {
-        $method = static::buildMethodName($cast, 'castTo');
-        return !empty($cast) && method_exists(__CLASS__, $method)
-            ? static::$method($value)
-            : $value;
-    }
-
-    /**
-     * @param mixed $value
-     * @return array
-     */
-    public static function castToArray($value)
-    {
-        return (array) $value;
-    }
-
-    /**
-     * @param mixed $value
-     * @return bool
-     */
-    public static function castToBool($value)
-    {
-        return filter_var($value, FILTER_VALIDATE_BOOLEAN);
-    }
-
-    /**
-     * @param mixed $value
-     * @return float
-     */
-    public static function castToFloat($value)
-    {
-        return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
-    }
-
-    /**
-     * @param mixed $value
-     * @return int
-     */
-    public static function castToInt($value)
-    {
-        return (int) filter_var($value, FILTER_VALIDATE_INT);
-    }
-
-    /**
-     * @param mixed $value
-     * @return object
-     */
-    public static function castToObject($value)
-    {
-        return (object) (array) $value;
-    }
-
-    /**
-     * @param mixed $value
-     * @return string
-     */
-    public static function castToString($value)
-    {
-        if (is_object($value) && in_array('__toString', get_class_methods($value))) {
-            return (string) $value->__toString();
-        }
-        if (is_array($value) || is_object($value)) {
-            return serialize($value);
-        }
-        return (string) $value;
-    }
-
-    /**
-     * @param string $key
-     * @return mixed
-     */
-    public static function filterInput($key, array $request = [])
-    {
-        if (isset($request[$key])) {
-            return $request[$key];
-        }
-        $variable = filter_input(INPUT_POST, $key);
-        if (is_null($variable) && isset($_POST[$key])) {
-            $variable = $_POST[$key];
-        }
-        return $variable;
-    }
-
-    /**
-     * @param string $key
-     * @return array
-     */
-    public static function filterInputArray($key)
-    {
-        $variable = filter_input(INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
-        if (empty($variable) && !empty($_POST[$key]) && is_array($_POST[$key])) {
-            $variable = $_POST[$key];
-        }
-        return (array) $variable;
-    }
-
-    /**
-     * @return string
-     */
-    public static function getIpAddress()
-    {
-        $whitelist = [];
-        $isUsingCloudflare = !empty(filter_input(INPUT_SERVER, 'CF-Connecting-IP'));
-        if (apply_filters('site-reviews/whip/whitelist/cloudflare', $isUsingCloudflare)) {
-            $cloudflareIps = glsr(Cache::class)->getCloudflareIps();
-            $whitelist[Whip::CLOUDFLARE_HEADERS] = [Whip::IPV4 => $cloudflareIps['v4']];
-            if (defined('AF_INET6')) {
-                $whitelist[Whip::CLOUDFLARE_HEADERS][Whip::IPV6] = $cloudflareIps['v6'];
-            }
-        }
-        $whitelist = apply_filters('site-reviews/whip/whitelist', $whitelist);
-        $methods = apply_filters('site-reviews/whip/methods', Whip::ALL_METHODS);
-        $whip = new Whip($methods, $whitelist);
-        do_action_ref_array('site-reviews/whip', [$whip]);
-        if (false !== ($clientAddress = $whip->getValidIpAddress())) {
-            return (string) $clientAddress;
-        }
-        glsr_log()->error('Unable to detect IP address.');
-        return 'unknown';
-    }
-
-    /**
-     * @param mixed $value
-     * @param string|int $min
-     * @param string|int $max
-     * @return bool
-     */
-    public static function inRange($value, $min, $max)
-    {
-        $inRange = filter_var($value, FILTER_VALIDATE_INT, ['options' => [
-            'min_range' => intval($min),
-            'max_range' => intval($max),
-        ]]);
-        return false !== $inRange;
-    }
+	/**
+	 * @param string $name
+	 * @param string $path
+	 * @return string
+	 */
+	public static function buildClassName($name, $path = '')
+	{
+		$className = Str::camelCase($name);
+		$path = ltrim(str_replace(__NAMESPACE__, '', $path), '\\');
+		return !empty($path)
+			? __NAMESPACE__.'\\'.$path.'\\'.$className
+			: $className;
+	}
+
+	/**
+	 * @param string $name
+	 * @param string $prefix
+	 * @return string
+	 */
+	public static function buildMethodName($name, $prefix = '')
+	{
+		return lcfirst($prefix.static::buildClassName($name));
+	}
+
+	/**
+	 * @param string $name
+	 * @return string
+	 */
+	public static function buildPropertyName($name)
+	{
+		return static::buildMethodName($name);
+	}
+
+	/**
+	 * @param string $cast
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	public static function castTo($cast = '', $value)
+	{
+		$method = static::buildMethodName($cast, 'castTo');
+		return !empty($cast) && method_exists(__CLASS__, $method)
+			? static::$method($value)
+			: $value;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return array
+	 */
+	public static function castToArray($value)
+	{
+		return (array) $value;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public static function castToBool($value)
+	{
+		return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return float
+	 */
+	public static function castToFloat($value)
+	{
+		return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return int
+	 */
+	public static function castToInt($value)
+	{
+		return (int) filter_var($value, FILTER_VALIDATE_INT);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return object
+	 */
+	public static function castToObject($value)
+	{
+		return (object) (array) $value;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return string
+	 */
+	public static function castToString($value)
+	{
+		if (is_object($value) && in_array('__toString', get_class_methods($value))) {
+			return (string) $value->__toString();
+		}
+		if (is_array($value) || is_object($value)) {
+			return serialize($value);
+		}
+		return (string) $value;
+	}
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	public static function filterInput($key, array $request = [])
+	{
+		if (isset($request[$key])) {
+			return $request[$key];
+		}
+		$variable = filter_input(INPUT_POST, $key);
+		if (is_null($variable) && isset($_POST[$key])) {
+			$variable = $_POST[$key];
+		}
+		return $variable;
+	}
+
+	/**
+	 * @param string $key
+	 * @return array
+	 */
+	public static function filterInputArray($key)
+	{
+		$variable = filter_input(INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
+		if (empty($variable) && !empty($_POST[$key]) && is_array($_POST[$key])) {
+			$variable = $_POST[$key];
+		}
+		return (array) $variable;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function getIpAddress()
+	{
+		$whitelist = [];
+		$isUsingCloudflare = !empty(filter_input(INPUT_SERVER, 'CF-Connecting-IP'));
+		if (apply_filters('site-reviews/whip/whitelist/cloudflare', $isUsingCloudflare)) {
+			$cloudflareIps = glsr(Cache::class)->getCloudflareIps();
+			$whitelist[Whip::CLOUDFLARE_HEADERS] = [Whip::IPV4 => $cloudflareIps['v4']];
+			if (defined('AF_INET6')) {
+				$whitelist[Whip::CLOUDFLARE_HEADERS][Whip::IPV6] = $cloudflareIps['v6'];
+			}
+		}
+		$whitelist = apply_filters('site-reviews/whip/whitelist', $whitelist);
+		$methods = apply_filters('site-reviews/whip/methods', Whip::ALL_METHODS);
+		$whip = new Whip($methods, $whitelist);
+		do_action_ref_array('site-reviews/whip', [$whip]);
+		if (false !== ($clientAddress = $whip->getValidIpAddress())) {
+			return (string) $clientAddress;
+		}
+		glsr_log()->error('Unable to detect IP address.');
+		return 'unknown';
+	}
+
+	/**
+	 * @param mixed $value
+	 * @param string|int $min
+	 * @param string|int $max
+	 * @return bool
+	 */
+	public static function inRange($value, $min, $max)
+	{
+		$inRange = filter_var($value, FILTER_VALIDATE_INT, ['options' => [
+			'min_range' => intval($min),
+			'max_range' => intval($max),
+		]]);
+		return false !== $inRange;
+	}
 }

Spacing +51 added lines, -51 removed lines

@@ -13,10 +13,10 @@ 
      * @param string $path
      * @return string
      */
-    public static function buildClassName($name, $path = '')
+    public static function buildClassName( $name, $path = '' )
     {
-        $className = Str::camelCase($name);
-        $path = ltrim(str_replace(__NAMESPACE__, '', $path), '\\');
+        $className = Str::camelCase( $name );
+        $path = ltrim( str_replace( __NAMESPACE__, '', $path ), '\\' );
         return !empty($path)
             ? __NAMESPACE__.'\\'.$path.'\\'.$className
             : $className;
@@ -27,18 +27,18 @@ 
      * @param string $prefix
      * @return string
      */
-    public static function buildMethodName($name, $prefix = '')
+    public static function buildMethodName( $name, $prefix = '' )
     {
-        return lcfirst($prefix.static::buildClassName($name));
+        return lcfirst( $prefix.static::buildClassName( $name ) );
     }
 
     /**
      * @param string $name
      * @return string
      */
-    public static function buildPropertyName($name)
+    public static function buildPropertyName( $name )
     {
-        return static::buildMethodName($name);
+        return static::buildMethodName( $name );
     }
 
     /**
@@ -46,11 +46,11 @@ 
      * @param mixed $value
      * @return mixed
      */
-    public static function castTo($cast = '', $value)
+    public static function castTo( $cast = '', $value )
     {
-        $method = static::buildMethodName($cast, 'castTo');
-        return !empty($cast) && method_exists(__CLASS__, $method)
-            ? static::$method($value)
+        $method = static::buildMethodName( $cast, 'castTo' );
+        return !empty($cast) && method_exists( __CLASS__, $method )
+            ? static::$method( $value )
             : $value;
     }
 
@@ -58,73 +58,73 @@ 
      * @param mixed $value
      * @return array
      */
-    public static function castToArray($value)
+    public static function castToArray( $value )
     {
-        return (array) $value;
+        return (array)$value;
     }
 
     /**
      * @param mixed $value
      * @return bool
      */
-    public static function castToBool($value)
+    public static function castToBool( $value )
     {
-        return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+        return filter_var( $value, FILTER_VALIDATE_BOOLEAN );
     }
 
     /**
      * @param mixed $value
      * @return float
      */
-    public static function castToFloat($value)
+    public static function castToFloat( $value )
     {
-        return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
+        return (float)filter_var( $value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND );
     }
 
     /**
      * @param mixed $value
      * @return int
      */
-    public static function castToInt($value)
+    public static function castToInt( $value )
     {
-        return (int) filter_var($value, FILTER_VALIDATE_INT);
+        return (int)filter_var( $value, FILTER_VALIDATE_INT );
     }
 
     /**
      * @param mixed $value
      * @return object
      */
-    public static function castToObject($value)
+    public static function castToObject( $value )
     {
-        return (object) (array) $value;
+        return (object)(array)$value;
     }
 
     /**
      * @param mixed $value
      * @return string
      */
-    public static function castToString($value)
+    public static function castToString( $value )
     {
-        if (is_object($value) && in_array('__toString', get_class_methods($value))) {
-            return (string) $value->__toString();
+        if( is_object( $value ) && in_array( '__toString', get_class_methods( $value ) ) ) {
+            return (string)$value->__toString();
         }
-        if (is_array($value) || is_object($value)) {
-            return serialize($value);
+        if( is_array( $value ) || is_object( $value ) ) {
+            return serialize( $value );
         }
-        return (string) $value;
+        return (string)$value;
     }
 
     /**
      * @param string $key
      * @return mixed
      */
-    public static function filterInput($key, array $request = [])
+    public static function filterInput( $key, array $request = [] )
     {
-        if (isset($request[$key])) {
+        if( isset($request[$key]) ) {
             return $request[$key];
         }
-        $variable = filter_input(INPUT_POST, $key);
-        if (is_null($variable) && isset($_POST[$key])) {
+        $variable = filter_input( INPUT_POST, $key );
+        if( is_null( $variable ) && isset($_POST[$key]) ) {
             $variable = $_POST[$key];
         }
         return $variable;
@@ -134,13 +134,13 @@ 
      * @param string $key
      * @return array
      */
-    public static function filterInputArray($key)
+    public static function filterInputArray( $key )
     {
-        $variable = filter_input(INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
-        if (empty($variable) && !empty($_POST[$key]) && is_array($_POST[$key])) {
+        $variable = filter_input( INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
+        if( empty($variable) && !empty($_POST[$key]) && is_array( $_POST[$key] ) ) {
             $variable = $_POST[$key];
         }
-        return (array) $variable;
+        return (array)$variable;
     }
 
     /**
@@ -149,22 +149,22 @@ 
     public static function getIpAddress()
     {
         $whitelist = [];
-        $isUsingCloudflare = !empty(filter_input(INPUT_SERVER, 'CF-Connecting-IP'));
-        if (apply_filters('site-reviews/whip/whitelist/cloudflare', $isUsingCloudflare)) {
-            $cloudflareIps = glsr(Cache::class)->getCloudflareIps();
+        $isUsingCloudflare = !empty(filter_input( INPUT_SERVER, 'CF-Connecting-IP' ));
+        if( apply_filters( 'site-reviews/whip/whitelist/cloudflare', $isUsingCloudflare ) ) {
+            $cloudflareIps = glsr( Cache::class )->getCloudflareIps();
             $whitelist[Whip::CLOUDFLARE_HEADERS] = [Whip::IPV4 => $cloudflareIps['v4']];
-            if (defined('AF_INET6')) {
+            if( defined( 'AF_INET6' ) ) {
                 $whitelist[Whip::CLOUDFLARE_HEADERS][Whip::IPV6] = $cloudflareIps['v6'];
             }
         }
-        $whitelist = apply_filters('site-reviews/whip/whitelist', $whitelist);
-        $methods = apply_filters('site-reviews/whip/methods', Whip::ALL_METHODS);
-        $whip = new Whip($methods, $whitelist);
-        do_action_ref_array('site-reviews/whip', [$whip]);
-        if (false !== ($clientAddress = $whip->getValidIpAddress())) {
-            return (string) $clientAddress;
+        $whitelist = apply_filters( 'site-reviews/whip/whitelist', $whitelist );
+        $methods = apply_filters( 'site-reviews/whip/methods', Whip::ALL_METHODS );
+        $whip = new Whip( $methods, $whitelist );
+        do_action_ref_array( 'site-reviews/whip', [$whip] );
+        if( false !== ($clientAddress = $whip->getValidIpAddress()) ) {
+            return (string)$clientAddress;
         }
-        glsr_log()->error('Unable to detect IP address.');
+        glsr_log()->error( 'Unable to detect IP address.' );
         return 'unknown';
     }
 
@@ -174,12 +174,12 @@ 
      * @param string|int $max
      * @return bool
      */
-    public static function inRange($value, $min, $max)
+    public static function inRange( $value, $min, $max )
     {
-        $inRange = filter_var($value, FILTER_VALIDATE_INT, ['options' => [
-            'min_range' => intval($min),
-            'max_range' => intval($max),
-        ]]);
+        $inRange = filter_var( $value, FILTER_VALIDATE_INT, ['options' => [
+            'min_range' => intval( $min ),
+            'max_range' => intval( $max ),
+        ]] );
         return false !== $inRange;
     }
 }

plugin/Modules/Validator/ValidateReview.php

Indentation +272 added lines, -272 removed lines

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

Spacing +73 added lines, -73 removed lines

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

plugin/Modules/Schema.php

Indentation +308 added lines, -308 removed lines

@@ -12,335 +12,335 @@
 
 class Schema
 {
-    /**
-     * @var array
-     */
-    protected $args;
+	/**
+	 * @var array
+	 */
+	protected $args;
 
-    /**
-     * @var array
-     */
-    protected $keyValues = [];
+	/**
+	 * @var array
+	 */
+	protected $keyValues = [];
 
-    /**
-     * @var array
-     */
-    protected $ratingCounts;
+	/**
+	 * @var array
+	 */
+	protected $ratingCounts;
 
-    /**
-     * @return array
-     */
-    public function build(array $args = [])
-    {
-        $this->args = $args;
-        $schema = $this->buildSummary($args);
-        if (!empty($schema)) {
-            $reviews = $this->buildReviews();
-            foreach ($reviews as &$review) {
-                unset($review['@context']);
-                unset($review['itemReviewed']);
-            });
-        }
-        if (!empty($reviews)) {
-            $schema['review'] = $reviews;
-        }
-        return $schema;
-    }
+	/**
+	 * @return array
+	 */
+	public function build(array $args = [])
+	{
+		$this->args = $args;
+		$schema = $this->buildSummary($args);
+		if (!empty($schema)) {
+			$reviews = $this->buildReviews();
+			foreach ($reviews as &$review) {
+				unset($review['@context']);
+				unset($review['itemReviewed']);
+			});
+		}
+		if (!empty($reviews)) {
+			$schema['review'] = $reviews;
+		}
+		return $schema;
+	}
 
-    /**
-     * @param array|null $args
-     * @return array
-     */
-    public function buildSummary($args = null)
-    {
-        if (is_array($args)) {
-            $this->args = $args;
-        }
-        $buildSummary = Helper::buildMethodName($this->getSchemaOptionValue('type'), 'buildSummaryFor');
-        if ($count = array_sum($this->getRatingCounts())) {
-            $schema = method_exists($this, $buildSummary)
-                ? $this->$buildSummary()
-                : $this->buildSummaryForCustom();
-            $schema->aggregateRating(
-                $this->getSchemaType('AggregateRating')
-                    ->ratingValue($this->getRatingValue())
-                    ->reviewCount($count)
-                    ->bestRating(glsr()->constant('MAX_RATING', Rating::class))
-                    ->worstRating(glsr()->constant('MIN_RATING', Rating::class))
-            );
-            $schema = $schema->toArray();
-            return apply_filters('site-reviews/schema/'.$schema['@type'], $schema, $args);
-        }
-        return [];
-    }
+	/**
+	 * @param array|null $args
+	 * @return array
+	 */
+	public function buildSummary($args = null)
+	{
+		if (is_array($args)) {
+			$this->args = $args;
+		}
+		$buildSummary = Helper::buildMethodName($this->getSchemaOptionValue('type'), 'buildSummaryFor');
+		if ($count = array_sum($this->getRatingCounts())) {
+			$schema = method_exists($this, $buildSummary)
+				? $this->$buildSummary()
+				: $this->buildSummaryForCustom();
+			$schema->aggregateRating(
+				$this->getSchemaType('AggregateRating')
+					->ratingValue($this->getRatingValue())
+					->reviewCount($count)
+					->bestRating(glsr()->constant('MAX_RATING', Rating::class))
+					->worstRating(glsr()->constant('MIN_RATING', Rating::class))
+			);
+			$schema = $schema->toArray();
+			return apply_filters('site-reviews/schema/'.$schema['@type'], $schema, $args);
+		}
+		return [];
+	}
 
-    /**
-     * @return void
-     */
-    public function render()
-    {
-        if (empty(glsr()->schemas)) {
-            return;
-        }
-        printf('<script type="application/ld+json">%s</script>', json_encode(
-            apply_filters('site-reviews/schema/all', glsr()->schemas),
-            JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES
-        ));
-    }
+	/**
+	 * @return void
+	 */
+	public function render()
+	{
+		if (empty(glsr()->schemas)) {
+			return;
+		}
+		printf('<script type="application/ld+json">%s</script>', json_encode(
+			apply_filters('site-reviews/schema/all', glsr()->schemas),
+			JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES
+		));
+	}
 
-    /**
-     * @return void
-     */
-    public function store(array $schema)
-    {
-        if (empty($schema)) {
-            return;
-        }
-        $schemas = glsr()->schemas;
-        $schemas[] = $schema;
-        glsr()->schemas = array_map('unserialize', array_unique(array_map('serialize', $schemas)));
-    }
+	/**
+	 * @return void
+	 */
+	public function store(array $schema)
+	{
+		if (empty($schema)) {
+			return;
+		}
+		$schemas = glsr()->schemas;
+		$schemas[] = $schema;
+		glsr()->schemas = array_map('unserialize', array_unique(array_map('serialize', $schemas)));
+	}
 
-    /**
-     * @param Review $review
-     * @return array
-     */
-    protected function buildReview($review)
-    {
-        $schema = $this->getSchemaType('Review')
-            ->doIf(!in_array('title', $this->args['hide']), function ($schema) use ($review) {
-                $schema->name($review->title);
-            })
-            ->doIf(!in_array('excerpt', $this->args['hide']), function ($schema) use ($review) {
-                $schema->reviewBody($review->content);
-            })
-            ->datePublished((new DateTime($review->date)))
-            ->author($this->getSchemaType('Person')->name($review->author))
-            ->itemReviewed($this->getSchemaType()->name($this->getSchemaOptionValue('name')));
-        if (!empty($review->rating)) {
-            $schema->reviewRating(
-                $this->getSchemaType('Rating')
-                    ->ratingValue($review->rating)
-                    ->bestRating(glsr()->constant('MAX_RATING', Rating::class))
-                    ->worstRating(glsr()->constant('MIN_RATING', Rating::class))
-            );
-        }
-        return apply_filters('site-reviews/schema/review', $schema->toArray(), $review, $this->args);
-    }
+	/**
+	 * @param Review $review
+	 * @return array
+	 */
+	protected function buildReview($review)
+	{
+		$schema = $this->getSchemaType('Review')
+			->doIf(!in_array('title', $this->args['hide']), function ($schema) use ($review) {
+				$schema->name($review->title);
+			})
+			->doIf(!in_array('excerpt', $this->args['hide']), function ($schema) use ($review) {
+				$schema->reviewBody($review->content);
+			})
+			->datePublished((new DateTime($review->date)))
+			->author($this->getSchemaType('Person')->name($review->author))
+			->itemReviewed($this->getSchemaType()->name($this->getSchemaOptionValue('name')));
+		if (!empty($review->rating)) {
+			$schema->reviewRating(
+				$this->getSchemaType('Rating')
+					->ratingValue($review->rating)
+					->bestRating(glsr()->constant('MAX_RATING', Rating::class))
+					->worstRating(glsr()->constant('MIN_RATING', Rating::class))
+			);
+		}
+		return apply_filters('site-reviews/schema/review', $schema->toArray(), $review, $this->args);
+	}
 
-    /**
-     * @return array
-     */
-    protected function buildReviews()
-    {
-        $reviews = [];
-        foreach (glsr(ReviewManager::class)->get($this->args) as $review) {
-            // Only include critic reviews that have been directly produced by your site, not reviews from third-party sites or syndicated reviews.
-            // @see https://developers.google.com/search/docs/data-types/review
-            if ('local' === $review->review_type) {
-                $reviews[] = $this->buildReview($review);
-            }
-        }
-        return $reviews;
-    }
+	/**
+	 * @return array
+	 */
+	protected function buildReviews()
+	{
+		$reviews = [];
+		foreach (glsr(ReviewManager::class)->get($this->args) as $review) {
+			// Only include critic reviews that have been directly produced by your site, not reviews from third-party sites or syndicated reviews.
+			// @see https://developers.google.com/search/docs/data-types/review
+			if ('local' === $review->review_type) {
+				$reviews[] = $this->buildReview($review);
+			}
+		}
+		return $reviews;
+	}
 
-    /**
-     * @param mixed $schema
-     * @return mixed
-     */
-    protected function buildSchemaValues($schema, array $values = [])
-    {
-        foreach ($values as $value) {
-            $option = $this->getSchemaOptionValue($value);
-            if (empty($option)) {
-                continue;
-            }
-            $schema->$value($option);
-        }
-        return $schema;
-    }
+	/**
+	 * @param mixed $schema
+	 * @return mixed
+	 */
+	protected function buildSchemaValues($schema, array $values = [])
+	{
+		foreach ($values as $value) {
+			$option = $this->getSchemaOptionValue($value);
+			if (empty($option)) {
+				continue;
+			}
+			$schema->$value($option);
+		}
+		return $schema;
+	}
 
-    /**
-     * @return mixed
-     */
-    protected function buildSummaryForCustom()
-    {
-        return $this->buildSchemaValues($this->getSchemaType(), [
-            'description', 'image', 'name', 'url',
-        ]);
-    }
+	/**
+	 * @return mixed
+	 */
+	protected function buildSummaryForCustom()
+	{
+		return $this->buildSchemaValues($this->getSchemaType(), [
+			'description', 'image', 'name', 'url',
+		]);
+	}
 
-    /**
-     * @return mixed
-     */
-    protected function buildSummaryForLocalBusiness()
-    {
-        return $this->buildSchemaValues($this->buildSummaryForCustom(), [
-            'address', 'priceRange', 'telephone',
-        ]);
-    }
+	/**
+	 * @return mixed
+	 */
+	protected function buildSummaryForLocalBusiness()
+	{
+		return $this->buildSchemaValues($this->buildSummaryForCustom(), [
+			'address', 'priceRange', 'telephone',
+		]);
+	}
 
-    /**
-     * @return mixed
-     */
-    protected function buildSummaryForProduct()
-    {
-        $offerType = $this->getSchemaOption('offerType', 'AggregateOffer');
-        $offers = $this->buildSchemaValues($this->getSchemaType($offerType), [
-            'highPrice', 'lowPrice', 'price', 'priceCurrency',
-        ]);
-        return $this->buildSummaryForCustom()
-            ->doIf(!empty($offers->getProperties()), function ($schema) use ($offers) {
-                $schema->offers($offers);
-            })
-            ->setProperty('@id', $this->getSchemaOptionValue('url').'#product');
-    }
+	/**
+	 * @return mixed
+	 */
+	protected function buildSummaryForProduct()
+	{
+		$offerType = $this->getSchemaOption('offerType', 'AggregateOffer');
+		$offers = $this->buildSchemaValues($this->getSchemaType($offerType), [
+			'highPrice', 'lowPrice', 'price', 'priceCurrency',
+		]);
+		return $this->buildSummaryForCustom()
+			->doIf(!empty($offers->getProperties()), function ($schema) use ($offers) {
+				$schema->offers($offers);
+			})
+			->setProperty('@id', $this->getSchemaOptionValue('url').'#product');
+	}
 
-    /**
-     * @return array
-     */
-    protected function getRatingCounts()
-    {
-        if (!isset($this->ratingCounts)) {
-            $this->ratingCounts = glsr(ReviewManager::class)->getRatingCounts($this->args);
-        }
-        return $this->ratingCounts;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getRatingCounts()
+	{
+		if (!isset($this->ratingCounts)) {
+			$this->ratingCounts = glsr(ReviewManager::class)->getRatingCounts($this->args);
+		}
+		return $this->ratingCounts;
+	}
 
-    /**
-     * @return int|float
-     */
-    protected function getRatingValue()
-    {
-        return glsr(Rating::class)->getAverage($this->getRatingCounts());
-    }
+	/**
+	 * @return int|float
+	 */
+	protected function getRatingValue()
+	{
+		return glsr(Rating::class)->getAverage($this->getRatingCounts());
+	}
 
-    /**
-     * @param string $option
-     * @param string $fallback
-     * @return string
-     */
-    protected function getSchemaOption($option, $fallback)
-    {
-        $option = strtolower($option);
-        if ($schemaOption = trim((string) get_post_meta(intval(get_the_ID()), 'schema_'.$option, true))) {
-            return $schemaOption;
-        }
-        $setting = glsr(OptionManager::class)->get('settings.schema.'.$option);
-        if (is_array($setting)) {
-            return $this->getSchemaOptionDefault($setting, $fallback);
-        }
-        return !empty($setting)
-            ? $setting
-            : $fallback;
-    }
+	/**
+	 * @param string $option
+	 * @param string $fallback
+	 * @return string
+	 */
+	protected function getSchemaOption($option, $fallback)
+	{
+		$option = strtolower($option);
+		if ($schemaOption = trim((string) get_post_meta(intval(get_the_ID()), 'schema_'.$option, true))) {
+			return $schemaOption;
+		}
+		$setting = glsr(OptionManager::class)->get('settings.schema.'.$option);
+		if (is_array($setting)) {
+			return $this->getSchemaOptionDefault($setting, $fallback);
+		}
+		return !empty($setting)
+			? $setting
+			: $fallback;
+	}
 
-    /**
-     * @param string $fallback
-     * @return string
-     */
-    protected function getSchemaOptionDefault(array $setting, $fallback)
-    {
-        $setting = wp_parse_args($setting, [
-            'custom' => '',
-            'default' => $fallback,
-        ]);
-        return 'custom' != $setting['default']
-            ? $setting['default']
-            : $setting['custom'];
-    }
+	/**
+	 * @param string $fallback
+	 * @return string
+	 */
+	protected function getSchemaOptionDefault(array $setting, $fallback)
+	{
+		$setting = wp_parse_args($setting, [
+			'custom' => '',
+			'default' => $fallback,
+		]);
+		return 'custom' != $setting['default']
+			? $setting['default']
+			: $setting['custom'];
+	}
 
-    /**
-     * @param string $option
-     * @param string $fallback
-     * @return void|string
-     */
-    protected function getSchemaOptionValue($option, $fallback = 'post')
-    {
-        if (array_key_exists($option, $this->keyValues)) {
-            return $this->keyValues[$option];
-        }
-        $value = $this->getSchemaOption($option, $fallback);
-        if ($value != $fallback) {
-            return $this->setAndGetKeyValue($option, $value);
-        }
-        if (!is_single() && !is_page()) {
-            return;
-        }
-        $method = Helper::buildMethodName($option, 'getThing');
-        if (method_exists($this, $method)) {
-            return $this->setAndGetKeyValue($option, $this->$method());
-        }
-    }
+	/**
+	 * @param string $option
+	 * @param string $fallback
+	 * @return void|string
+	 */
+	protected function getSchemaOptionValue($option, $fallback = 'post')
+	{
+		if (array_key_exists($option, $this->keyValues)) {
+			return $this->keyValues[$option];
+		}
+		$value = $this->getSchemaOption($option, $fallback);
+		if ($value != $fallback) {
+			return $this->setAndGetKeyValue($option, $value);
+		}
+		if (!is_single() && !is_page()) {
+			return;
+		}
+		$method = Helper::buildMethodName($option, 'getThing');
+		if (method_exists($this, $method)) {
+			return $this->setAndGetKeyValue($option, $this->$method());
+		}
+	}
 
-    /**
-     * @param string|null $type
-     * @return mixed
-     */
-    protected function getSchemaType($type = null)
-    {
-        if (!is_string($type)) {
-            $type = $this->getSchemaOption('type', 'LocalBusiness');
-        }
-        $className = Helper::buildClassName($type, 'Modules\Schema');
-        return class_exists($className)
-            ? new $className()
-            : new UnknownType($type);
-    }
+	/**
+	 * @param string|null $type
+	 * @return mixed
+	 */
+	protected function getSchemaType($type = null)
+	{
+		if (!is_string($type)) {
+			$type = $this->getSchemaOption('type', 'LocalBusiness');
+		}
+		$className = Helper::buildClassName($type, 'Modules\Schema');
+		return class_exists($className)
+			? new $className()
+			: new UnknownType($type);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getThingDescription()
-    {
-        $post = get_post();
-        $text = Arr::get($post, 'post_excerpt');
-        if (empty($text)) {
-            $text = Arr::get($post, 'post_content');
-        }
-        if (function_exists('excerpt_remove_blocks')) {
-            $text = excerpt_remove_blocks($text);
-        }
-        $text = strip_shortcodes($text);
-        $text = wpautop($text);
-        $text = wptexturize($text);
-        $text = wp_strip_all_tags($text);
-        $text = str_replace(']]>', ']]&gt;', $text);
-        return wp_trim_words($text, apply_filters('excerpt_length', 55));
-    }
+	/**
+	 * @return string
+	 */
+	protected function getThingDescription()
+	{
+		$post = get_post();
+		$text = Arr::get($post, 'post_excerpt');
+		if (empty($text)) {
+			$text = Arr::get($post, 'post_content');
+		}
+		if (function_exists('excerpt_remove_blocks')) {
+			$text = excerpt_remove_blocks($text);
+		}
+		$text = strip_shortcodes($text);
+		$text = wpautop($text);
+		$text = wptexturize($text);
+		$text = wp_strip_all_tags($text);
+		$text = str_replace(']]>', ']]&gt;', $text);
+		return wp_trim_words($text, apply_filters('excerpt_length', 55));
+	}
 
-    /**
-     * @return string
-     */
-    protected function getThingImage()
-    {
-        return (string) get_the_post_thumbnail_url(null, 'large');
-    }
+	/**
+	 * @return string
+	 */
+	protected function getThingImage()
+	{
+		return (string) get_the_post_thumbnail_url(null, 'large');
+	}
 
-    /**
-     * @return string
-     */
-    protected function getThingName()
-    {
-        return get_the_title();
-    }
+	/**
+	 * @return string
+	 */
+	protected function getThingName()
+	{
+		return get_the_title();
+	}
 
-    /**
-     * @return string
-     */
-    protected function getThingUrl()
-    {
-        return (string) get_the_permalink();
-    }
+	/**
+	 * @return string
+	 */
+	protected function getThingUrl()
+	{
+		return (string) get_the_permalink();
+	}
 
-    /**
-     * @param string $option
-     * @param string $value
-     * @return string
-     */
-    protected function setAndGetKeyValue($option, $value)
-    {
-        $this->keyValues[$option] = $value;
-        return $value;
-    }
+	/**
+	 * @param string $option
+	 * @param string $value
+	 * @return string
+	 */
+	protected function setAndGetKeyValue($option, $value)
+	{
+		$this->keyValues[$option] = $value;
+		return $value;
+	}
 }

Spacing +97 added lines, -97 removed lines

@@ -30,18 +30,18 @@ 
     /**
      * @return array
      */
-    public function build(array $args = [])
+    public function build( array $args = [] )
     {
         $this->args = $args;
-        $schema = $this->buildSummary($args);
-        if (!empty($schema)) {
+        $schema = $this->buildSummary( $args );
+        if( !empty($schema) ) {
             $reviews = $this->buildReviews();
-            foreach ($reviews as &$review) {
+            foreach( $reviews as &$review ) {
                 unset($review['@context']);
                 unset($review['itemReviewed']);
             });
         }
-        if (!empty($reviews)) {
+        if( !empty($reviews) ) {
             $schema['review'] = $reviews;
         }
         return $schema;
@@ -51,25 +51,25 @@ 
      * @param array|null $args
      * @return array
      */
-    public function buildSummary($args = null)
+    public function buildSummary( $args = null )
     {
-        if (is_array($args)) {
+        if( is_array( $args ) ) {
             $this->args = $args;
         }
-        $buildSummary = Helper::buildMethodName($this->getSchemaOptionValue('type'), 'buildSummaryFor');
-        if ($count = array_sum($this->getRatingCounts())) {
-            $schema = method_exists($this, $buildSummary)
+        $buildSummary = Helper::buildMethodName( $this->getSchemaOptionValue( 'type' ), 'buildSummaryFor' );
+        if( $count = array_sum( $this->getRatingCounts() ) ) {
+            $schema = method_exists( $this, $buildSummary )
                 ? $this->$buildSummary()
                 : $this->buildSummaryForCustom();
             $schema->aggregateRating(
-                $this->getSchemaType('AggregateRating')
-                    ->ratingValue($this->getRatingValue())
-                    ->reviewCount($count)
-                    ->bestRating(glsr()->constant('MAX_RATING', Rating::class))
-                    ->worstRating(glsr()->constant('MIN_RATING', Rating::class))
+                $this->getSchemaType( 'AggregateRating' )
+                    ->ratingValue( $this->getRatingValue() )
+                    ->reviewCount( $count )
+                    ->bestRating( glsr()->constant( 'MAX_RATING', Rating::class ) )
+                    ->worstRating( glsr()->constant( 'MIN_RATING', Rating::class ) )
             );
             $schema = $schema->toArray();
-            return apply_filters('site-reviews/schema/'.$schema['@type'], $schema, $args);
+            return apply_filters( 'site-reviews/schema/'.$schema['@type'], $schema, $args );
         }
         return [];
     }
@@ -79,53 +79,53 @@ 
      */
     public function render()
     {
-        if (empty(glsr()->schemas)) {
+        if( empty(glsr()->schemas) ) {
             return;
         }
-        printf('<script type="application/ld+json">%s</script>', json_encode(
-            apply_filters('site-reviews/schema/all', glsr()->schemas),
+        printf( '<script type="application/ld+json">%s</script>', json_encode(
+            apply_filters( 'site-reviews/schema/all', glsr()->schemas ),
             JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES
-        ));
+        ) );
     }
 
     /**
      * @return void
      */
-    public function store(array $schema)
+    public function store( array $schema )
     {
-        if (empty($schema)) {
+        if( empty($schema) ) {
             return;
         }
         $schemas = glsr()->schemas;
         $schemas[] = $schema;
-        glsr()->schemas = array_map('unserialize', array_unique(array_map('serialize', $schemas)));
+        glsr()->schemas = array_map( 'unserialize', array_unique( array_map( 'serialize', $schemas ) ) );
     }
 
     /**
      * @param Review $review
      * @return array
      */
-    protected function buildReview($review)
+    protected function buildReview( $review )
     {
-        $schema = $this->getSchemaType('Review')
-            ->doIf(!in_array('title', $this->args['hide']), function ($schema) use ($review) {
-                $schema->name($review->title);
+        $schema = $this->getSchemaType( 'Review' )
+            ->doIf( !in_array( 'title', $this->args['hide'] ), function( $schema ) use ($review) {
+                $schema->name( $review->title );
             })
-            ->doIf(!in_array('excerpt', $this->args['hide']), function ($schema) use ($review) {
-                $schema->reviewBody($review->content);
+            ->doIf( !in_array( 'excerpt', $this->args['hide'] ), function( $schema ) use ($review) {
+                $schema->reviewBody( $review->content );
             })
-            ->datePublished((new DateTime($review->date)))
-            ->author($this->getSchemaType('Person')->name($review->author))
-            ->itemReviewed($this->getSchemaType()->name($this->getSchemaOptionValue('name')));
-        if (!empty($review->rating)) {
+            ->datePublished( (new DateTime( $review->date )) )
+            ->author( $this->getSchemaType( 'Person' )->name( $review->author ) )
+            ->itemReviewed( $this->getSchemaType()->name( $this->getSchemaOptionValue( 'name' ) ) );
+        if( !empty($review->rating) ) {
             $schema->reviewRating(
-                $this->getSchemaType('Rating')
-                    ->ratingValue($review->rating)
-                    ->bestRating(glsr()->constant('MAX_RATING', Rating::class))
-                    ->worstRating(glsr()->constant('MIN_RATING', Rating::class))
+                $this->getSchemaType( 'Rating' )
+                    ->ratingValue( $review->rating )
+                    ->bestRating( glsr()->constant( 'MAX_RATING', Rating::class ) )
+                    ->worstRating( glsr()->constant( 'MIN_RATING', Rating::class ) )
             );
         }
-        return apply_filters('site-reviews/schema/review', $schema->toArray(), $review, $this->args);
+        return apply_filters( 'site-reviews/schema/review', $schema->toArray(), $review, $this->args );
     }
 
     /**
@@ -134,11 +134,11 @@ 
     protected function buildReviews()
     {
         $reviews = [];
-        foreach (glsr(ReviewManager::class)->get($this->args) as $review) {
+        foreach( glsr( ReviewManager::class )->get( $this->args ) as $review ) {
             // Only include critic reviews that have been directly produced by your site, not reviews from third-party sites or syndicated reviews.
             // @see https://developers.google.com/search/docs/data-types/review
-            if ('local' === $review->review_type) {
-                $reviews[] = $this->buildReview($review);
+            if( 'local' === $review->review_type ) {
+                $reviews[] = $this->buildReview( $review );
             }
         }
         return $reviews;
@@ -148,14 +148,14 @@ 
      * @param mixed $schema
      * @return mixed
      */
-    protected function buildSchemaValues($schema, array $values = [])
+    protected function buildSchemaValues( $schema, array $values = [] )
     {
-        foreach ($values as $value) {
-            $option = $this->getSchemaOptionValue($value);
-            if (empty($option)) {
+        foreach( $values as $value ) {
+            $option = $this->getSchemaOptionValue( $value );
+            if( empty($option) ) {
                 continue;
             }
-            $schema->$value($option);
+            $schema->$value( $option );
         }
         return $schema;
     }
@@ -165,9 +165,9 @@ 
      */
     protected function buildSummaryForCustom()
     {
-        return $this->buildSchemaValues($this->getSchemaType(), [
+        return $this->buildSchemaValues( $this->getSchemaType(), [
             'description', 'image', 'name', 'url',
-        ]);
+        ] );
     }
 
     /**
@@ -175,9 +175,9 @@ 
      */
     protected function buildSummaryForLocalBusiness()
     {
-        return $this->buildSchemaValues($this->buildSummaryForCustom(), [
+        return $this->buildSchemaValues( $this->buildSummaryForCustom(), [
             'address', 'priceRange', 'telephone',
-        ]);
+        ] );
     }
 
     /**
@@ -185,15 +185,15 @@ 
      */
     protected function buildSummaryForProduct()
     {
-        $offerType = $this->getSchemaOption('offerType', 'AggregateOffer');
-        $offers = $this->buildSchemaValues($this->getSchemaType($offerType), [
+        $offerType = $this->getSchemaOption( 'offerType', 'AggregateOffer' );
+        $offers = $this->buildSchemaValues( $this->getSchemaType( $offerType ), [
             'highPrice', 'lowPrice', 'price', 'priceCurrency',
-        ]);
+        ] );
         return $this->buildSummaryForCustom()
-            ->doIf(!empty($offers->getProperties()), function ($schema) use ($offers) {
-                $schema->offers($offers);
+            ->doIf( !empty($offers->getProperties()), function( $schema ) use ($offers) {
+                $schema->offers( $offers );
             })
-            ->setProperty('@id', $this->getSchemaOptionValue('url').'#product');
+            ->setProperty( '@id', $this->getSchemaOptionValue( 'url' ).'#product' );
     }
 
     /**
@@ -201,8 +201,8 @@ 
      */
     protected function getRatingCounts()
     {
-        if (!isset($this->ratingCounts)) {
-            $this->ratingCounts = glsr(ReviewManager::class)->getRatingCounts($this->args);
+        if( !isset($this->ratingCounts) ) {
+            $this->ratingCounts = glsr( ReviewManager::class )->getRatingCounts( $this->args );
         }
         return $this->ratingCounts;
     }
@@ -212,7 +212,7 @@ 
      */
     protected function getRatingValue()
     {
-        return glsr(Rating::class)->getAverage($this->getRatingCounts());
+        return glsr( Rating::class )->getAverage( $this->getRatingCounts() );
     }
 
     /**
@@ -220,15 +220,15 @@ 
      * @param string $fallback
      * @return string
      */
-    protected function getSchemaOption($option, $fallback)
+    protected function getSchemaOption( $option, $fallback )
     {
-        $option = strtolower($option);
-        if ($schemaOption = trim((string) get_post_meta(intval(get_the_ID()), 'schema_'.$option, true))) {
+        $option = strtolower( $option );
+        if( $schemaOption = trim( (string)get_post_meta( intval( get_the_ID() ), 'schema_'.$option, true ) ) ) {
             return $schemaOption;
         }
-        $setting = glsr(OptionManager::class)->get('settings.schema.'.$option);
-        if (is_array($setting)) {
-            return $this->getSchemaOptionDefault($setting, $fallback);
+        $setting = glsr( OptionManager::class )->get( 'settings.schema.'.$option );
+        if( is_array( $setting ) ) {
+            return $this->getSchemaOptionDefault( $setting, $fallback );
         }
         return !empty($setting)
             ? $setting
@@ -239,12 +239,12 @@ 
      * @param string $fallback
      * @return string
      */
-    protected function getSchemaOptionDefault(array $setting, $fallback)
+    protected function getSchemaOptionDefault( array $setting, $fallback )
     {
-        $setting = wp_parse_args($setting, [
+        $setting = wp_parse_args( $setting, [
             'custom' => '',
             'default' => $fallback,
-        ]);
+        ] );
         return 'custom' != $setting['default']
             ? $setting['default']
             : $setting['custom'];
@@ -255,21 +255,21 @@ 
      * @param string $fallback
      * @return void|string
      */
-    protected function getSchemaOptionValue($option, $fallback = 'post')
+    protected function getSchemaOptionValue( $option, $fallback = 'post' )
     {
-        if (array_key_exists($option, $this->keyValues)) {
+        if( array_key_exists( $option, $this->keyValues ) ) {
             return $this->keyValues[$option];
         }
-        $value = $this->getSchemaOption($option, $fallback);
-        if ($value != $fallback) {
-            return $this->setAndGetKeyValue($option, $value);
+        $value = $this->getSchemaOption( $option, $fallback );
+        if( $value != $fallback ) {
+            return $this->setAndGetKeyValue( $option, $value );
         }
-        if (!is_single() && !is_page()) {
+        if( !is_single() && !is_page() ) {
             return;
         }
-        $method = Helper::buildMethodName($option, 'getThing');
-        if (method_exists($this, $method)) {
-            return $this->setAndGetKeyValue($option, $this->$method());
+        $method = Helper::buildMethodName( $option, 'getThing' );
+        if( method_exists( $this, $method ) ) {
+            return $this->setAndGetKeyValue( $option, $this->$method() );
         }
     }
 
@@ -277,15 +277,15 @@ 
      * @param string|null $type
      * @return mixed
      */
-    protected function getSchemaType($type = null)
+    protected function getSchemaType( $type = null )
     {
-        if (!is_string($type)) {
-            $type = $this->getSchemaOption('type', 'LocalBusiness');
+        if( !is_string( $type ) ) {
+            $type = $this->getSchemaOption( 'type', 'LocalBusiness' );
         }
-        $className = Helper::buildClassName($type, 'Modules\Schema');
-        return class_exists($className)
+        $className = Helper::buildClassName( $type, 'Modules\Schema' );
+        return class_exists( $className )
             ? new $className()
-            : new UnknownType($type);
+            : new UnknownType( $type );
     }
 
     /**
@@ -294,19 +294,19 @@ 
     protected function getThingDescription()
     {
         $post = get_post();
-        $text = Arr::get($post, 'post_excerpt');
-        if (empty($text)) {
-            $text = Arr::get($post, 'post_content');
+        $text = Arr::get( $post, 'post_excerpt' );
+        if( empty($text) ) {
+            $text = Arr::get( $post, 'post_content' );
         }
-        if (function_exists('excerpt_remove_blocks')) {
-            $text = excerpt_remove_blocks($text);
+        if( function_exists( 'excerpt_remove_blocks' ) ) {
+            $text = excerpt_remove_blocks( $text );
         }
-        $text = strip_shortcodes($text);
-        $text = wpautop($text);
-        $text = wptexturize($text);
-        $text = wp_strip_all_tags($text);
-        $text = str_replace(']]>', ']]&gt;', $text);
-        return wp_trim_words($text, apply_filters('excerpt_length', 55));
+        $text = strip_shortcodes( $text );
+        $text = wpautop( $text );
+        $text = wptexturize( $text );
+        $text = wp_strip_all_tags( $text );
+        $text = str_replace( ']]>', ']]&gt;', $text );
+        return wp_trim_words( $text, apply_filters( 'excerpt_length', 55 ) );
     }
 
     /**
@@ -314,7 +314,7 @@ 
      */
     protected function getThingImage()
     {
-        return (string) get_the_post_thumbnail_url(null, 'large');
+        return (string)get_the_post_thumbnail_url( null, 'large' );
     }
 
     /**
@@ -330,7 +330,7 @@ 
      */
     protected function getThingUrl()
     {
-        return (string) get_the_permalink();
+        return (string)get_the_permalink();
     }
 
     /**
@@ -338,7 +338,7 @@ 
      * @param string $value
      * @return string
      */
-    protected function setAndGetKeyValue($option, $value)
+    protected function setAndGetKeyValue( $option, $value )
     {
         $this->keyValues[$option] = $value;
         return $value;