pryley / site-reviews

plugin/Handlers/CreateReview.php

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
 		}
 		glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ));
 		glsr( Notification::class )->send( $review );
-		if( $command->ajax_request )return;
+		if( $command->ajax_request ) {
+			return;
+		}
 		wp_safe_redirect( $this->getReferer( $command ));
 		exit;
 	}

Spacing +6 added lines, -6 removed lines

@@ -17,13 +17,13 @@ 
 		$review = glsr( ReviewManager::class )->create( $command );
 		if( !$review ) {
 			glsr( Session::class )->set( $command->form_id.'errors', [] );
-			glsr( Session::class )->set( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' ));
+			glsr( Session::class )->set( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' ) );
 			return;
 		}
-		glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ));
+		glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ) );
 		glsr( Notification::class )->send( $review );
 		if( $command->ajax_request )return;
-		wp_safe_redirect( $this->getReferer( $command ));
+		wp_safe_redirect( $this->getReferer( $command ) );
 		exit;
 	}
 
@@ -32,12 +32,12 @@ 
 	 */
 	protected function getReferer( Command $command )
 	{
-		$referer = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true )));
+		$referer = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ) ) );
 		$referer = apply_filters( 'site-reviews/review/redirect', $referer, $command );
-		if( empty( $referer )) {
+		if( empty($referer) ) {
 			$referer = $command->referer;
 		}
-		if( empty( $referer )) {
+		if( empty($referer) ) {
 			glsr_log()->warning( 'The form referer ($_SERVER[REQUEST_URI]) was empty.' )->debug( $command );
 			$referer = home_url();
 		}

plugin/Modules/Html/Form.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	{
 		$fields = [];
 		foreach( glsr()->config( 'forms/'.$id ) as $name => $field ) {
-			$fields[] = new Field( wp_parse_args( $field, ['name' => $name] ));
+			$fields[] = new Field( wp_parse_args( $field, ['name' => $name] ) );
 		}
 		return $fields;
 	}

views/partials/translations/single.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 			<p>{{ data.s1 }}</p>
 		</div>
 		<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>
 	</td>
 	<td class="glsr-string-td2">

views/partials/translations/plural.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 			<p>{{ data.p1 }}</p>
 		</div>
 		<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>
 	</td>
 	<td class="glsr-string-td2">

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/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/Router.php

Braces +15 added lines, -5 removed lines

@@ -17,7 +17,9 @@ 
 	public function routeAdminPostRequest()
 	{
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request )) {
+			return;
+		}
 		check_admin_referer( $request['_action'] );
 		$this->routeRequest( 'admin', $request['_action'], $request );
 	}
@@ -39,10 +41,16 @@ 
 	 */
 	public function routePublicPostRequest()
 	{
-		if( is_admin() )return;
+		if( is_admin() ) {
+			return;
+		}
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
-		if( !$this->isValidPublicNonce( $request ))return;
+		if( !$this->isValidPostRequest( $request )) {
+			return;
+		}
+		if( !$this->isValidPublicNonce( $request )) {
+			return;
+		}
 		$this->routeRequest( 'public', $request['_action'], $request );
 	}
 
@@ -51,7 +59,9 @@ 
 	 */
 	protected function checkAjaxNonce( array $request )
 	{
-		if( !is_user_logged_in() )return;
+		if( !is_user_logged_in() ) {
+			return;
+		}
 		if( !isset( $request['_nonce'] )) {
 			$this->sendAjaxError( 'request is missing a nonce', $request );
 		}

Spacing +13 added lines, -13 removed lines

@@ -17,7 +17,7 @@ 
 	public function routeAdminPostRequest()
 	{
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request ) )return;
 		check_admin_referer( $request['_action'] );
 		$this->routeRequest( 'admin', $request['_action'], $request );
 	}
@@ -41,8 +41,8 @@ 
 	{
 		if( is_admin() )return;
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
-		if( !$this->isValidPublicNonce( $request ))return;
+		if( !$this->isValidPostRequest( $request ) )return;
+		if( !$this->isValidPublicNonce( $request ) )return;
 		$this->routeRequest( 'public', $request['_action'], $request );
 	}
 
@@ -52,10 +52,10 @@ 
 	protected function checkAjaxNonce( array $request )
 	{
 		if( !is_user_logged_in() )return;
-		if( !isset( $request['_nonce'] )) {
+		if( !isset($request['_nonce']) ) {
 			$this->sendAjaxError( 'request is missing a nonce', $request );
 		}
-		if( !wp_verify_nonce( $request['_nonce'], $request['_action'] )) {
+		if( !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) {
 			$this->sendAjaxError( 'request failed the nonce check', $request, 403 );
 		}
 	}
@@ -65,10 +65,10 @@ 
 	 */
 	protected function checkAjaxRequest( array $request )
 	{
-		if( !isset( $request['_action'] )) {
+		if( !isset($request['_action']) ) {
 			$this->sendAjaxError( 'request must include an action', $request );
 		}
-		if( empty( $request['_ajax_request'] )) {
+		if( empty($request['_ajax_request']) ) {
 			$this->sendAjaxError( 'request is invalid', $request );
 		}
 	}
@@ -95,7 +95,7 @@ 
 	 */
 	protected function isValidPostRequest( array $request = [] )
 	{
-		return !empty( $request['_action'] ) && empty( $request['_ajax_request'] );
+		return !empty($request['_action']) && empty($request['_ajax_request']);
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	protected function isValidPublicNonce( array $request )
 	{
-		if( is_user_logged_in() && !wp_verify_nonce( $request['_nonce'], $request['_action'] )) {
+		if( is_user_logged_in() && !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) {
 			glsr_log()->error( 'nonce check failed for public request' )->debug( $request );
 			return false;
 		}
@@ -118,11 +118,11 @@ 
 	protected function routeRequest( $type, $action, array $request = [] )
 	{
 		$actionHook = 'site-reviews/route/'.$type.'/request';
-		$controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' ));
+		$controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' ) );
 		$method = glsr( Helper::class )->buildMethodName( $action, 'router' );
 		$request = apply_filters( 'site-reviews/route/request', $request, $action, $type );
 		do_action( $actionHook, $action, $request );
-		if( is_callable( [$controller, $method] )) {
+		if( is_callable( [$controller, $method] ) ) {
 			call_user_func( [$controller, $method], $request );
 			return;
 		}
@@ -140,10 +140,10 @@ 
 	{
 		glsr_log()->error( $error )->debug( $request );
 		glsr( Notice::class )->addError( __( 'There was an error (try refreshing the page).', 'site-reviews' ).' <code>'.$error.'</code>' );
-		wp_send_json_error([
+		wp_send_json_error( [
 			'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ),
 			'notices' => glsr( Notice::class )->get(),
 			'error' => $error,
-		]);
+		] );
 	}
 }