pryley / site-reviews

plugin/Helper.php

Spacing +23 added lines, -23 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 );
 	}
 
@@ -89,7 +89,7 @@ 
 	 */
 	public function convertPathToId( $path, $prefix = '' )
 	{
-		return str_replace( ['[', ']'], ['-', ''], $this->convertPathToName( $path, $prefix ));
+		return str_replace( ['[', ']'], ['-', ''], $this->convertPathToName( $path, $prefix ) );
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	{
 		$levels = explode( '.', $path );
 		return array_reduce( $levels, function( $result, $value ) {
-			return $result.= '['.$value.']';
+			return $result .= '['.$value.']';
 		}, $prefix );
 	}
 
@@ -111,7 +111,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 );
@@ -123,7 +123,7 @@ 
 	 */
 	public function dashCase( $string )
 	{
-		return str_replace( '_', '-', $this->snakeCase( $string ));
+		return str_replace( '_', '-', $this->snakeCase( $string ) );
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 		$data = $this->consolidateArray( $data );
 		$keys = explode( '.', $path );
 		foreach( $keys as $key ) {
-			if( !isset( $data[$key] )) {
+			if( !isset($data[$key]) ) {
 				return $fallback;
 			}
 			$data = $data[$key];
@@ -184,11 +184,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;
@@ -201,7 +201,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;
@@ -217,13 +217,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;
@@ -245,7 +245,7 @@ 
 				Whip::IPV4 => $cloudflareIps['v4'],
 				Whip::IPV6 => $ipv6,
 			],
-		]);
+		] );
 		$whip = new Whip( Whip::ALL_METHODS, $whitelist );
 		do_action_ref_array( 'site-reviews/whip', [&$whip] );
 		return (string)$whip->getValidIpAddress();
@@ -258,14 +258,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 );
 	}
@@ -276,7 +276,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 wp_is_numeric_array( $array );
@@ -289,7 +289,7 @@ 
 	 */
 	public function prefixString( $string, $prefix = '' )
 	{
-		return $prefix.str_replace( $prefix, '', trim( $string ));
+		return $prefix.str_replace( $prefix, '', trim( $string ) );
 	}
 
 	/**
@@ -315,7 +315,7 @@ 
 	public function removePrefix( $prefix, $text )
 	{
 		return 0 === strpos( $text, $prefix )
-			? substr( $text, strlen( $prefix ))
+			? substr( $text, strlen( $prefix ) )
 			: $text;
 	}
 
@@ -325,7 +325,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' )
@@ -342,6 +342,6 @@ 
 	 */
 	public function startsWith( $needle, $haystack )
 	{
-		return substr( $haystack, 0, strlen( $needle )) === $needle;
+		return substr( $haystack, 0, strlen( $needle ) ) === $needle;
 	}
 }

plugin/Controllers/ListTableController.php

Spacing +25 added lines, -25 removed lines

@@ -22,11 +22,11 @@ 
 	public function approve()
 	{
 		if( filter_input( INPUT_GET, 'plugin' ) != Application::ID )return;
-		check_admin_referer( 'approve-review_'.( $postId = $this->getPostId() ));
-		wp_update_post([
+		check_admin_referer( 'approve-review_'.($postId = $this->getPostId()) );
+		wp_update_post( [
 			'ID' => $postId,
 			'post_status' => 'publish',
-		]);
+		] );
 		wp_safe_redirect( wp_get_referer() );
 		exit;
 	}
@@ -59,11 +59,11 @@ 
 		$columns = glsr( Helper::class )->consolidateArray( $columns );
 		$postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
 		foreach( $postTypeColumns as $key => &$value ) {
-			if( !array_key_exists( $key, $columns ) || !empty( $value ))continue;
+			if( !array_key_exists( $key, $columns ) || !empty($value) )continue;
 			$value = $columns[$key];
 		}
-		if( count( glsr( Database::class )->getReviewsMeta( 'review_type' )) < 2 ) {
-			unset( $postTypeColumns['review_type'] );
+		if( count( glsr( Database::class )->getReviewsMeta( 'review_type' ) ) < 2 ) {
+			unset($postTypeColumns['review_type']);
 		}
 		return array_filter( $postTypeColumns, 'strlen' );
 	}
