pryley / site-reviews

plugin/Controllers/MenuController.php

Spacing +15 added lines, -15 removed lines

@@ -21,17 +21,17 @@ 
 	{
 		global $menu, $typenow;
 		foreach( $menu as $key => $value ) {
-			if( !isset( $value[2] ) || $value[2] != 'edit.php?post_type='.Application::POST_TYPE )continue;
+			if( !isset($value[2]) || $value[2] != 'edit.php?post_type='.Application::POST_TYPE )continue;
 			$postCount = wp_count_posts( Application::POST_TYPE );
 			$pendingCount = glsr( Builder::class )->span( number_format_i18n( $postCount->pending ), [
 				'class' => 'pending-count',
-			]);
+			] );
 			$awaitingModeration = glsr( Builder::class )->span( $pendingCount, [
 				'class' => 'awaiting-mod count-'.$postCount->pending,
-			]);
+			] );
 			$menu[$key][0] .= ' '.$awaitingModeration;
 			if( $typenow === Application::POST_TYPE ) {
-				$menu[$key][4].= ' current';
+				$menu[$key][4] .= ' current';
 			}
 			break;
 		}
@@ -48,11 +48,11 @@ 
 			'tools' => __( 'Tools', 'site-reviews' ),
 			'addons' => __( 'Add-Ons', 'site-reviews' ),
 			'documentation' => __( 'Documentation', 'site-reviews' ),
-		]);
+		] );
 		foreach( $pages as $slug => $title ) {
 			$method = glsr( Helper::class )->buildMethodName( 'render-'.$slug.'-menu' );
 			$callback = apply_filters( 'site-reviews/addon/submenu/callback', [$this, $method], $slug );
-			if( !is_callable( $callback ))continue;
+			if( !is_callable( $callback ) )continue;
 			add_submenu_page( 'edit.php?post_type='.Application::POST_TYPE, $title, $title, Application::CAPABILITY, $slug, $callback );
 		}
 	}
@@ -66,7 +66,7 @@ 
 	{
 		$this->renderPage( 'addons', [
 			'template' => glsr( Template::class ),
-		]);
+		] );
 	}
 
 	/**
@@ -82,10 +82,10 @@ 
 			'shortcodes' => __( 'Shortcodes', 'site-reviews' ),
 			'hooks' => __( 'Hooks', 'site-reviews' ),
 			'functions' => __( 'Functions', 'site-reviews' ),
-		]);
+		] );
 		$this->renderPage( 'documentation', [
 			'tabs' => $tabs,
-		]);
+		] );
 	}
 
 	/**
@@ -102,14 +102,14 @@ 
 			'schema' => __( 'Schema', 'site-reviews' ),
 			'translations' => __( 'Translations', 'site-reviews' ),
 			'licenses' => __( 'Licenses', 'site-reviews' ),
-		]);
-		if( !apply_filters( 'site-reviews/addon/licenses', false )) {
-			unset( $tabs['licenses'] );
+		] );
+		if( !apply_filters( 'site-reviews/addon/licenses', false ) ) {
+			unset($tabs['licenses']);
 		}
 		$this->renderPage( 'settings', [
 			'html' => glsr( Html::class ),
 			'tabs' => $tabs,
-		]);
+		] );
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 			'import-export' => __( 'Import/Export', 'site-reviews' ),
 			'logging' => __( 'Logging', 'site-reviews' ),
 			'system-info' => __( 'System Info', 'site-reviews' ),
-		]);
+		] );
 		$this->renderPage( 'tools', [
 			'data' => [
 				'context' => [
@@ -134,7 +134,7 @@ 
 			],
 			'html' => glsr( Html::class ),
 			'tabs' => $tabs,
-		]);
+		] );
 	}
 
 	/**

plugin/Modules/Html/Partials/SiteReviewsForm.php

Spacing +11 added lines, -11 removed lines

@@ -30,7 +30,7 @@ 
 				'submit_button' => $this->buildSubmitButton(),
 			],
 			'fields' => $this->getFields(),
-		]);
+		] );
 	}
 
 	/**
@@ -48,7 +48,7 @@ 
 	{
 		return glsr( Builder::class )->button( '<span></span>'.__( 'Submit your review', 'site-reviews' ), [
 			'type' => 'submit',
-		]);
+		] );
 	}
 
 	/**
@@ -82,25 +82,25 @@ 
 		$fields = [[
 			'name' => 'assign_to',
 			'value' => $this->args['assign_to'],
-		],[
+		], [
 			'name' => 'category',
 			'value' => $this->args['category'],
-		],[
+		], [
 			'name' => 'excluded',
 			'value' => $this->args['excluded'],
-		],[
+		], [
 			'name' => 'id',
 			'value' => $this->args['id'],
-		],[
+		], [
 			'name' => '_wp_http_referer',
 			'value' => wp_get_referer(),
-		],[
+		], [
 			'name' => '_wpnonce',
 			'value' => wp_create_nonce( 'post-review' ),
 		]];
 		return array_values( array_map( function( $field ) {
-			return new Field( wp_parse_args( $field, ['type' => 'hidden'] ));
-		}, $fields ));
+			return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) );
+		}, $fields ) );
 	}
 
 	/**
@@ -108,9 +108,9 @@ 
 	 */
 	protected function getHoneypotField()
 	{
-		return new Field([
+		return new Field( [
 			'name' => 'gotcha',
 			'type' => 'honeypot',
-		]);
+		] );
 	}
 }

