pryley / site-reviews

plugin/Helper.php

Braces +3 added lines, -1 removed lines

@@ -166,7 +166,9 @@
 	{
 		$result = [];
 		foreach( $array as $key => $value ) {
-			if( !$value )continue;
+			if( !$value ) {
+				continue;
+			}
 			$result[$key] = is_array( $value )
 				? $this->removeEmptyArrayValues( $value )
 				: $value;

Spacing +24 added lines, -24 removed lines

@@ -16,7 +16,7 @@ 
 	{
 		$className = $this->camelCase( $name );
 		$path = ltrim( str_replace( __NAMESPACE__, '', $path ), '\\' );
-		return !empty( $path )
+		return !empty($path)
 			? __NAMESPACE__.'\\'.$path.'\\'.$className
 			: $className;
 	}
@@ -28,7 +28,7 @@ 
 	 */
 	public function buildMethodName( $name, $prefix = '' )
 	{
-		return lcfirst( $prefix.$this->buildClassName( $name ));
+		return lcfirst( $prefix.$this->buildClassName( $name ) );
 	}
 
 	/**
@@ -37,7 +37,7 @@ 
 	 */
 	public function buildPropertyName( $name )
 	{
-		return lcfirst( $this->buildClassName( $name ));
+		return lcfirst( $this->buildClassName( $name ) );
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 	 */
 	public function camelCase( $string )
 	{
-		$string = ucwords( str_replace( ['-', '_'], ' ', trim( $string )));
+		$string = ucwords( str_replace( ['-', '_'], ' ', trim( $string ) ) );
 		return str_replace( ' ', '', $string );
 	}
 
@@ -78,7 +78,7 @@ 
 	 */
 	public function convertPathToId( $path, $prefix = '' )
 	{
-		return str_replace( ['[', ']'], ['-', ''], $this->convertPathToName( $path, $prefix ));
+		return str_replace( ['[', ']'], ['-', ''], $this->convertPathToName( $path, $prefix ) );
 	}
 
 	/**
@@ -89,7 +89,7 @@ 
 	{
 		$levels = explode( '.', $path );
 		return array_reduce( $levels, function( $result, $value ) {
-			return $result.= '['.$value.']';
+			return $result .= '['.$value.']';
 		}, $prefix );
 	}
 
@@ -100,7 +100,7 @@ 
 	 */
 	public function convertStringToArray( $string, $callback = null )
 	{
-		$array = array_map( 'trim', explode( ',', $string ));
+		$array = array_map( 'trim', explode( ',', $string ) );
 		return $callback
 			? array_filter( $array, $callback )
 			: array_filter( $array );
@@ -112,7 +112,7 @@ 
 	 */
 	public function dashCase( $string )
 	{
-		return str_replace( '_', '-', $this->snakeCase( $string ));
+		return str_replace( '_', '-', $this->snakeCase( $string ) );
 	}
 
 	/**
@@ -134,11 +134,11 @@ 
 	 */
 	public function filterInput( $key, array $request = [] )
 	{
-		if( isset( $request[$key] )) {
+		if( isset($request[$key]) ) {
 			return $request[$key];
 		}
 		$variable = filter_input( INPUT_POST, $key );
-		if( is_null( $variable ) && isset( $_POST[$key] )) {
+		if( is_null( $variable ) && isset($_POST[$key]) ) {
 			$variable = $_POST[$key];
 		}
 		return $variable;
@@ -151,7 +151,7 @@ 
 	public function filterInputArray( $key )
 	{
 		$variable = filter_input( INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
-		if( empty( $variable ) && !empty( $_POST[$key] ) && is_array( $_POST[$key] )) {
+		if( empty($variable) && !empty($_POST[$key]) && is_array( $_POST[$key] ) ) {
 			$variable = $_POST[$key];
 		}
 		return (array)$variable;
@@ -167,13 +167,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;
@@ -195,7 +195,7 @@ 
 				Whip::IPV4 => $cloudflareIps['v4'],
 				Whip::IPV6 => $ipv6,
 			],
-		]))->getValidIpAddress();
+		] ))->getValidIpAddress();
 	}
 
 	/**
@@ -208,7 +208,7 @@ 
 	{
 		$keys = explode( '.', $path );
 		foreach( $keys as $key ) {
-			if( !isset( $values[$key] )) {
+			if( !isset($values[$key]) ) {
 				return $fallback;
 			}
 			$values = $values[$key];
@@ -223,14 +223,14 @@ 
 	 */
 	public function insertInArray( array $array, array $insert, $key, $position = 'before' )
 	{
-		$keyPosition = intval( array_search( $key, array_keys( $array )));
+		$keyPosition = intval( array_search( $key, array_keys( $array ) ) );
 		if( 'after' == $position ) {
 			$keyPosition++;
 		}
 		if( false !== $keyPosition ) {
 			$result = array_slice( $array, 0, $keyPosition );
 			$result = array_merge( $result, $insert );
-			return array_merge( $result, array_slice( $array, $keyPosition ));
+			return array_merge( $result, array_slice( $array, $keyPosition ) );
 		}
 		return array_merge( $array, $insert );
 	}
@@ -241,7 +241,7 @@ 
 	 */
 	public function isIndexedArray( $array )
 	{
-		if( !is_array( $array )) {
+		if( !is_array( $array ) ) {
 			return false;
 		}
 		$current = 0;
@@ -260,7 +260,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 );
@@ -273,7 +273,7 @@ 
 	 */
 	public function prefixString( $string, $prefix = '' )
 	{
-		return $prefix.str_replace( $prefix, '', trim( $string ));
+		return $prefix.str_replace( $prefix, '', trim( $string ) );
 	}
 
 	/**
@@ -299,7 +299,7 @@ 
 	public function removePrefix( $prefix, $text )
 	{
 		return 0 === strpos( $text, $prefix )
-			? substr( $text, strlen( $prefix ))
+			? substr( $text, strlen( $prefix ) )
 			: $text;
 	}
 
@@ -330,7 +330,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 = function_exists( 'mb_strtolower' )
@@ -347,6 +347,6 @@ 
 	 */
 	public function startsWith( $needle, $haystack )
 	{
-		return substr( $haystack, 0, strlen( $needle )) === $needle;
+		return substr( $haystack, 0, strlen( $needle ) ) === $needle;
 	}
 }

plugin/Commands/CreateReview.php

Spacing +20 added lines, -20 removed lines

@@ -31,25 +31,25 @@ 
 	public function __construct( $input )
 	{
 		$this->request = $input;
-		$this->ajax_request = isset( $input['_ajax_request'] );
+		$this->ajax_request = isset($input['_ajax_request']);
 		$this->assigned_to = $this->getNumeric( 'assign_to' );
-		$this->author = sanitize_text_field( $this->getUser( 'name' ));
+		$this->author = sanitize_text_field( $this->getUser( 'name' ) );
 		$this->avatar = $this->getAvatar();
-		$this->blacklisted = isset( $input['blacklisted'] );
-		$this->category = sanitize_key( $this->get( 'category' ));
-		$this->content = sanitize_textarea_field( $this->get( 'content' ));
+		$this->blacklisted = isset($input['blacklisted']);
+		$this->category = sanitize_key( $this->get( 'category' ) );
+		$this->content = sanitize_textarea_field( $this->get( 'content' ) );
 		$this->custom = $this->getCustom();
 		$this->date = $this->getDate( 'date' );
-		$this->email = sanitize_email( $this->getUser( 'email' ));
-		$this->form_id = sanitize_key( $this->get( 'form_id' ));
+		$this->email = sanitize_email( $this->getUser( 'email' ) );
+		$this->form_id = sanitize_key( $this->get( 'form_id' ) );
 		$this->ip_address = $this->get( 'ip_address' );
-		$this->post_id = intval( $this->get( '_post_id' ));
-		$this->rating = intval( $this->get( 'rating' ));
+		$this->post_id = intval( $this->get( '_post_id' ) );
+		$this->rating = intval( $this->get( 'rating' ) );
 		$this->referer = $this->get( '_referer' );
-		$this->response = sanitize_textarea_field( $this->get( 'response' ));
-		$this->terms = !empty( $input['terms'] );
-		$this->title = sanitize_text_field( $this->get( 'title' ));
-		$this->url = esc_url_raw( $this->get( 'url' ));
+		$this->response = sanitize_textarea_field( $this->get( 'response' ) );
+		$this->terms = !empty($input['terms']);
+		$this->title = sanitize_text_field( $this->get( 'title' ) );
+		$this->url = esc_url_raw( $this->get( 'url' ) );
 	}
 
 	/**
@@ -58,7 +58,7 @@ 
 	 */
 	protected function get( $key )
 	{
-		return isset( $this->request[$key] )
+		return isset($this->request[$key])
 			? (string)$this->request[$key]
 			: '';
 	}
@@ -70,7 +70,7 @@ 
 	{
 		$avatar = $this->get( 'avatar' );
 		return !filter_var( $avatar, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED | FILTER_FLAG_PATH_REQUIRED )
-			? (string)get_avatar_url( $this->get( 'email' ))
+			? (string)get_avatar_url( $this->get( 'email' ) )
 			: $avatar;
 	}
 
@@ -87,7 +87,7 @@ 
 		$unset = apply_filters( 'site-reviews/create/unset-keys-from-custom', $unset );
 		$custom = $this->request;
 		foreach( $unset as $value ) {
-			unset( $custom[$value] );
+			unset($custom[$value]);
 		}
 		return $custom;
 	}
@@ -98,11 +98,11 @@ 
 	 */
 	protected function getDate( $key )
 	{
-		$date = strtotime( $this->get( $key ));
+		$date = strtotime( $this->get( $key ) );
 		if( $date === false ) {
 			$date = time();
 		}
-		return get_date_from_gmt( gmdate( 'Y-m-d H:i:s', $date ));
+		return get_date_from_gmt( gmdate( 'Y-m-d H:i:s', $date ) );
 	}
 
 	/**
@@ -112,13 +112,13 @@ 
 	protected function getUser( $key )
 	{
 		$value = $this->get( $key );
-		if( empty( $value )) {
+		if( empty($value) ) {
 			$user = wp_get_current_user();
 			$userValues = [
 				'email' => 'user_email',
 				'name' => 'display_name',
 			];
-			if( $user->exists() && array_key_exists( $key, $userValues )) {
+			if( $user->exists() && array_key_exists( $key, $userValues ) ) {
 				return $user->{$userValues[$key]};
 			}
 		}

plugin/Actions.php

Spacing +51 added lines, -51 removed lines

@@ -54,57 +54,57 @@
 	 */
 	public function run()
 	{
-		add_action( 'admin_enqueue_scripts',                        [$this->admin, 'enqueueAssets'] );
-		add_action( 'admin_init',                                   [$this->admin, 'registerTinymcePopups'] );
-		add_action( 'media_buttons',                                [$this->admin, 'renderTinymceButton'], 11 );
-		add_action( 'plugins_loaded',                               [$this->app, 'getDefaults'], 11 );
-		add_action( 'plugins_loaded',                               [$this->app, 'registerAddons'] );
-		add_action( 'plugins_loaded',                               [$this->app, 'registerLanguages'] );
-		add_action( 'plugins_loaded',                               [$this->app, 'registerReviewTypes'] );
-		add_action( 'upgrader_process_complete',                    [$this->app, 'upgraded'], 10, 2 );
-		add_action( 'init',                                         [$this->blocks, 'registerAssets'], 9 );
-		add_action( 'init',                                         [$this->blocks, 'registerBlocks'] );
-		add_action( 'admin_enqueue_scripts',                        [$this->editor, 'customizePostStatusLabels'] );
-		add_action( 'add_meta_boxes_'.Application::POST_TYPE,       [$this->editor, 'registerMetaBoxes'] );
-		add_action( 'admin_print_scripts',                          [$this->editor, 'removeAutosave'], 999 );
-		add_action( 'admin_menu',                                   [$this->editor, 'removeMetaBoxes'] );
-		add_action( 'current_screen',                               [$this->editor, 'removePostTypeSupport'] );
-		add_action( 'post_submitbox_misc_actions',                  [$this->editor, 'renderPinnedInPublishMetaBox'] );
-		add_action( 'admin_head',                                   [$this->editor, 'renderReviewFields'] );
-		add_action( 'admin_action_revert',                          [$this->editor, 'revertReview'] );
-		add_action( 'save_post_'.Application::POST_TYPE,            [$this->editor, 'saveMetaboxes'] );
-		add_action( 'admin_action_approve',                         [$this->listtable, 'approve'] );
-		add_action( 'bulk_edit_custom_box',                         [$this->listtable, 'renderBulkEditFields'], 10, 2 );
-		add_action( 'restrict_manage_posts',                        [$this->listtable, 'renderColumnFilters'] );
-		add_action( 'manage_posts_custom_column',                   [$this->listtable, 'renderColumnValues'], 10, 2 );
-		add_action( 'save_post_'.Application::POST_TYPE,            [$this->listtable, 'saveBulkEditFields'] );
-		add_action( 'pre_get_posts',                                [$this->listtable, 'setQueryForColumn'] );
-		add_action( 'admin_action_unapprove',                       [$this->listtable, 'unapprove'] );
-		add_action( 'init',                                         [$this->main, 'registerPostType'], 8 );
-		add_action( 'init',                                         [$this->main, 'registerShortcodes'] );
-		add_action( 'init',                                         [$this->main, 'registerTaxonomy'] );
-		add_action( 'widgets_init',                                 [$this->main, 'registerWidgets'] );
-		add_action( 'admin_menu',                                   [$this->menu, 'registerMenuCount'] );
-		add_action( 'admin_menu',                                   [$this->menu, 'registerSubMenus'] );
-		add_action( 'admin_init',                                   [$this->menu, 'setCustomPermissions'], 999 );
-		add_action( 'wp_enqueue_scripts',                           [$this->public, 'enqueueAssets'], 999 );
-		add_filter( 'site-reviews/builder',                         [$this->public, 'modifyBuilder'] );
-		add_action( 'wp_footer',                                    [$this->public, 'renderSchema'] );
-		add_action( 'set_object_terms',                             [$this->review, 'onAfterChangeCategory'], 10, 6 );
-		add_action( 'transition_post_status',                       [$this->review, 'onAfterChangeStatus'], 10, 3 );
-		add_action( 'site-reviews/review/created',                  [$this->review, 'onAfterCreate'] );
-		add_action( 'before_delete_post',                           [$this->review, 'onBeforeDelete'] );
-		add_action( 'update_postmeta',                              [$this->review, 'onBeforeUpdate'], 10, 4 );
-		add_action( 'admin_init',                                   [$this->router, 'routeAdminPostRequest'] );
-		add_action( 'wp_ajax_'.Application::PREFIX.'action',        [$this->router, 'routeAjaxRequest'] );
+		add_action( 'admin_enqueue_scripts', [$this->admin, 'enqueueAssets'] );
+		add_action( 'admin_init', [$this->admin, 'registerTinymcePopups'] );
+		add_action( 'media_buttons', [$this->admin, 'renderTinymceButton'], 11 );
+		add_action( 'plugins_loaded', [$this->app, 'getDefaults'], 11 );
+		add_action( 'plugins_loaded', [$this->app, 'registerAddons'] );
+		add_action( 'plugins_loaded', [$this->app, 'registerLanguages'] );
+		add_action( 'plugins_loaded', [$this->app, 'registerReviewTypes'] );
+		add_action( 'upgrader_process_complete', [$this->app, 'upgraded'], 10, 2 );
+		add_action( 'init', [$this->blocks, 'registerAssets'], 9 );
+		add_action( 'init', [$this->blocks, 'registerBlocks'] );
+		add_action( 'admin_enqueue_scripts', [$this->editor, 'customizePostStatusLabels'] );
+		add_action( 'add_meta_boxes_'.Application::POST_TYPE, [$this->editor, 'registerMetaBoxes'] );
+		add_action( 'admin_print_scripts', [$this->editor, 'removeAutosave'], 999 );
+		add_action( 'admin_menu', [$this->editor, 'removeMetaBoxes'] );
+		add_action( 'current_screen', [$this->editor, 'removePostTypeSupport'] );
+		add_action( 'post_submitbox_misc_actions', [$this->editor, 'renderPinnedInPublishMetaBox'] );
+		add_action( 'admin_head', [$this->editor, 'renderReviewFields'] );
+		add_action( 'admin_action_revert', [$this->editor, 'revertReview'] );
+		add_action( 'save_post_'.Application::POST_TYPE, [$this->editor, 'saveMetaboxes'] );
+		add_action( 'admin_action_approve', [$this->listtable, 'approve'] );
+		add_action( 'bulk_edit_custom_box', [$this->listtable, 'renderBulkEditFields'], 10, 2 );
+		add_action( 'restrict_manage_posts', [$this->listtable, 'renderColumnFilters'] );
+		add_action( 'manage_posts_custom_column', [$this->listtable, 'renderColumnValues'], 10, 2 );
+		add_action( 'save_post_'.Application::POST_TYPE, [$this->listtable, 'saveBulkEditFields'] );
+		add_action( 'pre_get_posts', [$this->listtable, 'setQueryForColumn'] );
+		add_action( 'admin_action_unapprove', [$this->listtable, 'unapprove'] );
+		add_action( 'init', [$this->main, 'registerPostType'], 8 );
+		add_action( 'init', [$this->main, 'registerShortcodes'] );
+		add_action( 'init', [$this->main, 'registerTaxonomy'] );
+		add_action( 'widgets_init', [$this->main, 'registerWidgets'] );
+		add_action( 'admin_menu', [$this->menu, 'registerMenuCount'] );
+		add_action( 'admin_menu', [$this->menu, 'registerSubMenus'] );
+		add_action( 'admin_init', [$this->menu, 'setCustomPermissions'], 999 );
+		add_action( 'wp_enqueue_scripts', [$this->public, 'enqueueAssets'], 999 );
+		add_filter( 'site-reviews/builder', [$this->public, 'modifyBuilder'] );
+		add_action( 'wp_footer', [$this->public, 'renderSchema'] );
+		add_action( 'set_object_terms', [$this->review, 'onAfterChangeCategory'], 10, 6 );
+		add_action( 'transition_post_status', [$this->review, 'onAfterChangeStatus'], 10, 3 );
+		add_action( 'site-reviews/review/created', [$this->review, 'onAfterCreate'] );
+		add_action( 'before_delete_post', [$this->review, 'onBeforeDelete'] );
+		add_action( 'update_postmeta', [$this->review, 'onBeforeUpdate'], 10, 4 );
+		add_action( 'admin_init', [$this->router, 'routeAdminPostRequest'] );
+		add_action( 'wp_ajax_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest'] );
 		add_action( 'wp_ajax_nopriv_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest'] );
