pryley / site-reviews

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

plugin/Modules/Style.php

Spacing +7 added lines, -7 removed lines

@@ -50,12 +50,12 @@ 
 			'templates/form/submit-button',
 			'templates/reviews-form',
 		];
-		if( !preg_match( '('.implode( '|', $styledViews ).')', $view )) {
+		if( !preg_match( '('.implode( '|', $styledViews ).')', $view ) ) {
 			return $view;
 		}
 		$views = $this->generatePossibleViews( $view );
 		foreach( $views as $possibleView ) {
-			if( !file_exists( glsr()->file( $possibleView )))continue;
+			if( !file_exists( glsr()->file( $possibleView ) ) )continue;
 			return glsr( Helper::class )->removePrefix( 'views/', $possibleView );
 		}
 		return $view;
@@ -88,7 +88,7 @@ 
 	 */
 	public function modifyField( Builder $instance )
 	{
-		if( !$this->isPublicInstance( $instance ) || empty( array_filter( $this->fields )))return;
+		if( !$this->isPublicInstance( $instance ) || empty(array_filter( $this->fields )) )return;
 		call_user_func_array( [$this, 'customize'], [&$instance] );
 	}
 
@@ -105,10 +105,10 @@ 
 	 */
 	protected function customize( Builder $instance )
 	{
-		if( !array_key_exists( $instance->tag, $this->fields ))return;
-		$args = wp_parse_args( $instance->args, array_fill_keys( ['class', 'type'], '' ));
+		if( !array_key_exists( $instance->tag, $this->fields ) )return;
+		$args = wp_parse_args( $instance->args, array_fill_keys( ['class', 'type'], '' ) );
 		$key = $instance->tag.'_'.$args['type'];
-		$classes = !isset( $this->fields[$key] )
+		$classes = !isset($this->fields[$key])
 			? $this->fields[$instance->tag]
 			: $this->fields[$key];
 		$instance->args['class'] = trim( $args['class'].' '.$classes );
@@ -142,7 +142,7 @@ 
 		$args = wp_parse_args( $instance->args, [
 			'is_public' => false,
 			'is_raw' => false,
-		]);
+		] );
 		if( is_admin() || !$args['is_public'] || $args['is_raw'] ) {
 			return false;
 		}

Braces +9 added lines, -3 removed lines

@@ -55,7 +55,9 @@ 
 		}
 		$views = $this->generatePossibleViews( $view );
 		foreach( $views as $possibleView ) {
-			if( !file_exists( glsr()->file( $possibleView )))continue;
+			if( !file_exists( glsr()->file( $possibleView ))) {
+				continue;
+			}
 			return glsr( Helper::class )->removePrefix( 'views/', $possibleView );
 		}
 		return $view;
@@ -88,7 +90,9 @@ 
 	 */
 	public function modifyField( Builder $instance )
 	{
-		if( !$this->isPublicInstance( $instance ) || empty( array_filter( $this->fields )))return;
+		if( !$this->isPublicInstance( $instance ) || empty( array_filter( $this->fields ))) {
+			return;
+		}
 		call_user_func_array( [$this, 'customize'], [&$instance] );
 	}
 
@@ -105,7 +109,9 @@ 
 	 */
 	protected function customize( Builder $instance )
 	{
-		if( !array_key_exists( $instance->tag, $this->fields ))return;
+		if( !array_key_exists( $instance->tag, $this->fields )) {
+			return;
+		}
 		$args = wp_parse_args( $instance->args, array_fill_keys( ['class', 'type'], '' ));
 		$key = $instance->tag.'_'.$args['type'];
 		$classes = !isset( $this->fields[$key] )

plugin/Controllers/AdminController.php

Spacing +26 added lines, -26 removed lines

@@ -24,7 +24,7 @@ 
 	 */
 	public function enqueueAssets()
 	{
-		$command = new EnqueueAdminAssets([
+		$command = new EnqueueAdminAssets( [
 			'pointers' => [[
 				'content' => __( 'You can pin exceptional reviews so that they are always shown first.', 'site-reviews' ),
 				'id' => 'glsr-pointer-pinned',
@@ -36,7 +36,7 @@ 
 				'target' => '#misc-pub-pinned',
 				'title' => __( 'Pin Your Reviews', 'site-reviews' ),
 			]],
-		]);
+		] );
 		$this->execute( $command );
 	}
 
@@ -48,7 +48,7 @@ 
 	{
 		$links['settings'] = glsr( Builder::class )->a( __( 'Settings', 'site-reviews' ), [
 			'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=settings' ),
-		]);
+		] );
 		return $links;
 	}
 
