pryley / site-reviews

views/partials/translations/single.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 			<p>{{ data.s1 }}</p>
 		</div>
 		<p class="row-actions">
-			<span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' );?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span>
+			<span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' ); ?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span>
 		</p>
 	</td>
 	<td class="glsr-string-td2">

views/partials/translations/plural.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 			<p>{{ data.p1 }}</p>
 		</div>
 		<p class="row-actions">
-			<span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' );?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span>
+			<span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' ); ?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span>
 		</p>
 	</td>
 	<td class="glsr-string-td2">

plugin/Modules/Translator.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 	{
 		return $this->translate( $translation, $domain, [
 			'single' => $text,
-		]);
+		] );
 	}
 
 	/**
@@ -33,7 +33,7 @@ 
 		return $this->translate( $translation, $domain, [
 			'context' => $context,
 			'single' => $text,
-		]);
+		] );
 	}
 
 	/**
@@ -50,7 +50,7 @@ 
 			'number' => $number,
 			'plural' => $plural,
 			'single' => $single,
-		]);
+		] );
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 			'number' => $number,
 			'plural' => $plural,
 			'single' => $single,
-		]);
+		] );
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 		}
 		$args = $this->normalizeTranslationArgs( $args );
 		$strings = $this->getTranslationStrings( $args['single'], $args['plural'] );
-		if( empty( $strings )) {
+		if( empty($strings) ) {
 			return $original;
 		}
 		$string = current( $strings );
@@ -100,7 +100,7 @@ 
 	 */
 	protected function getTranslationStrings( $single, $plural )
 	{
-		return array_filter( glsr( Translation::class )->translations(), function( $string ) use( $single, $plural ) {
+		return array_filter( glsr( Translation::class )->translations(), function( $string ) use($single, $plural) {
 			return $string['s1'] == html_entity_decode( $single, ENT_COMPAT, 'UTF-8' )
 				&& $string['p1'] == html_entity_decode( $plural, ENT_COMPAT, 'UTF-8' );
 		});
@@ -126,10 +126,10 @@ 
 	 */
 	protected function translatePlural( $domain, array $string, array $args )
 	{
-		if( !empty( $string['s2'] )) {
+		if( !empty($string['s2']) ) {
 			$args['single'] = $string['s2'];
 		}
-		if( !empty( $string['p2'] )) {
+		if( !empty($string['p2']) ) {
 			$args['plural'] = $string['p2'];
 		}
 		return get_translations_for_domain( $domain )->translate_plural(
@@ -146,7 +146,7 @@ 
 	 */
 	protected function translateSingle( $domain, array $string, array $args )
 	{
-		if( !empty( $string['s2'] )) {
+		if( !empty($string['s2']) ) {
 			$args['single'] = $string['s2'];
 		}
 		return get_translations_for_domain( $domain )->translate(

plugin/Modules/Upgrader.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 			$className = str_replace( '.php', '', $file );
 			$version = str_replace( ['Upgrade_', '_'], ['', '.'], $className );
 			$versionSuffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions
-			if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ))return;
+			if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ) )return;
 			glsr( 'Modules\\Upgrader\\'.$className );
 			glsr_log()->info( 'Completed Upgrade for v'.$version.$versionSuffix );
 		});

Braces +6 added lines, -2 removed lines

@@ -20,7 +20,9 @@ 
 		$filenames = [];
 		$iterator = new DirectoryIterator( dirname( __FILE__ ).'/Upgrader' );
 		foreach( $iterator as $fileinfo ) {
-			if( !$fileinfo->isFile() )continue;
+			if( !$fileinfo->isFile() ) {
+				continue;
+			}
 			$filenames[] = $fileinfo->getFilename();
 		}
 		natsort( $filenames );
@@ -28,7 +30,9 @@ 
 			$className = str_replace( '.php', '', $file );
 			$version = str_replace( ['Upgrade_', '_'], ['', '.'], $className );
 			$versionSuffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions
-			if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ))return;
+			if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' )) {
+				return;
+			}
 			glsr( 'Modules\\Upgrader\\'.$className );
 			glsr_log()->info( 'Completed Upgrade for v'.$version.$versionSuffix );
 		});

