pryley / site-reviews

plugin/Controllers/PublicController.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@
 	public function routerSubmitReview( array $request )
 	{
 		$validated = glsr( ValidateReview::class )->validate( $request );
-		if( !empty( $validated->error ) || $validated->recaptchaIsUnset )return;
-		$this->execute( new CreateReview( $validated->request ));
+		if( !empty($validated->error) || $validated->recaptchaIsUnset )return;
+		$this->execute( new CreateReview( $validated->request ) );
 	}
 }

plugin/Database/SqlQueries.php

Spacing +15 added lines, -15 removed lines

@@ -23,11 +23,11 @@ 
 	 */
 	public function deleteAllSessions( $sessionCookiePrefix )
 	{
-		return $this->db->query("
+		return $this->db->query( "
 			DELETE
 			FROM {$this->db->options}
 			WHERE option_name LIKE '{$sessionCookiePrefix}_%'
-		");
+		" );
 	}
 
 	/**
@@ -36,11 +36,11 @@ 
 	 */
 	public function deleteExpiredSessions( $expiredSessions )
 	{
-		return $this->db->query("
+		return $this->db->query( "
 			DELETE
 			FROM {$this->db->options}
 			WHERE option_name IN ('{$expiredSessions}')
-		");
+		" );
 	}
 
 	/**
@@ -49,13 +49,13 @@ 
 	 */
 	public function getReviewCounts( $metaKey )
 	{
-		return (array) $this->db->get_results("
+		return (array)$this->db->get_results( "
 			SELECT m.meta_value AS name, COUNT(*) num_posts
 			FROM {$this->db->posts} AS p
 			INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
 			WHERE p.post_type = '{$this->postType}' AND m.meta_key = '{$metaKey}'
 			GROUP BY name
-		");
+		" );
 	}
 
 	/**
@@ -65,13 +65,13 @@ 
 	 */
 	public function getExpiredSessions( $sessionCookiePrefix, $limit )
 	{
-		return $this->db->get_results("
+		return $this->db->get_results( "
 			SELECT option_name AS name, option_value AS expiration
 			FROM {$this->db->options}
 			WHERE option_name LIKE '{$sessionCookiePrefix}_expires_%'
 			ORDER BY option_value ASC
 			LIMIT 0, {$limit}
-		");
+		" );
 	}
 
 	/**
@@ -80,14 +80,14 @@ 
 	 */
 	public function getReviewPostId( $metaReviewId )
 	{
-		$postId = $this->db->get_var("
+		$postId = $this->db->get_var( "
 			SELECT p.ID
 			FROM {$this->db->posts} AS p
 			INNER JOIN {$this->db->postmeta} AS pm ON p.ID = pm.post_id
 			WHERE p.post_type = '{$this->postType}'
 			AND pm.meta_key = 'review_id'
 			AND pm.meta_value = '{$metaReviewId}'
-		");
+		" );
 		return intval( $postId );
 	}
 
@@ -97,7 +97,7 @@ 
 	 */
 	public function getReviewIdsByType( $metaReviewType )
 	{
-		$query = $this->db->get_col("
+		$query = $this->db->get_col( "
 			SELECT m1.meta_value AS review_id
 			FROM {$this->db->posts} AS p
 			INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
@@ -106,8 +106,8 @@ 
 			AND m1.meta_key = 'review_id'
 			AND m2.meta_key = 'review_type'
 			AND m2.meta_value = '{$metaReviewType}'
-		");
-		return array_keys( array_flip( $query ));
+		" );
+		return array_keys( array_flip( $query ) );
 	}
 
 	/**
@@ -120,13 +120,13 @@ 
 		$queryBuilder = glsr( QueryBuilder::class );
 		$keys = $queryBuilder->buildSqlOr( $keys, "pm.meta_key = '%s'" );
 		$status = $queryBuilder->buildSqlOr( $status, "p.post_status = '%s'" );
-		return $this->db->get_col("
+		return $this->db->get_col( "
 			SELECT DISTINCT pm.meta_value FROM {$this->db->postmeta} pm
 			LEFT JOIN {$this->db->posts} p ON p.ID = pm.post_id
 			WHERE p.post_type = '{$this->postType}'
 			AND ({$keys})
 			AND ({$status})
 			ORDER BY pm.meta_value
-		");
+		" );
 	}
 }

plugin/Modules/Session.php

Spacing +13 added lines, -13 removed lines

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

plugin/Modules/Blacklist.php

Spacing +9 added lines, -9 removed lines

@@ -11,14 +11,14 @@ 
 	 */
 	public function isBlacklisted( array $review )
 	{
-		$target = implode( "\n", array_filter([
+		$target = implode( "\n", array_filter( [
 			$review['name'],
 			$review['content'],
 			$review['email'],
 			$review['ip_address'],
 			$review['title'],
-		]));
-		return (bool) apply_filters( 'site-reviews/blacklist/is-blacklisted',
+		] ) );
+		return (bool)apply_filters( 'site-reviews/blacklist/is-blacklisted',
 			$this->check( $target ),
 			$review
 		);
@@ -30,16 +30,16 @@ 
 	 */
 	protected function check( $target )
 	{
-		$blacklist = trim( glsr( OptionManager::class )->get( 'settings.submissions.blacklist.entries' ));
-		if( empty( $blacklist )) {
+		$blacklist = trim( glsr( OptionManager::class )->get( 'settings.submissions.blacklist.entries' ) );
+		if( empty($blacklist) ) {
 			return false;
 		}
 		$lines = explode( "\n", $blacklist );
-		foreach( (array) $lines as $line ) {
+		foreach( (array)$lines as $line ) {
 			$line = trim( $line );
-			if( empty( $line ) || 256 < strlen( $line ))continue;
-			$pattern = sprintf( '#%s#i', preg_quote( $line, '#' ));
-			if( preg_match( $pattern, $target )) {
+			if( empty($line) || 256 < strlen( $line ) )continue;
+			$pattern = sprintf( '#%s#i', preg_quote( $line, '#' ) );
+			if( preg_match( $pattern, $target ) ) {
 				return true;
 			}
 		}

plugin/Modules/Html/Partials/FormResults.php

Spacing +3 added lines, -3 removed lines

@@ -19,10 +19,10 @@ 
 	public function build( array $args = [] )
 	{
 		$this->errors = $args['errors'];
-		if( empty( $args['message'] ))return;
+		if( empty($args['message']) )return;
 		return glsr( Builder::class )->div( wpautop( $args['message'] ), [
 			'class' => $this->getClass(),
-		]);
+		] );
 	}
 
 	/**
@@ -30,7 +30,7 @@ 
 	 */
 	protected function getClass()
 	{
-		$errorClass = !empty( $this->errors )
+		$errorClass = !empty($this->errors)
 			? 'glsr-has-errors'
 			: '';
 		return trim( 'glsr-form-messages '.$errorClass );

plugin/Modules/Html/Settings.php

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
 			: $this->$method( $id );
 		return glsr( Template::class )->build( 'pages/settings/'.$id, [
 			'context' => $context,
-		]);
+		] );
 	}
 
 	/**
@@ -31,7 +31,7 @@ 
 	 */
 	protected function getFieldDefault( array $field )
 	{
-		return isset( $field['default'] )
+		return isset($field['default'])
 			? $field['default']
 			: '';
 	}
@@ -42,7 +42,7 @@ 
 	protected function getSettingFields( $path )
 	{
 		$settings = glsr( DefaultsManager::class )->settings();
-		return array_filter( $settings, function( $key ) use( $path ) {
+		return array_filter( $settings, function( $key ) use($path) {
 			return glsr( Helper::class )->startsWith( $path, $key );
 		}, ARRAY_FILTER_USE_KEY );
 	}
@@ -53,14 +53,14 @@ 
 	 */
 	protected function getTemplateContext( $id )
 	{
-		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ));
+		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
 		$rows = '';
 		foreach( $fields as $name => $field ) {
 			$field = wp_parse_args( $field, [
 				'is_setting' => true,
 				'name' => $name,
-			]);
-			$rows.= new Field( $this->normalize( $field ));
+			] );
+			$rows .= new Field( $this->normalize( $field ) );
 		}
 		return [
 			'rows' => $rows,
@@ -73,7 +73,7 @@ 
 	protected function getTemplateContextForTranslations()
 	{
 		$translations = glsr( Translator::class )->renderAll();
-		$class = empty( $translations )
+		$class = empty($translations)
 			? 'glsr-hidden'
 			: '';
 		return [
@@ -94,7 +94,7 @@ 
 			$path,
 			glsr( Helper::class )->getPathValue( $path, glsr()->defaults )
 		);
-		if( is_array( $expectedValue )) {
+		if( is_array( $expectedValue ) ) {
 			return !in_array( $optionValue, $expectedValue );
 		}
 		return $optionValue != $expectedValue;
@@ -116,13 +116,13 @@ 
 	 */
 	protected function normalizeDependsOn( array $field )
 	{
-		if( !empty( $field['depends_on'] ) && is_array( $field['depends_on'] )) {
+		if( !empty($field['depends_on']) && is_array( $field['depends_on'] ) ) {
 			$path = key( $field['depends_on'] );
 			$expectedValue = $field['depends_on'][$path];
-			$field['data-depends'] = json_encode([
+			$field['data-depends'] = json_encode( [
 				'name' => glsr( Helper::class )->convertPathToName( $path, OptionManager::databaseKey() ),
 				'value' => $expectedValue,
-			], JSON_HEX_APOS|JSON_HEX_QUOT );
+			], JSON_HEX_APOS | JSON_HEX_QUOT );
 			$field['is_hidden'] = $this->isFieldHidden( $path, $expectedValue );
 		}
 		return $field;
@@ -133,9 +133,9 @@ 
 	 */
 	protected function normalizeLabelAndLegend( array $field )
 	{
-		if( !empty( $field['label'] )) {
+		if( !empty($field['label']) ) {
 			$field['legend'] = $field['label'];
-			unset( $field['label'] );
+			unset($field['label']);
 		}
 		else {
 			$field['is_valid'] = false;
@@ -149,7 +149,7 @@ 
 	 */
 	protected function normalizeValue( array $field )
 	{
-		if( !isset( $field['value'] )) {
+		if( !isset($field['value']) ) {
 			$field['value'] = glsr( OptionManager::class )->get(
 				$field['name'],
 				$this->getFieldDefault( $field )

plugin/Modules/Html/Field.php

Spacing +18 added lines, -18 removed lines

@@ -26,7 +26,7 @@ 
 			'is_valid' => true,
 			'is_widget' => false,
 			'path' => '',
-		]);
+		] );
 		$this->normalize();
 	}
 
@@ -45,7 +45,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();
@@ -73,9 +73,9 @@ 
 			'context' => [
 				'class' => $this->getFieldClass(),
 				'errors' => $this->getFieldErrors(),
-				'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ),
+				'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -86,10 +86,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']] ),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -98,16 +98,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'],
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -116,13 +116,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';
 		}
 		return implode( ' ', $classes );
@@ -133,7 +133,7 @@ 
 	 */
 	protected function getFieldDependsOn()
 	{
-		return !empty( $this->field['data-depends'] )
+		return !empty($this->field['data-depends'])
 			? $this->field['data-depends']
 			: '';
 	}
@@ -143,7 +143,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'] );
 		});
@@ -170,13 +170,13 @@ 
 			'name', 'type',
 		];
 		foreach( $requiredValues as $value ) {
-			if( isset( $this->field[$value] ))continue;
+			if( isset($this->field[$value]) )continue;
 			$missingValues[] = $value;
 			$this->field['is_valid'] = false;
 		}
-		if( !empty( $missingValues )) {
+		if( !empty($missingValues) ) {
 			glsr_log()
-				->warning( 'Field is missing: '.implode( ', ', $missingValues ))
+				->warning( 'Field is missing: '.implode( ', ', $missingValues ) )
 				->info( $this->field );
 		}
 		return $this->field['is_valid'];
@@ -190,7 +190,7 @@ 
 		if( !$this->isFieldValid() )return;
 		$this->field['path'] = $this->field['name'];
 		$className = glsr( Helper::class )->buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' );
-		if( class_exists( $className )) {
+		if( class_exists( $className ) ) {
 			$this->field = array_merge(
 				wp_parse_args( $this->field, $className::defaults() ),
 				$className::required()
@@ -205,7 +205,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/Commands/CreateReview.php

Spacing +13 added lines, -13 removed lines

@@ -27,21 +27,21 @@ 
 	public function __construct( $input )
 	{
 		$this->request = $input;
-		$this->ajax_request = isset( $input['ajax_request'] );
+		$this->ajax_request = isset($input['ajax_request']);
 		$this->assigned_to = $this->getNumeric( 'assign_to' );
-		$this->author = sanitize_text_field( $this->get( 'name' ));
-		$this->avatar = get_avatar_url( $this->get( 'email' ));
-		$this->blacklisted = isset( $input['blacklisted'] );
-		$this->category = sanitize_key( $this->get( 'category' ));
-		$this->content = sanitize_textarea_field( $this->get( 'content' ));
+		$this->author = sanitize_text_field( $this->get( 'name' ) );
+		$this->avatar = get_avatar_url( $this->get( 'email' ) );
+		$this->blacklisted = isset($input['blacklisted']);
+		$this->category = sanitize_key( $this->get( 'category' ) );
+		$this->content = sanitize_textarea_field( $this->get( 'content' ) );
 		$this->custom = $this->getCustom();
-		$this->email = sanitize_email( $this->get( 'email' ));
-		$this->form_id = sanitize_key( $this->get( 'form_id' ));
+		$this->email = sanitize_email( $this->get( 'email' ) );
+		$this->form_id = sanitize_key( $this->get( 'form_id' ) );
 		$this->ip_address = $this->get( 'ip_address' );
-		$this->rating = intval( $this->get( 'rating' ));
+		$this->rating = intval( $this->get( 'rating' ) );
 		$this->referrer = $this->get( 'referrer' );
-		$this->terms = isset( $input['terms'] );
-		$this->title = sanitize_text_field( $this->get( 'title' ));
+		$this->terms = isset($input['terms']);
+		$this->title = sanitize_text_field( $this->get( 'title' ) );
 	}
 
 	/**
@@ -50,7 +50,7 @@ 
 	 */
 	protected function get( $key )
 	{
-		return isset( $this->request[$key] )
+		return isset($this->request[$key])
 			? (string)$this->request[$key]
 			: '';
 	}
@@ -67,7 +67,7 @@ 
 		];
 		$custom = $this->request;
 		foreach( $unset as $value ) {
-			unset( $custom[$value] );
+			unset($custom[$value]);
 		}
 		return $custom;
 	}

plugin/Modules/Html/Builder.php

Spacing +28 added lines, -28 removed lines

@@ -55,7 +55,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 );
 		$generatedTag = in_array( $instance->tag, $tags )
 			? $instance->buildTag()
@@ -78,8 +78,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;
 	}
@@ -97,7 +97,7 @@ 
 	 */
 	public function getOpeningTag()
 	{
-		$attributes = glsr( Attributes::class )->{$this->tag}( $this->args )->toString();
+		$attributes = glsr( Attributes::class )->{$this->tag}($this->args)->toString();
 		return '<'.trim( $this->tag.' '.$attributes ).'>';
 	}
 
@@ -107,7 +107,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 );
@@ -118,7 +118,7 @@ 
 	 */
 	protected function buildDefaultTag( $text = '' )
 	{
-		if( empty( $text )) {
+		if( empty($text) ) {
 			$text = $this->args['text'];
 		}
 		return $this->getOpeningTag().$text.$this->getClosingTag();
@@ -129,7 +129,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'] );
 		}
@@ -141,13 +141,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();
 	}
@@ -157,13 +157,13 @@ 
 	 */
 	protected function buildFormInputChoice()
 	{
-		$labelText = !empty( $this->args['text'] )
+		$labelText = !empty($this->args['text'])
 			? $this->args['text']
 			: $this->args['label'];
 		return $this->label( $this->getOpeningTag().' '.$labelText, [
 			'class' => 'glsr-'.$this->args['type'].'-label',
 			'for' => $this->args['id'],
-		]);
+		] );
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	protected function buildFormInputMultiChoice()
 	{
 		if( $this->args['type'] == 'checkbox' ) {
-			$this->args['name'].= '[]';
+			$this->args['name'] .= '[]';
 		}
 		$options = array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) {
 			return $carry.$this->li( $this->{$this->args['type']}([
@@ -180,12 +180,12 @@ 
 				'name' => $this->args['name'],
 				'text' => $this->args['options'][$key],
 				'value' => $key,
-			]));
+			]) );
 		});
 		return $this->ul( $options, [
 			'class' => $this->args['class'],
 			'id' => $this->args['id'],
-		]);
+		] );
 	}
 
 	/**
@@ -193,11 +193,11 @@ 
 	 */
 	protected function buildFormLabel()
 	{
-		if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' )return;
-		return $this->label([
+		if( empty($this->args['label']) || $this->args['type'] == 'hidden' )return;
+		return $this->label( [
 			'for' => $this->args['id'],
 			'text' => $this->args['label'],
-		]);
+		] );
 	}
 
 	/**
@@ -214,11 +214,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,
-			]);
+			] );
 		});
 	}
 
@@ -236,10 +236,10 @@ 
 	protected function buildTag()
 	{
 		$this->mergeArgsWithRequiredDefaults();
-		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();
@@ -259,7 +259,7 @@ 
 	protected function mergeArgsWithRequiredDefaults()
 	{
 		$className = $this->getCustomFieldClassName();
-		if( class_exists( $className )) {
+		if( class_exists( $className ) ) {
 			$this->args = array_merge(
 				wp_parse_args( $this->args, $className::defaults() ),
 				$className::required()
@@ -274,13 +274,13 @@ 
 	 */
 	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];
 		}
 	}
@@ -304,7 +304,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';
 		}