@@ -60,20 +60,20 @@ 
 	public function filterDashboardGlanceItems( $items )
 	{
 		$postCount = wp_count_posts( Application::POST_TYPE );
-		if( empty( $postCount->publish )) {
+		if( empty($postCount->publish) ) {
 			return $items;
 		}
 		$text = _n( '%s Review', '%s Reviews', $postCount->publish, 'site-reviews' );
-		$text = sprintf( $text, number_format_i18n( $postCount->publish ));
+		$text = sprintf( $text, number_format_i18n( $postCount->publish ) );
 		$items = glsr( Helper::class )->consolidateArray( $items );
 		$items[] = current_user_can( get_post_type_object( Application::POST_TYPE )->cap->edit_posts )
 			? glsr( Builder::class )->a( $text, [
 				'class' => 'glsr-review-count',
 				'href' => 'edit.php?post_type='.Application::POST_TYPE,
-			])
+			] )
 			: glsr( Builder::class )->span( $text, [
 				'class' => 'glsr-review-count',
-			]);
+			] );
 		return $items;
 	}
 
@@ -84,7 +84,7 @@ 
 	 */
 	public function filterTinymcePlugins( $plugins )
 	{
-		if( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' )) {
+		if( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) {
 			$plugins = glsr( Helper::class )->consolidateArray( $plugins );
 			$plugins['glsr_shortcode'] = glsr()->url( 'assets/scripts/mce-plugin.js' );
 		}
@@ -97,11 +97,11 @@ 
 	 */
 	public function registerTinymcePopups()
 	{
-		$command = new RegisterTinymcePopups([
+		$command = new RegisterTinymcePopups( [
 			'site_reviews' => esc_html__( 'Recent Reviews', 'site-reviews' ),
 			'site_reviews_form' => esc_html__( 'Submit a Review', 'site-reviews' ),
 			'site_reviews_summary' => esc_html__( 'Summary of Reviews', 'site-reviews' ),
-		]);
+		] );
 		$this->execute( $command );
 	}
 
@@ -113,15 +113,15 @@ 
 	public function renderTinymceButton( $editorId )
 	{
 		$allowedEditors = apply_filters( 'site-reviews/tinymce/editor-ids', ['content'], $editorId );
-		if( glsr_current_screen()->base != 'post' || !in_array( $editorId, $allowedEditors ))return;
+		if( glsr_current_screen()->base != 'post' || !in_array( $editorId, $allowedEditors ) )return;
 		$shortcodes = [];
 		foreach( glsr()->mceShortcodes as $shortcode => $values ) {
 			$shortcodes[$shortcode] = $values;
 		}
-		if( empty( $shortcodes ))return;
+		if( empty($shortcodes) )return;
 		glsr()->render( 'partials/editor/tinymce', [
 			'shortcodes' => $shortcodes,
-		]);
+		] );
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	public function routerClearConsole()
 	{
 		glsr( Console::class )->clear();
-		glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ));
+		glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ) );
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 */
 	public function routerFetchConsole()
 	{
-		glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ));
+		glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ) );
 	}
 
 	/**
@@ -157,13 +157,13 @@ 
 		}
 		$postIds = glsr( SqlQueries::class )->getReviewsMeta( 'assigned_to' );
 		foreach( $postIds as $postId ) {
-			$countManager->setPostCounts( $postId, $countManager->buildPostCounts( $postId ));
+			$countManager->setPostCounts( $postId, $countManager->buildPostCounts( $postId ) );
 		}
 		$countManager->setCounts( $countManager->buildCounts() );
 		if( $showNotice ) {
-			glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ));
+			glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ) );
 		}
-		glsr( OptionManager::class )->set( 'last_review_count', current_time( 'timestamp' ));
+		glsr( OptionManager::class )->set( 'last_review_count', current_time( 'timestamp' ) );
 	}
 
 	/**
@@ -197,17 +197,17 @@ 
 	{
 		$file = $_FILES['import-file'];
 		if( $file['error'] !== UPLOAD_ERR_OK ) {
-			return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ));
+			return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ) );
 		}
-		if( $file['type'] !== 'application/json' || !glsr( Helper::class )->endsWith( '.json', $file['name'] )) {
-			return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ));
+		if( $file['type'] !== 'application/json' || !glsr( Helper::class )->endsWith( '.json', $file['name'] ) ) {
+			return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ) );
 		}
 		$settings = json_decode( file_get_contents( $file['tmp_name'] ), true );
-		if( empty( $settings )) {
-			return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ));
+		if( empty($settings) ) {
+			return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ) );
 		}
-		glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ));
-		glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ));
+		glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ) );
+		glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ) );
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 			UPLOAD_ERR_CANT_WRITE => __( 'Failed to write file to disk.', 'site-reviews' ),
 			UPLOAD_ERR_EXTENSION => __( 'A PHP extension stopped the file upload.', 'site-reviews' ),
 		];
-		return !isset( $errors[$errorCode] )
+		return !isset($errors[$errorCode])
 			? __( 'Unknown upload error.', 'site-reviews' )
 			: $errors[$errorCode];
 	}

plugin/Handlers/CreateReview.php

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.' )->info( $command );
 			$referer = home_url();
 		}

helpers.php

Spacing +13 added lines, -13 removed lines

@@ -20,8 +20,8 @@ 
 		'glsr_log',
 		'glsr_star_rating',
 	);
-	if( !in_array( $hook, $hooks ) || !function_exists( $hook ))return;
-	add_filter( $hook, function() use( $hook, $args ) {
+	if( !in_array( $hook, $hooks ) || !function_exists( $hook ) )return;
+	add_filter( $hook, function() use($hook, $args) {
 		array_shift( $args ); // remove the fallback value
 		return call_user_func_array( $hook, $args );
 	});
@@ -32,7 +32,7 @@ 
  */
 function glsr( $alias = null ) {
 	$app = \GeminiLabs\SiteReviews\Application::load();
-	return !empty( $alias )
+	return !empty($alias)
 		? $app->make( $alias )
 		: $app;
 }