plugin/Modules/Html/Form.php

Spacing +2 added lines, -2 removed lines

@@ -27,13 +27,13 @@
 	public function getFields( $id )
 	{
 		$fields = [];
-		$configPath = glsr()->path( 'config/'.$id.'.php' );;
+		$configPath = glsr()->path( 'config/'.$id.'.php' ); ;
 		$values = file_exists( $configPath )
 			? include $configPath
 			: [];
 		$values = apply_filters( 'site-reviews/form/fields', $values );
 		foreach( $values as $name => $field ) {
-			$fields[] = new Field( wp_parse_args( $field, ['name' => $name] ));
+			$fields[] = new Field( wp_parse_args( $field, ['name' => $name] ) );
 		}
 		return $fields;
 	}

plugin/Modules/Html/Partials/SiteReviews.php

Spacing +30 added lines, -30 removed lines

@@ -55,7 +55,7 @@ 
 				'navigation' => $navigation,
 			],
 			'reviews' => $this->buildReviews(),
-		]);
+		] );
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 		$generatedReview = [];
 		foreach( $review as $key => $value ) {
 			$method = glsr( Helper::class )->buildMethodName( $key, 'buildOption' );
-			if( !method_exists( $this, $method ))continue;
+			if( !method_exists( $this, $method ) )continue;
 			$generatedReview[$key] = $this->$method( $key, $value );
 		}
 		return (object)$generatedReview;
@@ -96,12 +96,12 @@ 
 	 */
 	protected function buildOptionAssignedTo( $key, $value )
 	{
-		if( $this->isHiddenOrEmpty( $key, 'settings.reviews.assigned_links.enabled' ))return;
-		$post = get_post( intval( $value ));
-		if( !( $post instanceof WP_Post ))return;
+		if( $this->isHiddenOrEmpty( $key, 'settings.reviews.assigned_links.enabled' ) )return;
+		$post = get_post( intval( $value ) );
+		if( !($post instanceof WP_Post) )return;
 		$permalink = glsr( Builder::class )->a( get_the_title( $post->ID ), [
 			'href' => get_the_permalink( $post->ID ),
-		]);
+		] );
 		$assignedTo = sprintf( __( 'Review of %s', 'site-reviews' ), $permalink );
 		return $this->wrap( $key, '<span>'.$assignedTo.'</span>' );
 	}
