pryley / site-reviews

plugin/Modules/Upgrader.php

Braces +6 added lines, -2 removed lines

@@ -20,7 +20,9 @@ 
 		$filenames = [];
 		$iterator = new DirectoryIterator( dirname( __FILE__ ).'/Upgrader' );
 		foreach( $iterator as $fileinfo ) {
-			if( !$fileinfo->isFile() )continue;
+			if( !$fileinfo->isFile() ) {
+				continue;
+			}
 			$filenames[] = $fileinfo->getFilename();
 		}
 		natsort( $filenames );
@@ -28,7 +30,9 @@ 
 			$className = str_replace( '.php', '', $file );
 			$version = str_replace( ['Upgrade_', '_'], ['', '.'], $className );
 			$versionSuffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions
-			if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ))return;
+			if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' )) {
+				return;
+			}
 			glsr( 'Modules\\Upgrader\\'.$className );
 			glsr_log()->info( 'Completed Upgrade for v'.$version.$versionSuffix );
 		});

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 			$className = str_replace( '.php', '', $file );
 			$version = str_replace( ['Upgrade_', '_'], ['', '.'], $className );
 			$versionSuffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions
-			if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ))return;
+			if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ) )return;
 			glsr( 'Modules\\Upgrader\\'.$className );
 			glsr_log()->info( 'Completed Upgrade for v'.$version.$versionSuffix );
 		});
@@ -41,7 +41,7 @@ 
 			$this->setReviewCounts();
 			$this->updateVersionFrom( $version );
 		}
-		else if( !glsr( OptionManager::class )->get( 'last_review_count', false )) {
+		else if( !glsr( OptionManager::class )->get( 'last_review_count', false ) ) {
 			$this->setReviewCounts();
 		}
 	}

plugin/Modules/Html/Attributes.php

Spacing +14 added lines, -14 removed lines

