pryley / site-reviews

plugin/Handlers/EnqueuePublicAssets.php

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
 	 */
 	public function enqueueAssets()
 	{
-		if( apply_filters( 'site-reviews/assets/css', true )) {
+		if( apply_filters( 'site-reviews/assets/css', true ) ) {
 			wp_enqueue_style(
 				Application::ID,
 				$this->getStylesheet(),
@@ -35,7 +35,7 @@ 
 				glsr()->version
 			);
 		}
-		if( apply_filters( 'site-reviews/assets/js', true )) {
+		if( apply_filters( 'site-reviews/assets/js', true ) ) {
 			$dependencies = apply_filters( 'site-reviews/assets/polyfill', true )
 				? [Application::ID.'/polyfill']
 				: [];
@@ -55,11 +55,11 @@ 
 	 */
 	public function enqueuePolyfillService()
 	{
-		if( !apply_filters( 'site-reviews/assets/polyfill', true ))return;
-		wp_enqueue_script( Application::ID.'/polyfill', add_query_arg([
+		if( !apply_filters( 'site-reviews/assets/polyfill', true ) )return;
+		wp_enqueue_script( Application::ID.'/polyfill', add_query_arg( [
 			'features' => 'CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event',
 			'flags' => 'gated',
-		], 'https://cdn.polyfill.io/v2/polyfill.js' ));
+		], 'https://cdn.polyfill.io/v2/polyfill.js' ) );
 	}
 
 	/**
@@ -72,10 +72,10 @@ 
 		// nf-google-recaptcha
 		if( !glsr( OptionManager::class )->isRecaptchaEnabled() )return;
 		$language = apply_filters( 'site-reviews/recaptcha/language', get_locale() );
-		wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg([
+		wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg( [
 			'hl' => $language,
 			'render' => 'explicit',
-		], 'https://www.google.com/recaptcha/api.js' ));
+		], 'https://www.google.com/recaptcha/api.js' ) );
 	}
 
 	/**
@@ -84,8 +84,8 @@ 
 	public function inlineStyles()
 	{
 		$inlineStylesheetPath = glsr()->path( 'assets/styles/inline-styles.css' );
-		if( !apply_filters( 'site-reviews/assets/css', true ))return;
-		if( !file_exists( $inlineStylesheetPath )) {
+		if( !apply_filters( 'site-reviews/assets/css', true ) )return;
+		if( !file_exists( $inlineStylesheetPath ) ) {
 			glsr_log()->error( 'Inline stylesheet is missing: '.$inlineStylesheetPath );
 			return;
 		}
@@ -120,7 +120,7 @@ 
 	 */
 	protected function getFixedSelectorsForPagination()
 	{
-		$selectors = ['#wpadminbar','.site-navigation-fixed'];
+		$selectors = ['#wpadminbar', '.site-navigation-fixed'];
 		return apply_filters( 'site-reviews/localize/pagination/selectors', $selectors );
 	}
 
@@ -130,7 +130,7 @@ 
 	protected function getStylesheet()
 	{
 		$currentStyle = glsr( Style::class )->style;
-		return file_exists( glsr()->path( 'assets/styles/custom/'.$currentStyle.'.css' ))
+		return file_exists( glsr()->path( 'assets/styles/custom/'.$currentStyle.'.css' ) )
 			? glsr()->url( 'assets/styles/custom/'.$currentStyle.'.css' )
 			: glsr()->url( 'assets/styles/'.Application::ID.'.css' );
 	}

Braces +9 added lines, -3 removed lines

@@ -55,7 +55,9 @@ 
 	 */
 	public function enqueuePolyfillService()
 	{
-		if( !apply_filters( 'site-reviews/assets/polyfill', true ))return;
+		if( !apply_filters( 'site-reviews/assets/polyfill', true )) {
+			return;
+		}
 		wp_enqueue_script( Application::ID.'/polyfill', add_query_arg([
 			'features' => 'CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event',
 			'flags' => 'gated',
@@ -70,7 +72,9 @@ 
 		// wpforms-recaptcha
 		// google-recaptcha
 		// nf-google-recaptcha
-		if( !glsr( OptionManager::class )->isRecaptchaEnabled() )return;
+		if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
+			return;
+		}
 		$language = apply_filters( 'site-reviews/recaptcha/language', get_locale() );
 		wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg([
 			'hl' => $language,
@@ -84,7 +88,9 @@ 
 	public function inlineStyles()
 	{
 		$inlineStylesheetPath = glsr()->path( 'assets/styles/inline-styles.css' );
-		if( !apply_filters( 'site-reviews/assets/css', true ))return;
+		if( !apply_filters( 'site-reviews/assets/css', true )) {
+			return;
+		}
 		if( !file_exists( $inlineStylesheetPath )) {
 			glsr_log()->error( 'Inline stylesheet is missing: '.$inlineStylesheetPath );
 			return;

plugin/Defaults/DefaultsAbstract.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	 */
 	public function __call( $name, array $args = [] )
 	{
-		if( !method_exists( $this, $name ))return;
+		if( !method_exists( $this, $name ) )return;
 		$defaults = call_user_func_array( [$this, $name], $args );
 		$className = (new ReflectionClass( $this ))->getShortName();
 		$className = str_replace( 'Defaults', '', $className );

Braces +3 added lines, -1 removed lines

@@ -13,7 +13,9 @@
 	 */
 	public function __call( $name, array $args = [] )
 	{
-		if( !method_exists( $this, $name ))return;
+		if( !method_exists( $this, $name )) {
+			return;
+		}
 		$defaults = call_user_func_array( [$this, $name], $args );
 		$className = (new ReflectionClass( $this ))->getShortName();
 		$className = str_replace( 'Defaults', '', $className );

plugin/Controllers/AjaxController.php

Spacing +18 added lines, -18 removed lines

@@ -22,7 +22,7 @@ 
 	 */
 	public function routerChangeStatus( array $request )
 	{
-		wp_send_json_success( $this->execute( new ChangeStatus( $request )));
+		wp_send_json_success( $this->execute( new ChangeStatus( $request ) ) );
 	}
 
 	/**
@@ -31,10 +31,10 @@ 
 	public function routerClearConsole()
 	{
 		glsr( AdminController::class )->routerClearConsole();
-		wp_send_json_success([
+		wp_send_json_success( [
 			'console' => glsr( Console::class )->get(),
 			'notices' => glsr( Notice::class )->get(),
-		]);
+		] );
 	}
 
 	/**
@@ -43,9 +43,9 @@ 
 	public function routerCountReviews()
 	{
 		glsr( AdminController::class )->routerCountReviews();
-		wp_send_json_success([
+		wp_send_json_success( [
 			'notices' => glsr( Notice::class )->get(),
-		]);
+		] );
 	}
 
 	/**
@@ -55,9 +55,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 = [
@@ -77,10 +77,10 @@ 
 	public function routerFetchConsole()
 	{
 		glsr( AdminController::class )->routerFetchConsole();
-		wp_send_json_success([
+		wp_send_json_success( [
 			'console' => glsr( Console::class )->get(),
 			'notices' => glsr( Notice::class )->get(),
-		]);
+		] );
 	}
 
 	/**
@@ -89,10 +89,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,
-		]);
+		] );
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 */
 	public function routerSearchTranslations( array $request )
 	{
-		if( empty( $request['exclude'] )) {
+		if( empty($request['exclude']) ) {
 			$request['exclude'] = [];
 		}
 		$results = glsr( Translator::class )
@@ -108,10 +108,10 @@ 
 			->exclude()
 			->exclude( $request['exclude'] )
 			->renderResults();
-		wp_send_json_success([
+		wp_send_json_success( [
 			'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
 			'items' => $results,
-		]);
+		] );
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 			'message' => glsr( Session::class )->get( $request['form_id'].'message', '', true ),
 			'recaptcha' => glsr( Session::class )->get( $request['form_id'].'recaptcha', false, true ),
 		];
-		if( !wp_validate_boolean( $data['errors'] )) {
+		if( !wp_validate_boolean( $data['errors'] ) ) {
 			glsr( Session::class )->clear();
 			wp_send_json_success( $data );
 		}
@@ -137,10 +137,10 @@ 
 	 */
 	public function routerTogglePinned( array $request )
 	{
-		$isPinned = $this->execute( new TogglePinned( $request ));
-		wp_send_json_success([
+		$isPinned = $this->execute( new TogglePinned( $request ) );
+		wp_send_json_success( [
 			'notices' => glsr( Notice::class )->get(),
 			'pinned' => $isPinned,
-		]);
+		] );
 	}
 }

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/review/submission', 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/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 +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' );

plugin/Modules/Html/Partials/SiteReviewsForm.php

Spacing +23 added lines, -23 removed lines

@@ -62,7 +62,7 @@ 
 				'response' => $this->buildResponse(),
 				'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -71,12 +71,12 @@ 
 	protected function buildRecaptcha()
 	{
 		if( !glsr( OptionManager::class )->isRecaptchaEnabled() )return;
-		return glsr( Builder::class )->div([
+		return glsr( Builder::class )->div( [
 			'class' => 'glsr-recaptcha-holder',
 			'data-badge' => glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' ),
-			'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' )),
+			'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' ) ),
 			'data-size' => 'invisible',
-		]);
+		] );
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 */
 	protected function buildResponse()
 	{
-		$classes = !empty( $this->errors )
+		$classes = !empty($this->errors)
 			? glsr( StyleValidationDefaults::class )->defaults()['message_error_class']
 			: '';
 		return glsr( Template::class )->build( 'templates/form/response', [
@@ -92,8 +92,8 @@ 
 				'class' => $classes,
 				'message' => wpautop( $this->message ),
 			],
-			'has_errors' => !empty( $this->errors ),
-		]);
+			'has_errors' => !empty($this->errors),
+		] );
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 			'context' => [
 				'text' => __( 'Submit your review', 'site-reviews' ),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 		$fields = array_merge(
 			$this->getHiddenFields(),
 			[$this->getHoneypotField()],
-			$this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ))
+			$this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) )
 		);
 		return $fields;
 	}
@@ -137,27 +137,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 );
 	}
 
@@ -166,10 +166,10 @@ 
 	 */
 	protected function getHoneypotField()
 	{
-		return new Field([
+		return new Field( [
 			'name' => 'gotcha',
 			'type' => 'honeypot',
-		]);
+		] );
 	}
 
 	/**
@@ -177,7 +177,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']];
 	}
 
@@ -186,7 +186,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;
 	}
 
@@ -209,8 +209,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 {

Braces +12 added lines, -4 removed lines

@@ -70,7 +70,9 @@ 
 	 */
 	protected function buildRecaptcha()
 	{
-		if( !glsr( OptionManager::class )->isRecaptchaEnabled() )return;
+		if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
+			return;
+		}
 		return glsr( Builder::class )->div([
 			'class' => 'glsr-recaptcha-holder',
 			'data-badge' => glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' ),
@@ -177,7 +179,9 @@ 
 	 */
 	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']];
 	}
 
@@ -186,7 +190,9 @@ 
 	 */
 	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;
 	}
 
@@ -209,7 +215,9 @@ 
 	 */
 	protected function normalizeFieldValue( Field &$field )
 	{
-		if( !array_key_exists( $field->field['path'], $this->values ))return;
+		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']];
 		}

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->referer = $this->get( 'referer' );
-		$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/Router.php

Spacing +13 added lines, -13 removed lines

@@ -17,7 +17,7 @@ 
 	public function routeAdminPostRequest()
 	{
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request ) )return;
 		check_admin_referer( $request['action'] );
 		$this->routeRequest( 'admin', $request['action'], $request );
 	}