@@ -105,7 +105,7 @@ 
 	 */
 	public function filterPostStates( $postStates, $post ) {
 		$postStates = glsr( Helper::class )->consolidateArray( $postStates );
-		if( glsr_get( $post, 'post_type' ) == Application::POST_TYPE && array_key_exists( 'pending', $postStates )) {
+		if( glsr_get( $post, 'post_type' ) == Application::POST_TYPE && array_key_exists( 'pending', $postStates ) ) {
 			$postStates['pending'] = __( 'Unapproved', 'site-reviews' );
 		}
 		return $postStates;
@@ -122,7 +122,7 @@ 
 		if( glsr_get( $post, 'post_type' ) != Application::POST_TYPE || $post->post_status == 'trash' ) {
 			return $actions;
 		}
-		unset( $actions['inline hide-if-no-js'] ); //Remove Quick-edit
+		unset($actions['inline hide-if-no-js']); //Remove Quick-edit
 		$rowActions = [
 			'approve' => esc_attr__( 'Approve', 'site-reviews' ),
 			'unapprove' => esc_attr__( 'Unapprove', 'site-reviews' ),
@@ -136,7 +136,7 @@ 
 					admin_url( 'post.php?post='.$post->ID.'&action='.$key.'&plugin='.Application::ID ),
 					$key.'-review_'.$post->ID
 				),
-			]);
+			] );
 		}
 		return $newActions + glsr( Helper::class )->consolidateArray( $actions );
 	}