@@ -122,7 +122,7 @@ 
 	 */
 	protected function filterAttributes( array $allowedAttributeKeys )
 	{
-		return array_intersect_key( $this->attributes, array_flip( $allowedAttributeKeys ));
+		return array_intersect_key( $this->attributes, array_flip( $allowedAttributeKeys ) );
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 		$globalAttributes = $this->filterAttributes( static::GLOBAL_ATTRIBUTES );
 		$wildcards = [];
 		foreach( static::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard ) {
-			$newWildcards = array_filter( $this->attributes, function( $key ) use( $wildcard ) {
+			$newWildcards = array_filter( $this->attributes, function( $key ) use($wildcard) {
 				return glsr( Helper::class )->startsWith( $wildcard, $key );
 			}, ARRAY_FILTER_USE_KEY );
 			$wildcards = array_merge( $wildcards, $newWildcards );
@@ -147,7 +147,7 @@ 
 	protected function getPermanentAttributes()
 	{
 		$permanentAttributes = [];
-		if( array_key_exists( 'value', $this->attributes )) {
+		if( array_key_exists( 'value', $this->attributes ) ) {
 			$permanentAttributes['value'] = $this->attributes['value'];
 		}
 		return $permanentAttributes;
@@ -199,11 +199,11 @@ 
 	protected function normalizeBooleanAttributes()
 	{
 		foreach( $this->attributes as $key => $value ) {
-			if( $this->isAttributeKeyNumeric( $key, $value )) {
+			if( $this->isAttributeKeyNumeric( $key, $value ) ) {
 				$key = $value;
 				$value = true;
 			}
-			if( !in_array( $key, static::BOOLEAN_ATTRIBUTES ))continue;
+			if( !in_array( $key, static::BOOLEAN_ATTRIBUTES ) )continue;
 			$this->attributes[$key] = wp_validate_boolean( $value );
 		}
 	}
@@ -214,13 +214,13 @@ 
 	protected function normalizeDataAttributes()
 	{
 		foreach( $this->attributes as $key => $value ) {
-			if( $this->isAttributeKeyNumeric( $key, $value )) {
+			if( $this->isAttributeKeyNumeric( $key, $value ) ) {
 				$key = $value;
 				$value = '';
 			}
-			if( !glsr( Helper::class )->startsWith( 'data-', $key ))continue;
-			if( is_array( $value )) {
-				$value = json_encode( $value, JSON_HEX_APOS|JSON_NUMERIC_CHECK|JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE );
+			if( !glsr( Helper::class )->startsWith( 'data-', $key ) )continue;
+			if( is_array( $value ) ) {
+				$value = json_encode( $value, JSON_HEX_APOS | JSON_NUMERIC_CHECK | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE );
 			}
 			$this->attributes[$key] = $value;
 		}
@@ -232,7 +232,7 @@ 
 	protected function normalizeStringAttributes()
 	{
 		foreach( $this->attributes as $key => $value ) {
-			if( !is_string( $value ))continue;
+			if( !is_string( $value ) )continue;
 			$this->attributes[$key] = trim( $value );
 		}
 	}
@@ -245,7 +245,7 @@ 
 	{
 		if( $method != 'input' )return;
 		$attributes = wp_parse_args( $this->attributes, ['type' => ''] );
-		if( !in_array( $attributes['type'], static::INPUT_TYPES )) {
+		if( !in_array( $attributes['type'], static::INPUT_TYPES ) ) {
 			$this->attributes['type'] = 'text';
 		}
 	}
@@ -259,11 +259,11 @@ 
 		$permanentAttributes = $this->getPermanentAttributes();
 		foreach( $this->attributes as $key => $value ) {
 			if( in_array( $key, static::BOOLEAN_ATTRIBUTES ) && !$value ) {
-				unset( $attributes[$key] );
+				unset($attributes[$key]);
 			}
-			if( glsr( Helper::class )->startsWith( 'data-', $key )) {
+			if( glsr( Helper::class )->startsWith( 'data-', $key ) ) {
 				$permanentAttributes[$key] = $value;
-				unset( $attributes[$key] );
+				unset($attributes[$key]);
 			}
 		}
 		$this->attributes = array_merge( array_filter( $attributes ), $permanentAttributes );

Braces +12 added lines, -4 removed lines

@@ -203,7 +203,9 @@ 
 				$key = $value;
 				$value = true;
 			}
-			if( !in_array( $key, static::BOOLEAN_ATTRIBUTES ))continue;
+			if( !in_array( $key, static::BOOLEAN_ATTRIBUTES )) {
+				continue;
+			}
 			$this->attributes[$key] = wp_validate_boolean( $value );
 		}
 	}
@@ -218,7 +220,9 @@ 
 				$key = $value;
 				$value = '';
 			}
-			if( !glsr( Helper::class )->startsWith( 'data-', $key ))continue;
+			if( !glsr( Helper::class )->startsWith( 'data-', $key )) {
+				continue;
+			}
 			if( is_array( $value )) {
 				$value = json_encode( $value, JSON_HEX_APOS|JSON_NUMERIC_CHECK|JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE );
 			}
@@ -232,7 +236,9 @@ 
 	protected function normalizeStringAttributes()
 	{
 		foreach( $this->attributes as $key => $value ) {
-			if( !is_string( $value ))continue;
+			if( !is_string( $value )) {
+				continue;
+			}
 			$this->attributes[$key] = trim( $value );
 		}
 	}
@@ -243,7 +249,9 @@ 
 	 */
 	protected function normalizeInputType( $method )
 	{
-		if( $method != 'input' )return;
+		if( $method != 'input' ) {
+			return;
+		}
 		$attributes = wp_parse_args( $this->attributes, ['type' => ''] );
 		if( !in_array( $attributes['type'], static::INPUT_TYPES )) {
 			$this->attributes['type'] = 'text';

plugin/Modules/Upgrader/Upgrade_3_0_0.php

Spacing +6 added lines, -6 removed lines

@@ -74,9 +74,9 @@ 
 	{
 		$this->newSettings = $this->getNewSettings();
 		$this->oldSettings = $this->getOldSettings();
-		if( empty( $this->oldSettings ))return;
+		if( empty($this->oldSettings) )return;
 		foreach( static::MAPPED_SETTINGS as $old => $new ) {
-			if( empty( $this->oldSettings[$old] ))continue;
+			if( empty($this->oldSettings[$old]) )continue;
 			$this->newSettings[$new] = $this->oldSettings[$old];
 		}
 		$this->migrateNotificationSettings();
@@ -84,7 +84,7 @@ 
 		$this->migrateRequiredSettings();
 		$oldSettings = glsr( Helper::class )->convertDotNotationArray( $this->oldSettings );
 		$newSettings = glsr( Helper::class )->convertDotNotationArray( $this->newSettings );
-		if( isset( $oldSettings['settings']['strings'] ) && is_array( $oldSettings['settings']['strings'] )) {
+		if( isset($oldSettings['settings']['strings']) && is_array( $oldSettings['settings']['strings'] ) ) {
 			$newSettings['settings']['strings'] = $oldSettings['settings']['strings'];
 		}
 		glsr( OptionManager::class )->set( $newSettings );
@@ -117,8 +117,8 @@ 
 	protected function getOldSettings()
 	{
 		$defaults = array_fill_keys( array_keys( static::MAPPED_SETTINGS ), '' );
-		$settings = glsr( Helper::class )->flattenArray( get_option( 'geminilabs_site_reviews-v2', [] ));
-		if( !empty( $settings )) {
+		$settings = glsr( Helper::class )->flattenArray( get_option( 'geminilabs_site_reviews-v2', [] ) );
+		if( !empty($settings) ) {
 			$settings = wp_parse_args( $settings, $defaults );
 		}
 		return $settings;
@@ -151,7 +151,7 @@ 
 			'SecretKey' => $this->oldSettings['settings.reviews-form.recaptcha.secret'],
 			'SiteKey' => $this->oldSettings['settings.reviews-form.recaptcha.key'],
 		];
-		if( in_array( $this->oldSettings['settings.reviews-form.recaptcha.integration'], ['custom', 'invisible-recaptcha'] )) {
+		if( in_array( $this->oldSettings['settings.reviews-form.recaptcha.integration'], ['custom', 'invisible-recaptcha'] ) ) {
 			$this->newSettings['settings.submissions.recaptcha.integration'] = 'all';
 		}
 		if( $this->oldSettings['settings.reviews-form.recaptcha.integration'] == 'invisible-recaptcha' ) {

Braces +9 added lines, -3 removed lines

@@ -74,9 +74,13 @@ 
 	{
 		$this->newSettings = $this->getNewSettings();
 		$this->oldSettings = $this->getOldSettings();
-		if( empty( $this->oldSettings ))return;
+		if( empty( $this->oldSettings )) {
+			return;
+		}
 		foreach( static::MAPPED_SETTINGS as $old => $new ) {
-			if( empty( $this->oldSettings[$old] ))continue;
+			if( empty( $this->oldSettings[$old] )) {
+				continue;
+			}
 			$this->newSettings[$new] = $this->oldSettings[$old];
 		}
 		$this->migrateNotificationSettings();
@@ -136,7 +140,9 @@ 
 		];
 		$this->newSettings['settings.general.notifications'] = [];
 		foreach( $notifications as $old => $new ) {
-			if( $this->oldSettings['settings.general.notification'] != $old )continue;
+			if( $this->oldSettings['settings.general.notification'] != $old ) {
+				continue;
+			}
 			$this->newSettings['settings.general.notifications'][] = $new;
 		}
 	}

plugin/Shortcodes/SiteReviewsPopup.php

Spacing +23 added lines, -23 removed lines

@@ -13,15 +13,15 @@ 
 	public function fields()
 	{
 		return [[
-			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' )),
+			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' ) ),
 			'minWidth' => 320,
 			'type' => 'container',
-		],[
+		], [
 			'label' => esc_html__( 'Title', 'site-reviews' ),
 			'name' => 'title',
 			'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Count', 'site-reviews' ),
 			'maxLength' => 5,
 			'name' => 'count',
@@ -29,20 +29,20 @@ 
 			'text' => '10',
 			'tooltip' => __( 'How many reviews would you like to display (default: 10)?', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Rating', 'site-reviews' ),
 			'name' => 'rating',
 			'options' => [
-				'5' => esc_html( sprintf( _n( '%s star', '%s stars', 5, 'site-reviews' ), 5 )),
-				'4' => esc_html( sprintf( _n( '%s star', '%s stars', 4, 'site-reviews' ), 4 )),
-				'3' => esc_html( sprintf( _n( '%s star', '%s stars', 3, 'site-reviews' ), 3 )),
-				'2' => esc_html( sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 )),
-				'1' => esc_html( sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 )),
-				'0' => esc_html( __( 'Unrated', 'site-reviews' )),
+				'5' => esc_html( sprintf( _n( '%s star', '%s stars', 5, 'site-reviews' ), 5 ) ),
+				'4' => esc_html( sprintf( _n( '%s star', '%s stars', 4, 'site-reviews' ), 4 ) ),
+				'3' => esc_html( sprintf( _n( '%s star', '%s stars', 3, 'site-reviews' ), 3 ) ),
+				'2' => esc_html( sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 ) ),
+				'1' => esc_html( sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 ) ),
+				'0' => esc_html( __( 'Unrated', 'site-reviews' ) ),
 			],
 			'tooltip' => __( 'What is the minimum rating to display (default: 1 star)?', 'site-reviews' ),
 			'type' => 'listbox',
-		],[
+		], [
 			'label' => esc_html__( 'Pagination', 'site-reviews' ),
 			'name' => 'pagination',
 			'options' => [
@@ -60,7 +60,7 @@ 
 			'name' => 'assigned_to',
 			'tooltip' => __( 'Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Schema', 'site-reviews' ),
 			'name' => 'schema',
 			'options' => [
@@ -69,49 +69,49 @@ 
 			],
 			'tooltip' => __( 'Rich snippets are disabled by default.', 'site-reviews' ),
 			'type' => 'listbox',
-		],[
+		], [
 			'label' => esc_html__( 'Classes', 'site-reviews' ),
 			'name' => 'class',
 			'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'columns' => 2,
 			'items' => [[
 				'name' => 'hide_assigned_to',
 				'text' => esc_html__( 'Assigned To', 'site-reviews' ),
 				'tooltip' => __( 'Hide the assigned to link?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_author',
 				'text' => esc_html__( 'Author', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review author?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_avatar',
 				'text' => esc_html__( 'Avatar', 'site-reviews' ),
 				'tooltip' => __( 'Hide the reviewer avatar if shown?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_content',
 				'text' => esc_html__( 'Content', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review content?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_date',
 				'text' => esc_html__( 'Date', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review date?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_rating',
 				'text' => esc_html__( 'Rating', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review rating?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_response',
 				'text' => esc_html__( 'Response', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review response?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_title',
 				'text' => esc_html__( 'Title', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review title?', 'site-reviews' ),
@@ -121,7 +121,7 @@ 
 			'label' => esc_html__( 'Hide', 'site-reviews' ),
 			'spacing' => 5,
 			'type' => 'container',
-		],[
+		], [
 			'hidden' => true,
 			'name' => 'id',
 			'type' => 'textbox',
@@ -134,7 +134,7 @@ 
 	public function getTerms()
 	{
 		$terms = glsr( Database::class )->getTerms();
-		if( empty( $terms )) {
+		if( empty($terms) ) {
 			return [];
 		}
 		return [

plugin/Shortcodes/SiteReviewsFormPopup.php

Spacing +11 added lines, -11 removed lines

@@ -15,12 +15,12 @@ 
 		return [[
 			'type' => 'container',
 			'html' => '<p class="strong">'.esc_html__( 'All settings are optional.', 'site-reviews' ).'</p>',
-		],[
+		], [
 			'label' => esc_html__( 'Title', 'site-reviews' ),
 			'name' => 'title',
 			'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Description', 'site-reviews' ),
 			'minHeight' => 60,
 			'minWidth' => 240,
@@ -35,39 +35,39 @@ 
 			'name' => 'assign_to',
 			'tooltip' => __( 'Assign submitted reviews to a custom page/post ID. You can also enter "post_id" to assign reviews to the ID of the current page.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Classes', 'site-reviews' ),
 			'name' => 'class',
 			'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'columns' => 2,
 			'items' => [[
 				'name' => 'hide_content',
 				'text' => esc_html__( 'Content', 'site-reviews' ),
 				'tooltip' => __( 'Hide the content field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_email',
 				'text' => esc_html__( 'Email', 'site-reviews' ),
 				'tooltip' => __( 'Hide the email field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_name',
 				'text' => esc_html__( 'Name', 'site-reviews' ),
 				'tooltip' => __( 'Hide the name field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_rating',
 				'text' => esc_html__( 'Rating', 'site-reviews' ),
 				'tooltip' => __( 'Hide the rating field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_terms',
 				'text' => esc_html__( 'Terms', 'site-reviews' ),
 				'tooltip' => __( 'Hide the terms field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_title',
 				'text' => esc_html__( 'Title', 'site-reviews' ),
 				'tooltip' => __( 'Hide the title field?', 'site-reviews' ),
@@ -77,7 +77,7 @@ 
 			'layout' => 'grid',
 			'spacing' => 5,
 			'type' => 'container',
-		],[
+		], [
 			'hidden' => true,
 			'name' => 'id',
 			'type' => 'textbox',
@@ -90,7 +90,7 @@ 
 	public function getTerms()
 	{
 		$terms = glsr( Database::class )->getTerms();
-		if( empty( $terms )) {
+		if( empty($terms) ) {
 			return [];
 		}
 		return [

plugin/Shortcodes/SiteReviewsSummaryPopup.php

Spacing +9 added lines, -9 removed lines

@@ -12,10 +12,10 @@ 
 	public function fields()
 	{
 		return [[
-			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' )),
+			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' ) ),
 			'minWidth' => 320,
 			'type' => 'container',
-		],[
+		], [
 			'label' => esc_html__( 'Title', 'site-reviews' ),
 			'name' => 'title',
 			'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
@@ -28,7 +28,7 @@ 
 			'name' => 'assigned_to',
 			'tooltip' => __( 'Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Schema', 'site-reviews' ),
 			'name' => 'schema',
 			'options' => [
@@ -37,34 +37,34 @@ 
 			],
 			'tooltip' => __( 'Rich snippets are disabled by default.', 'site-reviews' ),
 			'type' => 'listbox',
-		],[
+		], [
 			'label' => esc_html__( 'Classes', 'site-reviews' ),
 			'name' => 'class',
 			'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'columns' => 2,
 			'items' => [[
 				'type' => 'checkbox',
 				'name' => 'hide_bars',
 				'text' => esc_html__( 'Bars', 'site-reviews' ),
 				'tooltip' => __( 'Hide the percentage bars?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_if_empty',
 				'text' => esc_html__( 'If Empty', 'site-reviews' ),
 				'tooltip' => __( 'Hide the summary if no reviews are found?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_rating',
 				'text' => esc_html__( 'Rating', 'site-reviews' ),
 				'tooltip' => __( 'Hide the rating?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_stars',
 				'text' => esc_html__( 'Stars', 'site-reviews' ),
 				'tooltip' => __( 'Hide the stars?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_summary',
 				'text' => esc_html__( 'Summary', 'site-reviews' ),

plugin/Modules/Validator/ValidateReview.php

Braces +30 added lines, -10 removed lines

@@ -175,8 +175,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' );
 	}
@@ -186,8 +190,12 @@ 
 	 */
 	protected function validateBlacklist()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( !glsr( Blacklist::class )->isBlacklisted( $this->request )) {
+			return;
+		}
 		$blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'reject' ) {
 			$this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
@@ -202,9 +210,13 @@ 
 	 */
 	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;
+		if( $validated === true ) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [] );
 		$this->setSessionValues( 'values', $this->request );
 		$this->error = is_string( $validated )
@@ -217,8 +229,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' );
 	}
@@ -228,9 +244,13 @@ 
 	 */
 	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;

Spacing +23 added lines, -23 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:' );
 		$this->error = __( 'Your review cannot be submitted at this time. Please try again later.', '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,11 +250,11 @@ 
 	 */
 	protected function validateRequest( array $request )
 	{
-		if( !$this->isRequestValid( $request )) {
+		if( !$this->isRequestValid( $request ) ) {
 			$this->error = __( 'Please fix the submission errors.', 'site-reviews' );
 			return $request;
 		}
-		if( empty( $request['title'] )) {
+		if( empty($request['title']) ) {
 			$request['title'] = __( 'No Title', 'site-reviews' );
 		}
 		return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request );

plugin/Handlers/RegisterTinymcePopups.php

Spacing +3 added lines, -3 removed lines

@@ -14,14 +14,14 @@
 	{
 		foreach( $command->popups as $slug => $label ) {
 			$buttonClass = glsr( Helper::class )->buildClassName( $slug.'-popup', 'Shortcodes' );
-			if( !class_exists( $buttonClass )) {
-				glsr_log()->error( sprintf( 'Class missing (%s)', $buttonClass ));
+			if( !class_exists( $buttonClass ) ) {
+				glsr_log()->error( sprintf( 'Class missing (%s)', $buttonClass ) );
 				continue;
 			}
 			$shortcode = glsr( $buttonClass )->register( $slug, [
 				'label' => $label,
 				'title' => $label,
-			]);
+			] );
 			glsr()->mceShortcodes[$slug] = $shortcode->properties;
 		}
 	}

plugin/Helper.php

Braces +5 added lines, -2 removed lines

@@ -261,7 +261,9 @@ 
 	{
 		$result = [];
 		foreach( $array as $key => $value ) {
-			if( !$value )continue;
+			if( !$value ) {
+				continue;
+			}
 			$result[$key] = is_array( $value )
 				? $this->removeEmptyArrayValues( $value )
 				: $value;
@@ -274,7 +276,8 @@ 
 	 * @param string $text
 	 * @return string
 	 */
-	public function removePrefix( $prefix, $text ) {
+	public function removePrefix( $prefix, $text )
+	{
 		return 0 === strpos( $text, $prefix )
 			? substr( $text, strlen( $prefix ))
 			: $text;

Spacing +22 added lines, -22 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];
@@ -222,7 +222,7 @@ 
 	 */
 	public function isIndexedArray( $array )
 	{
-		if( !is_array( $array )) {
+		if( !is_array( $array ) ) {
 			return false;
 		}
 		$current = 0;
@@ -241,7 +241,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 );
@@ -254,7 +254,7 @@ 
 	 */
 	public function prefixString( $string, $prefix = '' )
 	{
-		return $prefix.str_replace( $prefix, '', trim( $string ));
+		return $prefix.str_replace( $prefix, '', trim( $string ) );
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 */
 	public function removePrefix( $prefix, $text ) {
 		return 0 === strpos( $text, $prefix )
-			? substr( $text, strlen( $prefix ))
+			? substr( $text, strlen( $prefix ) )
 			: $text;
 	}
 
@@ -310,7 +310,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' )
@@ -327,6 +327,6 @@ 
 	 */
 	public function startsWith( $needle, $haystack )
 	{
-		return substr( $haystack, 0, strlen( $needle )) === $needle;
+		return substr( $haystack, 0, strlen( $needle ) ) === $needle;
 	}
 }