@@ -41,8 +41,8 @@ 
 	{
 		if( is_admin() )return;
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
-		if( !$this->isValidPublicNonce( $request ))return;
+		if( !$this->isValidPostRequest( $request ) )return;
+		if( !$this->isValidPublicNonce( $request ) )return;
 		$this->routeRequest( 'public', $request['action'], $request );
 	}
 
@@ -52,10 +52,10 @@ 
 	protected function checkAjaxNonce( array $request )
 	{
 		if( !is_user_logged_in() )return;
-		if( !isset( $request['nonce'] )) {
+		if( !isset($request['nonce']) ) {
 			$this->sendAjaxError( 'request is missing a nonce', $request );
 		}
-		if( !wp_verify_nonce( $request['nonce'], $request['action'] )) {
+		if( !wp_verify_nonce( $request['nonce'], $request['action'] ) ) {
 			$this->sendAjaxError( 'request failed the nonce check', $request, 403 );
 		}
 	}
@@ -65,10 +65,10 @@ 
 	 */
 	protected function checkAjaxRequest( array $request )
 	{
-		if( !isset( $request['action'] )) {
+		if( !isset($request['action']) ) {
 			$this->sendAjaxError( 'request must include an action', $request );
 		}
-		if( empty( $request['ajax_request'] )) {
+		if( empty($request['ajax_request']) ) {
 			$this->sendAjaxError( 'request is invalid', $request );
 		}
 	}
@@ -95,7 +95,7 @@ 
 	 */
 	protected function isValidPostRequest( array $request = [] )
 	{
-		return !empty( $request['action'] ) && empty( $request['ajax_request'] );
+		return !empty($request['action']) && empty($request['ajax_request']);
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	protected function isValidPublicNonce( array $request )
 	{
-		if( is_user_logged_in() && !wp_verify_nonce( $request['nonce'], $request['action'] )) {
+		if( is_user_logged_in() && !wp_verify_nonce( $request['nonce'], $request['action'] ) ) {
 			glsr_log()->error( 'nonce check failed for public request' )->info( $request );
 			return false;
 		}
@@ -118,11 +118,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;
 		}
@@ -141,10 +141,10 @@ 
 		glsr_log()->error( $error )->info( $request );
 		glsr_log( $_POST );
 		glsr( Notice::class )->addError( __( 'There was an error (try refreshing the page).', 'site-reviews' ).' <code>'.$error.'</code>' );
-		wp_send_json_error([
+		wp_send_json_error( [
 			'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ),
 			'notices' => glsr( Notice::class )->get(),
 			'error' => $error,
-		]);
+		] );
 	}
 }

Braces +15 added lines, -5 removed lines

@@ -17,7 +17,9 @@ 
 	public function routeAdminPostRequest()
 	{
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request )) {
+			return;
+		}
 		check_admin_referer( $request['action'] );
 		$this->routeRequest( 'admin', $request['action'], $request );
 	}
@@ -39,10 +41,16 @@ 
 	 */
 	public function routePublicPostRequest()
 	{
-		if( is_admin() )return;
+		if( is_admin() ) {
+			return;
+		}
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
-		if( !$this->isValidPublicNonce( $request ))return;
+		if( !$this->isValidPostRequest( $request )) {
+			return;
+		}
+		if( !$this->isValidPublicNonce( $request )) {
+			return;
+		}
 		$this->routeRequest( 'public', $request['action'], $request );
 	}
 
@@ -51,7 +59,9 @@ 
 	 */
 	protected function checkAjaxNonce( array $request )
 	{
-		if( !is_user_logged_in() )return;
+		if( !is_user_logged_in() ) {
+			return;
+		}
 		if( !isset( $request['nonce'] )) {
 			$this->sendAjaxError( 'request is missing a nonce', $request );
 		}

plugin/Controllers/SettingsController.php

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
 	 */
 	public function callbackRegisterSettings( $input )
 	{
-		if( !is_array( $input )) {
+		if( !is_array( $input ) ) {
 			$input = ['settings' => []];
 		}
 		if( key( $input ) == 'settings' ) {
@@ -24,7 +24,7 @@ 
 			$options = $this->sanitizeGeneral( $input, $options );
 			$options = $this->sanitizeSubmissions( $input, $options );
 			$options = $this->sanitizeTranslations( $input, $options );
-			glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ));
+			glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ) );
 			return $options;
 		}
 		return $input;
@@ -38,7 +38,7 @@ 
 	{
 		register_setting( Application::ID.'-settings', OptionManager::databaseKey(), [
 			'sanitize_callback' => [$this, 'callbackRegisterSettings'],
-		]);
+		] );
 	}
 
 	/**
@@ -47,7 +47,7 @@ 
 	protected function sanitizeGeneral( array $input, array $options )
 	{
 		$inputForm = $input['settings']['general'];
-		if( !isset( $inputForm['notifications'] )) {
+		if( !isset($inputForm['notifications']) ) {
 			$options['settings']['general']['notifications'] = [];
 		}
 		if( trim( $inputForm['notification_message'] ) == '' ) {
@@ -62,7 +62,7 @@ 
 	protected function sanitizeSubmissions( array $input, array $options )
 	{
 		$inputForm = $input['settings']['submissions'];
-		if( !isset( $inputForm['required'] )) {
+		if( !isset($inputForm['required']) ) {
 			$options['settings']['submissions']['required'] = [];
 		}
 		return $options;
@@ -73,13 +73,13 @@ 
 	 */
 	protected function sanitizeTranslations( array $input, array $options )
 	{
-		if( isset( $input['settings']['strings'] )) {
-			$options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] ));
+		if( isset($input['settings']['strings']) ) {
+			$options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] ) );
 			array_walk( $options['settings']['strings'], function( &$string ) {
-				if( isset( $string['s2'] )) {
+				if( isset($string['s2']) ) {
 					$string['s2'] = wp_strip_all_tags( $string['s2'] );
 				}
-				if( isset( $string['p2'] )) {
+				if( isset($string['p2']) ) {
 					$string['p2'] = wp_strip_all_tags( $string['p2'] );
 				}
 			});

plugin/Modules/Html/Settings.php

Spacing +18 added lines, -18 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	protected function getFieldDefault( array $field )
 	{
-		return isset( $field['default'] )
+		return isset($field['default'])
 			? $field['default']
 			: '';
 	}
@@ -40,7 +40,7 @@ 
 	protected function getSettingFields( $path )
 	{
 		$settings = glsr( DefaultsManager::class )->settings();
-		return array_filter( $settings, function( $key ) use( $path ) {
+		return array_filter( $settings, function( $key ) use($path) {
 			return glsr( Helper::class )->startsWith( $path, $key );
 		}, ARRAY_FILTER_USE_KEY );
 	}
@@ -55,8 +55,8 @@ 
 			$field = wp_parse_args( $field, [
 				'is_setting' => true,
 				'name' => $name,
-			]);
-			$rows.= new Field( $this->normalize( $field ));
+			] );
+			$rows .= new Field( $this->normalize( $field ) );
 		}
 		return $rows;
 	}
