pryley / site-reviews

plugin/Router.php

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
 	public function routeAdminPostRequest()
 	{
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request ) )return;
 		$this->checkAdminNonce( $request['action'] );
 		$this->routeRequest( 'admin', $request['action'], $request );
 	}
@@ -29,15 +29,15 @@ 
 	public function routeAjaxRequest()
 	{
 		$request = $this->getRequest();
-		if( !isset( $request['action'] )) {
+		if( !isset($request['action']) ) {
 			glsr_log()->error( 'The AJAX request must include an action' )->info( $request );
 			wp_die();
 		}
-		if( !isset( $request['nonce'] )) {
+		if( !isset($request['nonce']) ) {
 			glsr_log()->error( 'The AJAX request must include a nonce' )->info( $request );
 			wp_die();
 		}
-		if( !wp_verify_nonce( $request['nonce'], $request['action'] )) {
+		if( !wp_verify_nonce( $request['nonce'], $request['action'] ) ) {
 			glsr_log()->error( 'Nonce check failed for ajax request' )->info( $request );
 			wp_die( -1, 403 );
 		}
@@ -53,8 +53,8 @@ 
 	{
 		if( is_admin() )return;
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
-		if( !wp_verify_nonce( $request['_wpnonce'], $request['action'] )) {
+		if( !$this->isValidPostRequest( $request ) )return;
+		if( !wp_verify_nonce( $request['_wpnonce'], $request['action'] ) ) {
 			glsr_log()->error( 'Nonce check failed for public request' )->info( $request );
 			return;
 		}
@@ -92,7 +92,7 @@ 
 	{
 		foreach( ['request', Application::ID] as $key ) {
 			$request = glsr( Helper::class )->filterInputArray( $key );
-			if( !empty( $request ))break;
+			if( !empty($request) )break;
 		}
 		return $this->normalizeRequest( $request );
 	}
@@ -102,7 +102,7 @@ 
 	 */
 	protected function isValidPostRequest( array $request = [] )
 	{
-		return !empty( $request['action'] ) && empty( glsr( Helper::class )->filterInput( 'ajax_request' ));
+		return !empty($request['action']) && empty(glsr( Helper::class )->filterInput( 'ajax_request' ));
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	protected function normalizeRequest( array $request )
 	{
-		if( isset( $request[Application::ID]['action'] )) {
+		if( isset($request[Application::ID]['action']) ) {
 			$request = $request[Application::ID];
 		}
 		if( glsr( Helper::class )->filterInput( 'action', $request ) == 'submit-review' ) {
@@ -127,11 +127,11 @@ 
 	protected function routeRequest( $type, $action, array $request = [] )
 	{
 		$actionHook = 'site-reviews/route/'.$type.'/request';
-		$controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' ));
+		$controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' ) );
 		$method = glsr( Helper::class )->buildMethodName( $action, 'router' );
 		$request = apply_filters( 'site-reviews/route/request', $request, $action, $type );
 		do_action( $actionHook, $action, $request );
-		if( is_callable( [$controller, $method] )) {
+		if( is_callable( [$controller, $method] ) ) {
 			call_user_func( [$controller, $method], $request );
 			return;
 		}

Braces +15 added lines, -5 removed lines

@@ -16,7 +16,9 @@ 
 	public function routeAdminPostRequest()
 	{
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request )) {
+			return;
+		}
 		$this->checkAdminNonce( $request['action'] );
 		$this->routeRequest( 'admin', $request['action'], $request );
 	}
@@ -51,9 +53,13 @@ 
 	 */
 	public function routePublicPostRequest()
 	{
-		if( is_admin() )return;
+		if( is_admin() ) {
+			return;
+		}
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request )) {
+			return;
+		}
 		if( !wp_verify_nonce( $request['_wpnonce'], $request['action'] )) {
 			glsr_log()->error( 'Nonce check failed for public request' )->info( $request );
 			return;
@@ -67,7 +73,9 @@ 
 	public function routeWebhookRequest()
 	{
 		$request = filter_input( INPUT_GET, Application::PREFIX.'hook' );
-		if( !$request )return;
+		if( !$request ) {
+			return;
+		}
 		// @todo manage webhook here
 	}
 
@@ -92,7 +100,9 @@ 
 	{
 		foreach( ['request', Application::ID] as $key ) {
 			$request = glsr( Helper::class )->filterInputArray( $key );
-			if( !empty( $request ))break;
+			if( !empty( $request )) {
+				break;
+			}
 		}
 		return $this->normalizeRequest( $request );
 	}

plugin/Modules/Html/Partials/SiteReviewsForm.php

Spacing +24 added lines, -24 removed lines

@@ -57,7 +57,7 @@ 
 				'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(),
 			],
 			'fields' => $this->getFields(),
-		]);
+		] );
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	{
 		$integration = glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.integration' );
 		$recaptchaMethod = glsr( Helper::class )->buildMethodName( $integration, 'getRecaptcha' );
-		if( method_exists( $this, $recaptchaMethod )) {
+		if( method_exists( $this, $recaptchaMethod ) ) {
 			return $this->$recaptchaMethod();
 		}
 	}
@@ -80,7 +80,7 @@ 
 		return glsr( Partial::class )->build( 'form-results', [
 			'errors' => $this->errors,
 			'message' => $this->message,
-		]);
+		] );
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	{
 		return glsr( Builder::class )->button( '<span></span>'.__( 'Submit your review', 'site-reviews' ), [
 			'type' => 'submit',
-		]);
+		] );
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 		$fields = array_merge(
 			$this->getHiddenFields(),
 			[$this->getHoneypotField()],
-			$this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ))
+			$this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) )
 		);
 		// glsr_debug( $fields );
 		return $fields;
