pryley / site-reviews

plugin/Modules/Html/Field.php

Spacing +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 			'is_setting' => false,
 			'is_valid' => true,
 			'path' => '',
-		]);
+		] );
 		$this->normalize();
 	}
 
@@ -72,9 +72,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),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -85,10 +85,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']] ),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -97,16 +97,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'],
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 		if( $this->field['is_hidden'] ) {
 			$classes[] = 'hidden';
 		}
-		if( !empty( $this->field['required'] )) {
+		if( !empty($this->field['required']) ) {
 			$classes[] = 'glsr-required';
 		}
 		return implode( ' ', $classes );
@@ -129,7 +129,7 @@ 
 	 */
 	protected function getFieldDependsOn()
 	{
-		return !empty( $this->field['data-depends'] )
+		return !empty($this->field['data-depends'])
 			? $this->field['data-depends']
 			: '';
 	}
@@ -154,13 +154,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'];
@@ -174,7 +174,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()
@@ -190,7 +190,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()
@@ -214,7 +214,7 @@ 
 	 */
 	protected function determineIfMulti()
 	{
-		if( !in_array( $this->field['type'], static::MULTI_FIELD_TYPES ))return;
+		if( !in_array( $this->field['type'], static::MULTI_FIELD_TYPES ) )return;
 		$this->field['is_multi'] = true;
 	}
 }

Braces +15 added lines, -5 removed lines

@@ -43,7 +43,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 );
 		}
@@ -154,7 +156,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;
 		}
@@ -171,7 +175,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 )) {
@@ -190,7 +196,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()
@@ -214,7 +222,9 @@ 
 	 */
 	protected function determineIfMulti()
 	{
-		if( !in_array( $this->field['type'], static::MULTI_FIELD_TYPES ))return;
+		if( !in_array( $this->field['type'], static::MULTI_FIELD_TYPES )) {
+			return;
+		}
 		$this->field['is_multi'] = true;
 	}
 }

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