@@ -67,7 +67,7 @@ 
 	 */
 	protected function getTemplateData( $id )
 	{
-		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ));
+		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
 		return [
 			'context' => [
 				'rows' => $this->getSettingRows( $fields ),
@@ -81,12 +81,12 @@ 
 	 */
 	protected function getTemplateDataForAddons( $id )
 	{
-		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ));
+		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
 		$settings = glsr( Helper::class )->convertDotNotationArray( $fields );
 		$settingKeys = array_keys( $settings['settings']['addons'] );
 		$results = [];
 		foreach( $settingKeys as $key ) {
-			$addonFields = array_filter( $fields, function( $path ) use( $key ) {
+			$addonFields = array_filter( $fields, function( $path ) use($key) {
 				return glsr( Helper::class )->startsWith( 'settings.addons.'.$key, $path );
 			}, ARRAY_FILTER_USE_KEY );
 			$results[$key] = $this->getSettingRows( $addonFields );
@@ -102,7 +102,7 @@ 
 	protected function getTemplateDataForTranslations()
 	{
 		$translations = glsr( Translator::class )->renderAll();
-		$class = empty( $translations )
+		$class = empty($translations)
 			? 'glsr-hidden'
 			: '';
 		return [
@@ -125,9 +125,9 @@ 
 			$path,
 			glsr( Helper::class )->getPathValue( $path, glsr()->defaults )
 		);
-		if( is_array( $expectedValue )) {
+		if( is_array( $expectedValue ) ) {
 			return is_array( $optionValue )
-				? count( array_intersect( $optionValue, $expectedValue )) === 0
+				? count( array_intersect( $optionValue, $expectedValue ) ) === 0
 				: !in_array( $optionValue, $expectedValue );
 		}
 		return $optionValue != $expectedValue;
@@ -149,17 +149,17 @@ 
 	 */
 	protected function normalizeDependsOn( array $field )
 	{
-		if( !empty( $field['depends_on'] ) && is_array( $field['depends_on'] )) {
+		if( !empty($field['depends_on']) && is_array( $field['depends_on'] ) ) {
 			$path = key( $field['depends_on'] );
 			$expectedValue = $field['depends_on'][$path];
 			$fieldName = glsr( Helper::class )->convertPathToName( $path, OptionManager::databaseKey() );
-			if( is_array( $expectedValue )) {
-				$fieldName.= '[]';
+			if( is_array( $expectedValue ) ) {
+				$fieldName .= '[]';
 			}
-			$field['data-depends'] = json_encode([
+			$field['data-depends'] = json_encode( [
 				'name' => $fieldName,
 				'value' => $expectedValue,
-			], JSON_HEX_APOS|JSON_HEX_QUOT );
+			], JSON_HEX_APOS | JSON_HEX_QUOT );
 			$field['is_hidden'] = $this->isFieldHidden( $path, $expectedValue );
 		}
 		return $field;
@@ -170,9 +170,9 @@ 
 	 */
 	protected function normalizeLabelAndLegend( array $field )
 	{
-		if( !empty( $field['label'] )) {
+		if( !empty($field['label']) ) {
 			$field['legend'] = $field['label'];
-			unset( $field['label'] );
+			unset($field['label']);
 		}
 		else {
 			$field['is_valid'] = false;
@@ -186,7 +186,7 @@ 
 	 */
 	protected function normalizeValue( array $field )
 	{
-		if( !isset( $field['value'] )) {
+		if( !isset($field['value']) ) {
 			$field['value'] = glsr( OptionManager::class )->get(
 				$field['name'],
 				$this->getFieldDefault( $field )