pryley / site-reviews

plugin/Modules/Validator/ValidateReview.php

Spacing +22 added lines, -22 removed lines

@@ -55,11 +55,11 @@ 
 	 */
 	public 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 );
@@ -73,14 +73,14 @@ 
 		$rules = array_intersect_key(
 			apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ),
 			array_flip( array_merge(
-				['rating','terms'],
+				['rating', 'terms'],
 				glsr( OptionManager::class )->get( 'settings.reviews-form.required', [] )
-			))
+			) )
 		);
-		$excluded = isset( $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 ) );
 	}
 
 	/**
@@ -93,12 +93,12 @@ 
 			return true;
 		}
 		$recaptchaResponse = filter_input( INPUT_POST, 'g-recaptcha-response' );
-		if( empty( $recaptchaResponse ))return; //if response is empty we need to return null
+		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 ));
+			return boolval( apply_filters( 'google_invre_is_valid_request_filter', true ) );
 		}
 		return false;
 	}
@@ -108,13 +108,13 @@ 
 	 */
 	protected function isRecaptchaValid( $recaptchaResponse )
 	{
-		$endpoint = add_query_arg([
+		$endpoint = add_query_arg( [
 			'remoteip' => glsr( Helper::class )->getIpAddress(),
 			'response' => $recaptchaResponse,
 			'secret' => glsr( OptionManager::class )->get( 'settings.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 )) {
+		$response = json_decode( wp_remote_retrieve_body( wp_remote_get( $endpoint ) ) );
+		if( !empty($response->success) ) {
 			return boolval( $response->success );
 		}
 		$errorCodes = [
@@ -137,7 +137,7 @@ 
 	{
 		$rules = $this->getValidationRules( $request );
 		$errors = glsr( Validator::class )->validate( $request, $rules );
-		if( empty( $errors )) {
+		if( empty($errors) ) {
 			return true;
 		}
 		$this->setSession( 'errors', $errors );
@@ -154,7 +154,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 );
 		}
@@ -165,8 +165,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' );
 	}
@@ -176,8 +176,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 = glsr( OptionManager::class )->get( 'settings.reviews-form.blacklist.action' );
 		if( $blacklistAction == 'unapprove' ) {
 			$this->request['blacklisted'] = true;
@@ -193,7 +193,7 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request );
 		if( $validated === true )return;
 		$this->setSessionValues( 'errors', [] );
@@ -208,8 +208,8 @@ 
 	 */
 	protected function validateHoneyPot( array $request )
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $request['gotcha'] ))return;
+		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' );
 	}
@@ -219,9 +219,9 @@ 
 	 */
 	protected function validateRecaptcha( array $request )
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$isValid = $this->isRecaptchaResponseValid();
-		if( is_null( $isValid )) {
+		if( is_null( $isValid ) ) {
 			$this->setSessionValues( 'recaptcha', true );
 			$this->recaptchaIsUnset = true;
 		}

Braces +31 added lines, -10 removed lines

@@ -93,7 +93,10 @@ 
 			return true;
 		}
 		$recaptchaResponse = filter_input( INPUT_POST, 'g-recaptcha-response' );
-		if( empty( $recaptchaResponse ))return; //if response is empty we need to return null
+		if( empty( $recaptchaResponse )) {
+			return;
+		}
+		//if response is empty we need to return null
 		if( $integration == 'custom' ) {
 			return $this->isRecaptchaValid( $recaptchaResponse );
 		}
@@ -165,8 +168,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' );
 	}
@@ -176,8 +183,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 = glsr( OptionManager::class )->get( 'settings.reviews-form.blacklist.action' );
 		if( $blacklistAction == 'unapprove' ) {
 			$this->request['blacklisted'] = true;
@@ -193,9 +204,13 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$validated = apply_filters( 'site-reviews/validate/review/submission', 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 +223,12 @@ 
 	 */
 	protected function validateHoneyPot( array $request )
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $request['gotcha'] ))return;
+		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' );
 	}
@@ -219,7 +238,9 @@ 
 	 */
 	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 );

plugin/Modules/Email.php

Spacing +10 added lines, -10 removed lines

@@ -43,7 +43,7 @@ 
 		$this->message = $this->buildHtmlMessage( $email );
 		$this->subject = $email['subject'];
 		$this->to = $email['to'];
