pryley / site-reviews

plugin/Handlers/CreateReview.php

Spacing +14 added lines, -14 removed lines

@@ -31,7 +31,7 @@ 
 		}
 		$this->sendNotification( $postId );
 		do_action( 'site-reviews/local/review/submitted', $postId, $command );
-		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' ) );
 		if( $command->ajax_request ) {
 			glsr( Session::class )->clear();
 			return;
@@ -81,8 +81,8 @@ 
 		if( $this->command->author ) {
 			$fields[] = ['value' => trim( $this->command->author.$this->command->email.' - '.$this->command->ip_address )];
 		}
-		$fields[] = ['value' => sprintf( '<%s|%s>', $args['notification_link'], __( 'View Review', 'site-reviews' ))];
-		return json_encode([
+		$fields[] = ['value' => sprintf( '<%s|%s>', $args['notification_link'], __( 'View Review', 'site-reviews' ) )];
+		return json_encode( [
 			'icon_url' => glsr()->url( 'assets/img/icon.png' ),
 			'username' => glsr()->name,
 			'attachments' => [[
@@ -91,7 +91,7 @@ 
 				'fallback' => $this->createEmailNotification( $args )->read( 'plaintext' ),
 				'fields' => $fields,
 			]],
-		]);
+		] );
 	}
 
 	/**
@@ -101,12 +101,12 @@ 
 	protected function sendNotification( $postId )
 	{
 		$notificationType = glsr( OptionManager::class )->get( 'settings.general.notification' );
-		if( !in_array( $notificationType, ['default','custom','webhook'] ))return;
+		if( !in_array( $notificationType, ['default', 'custom', 'webhook'] ) )return;
 		$assignedToTitle = get_the_title( (int)$this->command->assigned_to );
 		$notificationSubject = _nx(
 			'New %s-star review',
 			'New %s-star review of: %s',
-			intval( empty( $assignedToTitle )),
+			intval( empty($assignedToTitle) ),
 			'The text is different depending on whether or not the review has been assigned to a post.',
 			'site-reviews'
 		);
@@ -115,7 +115,7 @@ 
 			sprintf( $notificationSubject, $this->command->rating, $assignedToTitle )
 		);
 		$args = [
-			'notification_link' => esc_url( admin_url( sprintf( 'post.php?post=%s&action=edit', $postId ))),
+			'notification_link' => esc_url( admin_url( sprintf( 'post.php?post=%s&action=edit', $postId ) ) ),
 			'notification_title' => $notificationTitle,
 			'notification_type' => $notificationType,
 		];
@@ -133,14 +133,14 @@ 
 		$args['recipient'] = $args['notification_type'] !== 'default'
 			? glsr( OptionManager::class )->get( 'settings.general.notification_email' )
 			: get_option( 'admin_email' );
-		$result = !empty( $args['recipient'] )
+		$result = !empty($args['recipient'])
 			? $this->createEmailNotification( $args )->send()
 			: false;
-		if( !is_bool( $result )) {
-			glsr_log()->error( __( 'Email notification was not sent: missing email, subject, or message.', 'site-reviews' ));
+		if( !is_bool( $result ) ) {
+			glsr_log()->error( __( 'Email notification was not sent: missing email, subject, or message.', 'site-reviews' ) );
 		}
 		if( $result === false ) {
-			glsr_log()->error( __( 'Email notification was not sent: wp_mail() failed.', 'site-reviews' ));
+			glsr_log()->error( __( 'Email notification was not sent: wp_mail() failed.', 'site-reviews' ) );
 		}
 	}
 
@@ -149,7 +149,7 @@ 
 	 */
 	protected function sendWebhookNotification( array $args )
 	{
-		if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )))return;
+		if( !($endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )) )return;
 		$notification = $this->createWebhookNotification( $args );
 		$result = wp_remote_post( $endpoint, [
 			'blocking' => false,
@@ -160,8 +160,8 @@ 
 			'redirection' => 5,
 			'sslverify' => false,
 			'timeout' => 45,
-		]);
-		if( is_wp_error( $result )) {
+		] );
+		if( is_wp_error( $result ) ) {
 			glsr_log()->error( $result->get_error_message() );
 		}
 	}

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,9 +92,9 @@ 
 	{
 		foreach( ['request', Application::ID] as $key ) {
 			$request = filter_input( INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
-			if( !empty( $request ))break;
+			if( !empty($request) )break;
 		}
-		if( isset( $request[Application::ID]['action'] )) {
+		if( isset($request[Application::ID]['action']) ) {
 			$request = $request[Application::ID];
 		}
 		return (array)$request;
@@ -105,7 +105,7 @@ 
 	 */
 	protected function isValidPostRequest( array $request = [] )
 	{
-		return !empty( $request['action'] ) && empty( filter_input( INPUT_POST, 'ajax_request' ));
+		return !empty($request['action']) && empty(filter_input( INPUT_POST, 'ajax_request' ));
 	}
 
 	/**
@@ -115,10 +115,10 @@ 
 	 */
 	protected function routeRequest( $type, $action, array $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 );
-		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 = filter_input( INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
-			if( !empty( $request ))break;
+			if( !empty( $request )) {
+				break;
+			}
 		}
 		if( isset( $request[Application::ID]['action'] )) {
 			$request = $request[Application::ID];

plugin/Commands/CreateReview.php

Spacing +13 added lines, -13 removed lines

@@ -27,21 +27,21 @@ 
 	public function __construct( $input )
 	{
 		$this->request = $input;
-		$this->ajax_request = isset( $input['ajax_request'] );
+		$this->ajax_request = isset($input['ajax_request']);
 		$this->assigned_to = $this->getNumeric( 'assign_to' );
-		$this->author = sanitize_text_field( $this->get( 'name' ));
-		$this->avatar = get_avatar_url( $this->get( 'email' ));
-		$this->blacklisted = isset( $input['blacklisted'] );
-		$this->category = sanitize_key( $this->get( 'category' ));
-		$this->content = sanitize_textarea_field( $this->get( 'content' ));
+		$this->author = sanitize_text_field( $this->get( 'name' ) );
+		$this->avatar = get_avatar_url( $this->get( 'email' ) );
+		$this->blacklisted = isset($input['blacklisted']);
+		$this->category = sanitize_key( $this->get( 'category' ) );
+		$this->content = sanitize_textarea_field( $this->get( 'content' ) );
 		$this->custom = $this->getCustom();
-		$this->email = sanitize_email( $this->get( 'email' ));
-		$this->form_id = sanitize_key( $this->get( 'form_id' ));
+		$this->email = sanitize_email( $this->get( 'email' ) );
+		$this->form_id = sanitize_key( $this->get( 'form_id' ) );
 		$this->ip_address = $this->get( 'ip_address' );
-		$this->rating = intval( $this->get( 'rating' ));
+		$this->rating = intval( $this->get( 'rating' ) );
 		$this->referrer = $this->get( 'referrer' );
-		$this->terms = isset( $input['terms'] );
-		$this->title = sanitize_text_field( $this->get( 'title' ));
+		$this->terms = isset($input['terms']);
+		$this->title = sanitize_text_field( $this->get( 'title' ) );
 	}
 
 	/**
@@ -50,7 +50,7 @@ 
 	 */
 	protected function get( $key )
 	{
-		return isset( $this->request[$key] )
+		return isset($this->request[$key])
 			? (string)$this->request[$key]
 			: '';
 	}
@@ -67,7 +67,7 @@ 
 		];
 		$custom = $this->request;
 		foreach( $unset as $value ) {
-			unset( $custom[$value] );
+			unset($custom[$value]);
 		}
 		return $custom;
 	}

plugin/Modules/Validator/ValidateReview.php

Spacing +22 added lines, -22 removed lines

@@ -59,7 +59,7 @@ 
 		$this->validateBlacklist();
 		$this->validateAkismet();
 		$this->validateRecaptcha();
-		if( !empty( $this->error )) {
+		if( !empty($this->error) ) {
 			$this->setSessionValues( 'message', $this->error );
 		}
 		return $this;
@@ -70,11 +70,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 );
@@ -99,10 +99,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 ) );
 	}
 
 	/**
@@ -115,14 +115,14 @@ 
 			return true;
 		}
 		$recaptchaResponse = filter_input( INPUT_POST, 'g-recaptcha-response' ); // @todo site-reviews[g-recaptcha-response]
-		if( empty( $recaptchaResponse )) {
+		if( empty($recaptchaResponse) ) {
 			return null; //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;
 	}
@@ -132,17 +132,17 @@ 
 	 */
 	protected function isRecaptchaValid( $recaptchaResponse )
 	{
-		$endpoint = add_query_arg([
+		$endpoint = add_query_arg( [
 			'remoteip' => glsr( Helper::class )->getIpAddress(),
 			'response' => $recaptchaResponse,
 			'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ),
 		], 'https://www.google.com/recaptcha/api/siteverify' );
-		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 = [
@@ -165,7 +165,7 @@ 
 	{
 		$rules = $this->getValidationRules( $request );
 		$errors = glsr( Validator::class )->validate( $request, $rules );
-		if( empty( $errors )) {
+		if( empty($errors) ) {
 			return true;
 		}
 		$this->setSessionValues( 'errors', $errors );
@@ -182,7 +182,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 );
 		}
@@ -193,8 +193,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' );
 	}
@@ -204,8 +204,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:' );
@@ -220,7 +220,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', [] );
@@ -235,8 +235,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' );
 	}
@@ -246,9 +246,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;
 		}

Braces +27 added lines, -9 removed lines

@@ -193,8 +193,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' );
 	}
