pryley / site-reviews

plugin/Modules/Upgrade.php

Spacing +7 added lines, -7 removed lines

@@ -10,13 +10,13 @@
 {
 	public function run()
 	{
-		$routines = (new ReflectionClass( __CLASS__ ))->getMethods( ReflectionMethod::IS_PROTECTED );
-		$routines = array_column( $routines, 'name' );
-		natsort( $routines );
-		array_walk( $routines, function( $routine ) {
-			$version = str_replace( strtolower( __CLASS__ ).'_', '', $routine );
-			if( version_compare( glsr()->version, $version, '>=' ))return;
-			call_user_func( [$this, $routine] );
+		$routines = (new ReflectionClass(__CLASS__))->getMethods(ReflectionMethod::IS_PROTECTED);
+		$routines = array_column($routines, 'name');
+		natsort($routines);
+		array_walk($routines, function($routine) {
+			$version = str_replace(strtolower(__CLASS__).'_', '', $routine);
+			if (version_compare(glsr()->version, $version, '>='))return;
+			call_user_func([$this, $routine]);
 		});
 	}
 

plugin/Modules/Validator/ValidateReview.php

Spacing +73 added lines, -73 removed lines

@@ -38,10 +38,10 @@ 
 	/**
 	 * @return array|string
 	 */
-	public function validate( array $request )
+	public function validate(array $request)
 	{
 		$this->form_id = $this->request['form_id']; // @todo verify this exists
-		$this->request = $this->validateRequest( $request );
+		$this->request = $this->validateRequest($request);
 		$this->validateCustom();
 		$this->validateHoneyPot();
 		$this->validateBlacklist();
@@ -52,31 +52,31 @@ 
 	/**
 	 * @return array
 	 */
-	public function validateRequest( array $request )
+	public function validateRequest(array $request)
 	{
-		if( !$this->isRequestValid( $request )) {
-			$this->error = __( 'Please fix the submission errors.', 'site-reviews' );
+		if (!$this->isRequestValid($request)) {
+			$this->error = __('Please fix the submission errors.', 'site-reviews');
 			return $request;
 		}
-		if( empty( $request['title'] )) {
-			$request['title'] = __( 'No Title', 'site-reviews' );
+		if (empty($request['title'])) {
+			$request['title'] = __('No Title', 'site-reviews');
 		}
-		return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request );
+		return array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request);
 	}
 
 	/**
 	 * @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 ),
-			array_flip( array_merge( ['rating','terms'], glsr_get_option( 'reviews-form.required', [] )))
+			apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES),
+			array_flip(array_merge(['rating', 'terms'], glsr_get_option('reviews-form.required', [])))
 		);
-		$excluded = isset( $request['excluded'] )
-			? json_decode( $request['excluded'] )
+		$excluded = isset($request['excluded'])
+			? json_decode($request['excluded'])
 			: [];
-		return array_diff_key( $rules, array_flip( $excluded ));
+		return array_diff_key($rules, array_flip($excluded));
 	}
 
 	/**
@@ -84,17 +84,17 @@ 
 	 */
 	protected function isRecaptchaResponseValid()
 	{
-		$integration = glsr_get_option( 'reviews-form.recaptcha.integration' );
-		if( !$integration ) {
+		$integration = glsr_get_option('reviews-form.recaptcha.integration');
+		if (!$integration) {
 			return true;
 		}
-		$recaptchaResponse = filter_input( INPUT_POST, 'g-recaptcha-response' );
-		if( empty( $recaptchaResponse ))return; //if response is empty we need to return null
-		if( $integration == 'custom' ) {
-			return $this->isRecaptchaValid( $recaptchaResponse );
+		$recaptchaResponse = filter_input(INPUT_POST, 'g-recaptcha-response');
+		if (empty($recaptchaResponse))return; //if response is empty we need to return null
+		if ($integration == 'custom') {
+			return $this->isRecaptchaValid($recaptchaResponse);
 		}
-		if( $integration == 'invisible-recaptcha' ) {
-			return boolval( apply_filters( 'google_invre_is_valid_request_filter', true ));
+		if ($integration == 'invisible-recaptcha') {
+			return boolval(apply_filters('google_invre_is_valid_request_filter', true));
 		}
 		return false;
 	}
@@ -102,16 +102,16 @@ 
 	/**
 	 * @return bool
 	 */
-	protected function isRecaptchaValid( $recaptchaResponse )
+	protected function isRecaptchaValid($recaptchaResponse)
 	{
 		$endpoint = add_query_arg([
-			'remoteip' => glsr( Helper::class )->getIpAddress(),
+			'remoteip' => glsr(Helper::class)->getIpAddress(),
 			'response' => $recaptchaResponse,
-			'secret' => glsr_get_option( 'reviews-form.recaptcha.secret' ),
-		], 'https://www.google.com/recaptcha/api/siteverify' );
-		$response = json_decode( wp_remote_retrieve_body( wp_remote_get( $endpoint )));
-		if( !empty( $response->success )) {
-			return boolval( $response->success );
+			'secret' => glsr_get_option('reviews-form.recaptcha.secret'),
+		], 'https://www.google.com/recaptcha/api/siteverify');
+		$response = json_decode(wp_remote_retrieve_body(wp_remote_get($endpoint)));
+		if (!empty($response->success)) {
+			return boolval($response->success);
 		}
 		$errorCodes = [
 			'missing-input-secret' => 'The secret parameter is missing.',
@@ -120,8 +120,8 @@ 
 			'invalid-input-response' => 'The response parameter is invalid or malformed.',
 			'bad-request' => 'The request is invalid or malformed.',
 		];
-		foreach( $response->{'error-codes'} as $error ) {
-			glsr_log()->error( 'reCAPTCHA: '.$errorCodes[$error] );
+		foreach ($response->{'error-codes'} as $error) {
+			glsr_log()->error('reCAPTCHA: '.$errorCodes[$error]);
 		}
 		return false;
 	}
@@ -129,15 +129,15 @@ 
 	/**
 	 * @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->setSession( 'errors', $errors );
-		$this->setSession( 'values', $request );
+		$this->setSession('errors', $errors);
+		$this->setSession('values', $request);
 		return false;
 	}
 
@@ -147,12 +147,12 @@ 
 	 * @param string $loggedMessage
 	 * @return void
 	 */
-	protected function setSessionValues( $type, $value, $loggedMessage = '' )
+	protected function setSessionValues($type, $value, $loggedMessage = '')
 	{
-		glsr( Session::class )->set( $this->form_id.$type, $value );
-		if( !empty( $loggedMessage )) {
-			glsr_log()->warning( $loggedMessage );
-			glsr_log()->warning( $this->request );
+		glsr(Session::class)->set($this->form_id.$type, $value);
+		if (!empty($loggedMessage)) {
+			glsr_log()->warning($loggedMessage);
+			glsr_log()->warning($this->request);
 		}
 	}
 
@@ -161,10 +161,10 @@ 
 	 */
 	protected function validateAkismet()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Akismet::class )->isSpam( $this->request ))return;
-		$this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' );
-		$this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' );
+		if (!empty($this->error))return;
+		if (!glsr(Akismet::class)->isSpam($this->request))return;
+		$this->setSessionValues('errors', [], 'Akismet caught a spam submission:');
+		$this->error = __('Your review cannot be submitted at this time. Please try again later.', 'site-reviews');
 	}
 
 	/**
@@ -172,15 +172,15 @@ 
 	 */
 	protected function validateBlacklist()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return;
-		$blacklistAction = glsr_get_option( 'reviews-form.blacklist.action' );
-		if( $blacklistAction == 'unapprove' ) {
+		if (!empty($this->error))return;
+		if (!glsr(Blacklist::class)->isBlacklisted($this->request))return;
+		$blacklistAction = glsr_get_option('reviews-form.blacklist.action');
+		if ($blacklistAction == 'unapprove') {
 			$this->request['blacklisted'] = true;
 		}
-		else if( $blacklistAction == 'reject' ) {
-			$this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
-			$this->error = __( 'Your review cannot be submitted at this time.', 'site-reviews' );
+		else if ($blacklistAction == 'reject') {
+			$this->setSessionValues('errors', [], 'Blacklisted submission detected:');
+			$this->error = __('Your review cannot be submitted at this time.', 'site-reviews');
 		}
 	}
 
@@ -189,42 +189,42 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
-		$validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request );
-		if( $validated === true )return;
-		$this->setSessionValues( 'errors', [] );
-		$this->setSessionValues( 'values', $this->request );
-		$this->error = is_string( $validated )
+		if (!empty($this->error))return;
+		$validated = apply_filters('site-reviews/validate/review/submission', true, $this->request);
+		if ($validated === true)return;
+		$this->setSessionValues('errors', []);
+		$this->setSessionValues('values', $this->request);
+		$this->error = is_string($validated)
 			? $validated
-			: __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
+			: __('The review submission failed. Please notify the site administrator.', 'site-reviews');
 	}
 
 	/**
 	 * @return void
 	 */
-	protected function validateHoneyPot( array $request )
+	protected function validateHoneyPot(array $request)
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $request['gotcha'] ))return;
-		$this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' );
-		$this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
+		if (!empty($this->error))return;
+		if (empty($request['gotcha']))return;
+		$this->setSessionValues('errors', [], 'The Honeypot caught a bad submission:');
+		$this->error = __('The review submission failed. Please notify the site administrator.', 'site-reviews');
 	}
 
 	/**
 	 * @return void
 	 */
-	protected function validateRecaptcha( array $request )
+	protected function validateRecaptcha(array $request)
 	{
-		if( !empty( $this->error ))return;
+		if (!empty($this->error))return;
 		$isValid = $this->isRecaptchaResponseValid();
-		if( is_null( $isValid )) {
-			$this->setSessionValues( 'recaptcha', true );
+		if (is_null($isValid)) {
+			$this->setSessionValues('recaptcha', true);
 			$this->recaptchaIsUnset = true;
 		}
-		else if( !$isValid ) {
-			$this->setSessionValues( 'errors', [] );
-			$this->setSessionValues( 'recaptcha', 'reset' );
-			$this->error = __( 'The reCAPTCHA verification failed. Please notify the site administrator.', 'site-reviews' );
+		else if (!$isValid) {
+			$this->setSessionValues('errors', []);
+			$this->setSessionValues('recaptcha', 'reset');
+			$this->error = __('The reCAPTCHA verification failed. Please notify the site administrator.', 'site-reviews');
 		}
 	}
 }

plugin/Modules/Validator/ValidationRules.php

Spacing +29 added lines, -29 removed lines

@@ -16,7 +16,7 @@ 
 	 * @param mixed $value
 	 * @return mixed
 	 */
-	abstract protected function getSize( $attribute, $value );
+	abstract protected function getSize($attribute, $value);
 
 
 	/**
@@ -24,9 +24,9 @@ 
 	 * @param string $message
 	 * @return string
 	 */
-	protected function replaceBetween( $message, array $parameters )
+	protected function replaceBetween($message, array $parameters)
 	{
-		return str_replace( [':min', ':max'], $parameters, $message );
+		return str_replace([':min', ':max'], $parameters, $message);
 	}
 
 	/**
@@ -34,9 +34,9 @@ 
 	 * @param string $message
 	 * @return string
 	 */
-	protected function replaceMax( $message, array $parameters )
+	protected function replaceMax($message, array $parameters)
 	{
-		return str_replace( ':max', $parameters[0], $message );
+		return str_replace(':max', $parameters[0], $message);
 	}
 
 	/**
@@ -44,9 +44,9 @@ 
 	 * @param string $message
 	 * @return string
 	 */
-	protected function replaceMin( $message, array $parameters )
+	protected function replaceMin($message, array $parameters)
 	{
-		return str_replace( ':min', $parameters[0], $message );
+		return str_replace(':min', $parameters[0], $message);
 	}
 
 	/**
@@ -56,10 +56,10 @@ 
 	 * @param mixed $value
 	 * @return bool
 	 */
-	public function validateAccepted( $attribute, $value )
+	public function validateAccepted($attribute, $value)
 	{
 		$acceptable = ['yes', 'on', '1', 1, true, 'true'];
-		return $this->validateRequired( $attribute, $value ) && in_array( $value, $acceptable, true );
+		return $this->validateRequired($attribute, $value) && in_array($value, $acceptable, true);
 	}
 
 	/**
@@ -68,10 +68,10 @@ 
 	 * @param mixed $value
 	 * @return bool
 	 */
-	public function validateBetween( $attribute, $value, array $parameters )
+	public function validateBetween($attribute, $value, array $parameters)
 	{
-		$this->requireParameterCount( 2, $parameters, 'between' );
-		$size = $this->getSize( $attribute, $value );
+		$this->requireParameterCount(2, $parameters, 'between');
+		$size = $this->getSize($attribute, $value);
 		return $size >= $parameters[0] && $size <= $parameters[1];
 	}
 
@@ -81,9 +81,9 @@ 
 	 * @param mixed $value
 	 * @return bool
 	 */
-	public function validateEmail( $attribute, $value )
+	public function validateEmail($attribute, $value)
 	{
-		return filter_var( $value, FILTER_VALIDATE_EMAIL ) !== false;
+		return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
 	}
 
 	/**
@@ -92,10 +92,10 @@ 
 	 * @param mixed $value
 	 * @return bool
 	 */
-	public function validateMax( $attribute, $value, array $parameters )
+	public function validateMax($attribute, $value, array $parameters)
 	{
-		$this->requireParameterCount( 1, $parameters, 'max' );
-		return $this->getSize( $attribute, $value ) <= $parameters[0];
+		$this->requireParameterCount(1, $parameters, 'max');
+		return $this->getSize($attribute, $value) <= $parameters[0];
 	}
 
 	/**
@@ -104,10 +104,10 @@ 
 	 * @param mixed $value
 	 * @return bool
 	 */
-	public function validateMin( $attribute, $value, array $parameters )
+	public function validateMin($attribute, $value, array $parameters)
 	{
-		$this->requireParameterCount( 1, $parameters, 'min' );
-		return $this->getSize( $attribute, $value ) >= $parameters[0];
+		$this->requireParameterCount(1, $parameters, 'min');
+		return $this->getSize($attribute, $value) >= $parameters[0];
 	}
 
 	/**
@@ -116,9 +116,9 @@ 
 	 * @param mixed $value
 	 * @return bool
 	 */
-	public function validateNumeric( $attribute, $value )
+	public function validateNumeric($attribute, $value)
 	{
-		return is_numeric( $value );
+		return is_numeric($value);
 	}
 
 	/**
@@ -127,11 +127,11 @@ 
 	 * @param mixed $value
 	 * @return bool
 	 */
-	public function validateRequired( $attribute, $value )
+	public function validateRequired($attribute, $value)
 	{
-		return is_null( $value )
-			|| ( is_string( $value ) && trim( $value ) === '' )
-			|| ( is_array( $value ) && count( $value ) < 1 )
+		return is_null($value)
+			|| (is_string($value) && trim($value) === '')
+			|| (is_array($value) && count($value) < 1)
 			? false
 			: true;
 	}
@@ -143,10 +143,10 @@ 
 	 * @return void
 	 * @throws InvalidArgumentException
 	 */
-	protected function requireParameterCount( $count, array $parameters, $rule )
+	protected function requireParameterCount($count, array $parameters, $rule)
 	{
-		if( count( $parameters ) < $count ) {
-			throw new InvalidArgumentException( "Validation rule $rule requires at least $count parameters." );
+		if (count($parameters) < $count) {
+			throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
 		}
 	}
 }

plugin/Modules/Rating.php

Spacing +57 added lines, -57 removed lines

@@ -46,24 +46,24 @@ 
 	 * @param int $roundBy
 	 * @return float
 	 */
-	public function getAverage( array $reviews, $roundBy = 1 )
+	public function getAverage(array $reviews, $roundBy = 1)
 	{
-		$average = count( $reviews );
-		if( $average > 0 ) {
-			$average = round( $this->getTotal( $reviews ) / $average, intval( $roundBy ));
+		$average = count($reviews);
+		if ($average > 0) {
+			$average = round($this->getTotal($reviews) / $average, intval($roundBy));
 		}
-		return floatval( apply_filters( 'site-reviews/rating/average', $average, $reviews ));
+		return floatval(apply_filters('site-reviews/rating/average', $average, $reviews));
 	}
 
 	/**
 	 * @return array
 	 */
-	public function getCounts( array $reviews )
+	public function getCounts(array $reviews)
 	{
-		$counts = array_fill_keys( [5,4,3,2,1], [] );
-		array_walk( $counts, function( &$count, $key ) use( $reviews ) {
-			$count = count( array_filter( $reviews, function( $review ) use( $key ) {
-				if( !isset( $review->rating ))return;
+		$counts = array_fill_keys([5, 4, 3, 2, 1], []);
+		array_walk($counts, function(&$count, $key) use($reviews) {
+			$count = count(array_filter($reviews, function($review) use($key) {
+				if (!isset($review->rating))return;
 				return $review->rating == $key;
 			}));
 		});
@@ -80,51 +80,51 @@ 
 	 * @param int $confidencePercentage
 	 * @return int|float
 	 */
-	public function getLowerBound( array $upDownRatings, $confidencePercentage = 95 )
+	public function getLowerBound(array $upDownRatings, $confidencePercentage = 95)
 	{
-		$numRatings = count( $upDownRatings );
-		if( !$numRatings )return 0;
-		$positiveRatings = count( array_filter( $upDownRatings, function( $value ) {
+		$numRatings = count($upDownRatings);
+		if (!$numRatings)return 0;
+		$positiveRatings = count(array_filter($upDownRatings, function($value) {
 			return $value > 0;
 		}));
 		$z = static::CONFIDENCE_LEVEL_Z_SCORES[$confidencePercentage];
 		$phat = 1 * $positiveRatings / $numRatings;
-		return ( $phat + $z * $z / ( 2 * $numRatings ) - $z * sqrt(( $phat * ( 1 - $phat ) + $z * $z / ( 4 * $numRatings )) / $numRatings )) / ( 1 + $z * $z / $numRatings );
+		return ($phat + $z * $z / (2 * $numRatings) - $z * sqrt(($phat * (1 - $phat) + $z * $z / (4 * $numRatings)) / $numRatings)) / (1 + $z * $z / $numRatings);
 	}
 
 	/**
 	 * Get the overall percentage rating for an array of reviews
 	 * @return int|float
 	 */
-	public function getPercentage( array $reviews )
+	public function getPercentage(array $reviews)
 	{
-		return round( $this->getAverage( $reviews ) * 100 / static::MAX_RATING, 2 );
+		return round($this->getAverage($reviews) * 100 / static::MAX_RATING, 2);
 	}
 
 	/**
 	 * Get the percentage ratings for an array of reviews
 	 * @return array
 	 */
-	public function getPercentages( array $reviews )
+	public function getPercentages(array $reviews)
 	{
-		$counts = $this->getCounts( $reviews );
-		array_walk( $counts, function( &$count, $rating ) use( $counts ) {
-			$total = array_sum( $counts );
-			$count = !empty( $total ) && !empty( $counts[$rating] )
-				? $counts[$rating] / array_sum( $counts ) * 100
+		$counts = $this->getCounts($reviews);
+		array_walk($counts, function(&$count, $rating) use($counts) {
+			$total = array_sum($counts);
+			$count = !empty($total) && !empty($counts[$rating])
+				? $counts[$rating] / array_sum($counts) * 100
 				: 0;
 		});
-		return $this->getRoundedPercentages( $counts );
+		return $this->getRoundedPercentages($counts);
 	}
 
 	/**
 	 * Get the bayesian ranking for an array of reviews
 	 * @return float
 	 */
-	public function getRanking( array $reviews )
+	public function getRanking(array $reviews)
 	{
-		return floatval( apply_filters( 'site-reviews/bayesian/ranking',
-			$this->getRankingUsingImdb( $reviews ),
+		return floatval(apply_filters('site-reviews/bayesian/ranking',
+			$this->getRankingUsingImdb($reviews),
 			$reviews,
 			$this
 		));
@@ -134,10 +134,10 @@ 
 	 * Get the sum of all review ratings
 	 * @return int
 	 */
-	public function getTotal( array $reviews )
+	public function getTotal(array $reviews)
 	{
-		return array_reduce( $reviews, function( $sum, $review ) {
-			return $sum + intval( $review->rating );
+		return array_reduce($reviews, function($sum, $review) {
+			return $sum + intval($review->rating);
 		});
 	}
 
@@ -151,17 +151,17 @@ 
 	 * @param int $confidencePercentage
 	 * @return int|float
 	 */
-	protected function getRankingUsingImdb( array $reviews, $confidencePercentage = 70 )
+	protected function getRankingUsingImdb(array $reviews, $confidencePercentage = 70)
 	{
 		// Represents the number of ratings expected to begin observing a pattern that would put confidence in the prior.
 		$bayesMinimal = 10; // confidence
 		// Represents a prior (your prior opinion without data) for the average star rating. A higher prior also means a higher margin for error.
 		// This could also be the average score of all items instead of a fixed value.
-		$bayesMean = ( $confidencePercentage / 100 ) * static::MAX_RATING; // prior, 70% = 3.5
-		$numOfReviews = count( $reviews );
-		$avgRating = $this->getAverage( $reviews );
+		$bayesMean = ($confidencePercentage / 100) * static::MAX_RATING; // prior, 70% = 3.5
+		$numOfReviews = count($reviews);
+		$avgRating = $this->getAverage($reviews);
 		return $avgRating > 0
-			? (( $bayesMinimal * $bayesMean ) + ( $avgRating * $numOfReviews )) / ( $bayesMinimal + $numOfReviews )
+			? (($bayesMinimal * $bayesMean) + ($avgRating * $numOfReviews)) / ($bayesMinimal + $numOfReviews)
 			: 0;
 	}
 
@@ -175,41 +175,41 @@ 
 	 * @param int $confidencePercentage
 	 * @return float
 	 */
-	protected function getRankingUsingZScores( array $reviews, $confidencePercentage = 90 )
+	protected function getRankingUsingZScores(array $reviews, $confidencePercentage = 90)
 	{
-		$ratingCounts = $this->getCounts( $reviews );
-		$ratingCountsSum = array_sum( $ratingCounts ) + count( $ratingCounts );
-		$weight = $this->getWeight( $ratingCounts, $ratingCountsSum );
-		$weightPow2 = $this->getWeight( $ratingCounts, $ratingCountsSum, true );
+		$ratingCounts = $this->getCounts($reviews);
+		$ratingCountsSum = array_sum($ratingCounts) + count($ratingCounts);
+		$weight = $this->getWeight($ratingCounts, $ratingCountsSum);
+		$weightPow2 = $this->getWeight($ratingCounts, $ratingCountsSum, true);
 		$zScore = static::CONFIDENCE_LEVEL_Z_SCORES[$confidencePercentage];
-		return $weight - $zScore * sqrt(( $weightPow2 - pow( $weight, 2 )) / ( $ratingCountsSum + 1 ));
+		return $weight - $zScore * sqrt(($weightPow2 - pow($weight, 2)) / ($ratingCountsSum + 1));
 	}
 
 	/**
 	 * @param int $target The target total percentage
 	 * @return array
 	 */
-	protected function getRoundedPercentages( array $percentages, $target = 100 )
+	protected function getRoundedPercentages(array $percentages, $target = 100)
 	{
-		array_walk( $percentages, function( &$value, $index ) {
+		array_walk($percentages, function(&$value, $index) {
 			$value = [
 				'index' => $index,
-				'percent' => floor( $value ),
-				'remainder' => fmod( $value, 1 ),
+				'percent' => floor($value),
+				'remainder' => fmod($value, 1),
 			];
 		});
-		$indexes = array_column( $percentages, 'index' );
-		$remainders = array_column( $percentages, 'remainder' );
-		array_multisort( $remainders, SORT_DESC, SORT_STRING, $indexes, SORT_DESC, $percentages );
+		$indexes = array_column($percentages, 'index');
+		$remainders = array_column($percentages, 'remainder');
+		array_multisort($remainders, SORT_DESC, SORT_STRING, $indexes, SORT_DESC, $percentages);
 		$i = 0;
-		if( array_sum( array_column( $percentages, 'percent' )) > 0 ) {
-			while( array_sum( array_column( $percentages, 'percent' )) < $target ) {
+		if (array_sum(array_column($percentages, 'percent')) > 0) {
+			while (array_sum(array_column($percentages, 'percent')) < $target) {
 				$percentages[$i]['percent']++;
 				$i++;
 			}
 		}
-		array_multisort( $indexes, SORT_DESC, $percentages );
-		return array_combine( $indexes, array_column( $percentages, 'percent' ));
+		array_multisort($indexes, SORT_DESC, $percentages);
+		return array_combine($indexes, array_column($percentages, 'percent'));
 	}
 
 	/**
@@ -217,12 +217,12 @@ 
 	 * @param bool $powerOf2
 	 * @return float
 	 */
-	protected function getWeight( array $ratingCounts, $ratingCountsSum, $powerOf2 = false )
+	protected function getWeight(array $ratingCounts, $ratingCountsSum, $powerOf2 = false)
 	{
-		return array_reduce( array_keys( $ratingCounts ),
-			function( $count, $rating ) use( $ratingCounts, $ratingCountsSum, $powerOf2 ) {
-				$ratingLevel = $powerOf2 ? pow( $rating, 2 ) : $rating;
-				return $count + ( $ratingLevel * ( $ratingCounts[$rating] + 1 )) / $ratingCountsSum;
+		return array_reduce(array_keys($ratingCounts),
+			function($count, $rating) use($ratingCounts, $ratingCountsSum, $powerOf2) {
+				$ratingLevel = $powerOf2 ? pow($rating, 2) : $rating;
+				return $count + ($ratingLevel * ($ratingCounts[$rating] + 1)) / $ratingCountsSum;
 			}
 		);
 	}

plugin/Database/OptionManager.php

Spacing +20 added lines, -20 removed lines

@@ -13,8 +13,8 @@ 
 	 */
 	public static function databaseKey()
 	{
-		return glsr( Helper::class )->snakeCase(
-			Application::ID.'-v'.explode( '.', glsr()->version )[0]
+		return glsr(Helper::class)->snakeCase(
+			Application::ID.'-v'.explode('.', glsr()->version)[0]
 		);
 	}
 
@@ -23,9 +23,9 @@ 
 	 */
 	public function all()
 	{
-		$options = get_option( static::databaseKey(), [] );
-		if( !is_array( $options )) {
-			delete_option( static::databaseKey() );
+		$options = get_option(static::databaseKey(), []);
+		if (!is_array($options)) {
+			delete_option(static::databaseKey());
 			$options = [];
 		}
 		return $options;
@@ -35,18 +35,18 @@ 
 	 * @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] ))continue;
+		foreach ($keys as $key) {
+			if (!isset($pointer[$key]) || !is_array($pointer[$key]))continue;
 			$pointer = &$pointer[$key];
 		}
-		unset( $pointer[$last] );
-		return $this->set( $options );
+		unset($pointer[$last]);
+		return $this->set($options);
 	}
 
 	/**
@@ -54,15 +54,15 @@ 
 	 * @param mixed $fallback
 	 * @return mixed
 	 */
-	public function get( $path = '', $fallback = '' )
+	public function get($path = '', $fallback = '')
 	{
 		$options = $this->all();
-		if( empty( $options )) {
+		if (empty($options)) {
 			$options = [
-				'settings' => glsr( DefaultsManager::class )->get(),
+				'settings' => glsr(DefaultsManager::class)->get(),
 			];
 		}
-		return glsr( Helper::class )->getPathValue( $path, $fallback, $options );
+		return glsr(Helper::class)->getPathValue($path, $fallback, $options);
 	}
 
 	/**
@@ -70,11 +70,11 @@ 
 	 * @param mixed $value
 	 * @return bool
 	 */
-	public function set( $pathOrOptions, $value = '' )
+	public function set($pathOrOptions, $value = '')
 	{
-		if( is_string( $pathOrOptions )) {
-			$pathOrOptions = glsr( Helper::class )->setPathValue( $pathOrOptions, $value, $this->all() );
+		if (is_string($pathOrOptions)) {
+			$pathOrOptions = glsr(Helper::class)->setPathValue($pathOrOptions, $value, $this->all());
 		}
-		return update_option( static::databaseKey(), (array)$pathOrOptions );
+		return update_option(static::databaseKey(), (array)$pathOrOptions);
 	}
 }

plugin/Database/QueryBuilder.php

Spacing +34 added lines, -34 removed lines

@@ -12,15 +12,15 @@ 
 	 * Build a WP_Query meta_query/tax_query
 	 * @return array
 	 */
-	public function buildQuery( array $keys = [], array $values = [] )
+	public function buildQuery(array $keys = [], array $values = [])
 	{
 		$queries = [];
-		foreach( $keys as $key ) {
-			if( !array_key_exists( $key, $values ))continue;
-			$methodName = glsr( Helper::class )->buildMethodName( $key, $prefix = __METHOD__ );
-			if( !method_exists( $this, $methodName ))continue;
-			$query = call_user_func( [$this, $methodName], $values[$key] );
-			if( is_array( $query )) {
+		foreach ($keys as $key) {
+			if (!array_key_exists($key, $values))continue;
+			$methodName = glsr(Helper::class)->buildMethodName($key, $prefix = __METHOD__);
+			if (!method_exists($this, $methodName))continue;
+			$query = call_user_func([$this, $methodName], $values[$key]);
+			if (is_array($query)) {
 				$queries[] = $query;
 			}
 		}
@@ -33,16 +33,16 @@ 
 	 * @param string $sprintfFormat
 	 * @return string
 	 */
-	public function buildSqlOr( $values, $sprintfFormat )
+	public function buildSqlOr($values, $sprintfFormat)
 	{
-		if( !is_array( $values )) {
-			$values = explode( ',', $values );
+		if (!is_array($values)) {
+			$values = explode(',', $values);
 		}
-		$values = array_filter( array_map( 'trim', (array)$values ));
-		$values = array_map( function( $value ) use( $sprintfFormat ) {
-			return sprintf( $sprintfFormat, $value );
-		}, $values );
-		return implode( ' OR ', $values );
+		$values = array_filter(array_map('trim', (array)$values));
+		$values = array_map(function($value) use($sprintfFormat) {
+			return sprintf($sprintfFormat, $value);
+		}, $values);
+		return implode(' OR ', $values);
 	}
 
 	/**
@@ -52,23 +52,23 @@ 
 	 * @return string
 	 * @filter posts_search
 	 */
-	public function filterSearchByTitle( $search, WP_Query $query )
+	public function filterSearchByTitle($search, WP_Query $query)
 	{
-		if( empty( $search ) || empty( $query->get( 'search_terms' ))) {
+		if (empty($search) || empty($query->get('search_terms'))) {
 			return $search;
 		}
 		global $wpdb;
-		$n = empty( $query->get( 'exact' ))
+		$n = empty($query->get('exact'))
 			? '%'
 			: '';
 		$search = [];
-		foreach( (array)$query->get( 'search_terms' ) as $term ) {
-			$search[] = $wpdb->prepare( "{$wpdb->posts}.post_title LIKE %s", $n.$wpdb->esc_like( $term ).$n );
+		foreach ((array)$query->get('search_terms') as $term) {
+			$search[] = $wpdb->prepare("{$wpdb->posts}.post_title LIKE %s", $n.$wpdb->esc_like($term).$n);
 		}
-		if( !is_user_logged_in() ) {
+		if (!is_user_logged_in()) {
 			$search[] = "{$wpdb->posts}.post_password = ''";
 		}
-		return ' AND '.implode( ' AND ', $search );
+		return ' AND '.implode(' AND ', $search);
 	}
 
 	/**
@@ -76,25 +76,25 @@ 
 	 * @param bool $isEnabled
 	 * @return int
 	 */
-	public function getPaged( $isEnabled = true )
+	public function getPaged($isEnabled = true)
 	{
 		$paged = $isEnabled
-			? intval( get_query_var( is_front_page() ? 'page' : Application::PAGED_QUERY_VAR ))
+			? intval(get_query_var(is_front_page() ? 'page' : Application::PAGED_QUERY_VAR))
 			: 1;
-		return max( 1, $paged );
+		return max(1, $paged);
 	}
 
 	/**
 	 * @param string $value
 	 * @return void|array
 	 */
-	protected function buildQueryAssignedTo( $value )
+	protected function buildQueryAssignedTo($value)
 	{
-		if( empty( $value ))return;
+		if (empty($value))return;
 		return [
 			'compare' => 'IN',
 			'key' => 'assigned_to',
-			'value' => array_filter( array_map( 'trim', explode( ',', $value )), 'is_numeric' ),
+			'value' => array_filter(array_map('trim', explode(',', $value)), 'is_numeric'),
 		];
 	}
 
@@ -102,9 +102,9 @@ 
 	 * @param array $value
 	 * @return void|array
 	 */
-	protected function buildQueryCategory( $value )
+	protected function buildQueryCategory($value)
 	{
-		if( empty( $value ))return;
+		if (empty($value))return;
 		return [
 			'field' => 'term_id',
 			'taxonomy' => Application::TAXONOMY,
@@ -116,9 +116,9 @@ 
 	 * @param string $value
 	 * @return void|array
 	 */
-	protected function buildQueryRating( $value )
+	protected function buildQueryRating($value)
 	{
-		if( !is_numeric( $value ) || !in_array( intval( $value ), range( 1, 5 )))return;
+		if (!is_numeric($value) || !in_array(intval($value), range(1, 5)))return;
 		return [
 			'compare' => '>=',
 			'key' => 'rating',
@@ -130,9 +130,9 @@ 
 	 * @param string $value
 	 * @return void|array
 	 */
-	protected function buildQueryType( $value )
+	protected function buildQueryType($value)
 	{
-		if( in_array( $value, ['','all'] ))return;
+		if (in_array($value, ['', 'all']))return;
 		return [
 			'key' => 'review_type',
 			'value' => $value,

plugin/Database/SqlQueries.php

Spacing +10 added lines, -10 removed lines

@@ -21,9 +21,9 @@ 
 	 * @param $metaKey
 	 * @return array
 	 */
-	public function getReviewCounts( $metaKey )
+	public function getReviewCounts($metaKey)
 	{
-		return (array) $this->db->get_results("
+		return (array)$this->db->get_results("
 			SELECT m.meta_value AS name, COUNT(*) num_posts
 			FROM {$this->db->posts} AS p
 			INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -36,7 +36,7 @@ 
 	 * @param $metaReviewId
 	 * @return int
 	 */
-	public function getReviewPostId( $metaReviewId )
+	public function getReviewPostId($metaReviewId)
 	{
 		$postId = $this->db->get_var("
 			SELECT p.ID
@@ -46,14 +46,14 @@ 
 			AND pm.meta_key = 'review_id'
 			AND pm.meta_value = '{$metaReviewId}'
 		");
-		return intval( $postId );
+		return intval($postId);
 	}
 
 	/**
 	 * @param string $metaReviewType
 	 * @return array
 	 */
-	public function getReviewIdsByType( $metaReviewType )
+	public function getReviewIdsByType($metaReviewType)
 	{
 		$query = $this->db->get_col("
 			SELECT m1.meta_value AS review_id
@@ -65,7 +65,7 @@ 
 			AND m2.meta_key = 'review_type'
 			AND m2.meta_value = '{$metaReviewType}'
 		");
-		return array_keys( array_flip( $query ));
+		return array_keys(array_flip($query));
 	}
 
 	/**
@@ -73,11 +73,11 @@ 
 	 * @param string $status
 	 * @return array
 	 */
-	public function getReviewsMeta( $keys, $status )
+	public function getReviewsMeta($keys, $status)
 	{
-		$queryBuilder = glsr( QueryBuilder::class );
-		$keys = $queryBuilder->buildSqlOr( $keys, "pm.meta_key = '%s'" );
-		$status = $queryBuilder->buildSqlOr( $status, "p.post_status = '%s'" );
+		$queryBuilder = glsr(QueryBuilder::class);
+		$keys = $queryBuilder->buildSqlOr($keys, "pm.meta_key = '%s'");
+		$status = $queryBuilder->buildSqlOr($status, "p.post_status = '%s'");
 		return $this->db->get_col("
 			SELECT DISTINCT pm.meta_value FROM {$this->db->postmeta} pm
 			LEFT JOIN {$this->db->posts} p ON p.ID = pm.post_id

plugin/Database/DefaultsManager.php

Spacing +13 added lines, -13 removed lines

@@ -12,11 +12,11 @@ 
 	 */
 	public function get()
 	{
-		$settings = include glsr()->path( 'config/settings.php' );
-		$settings = apply_filters( 'site-reviews/addon/settings', $settings );
-		$settings = $this->normalize( $settings );
-		$defaults = array_combine( array_keys( $settings ), array_column( $settings, 'default' ));
-		return glsr( Helper::class )->convertDotNotationArray( $defaults );
+		$settings = include glsr()->path('config/settings.php');
+		$settings = apply_filters('site-reviews/addon/settings', $settings);
+		$settings = $this->normalize($settings);
+		$defaults = array_combine(array_keys($settings), array_column($settings, 'default'));
+		return glsr(Helper::class)->convertDotNotationArray($defaults);
 	}
 
 	/**
@@ -24,21 +24,21 @@ 
 	 */
 	public function set()
 	{
-		$settings = glsr( OptionManager::class )->all();
-		$currentSettings = glsr( Helper::class )->removeEmptyArrayValues( $settings );
-		$defaultSettings = array_replace_recursive( $this->getDefaults(), $currentSettings );
-		$updatedSettings = array_replace_recursive( $settings, $defaultSettings );
-		update_option( OptionManager::databaseKey(), $updatedSettings );
+		$settings = glsr(OptionManager::class)->all();
+		$currentSettings = glsr(Helper::class)->removeEmptyArrayValues($settings);
+		$defaultSettings = array_replace_recursive($this->getDefaults(), $currentSettings);
+		$updatedSettings = array_replace_recursive($settings, $defaultSettings);
+		update_option(OptionManager::databaseKey(), $updatedSettings);
 		return $defaultSettings;
 	}
 
 	/**
 	 * @return array
 	 */
-	protected function normalize( array $settings )
+	protected function normalize(array $settings)
 	{
-		array_walk( $settings, function( &$setting ) {
-			if( isset( $setting['default'] ))return;
+		array_walk($settings, function(&$setting) {
+			if (isset($setting['default']))return;
 			$setting['default'] = null;
 		});
 		return $settings;

plugin/Database/Cache.php

Spacing +14 added lines, -14 removed lines

@@ -11,15 +11,15 @@ 
 	 */
 	public function getCloudflareIps()
 	{
-		$ipAddresses = wp_cache_get( glsr()->id, '_cloudflare_ips' );
-		if( $ipAddresses === false ) {
-			$ipAddresses = array_fill_keys( ['v4', 'v6'], [] );
-			foreach( array_keys( $ipAddresses ) as $version ) {
-				$response = wp_remote_get( 'https://www.cloudflare.com/ips-'.$version );
-				if( is_wp_error( $response ))continue;
-				$ipAddresses[$version] = array_filter( explode( PHP_EOL, wp_remote_retrieve_body( $response )));
+		$ipAddresses = wp_cache_get(glsr()->id, '_cloudflare_ips');
+		if ($ipAddresses === false) {
+			$ipAddresses = array_fill_keys(['v4', 'v6'], []);
+			foreach (array_keys($ipAddresses) as $version) {
+				$response = wp_remote_get('https://www.cloudflare.com/ips-'.$version);
+				if (is_wp_error($response))continue;
+				$ipAddresses[$version] = array_filter(explode(PHP_EOL, wp_remote_retrieve_body($response)));
 			}
-			wp_cache_set( glsr()->id, $ipAddresses, '_cloudflare_ips' );
+			wp_cache_set(glsr()->id, $ipAddresses, '_cloudflare_ips');
 		}
 		return $ipAddresses;
 	}
@@ -28,16 +28,16 @@ 
 	 * @param string $metaKey
 	 * @return array
 	 */
-	public function getReviewCountsFor( $metaKey )
+	public function getReviewCountsFor($metaKey)
 	{
-		$counts = wp_cache_get( glsr()->id, $metaKey.'_count' );
-		if( $counts === false ) {
+		$counts = wp_cache_get(glsr()->id, $metaKey.'_count');
+		if ($counts === false) {
 			$counts = [];
-			$results = glsr( SqlQueries::class )->getReviewCounts( $metaKey );
-			foreach( $results as $result ) {
+			$results = glsr(SqlQueries::class)->getReviewCounts($metaKey);
+			foreach ($results as $result) {
 				$counts[$result->name] = $result->num_posts;
 			}
-			wp_cache_set( glsr()->id, $counts, $metaKey.'_count' );
+			wp_cache_set(glsr()->id, $counts, $metaKey.'_count');
 		}
 		return $counts;
 	}