@@ -46,7 +46,7 @@ 
 	$result = array();
 	foreach( $array as $subarray ) {
 		$subarray = (array)$subarray;
-		if( !isset( $subarray[$column] ))continue;
+		if( !isset($subarray[$column]) )continue;
 		$result[] = $subarray[$column];
 	}
 	return $result;
@@ -57,14 +57,14 @@ 
  */
 function glsr_calculate_ratings() {
 	glsr( 'Controllers\AdminController' )->routerCountReviews( false );
-	glsr_log()->info( __( 'Recalculated rating counts.', 'site-reviews' ));
+	glsr_log()->info( __( 'Recalculated rating counts.', 'site-reviews' ) );
 }
 
 /**
  * @return \GeminiLabs\SiteReviews\Review|false
  */
 function glsr_create_review( $reviewValues = array() ) {
-	if( !is_array( $reviewValues )) {
+	if( !is_array( $reviewValues ) ) {
 		$reviewValues = array();
 	}
 	$review = new \GeminiLabs\SiteReviews\Commands\CreateReview( $reviewValues );
@@ -75,10 +75,10 @@ 
  * @return \WP_Screen|object
  */
 function glsr_current_screen() {
-	if( function_exists( 'get_current_screen' )) {
+	if( function_exists( 'get_current_screen' ) ) {
 		$screen = get_current_screen();
 	}
-	return empty( $screen )
+	return empty($screen)
 		? (object)array_fill_keys( ['base', 'id', 'post_type'], null )
 		: $screen;
 }
@@ -125,10 +125,10 @@ 
  */
 function glsr_get_review( $post_id ) {
 	$post = null;
-	if( is_numeric( $post_id )) {
+	if( is_numeric( $post_id ) ) {
 		$post = get_post( $post_id );
 	}
-	if( !( $post instanceof WP_Post )) {
+	if( !($post instanceof WP_Post) ) {
 		$post = new WP_Post( (object)[] );
 	}
 	return glsr( 'Database\ReviewManager' )->single( $post );
@@ -138,7 +138,7 @@ 
  * @return array
  */
 function glsr_get_reviews( $args = array() ) {
-	if( !is_array( $args )) {
+	if( !is_array( $args ) ) {
 		$args = [];
 	}
 	return glsr( 'Database\ReviewManager' )->get( $args );
@@ -149,11 +149,11 @@ 
  */
 function glsr_log() {
 	$args = func_get_args();
-	$context = isset( $args[1] )
+	$context = isset($args[1])
 		? $args[1]
 		: [];
 	$console = glsr( 'Modules\Console' );
-	return !empty( $args )
+	return !empty($args)
 		? $console->log( 'debug', $args[0], $context )
 		: $console;
 }

Braces +30 added lines, -14 removed lines

@@ -20,7 +20,9 @@ 
 		'glsr_log',
 		'glsr_star_rating',
 	);
-	if( !in_array( $hook, $hooks ) || !function_exists( $hook ))return;
+	if( !in_array( $hook, $hooks ) || !function_exists( $hook )) {
+		return;
+	}
 	add_filter( $hook, function() use( $hook, $args ) {
 		array_shift( $args ); // remove the fallback value
 		return call_user_func_array( $hook, $args );
@@ -30,7 +32,8 @@ 
 /**
  * @return mixed
  */
-function glsr( $alias = null ) {
+function glsr( $alias = null )
+{
 	$app = \GeminiLabs\SiteReviews\Application::load();
 	return !empty( $alias )
 		? $app->make( $alias )
@@ -42,11 +45,14 @@ 
  * @param $column string
  * @return array
  */
-function glsr_array_column( array $array, $column ) {
+function glsr_array_column( array $array, $column )
+{
 	$result = array();
 	foreach( $array as $subarray ) {
 		$subarray = (array)$subarray;
-		if( !isset( $subarray[$column] ))continue;
+		if( !isset( $subarray[$column] )) {
+			continue;
+		}
 		$result[] = $subarray[$column];
 	}
 	return $result;
@@ -55,7 +61,8 @@ 
 /**
  * @return void
  */
-function glsr_calculate_ratings() {
+function glsr_calculate_ratings()
+{
 	glsr( 'Controllers\AdminController' )->routerCountReviews( false );
 	glsr_log()->info( __( 'Recalculated rating counts.', 'site-reviews' ));
 }
@@ -63,7 +70,8 @@ 
 /**
  * @return \GeminiLabs\SiteReviews\Review|false
  */
-function glsr_create_review( $reviewValues = array() ) {
+function glsr_create_review( $reviewValues = array() )
+{
 	if( !is_array( $reviewValues )) {
 		$reviewValues = array();
 	}
@@ -74,7 +82,8 @@ 
 /**
  * @return \WP_Screen|object
  */
-function glsr_current_screen() {
+function glsr_current_screen()
+{
 	if( function_exists( 'get_current_screen' )) {
 		$screen = get_current_screen();
 	}
@@ -87,7 +96,8 @@ 
  * @param mixed ...$vars
  * @return void
  */
-function glsr_debug( ...$vars ) {
+function glsr_debug( ...$vars )
+{
 	if( count( $vars ) == 1 ) {
 		$value = htmlspecialchars( print_r( $vars[0], true ), ENT_QUOTES, 'UTF-8' );
 		printf( '<div class="glsr-debug"><pre>%s</pre></div>', $value );
@@ -106,7 +116,8 @@ 
  * @param mixed $fallback
  * @return string|array
  */
-function glsr_get_option( $path = '', $fallback = '' ) {
+function glsr_get_option( $path = '', $fallback = '' )
+{
 	return is_string( $path )
 		? glsr( 'Database\OptionManager' )->get( 'settings.'.$path, $fallback )
 		: $fallback;
@@ -115,7 +126,8 @@ 
 /**
  * @return array
  */
-function glsr_get_options() {
+function glsr_get_options()
+{
 	return glsr( 'Database\OptionManager' )->get( 'settings' );
 }
 
@@ -123,7 +135,8 @@ 
  * @param int $post_id
  * @return \GeminiLabs\SiteReviews\Review
  */
-function glsr_get_review( $post_id ) {
+function glsr_get_review( $post_id )
+{
 	$post = null;
 	if( is_numeric( $post_id )) {
 		$post = get_post( $post_id );
@@ -137,7 +150,8 @@ 
 /**
  * @return array
  */
-function glsr_get_reviews( $args = array() ) {
+function glsr_get_reviews( $args = array() )
+{
 	if( !is_array( $args )) {
 		$args = [];
 	}
@@ -147,7 +161,8 @@ 
 /**
  * @return \GeminiLabs\SiteReviews\Modules\Console
  */
-function glsr_log() {
+function glsr_log()
+{
 	$args = func_get_args();
 	$context = isset( $args[1] )
 		? $args[1]
@@ -161,6 +176,7 @@ 
 /**
  * @return string
  */
-function glsr_star_rating( $rating ) {
+function glsr_star_rating( $rating )
+{
 	return glsr( 'Modules\Html\Partial' )->build( 'star-rating', ['rating' => $rating] );
 }

plugin/Modules/Translation.php

Spacing +25 added lines, -25 removed lines

@@ -30,7 +30,7 @@ 
 	{
 		$translations = $this->translations();
 		$entries = $this->filter( $translations, $this->entries() )->results();
-		array_walk( $translations, function( &$entry ) use( $entries ) {
+		array_walk( $translations, function( &$entry ) use($entries) {
 			$entry['desc'] = array_key_exists( $entry['id'], $entries )
 				? $this->getEntryString( $entries[$entry['id']], 'msgctxt' )
 				: '';
@@ -43,7 +43,7 @@ 
 	 */
 	public function entries()
 	{
-		if( !isset( $this->entries )) {
+		if( !isset($this->entries) ) {
 			$potFile = glsr()->path( glsr()->languages.'/'.Application::ID.'.pot' );
 			$entries = $this->extractEntriesFromPotFile( $potFile );
 			$entries = apply_filters( 'site-reviews/translation/entries', $entries );
@@ -88,13 +88,13 @@ 
 	 */
 	public function filter( $filterWith = null, $entries = null, $intersect = true )
 	{
-		if( !is_array( $entries )) {
+		if( !is_array( $entries ) ) {
 			$entries = $this->results;
 		}
-		if( !is_array( $filterWith )) {
+		if( !is_array( $filterWith ) ) {
 			$filterWith = $this->translations();
 		}
-		$keys = array_flip( glsr_array_column( $filterWith, 'id' ));
+		$keys = array_flip( glsr_array_column( $filterWith, 'id' ) );
 		$this->results = $intersect
 			? array_intersect_key( $entries, $keys )
 			: array_diff_key( $entries, $keys );
@@ -108,17 +108,17 @@ 
 	public function render( $template, array $entry )
 	{
 		$data = array_combine(
-			array_map( function( $key ) { return 'data.'.$key; }, array_keys( $entry )),
+			array_map( function( $key ) { return 'data.'.$key; }, array_keys( $entry ) ),
 			$entry
 		);
 		$data['data.class'] = $data['data.error'] = '';
-		if( array_search( $entry['s1'], glsr_array_column( $this->entries(), 'msgid' )) === false ) {
+		if( array_search( $entry['s1'], glsr_array_column( $this->entries(), 'msgid' ) ) === false ) {
 			$data['data.class'] = 'is-invalid';
 			$data['data.error'] = __( 'This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews' );
 		}
 		return glsr( Template::class )->build( 'partials/translations/'.$template, [
 			'context' => $data,
-		]);
+		] );
 	}
 
 	/**
@@ -150,13 +150,13 @@ 
 				'p1' => $this->getEntryString( $entry, 'msgid_plural' ),
 				's1' => $this->getEntryString( $entry, 'msgid' ),
 			];
-			$text = !empty( $data['p1'] )
+			$text = !empty($data['p1'])
 				? sprintf( '%s | %s', $data['s1'], $data['p1'] )
 				: $data['s1'];
 			$rendered .= $this->render( 'result', [
-				'entry' => json_encode( $data, JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE ),
+				'entry' => json_encode( $data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ),
 				'text' => wp_strip_all_tags( $text ),
-			]);
+			] );
 		}
 		if( $resetAfterRender ) {
 			$this->reset();
@@ -189,12 +189,12 @@ 
 	public function search( $needle = '' )
 	{
 		$this->reset();
-		$needle = trim( strtolower( $needle ));
+		$needle = trim( strtolower( $needle ) );
 		foreach( $this->entries() as $key => $entry ) {
-			$single = strtolower( $this->getEntryString( $entry, 'msgid' ));
-			$plural = strtolower( $this->getEntryString( $entry, 'msgid_plural' ));
+			$single = strtolower( $this->getEntryString( $entry, 'msgid' ) );
+			$plural = strtolower( $this->getEntryString( $entry, 'msgid_plural' ) );
 			if( strlen( $needle ) < static::SEARCH_THRESHOLD ) {
-				if( in_array( $needle, [$single, $plural] )) {
+				if( in_array( $needle, [$single, $plural] ) ) {
 					$this->results[$key] = $entry;
 				}
 			}
@@ -212,10 +212,10 @@ 
 	public function translations()
 	{
 		static $translations;
-		if( empty( $translations )) {
+		if( empty($translations) ) {
 			$settings = glsr( OptionManager::class )->get( 'settings' );
-			$translations = isset( $settings['strings'] )
-				? $this->normalizeSettings( (array) $settings['strings'] )
+			$translations = isset($settings['strings'])
+				? $this->normalizeSettings( (array)$settings['strings'] )
 				: [];
 		}
 		return $translations;
@@ -227,8 +227,8 @@ 
 	 */
 	protected function getEntryString( array $entry, $key )
 	{
-		return isset( $entry[$key] )
-			? implode( '', (array) $entry[$key] )
+		return isset($entry[$key])
+			? implode( '', (array)$entry[$key] )
 			: '';
 	}
 
@@ -240,9 +240,9 @@ 
 		$keys = [
 			'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
 		];
-		array_walk( $entries, function( &$entry ) use( $keys ) {
+		array_walk( $entries, function( &$entry ) use($keys) {
 			foreach( $keys as $key ) {
-				if( is_array( $entry )) {
+				if( is_array( $entry ) ) {
 					$entry = $this->normalizeEntryString( $entry, $key );
 					continue;
 				}
@@ -258,7 +258,7 @@ 
 	 */
 	protected function normalizeEntryString( array $entry, $key )
 	{
-		if( isset( $entry[$key] )) {
+		if( isset($entry[$key]) ) {
 			$entry[$key] = $this->getEntryString( $entry, $key );
 		}
 		return $entry;
@@ -272,11 +272,11 @@ 
 		$defaultString = array_fill_keys( ['id', 's1', 's2', 'p1', 'p2'], '' );
 		$strings = array_filter( $strings, 'is_array' );
 		foreach( $strings as &$string ) {
-			$string['type'] = isset( $string['p1'] ) ? 'plural' : 'single';
+			$string['type'] = isset($string['p1']) ? 'plural' : 'single';
 			$string = wp_parse_args( $string, $defaultString );
 		}
 		return array_filter( $strings, function( $string ) {
-			return !empty( $string['id'] );
+			return !empty($string['id']);
 		});
 	}
 }

plugin/Modules/Console.php

Spacing +14 added lines, -14 removed lines

@@ -110,7 +110,7 @@ 
 	 */
 	public function get()
 	{
-		return empty( $this->log )
+		return empty($this->log)
 			? __( 'Console is empty', 'site-reviews' )
 			: $this->log;
 	}
@@ -122,11 +122,11 @@ 
 	public function humanSize( $valueIfEmpty = null )
 	{
 		$bytes = $this->size();
-		if( empty( $bytes ) && is_string( $valueIfEmpty )) {
+		if( empty($bytes) && is_string( $valueIfEmpty ) ) {
 			return $valueIfEmpty;
 		}
-		$exponent = floor( log( max( $bytes, 1 ), 1024 ));
-		return round( $bytes / pow( 1024, $exponent ), 2 ).' '.['bytes','KB','MB','GB'][$exponent];
+		$exponent = floor( log( max( $bytes, 1 ), 1024 ) );
+		return round( $bytes / pow( 1024, $exponent ), 2 ).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
 	}
 
 	/**
@@ -149,9 +149,9 @@ 
 	public function log( $level, $message, array $context = [] )
 	{
 		$constants = (new ReflectionClass( __CLASS__ ))->getConstants();
-		if( in_array( $level, $constants, true )) {
+		if( in_array( $level, $constants, true ) ) {
 			$entry = $this->buildLogEntry( $level, $message, $context );
-			file_put_contents( $this->file, $entry, FILE_APPEND|LOCK_EX );
+			file_put_contents( $this->file, $entry, FILE_APPEND | LOCK_EX );
 			$this->reset();
 		}
 		return $this;
@@ -163,10 +163,10 @@ 
 	public function logOnce()
 	{
 		$single = glsr( Session::class )->get( 'glsr_log_once', null, true );
-		if( !is_array( $single ))return;
+		if( !is_array( $single ) )return;
 		foreach( $single as $message => $debug ) {
-			if( !empty( $debug )) {
-				$message.= PHP_EOL.print_r( $debug, 1 );
+			if( !empty($debug) ) {
+				$message .= PHP_EOL.print_r( $debug, 1 );
 			}
 			$this->log( static::RECURRING, $message );
 		}
@@ -191,10 +191,10 @@ 
 	public function once( $message, $debug = '' )
 	{
 		$once = glsr( Session::class )->get( 'glsr_log_once', [] );
-		if( !is_array( $once )) {
+		if( !is_array( $once ) ) {
 			$once = [];
 		}
-		if( !isset( $once[$message] )) {
+		if( !isset($once[$message]) ) {
 			$once[$message] = $debug;
 			glsr( Session::class )->set( 'glsr_log_once', $once );
 		}
@@ -256,7 +256,7 @@ 
 	 */
 	protected function interpolate( $message, $context = [] )
 	{
-		if( $this->isObjectOrArray( $message ) || !is_array( $context )) {
+		if( $this->isObjectOrArray( $message ) || !is_array( $context ) ) {
 			return print_r( $message, true );
 		}
 		$replace = [];
@@ -284,7 +284,7 @@ 
 		if( $value instanceof DateTime ) {
 			$value = $value->format( 'Y-m-d H:i:s' );
 		}
-		else if( $this->isObjectOrArray( $value )) {
+		else if( $this->isObjectOrArray( $value ) ) {
 			$value = json_encode( $value );
 		}
 		return (string)$value;
@@ -299,7 +299,7 @@ 
 			$this->clear();
 			file_put_contents(
 				$this->file,
-				$this->buildLogEntry( 'info', __( 'Console was automatically cleared (128 KB maximum size)', 'site-reviews' ))
+				$this->buildLogEntry( 'info', __( 'Console was automatically cleared (128 KB maximum size)', 'site-reviews' ) )
 			);
 		}
 	}

Braces +3 added lines, -1 removed lines

@@ -163,7 +163,9 @@
 	public function logOnce()
 	{
 		$single = glsr( Session::class )->get( 'glsr_log_once', null, true );
-		if( !is_array( $single ))return;
+		if( !is_array( $single )) {
+			return;
+		}
 		foreach( $single as $message => $debug ) {
 			if( !empty( $debug )) {
 				$message.= PHP_EOL.print_r( $debug, 1 );