-		add_action( 'init',                                         [$this->router, 'routePublicPostRequest'] );
-		add_action( 'site-reviews/schedule/session/purge',          [$this->session, 'deleteExpiredSessions'] );
-		add_action( 'admin_init',                                   [$this->settings, 'registerSettings'] );
-		add_action( Application::TAXONOMY.'_term_edit_form_top',    [$this->taxonomy, 'disableParents'] );
-		add_action( Application::TAXONOMY.'_term_new_form_tag',     [$this->taxonomy, 'disableParents'] );
-		add_action( Application::TAXONOMY.'_add_form_fields',       [$this->taxonomy, 'enableParents'] );
-		add_action( Application::TAXONOMY.'_edit_form',             [$this->taxonomy, 'enableParents'] );
-		add_action( 'restrict_manage_posts',                        [$this->taxonomy, 'renderTaxonomyFilter'], 9 );
+		add_action( 'init', [$this->router, 'routePublicPostRequest'] );
+		add_action( 'site-reviews/schedule/session/purge', [$this->session, 'deleteExpiredSessions'] );
+		add_action( 'admin_init', [$this->settings, 'registerSettings'] );
+		add_action( Application::TAXONOMY.'_term_edit_form_top', [$this->taxonomy, 'disableParents'] );
+		add_action( Application::TAXONOMY.'_term_new_form_tag', [$this->taxonomy, 'disableParents'] );
+		add_action( Application::TAXONOMY.'_add_form_fields', [$this->taxonomy, 'enableParents'] );
+		add_action( Application::TAXONOMY.'_edit_form', [$this->taxonomy, 'enableParents'] );
+		add_action( 'restrict_manage_posts', [$this->taxonomy, 'renderTaxonomyFilter'], 9 );
 	}
 }

