pryley / site-reviews

plugin/Widgets/Widget.php

Spacing +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@ 
 	public function __construct( $idBase, $name, $values )
 	{
 		$controlOptions = $widgetOptions = [];
-		if( isset( $values['class'] )) {
+		if( isset($values['class']) ) {
 			$widgetOptions['classname'] = $values['class'];
 		}
-		if( isset( $values['description'] )) {
+		if( isset($values['description']) ) {
 			$widgetOptions['description'] = $values['description'];
 		}
-		if( isset( $values['width'] )) {
+		if( isset($values['width']) ) {
 			$controlOptions['width'] = $values['width'];
 		}
 		parent::__construct( $idBase, $name, $widgetOptions, $controlOptions );
@@ -34,10 +34,10 @@ 
 	protected function renderField( $tag, array $args = [] )
 	{
 		$args = $this->normalizeFieldAttributes( $tag, $args );
-		$field = glsr( Builder::class )->{$tag}( $args['name'], $args );
+		$field = glsr( Builder::class )->{$tag}($args['name'], $args);
 		echo glsr( Builder::class )->div( $field, [
 			'class' => 'glsr-field',
-		]);
+		] );
 	}
 
 	/**
@@ -46,10 +46,10 @@ 
 	 */
 	protected function normalizeFieldAttributes( $tag, array $args )
 	{
-		if( empty( $args['value'] )) {
+		if( empty($args['value']) ) {
 			$args['value'] = $this->widgetArgs[$args['name']];
 		}
-		if( empty( $this->widgetArgs['options'] ) && in_array( $tag, ['checkbox', 'radio'] )) {
+		if( empty($this->widgetArgs['options']) && in_array( $tag, ['checkbox', 'radio'] ) ) {
 			$args['checked'] = in_array( $args['value'], (array)$this->widgetArgs[$args['name']] );
 		}
 		$args['id'] = $this->get_field_id( $args['name'] );

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 normalizeId()
 	{
-		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()

Braces +12 added lines, -4 removed lines

@@ -42,7 +42,9 @@ 
 	 */
 	public function build()
 	{
-		if( !$this->field['is_valid'] )return;
+		if( !$this->field['is_valid'] ) {
+			return;
+		}
 		if( $this->field['is_raw'] ) {
 			return glsr( Builder::class )->hidden( $this->field );
 		}
@@ -153,7 +155,9 @@ 
 			'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;
 		}
@@ -170,7 +174,9 @@ 
 	 */
 	protected function normalize()
 	{
-		if( !$this->isFieldValid() )return;
+		if( !$this->isFieldValid() ) {
+			return;
+		}
 		$this->field['path'] = $this->field['name'];
 		$className = glsr( Helper::class )->buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' );
 		if( class_exists( $className )) {
@@ -188,7 +194,9 @@ 
 	 */
 	protected function normalizeId()
 	{
-		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/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';
 		}

Braces +9 added lines, -3 removed lines

@@ -80,7 +80,9 @@ 
 		];
 		if( !isset( $properties[$property] )
 			|| empty( array_filter( [$value], $properties[$property] ))
-		)return;
+		) {
+			return;
+		}
 		$this->$property = $value;
 	}
 
@@ -129,7 +131,9 @@ 
 	 */
 	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'] );
 		}
@@ -184,7 +188,9 @@ 
 	 */
 	protected function buildFormLabel()
 	{
-		if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' )return;
+		if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' ) {
+			return;
+		}
 		return $this->label([
 			'for' => $this->args['id'],
 			'text' => $this->args['label'],