@@ -150,9 +150,9 @@ 
 	{
 		$columns = glsr( Helper::class )->consolidateArray( $columns );
 		$postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
-		unset( $postTypeColumns['cb'] );
+		unset($postTypeColumns['cb']);
 		foreach( $postTypeColumns as $key => $value ) {
-			if( glsr( Helper::class )->startsWith( 'taxonomy', $key ))continue;
+			if( glsr( Helper::class )->startsWith( 'taxonomy', $key ) )continue;
 			$columns[$key] = $key;
 		}
 		return $columns;
@@ -170,18 +170,18 @@ 
 	 */
 	public function filterStatusText( $translation, $single, $plural, $number, $domain )
 	{
-		if( $this->canModifyTranslation( $domain )) {
+		if( $this->canModifyTranslation( $domain ) ) {
 			$strings = [
 				'Published' => __( 'Approved', 'site-reviews' ),
 				'Pending' => __( 'Unapproved', 'site-reviews' ),
 			];
 			foreach( $strings as $search => $replace ) {
 				if( strpos( $single, $search ) === false )continue;
-				$translation = $this->getTranslation([
+				$translation = $this->getTranslation( [
 					'number' => $number,
 					'plural' => str_replace( $search, $replace, $plural ),
 					'single' => str_replace( $search, $replace, $single ),
-				]);
+				] );
 			}
 		}
 		return $translation;
@@ -228,9 +228,9 @@ 
 	 */
 	public function saveBulkEditFields( $postId )
 	{
-		if( !current_user_can( 'edit_posts' ))return;
+		if( !current_user_can( 'edit_posts' ) )return;
 		$assignedTo = filter_input( INPUT_GET, 'assigned_to' );
-		if( $assignedTo && get_post( $assignedTo )) {
+		if( $assignedTo && get_post( $assignedTo ) ) {
 			update_post_meta( $postId, 'assigned_to', $assignedTo );
 		}
 	}
@@ -241,10 +241,10 @@ 
 	 */
 	public function setQueryForColumn( WP_Query $query )
 	{
-		if( !$this->hasPermission( $query ))return;
+		if( !$this->hasPermission( $query ) )return;
 		$this->setMetaQuery( $query, [
 			'rating', 'review_type',
-		]);
+		] );
 		$this->setOrderby( $query );
 	}
 
@@ -255,11 +255,11 @@ 
 	public function unapprove()
 	{
 		if( filter_input( INPUT_GET, 'plugin' ) != Application::ID )return;
-		check_admin_referer( 'unapprove-review_'.( $postId = $this->getPostId() ));
-		wp_update_post([
+		check_admin_referer( 'unapprove-review_'.($postId = $this->getPostId()) );
+		wp_update_post( [
 			'ID' => $postId,
 			'post_status' => 'pending',
-		]);
+		] );
 		wp_safe_redirect( wp_get_referer() );
 		exit;
 	}
@@ -289,7 +289,7 @@ 
 			'single' => '',
 			'text' => '',
 		];
-		$args = (object) wp_parse_args( $args, $defaults );
+		$args = (object)wp_parse_args( $args, $defaults );
 		$translations = get_translations_for_domain( Application::ID );
 		return $args->text
 			? $translations->translate( $args->text )
@@ -314,7 +314,7 @@ 
 	protected function setMetaQuery( WP_Query $query, array $metaKeys )
 	{
 		foreach( $metaKeys as $key ) {
-			if( !( $value = filter_input( INPUT_GET, $key )))continue;
+			if( !($value = filter_input( INPUT_GET, $key )) )continue;
 			$metaQuery = (array)$query->get( 'meta_query' );
 			$metaQuery[] = [
 				'key' => $key,
@@ -331,8 +331,8 @@ 
 	{
 		$orderby = $query->get( 'orderby' );
 		$columns = glsr()->postTypeColumns[Application::POST_TYPE];
-		unset( $columns['cb'], $columns['title'], $columns['date'] );
-		if( in_array( $orderby, array_keys( $columns ))) {
+		unset($columns['cb'], $columns['title'], $columns['date']);
+		if( in_array( $orderby, array_keys( $columns ) ) ) {
 			if( $orderby == 'reviewer' ) {
 				$orderby = 'author';
 			}

plugin/Controllers/EditorController.php

Spacing +30 added lines, -30 removed lines

@@ -133,13 +133,13 @@ 
 	 */
 	public function renderAssignedToMetabox( $post )
 	{
-		if( !$this->isReviewPostType( $post ))return;
+		if( !$this->isReviewPostType( $post ) )return;
 		$assignedTo = (string)get_post_meta( $post->ID, 'assigned_to', true );
 		wp_nonce_field( 'assigned_to', '_nonce-assigned-to', false );
 		glsr()->render( 'partials/editor/metabox-assigned-to', [
 			'id' => $assignedTo,
 			'template' => $this->buildAssignedToTemplate( $assignedTo, $post ),
-		]);
+		] );
 	}
 
 	/**
@@ -149,12 +149,12 @@ 
 	 */
 	public function renderDetailsMetaBox( $post )
 	{
-		if( !$this->isReviewPostType( $post ))return;
+		if( !$this->isReviewPostType( $post ) )return;
 		$review = glsr( ReviewManager::class )->single( $post );
 		glsr()->render( 'partials/editor/metabox-details', [
 			'button' => $this->buildDetailsMetaBoxRevertButton( $review, $post ),
 			'metabox' => $this->normalizeDetailsMetaBox( $review ),
-		]);
+		] );
 	}
 
 	/**
@@ -163,14 +163,14 @@ 
 	 */
 	public function renderPinnedInPublishMetaBox()
 	{
-		if( !$this->isReviewPostType( get_post() ))return;
+		if( !$this->isReviewPostType( get_post() ) )return;
 		glsr( Template::class )->render( 'partials/editor/pinned', [
 			'context' => [
 				'no' => __( 'No', 'site-reviews' ),
 				'yes' => __( 'Yes', 'site-reviews' ),
 			],
-			'pinned' => wp_validate_boolean( get_post_meta( intval( get_the_ID() ), 'pinned', true )),
-		]);
+			'pinned' => wp_validate_boolean( get_post_meta( intval( get_the_ID() ), 'pinned', true ) ),
+		] );
 	}
 
 	/**
@@ -180,11 +180,11 @@ 
 	 */
 	public function renderResponseMetaBox( $post )
 	{
-		if( !$this->isReviewPostType( $post ))return;
+		if( !$this->isReviewPostType( $post ) )return;
 		wp_nonce_field( 'response', '_nonce-response', false );
 		glsr()->render( 'partials/editor/metabox-response', [
 			'response' => get_post_meta( $post->ID, 'response', true ),
-		]);
+		] );
 	}
 
 	/**
@@ -194,11 +194,11 @@ 
 	 */
 	public function renderReviewEditor( $post )
 	{
-		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return;
+		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) )return;
 		glsr()->render( 'partials/editor/review', [
 			'post' => $post,
 			'response' => get_post_meta( $post->ID, 'response', true ),
-		]);
+		] );
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 		$screen = glsr_current_screen();
 		if( $screen->base != 'post' || $screen->post_type != Application::POST_TYPE )return;
 		add_action( 'edit_form_after_title', [$this, 'renderReviewEditor'] );