plugin/Modules/Validator/ValidateReview.php

Spacing +22 added lines, -22 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 (consider adding the IP address to the blacklist):' );
 		$this->error = __( 'This review has been flagged as possible spam and cannot be submitted.', '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,7 +250,7 @@ 
 	 */
 	protected function validateRequest( array $request )
 	{
-		if( !$this->isRequestValid( $request )) {
+		if( !$this->isRequestValid( $request ) ) {
 			$this->error = __( 'Please fix the submission errors.', 'site-reviews' );
 			return $request;
 		}

plugin/Controllers/EditorController.php

Braces +33 added lines, -11 removed lines

@@ -91,7 +91,9 @@ 
 	{
 		add_meta_box( Application::ID.'_assigned_to', __( 'Assigned To', 'site-reviews' ), [$this, 'renderAssignedToMetabox'], null, 'side' );
 		add_meta_box( Application::ID.'_review', __( 'Details', 'site-reviews' ), [$this, 'renderDetailsMetaBox'], null, 'side' );
-		if( get_post_meta( $post->ID, 'review_type', true ) != 'local' )return;
+		if( get_post_meta( $post->ID, 'review_type', true ) != 'local' ) {
+			return;
+		}
 		add_meta_box( Application::ID.'_response', __( 'Respond Publicly', 'site-reviews' ), [$this, 'renderResponseMetaBox'], null, 'normal' );
 	}
 
@@ -127,7 +129,9 @@ 
 	 */
 	public function renderAssignedToMetabox( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ))return;
+		if( !$this->isReviewPostType( $post )) {
+			return;
+		}
 		$assignedTo = (string)get_post_meta( $post->ID, 'assigned_to', true );
 		wp_nonce_field( 'assigned_to', '_nonce-assigned-to', false );
 		glsr()->render( 'partials/editor/metabox-assigned-to', [
@@ -142,7 +146,9 @@ 
 	 */
 	public function renderDetailsMetaBox( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ))return;
+		if( !$this->isReviewPostType( $post )) {
+			return;
+		}
 		$review = glsr( ReviewManager::class )->single( $post );
 		glsr()->render( 'partials/editor/metabox-details', [
 			'button' => $this->buildDetailsMetaBoxRevertButton( $review, $post ),
@@ -156,7 +162,9 @@ 
 	 */
 	public function renderPinnedInPublishMetaBox()
 	{
-		if( !$this->isReviewPostType( get_post() ))return;
+		if( !$this->isReviewPostType( get_post() )) {
+			return;
+		}
 		glsr( Template::class )->render( 'partials/editor/pinned', [
 			'context' => [
 				'no' => __( 'No', 'site-reviews' ),
@@ -172,7 +180,9 @@ 
 	 */
 	public function renderResponseMetaBox( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ))return;
+		if( !$this->isReviewPostType( $post )) {
+			return;
+		}
 		wp_nonce_field( 'response', '_nonce-response', false );
 		glsr()->render( 'partials/editor/metabox-response', [
 			'response' => get_post_meta( $post->ID, 'response', true ),
@@ -185,7 +195,9 @@ 
 	 */
 	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,
 			'response' => get_post_meta( $post->ID, 'response', true ),
@@ -199,7 +211,9 @@ 
 	public function renderReviewFields()
 	{
 		$screen = glsr_current_screen();
-		if( $screen->base != 'post' || $screen->post_type != Application::POST_TYPE )return;
+		if( $screen->base != 'post' || $screen->post_type != Application::POST_TYPE ) {
+			return;
+		}
 		add_action( 'edit_form_after_title', [$this, 'renderReviewEditor'] );
 		add_action( 'edit_form_top',         [$this, 'renderReviewNotice'] );
 	}
@@ -210,7 +224,9 @@ 
 	 */
 	public function renderReviewNotice( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return;
+		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post )) {
+			return;
+		}
 		glsr( Notice::class )->addWarning( sprintf(
 			__( '%s reviews are read-only.', 'site-reviews' ),
 			glsr( Columns::class )->buildColumnReviewType( $post->ID )
@@ -229,7 +245,9 @@ 
 	 */
 	public function renderTaxonomyMetabox( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ))return;
+		if( !$this->isReviewPostType( $post )) {
+			return;
+		}
 		glsr()->render( 'partials/editor/metabox-categories', [
 			'post' => $post,
 			'tax_name' => Application::TAXONOMY,
@@ -267,7 +285,9 @@ 
 	protected function buildAssignedToTemplate( $assignedTo, WP_Post $post )
 	{
 		$assignedPost = glsr( Database::class )->getAssignedToPost( $post->ID, $assignedTo );
-		if( !( $assignedPost instanceof WP_Post ))return;
+		if( !( $assignedPost instanceof WP_Post )) {
+			return;
+		}
 		return glsr( Template::class )->build( 'partials/editor/assigned-post', [
 			'context' => [
 				'data.url' => (string)get_permalink( $assignedPost ),
@@ -312,7 +332,9 @@ 
 	 */
 	protected function getReviewType( $review )
 	{
-		if( count( glsr()->reviewTypes ) < 2 )return;
+		if( count( glsr()->reviewTypes ) < 2 ) {
+			return;
+		}
 		$reviewType = array_key_exists( $review->review_type, glsr()->reviewTypes )
 			? glsr()->reviewTypes[$review->review_type]
 			: __( 'Unknown', 'site-reviews' );

plugin/Modules/Session.php

Spacing +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
 	{
 		$cookieId = filter_input( INPUT_COOKIE, static::SESSION_COOKIE );
 		if( strpos( $cookieId, static::DELIMITER ) !== false ) {
-			$cookie = explode( static::DELIMITER, stripslashes( $cookieId ));
+			$cookie = explode( static::DELIMITER, stripslashes( $cookieId ) );
 			$this->sessionId = preg_replace( '/[^A-Za-z0-9_]/', '', $cookie[0] );
 			$this->expiryTimestamp = absint( $cookie[1] );
 			$this->expiryTimestampReset = absint( $cookie[2] );
@@ -77,7 +77,7 @@ 
 	 */
 	public function deleteExpiredSessions( $limit = 1000 )
 	{
-		if( $expiredSessions = implode( "','", $this->getExpiredSessions( $limit ))) {
+		if( $expiredSessions = implode( "','", $this->getExpiredSessions( $limit ) ) ) {
 			glsr( SqlQueries::class )->deleteExpiredSessions( $expiredSessions );
 		}
 	}
@@ -91,11 +91,11 @@ 
 	public function get( $key, $fallback = '', $unset = false )
 	{
 		$key = sanitize_key( $key );
-		$value = isset( $this->sessionData[$key] )
+		$value = isset($this->sessionData[$key])
 			? maybe_unserialize( $this->sessionData[$key] )
 			: $fallback;
-		if( isset( $this->sessionData[$key] ) && $unset ) {
-			unset( $this->sessionData[$key] );
+		if( isset($this->sessionData[$key]) && $unset ) {
+			unset($this->sessionData[$key]);
 			$this->updateSession();
 		}
 		return $value;
@@ -129,7 +129,7 @@ 
 	protected function deleteSession()
 	{
 		delete_option( $this->getSessionId() );
-		delete_option( $this->getSessionId( 'expires' ));
+		delete_option( $this->getSessionId( 'expires' ) );
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 */
 	protected function generateSessionId()
 	{
-		return md5(( new PasswordHash( 8, false ))->get_random_bytes( 32 ));
+		return md5( (new PasswordHash( 8, false ))->get_random_bytes( 32 ) );
 	}
 
 	/**
@@ -147,8 +147,8 @@ 
 	protected function getExpiredSessions( $limit )
 	{
 		$expiredSessions = [];
-		$sessions = glsr( SqlQueries::class )->getExpiredSessions( static::SESSION_COOKIE, absint( $limit ));
-		if( !empty( $sessions )) {
+		$sessions = glsr( SqlQueries::class )->getExpiredSessions( static::SESSION_COOKIE, absint( $limit ) );
+		if( !empty($sessions) ) {
 			$now = time();
 			foreach( $sessions as $session ) {
 				if( $now <= $session->expiration )continue;
@@ -165,7 +165,7 @@ 
 	 */
 	protected function getSessionId( $separator = '' )
 	{
-		return implode( '_', array_filter( [static::SESSION_COOKIE, $separator, $this->sessionId] ));
+		return implode( '_', array_filter( [static::SESSION_COOKIE, $separator, $this->sessionId] ) );
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 	{
 		if( headers_sent() )return;
 		$cookie = $this->sessionId.static::DELIMITER.$this->expiryTimestamp.static::DELIMITER.$this->expiryTimestampReset;
-		$cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' )));
+		$cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' ) ) );
 		setcookie( static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath );
 	}
 
@@ -214,7 +214,7 @@ 
 	 */
 	protected function updateSession()
 	{
-		if( false === get_option( $this->getSessionId() )) {
+		if( false === get_option( $this->getSessionId() ) ) {
 			return $this->createSession();
 		}
 		update_option( $this->getSessionId(), $this->sessionData, false );