pryley / site-reviews

plugin/Handlers/CreateReview.php

Spacing +6 added lines, -6 removed lines

@@ -17,13 +17,13 @@ 
 		$review = glsr( ReviewManager::class )->create( $command );
 		if( !$review ) {
 			glsr( Session::class )->set( $command->form_id.'errors', [] );
-			glsr( Session::class )->set( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' ));
+			glsr( Session::class )->set( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' ) );
 			return;
 		}
-		glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ));
+		glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ) );
 		glsr( Notification::class )->send( $review );
 		if( $command->ajax_request )return;
-		wp_safe_redirect( $this->getReferer( $command ));
+		wp_safe_redirect( $this->getReferer( $command ) );
 		exit;
 	}
 
@@ -32,11 +32,11 @@ 
 	 */
 	protected function getReferer( Command $command )
 	{
-		$referer = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true )));
-		if( empty( $referer )) {
+		$referer = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ) ) );
+		if( empty($referer) ) {
 			$referer = $command->referer;
 		}
-		if( empty( $referer )) {
+		if( empty($referer) ) {
 			glsr_log()->warning( 'The form referer ($_SERVER[REQUEST_URI]) was empty.' )->info( $command );
 			$referer = home_url();
 		}

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
 		}
 		glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ));
 		glsr( Notification::class )->send( $review );
-		if( $command->ajax_request )return;
+		if( $command->ajax_request ) {
+			return;
+		}
 		wp_safe_redirect( $this->getReferer( $command ));
 		exit;
 	}

plugin/Modules/Html/Form.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	{
 		$fields = [];
 		foreach( glsr()->config( 'forms/'.$id ) as $name => $field ) {
-			$fields[] = new Field( wp_parse_args( $field, ['name' => $name] ));
+			$fields[] = new Field( wp_parse_args( $field, ['name' => $name] ) );
 		}
 		return $fields;
 	}

deprecated.php

Spacing +18 added lines, -18 removed lines