@@ -113,7 +113,7 @@ 
 	 */
 	protected function buildOptionAuthor( $key, $value )
 	{
-		if( $this->isHidden( $key ))return;
+		if( $this->isHidden( $key ) )return;
 		$prefix = !$this->isOptionEnabled( 'settings.reviews.avatars.enabled' )
 			? apply_filters( 'site-reviews/review/author/prefix', '&mdash;' )
 			: '';
@@ -127,13 +127,13 @@ 
 	 */
 	protected function buildOptionAvatar( $key, $value )
 	{
-		if( $this->isHidden( $key, 'settings.reviews.avatars.enabled' ))return;
+		if( $this->isHidden( $key, 'settings.reviews.avatars.enabled' ) )return;
 		$size = $this->getOption( 'settings.reviews.avatars.size', 40 );
-		return $this->wrap( $key, glsr( Builder::class )->img([
+		return $this->wrap( $key, glsr( Builder::class )->img( [
 			'src' => $this->generateAvatar( $value ),
 			'height' => $size,
 			'width' => $size,
-		]));
+		] ) );
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	protected function buildOptionContent( $key, $value )
 	{
 		$text = $this->normalizeText( $value );
-		if( $this->isHiddenOrEmpty( $key, $text ))return;
+		if( $this->isHiddenOrEmpty( $key, $text ) )return;
 		return $this->wrap( $key, '<p>'.$text.'</p>' );
 	}
 
@@ -155,7 +155,7 @@ 
 	 */
 	protected function buildOptionDate( $key, $value )
 	{
-		if( $this->isHidden( $key ))return;
+		if( $this->isHidden( $key ) )return;
 		$dateFormat = $this->getOption( 'settings.reviews.date.format', 'default' );
 		if( $dateFormat == 'relative' ) {
 			$date = glsr( Date::class )->relative( $value );
@@ -164,7 +164,7 @@ 
 			$format = $dateFormat == 'custom'
 				? $this->getOption( 'settings.reviews.date.custom', 'M j, Y' )
 				: (string)get_option( 'date_format' );
-			$date = date_i18n( $format, strtotime( $value ));
+			$date = date_i18n( $format, strtotime( $value ) );
 		}
 		return $this->wrap( $key, '<span>'.$date.'</span>' );
 	}
@@ -176,10 +176,10 @@ 
 	 */
 	protected function buildOptionRating( $key, $value )
 	{
-		if( $this->isHiddenOrEmpty( $key, $value ))return;
+		if( $this->isHiddenOrEmpty( $key, $value ) )return;
 		$rating = glsr( Html::class )->buildPartial( 'star-rating', [
 			'rating' => $value,
-		]);
+		] );
 		return $this->wrap( $key, $rating );
 	}
 