@@ -124,27 +124,27 @@ 
 		$fields = [[
 			'name' => 'action',
 			'value' => 'submit-review',
-		],[
+		], [
 			'name' => 'assign_to',
 			'value' => $this->args['assign_to'],
-		],[
+		], [
 			'name' => 'category',
 			'value' => $this->args['category'],
-		],[
+		], [
 			'name' => 'excluded',
 			'value' => $this->args['excluded'], // @todo should default to "[]"
-		],[
+		], [
 			'name' => 'form_id',
 			'value' => $this->args['id'],
-		],[
+		], [
 			'name' => 'nonce',
 			'value' => wp_create_nonce( 'submit-review' ),
-		],[
+		], [
 			'name' => 'referer',
-			'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' )),
+			'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ),
 		]];
 		return array_map( function( $field ) {
-			return new Field( wp_parse_args( $field, ['type' => 'hidden'] ));
+			return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) );
 		}, $fields );
 	}
 
@@ -153,10 +153,10 @@ 
 	 */
 	protected function getHoneypotField()
 	{
-		return new Field([
+		return new Field( [
 			'name' => 'gotcha',
 			'type' => 'honeypot',
-		]);
+		] );
 	}
 
 	/**
@@ -164,12 +164,12 @@ 
 	 */
 	protected function getRecaptchaCustom()
 	{
-		return glsr( Builder::class )->div([
+		return glsr( Builder::class )->div( [
 			'class' => 'glsr-recaptcha-holder',
-			'data-badge' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' )),
-			'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' )),
+			'data-badge' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' ) ),
+			'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' ) ),
 			'data-size' => 'invisible',
-		]);
+		] );
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 		$html = ob_get_clean();
 		return glsr( Builder::class )->div( $html, [
 			'class' => 'glsr-recaptcha-holder',
-		]);
+		] );
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 	 */
 	protected function normalizeFieldErrors( Field &$field )
 	{
-		if( !array_key_exists( $field->field['path'], $this->errors ))return;
+		if( !array_key_exists( $field->field['path'], $this->errors ) )return;
 		$field->field['errors'] = $this->errors[$field->field['path']];
 	}
 
