pryley / site-reviews

plugin/Shortcodes/TinymcePopupGenerator.php

Braces +18 added lines, -6 removed lines

@@ -56,9 +56,13 @@ 
 	protected function generateFields( array $fields )
 	{
 		$generatedFields = array_map( function( $field ) {
-			if( empty( $field ))return;
+			if( empty( $field )) {
+				return;
+			}
 			$field = $this->normalize( $field );
-			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return;
+			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ))) {
+				return;
+			}
 			return $this->$method( $field );
 		}, $fields );
 		return array_values( array_filter( $generatedFields ));
@@ -73,7 +77,9 @@ 
 		if( !empty( $this->errors )) {
 			$errors = [];
 			foreach( $this->required as $name => $alert ) {
-				if( false !== array_search( $name, glsr_array_column( $fields, 'name' )))continue;
+				if( false !== array_search( $name, glsr_array_column( $fields, 'name' ))) {
+					continue;
+				}
 				$errors[] = $this->errors[$name];
 			}
 			$this->errors = $errors;
@@ -117,7 +123,9 @@ 
 	 */
 	protected function normalizeContainer( array $field )
 	{
-		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return;
+		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field )) {
+			return;
+		}
 		$field['items'] = $this->generateFields( $field['items'] );
 		return $field;
 	}
@@ -127,7 +135,9 @@ 
 	 */
 	protected function normalizeField( array $field, array $defaults )
 	{
-		if( !$this->validate( $field ))return;
+		if( !$this->validate( $field )) {
+			return;
+		}
 		return array_filter( shortcode_atts( $defaults, $field ), function( $value ) {
 			return $value !== '';
 		});
@@ -148,7 +158,9 @@ 
 			'type' => '',
 			'value' => '',
 		]);
-		if( !is_array( $listbox ))return;
+		if( !is_array( $listbox )) {
+			return;
+		}
 		if( !array_key_exists( '', $listbox['options'] )) {
 			$listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
 		}

Spacing +26 added lines, -26 removed lines

@@ -48,7 +48,7 @@ 
 			'label' => '['.$tag.']',
 			'required' => $this->required,
 			'title' => esc_html__( 'Shortcode', 'site-reviews' ),
-		]);
+		] );
 		return $this;
 	}
 
@@ -58,12 +58,12 @@ 
 	protected function generateFields( array $fields )
 	{
 		$generatedFields = array_map( function( $field ) {
-			if( empty( $field ))return;
+			if( empty($field) )return;
 			$field = $this->normalize( $field );
-			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return;
+			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ) ) )return;
 			return $this->$method( $field );
 		}, $fields );
