pryley / site-reviews

plugin/Handlers/CreateReview.php

Spacing +14 added lines, -14 removed lines

@@ -63,7 +63,7 @@ 
 	protected function createWebhookNotification( Command $command, array $args )
 	{
 		$fields = [];
-		$fields[] = ['title' => str_repeat( ':star:', (int) $command->rating )];
+		$fields[] = ['title' => str_repeat( ':star:', (int)$command->rating )];
 		if( $command->title ) {
 			$fields[] = ['title' => $command->title];
 		}
@@ -76,8 +76,8 @@ 
 		if( $command->author ) {
 			$fields[] = ['value' => trim( $command->author.$command->email.' - '.$command->ipAddress )];
 		}
-		$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' => [[
@@ -86,7 +86,7 @@ 
 				'fallback' => $this->createEmailNotification( $command, $args )->read( 'plaintext' ),
 				'fields' => $fields,
 			]],
-		]);
+		] );
 	}
 
 	/**
@@ -115,12 +115,12 @@ 
 	protected function sendNotification( $post_id, Command $command )
 	{
 		$notificationType = glsr( OptionManager::class )->get( 'settings.general.notification' );
-		if( !in_array( $notificationType, ['default','custom','webhook'] ))return;
-		$assignedToTitle = get_the_title( (int) $command->assignedTo );
+		if( !in_array( $notificationType, ['default', 'custom', 'webhook'] ) )return;
+		$assignedToTitle = get_the_title( (int)$command->assignedTo );
 		$notificationSubject = _nx(
 			'New %s-star review',
 			'New %s-star review of: %s',
-			(int) empty( $assignedToTitle ),
+			(int)empty($assignedToTitle),
 			'The text is different depending on whether or not the review has been assigned to a post.',
 			'site-reviews'
 		);
@@ -129,7 +129,7 @@ 
 			sprintf( $notificationSubject, $command->rating, $assignedToTitle )
 		);
 		$args = [
-			'notification_link' => esc_url( admin_url( sprintf( 'post.php?post=%s&action=edit', $post_id ))),
+			'notification_link' => esc_url( admin_url( sprintf( 'post.php?post=%s&action=edit', $post_id ) ) ),
 			'notification_title' => $notificationTitle,
 			'notification_type' => $notificationType,
 		];
@@ -146,14 +146,14 @@ 
 		$args['recipient'] = $args['notification_type'] === 'default'
 			? get_option( 'admin_email' )
 			: glsr( OptionManager::class )->get( 'settings.general.notification_email' );
-		$result = !empty( $args['recipient'] )
+		$result = !empty($args['recipient'])
 			? $this->createEmailNotification( $command, $args )->send()
 			: false;
 		if( $result === null ) {
-			glsr_log()->error( __( 'Email notification was not sent: missing email, subject, or message.', 'site-reviews' ));
+			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' ) );
 		}
 	}
 
@@ -162,7 +162,7 @@ 
 	 */
 	protected function sendWebhookNotification( Command $command, 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( $command, $args );
 		$result = wp_remote_post( $endpoint, [
 			'method' => 'POST',
@@ -173,8 +173,8 @@ 
 			'sslverify' => false,
 			'headers' => ['Content-Type' => 'application/json'],
 			'body' => apply_filters( 'site-reviews/webhook/notification', $notification, $command ),
-		]);
-		if( is_wp_error( $result )) {
+		] );
+		if( is_wp_error( $result ) ) {
 			glsr_log()->error( $result->get_error_message() );
 		}
 	}

Braces +6 added lines, -2 removed lines

@@ -115,7 +115,9 @@ 
 	protected function sendNotification( $post_id, Command $command )
 	{
 		$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) $command->assignedTo );
 		$notificationSubject = _nx(
 			'New %s-star review',
@@ -162,7 +164,9 @@ 
 	 */
 	protected function sendWebhookNotification( Command $command, 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( $command, $args );
 		$result = wp_remote_post( $endpoint, [
 			'method' => 'POST',

plugin/Handlers/ChangeStatus.php

Spacing +5 added lines, -5 removed lines

@@ -12,11 +12,11 @@ 
 	 */
 	public function handle( Command $command )
 	{
-		$postId = wp_update_post([
+		$postId = wp_update_post( [
 			'ID' => $command->id,
 			'post_status' => $command->status,
-		]);
-		if( is_wp_error( $postId )) {
+		] );
+		if( is_wp_error( $postId ) ) {
 			glsr_log()->error( $postId->get_error_message() );
 			return [];
 		}
@@ -37,7 +37,7 @@ 
 			'href' => get_edit_post_link( $postId ),
 			'class' => 'row-title',
 			'title' => __( 'Edit', 'site-reviews' ).' “'.esc_attr( $title ).'”',
-		]);
+		] );
 	}
 
 	/**
@@ -47,7 +47,7 @@ 
 	protected function getPostState( $postId )
 	{
 		ob_start();
-		_post_states( get_post( $postId ));
+		_post_states( get_post( $postId ) );
 		return ob_get_clean();
 	}
 }

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 );