pryley / site-reviews

plugin/Shortcodes/TinymcePopupGenerator.php

Spacing +26 added lines, -26 removed lines

@@ -48,7 +48,7 @@ 
 			'label' => '['.$tag.']',
 			'required' => $this->required,
 			'title' => esc_html__( 'Shortcode', 'site-reviews' ),
-		]);
+		] );
 		return $this;
 	}
 
@@ -58,12 +58,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 ) );
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 	protected function getCategories( $tooltip = '' )
 	{
 		$terms = glsr( Database::class )->getTerms();
-		if( empty( $terms )) {
+		if( empty($terms) ) {
 			return [];
 		}
 		return [
@@ -91,15 +91,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, glsr_array_column( $fields, 'name' )))continue;
+				if( false !== array_search( $name, glsr_array_column( $fields, 'name' ) ) )continue;
 				$errors[] = $this->errors[$name];
 			}
 			$this->errors = $errors;
 		}
-		return empty( $this->errors )
+		return empty($this->errors)
 			? $fields
 			: $this->errors;
 	}
@@ -109,7 +109,7 @@ 
 	 */
 	protected function getHideOptions()
 	{
-		$classname = str_replace( 'Popup', 'Shortcode', get_class( $this ));
+		$classname = str_replace( 'Popup', 'Shortcode', get_class( $this ) );
 		$hideOptions = glsr( $classname )->getHideOptions();
 		$options = [];
 		foreach( $hideOptions as $name => $tooltip ) {
@@ -149,7 +149,7 @@ 
 		return wp_parse_args( $field, [
 			'items' => [],
 			'type' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -175,7 +175,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;
 	}
@@ -185,7 +185,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 !== '';
 		});
@@ -205,9 +205,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 ) {
@@ -224,7 +224,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'], [
@@ -232,8 +232,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 );
@@ -263,7 +263,7 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	protected function validate( array $field )
 	{
-		$args = shortcode_atts([
+		$args = shortcode_atts( [
 			'label' => '',
 			'name' => false,
 			'required' => false,
@@ -287,13 +287,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;
 	}
 
@@ -306,10 +306,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'] )

plugin/Modules/Slack.php

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
 	 */
 	public function compose( Review $review, array $notification )
 	{
-		if( empty( $this->endpoint )) {
+		if( empty($this->endpoint) ) {
 			return $this;
 		}
 		$args = shortcode_atts( glsr( SlackDefaults::class )->defaults(), $notification );
@@ -60,7 +60,7 @@ 
 	 */
 	public function send()
 	{
-		if( empty( $this->endpoint )) {
+		if( empty($this->endpoint) ) {
 			return new WP_Error( 'slack', 'Slack notification was not sent: missing endpoint' );
 		}
 		return wp_remote_post( $this->endpoint, [
@@ -72,7 +72,7 @@ 
 			'redirection' => 5,
 			'sslverify' => false,
 			'timeout' => 45,
-		]);
+		] );
 	}
 
 	/**
@@ -92,11 +92,11 @@ 
 	 */
 	protected function buildAuthorField()
 	{
-		$email = !empty( $this->review->email )
+		$email = !empty($this->review->email)
 			? '<'.$this->review->email.'>'
 			: '';
 		$author = trim( rtrim( $this->review->author ).' '.$email );
-		return ['value' => implode( ' - ', array_filter( [$author, $this->review->ip_address] ))];
+		return ['value' => implode( ' - ', array_filter( [$author, $this->review->ip_address] ) )];
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 */
 	protected function buildContentField()
 	{
-		return !empty( $this->review->content )
+		return !empty($this->review->content)
 			? ['value' => $this->review->content]
 			: [];
 	}
@@ -129,7 +129,7 @@ 
 	protected function buildStarsField()
 	{
 		$solidStars = str_repeat( '★', $this->review->rating );
-		$emptyStars = str_repeat( '☆', max( 0, Rating::MAX_RATING - $this->review->rating ));
+		$emptyStars = str_repeat( '☆', max( 0, Rating::MAX_RATING - $this->review->rating ) );
 		$stars = $solidStars.$emptyStars;
 		$stars = apply_filters( 'site-reviews/slack/stars', $stars, $this->review->rating, Rating::MAX_RATING );
 		return ['title' => $stars];
@@ -140,7 +140,7 @@ 
 	 */
 	protected function buildTitleField()
 	{
-		return !empty( $this->review->title )
+		return !empty($this->review->title)
 			? ['title' => $this->review->title]
 			: [];
 	}

plugin/Modules/Html/Field.php

Spacing +20 added lines, -20 removed lines

@@ -27,7 +27,7 @@ 
 			'is_valid' => true,
 			'is_widget' => false,
 			'path' => '',
-		]);
+		] );
 		$this->normalize();
 	}
 
@@ -46,7 +46,7 @@ 
 	{
 		if( !$this->field['is_valid'] )return;
 		if( $this->field['is_raw'] ) {
-			return glsr( Builder::class )->{$this->field['type']}( $this->field );
+			return glsr( Builder::class )->{$this->field['type']}($this->field);
 		}
 		if( !$this->field['is_setting'] ) {
 			return $this->buildField();
@@ -75,15 +75,15 @@ 
 				'class' => $this->getFieldClass(),
 				'errors' => $this->getFieldErrors(),
 				'field' => glsr( Builder::class )->raw( $this->field ),
-				'label' => glsr( Builder::class )->label([
+				'label' => glsr( Builder::class )->label( [
 					'class' => 'glsr-'.$this->field['type'].'-label',
 					'for' => $this->field['id'],
 					'is_public' => $this->field['is_public'],
 					'text' => $this->field['label'].'<span></span>',
 					'type' => $this->field['type'],
-				]),
+				] ),
 			],
-		]);
+		] );
 		return apply_filters( 'site-reviews/rendered/field', $field, $this->field['type'], $this->field );
 	}
 