@@ -199,7 +199,7 @@ 
 	 */
 	protected function normalizeFieldRequired( Field &$field )
 	{
-		if( !in_array( $field->field['path'], $this->required ))return;
+		if( !in_array( $field->field['path'], $this->required ) )return;
 		$field->field['required'] = true;
 	}
 
@@ -221,8 +221,8 @@ 
 	 */
 	protected function normalizeFieldValue( Field &$field )
 	{
-		if( !array_key_exists( $field->field['path'], $this->values ))return;
-		if( in_array( $field->field['type'], ['radio', 'checkbox'] )) {
+		if( !array_key_exists( $field->field['path'], $this->values ) )return;
+		if( in_array( $field->field['type'], ['radio', 'checkbox'] ) ) {
 			$field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']];
 		}
 		else {

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;
@@ -86,10 +86,10 @@ 
 			apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ),
 			$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 ) );
 	}
 
 	/**
@@ -101,14 +101,14 @@ 
 		if( !$integration ) {
 			return true;
 		}
-		if( empty( $this->request['recaptcha-token'] )) {
+		if( empty($this->request['recaptcha-token']) ) {
 			return null; // @see $this->validateRecaptcha()
 		}
 		if( $integration == 'custom' ) {
 			return $this->isRecaptchaValid( $this->request['recaptcha-token'] );
 		}
 		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;
 	}
@@ -119,17 +119,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 );
 		}
 		$errorCodes = [
@@ -152,7 +152,7 @@ 
 	{
 		$rules = $this->getValidationRules( $request );
 		$errors = glsr( Validator::class )->validate( $request, $rules );
-		if( empty( $errors )) {
+		if( empty($errors) ) {
 			return true;
 		}
 		$this->setSessionValues( 'errors', $errors );
@@ -169,7 +169,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 );
 		}
@@ -180,8 +180,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' );
 	}
@@ -191,8 +191,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:' );
@@ -207,7 +207,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', [] );
@@ -222,8 +222,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' );
 	}
@@ -233,9 +233,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', true );
 			$this->recaptchaIsUnset = true;
 		}
@@ -251,11 +251,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 );

plugin/Helper.php

Spacing +20 added lines, -20 removed lines

@@ -14,11 +14,11 @@ 
 	 */
 	public function buildClassName( $name, $path = '' )
 	{
-		$className = array_map( 'strtolower', (array)preg_split( '/[-_]/', $name ));
+		$className = array_map( 'strtolower', (array)preg_split( '/[-_]/', $name ) );
 		$className = array_map( 'ucfirst', $className );
 		$className = implode( '', $className );
 		$path = ltrim( str_replace( __NAMESPACE__, '', $path ), '\\' );
-		return !empty( $path )
+		return !empty($path)
 			? __NAMESPACE__.'\\'.$path.'\\'.$className
 			: $className;
 	}