-		return array_values( array_filter( $generatedFields ));
+		return array_values( array_filter( $generatedFields ) );
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 	protected function getCategories( $tooltip = '' )
 	{
 		$terms = glsr( Database::class )->getTerms();
-		if( empty( $terms )) {
+		if( empty($terms) ) {
 			return [];
 		}
 		return [
@@ -91,15 +91,15 @@ 
 	protected function getFields()
 	{
 		$fields = $this->generateFields( $this->fields() );
-		if( !empty( $this->errors )) {
+		if( !empty($this->errors) ) {
 			$errors = [];
 			foreach( $this->required as $name => $alert ) {
-				if( false !== array_search( $name, glsr_array_column( $fields, 'name' )))continue;
+				if( false !== array_search( $name, glsr_array_column( $fields, 'name' ) ) )continue;
 				$errors[] = $this->errors[$name];
 			}
 			$this->errors = $errors;
 		}
-		return empty( $this->errors )
+		return empty($this->errors)
 			? $fields
 			: $this->errors;
 	}
@@ -109,7 +109,7 @@ 
 	 */
 	protected function getHideOptions()
 	{
-		$classname = str_replace( 'Popup', 'Shortcode', get_class( $this ));
+		$classname = str_replace( 'Popup', 'Shortcode', get_class( $this ) );
 		$hideOptions = glsr( $classname )->getHideOptions();
 		$options = [];
 		foreach( $hideOptions as $name => $tooltip ) {
@@ -149,7 +149,7 @@ 
 		return wp_parse_args( $field, [
 			'items' => [],
 			'type' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 */
 	protected function normalizeContainer( array $field )
 	{
-		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return;
+		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ) )return;
 		$field['items'] = $this->generateFields( $field['items'] );
 		return $field;
 	}
@@ -185,7 +185,7 @@ 
 	 */
 	protected function normalizeField( array $field, array $defaults )
 	{
-		if( !$this->validate( $field ))return;
+		if( !$this->validate( $field ) )return;
 		return array_filter( shortcode_atts( $defaults, $field ), function( $value ) {
 			return $value !== '';
 		});
@@ -205,9 +205,9 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
-		if( !is_array( $listbox ))return;
-		if( !array_key_exists( '', $listbox['options'] )) {
+		] );
+		if( !is_array( $listbox ) )return;
+		if( !array_key_exists( '', $listbox['options'] ) ) {
 			$listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
 		}
 		foreach( $listbox['options'] as $value => $text ) {
@@ -224,7 +224,7 @@ 
 	 */
 	protected function normalizePost( array $field )
 	{
-		if( !is_array( $field['query_args'] )) {
+		if( !is_array( $field['query_args'] ) ) {
 			$field['query_args'] = [];
 		}
 		$posts = get_posts( wp_parse_args( $field['query_args'], [
@@ -232,8 +232,8 @@ 
 			'orderby' => 'title',
 			'post_type' => 'post',
 			'posts_per_page' => 30,
-		]));
-		if( !empty( $posts )) {
+		] ) );
+		if( !empty($posts) ) {
 			$options = [];
 			foreach( $posts as $post ) {
 				$options[$post->ID] = esc_html( $post->post_title );
@@ -263,7 +263,7 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	protected function validate( array $field )
 	{
-		$args = shortcode_atts([
+		$args = shortcode_atts( [
 			'label' => '',
 			'name' => false,
 			'required' => false,
@@ -287,13 +287,13 @@ 
 	 */
 	protected function validateErrors( array $args )
 	{
-		if( !isset( $args['required']['error'] )) {
+		if( !isset($args['required']['error']) ) {
 			return true;
 		}
-		$this->errors[$args['name']] = $this->normalizeContainer([
+		$this->errors[$args['name']] = $this->normalizeContainer( [
 			'html' => $args['required']['error'],
 			'type' => 'container',
-		]);
+		] );
 		return false;
 	}
 
@@ -306,10 +306,10 @@ 
 			return true;
 		}
 		$alert = esc_html__( 'Some of the shortcode options are required.', 'site-reviews' );
-		if( isset( $args['required']['alert'] )) {
+		if( isset($args['required']['alert']) ) {
 			$alert = $args['required']['alert'];
 		}
-		else if( !empty( $args['label'] )) {
+		else if( !empty($args['label']) ) {
 			$alert = sprintf(
 				esc_html_x( 'The "%s" option is required.', 'the option label', 'site-reviews' ),
 				str_replace( ':', '', $args['label'] )

plugin/Controllers/ReviewController.php

Spacing +9 added lines, -9 removed lines

@@ -26,15 +26,15 @@ 
 	{
 		sort( $termTaxonomyIds );
 		sort( $oldTermTaxonomyIds );
-		if( $termTaxonomyIds === $oldTermTaxonomyIds || !$this->isReviewPostId( $postId ))return;
-		$review = glsr( ReviewManager::class )->single( get_post( $postId ));
+		if( $termTaxonomyIds === $oldTermTaxonomyIds || !$this->isReviewPostId( $postId ) )return;
+		$review = glsr( ReviewManager::class )->single( get_post( $postId ) );
 		$ignoredIds = array_intersect( $oldTermTaxonomyIds, $termTaxonomyIds );
 		$decreasedIds = array_diff( $oldTermTaxonomyIds, $ignoredIds );
 		$increasedIds = array_diff( $termTaxonomyIds, $ignoredIds );
-		if( $review->term_ids = glsr( Database::class )->getTermIds( $decreasedIds, 'term_taxonomy_id' )) {
+		if( $review->term_ids = glsr( Database::class )->getTermIds( $decreasedIds, 'term_taxonomy_id' ) ) {
 			glsr( CountsManager::class )->decreaseTermCounts( $review );
 		}
-		if( $review->term_ids = glsr( Database::class )->getTermIds( $increasedIds, 'term_taxonomy_id' )) {
+		if( $review->term_ids = glsr( Database::class )->getTermIds( $increasedIds, 'term_taxonomy_id' ) ) {
 			glsr( CountsManager::class )->increaseTermCounts( $review );
 		}
 	}
@@ -47,8 +47,8 @@ 
 	 */
 	public function onAfterChangeStatus( $newStatus, $oldStatus, WP_Post $post )
 	{
-		if( $post->post_type != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] ))return;
-		$review = glsr( ReviewManager::class )->single( get_post( $post->ID ));
+		if( $post->post_type != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] ) )return;
+		$review = glsr( ReviewManager::class )->single( get_post( $post->ID ) );
 		if( $post->post_status == 'publish' ) {
 			glsr( CountsManager::class )->increase( $review );
 		}
@@ -74,8 +74,8 @@ 
 	 */
 	public function onBeforeDelete( $postId )
 	{
-		if( !$this->isReviewPostId( $postId ))return;
-		$review = glsr( ReviewManager::class )->single( get_post( $postId ));
+		if( !$this->isReviewPostId( $postId ) )return;
+		$review = glsr( ReviewManager::class )->single( get_post( $postId ) );
 		glsr( CountsManager::class )->decrease( $review );
 	}
 
@@ -92,7 +92,7 @@ 
 		if( !$this->isReviewPostId( $postId )
 			|| !in_array( $metaKey, ['assigned_to', 'rating', 'review_type'] )
 		)return;
-		$review = glsr( ReviewManager::class )->single( get_post( $postId ));
+		$review = glsr( ReviewManager::class )->single( get_post( $postId ) );
 		if( $review->$metaKey == $metaValue )return;
 		$method = glsr( Helper::class )->buildMethodName( $metaKey, 'onBeforeChange' );
 		call_user_func( [$this, $method], $review, $metaValue );

Braces +18 added lines, -6 removed lines

@@ -26,7 +26,9 @@ 
 	{
 		sort( $termTaxonomyIds );
 		sort( $oldTermTaxonomyIds );
-		if( $termTaxonomyIds === $oldTermTaxonomyIds || !$this->isReviewPostId( $postId ))return;
+		if( $termTaxonomyIds === $oldTermTaxonomyIds || !$this->isReviewPostId( $postId )) {
+			return;
+		}
 		$review = glsr( ReviewManager::class )->single( get_post( $postId ));
 		$ignoredIds = array_intersect( $oldTermTaxonomyIds, $termTaxonomyIds );
 		$decreasedIds = array_diff( $oldTermTaxonomyIds, $ignoredIds );
@@ -47,7 +49,9 @@ 
 	 */
 	public function onAfterChangeStatus( $newStatus, $oldStatus, WP_Post $post )
 	{
-		if( $post->post_type != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] ))return;
+		if( $post->post_type != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] )) {
+			return;
+		}
 		$review = glsr( ReviewManager::class )->single( get_post( $post->ID ));
 		if( $post->post_status == 'publish' ) {
 			glsr( CountsManager::class )->increase( $review );
@@ -63,7 +67,9 @@ 
 	 */
 	public function onAfterCreate( Review $review )
 	{
-		if( $review->status !== 'publish' )return;
+		if( $review->status !== 'publish' ) {
+			return;
+		}
 		glsr( CountsManager::class )->increase( $review );
 	}
 
@@ -74,7 +80,9 @@ 
 	 */
 	public function onBeforeDelete( $postId )
 	{
-		if( !$this->isReviewPostId( $postId ))return;
+		if( !$this->isReviewPostId( $postId )) {
+			return;
+		}
 		$review = glsr( ReviewManager::class )->single( get_post( $postId ));
 		glsr( CountsManager::class )->decrease( $review );
 	}
@@ -91,9 +99,13 @@ 
 	{
 		if( !$this->isReviewPostId( $postId )
 			|| !in_array( $metaKey, ['assigned_to', 'rating', 'review_type'] )
-		)return;
+		) {
+			return;
+		}
 		$review = glsr( ReviewManager::class )->single( get_post( $postId ));
-		if( $review->$metaKey == $metaValue )return;
+		if( $review->$metaKey == $metaValue ) {
+			return;
+		}
 		$method = glsr( Helper::class )->buildMethodName( $metaKey, 'onBeforeChange' );
 		call_user_func( [$this, $method], $review, $metaValue );
 	}

plugin/Database/CountsManager.php

Braces +21 added lines, -7 removed lines

@@ -74,7 +74,9 @@ 
 	 */
 	public function decreasePostCounts( Review $review )
 	{
-		if( empty( $counts = $this->getPostCounts( $review->assigned_to )))return;
+		if( empty( $counts = $this->getPostCounts( $review->assigned_to ))) {
+			return;
+		}
 		$counts = $this->decreaseRating( $counts, $review->review_type, $review->rating );
 		$this->setPostCounts( $review->assigned_to, $counts );
 	}
@@ -85,7 +87,9 @@ 
 	public function decreaseTermCounts( Review $review )
 	{
 		foreach( $review->term_ids as $termId ) {
-			if( empty( $counts = $this->getTermCounts( $termId )))continue;
+			if( empty( $counts = $this->getTermCounts( $termId ))) {
+				continue;
+			}
 			$counts = $this->decreaseRating( $counts, $review->review_type, $review->rating );
 			$this->setTermCounts( $termId, $counts );
 		}
@@ -107,7 +111,9 @@ 
 			'min' => Rating::MIN_RATING,
 		]);
 		foreach( $counts as $index => &$num ) {
-			if( $index >= intval( $args['min'] ) && $index <= intval( $args['max'] ))continue;
+			if( $index >= intval( $args['min'] ) && $index <= intval( $args['max'] )) {
+				continue;
+			}
 			$num = 0;
 		}
 		return $counts;
@@ -199,7 +205,9 @@ 
 	 */
 	public function increasePostCounts( Review $review )
 	{
-		if( !( get_post( $review->assigned_to ) instanceof WP_Post ))return;
+		if( !( get_post( $review->assigned_to ) instanceof WP_Post )) {
+			return;
+		}
 		$counts = $this->getPostCounts( $review->assigned_to );
 		$counts = empty( $counts )
 			? $this->buildPostCounts( $review->assigned_to )
@@ -249,7 +257,9 @@ 
 	public function setTermCounts( $termId, array $reviewCounts )
 	{
 		$term = get_term( $termId, Application::TAXONOMY );
-		if( !isset( $term->term_id ))return;
+		if( !isset( $term->term_id )) {
+			return;
+		}
 		$ratingCounts = $this->flatten( $reviewCounts );
 		update_term_meta( $termId, static::META_COUNT, $reviewCounts );
 		update_term_meta( $termId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ));
@@ -270,7 +280,9 @@ 
 			$types = array_unique( array_merge( ['local'], $types ));
 			foreach( $types as $type ) {
 				$type = $this->normalizeType( $type );
-				if( isset( $counts[$type] ))continue;
+				if( isset( $counts[$type] )) {
+					continue;
+				}
 				$counts[$type] = array_fill_keys( range( 0, Rating::MAX_RATING ), 0 );
 			}
 			foreach( $reviews as $review ) {
@@ -323,7 +335,9 @@ 
 		}
 		foreach( $reviewCounts as &$counts ) {
 			foreach( range( 0, Rating::MAX_RATING ) as $index ) {
-				if( isset( $counts[$index] ))continue;
+				if( isset( $counts[$index] )) {
+					continue;
+				}
 				$counts[$index] = 0;
 			}
 			ksort( $counts );

Spacing +35 added lines, -35 removed lines

@@ -64,7 +64,7 @@ 
 			$this->getCounts(),
 			$review->review_type,
 			$review->rating
-		));
+		) );
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	public function decreasePostCounts( Review $review )
 	{
-		if( empty( $counts = $this->getPostCounts( $review->assigned_to )))return;
+		if( empty($counts = $this->getPostCounts( $review->assigned_to )) )return;
 		$counts = $this->decreaseRating( $counts, $review->review_type, $review->rating );
 		$this->setPostCounts( $review->assigned_to, $counts );
 	}
@@ -83,7 +83,7 @@ 
 	public function decreaseTermCounts( Review $review )
 	{
 		foreach( $review->term_ids as $termId ) {
-			if( empty( $counts = $this->getTermCounts( $termId )))continue;
+			if( empty($counts = $this->getTermCounts( $termId )) )continue;
 			$counts = $this->decreaseRating( $counts, $review->review_type, $review->rating );
 			$this->setTermCounts( $termId, $counts );
 		}
@@ -95,15 +95,15 @@ 
 	public function flatten( array $reviewCounts, array $args = [] )
 	{
 		$counts = [];
-		array_walk_recursive( $reviewCounts, function( $num, $index ) use( &$counts ) {
-			$counts[$index] = $num + intval( glsr_get( $counts, $index, 0 ));
+		array_walk_recursive( $reviewCounts, function( $num, $index ) use(&$counts) {
+			$counts[$index] = $num + intval( glsr_get( $counts, $index, 0 ) );
 		});
 		$args = wp_parse_args( $args, [
 			'max' => Rating::MAX_RATING,
 			'min' => Rating::MIN_RATING,
-		]);
+		] );
 		foreach( $counts as $index => &$num ) {
-			if( $index >= intval( $args['min'] ) && $index <= intval( $args['max'] ))continue;
+			if( $index >= intval( $args['min'] ) && $index <= intval( $args['max'] ) )continue;
 			$num = 0;
 		}
 		return $counts;
@@ -116,7 +116,7 @@ 
 	{
 		$args = $this->normalizeArgs( $args );
 
-		if( !empty( $args['post_ids'] ) && !empty( $args['term_ids'] )) {
+		if( !empty($args['post_ids']) && !empty($args['term_ids']) ) {
 			$counts = [$this->build( $args )];
 		}
 		else {
@@ -130,13 +130,13 @@ 
 				// @todo if multiple ids are provided, a query must be used!
 				$counts[] = $this->getTermCounts( $termId );
 			}
-			if( empty( $counts )) {
+			if( empty($counts) ) {
 				$counts[] = $this->getCounts();
 			}
 		}
 		return in_array( $args['type'], ['', 'all'] )
 			? $this->normalize( [$this->flatten( $counts )] )
-			: $this->normalize( glsr_array_column( $counts, $args['type'] ));
+			: $this->normalize( glsr_array_column( $counts, $args['type'] ) );
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 	public function getCounts()
 	{
 		$counts = glsr( OptionManager::class )->get( 'counts', [] );
-		if( !is_array( $counts )) {
+		if( !is_array( $counts ) ) {
 			glsr_log()->error( '$counts is not an array' )->debug( $counts );
 			return [];
 		}
@@ -158,7 +158,7 @@ 
 	 */
 	public function getPostCounts( $postId )
 	{
-		return array_filter( (array)get_post_meta( $postId, static::META_COUNT, true ));
+		return array_filter( (array)get_post_meta( $postId, static::META_COUNT, true ) );
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getTermCounts( $termId )
 	{
-		return array_filter( (array)get_term_meta( $termId, static::META_COUNT, true ));
+		return array_filter( (array)get_term_meta( $termId, static::META_COUNT, true ) );
 	}
 
 	/**
@@ -185,10 +185,10 @@ 
 	 */
 	public function increaseCounts( Review $review )
 	{
-		if( empty( $counts = $this->getCounts() )) {
+		if( empty($counts = $this->getCounts()) ) {
 			$counts = $this->buildCounts();
 		}
-		$this->setCounts( $this->increaseRating( $counts, $review->review_type, $review->rating ));
+		$this->setCounts( $this->increaseRating( $counts, $review->review_type, $review->rating ) );
 	}
 
 	/**
@@ -196,9 +196,9 @@ 
 	 */
 	public function increasePostCounts( Review $review )
 	{
-		if( !( get_post( $review->assigned_to ) instanceof WP_Post ))return;
+		if( !(get_post( $review->assigned_to ) instanceof WP_Post) )return;
 		$counts = $this->getPostCounts( $review->assigned_to );
-		$counts = empty( $counts )
+		$counts = empty($counts)
 			? $this->buildPostCounts( $review->assigned_to )
 			: $this->increaseRating( $counts, $review->review_type, $review->rating );
 		$this->setPostCounts( $review->assigned_to, $counts );
@@ -209,10 +209,10 @@ 
 	 */
 	public function increaseTermCounts( Review $review )
 	{
-		$terms = glsr( ReviewManager::class )->normalizeTerms( implode( ',', $review->term_ids ));
+		$terms = glsr( ReviewManager::class )->normalizeTerms( implode( ',', $review->term_ids ) );
 		foreach( $terms as $term ) {
 			$counts = $this->getTermCounts( $term['term_id'] );
-			$counts = empty( $counts )
+			$counts = empty($counts)
 				? $this->buildTermCounts( $term['term_taxonomy_id'] )
 				: $this->increaseRating( $counts, $review->review_type, $review->rating );
 			$this->setTermCounts( $term['term_id'], $counts );
@@ -235,8 +235,8 @@ 
 	{
 		$ratingCounts = $this->flatten( $reviewCounts );
 		update_post_meta( $postId, static::META_COUNT, $reviewCounts );
-		update_post_meta( $postId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ));
-		update_post_meta( $postId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts ));
+		update_post_meta( $postId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ) );
+		update_post_meta( $postId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts ) );
 	}
 
 	/**
@@ -246,11 +246,11 @@ 
 	public function setTermCounts( $termId, array $reviewCounts )
 	{
 		$term = get_term( $termId, Application::TAXONOMY );
-		if( !isset( $term->term_id ))return;
+		if( !isset($term->term_id) )return;
 		$ratingCounts = $this->flatten( $reviewCounts );
 		update_term_meta( $termId, static::META_COUNT, $reviewCounts );
-		update_term_meta( $termId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ));
-		update_term_meta( $termId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts ));
+		update_term_meta( $termId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ) );
+		update_term_meta( $termId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts ) );
 	}
 
 	/**
@@ -262,12 +262,12 @@ 
 	{
 		$counts = [];
 		$lastPostId = 0;
-		while( $reviews = $this->queryReviews( $args, $lastPostId )) {
-			$types = array_keys( array_flip( glsr_array_column( $reviews, 'type' )));
-			$types = array_unique( array_merge( ['local'], $types ));
+		while( $reviews = $this->queryReviews( $args, $lastPostId ) ) {
+			$types = array_keys( array_flip( glsr_array_column( $reviews, 'type' ) ) );
+			$types = array_unique( array_merge( ['local'], $types ) );
 			foreach( $types as $type ) {
 				$type = $this->normalizeType( $type );
-				if( isset( $counts[$type] ))continue;
+				if( isset($counts[$type]) )continue;
 				$counts[$type] = array_fill_keys( range( 0, Rating::MAX_RATING ), 0 );
 			}
 			foreach( $reviews as $review ) {
@@ -286,7 +286,7 @@ 
 	 */
 	protected function decreaseRating( array $reviewCounts, $type, $rating )
 	{
-		if( isset( $reviewCounts[$type][$rating] )) {
+		if( isset($reviewCounts[$type][$rating]) ) {
 			$reviewCounts[$type][$rating] = max( 0, $reviewCounts[$type][$rating] - 1 );
 		}
 		return $reviewCounts;
@@ -299,10 +299,10 @@ 
 	 */
 	protected function increaseRating( array $reviewCounts, $type, $rating )
 	{
-		if( !array_key_exists( $type, glsr()->reviewTypes )) {
+		if( !array_key_exists( $type, glsr()->reviewTypes ) ) {
 			return $reviewCounts;
 		}
-		if( !array_key_exists( $type, $reviewCounts )) {
+		if( !array_key_exists( $type, $reviewCounts ) ) {
 			$reviewCounts[$type] = [];
 		}
 		$reviewCounts = $this->normalize( $reviewCounts );
@@ -315,12 +315,12 @@ 
 	 */
 	protected function normalize( array $reviewCounts )
 	{
-		if( empty( $reviewCounts )) {
+		if( empty($reviewCounts) ) {
 			$reviewCounts = [[]];
 		}
 		foreach( $reviewCounts as &$counts ) {
 			foreach( range( 0, Rating::MAX_RATING ) as $index ) {
-				if( isset( $counts[$index] ))continue;
+				if( isset($counts[$index]) )continue;
 				$counts[$index] = 0;
 			}
 			ksort( $counts );
@@ -337,7 +337,7 @@ 
 			'post_ids' => [],
 			'term_ids' => [],
 			'type' => 'local',
-		]);
+		] );
 		$args['post_ids'] = glsr( Polylang::class )->getPostIds( $args['post_ids'] );
 		$args['type'] = $this->normalizeType( $args['type'] );
 		return $args;
@@ -349,7 +349,7 @@ 
 	 */
 	protected function normalizeType( $type )
 	{
-		return empty( $type ) || !is_string( $type )
+		return empty($type) || !is_string( $type )
 			? 'local'
 			: $type;
 	}

plugin/Database.php

Braces +9 added lines, -3 removed lines

@@ -23,7 +23,9 @@ 
 		if( empty( $assignedTo )) {
 			$assignedTo = get_post_meta( $postId, 'assigned_to', true );
 		}
-		if( empty( $assignedTo ))return;
+		if( empty( $assignedTo )) {
+			return;
+		}
 		$assignedPost = get_post( $assignedTo );
 		if( $assignedPost instanceof WP_Post && $assignedPost->ID != $postId ) {
 			return $assignedPost;
@@ -80,7 +82,9 @@ 
 		$termIds = [];
 		foreach( $values as $value ) {
 			$term = get_term_by( $field, $value, Application::TAXONOMY );
-			if( !isset( $term->term_id ))continue;
+			if( !isset( $term->term_id )) {
+				continue;
+			}
 			$termIds[] = $term->term_id;
 		}
 		return $termIds;
@@ -127,7 +131,9 @@ 
 		add_filter( 'posts_search', [$queryBuilder, 'filterSearchByTitle'], 500, 2 );
 		$search = new WP_Query( $args );
 		remove_filter( 'posts_search', [$queryBuilder, 'filterSearchByTitle'], 500 );
-		if( !$search->have_posts() )return;
+		if( !$search->have_posts() ) {
+			return;
+		}
 		$results = '';
 		while( $search->have_posts() ) {
 			$search->the_post();

Spacing +9 added lines, -9 removed lines

@@ -20,10 +20,10 @@ 
 	 */
 	public function getAssignedToPost( $postId, $assignedTo = '' )
 	{
-		if( empty( $assignedTo )) {
+		if( empty($assignedTo) ) {
 			$assignedTo = get_post_meta( $postId, 'assigned_to', true );
 		}
-		if( empty( $assignedTo ))return;
+		if( empty($assignedTo) )return;
 		$assignedPost = get_post( $assignedTo );
 		if( $assignedPost instanceof WP_Post && $assignedPost->ID != $postId ) {
 			return $assignedPost;
@@ -63,7 +63,7 @@ 
 	 */
 	public function getReviewsMeta( $key, $status = 'publish' )
 	{
-		if( $status == 'all' || empty( $status )) {
+		if( $status == 'all' || empty($status) ) {
 			$status = get_post_stati( ['exclude_from_search' => false] );
 		}
 		return glsr( SqlQueries::class )->getReviewsMeta( $key, $status );
@@ -78,7 +78,7 @@ 
 		$termIds = [];
 		foreach( $values as $value ) {
 			$term = get_term_by( $field, $value, Application::TAXONOMY );
-			if( !isset( $term->term_id ))continue;
+			if( !isset($term->term_id) )continue;
 			$termIds[] = $term->term_id;
 		}
 		return $termIds;
@@ -94,9 +94,9 @@ 
 			'fields' => 'id=>name',
 			'hide_empty' => false,
 			'taxonomy' => Application::TAXONOMY,
-		]);
+		] );
 		$terms = get_terms( $args );
-		if( is_wp_error( $terms )) {
+		if( is_wp_error( $terms ) ) {
 			glsr_log()->error( $terms->get_error_message() );
 			return [];
 		}
@@ -113,7 +113,7 @@ 
 			'post_status' => 'publish',
 			'post_type' => 'any',
 		];
-		if( is_numeric( $searchTerm )) {
+		if( is_numeric( $searchTerm ) ) {
 			$args['post__in'] = [$searchTerm];
 		}
 		else {
@@ -132,9 +132,9 @@ 
 			ob_start();
 			glsr()->render( 'partials/editor/search-result', [
 				'ID' => get_the_ID(),
-				'permalink' => esc_url( (string) get_permalink() ),
+				'permalink' => esc_url( (string)get_permalink() ),
 				'title' => esc_attr( get_the_title() ),
-			]);
+			] );
 			$results .= ob_get_clean();
 		}
 		wp_reset_postdata();

plugin/Shortcodes/SiteReviewsSummaryShortcode.php

Braces +2 added lines, -1 removed lines

@@ -6,7 +6,8 @@
 
 class SiteReviewsSummaryShortcode extends Shortcode
 {
-	protected function hideOptions() {
+	protected function hideOptions()
+	{
 		return [
 			'rating' => __( 'Hide the rating', 'site-reviews' ),
 			'stars' => __( 'Hide the stars', 'site-reviews' ),

plugin/Shortcodes/SiteReviewsShortcode.php

Braces +2 added lines, -1 removed lines

@@ -6,7 +6,8 @@
 
 class SiteReviewsShortcode extends Shortcode
 {
-	protected function hideOptions() {
+	protected function hideOptions()
+	{
 		return [
 			'title' => __( 'Hide the title', 'site-reviews' ),
 			'rating' => __( 'Hide the rating', 'site-reviews' ),

plugin/Shortcodes/SiteReviewsFormPopup.php

Spacing +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@ 
 		return [[
 			'type' => 'container',
 			'html' => '<p class="strong">'.esc_html__( 'All settings are optional.', 'site-reviews' ).'</p>',
-		],[
+		], [
 			'label' => esc_html__( 'Title', 'site-reviews' ),
 			'name' => 'title',
 			'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Description', 'site-reviews' ),
 			'minHeight' => 60,
 			'minWidth' => 240,
@@ -29,25 +29,25 @@ 
 			'tooltip' => __( 'Enter a custom shortcode description.', 'site-reviews' ),
 			'type' => 'textbox',
 		],
-		$this->getCategories( __( 'Automatically assign a category to reviews submitted with this shortcode.', 'site-reviews' )),
+		$this->getCategories( __( 'Automatically assign a category to reviews submitted with this shortcode.', 'site-reviews' ) ),
 		[
 			'label' => esc_html__( 'Assign To', 'site-reviews' ),
 			'name' => 'assign_to',
 			'tooltip' => __( 'Assign submitted reviews to a custom page/post ID. You can also enter "post_id" to assign reviews to the ID of the current page.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Classes', 'site-reviews' ),
 			'name' => 'class',
 			'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'columns' => 2,
 			'items' => $this->getHideOptions(),
 			'label' => esc_html__( 'Hide', 'site-reviews' ),
 			'layout' => 'grid',
 			'spacing' => 5,
 			'type' => 'container',
-		],[
+		], [
 			'hidden' => true,
 			'name' => 'id',
 			'type' => 'textbox',

plugin/Widgets/SiteReviewsWidget.php

Spacing +11 added lines, -11 removed lines

@@ -20,14 +20,14 @@ 
 			'class' => 'widefat',
 			'label' => __( 'Title', 'site-reviews' ),
 			'name' => 'title',
-		]);
+		] );
 		$this->renderField( 'number', [
 			'class' => 'small-text',
 			'default' => 5,
 			'label' => __( 'How many reviews would you like to display?', 'site-reviews' ),
 			'max' => 100,
 			'name' => 'count',
-		]);
+		] );
 		$this->renderField( 'select', [
 			'label' => __( 'What is the minimum rating to display?', 'site-reviews' ),
 			'name' => 'rating',
@@ -38,22 +38,22 @@ 
 				'2' => sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 ),
 				'1' => sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 ),
 			],
-		]);
+		] );
 		if( count( glsr()->reviewTypes ) > 1 ) {
 			$this->renderField( 'select', [
 				'class' => 'widefat',
 				'label' => __( 'Which type of review would you like to display?', 'site-reviews' ),
 				'name' => 'type',
 				'options' => ['' => __( 'All Reviews', 'site-reviews' )] + glsr()->reviewTypes,
-			]);
+			] );
 		}
-		if( !empty( $terms )) {
+		if( !empty($terms) ) {
 			$this->renderField( 'select', [
 				'class' => 'widefat',
 				'label' => __( 'Limit reviews to this category', 'site-reviews' ),
 				'name' => 'category',
 				'options' => ['' => __( 'All Categories', 'site-reviews' )] + $terms,
-			]);
+			] );
 		}
 		$this->renderField( 'text', [
 			'class' => 'widefat',
@@ -61,16 +61,16 @@ 
 			'description' => sprintf( __( "Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews' ), '<code>post_id</code>' ),
 			'label' => __( 'Limit reviews to those assigned to this page/post ID', 'site-reviews' ),
 			'name' => 'assigned_to',
-		]);
+		] );
 		$this->renderField( 'text', [
 			'class' => 'widefat',
 			'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ),
 			'name' => 'class',
-		]);
+		] );
 		$this->renderField( 'checkbox', [
 			'name' => 'hide',
 			'options' => glsr( SiteReviewsShortcode::class )->getHideOptions(),
-		]);
+		] );
 	}
 
 	/**
@@ -80,10 +80,10 @@ 
 	 */
 	public function update( $newInstance, $oldInstance )
 	{
-		if( !is_numeric( $newInstance['count'] )) {
+		if( !is_numeric( $newInstance['count'] ) ) {
 			$newInstance['count'] = 10;
 		}
-		$newInstance['count'] = min( 50, max( 0, intval( $newInstance['count'] )));
+		$newInstance['count'] = min( 50, max( 0, intval( $newInstance['count'] ) ) );
 		return parent::update( $newInstance, $oldInstance );
 	}
 

plugin/Widgets/SiteReviewsFormWidget.php

Spacing +6 added lines, -6 removed lines

@@ -20,34 +20,34 @@
 			'class' => 'widefat',
 			'label' => __( 'Title', 'site-reviews' ),
 			'name' => 'title',
-		]);
+		] );
 		$this->renderField( 'textarea', [
 			'class' => 'widefat',
 			'label' => __( 'Description', 'site-reviews' ),
 			'name' => 'description',
-		]);
+		] );
 		$this->renderField( 'select', [
 			'class' => 'widefat',
 			'label' => __( 'Automatically assign a category', 'site-reviews' ),
 			'name' => 'category',
 			'options' => ['' => __( 'Do not assign a category', 'site-reviews' )] + $terms,
-		]);
+		] );
 		$this->renderField( 'text', [
 			'class' => 'widefat',
 			'default' => '',
 			'description' => sprintf( __( 'You may also enter %s to assign to the current post.', 'site-reviews' ), '<code>post_id</code>' ),
 			'label' => __( 'Assign reviews to a custom page/post ID', 'site-reviews' ),
 			'name' => 'assign_to',
-		]);
+		] );
 		$this->renderField( 'text', [
 			'class' => 'widefat',
 			'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ),
 			'name' => 'class',
-		]);
+		] );
 		$this->renderField( 'checkbox', [
 			'name' => 'hide',
 			'options' => glsr( SiteReviewsFormShortcode::class )->getHideOptions(),
-		]);
+		] );
 	}
 
 	/**