@@ -95,10 +95,10 @@ 
 		return glsr( Template::class )->build( 'partials/form/table-row', [
 			'context' => [
 				'class' => $this->getFieldClass(),
-				'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ),
+				'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
 				'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -107,16 +107,16 @@ 
 	protected function buildSettingMultiField()
 	{
 		$dependsOn = $this->getFieldDependsOn();
-		unset( $this->field['data-depends'] );
+		unset($this->field['data-depends']);
 		return glsr( Template::class )->build( 'partials/form/table-row-multiple', [
 			'context' => [
 				'class' => $this->getFieldClass(),
 				'depends_on' => $dependsOn,
-				'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ),
+				'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
 				'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ),
 				'legend' => $this->field['legend'],
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -125,13 +125,13 @@ 
 	protected function getFieldClass()
 	{
 		$classes = [];
-		if( !empty( $this->field['errors'] )) {
+		if( !empty($this->field['errors']) ) {
 			$classes[] = 'glsr-has-error';
 		}
 		if( $this->field['is_hidden'] ) {
 			$classes[] = 'hidden';
 		}
-		if( !empty( $this->field['required'] )) {
+		if( !empty($this->field['required']) ) {
 			$classes[] = 'glsr-required';
 		}
 		$classes = apply_filters( 'site-reviews/rendered/field/classes', $classes, $this->field );
@@ -143,7 +143,7 @@ 
 	 */
 	protected function getFieldDependsOn()
 	{
-		return !empty( $this->field['data-depends'] )
+		return !empty($this->field['data-depends'])
 			? $this->field['data-depends']
 			: '';
 	}
@@ -153,7 +153,7 @@ 
 	 */
 	protected function getFieldErrors()
 	{
-		if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] ))return;
+		if( empty($this->field['errors']) || !is_array( $this->field['errors'] ) )return;
 		$errors = array_reduce( $this->field['errors'], function( $carry, $error ) {
 			return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] );
 		});
@@ -161,7 +161,7 @@ 
 			'context' => [
 				'errors' => $errors,
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -184,13 +184,13 @@ 
 			'name', 'type',
 		];
 		foreach( $requiredValues as $value ) {
-			if( isset( $this->field[$value] ))continue;
+			if( isset($this->field[$value]) )continue;
 			$missingValues[] = $value;
 			$this->field['is_valid'] = false;
 		}
-		if( !empty( $missingValues )) {
+		if( !empty($missingValues) ) {
 			glsr_log()
-				->warning( 'Field is missing: '.implode( ', ', $missingValues ))
+				->warning( 'Field is missing: '.implode( ', ', $missingValues ) )
 				->info( $this->field );
 		}
 		return $this->field['is_valid'];
@@ -204,7 +204,7 @@ 
 		if( !$this->isFieldValid() )return;
 		$this->field['path'] = $this->field['name'];
 		$className = glsr( Helper::class )->buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' );
-		if( class_exists( $className )) {
+		if( class_exists( $className ) ) {
 			$this->field = array_merge(
 				wp_parse_args( $this->field, $className::defaults() ),
 				$className::required()
@@ -219,7 +219,7 @@ 
 	 */
 	protected function normalizeFieldId()
 	{
-		if( isset( $this->field['id'] ) || $this->field['is_raw'] )return;
+		if( isset($this->field['id']) || $this->field['is_raw'] )return;
 		$this->field['id'] = glsr( Helper::class )->convertPathToId(
 			$this->field['path'],
 			$this->getFieldPrefix()

plugin/Modules/Notification.php

Spacing +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
 	public function __construct()
 	{
 		$types = glsr( OptionManager::class )->get( 'settings.general.notifications', [] );
-		$this->email = count( array_intersect( ['admin', 'custom'], $types )) > 0;
+		$this->email = count( array_intersect( ['admin', 'custom'], $types ) ) > 0;
 		$this->slack = in_array( 'slack', $types );
 		$this->types = $types;
 	}
@@ -43,7 +43,7 @@ 
 	 */
 	public function send( Review $review )
 	{
-		if( empty( $this->types ))return;
+		if( empty($this->types) )return;
 		$this->review = $review;
 		$args = [
 			'link' => $this->getLink(),
@@ -58,7 +58,7 @@ 
 	 */
 	protected function buildEmail( array $args )
 	{
-		return glsr( Email::class )->compose([
+		return glsr( Email::class )->compose( [
 			'to' => $this->getEmailAddresses(),
 			'subject' => $args['title'],
 			'template' => 'email-notification',
@@ -71,7 +71,7 @@ 
 				'review_rating' => $this->review->rating,
 				'review_title' => $this->review->title,
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 			'button_url' => $args['link'],
 			'fallback' => $this->buildEmail( $args )->read( 'plaintext' ),
 			'pretext' => $args['title'],
-		]);
+		] );
 	}
 
 	/**
@@ -92,23 +92,23 @@ 
 	protected function getEmailAddresses()
 	{
 		$emails = [];
-		if( in_array( 'admin', $this->types )) {
+		if( in_array( 'admin', $this->types ) ) {
 			$emails[] = get_option( 'admin_email' );
 		}
-		if( in_array( 'author', $this->types )) {
-			$assignedPost = get_post( intval( $this->review->assigned_to ));
+		if( in_array( 'author', $this->types ) ) {
+			$assignedPost = get_post( intval( $this->review->assigned_to ) );
 			if( $assignedPost instanceof WP_Post ) {
 				$this->email = true;
-				$emails[] = get_the_author_meta( 'user_email', intval( $assignedPost->post_author ));
+				$emails[] = get_the_author_meta( 'user_email', intval( $assignedPost->post_author ) );
 			}
 		}
-		if( in_array( 'custom', $this->types )) {
+		if( in_array( 'custom', $this->types ) ) {
 			$customEmails = glsr( OptionManager::class )->get( 'settings.general.notification_email' );
 			$customEmails = str_replace( [' ', ',', ';'], ',', $customEmails );
 			$customEmails = explode( ',', $customEmails );
 			$emails = array_merge( $emails, $customEmails );
 		}
-		$emails = array_filter( array_keys( array_flip( $emails )));
+		$emails = array_filter( array_keys( array_flip( $emails ) ) );
 		return apply_filters( 'site-reviews/notification/emails', $emails, $this->review );
 	}
 
@@ -125,16 +125,16 @@ 
 	 */
 	protected function getTitle()
 	{
-		$assignedTitle = get_the_title( intval( $this->review->assigned_to ));
+		$assignedTitle = get_the_title( intval( $this->review->assigned_to ) );
 		$title = _nx(
 			'New %s-star review',
 			'New %s-star review of: %s',
-			intval( empty( $assignedTitle )),
+			intval( empty($assignedTitle) ),
 			'This string differs depending on whether or not the review has been assigned to a post.',
 			'site-reviews'
 		);
 		$title = sprintf( '[%s] %s',
-			wp_specialchars_decode( strval( get_option( 'blogname' )), ENT_QUOTES ),
+			wp_specialchars_decode( strval( get_option( 'blogname' ) ), ENT_QUOTES ),
 			sprintf( $title, $this->review->rating, $assignedTitle )
 		);
 		return apply_filters( 'site-reviews/notification/title', $title, $this->review );
@@ -147,7 +147,7 @@ 
 	{
 		$email = $this->buildEmail( $args );
 		if( !$this->email )return;
-		if( empty( $email->to )) {
+		if( empty($email->to) ) {
 			glsr_log()->error( 'Email notification was not sent (missing email address)' );
 			return;
 		}
@@ -164,7 +164,7 @@ 
 		if( !$this->slack )return;
 		$notification = $this->buildSlackNotification( $args );
 		$result = $notification->send();
-		if( is_wp_error( $result )) {
+		if( is_wp_error( $result ) ) {
 			$notification->review = null;
 			glsr_log()->error( $result->get_error_message() )->debug( $notification );
 		}

plugin/Controllers/SettingsController.php

Spacing +12 added lines, -12 removed lines

@@ -17,7 +17,7 @@ 
 	 */
 	public function callbackRegisterSettings( $input )
 	{
-		if( !is_array( $input )) {
+		if( !is_array( $input ) ) {
 			$input = ['settings' => []];
 		}
 		if( key( $input ) == 'settings' ) {
@@ -26,7 +26,7 @@ 
 			$options = $this->sanitizeSubmissions( $input, $options );
 			$options = $this->sanitizeTranslations( $input, $options );
 			if( filter_input( INPUT_POST, 'option_page' ) == Application::ID.'-settings' ) {
-				glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ));
+				glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ) );
 			}
 			return $options;
 		}
@@ -41,7 +41,7 @@ 
 	{
 		register_setting( Application::ID.'-settings', OptionManager::databaseKey(), [
 			'sanitize_callback' => [$this, 'callbackRegisterSettings'],
-		]);
+		] );
 	}
 
 	/**
@@ -56,7 +56,7 @@ 
 		if( trim( $inputForm['notification_message'] ) == '' ) {
 			$options['settings']['general']['notification_message'] = glsr()->defaults['settings']['general']['notification_message'];
 		}
-		$options['settings']['general']['notifications'] = isset( $inputForm['notifications'] )
+		$options['settings']['general']['notifications'] = isset($inputForm['notifications'])
 			? $inputForm['notifications']
 			: [];
 		return $options;
@@ -68,7 +68,7 @@ 
 	protected function sanitizeSubmissions( array $input, array $options )
 	{
 		$inputForm = $input['settings']['submissions'];
-		$options['settings']['submissions']['required'] = isset( $inputForm['required'] )
+		$options['settings']['submissions']['required'] = isset($inputForm['required'])
 			? $inputForm['required']
 			: [];
 		return $options;
@@ -79,17 +79,17 @@ 
 	 */
 	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'] ) );
 			$allowedTags = [
 				'a' => ['class' => [], 'href' => [], 'target' => []],
 				'span' => ['class' => []],
 			];
-			array_walk( $options['settings']['strings'], function( &$string ) use( $allowedTags ) {
-				if( isset( $string['s2'] )) {
+			array_walk( $options['settings']['strings'], function( &$string ) use($allowedTags) {
+				if( isset($string['s2']) ) {
 					$string['s2'] = wp_kses( $string['s2'], $allowedTags );
 				}
-				if( isset( $string['p2'] )) {
+				if( isset($string['p2']) ) {
 					$string['p2'] = wp_kses( $string['p2'], $allowedTags );
 				}
 			});
@@ -103,11 +103,11 @@ 
 	protected function isPolylangActiveAndSupported()
 	{
 		if( !glsr( Polylang::class )->isActive() ) {
-			glsr( Notice::class )->addError( __( 'Please install/activate the Polylang plugin to enable integration.', 'site-reviews' ));
+			glsr( Notice::class )->addError( __( 'Please install/activate the Polylang plugin to enable integration.', 'site-reviews' ) );
 			return false;
 		}
 		else if( !glsr( Polylang::class )->isSupported() ) {
-			glsr( Notice::class )->addError( __( 'Please update the Polylang plugin to v2.3.0 or greater to enable integration.', 'site-reviews' ));
+			glsr( Notice::class )->addError( __( 'Please update the Polylang plugin to v2.3.0 or greater to enable integration.', 'site-reviews' ) );
 			return false;
 		}
 		return true;

plugin/Modules/Validator/ValidateReview.php

Spacing +22 added lines, -22 removed lines

@@ -67,7 +67,7 @@ 
 		$this->validateBlacklist();
 		$this->validateAkismet();
 		$this->validateRecaptcha();
-		if( !empty( $this->error )) {
+		if( !empty($this->error) ) {
 			$this->setSessionValues( 'message', $this->error );
 		}
 		return $this;
@@ -91,8 +91,8 @@ 
 		if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
 			return static::RECAPTCHA_DISABLED;
 		}
-		if( empty( $this->request['_recaptcha-token'] )) {
-			return $this->request['_counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ))
+		if( empty($this->request['_recaptcha-token']) ) {
+			return $this->request['_counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ) )
 				? static::RECAPTCHA_EMPTY
 				: static::RECAPTCHA_FAILED;
 		}
@@ -104,17 +104,17 @@ 
 	 */
 	protected function getRecaptchaTokenStatus()
 	{
-		$endpoint = add_query_arg([
+		$endpoint = add_query_arg( [
 			'remoteip' => glsr( Helper::class )->getIpAddress(),
 			'response' => $this->request['_recaptcha-token'],
 			'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 static::RECAPTCHA_FAILED;
 		}
-		$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 )
 				? static::RECAPTCHA_VALID
 				: static::RECAPTCHA_INVALID;
@@ -132,12 +132,12 @@ 
 	{
 		$rules = array_intersect_key(
 			apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES, $request ),
-			array_flip( $this->getOption( 'settings.submissions.required', [] ))
+			array_flip( $this->getOption( 'settings.submissions.required', [] ) )
 		);
-		$excluded = isset( $request['excluded'] )
+		$excluded = isset($request['excluded'])
 			? explode( ',', $request['excluded'] )
 			: [];
-		return array_diff_key( $rules, array_flip( $excluded ));
+		return array_diff_key( $rules, array_flip( $excluded ) );
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	{
 		$rules = $this->getValidationRules( $request );
 		$errors = glsr( Validator::class )->validate( $request, $rules );
-		if( empty( $errors )) {
+		if( empty($errors) ) {
 			return true;
 		}
 		$this->setSessionValues( 'errors', $errors );
@@ -164,7 +164,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 );
 		}
@@ -175,8 +175,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 (consider adding the IP address to the blacklist):' );
 		$this->error = __( 'This review has been flagged as possible spam and cannot be submitted.', 'site-reviews' );
 	}
@@ -186,8 +186,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:' );
@@ -202,7 +202,7 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
 		if( $validated === true )return;
 		$this->setSessionValues( 'errors', [] );
@@ -217,8 +217,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' );
 	}
@@ -228,9 +228,9 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$status = $this->getRecaptchaStatus();
-		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ))return;
+		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ) )return;
 		if( $status == static::RECAPTCHA_EMPTY ) {
 			$this->setSessionValues( 'recaptcha', 'unset' );
 			$this->recaptchaIsUnset = true;
@@ -250,7 +250,7 @@ 
 	 */
 	protected function validateRequest( array $request )
 	{
-		if( !$this->isRequestValid( $request )) {
+		if( !$this->isRequestValid( $request ) ) {
 			$this->error = __( 'Please fix the submission errors.', 'site-reviews' );
 			return $request;
 		}

plugin/Modules/Session.php

Spacing +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
 	{
 		$cookieId = filter_input( INPUT_COOKIE, static::SESSION_COOKIE );
 		if( strpos( $cookieId, static::DELIMITER ) !== false ) {
-			$cookie = explode( static::DELIMITER, stripslashes( $cookieId ));
+			$cookie = explode( static::DELIMITER, stripslashes( $cookieId ) );
 			$this->sessionId = preg_replace( '/[^A-Za-z0-9_]/', '', $cookie[0] );
 			$this->expiryTimestamp = absint( $cookie[1] );
 			$this->expiryTimestampReset = absint( $cookie[2] );
@@ -77,7 +77,7 @@ 
 	 */
 	public function deleteExpiredSessions( $limit = 1000 )
 	{
-		if( $expiredSessions = implode( "','", $this->getExpiredSessions( $limit ))) {
+		if( $expiredSessions = implode( "','", $this->getExpiredSessions( $limit ) ) ) {
 			glsr( SqlQueries::class )->deleteExpiredSessions( $expiredSessions );
 		}
 	}
@@ -91,11 +91,11 @@ 
 	public function get( $key, $fallback = '', $unset = false )
 	{
 		$key = sanitize_key( $key );
-		$value = isset( $this->sessionData[$key] )
+		$value = isset($this->sessionData[$key])
 			? maybe_unserialize( $this->sessionData[$key] )
 			: $fallback;
-		if( isset( $this->sessionData[$key] ) && $unset ) {
-			unset( $this->sessionData[$key] );
+		if( isset($this->sessionData[$key]) && $unset ) {
+			unset($this->sessionData[$key]);
 			$this->updateSession();
 		}
 		return $value;
@@ -129,7 +129,7 @@ 
 	protected function deleteSession()
 	{
 		delete_option( $this->getSessionId() );
-		delete_option( $this->getSessionId( 'expires' ));
+		delete_option( $this->getSessionId( 'expires' ) );
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	protected function generateSessionId()
 	{
-		return md5(( new PasswordHash( 8, false ))->get_random_bytes( 32 ));
+		return md5( (new PasswordHash( 8, false ))->get_random_bytes( 32 ) );
 	}
 
 	/**
@@ -147,8 +147,8 @@ 
 	protected function getExpiredSessions( $limit )
 	{
 		$expiredSessions = [];
-		$sessions = glsr( SqlQueries::class )->getExpiredSessions( static::SESSION_COOKIE, absint( $limit ));
-		if( !empty( $sessions )) {
+		$sessions = glsr( SqlQueries::class )->getExpiredSessions( static::SESSION_COOKIE, absint( $limit ) );
+		if( !empty($sessions) ) {
 			$now = time();
 			foreach( $sessions as $session ) {
 				if( $now <= $session->expiration )continue;
@@ -165,7 +165,7 @@ 
 	 */
 	protected function getSessionId( $separator = '' )
 	{
-		return implode( '_', array_filter( [static::SESSION_COOKIE, $separator, $this->sessionId] ));
+		return implode( '_', array_filter( [static::SESSION_COOKIE, $separator, $this->sessionId] ) );
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 	{
 		if( headers_sent() )return;
 		$cookie = $this->sessionId.static::DELIMITER.$this->expiryTimestamp.static::DELIMITER.$this->expiryTimestampReset;
-		$cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' )));
+		$cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' ) ) );
 		setcookie( static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath );
 	}
 
@@ -214,7 +214,7 @@ 
 	 */
 	protected function updateSession()
 	{
-		if( false === get_option( $this->getSessionId() )) {
+		if( false === get_option( $this->getSessionId() ) ) {
 			return $this->createSession();
 		}
 		update_option( $this->getSessionId(), $this->sessionData, false );

plugin/Helper.php

Spacing +24 added lines, -24 removed lines

@@ -16,7 +16,7 @@ 
 	{
 		$className = $this->camelCase( $name );
 		$path = ltrim( str_replace( __NAMESPACE__, '', $path ), '\\' );
-		return !empty( $path )
+		return !empty($path)
 			? __NAMESPACE__.'\\'.$path.'\\'.$className
 			: $className;
 	}
@@ -28,7 +28,7 @@ 
 	 */
 	public function buildMethodName( $name, $prefix = '' )
 	{
-		return lcfirst( $prefix.$this->buildClassName( $name ));
+		return lcfirst( $prefix.$this->buildClassName( $name ) );
 	}
 
 	/**
@@ -37,7 +37,7 @@ 
 	 */
 	public function buildPropertyName( $name )
 	{
-		return lcfirst( $this->buildClassName( $name ));
+		return lcfirst( $this->buildClassName( $name ) );
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 	 */
 	public function camelCase( $string )
 	{
-		$string = ucwords( str_replace( ['-', '_'], ' ', trim( $string )));
+		$string = ucwords( str_replace( ['-', '_'], ' ', trim( $string ) ) );
 		return str_replace( ' ', '', $string );
 	}
 
@@ -78,7 +78,7 @@ 
 	 */
 	public function convertPathToId( $path, $prefix = '' )
 	{
-		return str_replace( ['[', ']'], ['-', ''], $this->convertPathToName( $path, $prefix ));
+		return str_replace( ['[', ']'], ['-', ''], $this->convertPathToName( $path, $prefix ) );
 	}
 
 	/**
@@ -89,7 +89,7 @@ 
 	{
 		$levels = explode( '.', $path );
 		return array_reduce( $levels, function( $result, $value ) {
-			return $result.= '['.$value.']';
+			return $result .= '['.$value.']';
 		}, $prefix );
 	}
 
@@ -100,7 +100,7 @@ 
 	 */
 	public function convertStringToArray( $string, $callback = null )
 	{
-		$array = array_map( 'trim', explode( ',', $string ));
+		$array = array_map( 'trim', explode( ',', $string ) );
 		return $callback
 			? array_filter( $array, $callback )
 			: array_filter( $array );
@@ -112,7 +112,7 @@ 
 	 */
 	public function dashCase( $string )
 	{
-		return str_replace( '_', '-', $this->snakeCase( $string ));
+		return str_replace( '_', '-', $this->snakeCase( $string ) );
 	}
 
 	/**
@@ -134,11 +134,11 @@ 
 	 */
 	public function filterInput( $key, array $request = [] )
 	{
-		if( isset( $request[$key] )) {
+		if( isset($request[$key]) ) {
 			return $request[$key];
 		}
 		$variable = filter_input( INPUT_POST, $key );
-		if( is_null( $variable ) && isset( $_POST[$key] )) {
+		if( is_null( $variable ) && isset($_POST[$key]) ) {
 			$variable = $_POST[$key];
 		}
 		return $variable;
@@ -151,7 +151,7 @@ 
 	public function filterInputArray( $key )
 	{
 		$variable = filter_input( INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
-		if( empty( $variable ) && !empty( $_POST[$key] ) && is_array( $_POST[$key] )) {
+		if( empty($variable) && !empty($_POST[$key]) && is_array( $_POST[$key] ) ) {
 			$variable = $_POST[$key];
 		}
 		return (array)$variable;
@@ -167,13 +167,13 @@ 
 		$result = [];
 		foreach( $array as $key => $value ) {
 			$newKey = ltrim( $prefix.'.'.$key, '.' );
-			if( $this->isIndexedFlatArray( $value )) {
+			if( $this->isIndexedFlatArray( $value ) ) {
 				if( $flattenValue ) {
 					$value = '['.implode( ', ', $value ).']';
 				}
 			}
-			else if( is_array( $value )) {
-				$result = array_merge( $result, $this->flattenArray( $value, $flattenValue, $newKey ));
+			else if( is_array( $value ) ) {
+				$result = array_merge( $result, $this->flattenArray( $value, $flattenValue, $newKey ) );
 				continue;
 			}
 			$result[$newKey] = $value;
@@ -195,7 +195,7 @@ 
 				Whip::IPV4 => $cloudflareIps['v4'],
 				Whip::IPV6 => $ipv6,
 			],
-		]))->getValidIpAddress();
+		] ))->getValidIpAddress();
 	}
 
 	/**
@@ -208,7 +208,7 @@ 
 	{
 		$keys = explode( '.', $path );
 		foreach( $keys as $key ) {
-			if( !isset( $values[$key] )) {
+			if( !isset($values[$key]) ) {
 				return $fallback;
 			}
 			$values = $values[$key];
@@ -223,14 +223,14 @@ 
 	 */
 	public function insertInArray( array $array, array $insert, $key, $position = 'before' )
 	{
-		$keyPosition = intval( array_search( $key, array_keys( $array )));
+		$keyPosition = intval( array_search( $key, array_keys( $array ) ) );
 		if( 'after' == $position ) {
 			$keyPosition++;
 		}
 		if( false !== $keyPosition ) {
 			$result = array_slice( $array, 0, $keyPosition );
 			$result = array_merge( $result, $insert );
-			return array_merge( $result, array_slice( $array, $keyPosition ));
+			return array_merge( $result, array_slice( $array, $keyPosition ) );
 		}
 		return array_merge( $array, $insert );
 	}
@@ -241,7 +241,7 @@ 
 	 */
 	public function isIndexedArray( $array )
 	{
-		if( !is_array( $array )) {
+		if( !is_array( $array ) ) {
 			return false;
 		}
 		$current = 0;
@@ -260,7 +260,7 @@ 
 	 */
 	public function isIndexedFlatArray( $array )
 	{
-		if( !is_array( $array ) || array_filter( $array, 'is_array' )) {
+		if( !is_array( $array ) || array_filter( $array, 'is_array' ) ) {
 			return false;
 		}
 		return $this->isIndexedArray( $array );
@@ -273,7 +273,7 @@ 
 	 */
 	public function prefixString( $string, $prefix = '' )
 	{
-		return $prefix.str_replace( $prefix, '', trim( $string ));
+		return $prefix.str_replace( $prefix, '', trim( $string ) );
 	}
 
 	/**
@@ -299,7 +299,7 @@ 
 	public function removePrefix( $prefix, $text )
 	{
 		return 0 === strpos( $text, $prefix )
-			? substr( $text, strlen( $prefix ))
+			? substr( $text, strlen( $prefix ) )
 			: $text;
 	}
 
@@ -330,7 +330,7 @@ 
 	 */
 	public function snakeCase( $string )
 	{
-		if( !ctype_lower( $string )) {
+		if( !ctype_lower( $string ) ) {
 			$string = preg_replace( '/\s+/u', '', $string );
 			$string = preg_replace( '/(.)(?=[A-Z])/u', '$1_', $string );
 			$string = function_exists( 'mb_strtolower' )
@@ -347,6 +347,6 @@ 
 	 */
 	public function startsWith( $needle, $haystack )
 	{
-		return substr( $haystack, 0, strlen( $needle )) === $needle;
+		return substr( $haystack, 0, strlen( $needle ) ) === $needle;
 	}
 }

plugin/Application.php

Spacing +13 added lines, -13 removed lines

@@ -33,7 +33,7 @@ 
 	public function __construct()
 	{
 		static::$instance = $this;
-		$this->file = realpath( trailingslashit( dirname( __DIR__ )).static::ID.'.php' );
+		$this->file = realpath( trailingslashit( dirname( __DIR__ ) ).static::ID.'.php' );
 		$plugin = get_file_data( $this->file, [
 			'languages' => 'Domain Path',
 			'name' => 'Plugin Name',
@@ -85,7 +85,7 @@ 
 	{
 		$constant = 'static::'.$property;
 		return defined( $constant )
-			? apply_filters( 'site-reviews/const/'.$property, constant( $constant ))
+			? apply_filters( 'site-reviews/const/'.$property, constant( $constant ) )
 			: '';
 	}
 
@@ -103,15 +103,15 @@ 
 	 */
 	public function file( $view )
 	{
-		$view.= '.php';
+		$view .= '.php';
 		$filePaths = [];
-		if( glsr( Helper::class )->startsWith( 'templates/', $view )) {
-			$filePaths[] = $this->themePath( glsr( Helper::class )->removePrefix( 'templates/', $view ));
+		if( glsr( Helper::class )->startsWith( 'templates/', $view ) ) {
+			$filePaths[] = $this->themePath( glsr( Helper::class )->removePrefix( 'templates/', $view ) );
 		}
 		$filePaths[] = $this->path( $view );
 		$filePaths[] = $this->path( 'views/'.$view );
 		foreach( $filePaths as $file ) {
-			if( !file_exists( $file ))continue;
+			if( !file_exists( $file ) )continue;
 			return $file;
 		}
 	}
@@ -121,7 +121,7 @@ 
 	 */
 	public function getDefaults()
 	{
-		if( empty( $this->defaults )) {
+		if( empty($this->defaults) ) {
 			$this->defaults = $this->make( DefaultsManager::class )->get();
 			$this->upgrade();
 		}
@@ -134,7 +134,7 @@ 
 	public function hasPermission()
 	{
 		$isAdmin = $this->isAdmin();
-		return !$isAdmin || ( $isAdmin && current_user_can( $this->constant( 'CAPABILITY' )));
+		return !$isAdmin || ($isAdmin && current_user_can( $this->constant( 'CAPABILITY' ) ));
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 		$types = apply_filters( 'site-reviews/addon/types', [] );
 		$this->reviewTypes = wp_parse_args( $types, [
 			'local' => __( 'Local', 'site-reviews' ),
-		]);
+		] );
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	{
 		$view = apply_filters( 'site-reviews/render/view', $view, $data );
 		$file = apply_filters( 'site-reviews/views/file', $this->file( $view ), $view, $data );
-		if( !file_exists( $file )) {
+		if( !file_exists( $file ) ) {
 			glsr_log()->error( 'File not found: '.$file );
 			return;
 		}
@@ -215,7 +215,7 @@ 
 	 */
 	public function scheduleCronJob()
 	{
-		if( wp_next_scheduled( static::CRON_EVENT ))return;
+		if( wp_next_scheduled( static::CRON_EVENT ) )return;
 		wp_schedule_event( time(), 'twicedaily', static::CRON_EVENT );
 	}
 
@@ -233,7 +233,7 @@ 
 	 */
 	public function unscheduleCronJob()
 	{
-		wp_unschedule_event( intval( wp_next_scheduled( static::CRON_EVENT )), static::CRON_EVENT );
+		wp_unschedule_event( intval( wp_next_scheduled( static::CRON_EVENT ) ), static::CRON_EVENT );
 	}
 
 	/**
@@ -265,7 +265,7 @@ 
 	 */
 	public function url( $path = '' )
 	{
-		$url = esc_url( plugin_dir_url( $this->file ).ltrim( trim( $path ), '/' ));
+		$url = esc_url( plugin_dir_url( $this->file ).ltrim( trim( $path ), '/' ) );
 		return apply_filters( 'site-reviews/url', $url, $path );
 	}
 }