-		add_action( 'edit_form_top',         [$this, 'renderReviewNotice'] );
+		add_action( 'edit_form_top', [$this, 'renderReviewNotice'] );
 	}
 
 	/**
@@ -220,16 +220,16 @@ 
 	 */
 	public function renderReviewNotice( $post )
 	{
-		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return;
+		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) )return;
 		glsr( Notice::class )->addWarning( sprintf(
 			__( '%s reviews are read-only.', 'site-reviews' ),
 			glsr( Columns::class )->buildColumnReviewType( $post->ID )
-		));
+		) );
 		glsr( Template::class )->render( 'partials/editor/notice', [
 			'context' => [
 				'notices' => glsr( Notice::class )->get(),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -240,12 +240,12 @@ 
 	 */
 	public function renderTaxonomyMetabox( $post )
 	{
-		if( !$this->isReviewPostType( $post ))return;
+		if( !$this->isReviewPostType( $post ) )return;
 		glsr()->render( 'partials/editor/metabox-categories', [
 			'post' => $post,
 			'tax_name' => Application::TAXONOMY,
 			'taxonomy' => get_taxonomy( Application::TAXONOMY ),
-		]);
+		] );
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 	public function revertReview()
 	{
 		if( filter_input( INPUT_GET, 'plugin' ) != Application::ID )return;
-		check_admin_referer( 'revert-review_'.( $postId = $this->getPostId() ));
+		check_admin_referer( 'revert-review_'.($postId = $this->getPostId()) );
 		glsr( ReviewManager::class )->revert( $postId );
 		$this->redirect( $postId, 52 );
 	}
@@ -279,13 +279,13 @@ 
 	protected function buildAssignedToTemplate( $assignedTo, WP_Post $post )
 	{
 		$assignedPost = glsr( Database::class )->getAssignedToPost( $post->ID, $assignedTo );
-		if( !( $assignedPost instanceof WP_Post ))return;
+		if( !($assignedPost instanceof WP_Post) )return;
 		return glsr( Template::class )->build( 'partials/editor/assigned-post', [
 			'context' => [
 				'data.url' => (string)get_permalink( $assignedPost ),
 				'data.title' => get_the_title( $assignedPost ),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -310,13 +310,13 @@ 
 				'class' => 'button button-large',
 				'href' => $revertUrl,
 				'id' => 'revert',
-			]);
+			] );
 		}
 		return glsr( Builder::class )->button( __( 'Nothing to Revert', 'site-reviews' ), [
 			'class' => 'button button-large',
 			'disabled' => true,
 			'id' => 'revert',
-		]);
+		] );
 	}
 
 	/**
@@ -329,11 +329,11 @@ 
 		$reviewType = array_key_exists( $review->review_type, glsr()->reviewTypes )
 			? glsr()->reviewTypes[$review->review_type]
 			: __( 'Unknown', 'site-reviews' );
-		if( !empty( $review->url )) {
+		if( !empty($review->url) ) {
 			$reviewType = glsr( Builder::class )->a( $reviewType, [
 				'href' => $review->url,
 				'target' => '_blank',
-			]);
+			] );
 		}
 		return $reviewType;
 	}
@@ -362,16 +362,16 @@ 
 	 */
 	protected function normalizeDetailsMetaBox( Review $review )
 	{
-		$user = empty( $review->user_id )
+		$user = empty($review->user_id)
 			? __( 'Unregistered user', 'site-reviews' )
 			: glsr( Builder::class )->a( get_the_author_meta( 'display_name', $review->user_id ), [
 				'href' => get_author_posts_url( $review->user_id ),
-			]);
-		$email = empty( $review->email )
+			] );
+		$email = empty($review->email)
 			? '—'
 			: glsr( Builder::class )->a( $review->email, [
 				'href' => 'mailto:'.$review->email.'?subject='.esc_attr( __( 'RE:', 'site-reviews' ).' '.$review->title ),
-			]);
+			] );
 		$metabox = [
 			__( 'Rating', 'site-reviews' ) => glsr_star_rating( $review->rating ),
 			__( 'Type', 'site-reviews' ) => $this->getReviewType( $review ),
@@ -382,7 +382,7 @@ 
 			__( 'IP Address', 'site-reviews' ) => $review->ip_address,
 			__( 'Avatar', 'site-reviews' ) => sprintf( '<img src="%s" width="96">', $review->avatar ),
 		];