@@ -190,8 +190,8 @@ 
 	 */
 	protected function buildOptionResponse( $key, $value )
 	{
-		if( $this->isHiddenOrEmpty( $key, $value ))return;
-		$title = sprintf( __( 'Response from %s', 'site-reviews' ), get_bloginfo( 'name' ));
+		if( $this->isHiddenOrEmpty( $key, $value ) )return;
+		$title = sprintf( __( 'Response from %s', 'site-reviews' ), get_bloginfo( 'name' ) );
 		$text = $this->normalizeText( $value );
 		$text = '<p><strong>'.$title.'</strong></p><p>'.$text.'</p>';
 		return $this->wrap( $key,
@@ -207,8 +207,8 @@ 
 	 */
 	protected function buildOptionTitle( $key, $value )
 	{
-		if( $this->isHidden( $key ))return;
-		if( empty( $value )) {
+		if( $this->isHidden( $key ) )return;
+		if( empty($value) ) {
 			$value = __( 'No Title', 'site-reviews' );
 		}
 		return $this->wrap( $key, '<h3>'.$value.'</h3>' );
@@ -226,7 +226,7 @@ 
 			return $avatarUrl;
 		}
 		$authorIdOrEmail = get_the_author_meta( 'ID', $review->user_id );
-		if( empty( $authorIdOrEmail )) {
+		if( empty($authorIdOrEmail) ) {
 			$authorIdOrEmail = $review->email;
 		}
 		return (string)get_avatar_url( $authorIdOrEmail );
@@ -237,7 +237,7 @@ 
 	 */
 	protected function generateSchema()
 	{
-		if( !wp_validate_boolean( $this->args['schema'] ))return;
+		if( !wp_validate_boolean( $this->args['schema'] ) )return;
 		glsr( Schema::class )->store(
 			glsr( Schema::class )->build( $this->args )
 		);
@@ -263,14 +263,14 @@ 
 	{
 		$limit = $this->getOption( 'settings.reviews.excerpt.length', 55 );
 		if( str_word_count( $text, 0 ) > $limit ) {
-			$words = array_keys( str_word_count( $text, 2 ));
-			$excerpt = ltrim( substr( $text, 0, $words[$limit] ));
-			$hiddenText = substr( $text, strlen( $excerpt ));
+			$words = array_keys( str_word_count( $text, 2 ) );
+			$excerpt = ltrim( substr( $text, 0, $words[$limit] ) );
+			$hiddenText = substr( $text, strlen( $excerpt ) );
 			$showMore = glsr( Builder::class )->span( $hiddenText, [
 				'class' => 'glsr-hidden glsr-hidden-text',
 				'data-show-less' => __( 'Show less', 'site-reviews' ),
 				'data-show-more' => __( 'Show more', 'site-reviews' ),
-			]);
+			] );
 			$text = $excerpt.$showMore;
 		}
 		return nl2br( $text );
@@ -283,7 +283,7 @@ 
 	 */
 	protected function getOption( $path, $fallback = '' )
 	{
-		if( array_key_exists( $path, $this->options )) {
+		if( array_key_exists( $path, $this->options ) ) {
 			return $this->options[$path];
 		}
 		return $fallback;
@@ -296,7 +296,7 @@ 
 	 */
 	protected function isHidden( $key, $path = '' )
 	{
-		$isOptionEnabled = !empty( $path )
+		$isOptionEnabled = !empty($path)
 			? $this->isOptionEnabled( $path )
 			: true;
 		return in_array( $key, $this->args['hide'] ) || !$isOptionEnabled;
@@ -309,7 +309,7 @@ 
 	 */
 	protected function isHiddenOrEmpty( $key, $value )
 	{
-		return $this->isHidden( $key ) || empty( $value );
+		return $this->isHidden( $key ) || empty($value);
 	}
 
 	/**
@@ -328,7 +328,7 @@ 
 	protected function normalizeText( $text )
 	{
 		$text = wp_kses( $text, wp_kses_allowed_html() );
-		$text = convert_smilies( wptexturize( strip_shortcodes( $text )));
+		$text = convert_smilies( wptexturize( strip_shortcodes( $text ) ) );
 		$text = str_replace( ']]>', ']]&gt;', $text );
 		$text = preg_replace( '/(\R){2,}/', '$1', $text );
 		return $this->isOptionEnabled( 'settings.reviews.excerpt.enabled' )
@@ -345,6 +345,6 @@ 
 	{
 		return glsr( Builder::class )->div( $value, [
 			'class' => 'glsr-review-'.$key,
-		]);
+		] );
 	}
 }

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( isset( $field['label'] )) {
+		if( isset($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/Helper.php

Spacing +17 added lines, -17 removed lines

@@ -14,11 +14,11 @@ 
 	 */
 	public function buildClassName( $name, $path = '' )
 	{
-		$className = array_map( 'strtolower', (array)preg_split( '/[-_]/', $name ));
+		$className = array_map( 'strtolower', (array)preg_split( '/[-_]/', $name ) );
 		$className = array_map( 'ucfirst', $className );
 		$className = implode( '', $className );
 		$path = ltrim( str_replace( __NAMESPACE__, '', $path ), '\\' );
-		return !empty( $path )
+		return !empty($path)
 			? __NAMESPACE__.'\\'.$path.'\\'.$className
 			: $className;
 	}
@@ -30,7 +30,7 @@ 
 	 */
 	public function buildMethodName( $name, $prefix = '' )
 	{
-		return lcfirst( $prefix.$this->buildClassName( $name ));
+		return lcfirst( $prefix.$this->buildClassName( $name ) );
 	}
 
 	/**
@@ -39,7 +39,7 @@ 
 	 */
 	public function buildPropertyName( $name )
 	{
-		return lcfirst( $this->buildClassName( $name ));
+		return lcfirst( $this->buildClassName( $name ) );
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function convertPathToId( $path, $prefix = '' )
 	{
-		return str_replace( ['[', ']'], ['-', ''], $this->convertPathToName( $path, $prefix ));
+		return str_replace( ['[', ']'], ['-', ''], $this->convertPathToName( $path, $prefix ) );
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	{
 		$levels = explode( '.', $path );
 		return array_reduce( $levels, function( $result, $value ) {
-			return $result.= '['.$value.']';
+			return $result .= '['.$value.']';
 		}, $prefix );
 	}
 
@@ -91,7 +91,7 @@ 
 	 */
 	public function dashCase( $string )
 	{
-		return str_replace( '_', '-', $this->snakeCase( $string ));
+		return str_replace( '_', '-', $this->snakeCase( $string ) );
 	}
 
 	/**
@@ -117,13 +117,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;
@@ -142,7 +142,7 @@ 
 				Whip::IPV4 => $cloudflareIps['v4'],
 				Whip::IPV6 => $cloudflareIps['v6'],
 			],
-		]))->getValidIpAddress();
+		] ))->getValidIpAddress();
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	{
 		$keys = explode( '.', $path );
 		foreach( $keys as $key ) {
-			if( !isset( $values[$key] )) {
+			if( !isset($values[$key]) ) {
 				return $fallback;
 			}
 			$values = $values[$key];
@@ -169,7 +169,7 @@ 
 	 */
 	public function isIndexedArray( $array )
 	{
-		if( !is_array( $array )) {
+		if( !is_array( $array ) ) {
 			return false;
 		}
 		$current = 0;
@@ -188,7 +188,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 );
@@ -201,7 +201,7 @@ 
 	 */
 	public function prefixString( $string, $prefix = '' )
 	{
-		return $prefix.str_replace( $prefix, '', trim( $string ));
+		return $prefix.str_replace( $prefix, '', trim( $string ) );
 	}
 
 	/**
@@ -247,7 +247,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 = mb_strtolower( $string, 'UTF-8' );
@@ -262,6 +262,6 @@ 
 	 */
 	public function startsWith( $needle, $haystack )
 	{
-		return substr( $haystack, 0, strlen( $needle )) === $needle;
+		return substr( $haystack, 0, strlen( $needle ) ) === $needle;
 	}
 }

plugin/Modules/Html/Fields/Honeypot.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	{
 		$this->builder->args = wp_parse_args( $this->builder->args, [
 			'name' => $this->builder->args['text'],
-		]);
+		] );
 		$this->builder->tag = 'input';
 		$this->mergeFieldArgs();
 		return $this->builder->getOpeningTag();

plugin/Modules/Html/Builder.php

Spacing +24 added lines, -24 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,10 +141,10 @@ 
 	 */
 	protected function buildFormInput()
 	{
-		if( !in_array( $this->args['type'], ['checkbox', 'radio'] )) {
+		if( !in_array( $this->args['type'], ['checkbox', 'radio'] ) ) {
 			return $this->buildFormLabel().$this->getOpeningTag();
 		}
-		return empty( $this->args['options'] )
+		return empty($this->args['options'])
 			? $this->buildFormInputChoice()
 			: $this->buildFormInputMultiChoice();
 	}
@@ -163,7 +163,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']}([
@@ -171,12 +171,12 @@ 
 				'name' => $this->args['name'],
 				'text' => $this->args['options'][$key],
 				'value' => $key,
-			]));
+			]) );
 		});
 		return $this->ul( $options, [
 			'class' => $this->args['class'],
 			'id' => $this->args['id'],
-		]);
+		] );
 	}
 
 	/**
@@ -184,11 +184,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'],
-		]);
+		] );
 	}
 
 	/**
@@ -205,11 +205,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,
-			]);
+			] );
 		});
 	}
 
@@ -227,10 +227,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();
@@ -251,7 +251,7 @@ 
 	{
 		$args = glsr( BuilderDefaults::class )->merge( $this->args );
 		$className = $this->getCustomFieldClassName();
-		if( class_exists( $className )) {
+		if( class_exists( $className ) ) {
 			$args = array_merge(
 				wp_parse_args( $args, $className::defaults() ),
 				$className::required()
@@ -266,13 +266,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];
 		}
 	}
@@ -296,7 +296,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/Html/Field.php

Spacing +15 added lines, -15 removed lines

@@ -25,7 +25,7 @@ 
 			'is_valid' => true,
 			'is_widget' => false,
 			'path' => '',
-		]);
+		] );
 		$this->normalize();
 	}
 
@@ -71,9 +71,9 @@ 
 		return glsr( Template::class )->build( 'partials/form/field', [
 			'context' => [
 				'class' => $this->getFieldClass(),
-				'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ),
+				'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -84,10 +84,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']] ),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -96,16 +96,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'],
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 		if( $this->field['is_hidden'] ) {
 			$classes[] = 'hidden';
 		}
-		if( !empty( $this->field['required'] )) {
+		if( !empty($this->field['required']) ) {
 			$classes[] = 'glsr-required';
 		}
 		return implode( ' ', $classes );
@@ -128,7 +128,7 @@ 
 	 */
 	protected function getFieldDependsOn()
 	{
-		return !empty( $this->field['data-depends'] )
+		return !empty($this->field['data-depends'])
 			? $this->field['data-depends']
 			: '';
 	}
@@ -153,13 +153,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'];
@@ -173,7 +173,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()
@@ -188,7 +188,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()