-		add_action( 'phpmailer_init', [ $this, 'buildPlainTextMessage'] );
+		add_action( 'phpmailer_init', [$this, 'buildPlainTextMessage'] );
 		return $this;
 	}
 
@@ -83,7 +83,7 @@ 
 	 */
 	public function buildPlainTextMessage( $phpmailer )
 	{
-		if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return;
+		if( $phpmailer->ContentType === 'text/plain' || !empty($phpmailer->AltBody) )return;
 		$message = $this->stripHtmlTags( $phpmailer->Body );
 		$phpmailer->AltBody = apply_filters( 'site-reviews/email/message', $message, 'text', $this );
 	}
@@ -99,10 +99,10 @@ 
 			'from',
 			'reply-to',
 		];
-		$headers = array_intersect_key( $email, array_flip( $allowed ));
+		$headers = array_intersect_key( $email, array_flip( $allowed ) );
 		$headers = array_filter( $headers );
 		foreach( $headers as $key => $value ) {
-			unset( $headers[ $key ] );
+			unset($headers[$key]);
 			$headers[] = "{$key}: {$value}";
 		}
 		$headers[] = 'Content-Type: text/html';
@@ -114,16 +114,16 @@ 
 	 */
 	protected function buildHtmlMessage( $email )
 	{
-		$template = trim( glsr( OptionManager::class )->get( 'settings.general.notification_message' ));
-		if( !empty( $template )) {
+		$template = trim( glsr( OptionManager::class )->get( 'settings.general.notification_message' ) );
+		if( !empty($template) ) {
 			$message = glsr( Template::class )->interpolate( $template, $email['template-tags'] );
 		}
 		else if( $email['template'] ) {
 			$message = glsr( Template::class )->build( 'templates/'.$email['template'], [
 				'context' => $email['template-tags'],
-			]);
+			] );
 		}
-		if( !isset( $message )) {
+		if( !isset($message) ) {
 			$message = $email['message'];
 		}
 		$message = $email['before'].$message.$email['after'];
@@ -134,7 +134,7 @@ 
 		$message = str_replace( ']]>', ']]>', $message );
 		$message = glsr( Template::class )->build( 'email/index', [
 			'context' => ['message' => $message],
-		]);
+		] );
 		return apply_filters( 'site-reviews/email/message', stripslashes( $message ), 'html', $this );
 	}
 
@@ -160,7 +160,7 @@ 
 			'to' => '',
 		];
 		$email = shortcode_atts( $defaults, $email );