@@ -4,7 +4,7 @@ 
 
 // Database/ReviewManager.php
 add_action( 'site-reviews/review/created', function( $review ) {
-	if( has_action( 'site-reviews/local/review/create' )) {
+	if( has_action( 'site-reviews/local/review/create' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/create/review" hook instead.';
 		do_action( 'site-reviews/local/review/create', (array)get_post( $review->ID ), (array)$review, $review->ID );
 	}
@@ -12,18 +12,18 @@ 
 
 // Handlers/CreateReview.php
 add_action( 'site-reviews/review/submitted', function( $review ) {
-	if( has_action( 'site-reviews/local/review/submitted' )) {
+	if( has_action( 'site-reviews/local/review/submitted' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.';
 		do_action( 'site-reviews/local/review/submitted', null, $review );
 	}
-	if( has_filter( 'site-reviews/local/review/submitted/message' )) {
+	if( has_filter( 'site-reviews/local/review/submitted/message' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.';
 	}
 }, 9 );
 
 // Database/ReviewManager.php
 add_filter( 'site-reviews/create/review-values', function( $values, $command ) {
-	if( has_filter( 'site-reviews/local/review' )) {
+	if( has_filter( 'site-reviews/local/review' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.';
 		return apply_filters( 'site-reviews/local/review', $values, $command );
 	}
@@ -32,7 +32,7 @@ 
 
 // Handlers/EnqueuePublicAssets.php
 add_filter( 'site-reviews/enqueue/public/localize', function( $variables ) {
-	if( has_filter( 'site-reviews/enqueue/localize' )) {
+	if( has_filter( 'site-reviews/enqueue/localize' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.';
 		return apply_filters( 'site-reviews/enqueue/localize', $variables );
 	}
@@ -41,7 +41,7 @@ 
 
 // Modules/Rating.php
 add_filter( 'site-reviews/rating/average', function( $average ) {
-	if( has_filter( 'site-reviews/average/rating' )) {
+	if( has_filter( 'site-reviews/average/rating' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.';
 	}
 	return $average;
@@ -49,7 +49,7 @@ 
 
 // Modules/Rating.php
 add_filter( 'site-reviews/rating/ranking', function( $ranking ) {
-	if( has_filter( 'site-reviews/bayesian/ranking' )) {
+	if( has_filter( 'site-reviews/bayesian/ranking' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.';
 	}
 	return $ranking;
@@ -57,13 +57,13 @@ 
 
 // Modules/Html/Partials/SiteReviews.php
 add_filter( 'site-reviews/review/build/after', function( $renderedFields ) {
-	if( has_filter( 'site-reviews/rendered/field' )) {
+	if( has_filter( 'site-reviews/rendered/field' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/rendered/field" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
 	}
-	if( has_filter( 'site-reviews/reviews/review/text' )) {
+	if( has_filter( 'site-reviews/reviews/review/text' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
 	}
-	if( has_filter( 'site-reviews/reviews/review/title' )) {
+	if( has_filter( 'site-reviews/reviews/review/title' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
 	}
 	return $renderedFields;
@@ -71,26 +71,26 @@ 
 
 // Modules/Html/Partials/SiteReviews.php
 add_filter( 'site-reviews/review/build/before', function( $review ) {
-	if( has_filter( 'site-reviews/rendered/review' )) {
+	if( has_filter( 'site-reviews/rendered/review' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.';
 	}
-	if( has_filter( 'site-reviews/rendered/review/meta/order' )) {
+	if( has_filter( 'site-reviews/rendered/review/meta/order' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
 	}
-	if( has_filter( 'site-reviews/rendered/review/order' )) {
+	if( has_filter( 'site-reviews/rendered/review/order' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
 	}
-	if( has_filter( 'site-reviews/rendered/review-form/login-register' )) {
+	if( has_filter( 'site-reviews/rendered/review-form/login-register' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).';
 	}
-	if( has_filter( 'site-reviews/reviews/navigation_links' )) {
+	if( has_filter( 'site-reviews/reviews/navigation_links' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).';
 	}
 	return $review;
 }, 9 );
 
 add_filter( 'site-reviews/validate/custom', function( $result, $request ) {
-	if( has_filter( 'site-reviews/validate/review/submission' )) {
+	if( has_filter( 'site-reviews/validate/review/submission' ) ) {
 		glsr_log()->notice( 'The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.' );
 		try {
 			$result = apply_filters( 'site-reviews/validate/review/submission', $result, $request );
@@ -101,7 +101,7 @@ 
 }, 9, 2 );
 
 add_filter( 'site-reviews/views/file', function( $file, $view, $data ) {
-	if( has_filter( 'site-reviews/addon/views/file' )) {
+	if( has_filter( 'site-reviews/addon/views/file' ) ) {
 		glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.';
 		$file = apply_filters( 'site-reviews/addon/views/file', $file, $view, $data );
 	}
@@ -109,7 +109,7 @@ 
 }, 9, 3 );
 
 add_action( 'wp_footer', function() {
-	$notices = array_keys( array_flip( glsr()->deprecated ));
+	$notices = array_keys( array_flip( glsr()->deprecated ) );
 	natsort( $notices );
 	foreach( $notices as $notice ) {
 		glsr_log()->notice( $notice );

plugin/Modules/Validator/ValidateReview.php

Spacing +22 added lines, -22 removed lines

@@ -61,7 +61,7 @@ 
 		$this->validateBlacklist();
 		$this->validateAkismet();
 		$this->validateRecaptcha();
-		if( !empty( $this->error )) {
+		if( !empty($this->error) ) {
 			$this->setSessionValues( 'message', $this->error );
 		}
 		return $this;
@@ -84,12 +84,12 @@ 
 	{
 		$rules = array_intersect_key(
 			apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ),
-			array_flip( $this->getOption( 'settings.submissions.required', [] ))
+			array_flip( $this->getOption( 'settings.submissions.required', [] ) )
 		);
-		$excluded = isset( $request['excluded'] )
+		$excluded = isset($request['excluded'])
 			? (array)json_decode( $request['excluded'] )
 			: [];
-		return array_diff_key( $rules, array_flip( $excluded ));
+		return array_diff_key( $rules, array_flip( $excluded ) );
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 		if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
 			return true;
 		}
-		if( empty( $this->request['recaptcha-token'] )) {
+		if( empty($this->request['recaptcha-token']) ) {
 			return null; // @see $this->validateRecaptcha()
 		}
 		return $this->isRecaptchaValid( $this->request['recaptcha-token'] );
@@ -112,17 +112,17 @@ 
 	 */
 	protected function isRecaptchaValid( $recaptchaToken )
 	{
-		$endpoint = add_query_arg([
+		$endpoint = add_query_arg( [
 			'remoteip' => glsr( Helper::class )->getIpAddress(),
 			'response' => $recaptchaToken,
 			'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ),
 		], static::RECAPTCHA_ENDPOINT );
-		if( is_wp_error( $response = wp_remote_get( $endpoint ))) {
+		if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) {
 			glsr_log()->error( $response->get_error_message() );
 			return false;
 		}
-		$response = json_decode( wp_remote_retrieve_body( $response ));
-		if( !empty( $response->success )) {
+		$response = json_decode( wp_remote_retrieve_body( $response ) );
+		if( !empty($response->success) ) {
 			return boolval( $response->success );
 		}
 		foreach( $response->{'error-codes'} as $error ) {
@@ -138,7 +138,7 @@ 
 	{
 		$rules = $this->getValidationRules( $request );
 		$errors = glsr( Validator::class )->validate( $request, $rules );
-		if( empty( $errors )) {
+		if( empty($errors) ) {
 			return true;
 		}
 		$this->setSessionValues( 'errors', $errors );
@@ -155,7 +155,7 @@ 
 	protected function setSessionValues( $type, $value, $loggedMessage = '' )
 	{
 		glsr( Session::class )->set( $this->form_id.$type, $value );
-		if( !empty( $loggedMessage )) {
+		if( !empty($loggedMessage) ) {
 			glsr_log()->warning( $loggedMessage );
 			glsr_log()->warning( $this->request );
 		}
@@ -166,8 +166,8 @@ 
 	 */
 	protected function validateAkismet()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Akismet::class )->isSpam( $this->request ))return;
+		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' );
 	}
@@ -177,8 +177,8 @@ 
 	 */
 	protected function validateBlacklist()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return;
+		if( !empty($this->error) )return;
+		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return;
 		$blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'reject' ) {
 			$this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
@@ -193,7 +193,7 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
 		if( $validated === true )return;
 		$this->setSessionValues( 'errors', [] );
@@ -208,8 +208,8 @@ 
 	 */
 	protected function validateHoneyPot()
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $this->request['gotcha'] ))return;
+		if( !empty($this->error) )return;
+		if( empty($this->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' );
 	}
@@ -219,9 +219,9 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$isValid = $this->isRecaptchaResponseValid();
-		if( is_null( $isValid )) {
+		if( is_null( $isValid ) ) {
 			$this->setSessionValues( 'recaptcha', 'unset' );
 			$this->recaptchaIsUnset = true;
 		}
@@ -237,11 +237,11 @@ 
 	 */
 	protected function validateRequest( array $request )
 	{
-		if( !$this->isRequestValid( $request )) {
+		if( !$this->isRequestValid( $request ) ) {
 			$this->error = __( 'Please fix the submission errors.', 'site-reviews' );
 			return $request;
 		}
-		if( empty( $request['title'] )) {
+		if( empty($request['title']) ) {
 			$request['title'] = __( 'No Title', 'site-reviews' );
 		}
 		return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request );

Braces +27 added lines, -9 removed lines

@@ -166,8 +166,12 @@ 
 	 */
 	protected function validateAkismet()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Akismet::class )->isSpam( $this->request ))return;
+		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' );
 	}
@@ -177,8 +181,12 @@ 
 	 */
 	protected function validateBlacklist()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( !glsr( Blacklist::class )->isBlacklisted( $this->request )) {
+			return;
+		}
 		$blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'reject' ) {
 			$this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
@@ -193,9 +201,13 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
-		if( $validated === true )return;
+		if( $validated === true ) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [] );
 		$this->setSessionValues( 'values', $this->request );
 		$this->error = is_string( $validated )
@@ -208,8 +220,12 @@ 
 	 */
 	protected function validateHoneyPot()
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $this->request['gotcha'] ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( empty( $this->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' );
 	}
@@ -219,7 +235,9 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$isValid = $this->isRecaptchaResponseValid();
 		if( is_null( $isValid )) {
 			$this->setSessionValues( 'recaptcha', 'unset' );