@@ -204,8 +208,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:' );
@@ -220,9 +228,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 )
@@ -235,8 +247,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' );
 	}
@@ -246,7 +262,9 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$isValid = $this->isRecaptchaResponseValid();
 		if( is_null( $isValid )) {
 			$this->setSessionValues( 'recaptcha', true );

plugin/Modules/Html/Builder.php

Spacing +28 added lines, -28 removed lines

@@ -55,7 +55,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_SINGLE, static::TAGS_STRUCTURE, static::TAGS_TEXT );
 		$generatedTag = in_array( $instance->tag, $tags )
 			? $instance->buildTag()
@@ -78,8 +78,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;
 	}
@@ -97,7 +97,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 ).'>';
 	}
 
@@ -107,7 +107,7 @@ 
 	protected function buildCustomField()
 	{
 		$className = $this->getCustomFieldClassName();
-		if( class_exists( $className )) {
+		if( class_exists( $className ) ) {
 			return (new $className( $this ))->build();
 		}
 		glsr_log()->error( 'Field missing: '.$className );
@@ -118,7 +118,7 @@ 
 	 */
 	protected function buildDefaultTag( $text = '' )
 	{
-		if( empty( $text )) {
+		if( empty($text) ) {
 			$text = $this->args['text'];
 		}
 		return $this->getOpeningTag().$text.$this->getClosingTag();
@@ -129,7 +129,7 @@ 
 	 */
 	protected function buildFieldDescription()
 	{
-		if( empty( $this->args['description'] ))return;
+		if( empty($this->args['description']) )return;
 		if( $this->args['is_widget'] ) {
 			return $this->small( $this->args['description'] );
 		}
@@ -141,13 +141,13 @@ 
 	 */
 	protected function buildFormInput()
 	{
-		if( !in_array( $this->args['type'], ['checkbox', 'radio'] )) {
-			if( isset( $this->args['multiple'] )) {
-				$this->args['name'].= '[]';
+		if( !in_array( $this->args['type'], ['checkbox', 'radio'] ) ) {
+			if( isset($this->args['multiple']) ) {
+				$this->args['name'] .= '[]';
 			}
 			return $this->buildFormLabel().$this->getOpeningTag();
 		}
-		return empty( $this->args['options'] )
+		return empty($this->args['options'])
 			? $this->buildFormInputChoice()
 			: $this->buildFormInputMultiChoice();
 	}
@@ -157,13 +157,13 @@ 
 	 */
 	protected function buildFormInputChoice()
 	{
-		$labelText = !empty( $this->args['text'] )
+		$labelText = !empty($this->args['text'])
 			? $this->args['text']
 			: $this->args['label'];
 		return $this->label( $this->getOpeningTag().' '.$labelText, [
 			'class' => 'glsr-'.$this->args['type'].'-label',
 			'for' => $this->args['id'],
-		]);
+		] );
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	protected function buildFormInputMultiChoice()
 	{
 		if( $this->args['type'] == 'checkbox' ) {
-			$this->args['name'].= '[]';
+			$this->args['name'] .= '[]';
 		}
 		$options = array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) {
 			return $carry.$this->li( $this->{$this->args['type']}([
@@ -180,12 +180,12 @@ 
 				'name' => $this->args['name'],
 				'text' => $this->args['options'][$key],
 				'value' => $key,
-			]));
+			]) );
 		});
 		return $this->ul( $options, [
 			'class' => $this->args['class'],
 			'id' => $this->args['id'],
-		]);
+		] );
 	}
 
 	/**
@@ -193,11 +193,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'],
-		]);
+		] );
 	}
 
 	/**
@@ -214,11 +214,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,
-			]);
+			] );
 		});
 	}
 
@@ -236,10 +236,10 @@ 
 	protected function buildTag()
 	{
 		$this->mergeArgsWithRequiredDefaults();
-		if( in_array( $this->tag, static::TAGS_SINGLE )) {
+		if( in_array( $this->tag, static::TAGS_SINGLE ) ) {
 			return $this->getOpeningTag();
 		}
-		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();
@@ -259,7 +259,7 @@ 
 	protected function mergeArgsWithRequiredDefaults()
 	{
 		$className = $this->getCustomFieldClassName();
-		if( class_exists( $className )) {
+		if( class_exists( $className ) ) {
 			$this->args = array_merge(
 				wp_parse_args( $this->args, $className::defaults() ),
 				$className::required()
@@ -274,13 +274,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];
 		}
 	}
@@ -304,7 +304,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';
 		}

plugin/Modules/Html/Partials/SiteReviewsForm.php

Spacing +19 added lines, -19 removed lines

@@ -57,7 +57,7 @@ 
 				'submit_button' => $this->buildSubmitButton(),
 			],
 			'fields' => $this->getFields(),
-		]);
+		] );
 	}
 
 	/**
@@ -68,7 +68,7 @@ 
 		return glsr( Partial::class )->build( 'form-results', [
 			'errors' => $this->errors,
 			'message' => $this->message,
-		]);
+		] );
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	{
 		return glsr( Builder::class )->button( '<span></span>'.__( 'Submit your review', 'site-reviews' ), [
 			'type' => 'submit',
-		]);
+		] );
 	}
 
 	/**
@@ -98,7 +98,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;
@@ -112,30 +112,30 @@ 
 		$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' ),
-		],[
+		], [
 			'id' => 'recaptcha-token',
 			'name' => 'recaptcha-token',
-		],[
+		], [
 			'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 );
 	}
 
@@ -144,10 +144,10 @@ 
 	 */
 	protected function getHoneypotField()
 	{
-		return new Field([
+		return new Field( [
 			'name' => 'gotcha',
 			'type' => 'honeypot',
-		]);
+		] );
 	}
 
 	/**
@@ -155,7 +155,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']];
 	}
 
@@ -164,7 +164,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;
 	}
 
@@ -186,8 +186,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/Html/Partials/Pagination.php

Spacing +10 added lines, -10 removed lines

@@ -22,11 +22,11 @@ 
 		$this->args = $this->normalize( $args );
 		if( $this->args['total'] < 2 )return;
 		$links = $this->buildLinksForDeprecatedThemes();
-		if( empty( $links )) {
+		if( empty($links) ) {
 			$links = $this->buildLinks();
 		}
 		$links = apply_filters( 'site-reviews/reviews/navigation_links', $links, $this->args );
-		if( empty( $links ))return;
+		if( empty($links) )return;
 		return $this->buildTemplate( $links );
 	}
 
@@ -45,7 +45,7 @@ 
 			'total' => $this->args['total'],
 		];
 		if( is_front_page() ) {
-			unset( $paginateArgs['format'] );
+			unset($paginateArgs['format']);
 		}
 		return paginate_links( $paginateArgs );
 	}
@@ -56,17 +56,17 @@ 
 	protected function buildLinksForDeprecatedThemes()
 	{
 		$theme = wp_get_theme()->get( 'TextDomain' );
-		if( !in_array( $theme, ['twentyten','twentyeleven','twentytwelve','twentythirteen'] ))return;
+		if( !in_array( $theme, ['twentyten', 'twentyeleven', 'twentytwelve', 'twentythirteen'] ) )return;
 		$links = '';
 		if( $this->args['paged'] > 1 ) {
-			$links.= sprintf( '<div class="nav-previous"><a href="%s"><span class="meta-nav">&larr;</span> %s</a></div>',
+			$links .= sprintf( '<div class="nav-previous"><a href="%s"><span class="meta-nav">&larr;</span> %s</a></div>',
 				$this->buildUrlForDeprecatedThemes(-1),
 				__( 'Previous', 'site-reviews' )
 			);
 		}
 		if( $this->args['paged'] < $this->args['total'] ) {
-			$links.= sprintf( '<div class="nav-next"><a href="%s">%s <span class="meta-nav">&rarr;</span></a></div>',
-				$this->buildUrlForDeprecatedThemes(1),
+			$links .= sprintf( '<div class="nav-next"><a href="%s">%s <span class="meta-nav">&rarr;</span></a></div>',
+				$this->buildUrlForDeprecatedThemes( 1 ),
 				__( 'Next', 'site-reviews' )
 			);
 		}
@@ -84,7 +84,7 @@ 
 		$screenReaderTemplate = '<h2 class="screen-reader-text">%2$s</h2>';
 		$screenReaderText = __( 'Site Reviews navigation', 'site-reviews' );
 		$innerTemplate = $screenReaderTemplate.'<div class="nav-links">%3$s</div>';
-		if( in_array( $theme, ['twentyten', 'twentyeleven', 'twentytwelve'] )) {
+		if( in_array( $theme, ['twentyten', 'twentyeleven', 'twentytwelve'] ) ) {
 			$innerTemplate = '%3$s';
 		}
 		else if( $theme == 'twentyfourteen' ) {
@@ -96,7 +96,7 @@ 
 		$template = sprintf( $template, $class, $screenReaderText, $links );
 		return glsr( Builder::class )->div( $template.'<div class="glsr-loader"></div>', [
 			'class' => 'glsr-navigation',
-		]);
+		] );
 	}
 
 	/**
@@ -119,6 +119,6 @@ 
 		return wp_parse_args( $args, [
 			'paged' => glsr( QueryBuilder::class )->getPaged(),
 			'total' => 1,
-		]);
+		] );
 	}
 }

plugin/Controllers/AjaxController.php

Spacing +17 added lines, -17 removed lines

@@ -24,7 +24,7 @@ 
 	{
 		wp_send_json( glsr( Html::class )->renderPartial( 'link', [
 			'post_id' => $request['ID'],
-		]));
+		] ) );
 	}
 
 	/**
@@ -32,7 +32,7 @@ 
 	 */
 	public function routerChangeReviewStatus( array $request )
 	{
-		wp_send_json( $this->execute( new ChangeStatus( $request )));
+		wp_send_json( $this->execute( new ChangeStatus( $request ) ) );
 	}
 
 	/**
@@ -41,10 +41,10 @@ 
 	public function routerClearLog()
 	{
 		glsr( AdminController::class )->routerClearLog();
-		wp_send_json([
+		wp_send_json( [
 			'logger' => glsr( Logger::class )->get(),
 			'notices' => glsr( Notice::class )->get(),
-		]);
+		] );
 	}
 
 	/**
@@ -54,9 +54,9 @@ 
 	{
 		$shortcode = $request['shortcode'];
 		$response = false;
-		if( array_key_exists( $shortcode, glsr()->mceShortcodes )) {
+		if( array_key_exists( $shortcode, glsr()->mceShortcodes ) ) {
 			$data = glsr()->mceShortcodes[$shortcode];
-			if( !empty( $data['errors'] )) {
+			if( !empty($data['errors']) ) {
 				$data['btn_okay'] = [esc_html__( 'Okay', 'site-reviews' )];
 			}
 			$response = [
@@ -76,10 +76,10 @@ 
 	public function routerSearchPosts( array $request )
 	{
 		$results = glsr( Database::class )->searchPosts( $request['search'] );
-		wp_send_json_success([
+		wp_send_json_success( [
 			'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
 			'items' => $results,
-		]);
+		] );
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function routerSearchTranslations( array $request )
 	{
-		if( empty( $request['exclude'] )) {
+		if( empty($request['exclude']) ) {
 			$request['exclude'] = [];
 		}
 		$results = glsr( Translator::class )
@@ -95,10 +95,10 @@ 
 			->exclude()
 			->exclude( $request['exclude'] )
 			->renderResults();
-		wp_send_json_success([
+		wp_send_json_success( [
 			'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
 			'items' => $results,
-		]);
+		] );
 	}
 
 	/**
@@ -107,11 +107,11 @@ 
 	public function routerSubmitReview( array $request )
 	{
 		glsr( PublicController::class )->routerSubmitReview( $request );
-		wp_send_json([
+		wp_send_json( [
 			'errors' => glsr( Session::class )->get( $request['form_id'].'errors', false, true ),
-			'message' => wpautop( glsr( Session::class )->get( $request['form_id'].'message', '', true )),
+			'message' => wpautop( glsr( Session::class )->get( $request['form_id'].'message', '', true ) ),
 			'recaptcha' => glsr( Session::class )->get( $request['form_id'].'recaptcha', false, true ),
-		]);
+		] );
 	}
 
 	/**
@@ -119,10 +119,10 @@ 
 	 */
 	public function routerTogglePinned( array $request )
 	{
-		$isPinned = $this->execute( new TogglePinned( $request ));
-		wp_send_json([
+		$isPinned = $this->execute( new TogglePinned( $request ) );
+		wp_send_json( [
 			'notices' => glsr( Notice::class )->get(),
 			'pinned' => $isPinned,
-		]);
+		] );
 	}
 }