pryley / site-reviews

plugin/Handlers/EnqueueAssets.php

Spacing +9 added lines, -9 removed lines

@@ -21,13 +21,13 @@ 
 		$this->dependencies = glsr( Html::class )->getDependencies();
 		$ajaxNonce = wp_create_nonce( Application::ID.'-ajax-nonce' );
 		$variables = [
-			'action'  => glsr()->prefix . '_action',
-			'ajaxurl' => add_query_arg( '_nonce', $ajaxNonce, admin_url( 'admin-ajax.php' )),
+			'action'  => glsr()->prefix.'_action',
+			'ajaxurl' => add_query_arg( '_nonce', $ajaxNonce, admin_url( 'admin-ajax.php' ) ),
 			'ajaxnonce' => $ajaxNonce,
-			'ajaxpagination' => ['#wpadminbar','.site-navigation-fixed'],
+			'ajaxpagination' => ['#wpadminbar', '.site-navigation-fixed'],
 		];
 		$this->enqueue();
-		wp_localize_script( Application::ID, 'site_reviews', apply_filters( 'site-reviews/enqueue/localize', $variables ));
+		wp_localize_script( Application::ID, 'site_reviews', apply_filters( 'site-reviews/enqueue/localize', $variables ) );
 	}
 
 	/**
@@ -35,11 +35,11 @@ 
 	 */
 	public function enqueue()
 	{
-		$currentTheme = sanitize_title( wp_get_theme()->get( 'Name' ));
+		$currentTheme = sanitize_title( wp_get_theme()->get( 'Name' ) );
 		$stylesheet = file_exists( glsr()->path.'assets/css/'.$currentTheme.'.css' )
 			? glsr()->url.'assets/css/'.$currentTheme.'.css'
 			: glsr()->url.'assets/css/'.Application::ID.'.css';
-		if( apply_filters( 'site-reviews/assets/css', true )) {
+		if( apply_filters( 'site-reviews/assets/css', true ) ) {
 			wp_enqueue_style(
 				Application::ID,
 				$stylesheet,
@@ -47,7 +47,7 @@ 
 				glsr()->version
 			);
 		}
-		if( apply_filters( 'site-reviews/assets/js', true )) {
+		if( apply_filters( 'site-reviews/assets/js', true ) ) {
 			wp_enqueue_script(
 				Application::ID,
 				glsr()->url.'assets/js/'.Application::ID.'.js',
@@ -66,11 +66,11 @@ 
 	 */
 	public function enqueueRecaptchaScript()
 	{
-		wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg([
+		wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg( [
 			'hl' => apply_filters( 'site-reviews/recaptcha/language', get_locale() ),
 			'onload' => 'glsr_render_recaptcha',
 			'render' => 'explicit',
-		], 'https://www.google.com/recaptcha/api.js' ));
+		], 'https://www.google.com/recaptcha/api.js' ) );
 		$inlineScript = file_get_contents( glsr()->path.'js/recaptcha.js' );
 		wp_add_inline_script( Application::ID.'/google-recaptcha', $inlineScript, 'before' );
 	}

plugin/Shortcodes/ButtonGenerator.php

Spacing +24 added lines, -24 removed lines

@@ -47,7 +47,7 @@ 
 			'label' => '['.$tag.']',
 			'required' => $this->required,
 			'title' => esc_html__( 'Shortcode', 'site-reviews' ),
-		]);
+		] );
 		return $this;
 	}
 
@@ -57,12 +57,12 @@ 
 	protected function generateFields( array $fields )
 	{
 		$generatedFields = array_map( function( $field ) {
-			if( empty( $field ))return;
+			if( empty($field) )return;
 			$field = $this->normalize( $field );
-			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return;
+			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ) ) )return;
 			return $this->$method( $field );
 		}, $fields );