-		return array_filter( apply_filters( 'site-reviews/metabox/details', $metabox, $review ));
+		return array_filter( apply_filters( 'site-reviews/metabox/details', $metabox, $review ) );
 	}
 
 	/**
@@ -399,7 +399,7 @@ 
 		$redirectUri = $hasReferer
 			? remove_query_arg( ['deleted', 'ids', 'trashed', 'untrashed'], $referer )
 			: get_edit_post_link( $postId );
-		wp_safe_redirect( add_query_arg( ['message' => $messageIndex], $redirectUri ));
+		wp_safe_redirect( add_query_arg( ['message' => $messageIndex], $redirectUri ) );
 		exit;
 	}
 }

plugin/Modules/Html/Fields/Field.php

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function build()
 	{
-		glsr_log()->error( 'Build method is not implemented for '.get_class( $this ));
+		glsr_log()->error( 'Build method is not implemented for '.get_class( $this ) );
 	}
 
 	/**
@@ -41,8 +41,8 @@ 
 			wp_parse_args( $args, static::defaults() ),
 			static::required()
 		);
-		$merged['class'] = implode( ' ', static::mergedAttribute( 'class', ' ', $args ));
-		$merged['style'] = implode( ';', static::mergedAttribute( 'style', ';', $args ));
+		$merged['class'] = implode( ' ', static::mergedAttribute( 'class', ' ', $args ) );
+		$merged['style'] = implode( ';', static::mergedAttribute( 'style', ';', $args ) );
 		return $merged;
 	}
 
@@ -54,10 +54,10 @@ 
 	public static function mergedAttribute( $key, $delimiter, array $args )
 	{
 		return array_filter( array_merge(
-			explode( $delimiter, glsr_get( $args, $key )),
-			explode( $delimiter, glsr_get( static::defaults(), $key )),
-			explode( $delimiter, glsr_get( static::required(), $key ))
-		));
+			explode( $delimiter, glsr_get( $args, $key ) ),
+			explode( $delimiter, glsr_get( static::defaults(), $key ) ),
+			explode( $delimiter, glsr_get( static::required(), $key ) )
+		) );
 	}
 
 	/**

plugin/Modules/Html/Field.php

Spacing +20 added lines, -20 removed lines

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

plugin/Modules/Html/Builder.php

Spacing +36 added lines, -36 removed lines

@@ -66,7 +66,7 @@ 
 	{
 		$instance = new static;
 		$instance->setTagFromMethod( $method );
-		call_user_func_array( [$instance, 'normalize'], $args += ['',''] );
+		call_user_func_array( [$instance, 'normalize'], $args += ['', ''] );
 		$tags = array_merge( static::TAGS_FORM, static::TAGS_SINGLE, static::TAGS_STRUCTURE, static::TAGS_TEXT );
 		do_action_ref_array( 'site-reviews/builder', [$instance] );
 		$generatedTag = in_array( $instance->tag, $tags )
@@ -91,8 +91,8 @@ 
 			'render' => 'is_bool',
 			'tag' => 'is_string',
 		];
-		if( !isset( $properties[$property] )
-			|| empty( array_filter( [$value], $properties[$property] ))
+		if( !isset($properties[$property])
+			|| empty(array_filter( [$value], $properties[$property] ))
 		)return;
 		$this->$property = $value;
 	}
@@ -102,7 +102,7 @@ 
 	 */
 	public function getClosingTag()
 	{
-		if( empty( $this->tag ))return;
+		if( empty($this->tag) )return;
 		return '</'.$this->tag.'>';
 	}
 
