pryley / site-reviews

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/AjaxController.php

Spacing +19 added lines, -19 removed lines

@@ -22,7 +22,7 @@ 
 	 */
 	public function routerChangeStatus( array $request )
 	{
-		wp_send_json_success( $this->execute( new ChangeStatus( $request )));
+		wp_send_json_success( $this->execute( new ChangeStatus( $request ) ) );
 	}
 
 	/**
@@ -31,10 +31,10 @@ 
 	public function routerClearConsole()
 	{
 		glsr( AdminController::class )->routerClearConsole();
-		wp_send_json_success([
+		wp_send_json_success( [
 			'console' => glsr( Console::class )->get(),
 			'notices' => glsr( Notice::class )->get(),
-		]);
+		] );
 	}
 
 	/**
@@ -43,9 +43,9 @@ 
 	public function routerCountReviews()
 	{
 		glsr( AdminController::class )->routerCountReviews();
-		wp_send_json_success([
+		wp_send_json_success( [
 			'notices' => glsr( Notice::class )->get(),
-		]);
+		] );
 	}
 
 	/**
@@ -55,9 +55,9 @@ 
 	{
 		$shortcode = $request['shortcode'];
 		$response = false;
-		if( array_key_exists( $shortcode, glsr()->mceShortcodes )) {
+		if( array_key_exists( $shortcode, glsr()->mceShortcodes ) ) {
 			$data = glsr()->mceShortcodes[$shortcode];
-			if( !empty( $data['errors'] )) {
+			if( !empty($data['errors']) ) {
 				$data['btn_okay'] = [esc_html__( 'Okay', 'site-reviews' )];
 			}
 			$response = [
@@ -77,10 +77,10 @@ 
 	public function routerFetchConsole()
 	{
 		glsr( AdminController::class )->routerFetchConsole();
-		wp_send_json_success([
+		wp_send_json_success( [
 			'console' => glsr( Console::class )->get(),
 			'notices' => glsr( Notice::class )->get(),
-		]);
+		] );
 	}
 
 	/**
@@ -89,10 +89,10 @@ 
 	public function routerSearchPosts( array $request )
 	{
 		$results = glsr( Database::class )->searchPosts( $request['search'] );
-		wp_send_json_success([
+		wp_send_json_success( [
 			'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
 			'items' => $results,
-		]);
+		] );
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 */
 	public function routerSearchTranslations( array $request )
 	{
-		if( empty( $request['exclude'] )) {
+		if( empty($request['exclude']) ) {
 			$request['exclude'] = [];
 		}
 		$results = glsr( Translation::class )
@@ -108,10 +108,10 @@ 
 			->exclude()
 			->exclude( $request['exclude'] )
 			->renderResults();
-		wp_send_json_success([
+		wp_send_json_success( [
 			'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
 			'items' => $results,
-		]);
+		] );
 	}
 
 	/**
@@ -124,9 +124,9 @@ 
 			'errors' => glsr( Session::class )->get( $request['form_id'].'errors', false, true ),
 			'message' => glsr( Session::class )->get( $request['form_id'].'message', '', true ),
 			'recaptcha' => glsr( Session::class )->get( $request['form_id'].'recaptcha', false, true ),
-			'redirect' => trim( strval( get_post_meta( intval( $request['post_id'] ), 'redirect_to', true ))),
+			'redirect' => trim( strval( get_post_meta( intval( $request['post_id'] ), 'redirect_to', true ) ) ),
 		];
-		if( !wp_validate_boolean( $data['errors'] )) {
+		if( !wp_validate_boolean( $data['errors'] ) ) {
 			glsr( Session::class )->clear();
 			wp_send_json_success( $data );
 		}
@@ -138,10 +138,10 @@ 
 	 */
 	public function routerTogglePinned( array $request )
 	{
-		$isPinned = $this->execute( new TogglePinned( $request ));
-		wp_send_json_success([
+		$isPinned = $this->execute( new TogglePinned( $request ) );
+		wp_send_json_success( [
 			'notices' => glsr( Notice::class )->get(),
 			'pinned' => $isPinned,
-		]);
+		] );
 	}
 }

helpers.php

