pryley / site-reviews

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.submissions.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.submissions.recaptcha.secret' ),
 		], 'https://www.google.com/recaptcha/api/siteverify' );
-		if( is_wp_error( $response = wp_remote_get( $endpoint ))) {
+		if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) {
 			glsr_log()->error( $response->get_error_message() );
 			return false;
 		}
-		$response = json_decode( wp_remote_retrieve_body( $response ));
-		if( !empty( $response->success )) {
+		$response = json_decode( wp_remote_retrieve_body( $response ) );
+		if( !empty($response->success) ) {
 			return boolval( $response->success );
 		}
 		$errorCodes = [
@@ -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.submissions.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.submissions.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/Database/Cache.php

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	const EXPIRY_TIME = WEEK_IN_SECONDS;
 
 	/**
- 	 * @return array
+	 * @return array
 	 */
 	public function getCloudflareIps()
 	{

Spacing +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@ 
 			$ipAddresses = array_fill_keys( ['v4', 'v6'], [] );
 			foreach( array_keys( $ipAddresses ) as $version ) {
 				$response = wp_remote_get( 'https://www.cloudflare.com/ips-'.$version );
-				if( is_wp_error( $response )) {
+				if( is_wp_error( $response ) ) {
 					glsr_log()->error( $response->get_error_message() );
 					continue;
 				}
-				$ipAddresses[$version] = array_filter( explode( PHP_EOL, wp_remote_retrieve_body( $response )));
+				$ipAddresses[$version] = array_filter( explode( PHP_EOL, wp_remote_retrieve_body( $response ) ) );
 			}
 			set_transient( Application::ID.'_cloudflare_ips', $ipAddresses, static::EXPIRY_TIME );
 		}
@@ -57,7 +57,7 @@ 
 		if( $test === false ) {
 			$response = wp_remote_post( 'https://api.wordpress.org/stats/php/1.0/' );
 			$test = !is_wp_error( $response )
-				&& in_array( $response['response']['code'], range( 200, 299 ))
+				&& in_array( $response['response']['code'], range( 200, 299 ) )
 				? 'Works'
 				: 'Does not work';
 			set_transient( Application::ID.'_remote_post_test', $test, static::EXPIRY_TIME );

plugin/Widgets/Widget.php

Spacing +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@ 
 	public function __construct( $idBase, $name, $values )
 	{
 		$controlOptions = $widgetOptions = [];
-		if( isset( $values['class'] )) {
+		if( isset($values['class']) ) {
 			$widgetOptions['classname'] = $values['class'];
 		}
-		if( isset( $values['description'] )) {
+		if( isset($values['description']) ) {
 			$widgetOptions['description'] = $values['description'];
 		}
-		if( isset( $values['width'] )) {
+		if( isset($values['width']) ) {
 			$controlOptions['width'] = $values['width'];
 		}
 		parent::__construct( $idBase, $name, $widgetOptions, $controlOptions );
@@ -34,10 +34,10 @@ 
 	protected function renderField( $tag, array $args = [] )
 	{
 		$args = $this->normalizeFieldAttributes( $tag, $args );
-		$field = glsr( Html::class )->build( ['is_widget' => true] )->{$tag}( $args['name'], $args );
+		$field = glsr( Html::class )->build( ['is_widget' => true] )->{$tag}($args['name'], $args);
 		echo glsr( Html::class )->build( ['is_widget' => true] )->div( $field, [
 			'class' => 'glsr-field',
-		]);
+		] );
 	}
 
 	/**
@@ -46,10 +46,10 @@ 
 	 */
 	protected function normalizeFieldAttributes( $tag, array $args )
 	{
-		if( empty( $args['value'] )) {
+		if( empty($args['value']) ) {
 			$args['value'] = $this->widgetArgs[$args['name']];
 		}
-		if( empty( $this->widgetArgs['options'] ) && in_array( $tag, ['checkbox', 'radio'] )) {
+		if( empty($this->widgetArgs['options']) && in_array( $tag, ['checkbox', 'radio'] ) ) {
 			$args['checked'] = in_array( $args['value'], (array)$this->widgetArgs[$args['name']] );
 		}
 		$args['id'] = $this->get_field_id( $args['name'] );

plugin/Modules/Html/Builder.php

Braces +9 added lines, -3 removed lines

@@ -87,7 +87,9 @@ 
 		];
 		if( !isset( $properties[$property] )
 			|| empty( array_filter( [$value], $properties[$property] ))
-		)return;
+		) {
+			return;
+		}
 		$this->$property = $value;
 	}
 
@@ -137,7 +139,9 @@ 
 	 */
 	protected function buildFieldDescription()
 	{
-		if( empty( $this->args['description'] ))return;
+		if( empty( $this->args['description'] )) {
+			return;
+		}
 		if( !empty( $this->globals['is_widget'] )) {
 			return $this->small( $this->args['description'] );
 		}
@@ -186,7 +190,9 @@ 
 	 */
 	protected function buildFormLabel()
 	{
-		if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' )return;
+		if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' ) {
+			return;
+		}
 		return $this->label([
 			'for' => $this->args['id'],
 			'text' => $this->args['label'],

Spacing +24 added lines, -24 removed lines

@@ -59,9 +59,9 @@ 
 	 */
 	public function __call( $method, $args )
 	{
-		$instance = new static( $this->globals );
+		$instance = new static($this->globals);
 		$instance->setTagFromMethod( $method );
-		call_user_func_array( [$instance, 'normalize'], $args += ['',''] );
+		call_user_func_array( [$instance, 'normalize'], $args += ['', ''] );
 		$tags = array_merge( static::TAGS_FORM, static::TAGS_STRUCTURE, static::TAGS_TEXT );
 		$generatedTag = in_array( $instance->tag, $tags )
 			? $instance->buildTag()
@@ -85,8 +85,8 @@ 
 			'render' => 'is_bool',
 			'tag' => 'is_string',
 		];
-		if( !isset( $properties[$property] )
-			|| empty( array_filter( [$value], $properties[$property] ))
+		if( !isset($properties[$property])
+			|| empty(array_filter( [$value], $properties[$property] ))
 		)return;
 		$this->$property = $value;
 	}
@@ -104,7 +104,7 @@ 
 	 */
 	public function getOpeningTag()
 	{
-		$attributes = glsr( Attributes::class )->{$this->tag}( $this->args )->toString();
+		$attributes = glsr( Attributes::class )->{$this->tag}($this->args)->toString();
 		return '<'.trim( $this->tag.' '.$attributes ).'>';
 	}
 
@@ -114,7 +114,7 @@ 
 	protected function buildCustomField()
 	{
 		$className = glsr( Helper::class )->buildClassName( $this->tag, __NAMESPACE__.'\Fields' );
-		if( !class_exists( $className )) {
+		if( !class_exists( $className ) ) {
 			glsr_log()->error( 'Field missing: '.$className );
 			return;
 		}
@@ -126,7 +126,7 @@ 
 	 */
 	protected function buildDefaultTag( $text = '' )
 	{
-		if( empty( $text )) {
+		if( empty($text) ) {
 			$text = $this->args['text'];
 		}
 		return $this->getOpeningTag().$text.$this->getClosingTag();
@@ -137,8 +137,8 @@ 
 	 */
 	protected function buildFieldDescription()
 	{
-		if( empty( $this->args['description'] ))return;
-		if( !empty( $this->globals['is_widget'] )) {
+		if( empty($this->args['description']) )return;
+		if( !empty($this->globals['is_widget']) ) {
 			return $this->small( $this->args['description'] );
 		}
 		return $this->p( $this->args['description'], ['class' => 'description'] );
@@ -149,10 +149,10 @@ 
 	 */
 	protected function buildFormInput()
 	{
-		if( !in_array( $this->args['type'], ['checkbox', 'radio'] )) {
+		if( !in_array( $this->args['type'], ['checkbox', 'radio'] ) ) {
 			return $this->buildFormLabel().$this->getOpeningTag();
 		}
-		return empty( $this->args['options'] )
+		return empty($this->args['options'])
 			? $this->buildFormInputChoice()
 			: $this->buildFormInputMultiChoice();
 	}
@@ -171,7 +171,7 @@ 
 	protected function buildFormInputMultiChoice()
 	{
 		if( $this->args['type'] == 'checkbox' ) {
-			$this->args['name'].= '[]';
+			$this->args['name'] .= '[]';
 		}
 		$options = array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) {
 			return $carry.$this->li( $this->{$this->args['type']}([
@@ -179,12 +179,12 @@ 
 				'name' => $this->args['name'],
 				'text' => $this->args['options'][$key],
 				'value' => $key,
-			]));
+			]) );
 		});
 		return $this->ul( $options, [
 			'class' => $this->args['class'],
 			'id' => $this->args['id'],
-		]);
+		] );
 	}
 
 	/**
@@ -192,11 +192,11 @@ 
 	 */
 	protected function buildFormLabel()
 	{
-		if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' )return;
-		return $this->label([
+		if( empty($this->args['label']) || $this->args['type'] == 'hidden' )return;
+		return $this->label( [
 			'for' => $this->args['id'],
 			'text' => $this->args['label'],
-		]);
+		] );
 	}
 
 	/**
@@ -213,11 +213,11 @@ 
 	protected function buildFormSelectOptions()
 	{
 		return array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) {
-			return $carry.$this->option([
+			return $carry.$this->option( [
 				'selected' => $this->args['value'] == $key,
 				'text' => $this->args['options'][$key],
 				'value' => $key,
-			]);
+			] );
 		});
 	}
 
@@ -234,7 +234,7 @@ 
 	 */
 	protected function buildTag()
 	{
-		if( !in_array( $this->tag, static::TAGS_FORM )) {
+		if( !in_array( $this->tag, static::TAGS_FORM ) ) {
 			return $this->buildDefaultTag();
 		}
 		return call_user_func( [$this, 'buildForm'.ucfirst( $this->tag )] ).$this->buildFieldDescription();
@@ -246,13 +246,13 @@ 
 	 */
 	protected function normalize( ...$params )
 	{
-		if( is_string( $params[0] ) || is_numeric( $params[0] )) {
+		if( is_string( $params[0] ) || is_numeric( $params[0] ) ) {
 			$this->setNameOrTextAttributeForTag( $params[0] );
 		}
-		if( is_array( $params[0] )) {
+		if( is_array( $params[0] ) ) {
 			$this->args += $params[0];
 		}
-		else if( is_array( $params[1] )) {
+		else if( is_array( $params[1] ) ) {
 			$this->args += $params[1];
 		}
 		$this->args = glsr( BuilderDefaults::class )->merge( $this->args );
@@ -277,7 +277,7 @@ 
 	protected function setTagFromMethod( $method )
 	{
 		$this->tag = strtolower( $method );
-		if( in_array( $this->tag, static::INPUT_TYPES )) {
+		if( in_array( $this->tag, static::INPUT_TYPES ) ) {
 			$this->args['type'] = $this->tag;
 			$this->tag = 'input';
 		}

plugin/Modules/Html/Fields/Honeypot.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	{
 		$defaults = wp_parse_args( $this->defaults(), [
 			'name' => $this->builder->args['text'],
-		]);
+		] );
 		$this->builder->args = wp_parse_args( $this->builder->args, $defaults );
 		$this->builder->tag = 'input';
 		return $this->builder->getOpeningTag();

views/pages/addons/index.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 				'name' => 'tripadvisor',
 				'title' => 'Tripadvisor Reviews',
 			],
-		]);
+		] );
 		$template->render( 'partials/addons/addon', [
 			'context' => [
 				'description' => __( 'Sync your Yelp reviews and display them on your site.', 'site-reviews' ),
@@ -20,7 +20,7 @@ 
 				'name' => 'yelp',
 				'title' => 'Yelp Reviews',
 			],
-		]);
+		] );
 	?>
 	</div>
 </div>

views/partials/translations/plural.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 		<p>{{ data.s1 }}</p>
 		<p>{{ data.p1 }}</p>
 		<p class="row-actions">
-			<span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' );?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span>
+			<span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' ); ?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span>
 		</p>
 		<button type="button" class="toggle-row">
 			<span class="screen-reader-text"><?= __( 'Show custom translation', 'site-reviews' ); ?></span>

views/partials/translations/single.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 	<td class="glsr-string-td1 column-primary">
 		<p>{{ data.s1 }}</p>
 		<p class="row-actions">
-			<span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' );?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span>
+			<span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' ); ?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span>
 		</p>
 		<button type="button" class="toggle-row">
 			<span class="screen-reader-text"><?= __( 'Show custom translation', 'site-reviews' ); ?></span>

views/partials/editor/metabox-categories.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 		</ul>
 	</div>
 
-	<?php if( current_user_can( $taxonomy->cap->edit_terms )) : ?>
+	<?php if( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
 	<div id="<?= $tax_name; ?>-adder" class="wp-hidden-children">
 		<a id="<?= $tax_name; ?>-add-toggle" href="#<?= $tax_name; ?>-add" class="hide-if-no-js taxonomy-add-new">
 			<?= sprintf( '+ %s', $taxonomy->labels->add_new_item ); ?>
@@ -29,7 +29,7 @@ 
 			<label class="screen-reader-text" for="new<?= $tax_name; ?>"><?= $taxonomy->labels->add_new_item; ?></label>
 			<input type="text" name="new<?= $tax_name; ?>" id="new<?= $tax_name; ?>" class="form-required form-input-tip" value="<?= esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/>
 			<input type="button" id="<?= $tax_name; ?>-add-submit" data-wp-lists="add:<?= $tax_name; ?>checklist:<?= $tax_name; ?>-add" class="button category-add-submit" value="<?= esc_attr( $taxonomy->labels->add_new_item ); ?>" />
-			<?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?>
+			<?php wp_nonce_field( 'add-'.$tax_name, '_ajax_nonce-add-'.$tax_name, false ); ?>
 			<span id="<?= $tax_name; ?>-ajax-response"></span>
 		</div>
 	</div>