@@ -111,8 +111,8 @@ 
 	 */
 	public function getOpeningTag()
 	{
-		if( empty( $this->tag ))return;
-		$attributes = glsr( Attributes::class )->{$this->tag}( $this->args )->toString();
+		if( empty($this->tag) )return;
+		$attributes = glsr( Attributes::class )->{$this->tag}($this->args)->toString();
 		return '<'.trim( $this->tag.' '.$attributes ).'>';
 	}
 
@@ -121,10 +121,10 @@ 
 	 */
 	public function getTag()
 	{
-		if( in_array( $this->tag, static::TAGS_SINGLE )) {
+		if( in_array( $this->tag, static::TAGS_SINGLE ) ) {
 			return $this->getOpeningTag();
 		}
-		if( !in_array( $this->tag, static::TAGS_FORM )) {
+		if( !in_array( $this->tag, static::TAGS_FORM ) ) {
 			return $this->buildDefaultTag();
 		}
 		return call_user_func( [$this, 'buildForm'.ucfirst( $this->tag )] ).$this->buildFieldDescription();
@@ -135,8 +135,8 @@ 
 	 */
 	public function raw( array $field )
 	{
-		unset( $field['label'] );
-		return $this->{$field['type']}( $field );
+		unset($field['label']);
+		return $this->{$field['type']}($field);
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 	protected function buildCustomField()
 	{
 		$className = $this->getCustomFieldClassName();
-		if( class_exists( $className )) {
+		if( class_exists( $className ) ) {
 			return (new $className( $this ))->build();
 		}
 		glsr_log()->error( 'Field missing: '.$className );
@@ -156,7 +156,7 @@ 
 	 */
 	protected function buildDefaultTag( $text = '' )
 	{
-		if( empty( $text )) {
+		if( empty($text) ) {
 			$text = $this->args['text'];
 		}
 		return $this->getOpeningTag().$text.$this->getClosingTag();
@@ -167,7 +167,7 @@ 
 	 */
 	protected function buildFieldDescription()
 	{
-		if( empty( $this->args['description'] ))return;
+		if( empty($this->args['description']) )return;
 		if( $this->args['is_widget'] ) {
 			return $this->small( $this->args['description'] );
 		}
@@ -179,13 +179,13 @@ 
 	 */
 	protected function buildFormInput()
 	{
-		if( !in_array( $this->args['type'], ['checkbox', 'radio'] )) {
-			if( isset( $this->args['multiple'] )) {
-				$this->args['name'].= '[]';
+		if( !in_array( $this->args['type'], ['checkbox', 'radio'] ) ) {
+			if( isset($this->args['multiple']) ) {
+				$this->args['name'] .= '[]';
 			}
 			return $this->buildFormLabel().$this->getOpeningTag();
 		}
-		return empty( $this->args['options'] )
+		return empty($this->args['options'])
 			? $this->buildFormInputChoice()
 			: $this->buildFormInputMultiChoice();
 	}
@@ -195,19 +195,19 @@ 
 	 */
 	protected function buildFormInputChoice()
 	{
-		if( !empty( $this->args['text'] )) {
+		if( !empty($this->args['text']) ) {
 			$this->args['label'] = $this->args['text'];
 		}
 		if( !$this->args['is_public'] ) {
-			return $this->buildFormLabel([
+			return $this->buildFormLabel( [
 				'class' => 'glsr-'.$this->args['type'].'-label',
 				'text' => $this->getOpeningTag().' '.$this->args['label'].'<span></span>',
-			]);
+			] );
 		}
-		return $this->getOpeningTag().$this->buildFormLabel([
+		return $this->getOpeningTag().$this->buildFormLabel( [
 			'class' => 'glsr-'.$this->args['type'].'-label',
 			'text' => $this->args['label'].'<span></span>',
-		]);
+		] );
 	}
 
 	/**
@@ -216,22 +216,22 @@ 
 	protected function buildFormInputMultiChoice()
 	{
 		if( $this->args['type'] == 'checkbox' ) {
-			$this->args['name'].= '[]';
+			$this->args['name'] .= '[]';
 		}
 		$index = 0;
-		$options = array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) use( &$index ) {
+		$options = array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) use(&$index) {
 			return $carry.$this->li( $this->{$this->args['type']}([
 				'checked' => in_array( $key, (array)$this->args['value'] ),
 				'id' => $this->args['id'].'-'.$index++,
 				'name' => $this->args['name'],
 				'text' => $this->args['options'][$key],
 				'value' => $key,
-			]));
+			]) );
 		});
 		return $this->ul( $options, [
 			'class' => $this->args['class'],
 			'id' => $this->args['id'],
-		]);
+		] );
 	}
 
 	/**
@@ -239,13 +239,13 @@ 
 	 */
 	protected function buildFormLabel( array $customArgs = [] )
 	{
-		if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' )return;
+		if( empty($this->args['label']) || $this->args['type'] == 'hidden' )return;
 		return $this->label( wp_parse_args( $customArgs, [
 			'for' => $this->args['id'],
 			'is_public' => $this->args['is_public'],
 			'text' => $this->args['label'],
 			'type' => $this->args['type'],
-		]));
+		] ) );
 	}
 
 	/**
@@ -262,11 +262,11 @@ 
 	protected function buildFormSelectOptions()
 	{
 		return array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) {
-			return $carry.$this->option([
+			return $carry.$this->option( [
 				'selected' => $this->args['value'] == $key,
 				'text' => $this->args['options'][$key],
 				'value' => $key,
-			]);
+			] );
 		});
 	}
 
@@ -302,7 +302,7 @@ 
 	protected function mergeArgsWithRequiredDefaults()
 	{
 		$className = $this->getCustomFieldClassName();
-		if( class_exists( $className )) {
+		if( class_exists( $className ) ) {
 			$this->args = $className::merge( $this->args );
 		}
 		$this->args = glsr( BuilderDefaults::class )->merge( $this->args );
@@ -314,16 +314,16 @@ 
 	 */
 	protected function normalize( ...$params )
 	{
-		if( is_string( $params[0] ) || is_numeric( $params[0] )) {
+		if( is_string( $params[0] ) || is_numeric( $params[0] ) ) {
 			$this->setNameOrTextAttributeForTag( $params[0] );
 		}
-		if( is_array( $params[0] )) {
+		if( is_array( $params[0] ) ) {
 			$this->args += $params[0];
 		}
-		else if( is_array( $params[1] )) {
+		else if( is_array( $params[1] ) ) {
 			$this->args += $params[1];
 		}
-		if( !isset( $this->args['is_public'] )) {
+		if( !isset($this->args['is_public']) ) {
 			$this->args['is_public'] = false;
 		}
 	}
@@ -347,7 +347,7 @@ 
 	protected function setTagFromMethod( $method )
 	{
 		$this->tag = strtolower( $method );
-		if( in_array( $this->tag, static::INPUT_TYPES )) {
+		if( in_array( $this->tag, static::INPUT_TYPES ) ) {
 			$this->args['type'] = $this->tag;
 			$this->tag = 'input';
 		}

plugin/Modules/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 = glsr_get( $this->fields, $key, glsr_get( $this->fields, $instance->tag ));
+		$classes = glsr_get( $this->fields, $key, glsr_get( $this->fields, $instance->tag ) );
 		$instance->args['class'] = trim( $args['class'].' '.$classes );
 		do_action_ref_array( 'site-reviews/customize/'.$this->style, [$instance] );
 	}
@@ -140,7 +140,7 @@ 
 		$args = wp_parse_args( $instance->args, [
 			'is_public' => false,
 			'is_raw' => false,
-		]);
+		] );
 		if( is_admin() || !$args['is_public'] || $args['is_raw'] ) {
 			return false;
 		}

plugin/Controllers/ReviewController.php

Spacing +9 added lines, -9 removed lines

@@ -26,15 +26,15 @@ 
 	{
 		sort( $newTTIds );
 		sort( $oldTTIds );
-		if( $newTTIds === $oldTTIds || !$this->isReviewPostId( $postId ))return;
-		$review = glsr( ReviewManager::class )->single( get_post( $postId ));
+		if( $newTTIds === $oldTTIds || !$this->isReviewPostId( $postId ) )return;
+		$review = glsr( ReviewManager::class )->single( get_post( $postId ) );
 		$ignoredIds = array_intersect( $oldTTIds, $newTTIds );
 		$decreasedIds = array_diff( $oldTTIds, $ignoredIds );
 		$increasedIds = array_diff( $newTTIds, $ignoredIds );
-		if( $review->term_ids = glsr( Database::class )->getTermIds( $decreasedIds, 'term_taxonomy_id' )) {
+		if( $review->term_ids = glsr( Database::class )->getTermIds( $decreasedIds, 'term_taxonomy_id' ) ) {
 			glsr( CountsManager::class )->decreaseTermCounts( $review );
 		}
-		if( $review->term_ids = glsr( Database::class )->getTermIds( $increasedIds, 'term_taxonomy_id' )) {
+		if( $review->term_ids = glsr( Database::class )->getTermIds( $increasedIds, 'term_taxonomy_id' ) ) {
 			glsr( CountsManager::class )->increaseTermCounts( $review );
 		}
 	}
@@ -48,8 +48,8 @@ 
 	 */
 	public function onAfterChangeStatus( $newStatus, $oldStatus, $post )
 	{
-		if( glsr_get( $post, 'post_type') != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] ))return;
-		$review = glsr( ReviewManager::class )->single( get_post( $post->ID ));
+		if( glsr_get( $post, 'post_type' ) != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] ) )return;
+		$review = glsr( ReviewManager::class )->single( get_post( $post->ID ) );
 		if( $post->post_status == 'publish' ) {
 			glsr( CountsManager::class )->increase( $review );
 		}
@@ -75,8 +75,8 @@ 
 	 */
 	public function onBeforeDelete( $postId )
 	{
-		if( !$this->isReviewPostId( $postId ))return;
-		$review = glsr( ReviewManager::class )->single( get_post( $postId ));
+		if( !$this->isReviewPostId( $postId ) )return;
+		$review = glsr( ReviewManager::class )->single( get_post( $postId ) );
 		glsr( CountsManager::class )->decrease( $review );
 	}
 
@@ -93,7 +93,7 @@ 
 		if( !$this->isReviewPostId( $postId )
 			|| !in_array( $metaKey, ['assigned_to', 'rating', 'review_type'] )
 		)return;
-		$review = glsr( ReviewManager::class )->single( get_post( $postId ));
+		$review = glsr( ReviewManager::class )->single( get_post( $postId ) );
 		if( $review->$metaKey == $metaValue )return;
 		$method = glsr( Helper::class )->buildMethodName( $metaKey, 'onBeforeChange' );
 		call_user_func( [$this, $method], $review, $metaValue );

plugin/Controllers/AdminController.php

Spacing +25 added lines, -25 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' ) );
 	}
 
 	/**
@@ -148,9 +148,9 @@ 
 	public function routerCountReviews( $showNotice = true )
 	{
 		glsr( CountsManager::class )->countAll();
-		glsr( OptionManager::class )->set( 'last_review_count', current_time( 'timestamp' ));
+		glsr( OptionManager::class )->set( 'last_review_count', current_time( 'timestamp' ) );
 		if( $showNotice ) {
-			glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ));
+			glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ) );
 		}
 	}
 
@@ -185,17 +185,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' ) );
 	}
 
 	/**
@@ -213,6 +213,6 @@ 
 			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 glsr_get( $errors, $errorCode, __( 'Unknown upload error.', 'site-reviews' ));
+		return glsr_get( $errors, $errorCode, __( 'Unknown upload error.', 'site-reviews' ) );
 	}
 }