-		return array_values( array_filter( $generatedFields ));
+		return array_values( array_filter( $generatedFields ) );
 	}
 
 	/**
@@ -71,15 +71,15 @@ 
 	protected function getFields()
 	{
 		$fields = $this->generateFields( $this->fields() );
-		if( !empty( $this->errors )) {
+		if( !empty($this->errors) ) {
 			$errors = [];
 			foreach( $this->required as $name => $alert ) {
-				if( false !== array_search( $name, array_column( $fields, 'name' )))continue;
+				if( false !== array_search( $name, array_column( $fields, 'name' ) ) )continue;
 				$errors[] = $this->errors[$name];
 			}
 			$this->errors = $errors;
 		}
-		return empty( $this->errors )
+		return empty($this->errors)
 			? $fields
 			: $this->errors;
 	}
@@ -92,7 +92,7 @@ 
 		return wp_parse_args( $field, [
 			'items' => [],
 			'type' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	protected function normalizeContainer( array $field )
 	{
-		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return;
+		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ) )return;
 		$field['items'] = $this->generateFields( $field['items'] );
 		return $field;
 	}
@@ -128,7 +128,7 @@ 
 	 */
 	protected function normalizeField( array $field, array $defaults )
 	{
-		if( !$this->validate( $field ))return;
+		if( !$this->validate( $field ) )return;
 		return array_filter( shortcode_atts( $defaults, $field ), function( $value ) {
 			return $value !== '';
 		});
@@ -148,9 +148,9 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
-		if( !is_array( $listbox ))return;
-		if( !array_key_exists( '', $listbox['options'] )) {
+		] );
+		if( !is_array( $listbox ) )return;
+		if( !array_key_exists( '', $listbox['options'] ) ) {
 			$listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
 		}
 		foreach( $listbox['options'] as $value => $text ) {
@@ -167,7 +167,7 @@ 
 	 */
 	protected function normalizePost( array $field )
 	{
-		if( !is_array( $field['query_args'] )) {
+		if( !is_array( $field['query_args'] ) ) {
 			$field['query_args'] = [];
 		}
 		$posts = get_posts( wp_parse_args( $field['query_args'], [
@@ -175,8 +175,8 @@ 
 			'orderby' => 'title',
 			'post_type' => 'post',
 			'posts_per_page' => 30,
-		]));
-		if( !empty( $posts )) {
+		] ) );
+		if( !empty($posts) ) {
 			$options = [];
 			foreach( $posts as $post ) {
 				$options[$post->ID] = esc_html( $post->post_title );
@@ -206,7 +206,7 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 */
 	protected function validate( array $field )
 	{
-		$args = shortcode_atts([
+		$args = shortcode_atts( [
 			'label' => '',
 			'name' => false,
 			'required' => false,
@@ -230,13 +230,13 @@ 
 	 */
 	protected function validateErrors( array $args )
 	{
-		if( !isset( $args['required']['error'] )) {
+		if( !isset($args['required']['error']) ) {
 			return true;
 		}
-		$this->errors[$args['name']] = $this->normalizeContainer([
+		$this->errors[$args['name']] = $this->normalizeContainer( [
 			'html' => $args['required']['error'],
 			'type' => 'container',
-		]);
+		] );
 		return false;
 	}
 
@@ -249,10 +249,10 @@ 
 			return true;
 		}
 		$alert = esc_html__( 'Some of the shortcode options are required.', 'site-reviews' );
-		if( isset( $args['required']['alert'] )) {
+		if( isset($args['required']['alert']) ) {
 			$alert = $args['required']['alert'];
 		}
-		else if( !empty( $args['label'] )) {
+		else if( !empty($args['label']) ) {
 			$alert = sprintf(
 				esc_html_x( 'The "%s" option is required.', 'the option label', 'site-reviews' ),
 				str_replace( ':', '', $args['label'] )

Braces +18 added lines, -6 removed lines

@@ -57,9 +57,13 @@ 
 	protected function generateFields( array $fields )
 	{
 		$generatedFields = array_map( function( $field ) {
-			if( empty( $field ))return;
+			if( empty( $field )) {
+				return;
+			}
 			$field = $this->normalize( $field );
-			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return;
+			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ))) {
+				return;
+			}
 			return $this->$method( $field );
 		}, $fields );
 		return array_values( array_filter( $generatedFields ));
@@ -74,7 +78,9 @@ 
 		if( !empty( $this->errors )) {
 			$errors = [];
 			foreach( $this->required as $name => $alert ) {
-				if( false !== array_search( $name, array_column( $fields, 'name' )))continue;
+				if( false !== array_search( $name, array_column( $fields, 'name' ))) {
+					continue;
+				}
 				$errors[] = $this->errors[$name];
 			}
 			$this->errors = $errors;
@@ -118,7 +124,9 @@ 
 	 */
 	protected function normalizeContainer( array $field )
 	{
-		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return;
+		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field )) {
+			return;
+		}
 		$field['items'] = $this->generateFields( $field['items'] );
 		return $field;
 	}
@@ -128,7 +136,9 @@ 
 	 */
 	protected function normalizeField( array $field, array $defaults )
 	{
-		if( !$this->validate( $field ))return;
+		if( !$this->validate( $field )) {
+			return;
+		}
 		return array_filter( shortcode_atts( $defaults, $field ), function( $value ) {
 			return $value !== '';
 		});
@@ -149,7 +159,9 @@ 
 			'type' => '',
 			'value' => '',
 		]);
-		if( !is_array( $listbox ))return;
+		if( !is_array( $listbox )) {
+			return;
+		}
 		if( !array_key_exists( '', $listbox['options'] )) {
 			$listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
 		}

plugin/Modules/Date.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 		$diff = time() - strtotime( $date );
 		foreach( static::$TIME_PERIODS as $i => $timePeriod ) {
 			if( $diff > $timePeriod[0] )continue;
-			$unit = intval( floor( $diff / $timePeriod[1] ));
+			$unit = intval( floor( $diff / $timePeriod[1] ) );
 			$relativeDates = [
 				_n( '%s second ago', '%s seconds ago', $unit, 'site-reviews' ),
 				_n( '%s minute ago', '%s minutes ago', $unit, 'site-reviews' ),

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
 	{
 		$diff = time() - strtotime( $date );
 		foreach( static::$TIME_PERIODS as $i => $timePeriod ) {
-			if( $diff > $timePeriod[0] )continue;
+			if( $diff > $timePeriod[0] ) {
+				continue;
+			}
 			$unit = intval( floor( $diff / $timePeriod[1] ));
 			$relativeDates = [
 				_n( '%s second ago', '%s seconds ago', $unit, 'site-reviews' ),

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( !isset( $this->entries )) {
+		if( !isset($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/Validator/ValidateReview.php

Spacing +23 added lines, -23 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,14 +93,14 @@ 
 			return true;
 		}
 		$recaptchaResponse = filter_input( INPUT_POST, '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;
 	}
@@ -110,17 +110,17 @@ 
 	 */
 	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' );
-		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 = [
@@ -143,7 +143,7 @@ 
 	{
 		$rules = $this->getValidationRules( $request );
 		$errors = glsr( Validator::class )->validate( $request, $rules );
-		if( empty( $errors )) {
+		if( empty($errors) ) {
 			return true;
 		}
 		$this->setSessionValues( 'errors', $errors );
@@ -160,7 +160,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 );
 		}
@@ -171,8 +171,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' );
 	}
@@ -182,8 +182,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;
@@ -199,7 +199,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', [] );
@@ -214,8 +214,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' );
 	}
@@ -225,9 +225,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

@@ -171,8 +171,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' );
 	}
@@ -182,8 +186,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;
@@ -199,9 +207,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 )
@@ -214,8 +226,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' );
 	}
@@ -225,7 +241,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/ListTable/Columns.php

Spacing +13 added lines, -13 removed lines

@@ -15,7 +15,7 @@ 
 	public function renderFilters( $postType )
 	{
 		if( $postType !== Application::POST_TYPE )return;
-		if( !( $status = filter_input( INPUT_GET, 'post_status' ))) {
+		if( !($status = filter_input( INPUT_GET, 'post_status' )) ) {
 			$status = 'publish';
 		}
 		$ratings = glsr( Database::class )->getReviewsMeta( 'rating', $status );
@@ -45,12 +45,12 @@ 
 	protected function buildColumnAssignedTo( $postId )
 	{
 		$post = get_post( glsr( Database::class )->getReviewMeta( $postId )->assigned_to );
-		if( !( $post instanceof WP_Post ) || $post->post_status != 'publish' ) {
+		if( !($post instanceof WP_Post) || $post->post_status != 'publish' ) {
 			return '—';
 		}
 		return glsr( Builder::class )->a( get_the_title( $post->ID ), [
 			'href' => (string)get_the_permalink( $post->ID ),
-		]);
+		] );
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	{
 		return glsr( Html::class )->buildPartial( 'star-rating', [
 			'rating' => glsr( Database::class )->getReviewMeta( $postId )->rating,
-		]);
+		] );
 	}
 
 	/**
@@ -82,10 +82,10 @@ 
 		$pinned = glsr( Database::class )->getReviewMeta( $postId )->pinned
 			? ' pinned'
 			: '';
-		return glsr( Builder::class )->i([
+		return glsr( Builder::class )->i( [
 			'class' => trim( 'dashicons dashicons-sticky '.$pinned ),
 			'data-id' => $postId,
-		]);
+		] );
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	protected function buildColumnType( $postId )
 	{
 		$reviewMeta = glsr( Database::class )->getReviewMeta( $postId );
-		return isset( glsr()->reviewTypes[$reviewMeta->review_type] )
+		return isset(glsr()->reviewTypes[$reviewMeta->review_type])
 			? glsr()->reviewTypes[$reviewMeta->review_type]
 			: $reviewMeta->review_type;
 	}
@@ -106,20 +106,20 @@ 
 	 */
 	protected function renderFilterRatings( $ratings )
 	{
-		if( empty( $ratings )
+		if( empty($ratings)
 			|| apply_filters( 'site-reviews/disable/filter/ratings', false )
 		)return;
-		$ratings = array_flip( array_reverse( $ratings ));
+		$ratings = array_flip( array_reverse( $ratings ) );
 		array_walk( $ratings, function( &$value, $key ) {
 			$label = _n( '%s star', '%s stars', $key, 'site-reviews' );
 			$value = sprintf( $label, $key );
 		});
 		$ratings = [__( 'All ratings', 'site-reviews' )] + $ratings;
-		printf( '<label class="screen-reader-text" for="rating">%s</label>', __( 'Filter by rating', 'site-reviews' ));
+		printf( '<label class="screen-reader-text" for="rating">%s</label>', __( 'Filter by rating', 'site-reviews' ) );
 		glsr( Html::class )->renderPartial( 'filterby', [
 			'name' => 'rating',
 			'values' => $ratings,
-		]);
+		] );
 	}
 
 	/**
@@ -130,10 +130,10 @@ 
 	{
 		if( count( glsr()->reviewTypes ) < 2 )return;
 		$reviewTypes = ['' => __( 'All types', 'site-reviews' )] + glsr()->reviewTypes;
-		printf( '<label class="screen-reader-text" for="type">%s</label>', __( 'Filter by type', 'site-reviews' ));
+		printf( '<label class="screen-reader-text" for="type">%s</label>', __( 'Filter by type', 'site-reviews' ) );
 		glsr( Html::class )->renderPartial( 'filterby', [
 			'name' => 'review_type',
 			'options' => $reviewTypes,
-		]);
+		] );
 	}
 }

Braces +12 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 	 */
 	public function renderFilters( $postType )
 	{
-		if( $postType !== Application::POST_TYPE )return;
+		if( $postType !== Application::POST_TYPE ) {
+			return;
+		}
 		if( !( $status = filter_input( INPUT_GET, 'post_status' ))) {
 			$status = 'publish';
 		}
@@ -31,7 +33,9 @@ 
 	 */
 	public function renderValues( $column, $postId )
 	{
-		if( glsr_current_screen()->id != Application::POST_TYPE )return;
+		if( glsr_current_screen()->id != Application::POST_TYPE ) {
+			return;
+		}
 		$method = glsr( Helper::class )->buildMethodName( $column, 'buildColumn' );
 		echo method_exists( $this, $method )
 			? call_user_func( [$this, $method], $postId )
@@ -108,7 +112,9 @@ 
 	{
 		if( empty( $ratings )
 			|| apply_filters( 'site-reviews/disable/filter/ratings', false )
-		)return;
+		) {
+			return;
+		}
 		$ratings = array_flip( array_reverse( $ratings ));
 		array_walk( $ratings, function( &$value, $key ) {
 			$label = _n( '%s star', '%s stars', $key, 'site-reviews' );
@@ -128,7 +134,9 @@ 
 	 */
 	protected function renderFilterTypes( $types )
 	{
-		if( count( glsr()->reviewTypes ) < 2 )return;
+		if( count( glsr()->reviewTypes ) < 2 ) {
+			return;
+		}
 		$reviewTypes = ['' => __( 'All types', 'site-reviews' )] + glsr()->reviewTypes;
 		printf( '<label class="screen-reader-text" for="type">%s</label>', __( 'Filter by type', 'site-reviews' ));
 		glsr( Html::class )->renderPartial( 'filterby', [

plugin/Modules/Upgrader.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/Controllers/ListTableController.php

Spacing +24 added lines, -24 removed lines

@@ -21,11 +21,11 @@ 
 	 */
 	public function approve()
 	{
-		check_admin_referer( 'approve-review_'.( $postId = $this->getPostId() ));
-		wp_update_post([
+		check_admin_referer( 'approve-review_'.($postId = $this->getPostId()) );
+		wp_update_post( [
 			'ID' => $postId,
 			'post_status' => 'publish',
-		]);
+		] );
 		wp_safe_redirect( wp_get_referer() );
 		exit;
 	}
@@ -54,11 +54,11 @@ 
 	{
 		$postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
 		foreach( $postTypeColumns as $key => &$value ) {
-			if( !array_key_exists( $key, $columns ) || !empty( $value ))continue;
+			if( !array_key_exists( $key, $columns ) || !empty($value) )continue;
 			$value = $columns[$key];
 		}
-		if( count( glsr( Database::class )->getReviewsMeta( 'type' )) < 2 ) {
-			unset( $postTypeColumns['review_type'] );
+		if( count( glsr( Database::class )->getReviewsMeta( 'type' ) ) < 2 ) {
+			unset($postTypeColumns['review_type']);
 		}
 		return array_filter( $postTypeColumns, 'strlen' );
 	}
@@ -84,7 +84,7 @@ 
 		if( $post->post_type != Application::POST_TYPE || $post->post_status == 'trash' ) {
 			return $actions;
 		}
-		unset( $actions['inline hide-if-no-js'] ); //Remove Quick-edit
+		unset($actions['inline hide-if-no-js']); //Remove Quick-edit
 		$rowActions = [
 			'approve' => esc_attr__( 'Approve', 'site-reviews' ),
 			'unapprove' => esc_attr__( 'Unapprove', 'site-reviews' ),
@@ -97,7 +97,7 @@ 
 					admin_url( 'post.php?post='.$post->ID.'&action='.$key ),
 					$key.'-review_'.$post->ID
 				),
-			]);
+			] );
 		}
 		return $actions;
 	}
@@ -109,9 +109,9 @@ 
 	public function filterSortableColumns( array $columns )
 	{
 		$postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
-		unset( $postTypeColumns['cb'] );
+		unset($postTypeColumns['cb']);
 		foreach( $postTypeColumns as $key => $value ) {
-			if( glsr( Helper::class )->startsWith( 'taxonomy', $key ))continue;
+			if( glsr( Helper::class )->startsWith( 'taxonomy', $key ) )continue;
 			$columns[$key] = $key;
 		}
 		return $columns;
@@ -129,18 +129,18 @@ 
 	 */
 	public function filterStatusText( $translation, $single, $plural, $number, $domain )
 	{
-		if( $this->canModifyTranslation( $domain )) {
+		if( $this->canModifyTranslation( $domain ) ) {
 			$strings = [
 				'Published' => __( 'Approved', 'site-reviews' ),
 				'Pending' => __( 'Unapproved', 'site-reviews' ),
 			];
 			foreach( $strings as $search => $replace ) {
 				if( strpos( $single, $search ) === false )continue;
-				$translation = $this->getTranslation([
+				$translation = $this->getTranslation( [
 					'number' => $number,
 					'plural' => str_replace( $search, $replace, $plural ),
 					'single' => str_replace( $search, $replace, $single ),
-				]);
+				] );
 			}
 		}
 		return $translation;
@@ -186,9 +186,9 @@ 
 	 */
 	public function saveBulkEditFields( $postId )
 	{
-		if( !current_user_can( 'edit_posts' ))return;
+		if( !current_user_can( 'edit_posts' ) )return;
 		$assignedTo = filter_input( INPUT_GET, 'assigned_to' );
-		if( $assignedTo && get_post( $assignedTo )) {
+		if( $assignedTo && get_post( $assignedTo ) ) {
 			update_post_meta( $postId, 'assigned_to', $assignedTo );
 		}
 	}
@@ -199,10 +199,10 @@ 
 	 */
 	public function setQueryForColumn( WP_Query $query )
 	{
-		if( !$this->hasPermission( $query ))return;
+		if( !$this->hasPermission( $query ) )return;
 		$this->setMetaQuery( $query, [
 			'rating', 'review_type',
-		]);
+		] );
 		$this->setOrderby( $query );
 	}
 
@@ -212,11 +212,11 @@ 
 	 */
 	public function unapprove()
 	{
-		check_admin_referer( 'unapprove-review_'.( $postId = $this->getPostId() ));
-		wp_update_post([
+		check_admin_referer( 'unapprove-review_'.($postId = $this->getPostId()) );
+		wp_update_post( [
 			'ID' => $postId,
 			'post_status' => 'pending',
-		]);
+		] );
 		wp_safe_redirect( wp_get_referer() );
 		exit;
 	}
@@ -245,7 +245,7 @@ 
 			'single' => '',
 			'text' => '',
 		];
-		$args = (object) wp_parse_args( $args, $defaults );
+		$args = (object)wp_parse_args( $args, $defaults );
 		$translations = get_translations_for_domain( Application::ID );
 		return $args->text
 			? $translations->translate( $args->text )
@@ -270,7 +270,7 @@ 
 	protected function setMetaQuery( WP_Query $query, array $metaKeys )
 	{
 		foreach( $metaKeys as $key ) {
-			if( !( $value = filter_input( INPUT_GET, $key )))continue;
+			if( !($value = filter_input( INPUT_GET, $key )) )continue;
 			$metaQuery = (array)$query->get( 'meta_query' );
 			$metaQuery[] = [
 				'key' => $key,
@@ -287,8 +287,8 @@ 
 	{
 		$orderby = $query->get( 'orderby' );
 		$columns = glsr()->postTypeColumns[Application::POST_TYPE];
-		unset( $columns['cb'], $columns['title'], $columns['date'] );
-		if( in_array( $orderby, array_keys( $columns ))) {
+		unset($columns['cb'], $columns['title'], $columns['date']);
+		if( in_array( $orderby, array_keys( $columns ) ) ) {
 			$query->set( 'meta_key', $orderby );
 			$query->set( 'orderby', 'meta_value' );
 		}

Braces +18 added lines, -6 removed lines

@@ -54,7 +54,9 @@ 
 	{
 		$postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
 		foreach( $postTypeColumns as $key => &$value ) {
-			if( !array_key_exists( $key, $columns ) || !empty( $value ))continue;
+			if( !array_key_exists( $key, $columns ) || !empty( $value )) {
+				continue;
+			}
 			$value = $columns[$key];
 		}
 		if( count( glsr( Database::class )->getReviewsMeta( 'type' )) < 2 ) {
@@ -111,7 +113,9 @@ 
 		$postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
 		unset( $postTypeColumns['cb'] );
 		foreach( $postTypeColumns as $key => $value ) {
-			if( glsr( Helper::class )->startsWith( 'taxonomy', $key ))continue;
+			if( glsr( Helper::class )->startsWith( 'taxonomy', $key )) {
+				continue;
+			}
 			$columns[$key] = $key;
 		}
 		return $columns;
@@ -135,7 +139,9 @@ 
 				'Pending' => __( 'Unapproved', 'site-reviews' ),
 			];
 			foreach( $strings as $search => $replace ) {
-				if( strpos( $single, $search ) === false )continue;
+				if( strpos( $single, $search ) === false ) {
+					continue;
+				}
 				$translation = $this->getTranslation([
 					'number' => $number,
 					'plural' => str_replace( $search, $replace, $plural ),
@@ -186,7 +192,9 @@ 
 	 */
 	public function saveBulkEditFields( $postId )
 	{
-		if( !current_user_can( 'edit_posts' ))return;
+		if( !current_user_can( 'edit_posts' )) {
+			return;
+		}
 		$assignedTo = filter_input( INPUT_GET, 'assigned_to' );
 		if( $assignedTo && get_post( $assignedTo )) {
 			update_post_meta( $postId, 'assigned_to', $assignedTo );
@@ -199,7 +207,9 @@ 
 	 */
 	public function setQueryForColumn( WP_Query $query )
 	{
-		if( !$this->hasPermission( $query ))return;
+		if( !$this->hasPermission( $query )) {
+			return;
+		}
 		$this->setMetaQuery( $query, [
 			'rating', 'review_type',
 		]);
@@ -270,7 +280,9 @@ 
 	protected function setMetaQuery( WP_Query $query, array $metaKeys )
 	{
 		foreach( $metaKeys as $key ) {
-			if( !( $value = filter_input( INPUT_GET, $key )))continue;
+			if( !( $value = filter_input( INPUT_GET, $key ))) {
+				continue;
+			}
 			$metaQuery = (array)$query->get( 'meta_query' );
 			$metaQuery[] = [
 				'key' => $key,