-		if( empty( $email['reply-to'] )) {
+		if( empty($email['reply-to']) ) {
 			$email['reply-to'] = $email['from'];
 		}
 		return apply_filters( 'site-reviews/email/compose', $email, $this );

Braces +6 added lines, -2 removed lines

@@ -64,7 +64,9 @@ 
 	 */
 	public function send()
 	{
-		if( !$this->message || !$this->subject || !$this->to )return;
+		if( !$this->message || !$this->subject || !$this->to ) {
+			return;
+		}
 		$sent = wp_mail(
 			$this->to,
 			$this->subject,
@@ -83,7 +85,9 @@ 
 	 */
 	public function buildPlainTextMessage( $phpmailer )
 	{
-		if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return;
+		if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody )) {
+			return;
+		}
 		$message = $this->stripHtmlTags( $phpmailer->Body );
 		$phpmailer->AltBody = apply_filters( 'site-reviews/email/message', $message, 'text', $this );
 	}

plugin/Modules/Validator.php

Spacing +18 added lines, -18 removed lines

@@ -74,7 +74,7 @@ 
 		foreach( $this->rules as $attribute => $rules ) {
 			foreach( $rules as $rule ) {
 				$this->validateAttribute( $attribute, $rule );
-				if( $this->shouldStopValidating( $attribute ))break;
+				if( $this->shouldStopValidating( $attribute ) )break;
 			}
 		}
 		return $this->errors;
@@ -89,14 +89,14 @@ 
 	 */
 	public function validateAttribute( $attribute, $rule )
 	{
-		list( $rule, $parameters ) = $this->parseRule( $rule );
+		list($rule, $parameters) = $this->parseRule( $rule );
 		if( $rule == '' )return;
 		$value = $this->getValue( $attribute );
 		$this->validateRequired( $attribute, $value ) || in_array( $rule, $this->implicitRules );
-		if( !method_exists( $this, $method = 'validate'.$rule )) {
+		if( !method_exists( $this, $method = 'validate'.$rule ) ) {
 			throw new BadMethodCallException( "Method [$method] does not exist." );
 		}
-		if( !$this->$method( $attribute, $value, $parameters )) {
+		if( !$this->$method( $attribute, $value, $parameters ) ) {
 			$this->addFailure( $attribute, $rule, $parameters );
 		}
 	}
@@ -111,7 +111,7 @@ 
 	{
 		$message = $this->getMessage( $attribute, $rule, $parameters );
 		$this->errors[$attribute]['errors'][] = $message;
-		if( !isset( $this->errors[$attribute]['value'] )) {
+		if( !isset($this->errors[$attribute]['value']) ) {
 			$this->errors[$attribute]['value'] = $this->getValue( $attribute );
 		}
 	}
@@ -148,7 +148,7 @@ 
 	 */
 	protected function getMessage( $attribute, $rule, array $parameters )
 	{
-		if( in_array( $rule, $this->sizeRules )) {
+		if( in_array( $rule, $this->sizeRules ) ) {
 			return $this->getSizeMessage( $attribute, $rule, $parameters );
 		}
 		$lowerRule = glsr( Helper::class )->snakeCase( $rule );
@@ -163,11 +163,11 @@ 
 	 */
 	protected function getRule( $attribute, $rules )
 	{
-		if( !array_key_exists( $attribute, $this->rules ))return;
-		$rules = (array) $rules;
+		if( !array_key_exists( $attribute, $this->rules ) )return;
+		$rules = (array)$rules;
 		foreach( $this->rules[$attribute] as $rule ) {
-			list( $rule, $parameters ) = $this->parseRule( $rule );
-			if( in_array( $rule, $rules )) {
+			list($rule, $parameters) = $this->parseRule( $rule );
+			if( in_array( $rule, $rules ) ) {
 				return [$rule, $parameters];
 			}
 		}
@@ -185,7 +185,7 @@ 
 		if( is_numeric( $value ) && $hasNumeric ) {
 			return $value;
 		}
-		elseif( is_array( $value )) {
+		elseif( is_array( $value ) ) {
 			return count( $value );
 		}
 		return mb_strlen( $value );
@@ -212,7 +212,7 @@ 
 	 */
 	protected function getValue( $attribute )
 	{
-		if( isset( $this->data[$attribute] )) {
+		if( isset($this->data[$attribute]) ) {
 			return $this->data[$attribute];
 		}
 	}
@@ -225,7 +225,7 @@ 
 	 */
 	protected function hasRule( $attribute, $rules )
 	{
-		return !is_null( $this->getRule( $attribute, $rules ));
+		return !is_null( $this->getRule( $attribute, $rules ) );
 	}
 
 	/**
@@ -265,11 +265,11 @@ 
 		$parameters = [];
 		// example: {rule}:{parameters}
 		if( strpos( $rule, ':' ) !== false ) {
-			list( $rule, $parameter ) = explode( ':', $rule, 2 );
+			list($rule, $parameter) = explode( ':', $rule, 2 );
 			// example: {parameter1,parameter2,...}
 			$parameters = $this->parseParameters( $rule, $parameter );
 		}
-		$rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule )));
+		$rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule ) ) );
 		$rule = str_replace( ' ', '', $rule );
 		return [$rule, $parameters];
 	}
@@ -297,7 +297,7 @@ 
 	protected function shouldStopValidating( $attribute )
 	{
 		return $this->hasRule( $attribute, $this->implicitRules )
-			&& isset( $this->failedRules[$attribute] )
+			&& isset($this->failedRules[$attribute])
 			&& array_intersect( array_keys( $this->failedRules[$attribute] ), $this->implicitRules );
 	}
 
@@ -311,12 +311,12 @@ 
 	protected function translator( $key, $rule, $attribute, array $parameters )
 	{
 		$strings = glsr( Strings::class )->validation();
-		$message = isset( $strings[$key] )
+		$message = isset($strings[$key])
 			? $strings[$key]
 			: false;
 		if( !$message )return;
 		$message = str_replace( ':attribute', $attribute, $message );
-		if( method_exists( $this, $replacer = 'replace'.$rule )) {
+		if( method_exists( $this, $replacer = 'replace'.$rule ) ) {
 			$message = $this->$replacer( $message, $parameters );
 		}
 		return $message;

Braces +12 added lines, -4 removed lines

@@ -74,7 +74,9 @@ 
 		foreach( $this->rules as $attribute => $rules ) {
 			foreach( $rules as $rule ) {
 				$this->validateAttribute( $attribute, $rule );
-				if( $this->shouldStopValidating( $attribute ))break;
+				if( $this->shouldStopValidating( $attribute )) {
+					break;
+				}
 			}
 		}
 		return $this->errors;
@@ -90,7 +92,9 @@ 
 	public function validateAttribute( $attribute, $rule )
 	{
 		list( $rule, $parameters ) = $this->parseRule( $rule );
-		if( $rule == '' )return;
+		if( $rule == '' ) {
+			return;
+		}
 		$value = $this->getValue( $attribute );
 		$this->validateRequired( $attribute, $value ) || in_array( $rule, $this->implicitRules );
 		if( !method_exists( $this, $method = 'validate'.$rule )) {
@@ -163,7 +167,9 @@ 
 	 */
 	protected function getRule( $attribute, $rules )
 	{
-		if( !array_key_exists( $attribute, $this->rules ))return;
+		if( !array_key_exists( $attribute, $this->rules )) {
+			return;
+		}
 		$rules = (array) $rules;
 		foreach( $this->rules[$attribute] as $rule ) {
 			list( $rule, $parameters ) = $this->parseRule( $rule );
@@ -314,7 +320,9 @@ 
 		$message = isset( $strings[$key] )
 			? $strings[$key]
 			: false;
-		if( !$message )return;
+		if( !$message ) {
+			return;
+		}
 		$message = str_replace( ':attribute', $attribute, $message );
 		if( method_exists( $this, $replacer = 'replace'.$rule )) {
 			$message = $this->$replacer( $message, $parameters );

plugin/Modules/Translator.php

Spacing +29 added lines, -29 removed lines

@@ -30,7 +30,7 @@ 
 	{
 		$translations = $this->getSettings();
 		$entries = $this->filter( $translations, $this->entries() )->results();
-		array_walk( $translations, function( &$entry ) use( $entries ) {
+		array_walk( $translations, function( &$entry ) use($entries) {
 			$entry['desc'] = array_key_exists( $entry['id'], $entries )
 				? $this->getEntryString( $entries[$entry['id']], 'msgctxt' )
 				: '';
@@ -43,10 +43,10 @@ 
 	 */
 	public function entries()
 	{
-		if( !is_array( $this->entries )) {
+		if( !is_array( $this->entries ) ) {
 			try {
 				$entries = $this->normalize(
-					Parser::parseFile( glsr()->path( 'languages/site-reviews.pot' ))->getEntries()
+					Parser::parseFile( glsr()->path( 'languages/site-reviews.pot' ) )->getEntries()
 				);
 			}
 			catch( Exception $e ) {
@@ -77,13 +77,13 @@ 
 	 */
 	public function filter( $filterWith = null, $entries = null, $intersect = true )
 	{
-		if( !is_array( $entries )) {
+		if( !is_array( $entries ) ) {
 			$entries = $this->results;
 		}
-		if( !is_array( $filterWith )) {
+		if( !is_array( $filterWith ) ) {
 			$filterWith = $this->getSettings();
 		}
-		$keys = array_flip( array_column( $filterWith, 'id' ));
+		$keys = array_flip( array_column( $filterWith, 'id' ) );
 		$this->results = $intersect
 			? array_intersect_key( $entries, $keys )
 			: array_diff_key( $entries, $keys );
@@ -100,7 +100,7 @@ 
 	{
 		return $this->translate( $translation, $domain, [
 			'single' => $text,
-		]);
+		] );
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 		return $this->translate( $translation, $domain, [
 			'context' => $context,
 			'single' => $text,
-		]);
+		] );
 	}
 
 	/**
@@ -132,7 +132,7 @@ 
 			'number' => $number,
 			'plural' => $plural,
 			'single' => $single,
-		]);
+		] );
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 			'number' => $number,
 			'plural' => $plural,
 			'single' => $single,
-		]);
+		] );
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	public function render( $template, array $entry )
 	{
 		$data = array_combine(
-			array_map( function( $key ) { return 'data.'.$key; }, array_keys( $entry )),
+			array_map( function( $key ) { return 'data.'.$key; }, array_keys( $entry ) ),
 			$entry
 		);
 		ob_start();
@@ -198,13 +198,13 @@ 
 				'p1' => $this->getEntryString( $entry, 'msgid_plural' ),
 				's1' => $this->getEntryString( $entry, 'msgid' ),
 			];
-			$text = !empty( $data['p1'] )
+			$text = !empty($data['p1'])
 				? sprintf( '%s | %s', $data['s1'], $data['p1'] )
 				: $data['s1'];
 			$rendered .= $this->render( 'result', [
 				'entry' => wp_json_encode( $data ),
 				'text' => wp_strip_all_tags( $text ),
-			]);
+			] );
 		}
 		if( $resetAfterRender ) {
 			$this->reset();
@@ -237,12 +237,12 @@ 
 	public function search( $needle = '' )
 	{
 		$this->reset();
-		$needle = trim( strtolower( $needle ));
+		$needle = trim( strtolower( $needle ) );
 		foreach( $this->entries() as $key => $entry ) {
-			$single = strtolower( $this->getEntryString( $entry, 'msgid' ));
-			$plural = strtolower( $this->getEntryString( $entry, 'msgid_plural' ));
+			$single = strtolower( $this->getEntryString( $entry, 'msgid' ) );
+			$plural = strtolower( $this->getEntryString( $entry, 'msgid_plural' ) );
 			if( strlen( $needle ) < static::SEARCH_THRESHOLD ) {
-				if( in_array( $needle, [$single, $plural] )) {
+				if( in_array( $needle, [$single, $plural] ) ) {
 					$this->results[$key] = $entry;
 				}
 			}
@@ -266,19 +266,19 @@ 
 		$args = $this->normalizeTranslationArgs( $args );
 		extract( $args );
 		$strings = $this->getSettings();
-		$strings = array_filter( $strings, function( $string ) use( $single, $plural ) {
+		$strings = array_filter( $strings, function( $string ) use($single, $plural) {
 			return $string['s1'] == html_entity_decode( $single, ENT_COMPAT, 'UTF-8' )
 				&& $string['p1'] == html_entity_decode( $plural, ENT_COMPAT, 'UTF-8' );
 		});
-		if( empty( $strings )) {
+		if( empty($strings) ) {
 			return $original;
 		}
 		$string = current( $strings );
 		$translations = get_translations_for_domain( $domain );
-		if( !empty( $string['s2'] )) {
+		if( !empty($string['s2']) ) {
 			$single = $string['s2'];
 		}
-		if( !empty( $string['p2'] )) {
+		if( !empty($string['p2']) ) {
 			$plural = $string['p2'];
 		}
 		return $string['type'] == 'plural'
@@ -292,8 +292,8 @@ 
 	 */
 	protected function getEntryString( array $entry, $key )
 	{
-		return isset( $entry[$key] )
-			? implode( '', (array) $entry[$key] )
+		return isset($entry[$key])
+			? implode( '', (array)$entry[$key] )
 			: '';
 	}
 
@@ -303,8 +303,8 @@ 
 	protected function getSettings()
 	{
 		$settings = glsr( OptionManager::class )->get( 'settings' );
-		return isset( $settings['strings'] )
-			? $this->normalizeSettings( (array) $settings['strings'] )
+		return isset($settings['strings'])
+			? $this->normalizeSettings( (array)$settings['strings'] )
 			: [];
 	}
 
@@ -316,7 +316,7 @@ 
 		$keys = [
 			'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
 		];
-		array_walk( $entries, function( &$entry ) use( $keys ) {
+		array_walk( $entries, function( &$entry ) use($keys) {
 			foreach( $keys as $key ) {
 				$entry = $this->normalizeEntryString( $entry, $key );
 			}
@@ -330,7 +330,7 @@ 
 	 */
 	protected function normalizeEntryString( array $entry, $key )
 	{
-		if( isset( $entry[$key] )) {
+		if( isset($entry[$key]) ) {
 			$entry[$key] = $this->getEntryString( $entry, $key );
 		}
 		return $entry;
@@ -344,11 +344,11 @@ 
 		$defaultString = array_fill_keys( ['id', 's1', 's2', 'p1', 'p2'], '' );
 		$strings = array_filter( $strings, 'is_array' );
 		foreach( $strings as &$string ) {
-			$string['type'] = isset( $string['p1'] ) ? 'plural' : 'single';
+			$string['type'] = isset($string['p1']) ? 'plural' : 'single';
 			$string = wp_parse_args( $string, $defaultString );
 		}
 		return array_filter( $strings, function( $string ) {
-			return !empty( $string['id'] );
+			return !empty($string['id']);
 		});
 	}
 

plugin/Modules/Upgrade.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 		natsort( $routines );
 		array_walk( $routines, function( $routine ) {
 			$version = str_replace( strtolower( __CLASS__ ).'_', '', $routine );
-			if( version_compare( glsr()->version, $version, '>=' ))return;
+			if( version_compare( glsr()->version, $version, '>=' ) )return;
 			call_user_func( [$this, $routine] );
 		});
 		$this->updateVersion();
@@ -28,7 +28,7 @@ 
 	public function updateVersion()
 	{
 		$currentVersion = glsr( OptionManager::class )->get( 'version' );
-		if( version_compare( $currentVersion, glsr()->version, '<' )) {
+		if( version_compare( $currentVersion, glsr()->version, '<' ) ) {
 			glsr( OptionManager::class )->set( 'version', glsr()->version );
 		}
 		if( $currentVersion != glsr()->version ) {

Braces +5 added lines, -2 removed lines

@@ -16,7 +16,9 @@ 
 		natsort( $routines );
 		array_walk( $routines, function( $routine ) {
 			$version = str_replace( strtolower( __CLASS__ ).'_', '', $routine );
-			if( version_compare( glsr()->version, $version, '>=' ))return;
+			if( version_compare( glsr()->version, $version, '>=' )) {
+				return;
+			}
 			call_user_func( [$this, $routine] );
 		});
 		$this->updateVersion();
@@ -37,5 +39,6 @@ 
 	}
 
 	protected function upgrade_3_0_0()
-	{}
+	{
+}
 }

plugin/Modules/Html/Fields/Honeypot.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 			'style' => 'display:none!important',
 			'tabindex' => '-1',
 			'type' => 'text',
-		]);
+		] );
 		$this->builder->tag = 'input';
 		return $this->builder->getOpeningTag();
 	}

plugin/Modules/Html/Fields/YesNo.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 				'no' => __( 'No', 'site-reviews' ),
 				'yes' => __( 'Yes', 'site-reviews' ),
 			],
-		]);
+		] );
 		$this->builder->tag = 'input';
 		return $this->builder->buildFormInput();
 	}

plugin/Modules/Html/Builder.php

Spacing +20 added lines, -20 removed lines

@@ -65,7 +65,7 @@ 
 	{
 		$instance = new static();
 		$instance->setTagFromMethod( $method );
-		call_user_func_array( [$instance, 'normalize'], $args += ['',''] );
+		call_user_func_array( [$instance, 'normalize'], $args += ['', ''] );
 		$tags = array_merge( static::TAGS_FORM, static::TAGS_STRUCTURE, static::TAGS_TEXT );
 		$generatedTag = in_array( $instance->tag, $tags )
 			? $instance->buildTag()
@@ -89,8 +89,8 @@ 
 			'render' => 'is_bool',
 			'tag' => 'is_string',
 		];
-		if( !isset( $properties[$property] )
-			|| empty( array_filter( [$value], $properties[$property] ))
+		if( !isset($properties[$property])
+			|| empty(array_filter( [$value], $properties[$property] ))
 		)return;
 		$this->$property = $value;
 	}
@@ -108,7 +108,7 @@ 
 	 */
 	public function getOpeningTag()
 	{
-		$attributes = glsr( Attributes::class )->{$this->tag}( $this->args )->toString();
+		$attributes = glsr( Attributes::class )->{$this->tag}($this->args)->toString();
 		return '<'.trim( $this->tag.' '.$attributes ).'>';
 	}
 
@@ -118,7 +118,7 @@ 
 	protected function buildCustomField()
 	{
 		$className = glsr( Helper::class )->buildClassName( $this->tag, __NAMESPACE__.'\Fields' );
-		if( !class_exists( $className )) {
+		if( !class_exists( $className ) ) {
 			glsr_log()->error( 'Field missing: '.$className );
 			return;
 		}
@@ -130,7 +130,7 @@ 
 	 */
 	protected function buildDefaultTag( $text = '' )
 	{
-		if( empty( $text )) {
+		if( empty($text) ) {
 			$text = $this->args['text'];
 		}
 		return $this->getOpeningTag().$text.$this->getClosingTag();
@@ -141,7 +141,7 @@ 
 	 */
 	protected function buildFieldDescription()
 	{
-		if( !empty( $this->args['description'] )) {
+		if( !empty($this->args['description']) ) {
 			return $this->small( $this->args['description'] );
 		}
 	}
@@ -151,10 +151,10 @@ 
 	 */
 	protected function buildFormInput()
 	{
-		if( !in_array( $this->args['type'], ['checkbox', 'radio'] )) {
+		if( !in_array( $this->args['type'], ['checkbox', 'radio'] ) ) {
 			return $this->buildFormLabel().$this->getOpeningTag();
 		}
-		return empty( $this->args['options'] )
+		return empty($this->args['options'])
 			? $this->buildFormInputChoice()
 			: $this->buildFormInputMultiChoice();
 	}
@@ -178,7 +178,7 @@ 
 				'name' => $this->args['name'].'[]',
 				'text' => $this->args['options'][$key],
 				'value' => $key,
-			]));
+			]) );
 		});
 		return $this->ul( $options );
 	}
@@ -188,11 +188,11 @@ 
 	 */
 	protected function buildFormLabel()
 	{
-		if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' )return;
-		return $this->label([
+		if( empty($this->args['label']) || $this->args['type'] == 'hidden' )return;
+		return $this->label( [
 			'for' => $this->args['id'],
 			'text' => $this->args['label'],
-		]);
+		] );
 	}
 
 	/**
@@ -209,11 +209,11 @@ 
 	protected function buildFormSelectOptions()
 	{
 		return array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) {
-			return $carry.$this->option([
+			return $carry.$this->option( [
 				'selected' => $this->args['value'] == $key,
 				'text' => $this->args['options'][$key],
 				'value' => $key,
-			]);
+			] );
 		});
 	}
 
@@ -230,7 +230,7 @@ 
 	 */
 	protected function buildTag()
 	{
-		if( !in_array( $this->tag, static::TAGS_FORM )) {
+		if( !in_array( $this->tag, static::TAGS_FORM ) ) {
 			return $this->buildDefaultTag();
 		}
 		return call_user_func( [$this, 'buildForm'.ucfirst( $this->tag )] ).$this->buildFieldDescription();
@@ -242,13 +242,13 @@ 
 	 */
 	protected function normalize( ...$params )
 	{
-		if( is_string( $params[0] ) || is_numeric( $params[0] )) {
+		if( is_string( $params[0] ) || is_numeric( $params[0] ) ) {
 			$this->setNameOrTextAttributeForTag( $params[0] );
 		}
-		if( is_array( $params[0] )) {
+		if( is_array( $params[0] ) ) {
 			$this->args += $params[0];
 		}
-		else if( is_array( $params[1] )) {
+		else if( is_array( $params[1] ) ) {
 			$this->args += $params[1];
 		}
 		$this->args = glsr( BuilderDefaults::class )->merge( $this->args );
@@ -273,7 +273,7 @@ 
 	protected function setTagFromMethod( $method )
 	{
 		$this->tag = strtolower( $method );
-		if( in_array( $this->tag, static::INPUT_TYPES )) {
+		if( in_array( $this->tag, static::INPUT_TYPES ) ) {
 			$this->args['type'] = $this->tag;
 			$this->tag = 'input';
 		}

Braces +6 added lines, -2 removed lines

@@ -91,7 +91,9 @@ 
 		];
 		if( !isset( $properties[$property] )
 			|| empty( array_filter( [$value], $properties[$property] ))
-		)return;
+		) {
+			return;
+		}
 		$this->$property = $value;
 	}
 
@@ -188,7 +190,9 @@ 
 	 */
 	protected function buildFormLabel()
 	{
-		if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' )return;
+		if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' ) {
+			return;
+		}
 		return $this->label([
 			'for' => $this->args['id'],
 			'text' => $this->args['label'],

plugin/Modules/Html/Partials/SiteReviewsForm.php

Spacing +3 added lines, -3 removed lines

@@ -14,14 +14,14 @@
 	{
 		$partial = glsr( Html::class )->buildTemplate( 'templates/reviews-form', [
 			'globals' => $args,
-		]);
+		] );
 		$form = glsr( Builder::class )->form( $partial, [
 			'class' => 'glsr-form',
 			'id' => $args['id'],
 			'method' => 'post',
-		]);
+		] );
 		return glsr( Builder::class )->div( $form, [
 			'class' => 'glsr-form-wrap '.$args['class'],
-		]);
+		] );
 	}
 }