@@ -30,7 +30,7 @@ 
 	 */
 	public function buildMethodName( $name, $prefix = '' )
 	{
-		return lcfirst( $prefix.$this->buildClassName( $name ));
+		return lcfirst( $prefix.$this->buildClassName( $name ) );
 	}
 
 	/**
@@ -39,7 +39,7 @@ 
 	 */
 	public function buildPropertyName( $name )
 	{
-		return lcfirst( $this->buildClassName( $name ));
+		return lcfirst( $this->buildClassName( $name ) );
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function convertPathToId( $path, $prefix = '' )
 	{
-		return str_replace( ['[', ']'], ['-', ''], $this->convertPathToName( $path, $prefix ));
+		return str_replace( ['[', ']'], ['-', ''], $this->convertPathToName( $path, $prefix ) );
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	{
 		$levels = explode( '.', $path );
 		return array_reduce( $levels, function( $result, $value ) {
-			return $result.= '['.$value.']';
+			return $result .= '['.$value.']';
 		}, $prefix );
 	}
 
@@ -91,7 +91,7 @@ 
 	 */
 	public function dashCase( $string )
 	{
-		return str_replace( '_', '-', $this->snakeCase( $string ));
+		return str_replace( '_', '-', $this->snakeCase( $string ) );
 	}
 
 	/**
@@ -113,11 +113,11 @@ 
 	 */
 	public function filterInput( $key, array $request = [] )
 	{
-		if( isset( $request[$key] )) {
+		if( isset($request[$key]) ) {
 			return $request[$key];
 		}
 		$variable = filter_input( INPUT_POST, $key );
-		if( is_null( $variable ) && isset( $_POST[$key] )) {
+		if( is_null( $variable ) && isset($_POST[$key]) ) {
 			$variable = $_POST[$key];
 		}
 		return $variable;
@@ -130,7 +130,7 @@ 
 	public function filterInputArray( $key )
 	{
 		$variable = filter_input( INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
-		if( empty( $variable ) && !empty( $_POST[$key] ) && is_array( $_POST[$key] )) {
+		if( empty($variable) && !empty($_POST[$key]) && is_array( $_POST[$key] ) ) {
 			$variable = $_POST[$key];
 		}
 		return (array)$variable;
@@ -146,13 +146,13 @@ 
 		$result = [];
 		foreach( $array as $key => $value ) {
 			$newKey = ltrim( $prefix.'.'.$key, '.' );
-			if( $this->isIndexedFlatArray( $value )) {
+			if( $this->isIndexedFlatArray( $value ) ) {
 				if( $flattenValue ) {
 					$value = '['.implode( ', ', $value ).']';
 				}
 			}
-			else if( is_array( $value )) {
-				$result = array_merge( $result, $this->flattenArray( $value, $flattenValue, $newKey ));
+			else if( is_array( $value ) ) {
+				$result = array_merge( $result, $this->flattenArray( $value, $flattenValue, $newKey ) );
 				continue;
 			}
 			$result[$newKey] = $value;
@@ -171,7 +171,7 @@ 
 				Whip::IPV4 => $cloudflareIps['v4'],
 				Whip::IPV6 => $cloudflareIps['v6'],
 			],
-		]))->getValidIpAddress();
+		] ))->getValidIpAddress();
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	{
 		$keys = explode( '.', $path );
 		foreach( $keys as $key ) {
-			if( !isset( $values[$key] )) {
+			if( !isset($values[$key]) ) {
 				return $fallback;
 			}
 			$values = $values[$key];
@@ -198,7 +198,7 @@ 
 	 */
 	public function isIndexedArray( $array )
 	{
-		if( !is_array( $array )) {
+		if( !is_array( $array ) ) {
 			return false;
 		}
 		$current = 0;
@@ -217,7 +217,7 @@ 
 	 */
 	public function isIndexedFlatArray( $array )
 	{
-		if( !is_array( $array ) || array_filter( $array, 'is_array' )) {
+		if( !is_array( $array ) || array_filter( $array, 'is_array' ) ) {
 			return false;
 		}
 		return $this->isIndexedArray( $array );
@@ -230,7 +230,7 @@ 
 	 */
 	public function prefixString( $string, $prefix = '' )
 	{
-		return $prefix.str_replace( $prefix, '', trim( $string ));
+		return $prefix.str_replace( $prefix, '', trim( $string ) );
 	}
 
 	/**
@@ -276,7 +276,7 @@ 
 	 */
 	public function snakeCase( $string )
 	{
-		if( !ctype_lower( $string )) {
+		if( !ctype_lower( $string ) ) {
 			$string = preg_replace( '/\s+/u', '', $string );
 			$string = preg_replace( '/(.)(?=[A-Z])/u', '$1_', $string );
 			$string = mb_strtolower( $string, 'UTF-8' );
@@ -291,6 +291,6 @@ 
 	 */
 	public function startsWith( $needle, $haystack )
 	{
-		return substr( $haystack, 0, strlen( $needle )) === $needle;
+		return substr( $haystack, 0, strlen( $needle ) ) === $needle;
 	}
 }