Spacing +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
  */
 function glsr( $alias = null ) {
 	$app = \GeminiLabs\SiteReviews\Application::load();
-	return !empty( $alias )
+	return !empty($alias)
 		? $app->make( $alias )
 		: $app;
 }
@@ -15,7 +15,7 @@ 
  * @return false|\GeminiLabs\SiteReviews\Review
  */
 function glsr_create_review( array $reviewValues = [] ) {
-	if( empty( $reviewValues )) {
+	if( empty($reviewValues) ) {
 		return false;
 	}
 	$review = new \GeminiLabs\SiteReviews\Commands\CreateReview( $reviewValues );
@@ -26,10 +26,10 @@ 
  * @return \WP_Screen|object
  */
 function glsr_current_screen() {
-	if( function_exists( 'get_current_screen' )) {
+	if( function_exists( 'get_current_screen' ) ) {
 		$screen = get_current_screen();
 	}
-	return empty( $screen )
+	return empty($screen)
 		? (object)array_fill_keys( ['base', 'id', 'post_type'], null )
 		: $screen;
 }
@@ -92,11 +92,11 @@ 
  */
 function glsr_log() {
 	$args = func_get_args();
-	$context = isset( $args[1] )
+	$context = isset($args[1])
 		? $args[1]
 		: [];
 	$console = glsr( 'Modules\Console' );
-	return !empty( $args )
+	return !empty($args)
 		? $console->log( 'debug', $args[0], $context )
 		: $console;
 }

Braces +18 added lines, -9 removed lines

@@ -4,7 +4,8 @@ 
 /**
  * @return mixed
  */
-function glsr( $alias = null ) {
+function glsr( $alias = null )
+{
 	$app = \GeminiLabs\SiteReviews\Application::load();
 	return !empty( $alias )
 		? $app->make( $alias )
@@ -14,7 +15,8 @@ 
 /**
  * @return false|\GeminiLabs\SiteReviews\Review
  */
-function glsr_create_review( array $reviewValues = [] ) {
+function glsr_create_review( array $reviewValues = [] )
+{
 	if( empty( $reviewValues )) {
 		return false;
 	}
@@ -25,7 +27,8 @@ 
 /**
  * @return \WP_Screen|object
  */
-function glsr_current_screen() {
+function glsr_current_screen()
+{
 	if( function_exists( 'get_current_screen' )) {
 		$screen = get_current_screen();
 	}
@@ -38,7 +41,8 @@ 
  * @param mixed ...$vars
  * @return void
  */
-function glsr_debug( ...$vars ) {
+function glsr_debug( ...$vars )
+{
 	if( count( $vars ) == 1 ) {
 		$value = htmlspecialchars( print_r( $vars[0], true ), ENT_QUOTES, 'UTF-8' );
 		printf( '<div class="glsr-debug"><pre>%s</pre></div>', $value );
@@ -57,14 +61,16 @@ 
  * @param mixed $fallback
  * @return string|array
  */
-function glsr_get_option( $path = '', $fallback = '' ) {
+function glsr_get_option( $path = '', $fallback = '' )
+{
 	return glsr( 'Database\OptionManager' )->get( 'settings.'.$path, $fallback );
 }
 
 /**
  * @return array
  */
-function glsr_get_options() {
+function glsr_get_options()
+{
 	return glsr( 'Database\OptionManager' )->get( 'settings' );
 }
 
@@ -72,7 +78,8 @@ 
  * @param int $post_id
  * @return void|\GeminiLabs\SiteReviews\Review
  */
-function glsr_get_review( $post_id ) {
+function glsr_get_review( $post_id )
+{
 	$post = get_post( $post_id );
 	if( $post instanceof WP_Post ) {
 		return glsr( 'Database\ReviewManager' )->single( $post );
@@ -83,14 +90,16 @@ 
  * @return array
  * @todo document change of $reviews->reviews to $reviews->results
  */
-function glsr_get_reviews( array $args = array() ) {
+function glsr_get_reviews( array $args = array() )
+{
 	return glsr( 'Database\ReviewManager' )->get( $args );
 }
 
 /**
  * @return \GeminiLabs\SiteReviews\Modules\Console
  */
-function glsr_log() {
+function glsr_log()
+{
 	$args = func_get_args();
 	$context = isset( $args[1] )
 		? $args[1]

plugin/Shortcodes/SiteReviewsPopup.php

Spacing +23 added lines, -23 removed lines

@@ -13,15 +13,15 @@ 
 	public function fields()
 	{
 		return [[
-			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' )),
+			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' ) ),
 			'minWidth' => 320,
 			'type' => 'container',
-		],[
+		], [
 			'label' => esc_html__( 'Title', 'site-reviews' ),
 			'name' => 'title',
 			'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Count', 'site-reviews' ),
 			'maxLength' => 5,
 			'name' => 'count',
@@ -29,20 +29,20 @@ 
 			'text' => '10',
 			'tooltip' => __( 'How many reviews would you like to display (default: 10)?', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Rating', 'site-reviews' ),
 			'name' => 'rating',
 			'options' => [
-				'5' => esc_html( sprintf( _n( '%s star', '%s stars', 5, 'site-reviews' ), 5 )),
-				'4' => esc_html( sprintf( _n( '%s star', '%s stars', 4, 'site-reviews' ), 4 )),
-				'3' => esc_html( sprintf( _n( '%s star', '%s stars', 3, 'site-reviews' ), 3 )),
-				'2' => esc_html( sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 )),
-				'1' => esc_html( sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 )),
-				'0' => esc_html( __( 'Unrated', 'site-reviews' )),
+				'5' => esc_html( sprintf( _n( '%s star', '%s stars', 5, 'site-reviews' ), 5 ) ),
+				'4' => esc_html( sprintf( _n( '%s star', '%s stars', 4, 'site-reviews' ), 4 ) ),
+				'3' => esc_html( sprintf( _n( '%s star', '%s stars', 3, 'site-reviews' ), 3 ) ),
+				'2' => esc_html( sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 ) ),
+				'1' => esc_html( sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 ) ),
+				'0' => esc_html( __( 'Unrated', 'site-reviews' ) ),
 			],
 			'tooltip' => __( 'What is the minimum rating to display (default: 1 star)?', 'site-reviews' ),
 			'type' => 'listbox',
-		],[
+		], [
 			'label' => esc_html__( 'Pagination', 'site-reviews' ),
 			'name' => 'pagination',
 			'options' => [
@@ -60,7 +60,7 @@ 
 			'name' => 'assigned_to',
 			'tooltip' => __( 'Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Schema', 'site-reviews' ),
 			'name' => 'schema',
 			'options' => [
@@ -69,49 +69,49 @@ 
 			],
 			'tooltip' => __( 'Rich snippets are disabled by default.', 'site-reviews' ),
 			'type' => 'listbox',
-		],[
+		], [
 			'label' => esc_html__( 'Classes', 'site-reviews' ),
 			'name' => 'class',
 			'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'columns' => 2,
 			'items' => [[
 				'name' => 'hide_assigned_to',
 				'text' => esc_html__( 'Assigned To', 'site-reviews' ),
 				'tooltip' => __( 'Hide the assigned to link?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_author',
 				'text' => esc_html__( 'Author', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review author?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_avatar',
 				'text' => esc_html__( 'Avatar', 'site-reviews' ),
 				'tooltip' => __( 'Hide the reviewer avatar if shown?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_content',
 				'text' => esc_html__( 'Content', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review content?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_date',
 				'text' => esc_html__( 'Date', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review date?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_rating',
 				'text' => esc_html__( 'Rating', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review rating?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_response',
 				'text' => esc_html__( 'Response', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review response?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_title',
 				'text' => esc_html__( 'Title', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review title?', 'site-reviews' ),
@@ -121,7 +121,7 @@ 
 			'label' => esc_html__( 'Hide', 'site-reviews' ),
 			'spacing' => 5,
 			'type' => 'container',
-		],[
+		], [
 			'hidden' => true,
 			'name' => 'id',
 			'type' => 'textbox',
@@ -134,7 +134,7 @@ 
 	public function getTerms()
 	{
 		$terms = glsr( Database::class )->getTerms();
-		if( empty( $terms )) {
+		if( empty($terms) ) {
 			return [];
 		}
 		return [

plugin/Shortcodes/SiteReviewsFormPopup.php

Spacing +11 added lines, -11 removed lines

@@ -15,12 +15,12 @@ 
 		return [[
 			'type' => 'container',
 			'html' => '<p class="strong">'.esc_html__( 'All settings are optional.', 'site-reviews' ).'</p>',
-		],[
+		], [
 			'label' => esc_html__( 'Title', 'site-reviews' ),
 			'name' => 'title',
 			'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Description', 'site-reviews' ),
 			'minHeight' => 60,
 			'minWidth' => 240,
@@ -35,39 +35,39 @@ 
 			'name' => 'assign_to',
 			'tooltip' => __( 'Assign submitted reviews to a custom page/post ID. You can also enter "post_id" to assign reviews to the ID of the current page.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Classes', 'site-reviews' ),
 			'name' => 'class',
 			'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'columns' => 2,
 			'items' => [[
 				'name' => 'hide_content',
 				'text' => esc_html__( 'Content', 'site-reviews' ),
 				'tooltip' => __( 'Hide the content field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_email',
 				'text' => esc_html__( 'Email', 'site-reviews' ),
 				'tooltip' => __( 'Hide the email field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_name',
 				'text' => esc_html__( 'Name', 'site-reviews' ),
 				'tooltip' => __( 'Hide the name field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_rating',
 				'text' => esc_html__( 'Rating', 'site-reviews' ),
 				'tooltip' => __( 'Hide the rating field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_terms',
 				'text' => esc_html__( 'Terms', 'site-reviews' ),
 				'tooltip' => __( 'Hide the terms field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_title',
 				'text' => esc_html__( 'Title', 'site-reviews' ),
 				'tooltip' => __( 'Hide the title field?', 'site-reviews' ),
@@ -77,7 +77,7 @@ 
 			'layout' => 'grid',
 			'spacing' => 5,
 			'type' => 'container',
-		],[
+		], [
 			'hidden' => true,
 			'name' => 'id',
 			'type' => 'textbox',
@@ -90,7 +90,7 @@ 
 	public function getTerms()
 	{
 		$terms = glsr( Database::class )->getTerms();
-		if( empty( $terms )) {
+		if( empty($terms) ) {
 			return [];
 		}
 		return [

plugin/Shortcodes/TinymcePopupGenerator.php

Spacing +24 added lines, -24 removed lines

@@ -47,7 +47,7 @@ 
 			'label' => '['.$tag.']',
 			'required' => $this->required,
 			'title' => esc_html__( 'Shortcode', 'site-reviews' ),
-		]);
+		] );
 		return $this;
 	}
 
@@ -57,12 +57,12 @@ 
 	protected function generateFields( array $fields )
 	{
 		$generatedFields = array_map( function( $field ) {
-			if( empty( $field ))return;
+			if( empty($field) )return;
 			$field = $this->normalize( $field );
-			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return;
+			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ) ) )return;
 			return $this->$method( $field );
 		}, $fields );
-		return array_values( array_filter( $generatedFields ));
+		return array_values( array_filter( $generatedFields ) );
 	}
 
 	/**
@@ -71,15 +71,15 @@ 
 	protected function getFields()
 	{
 		$fields = $this->generateFields( $this->fields() );
-		if( !empty( $this->errors )) {
+		if( !empty($this->errors) ) {
 			$errors = [];
 			foreach( $this->required as $name => $alert ) {
-				if( false !== array_search( $name, array_column( $fields, 'name' )))continue;
+				if( false !== array_search( $name, array_column( $fields, 'name' ) ) )continue;
 				$errors[] = $this->errors[$name];
 			}
 			$this->errors = $errors;
 		}
-		return empty( $this->errors )
+		return empty($this->errors)
 			? $fields
 			: $this->errors;
 	}
@@ -92,7 +92,7 @@ 
 		return wp_parse_args( $field, [
 			'items' => [],
 			'type' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	protected function normalizeContainer( array $field )
 	{
-		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return;
+		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ) )return;
 		$field['items'] = $this->generateFields( $field['items'] );
 		return $field;
 	}
@@ -128,7 +128,7 @@ 
 	 */
 	protected function normalizeField( array $field, array $defaults )
 	{
-		if( !$this->validate( $field ))return;
+		if( !$this->validate( $field ) )return;
 		return array_filter( shortcode_atts( $defaults, $field ), function( $value ) {
 			return $value !== '';
 		});
@@ -148,9 +148,9 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
-		if( !is_array( $listbox ))return;
-		if( !array_key_exists( '', $listbox['options'] )) {
+		] );
+		if( !is_array( $listbox ) )return;
+		if( !array_key_exists( '', $listbox['options'] ) ) {
 			$listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
 		}
 		foreach( $listbox['options'] as $value => $text ) {
@@ -167,7 +167,7 @@ 
 	 */
 	protected function normalizePost( array $field )
 	{
-		if( !is_array( $field['query_args'] )) {
+		if( !is_array( $field['query_args'] ) ) {
 			$field['query_args'] = [];
 		}
 		$posts = get_posts( wp_parse_args( $field['query_args'], [
@@ -175,8 +175,8 @@ 
 			'orderby' => 'title',
 			'post_type' => 'post',
 			'posts_per_page' => 30,
-		]));
-		if( !empty( $posts )) {
+		] ) );
+		if( !empty($posts) ) {
 			$options = [];
 			foreach( $posts as $post ) {
 				$options[$post->ID] = esc_html( $post->post_title );
@@ -206,7 +206,7 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 */
 	protected function validate( array $field )
 	{
-		$args = shortcode_atts([
+		$args = shortcode_atts( [
 			'label' => '',
 			'name' => false,
 			'required' => false,
@@ -230,13 +230,13 @@ 
 	 */
 	protected function validateErrors( array $args )
 	{
-		if( !isset( $args['required']['error'] )) {
+		if( !isset($args['required']['error']) ) {
 			return true;
 		}
-		$this->errors[$args['name']] = $this->normalizeContainer([
+		$this->errors[$args['name']] = $this->normalizeContainer( [
 			'html' => $args['required']['error'],
 			'type' => 'container',
-		]);
+		] );
 		return false;
 	}
 
@@ -249,10 +249,10 @@ 
 			return true;
 		}
 		$alert = esc_html__( 'Some of the shortcode options are required.', 'site-reviews' );
-		if( isset( $args['required']['alert'] )) {
+		if( isset($args['required']['alert']) ) {
 			$alert = $args['required']['alert'];
 		}
-		else if( !empty( $args['label'] )) {
+		else if( !empty($args['label']) ) {
 			$alert = sprintf(
 				esc_html_x( 'The "%s" option is required.', 'the option label', 'site-reviews' ),
 				str_replace( ':', '', $args['label'] )

Braces +18 added lines, -6 removed lines

@@ -57,9 +57,13 @@ 
 	protected function generateFields( array $fields )
 	{
 		$generatedFields = array_map( function( $field ) {
-			if( empty( $field ))return;
+			if( empty( $field )) {
+				return;
+			}
 			$field = $this->normalize( $field );
-			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return;
+			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ))) {
+				return;
+			}
 			return $this->$method( $field );
 		}, $fields );
 		return array_values( array_filter( $generatedFields ));
@@ -74,7 +78,9 @@ 
 		if( !empty( $this->errors )) {
 			$errors = [];
 			foreach( $this->required as $name => $alert ) {
-				if( false !== array_search( $name, array_column( $fields, 'name' )))continue;
+				if( false !== array_search( $name, array_column( $fields, 'name' ))) {
+					continue;
+				}
 				$errors[] = $this->errors[$name];
 			}
 			$this->errors = $errors;
@@ -118,7 +124,9 @@ 
 	 */
 	protected function normalizeContainer( array $field )
 	{
-		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return;
+		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field )) {
+			return;
+		}
 		$field['items'] = $this->generateFields( $field['items'] );
 		return $field;
 	}
@@ -128,7 +136,9 @@ 
 	 */
 	protected function normalizeField( array $field, array $defaults )
 	{
-		if( !$this->validate( $field ))return;
+		if( !$this->validate( $field )) {
+			return;
+		}
 		return array_filter( shortcode_atts( $defaults, $field ), function( $value ) {
 			return $value !== '';
 		});
@@ -149,7 +159,9 @@ 
 			'type' => '',
 			'value' => '',
 		]);
-		if( !is_array( $listbox ))return;
+		if( !is_array( $listbox )) {
+			return;
+		}
 		if( !array_key_exists( '', $listbox['options'] )) {
 			$listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
 		}

plugin/Shortcodes/SiteReviewsSummaryPopup.php

Spacing +9 added lines, -9 removed lines

@@ -12,10 +12,10 @@ 
 	public function fields()
 	{
 		return [[
-			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' )),
+			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' ) ),
 			'minWidth' => 320,
 			'type' => 'container',
-		],[
+		], [
 			'label' => esc_html__( 'Title', 'site-reviews' ),
 			'name' => 'title',
 			'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
@@ -28,7 +28,7 @@ 
 			'name' => 'assigned_to',
 			'tooltip' => __( 'Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Schema', 'site-reviews' ),
 			'name' => 'schema',
 			'options' => [
@@ -37,34 +37,34 @@ 
 			],
 			'tooltip' => __( 'Rich snippets are disabled by default.', 'site-reviews' ),
 			'type' => 'listbox',
-		],[
+		], [
 			'label' => esc_html__( 'Classes', 'site-reviews' ),
 			'name' => 'class',
 			'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'columns' => 2,
 			'items' => [[
 				'type' => 'checkbox',
 				'name' => 'hide_bars',
 				'text' => esc_html__( 'Bars', 'site-reviews' ),
 				'tooltip' => __( 'Hide the percentage bars?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_if_empty',
 				'text' => esc_html__( 'If Empty', 'site-reviews' ),
 				'tooltip' => __( 'Hide the summary if no reviews are found?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_rating',
 				'text' => esc_html__( 'Rating', 'site-reviews' ),
 				'tooltip' => __( 'Hide the rating?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_stars',
 				'text' => esc_html__( 'Stars', 'site-reviews' ),
 				'tooltip' => __( 'Hide the stars?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_summary',
 				'text' => esc_html__( 'Summary', 'site-reviews' ),

plugin/Modules/Validator/ValidateReview.php

Spacing +23 added lines, -23 removed lines

@@ -67,7 +67,7 @@ 
 		$this->validateBlacklist();
 		$this->validateAkismet();
 		$this->validateRecaptcha();
-		if( !empty( $this->error )) {
+		if( !empty($this->error) ) {
 			$this->setSessionValues( 'message', $this->error );
 		}
 		return $this;
@@ -91,8 +91,8 @@ 
 		if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
 			return static::RECAPTCHA_DISABLED;
 		}
-		if( empty( $this->request['recaptcha-token'] )) {
-			return $this->request['counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ))
+		if( empty($this->request['recaptcha-token']) ) {
+			return $this->request['counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ) )
 				? static::RECAPTCHA_EMPTY
 				: static::RECAPTCHA_FAILED;
 		}
@@ -104,17 +104,17 @@ 
 	 */
 	protected function getRecaptchaTokenStatus()
 	{
-		$endpoint = add_query_arg([
+		$endpoint = add_query_arg( [
 			'remoteip' => glsr( Helper::class )->getIpAddress(),
 			'response' => $this->request['recaptcha-token'],
 			'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ),
 		], static::RECAPTCHA_ENDPOINT );
-		if( is_wp_error( $response = wp_remote_get( $endpoint ))) {
+		if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) {
 			glsr_log()->error( $response->get_error_message() );
 			return static::RECAPTCHA_FAILED;
 		}
-		$response = json_decode( wp_remote_retrieve_body( $response ));
-		if( !empty( $response->success )) {
+		$response = json_decode( wp_remote_retrieve_body( $response ) );
+		if( !empty($response->success) ) {
 			return boolval( $response->success )
 				? static::RECAPTCHA_VALID
 				: static::RECAPTCHA_INVALID;
@@ -132,12 +132,12 @@ 
 	{
 		$rules = array_intersect_key(
 			apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES, $request ),
-			array_flip( $this->getOption( 'settings.submissions.required', [] ))
+			array_flip( $this->getOption( 'settings.submissions.required', [] ) )
 		);
-		$excluded = isset( $request['excluded'] )
+		$excluded = isset($request['excluded'])
 			? explode( ',', $request['excluded'] )
 			: [];
-		return array_diff_key( $rules, array_flip( $excluded ));
+		return array_diff_key( $rules, array_flip( $excluded ) );
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	{
 		$rules = $this->getValidationRules( $request );
 		$errors = glsr( Validator::class )->validate( $request, $rules );
-		if( empty( $errors )) {
+		if( empty($errors) ) {
 			return true;
 		}
 		$this->setSessionValues( 'errors', $errors );
@@ -164,7 +164,7 @@ 
 	protected function setSessionValues( $type, $value, $loggedMessage = '' )
 	{
 		glsr( Session::class )->set( $this->form_id.$type, $value );
-		if( !empty( $loggedMessage )) {
+		if( !empty($loggedMessage) ) {
 			glsr_log()->warning( $loggedMessage );
 			glsr_log()->warning( $this->request );
 		}
@@ -175,8 +175,8 @@ 
 	 */
 	protected function validateAkismet()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Akismet::class )->isSpam( $this->request ))return;
+		if( !empty($this->error) )return;
+		if( !glsr( Akismet::class )->isSpam( $this->request ) )return;
 		$this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' );
 		$this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' );
 	}
@@ -186,8 +186,8 @@ 
 	 */
 	protected function validateBlacklist()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return;
+		if( !empty($this->error) )return;
+		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return;
 		$blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'reject' ) {
 			$this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
@@ -202,7 +202,7 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
 		if( $validated === true )return;
 		$this->setSessionValues( 'errors', [] );
@@ -217,8 +217,8 @@ 
 	 */
 	protected function validateHoneyPot()
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $this->request['gotcha'] ))return;
+		if( !empty($this->error) )return;
+		if( empty($this->request['gotcha']) )return;
 		$this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' );
 		$this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
 	}
@@ -228,9 +228,9 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$status = $this->getRecaptchaStatus();
-		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ))return;
+		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ) )return;
 		if( $status == static::RECAPTCHA_EMPTY ) {
 			$this->setSessionValues( 'recaptcha', 'unset' );
 			$this->recaptchaIsUnset = true;
@@ -250,11 +250,11 @@ 
 	 */
 	protected function validateRequest( array $request )
 	{
-		if( !$this->isRequestValid( $request )) {
+		if( !$this->isRequestValid( $request ) ) {
 			$this->error = __( 'Please fix the submission errors.', 'site-reviews' );
 			return $request;
 		}
-		if( empty( $request['title'] )) {
+		if( empty($request['title']) ) {
 			$request['title'] = __( 'No Title', 'site-reviews' );
 		}
 		return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request );

Braces +30 added lines, -10 removed lines

@@ -175,8 +175,12 @@ 
 	 */
 	protected function validateAkismet()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Akismet::class )->isSpam( $this->request ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( !glsr( Akismet::class )->isSpam( $this->request )) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' );
 		$this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' );
 	}
@@ -186,8 +190,12 @@ 
 	 */
 	protected function validateBlacklist()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( !glsr( Blacklist::class )->isBlacklisted( $this->request )) {
+			return;
+		}
 		$blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'reject' ) {
 			$this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
@@ -202,9 +210,13 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
-		if( $validated === true )return;
+		if( $validated === true ) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [] );
 		$this->setSessionValues( 'values', $this->request );
 		$this->error = is_string( $validated )
@@ -217,8 +229,12 @@ 
 	 */
 	protected function validateHoneyPot()
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $this->request['gotcha'] ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( empty( $this->request['gotcha'] )) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' );
 		$this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
 	}
@@ -228,9 +244,13 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$status = $this->getRecaptchaStatus();
-		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ))return;
+		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] )) {
+			return;
+		}
 		if( $status == static::RECAPTCHA_EMPTY ) {
 			$this->setSessionValues( 'recaptcha', 'unset' );
 			$this->recaptchaIsUnset = true;