plugin/Modules/Html/Settings.php

Spacing +18 added lines, -18 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	protected function getFieldDefault( array $field )
 	{
-		return isset( $field['default'] )
+		return isset($field['default'])
 			? $field['default']
 			: '';
 	}
@@ -40,7 +40,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 );
 	}
@@ -55,8 +55,8 @@ 
 			$field = wp_parse_args( $field, [
 				'is_setting' => true,
 				'name' => $name,
-			]);
-			$rows.= new Field( $this->normalize( $field ));
+			] );
+			$rows .= new Field( $this->normalize( $field ) );
 		}
 		return $rows;
 	}
@@ -67,7 +67,7 @@ 
 	 */
 	protected function getTemplateData( $id )
 	{
-		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ));
+		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
 		return [
 			'context' => [
 				'rows' => $this->getSettingRows( $fields ),
@@ -81,12 +81,12 @@ 
 	 */
 	protected function getTemplateDataForAddons( $id )
 	{
-		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ));
+		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
 		$settings = glsr( Helper::class )->convertDotNotationArray( $fields );
 		$settingKeys = array_keys( $settings['settings']['addons'] );
 		$results = [];
 		foreach( $settingKeys as $key ) {
-			$addonFields = array_filter( $fields, function( $path ) use( $key ) {
+			$addonFields = array_filter( $fields, function( $path ) use($key) {
 				return glsr( Helper::class )->startsWith( 'settings.addons.'.$key, $path );
 			}, ARRAY_FILTER_USE_KEY );
 			$results[$key] = $this->getSettingRows( $addonFields );
@@ -102,7 +102,7 @@ 
 	protected function getTemplateDataForTranslations()
 	{
 		$translations = glsr( Translation::class )->renderAll();
-		$class = empty( $translations )
+		$class = empty($translations)
 			? 'glsr-hidden'
 			: '';
 		return [
@@ -125,9 +125,9 @@ 
 			$path,
 			glsr( Helper::class )->getPathValue( $path, glsr()->defaults )
 		);
-		if( is_array( $expectedValue )) {
+		if( is_array( $expectedValue ) ) {
 			return is_array( $optionValue )
-				? count( array_intersect( $optionValue, $expectedValue )) === 0
+				? count( array_intersect( $optionValue, $expectedValue ) ) === 0
 				: !in_array( $optionValue, $expectedValue );
 		}
 		return $optionValue != $expectedValue;
@@ -149,17 +149,17 @@ 
 	 */
 	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];
 			$fieldName = glsr( Helper::class )->convertPathToName( $path, OptionManager::databaseKey() );
-			if( is_array( $expectedValue )) {
-				$fieldName.= '[]';
+			if( is_array( $expectedValue ) ) {
+				$fieldName .= '[]';
 			}
-			$field['data-depends'] = json_encode([
+			$field['data-depends'] = json_encode( [
 				'name' => $fieldName,
 				'value' => $expectedValue,
-			], JSON_HEX_APOS|JSON_HEX_QUOT );
+			], JSON_HEX_APOS | JSON_HEX_QUOT );
 			$field['is_hidden'] = $this->isFieldHidden( $path, $expectedValue );
 		}
 		return $field;
@@ -170,9 +170,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;
@@ -186,7 +186,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/Attributes.php

Spacing +14 added lines, -14 removed lines

@@ -122,7 +122,7 @@ 
 	 */
 	protected function filterAttributes( array $allowedAttributeKeys )
 	{
-		return array_intersect_key( $this->attributes, array_flip( $allowedAttributeKeys ));
+		return array_intersect_key( $this->attributes, array_flip( $allowedAttributeKeys ) );
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 		$globalAttributes = $this->filterAttributes( static::GLOBAL_ATTRIBUTES );
 		$wildcards = [];
 		foreach( static::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard ) {
-			$newWildcards = array_filter( $this->attributes, function( $key ) use( $wildcard ) {
+			$newWildcards = array_filter( $this->attributes, function( $key ) use($wildcard) {
 				return glsr( Helper::class )->startsWith( $wildcard, $key );
 			}, ARRAY_FILTER_USE_KEY );
 			$wildcards = array_merge( $wildcards, $newWildcards );
@@ -147,7 +147,7 @@ 
 	protected function getPermanentAttributes()
 	{
 		$permanentAttributes = [];
-		if( array_key_exists( 'value', $this->attributes )) {
+		if( array_key_exists( 'value', $this->attributes ) ) {
 			$permanentAttributes['value'] = $this->attributes['value'];
 		}
 		return $permanentAttributes;
@@ -199,11 +199,11 @@ 
 	protected function normalizeBooleanAttributes()
 	{
 		foreach( $this->attributes as $key => $value ) {
-			if( $this->isAttributeKeyNumeric( $key, $value )) {
+			if( $this->isAttributeKeyNumeric( $key, $value ) ) {
 				$key = $value;
 				$value = true;
 			}
-			if( !in_array( $key, static::BOOLEAN_ATTRIBUTES ))continue;
+			if( !in_array( $key, static::BOOLEAN_ATTRIBUTES ) )continue;
 			$this->attributes[$key] = wp_validate_boolean( $value );
 		}
 	}
@@ -214,13 +214,13 @@ 
 	protected function normalizeDataAttributes()
 	{
 		foreach( $this->attributes as $key => $value ) {
-			if( $this->isAttributeKeyNumeric( $key, $value )) {
+			if( $this->isAttributeKeyNumeric( $key, $value ) ) {
 				$key = $value;
 				$value = '';
 			}
-			if( !glsr( Helper::class )->startsWith( 'data-', $key ))continue;
-			if( is_array( $value )) {
-				$value = json_encode( $value, JSON_HEX_APOS|JSON_NUMERIC_CHECK|JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE );
+			if( !glsr( Helper::class )->startsWith( 'data-', $key ) )continue;
+			if( is_array( $value ) ) {
+				$value = json_encode( $value, JSON_HEX_APOS | JSON_NUMERIC_CHECK | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE );
 			}
 			$this->attributes[$key] = $value;
 		}
@@ -232,7 +232,7 @@ 
 	protected function normalizeStringAttributes()
 	{
 		foreach( $this->attributes as $key => $value ) {
-			if( !is_string( $value ))continue;
+			if( !is_string( $value ) )continue;
 			$this->attributes[$key] = trim( $value );
 		}
 	}
@@ -245,7 +245,7 @@ 
 	{
 		if( $method != 'input' )return;
 		$attributes = wp_parse_args( $this->attributes, ['type' => ''] );
-		if( !in_array( $attributes['type'], static::INPUT_TYPES )) {
+		if( !in_array( $attributes['type'], static::INPUT_TYPES ) ) {
 			$this->attributes['type'] = 'text';
 		}
 	}
@@ -259,11 +259,11 @@ 
 		$permanentAttributes = $this->getPermanentAttributes();
 		foreach( $this->attributes as $key => $value ) {
 			if( in_array( $key, static::BOOLEAN_ATTRIBUTES ) && !$value ) {
-				unset( $attributes[$key] );
+				unset($attributes[$key]);
 			}
-			if( glsr( Helper::class )->startsWith( 'data-', $key )) {
+			if( glsr( Helper::class )->startsWith( 'data-', $key ) ) {
 				$permanentAttributes[$key] = $value;
-				unset( $attributes[$key] );
+				unset($attributes[$key]);
 			}
 		}
 		$this->attributes = array_merge( array_filter( $attributes ), $permanentAttributes );

Braces +12 added lines, -4 removed lines

@@ -203,7 +203,9 @@ 
 				$key = $value;
 				$value = true;
 			}
-			if( !in_array( $key, static::BOOLEAN_ATTRIBUTES ))continue;
+			if( !in_array( $key, static::BOOLEAN_ATTRIBUTES )) {
+				continue;
+			}
 			$this->attributes[$key] = wp_validate_boolean( $value );
 		}
 	}
@@ -218,7 +220,9 @@ 
 				$key = $value;
 				$value = '';
 			}
-			if( !glsr( Helper::class )->startsWith( 'data-', $key ))continue;
+			if( !glsr( Helper::class )->startsWith( 'data-', $key )) {
+				continue;
+			}
 			if( is_array( $value )) {
 				$value = json_encode( $value, JSON_HEX_APOS|JSON_NUMERIC_CHECK|JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE );
 			}
@@ -232,7 +236,9 @@ 
 	protected function normalizeStringAttributes()
 	{
 		foreach( $this->attributes as $key => $value ) {
-			if( !is_string( $value ))continue;
+			if( !is_string( $value )) {
+				continue;
+			}
 			$this->attributes[$key] = trim( $value );
 		}
 	}
@@ -243,7 +249,9 @@ 
 	 */
 	protected function normalizeInputType( $method )
 	{
-		if( $method != 'input' )return;
+		if( $method != 'input' ) {
+			return;
+		}
 		$attributes = wp_parse_args( $this->attributes, ['type' => ''] );
 		if( !in_array( $attributes['type'], static::INPUT_TYPES )) {
 			$this->attributes['type'] = 'text';

plugin/Modules/Translation.php

Spacing +24 added lines, -24 removed lines

@@ -30,7 +30,7 @@ 
 	{
 		$translations = $this->translations();
 		$entries = $this->filter( $translations, $this->entries() )->results();
-		array_walk( $translations, function( &$entry ) use( $entries ) {
+		array_walk( $translations, function( &$entry ) use($entries) {
 			$entry['desc'] = array_key_exists( $entry['id'], $entries )
 				? $this->getEntryString( $entries[$entry['id']], 'msgctxt' )
 				: '';
@@ -43,7 +43,7 @@ 
 	 */
 	public function entries()
 	{
-		if( !isset( $this->entries )) {
+		if( !isset($this->entries) ) {
 			try {
 				$potFile = glsr()->path( glsr()->languages.'/'.Application::ID.'.pot' );
 				$entries = $this->normalize( Parser::parseFile( $potFile )->getEntries() );
@@ -76,13 +76,13 @@ 
 	 */
 	public function filter( $filterWith = null, $entries = null, $intersect = true )
 	{
-		if( !is_array( $entries )) {
+		if( !is_array( $entries ) ) {
 			$entries = $this->results;
 		}
-		if( !is_array( $filterWith )) {
+		if( !is_array( $filterWith ) ) {
 			$filterWith = $this->translations();
 		}
-		$keys = array_flip( array_column( $filterWith, 'id' ));
+		$keys = array_flip( array_column( $filterWith, 'id' ) );
 		$this->results = $intersect
 			? array_intersect_key( $entries, $keys )
 			: array_diff_key( $entries, $keys );
@@ -96,17 +96,17 @@ 
 	public function render( $template, array $entry )
 	{
 		$data = array_combine(
-			array_map( function( $key ) { return 'data.'.$key; }, array_keys( $entry )),
+			array_map( function( $key ) { return 'data.'.$key; }, array_keys( $entry ) ),
 			$entry
 		);
 		$data['data.class'] = $data['data.error'] = '';
-		if( array_search( $entry['s1'], array_column( $this->entries(), 'msgid' )) === false ) {
+		if( array_search( $entry['s1'], array_column( $this->entries(), 'msgid' ) ) === false ) {
 			$data['data.class'] = 'is-invalid';
 			$data['data.error'] = __( 'This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews' );
 		}
 		return glsr( Template::class )->build( 'partials/translations/'.$template, [
 			'context' => $data,
-		]);
+		] );
 	}
 
 	/**
@@ -138,13 +138,13 @@ 
 				'p1' => $this->getEntryString( $entry, 'msgid_plural' ),
 				's1' => $this->getEntryString( $entry, 'msgid' ),
 			];
-			$text = !empty( $data['p1'] )
+			$text = !empty($data['p1'])
 				? sprintf( '%s | %s', $data['s1'], $data['p1'] )
 				: $data['s1'];
 			$rendered .= $this->render( 'result', [
-				'entry' => json_encode( $data, JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_TAG|JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE ),
+				'entry' => json_encode( $data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ),
 				'text' => wp_strip_all_tags( $text ),
-			]);
+			] );
 		}
 		if( $resetAfterRender ) {
 			$this->reset();
@@ -177,12 +177,12 @@ 
 	public function search( $needle = '' )
 	{
 		$this->reset();
-		$needle = trim( strtolower( $needle ));
+		$needle = trim( strtolower( $needle ) );
 		foreach( $this->entries() as $key => $entry ) {
-			$single = strtolower( $this->getEntryString( $entry, 'msgid' ));
-			$plural = strtolower( $this->getEntryString( $entry, 'msgid_plural' ));
+			$single = strtolower( $this->getEntryString( $entry, 'msgid' ) );
+			$plural = strtolower( $this->getEntryString( $entry, 'msgid_plural' ) );
 			if( strlen( $needle ) < static::SEARCH_THRESHOLD ) {
-				if( in_array( $needle, [$single, $plural] )) {
+				if( in_array( $needle, [$single, $plural] ) ) {
 					$this->results[$key] = $entry;
 				}
 			}
@@ -200,10 +200,10 @@ 
 	public function translations()
 	{
 		static $translations;
-		if( empty( $translations )) {
+		if( empty($translations) ) {
 			$settings = glsr( OptionManager::class )->get( 'settings' );
-			$translations = isset( $settings['strings'] )
-				? $this->normalizeSettings( (array) $settings['strings'] )
+			$translations = isset($settings['strings'])
+				? $this->normalizeSettings( (array)$settings['strings'] )
 				: [];
 		}
 		return $translations;
@@ -215,8 +215,8 @@ 
 	 */
 	protected function getEntryString( array $entry, $key )
 	{
-		return isset( $entry[$key] )
-			? implode( '', (array) $entry[$key] )
+		return isset($entry[$key])
+			? implode( '', (array)$entry[$key] )
 			: '';
 	}
 
@@ -228,7 +228,7 @@ 
 		$keys = [
 			'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
 		];
-		array_walk( $entries, function( &$entry ) use( $keys ) {
+		array_walk( $entries, function( &$entry ) use($keys) {
 			foreach( $keys as $key ) {
 				$entry = $this->normalizeEntryString( $entry, $key );
 			}
@@ -242,7 +242,7 @@ 
 	 */
 	protected function normalizeEntryString( array $entry, $key )
 	{
-		if( isset( $entry[$key] )) {
+		if( isset($entry[$key]) ) {
 			$entry[$key] = $this->getEntryString( $entry, $key );
 		}
 		return $entry;
@@ -256,11 +256,11 @@ 
 		$defaultString = array_fill_keys( ['id', 's1', 's2', 'p1', 'p2'], '' );
 		$strings = array_filter( $strings, 'is_array' );
 		foreach( $strings as &$string ) {
-			$string['type'] = isset( $string['p1'] ) ? 'plural' : 'single';
+			$string['type'] = isset($string['p1']) ? 'plural' : 'single';
 			$string = wp_parse_args( $string, $defaultString );
 		}
 		return array_filter( $strings, function( $string ) {
-			return !empty( $string['id'] );
+			return !empty($string['id']);
 		});
 	}
 }

plugin/Modules/Upgrader/Upgrade_3_0_0.php

Spacing +6 added lines, -6 removed lines

@@ -74,9 +74,9 @@ 
 	{
 		$this->newSettings = $this->getNewSettings();
 		$this->oldSettings = $this->getOldSettings();
-		if( empty( $this->oldSettings ))return;
+		if( empty($this->oldSettings) )return;
 		foreach( static::MAPPED_SETTINGS as $old => $new ) {
-			if( empty( $this->oldSettings[$old] ))continue;
+			if( empty($this->oldSettings[$old]) )continue;
 			$this->newSettings[$new] = $this->oldSettings[$old];
 		}
 		$this->migrateNotificationSettings();
@@ -84,7 +84,7 @@ 
 		$this->migrateRequiredSettings();
 		$oldSettings = glsr( Helper::class )->convertDotNotationArray( $this->oldSettings );
 		$newSettings = glsr( Helper::class )->convertDotNotationArray( $this->newSettings );
-		if( isset( $oldSettings['settings']['strings'] ) && is_array( $oldSettings['settings']['strings'] )) {
+		if( isset($oldSettings['settings']['strings']) && is_array( $oldSettings['settings']['strings'] ) ) {
 			$newSettings['settings']['strings'] = $oldSettings['settings']['strings'];
 		}
 		glsr( OptionManager::class )->set( $newSettings );
@@ -117,8 +117,8 @@ 
 	protected function getOldSettings()
 	{
 		$defaults = array_fill_keys( array_keys( static::MAPPED_SETTINGS ), '' );
-		$settings = glsr( Helper::class )->flattenArray( get_option( 'geminilabs_site_reviews-v2', [] ));
-		if( !empty( $settings )) {
+		$settings = glsr( Helper::class )->flattenArray( get_option( 'geminilabs_site_reviews-v2', [] ) );
+		if( !empty($settings) ) {
 			$settings = wp_parse_args( $settings, $defaults );
 		}
 		return $settings;
@@ -151,7 +151,7 @@ 
 			'SecretKey' => $this->oldSettings['settings.reviews-form.recaptcha.secret'],
 			'SiteKey' => $this->oldSettings['settings.reviews-form.recaptcha.key'],
 		];
-		if( in_array( $this->oldSettings['settings.reviews-form.recaptcha.integration'], ['custom', 'invisible-recaptcha'] )) {
+		if( in_array( $this->oldSettings['settings.reviews-form.recaptcha.integration'], ['custom', 'invisible-recaptcha'] ) ) {
 			$this->newSettings['settings.submissions.recaptcha.integration'] = 'all';
 		}
 		if( $this->oldSettings['settings.reviews-form.recaptcha.integration'] == 'invisible-recaptcha' ) {

Braces +9 added lines, -3 removed lines

@@ -74,9 +74,13 @@ 
 	{
 		$this->newSettings = $this->getNewSettings();
 		$this->oldSettings = $this->getOldSettings();
-		if( empty( $this->oldSettings ))return;
+		if( empty( $this->oldSettings )) {
+			return;
+		}
 		foreach( static::MAPPED_SETTINGS as $old => $new ) {
-			if( empty( $this->oldSettings[$old] ))continue;
+			if( empty( $this->oldSettings[$old] )) {
+				continue;
+			}
 			$this->newSettings[$new] = $this->oldSettings[$old];
 		}
 		$this->migrateNotificationSettings();
@@ -136,7 +140,9 @@ 
 		];
 		$this->newSettings['settings.general.notifications'] = [];
 		foreach( $notifications as $old => $new ) {
-			if( $this->oldSettings['settings.general.notification'] != $old )continue;
+			if( $this->oldSettings['settings.general.notification'] != $old ) {
+				continue;
+			}
 			$this->newSettings['settings.general.notifications'][] = $new;
 		}
 	}

plugin/Controllers/AdminController.php

Spacing +32 added lines, -32 removed lines

@@ -25,7 +25,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',
@@ -37,7 +37,7 @@ 
 				'target' => '#misc-pub-pinned',
 				'title' => __( 'Pin Your Reviews', 'site-reviews' ),
 			]],
-		]);
+		] );
 		$this->execute( $command );
 	}
 
@@ -49,7 +49,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,19 +60,19 @@ 
 	public function filterDashboardGlanceItems( array $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[] = 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;
 	}
 
@@ -83,7 +83,7 @@ 
 	public function filterTinymcePlugins( array $plugins )
 	{
 		if( user_can_richedit()
-			&& ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ))) {
+			&& (current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' )) ) {
 			$plugins['glsr_shortcode'] = glsr()->url( 'assets/scripts/mce-plugin.js' );
 		}
 		return $plugins;
@@ -95,11 +95,11 @@ 
 	 */
 	public function registerShortcodeButtons()
 	{
-		$command = new RegisterShortcodeButtons([
+		$command = new RegisterShortcodeButtons( [
 			'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 );
 	}
 
@@ -109,10 +109,10 @@ 
 	 */
 	public function renderReviewEditor( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return;
+		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) )return;
 		glsr()->render( 'partials/editor/review', [
 			'post' => $post,
-		]);
+		] );
 	}
 
 	/**
@@ -121,13 +121,13 @@ 
 	 */
 	public function renderReviewNotice( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return;
-		glsr( Notice::class )->addWarning( __( 'This review is read-only.', 'site-reviews' ));
+		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) )return;
+		glsr( Notice::class )->addWarning( __( 'This review is read-only.', 'site-reviews' ) );
 		glsr( Template::class )->render( 'partials/editor/notice', [
 			'context' => [
 				'notices' => glsr( Notice::class )->get(),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -141,10 +141,10 @@ 
 		foreach( glsr()->mceShortcodes as $shortcode => $values ) {
 			$shortcodes[$shortcode] = $values;
 		}
-		if( empty( $shortcodes ))return;
+		if( empty($shortcodes) )return;
 		glsr()->render( 'partials/editor/tinymce', [
 			'shortcodes' => $shortcodes,
-		]);
+		] );
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 	public function routerClearConsole()
 	{
 		glsr( Console::class )->clear();
-		glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ));
+		glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ) );
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 	 */
 	public function routerFetchConsole()
 	{
-		glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ));
+		glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ) );
 	}
 
 	/**
@@ -171,20 +171,20 @@ 
 	public function routerCountReviews( $showNotice = true )
 	{
 		$countManager = glsr( CountsManager::class );
-		$terms = get_terms([
+		$terms = get_terms( [
 			'hide_empty' => true,
 			'taxonomy' => Application::TAXONOMY,
-		]);
+		] );
 		foreach( $terms as $term ) {
-			$countManager->setTermCounts( $term->term_id, $countManager->buildTermCounts( $term->term_id ));
+			$countManager->setTermCounts( $term->term_id, $countManager->buildTermCounts( $term->term_id ) );
 		}
 		$postIds = glsr( SqlQueries::class )->getReviewsMeta( 'assigned_to' );
 		foreach( $postIds as $postId ) {
-			$countManager->setPostCounts( $postId, $countManager->buildPostCounts( $postId ));
+			$countManager->setPostCounts( $postId, $countManager->buildPostCounts( $postId ) );
 		}
 		$countManager->setCounts( $countManager->buildCounts() );
 		if( $showNotice ) {
-			glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ));
+			glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ) );
 		}
 	}
 
@@ -219,17 +219,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' ) );
 	}
 
 	/**
@@ -247,7 +247,7 @@ 
 			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 !isset( $errors[$errorCode] )
+		return !isset($errors[$errorCode])
 			? __( 'Unknown upload error.', 'site-reviews' )
 			: $errors[$errorCode];
 	}