pryley / site-reviews

plugin/Handlers/EnqueuePublicAssets.php

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	public function enqueueAssets()
 	{
-		if( apply_filters( 'site-reviews/assets/css', true )) {
+		if( apply_filters( 'site-reviews/assets/css', true ) ) {
 			wp_enqueue_style(
 				Application::ID,
 				$this->getStylesheet(),
@@ -31,11 +31,11 @@ 
 				glsr()->version
 			);
 		}
-		if( apply_filters( 'site-reviews/assets/js', true )) {
+		if( apply_filters( 'site-reviews/assets/js', true ) ) {
 			wp_enqueue_script(
 				Application::ID,
 				glsr()->url( 'assets/scripts/'.Application::ID.'.js' ),
-				[],//glsr( Html::class )->getDependencies(),
+				[], //glsr( Html::class )->getDependencies(),
 				glsr()->version,
 				true
 			);
@@ -48,12 +48,12 @@ 
 	public function enqueueRecaptchaScript()
 	{
 		if( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.integration' ) != 'custom' )return;
-		wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg([
+		wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg( [
 			'hl' => apply_filters( 'site-reviews/recaptcha/language', get_locale() ),
 			'onload' => 'glsr_render_recaptcha',
 			'render' => 'explicit',
-		], 'https://www.google.com/recaptcha/api.js' ));
-		$inlineScript = file_get_contents( glsr()->path( 'assets/scripts/recaptcha.js' ));
+		], 'https://www.google.com/recaptcha/api.js' ) );
+		$inlineScript = file_get_contents( glsr()->path( 'assets/scripts/recaptcha.js' ) );
 		wp_add_inline_script( Application::ID.'/google-recaptcha', $inlineScript, 'before' );
 	}
 
@@ -65,7 +65,7 @@ 
 		$variables = [
 			'action' => Application::PREFIX.'action',
 			'ajaxnonce' => wp_create_nonce( Application::ID.'-ajax-nonce' ),
-			'ajaxpagination' => ['#wpadminbar','.site-navigation-fixed'],
+			'ajaxpagination' => ['#wpadminbar', '.site-navigation-fixed'],
 			'ajaxurl' => admin_url( 'admin-ajax.php' ),
 		];
 		$variables = apply_filters( 'site-reviews/enqueue/localize', $variables );
@@ -77,7 +77,7 @@ 
 	 */
 	protected function getStylesheet()
 	{
-		$currentTheme = sanitize_title( wp_get_theme()->get( 'Name' ));
+		$currentTheme = sanitize_title( wp_get_theme()->get( 'Name' ) );
 		return file_exists( glsr()->path.'assets/styles/'.$currentTheme.'.css' )
 			? glsr()->url( 'assets/styles/'.$currentTheme.'.css' )
 			: glsr()->url( 'assets/styles/'.Application::ID.'.css' );

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
 	 */
 	public function enqueueRecaptchaScript()
 	{
-		if( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.integration' ) != 'custom' )return;
+		if( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.integration' ) != 'custom' ) {
+			return;
+		}
 		wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg([
 			'hl' => apply_filters( 'site-reviews/recaptcha/language', get_locale() ),
 			'onload' => 'glsr_render_recaptcha',

plugin/Filters.php

Spacing +19 added lines, -19 removed lines

@@ -38,25 +38,25 @@
 	 */
 	public function run()
 	{
-		add_filter( 'mce_external_plugins',                                    [$this->admin, 'filterTinymcePlugins'], 15 );
-		add_filter( 'plugin_action_links_'.$this->basename,                    [$this->admin, 'filterActionLinks'] );
-		add_filter( 'dashboard_glance_items',                                  [$this->admin, 'filterDashboardGlanceItems'] );
-		add_filter( 'wp_editor_settings',                                      [$this->editor, 'filterEditorSettings'] );
-		add_filter( 'the_editor',                                              [$this->editor, 'filterEditorTextarea'] );
-		add_filter( 'gettext',                                                 [$this->editor, 'filterPostStatusLabels'], 10, 3 );
-		add_filter( 'gettext_with_context',                                    [$this->editor, 'filterPostStatusLabelsWithContext'], 10, 4 );
-		add_filter( 'post_updated_messages',                                   [$this->editor, 'filterUpdateMessages'] );
-		add_filter( 'bulk_post_updated_messages',                              [$this->listtable, 'filterBulkUpdateMessages'], 10, 2 );
-		add_filter( 'manage_'.Application::POST_TYPE.'_posts_columns',         [$this->listtable, 'filterColumnsForPostType'] );
-		add_filter( 'default_hidden_columns',                                  [$this->listtable, 'filterDefaultHiddenColumns'], 10, 2 );
-		add_filter( 'post_row_actions',                                        [$this->listtable, 'filterRowActions'], 10, 2 );
+		add_filter( 'mce_external_plugins', [$this->admin, 'filterTinymcePlugins'], 15 );
+		add_filter( 'plugin_action_links_'.$this->basename, [$this->admin, 'filterActionLinks'] );
+		add_filter( 'dashboard_glance_items', [$this->admin, 'filterDashboardGlanceItems'] );
+		add_filter( 'wp_editor_settings', [$this->editor, 'filterEditorSettings'] );
+		add_filter( 'the_editor', [$this->editor, 'filterEditorTextarea'] );
+		add_filter( 'gettext', [$this->editor, 'filterPostStatusLabels'], 10, 3 );
+		add_filter( 'gettext_with_context', [$this->editor, 'filterPostStatusLabelsWithContext'], 10, 4 );
+		add_filter( 'post_updated_messages', [$this->editor, 'filterUpdateMessages'] );
+		add_filter( 'bulk_post_updated_messages', [$this->listtable, 'filterBulkUpdateMessages'], 10, 2 );
+		add_filter( 'manage_'.Application::POST_TYPE.'_posts_columns', [$this->listtable, 'filterColumnsForPostType'] );
+		add_filter( 'default_hidden_columns', [$this->listtable, 'filterDefaultHiddenColumns'], 10, 2 );
+		add_filter( 'post_row_actions', [$this->listtable, 'filterRowActions'], 10, 2 );
 		add_filter( 'manage_edit-'.Application::POST_TYPE.'_sortable_columns', [$this->listtable, 'filterSortableColumns'] );
-		add_filter( 'ngettext',                                                [$this->listtable, 'filterStatusText'], 10, 5 );
-		add_filter( 'script_loader_tag',                                       [$this->public, 'filterEnqueuedScripts'], 10, 2 );
-		add_filter( 'query_vars',                                              [$this->public, 'filterQueryVars'] );
-		add_filter( 'gettext',                                                 [$this->translator, 'filterGettext'], 10, 3 );
-		add_filter( 'gettext_with_context',                                    [$this->translator, 'filterGettextWithContext'], 10, 4 );
-		add_filter( 'ngettext',                                                [$this->translator, 'filterNgettext'], 10, 5 );
-		add_filter( 'ngettext_with_context',                                   [$this->translator, 'filterNgettextWithContext'], 10, 6 );
+		add_filter( 'ngettext', [$this->listtable, 'filterStatusText'], 10, 5 );
+		add_filter( 'script_loader_tag', [$this->public, 'filterEnqueuedScripts'], 10, 2 );
+		add_filter( 'query_vars', [$this->public, 'filterQueryVars'] );
+		add_filter( 'gettext', [$this->translator, 'filterGettext'], 10, 3 );
+		add_filter( 'gettext_with_context', [$this->translator, 'filterGettextWithContext'], 10, 4 );
+		add_filter( 'ngettext', [$this->translator, 'filterNgettext'], 10, 5 );
+		add_filter( 'ngettext_with_context', [$this->translator, 'filterNgettextWithContext'], 10, 6 );
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -22,7 +22,8 @@
 	protected $public;
 	protected $translator;
 
-	public function __construct( Application $app ) {
+	public function __construct( Application $app )
+	{
 		$this->app = $app;
 		$this->admin = $app->make( AdminController::class );
 		$this->basename = plugin_basename( $app->file );

plugin/Controllers/PublicController.php

Spacing +4 added lines, -4 removed lines

@@ -44,10 +44,10 @@ 
 		$vars[] = Application::PAGED_QUERY_VAR;
 		// dirty hack to fix a form submission with a field that has "name" as name
 		if( filter_input( INPUT_POST, 'action' ) == 'submit-review'
-			&& !is_null( filter_input( INPUT_POST, 'gotcha' ))) {
+			&& !is_null( filter_input( INPUT_POST, 'gotcha' ) ) ) {
 			$index = array_search( 'name', $vars, true );
 			if( false !== $index ) {
-				unset( $vars[$index] );
+				unset($vars[$index]);
 			}
 		}
 		return $vars;
@@ -59,10 +59,10 @@ 
 	public function routerCreateReview( array $request )
 	{
 		$validated = glsr( ValidateReview::class )->validate( $request );
-		if( !empty( $validated->error )) {
+		if( !empty($validated->error) ) {
 			return $validated->request;
 		}
 		if( $validated->recaptchaIsUnset )return;
-		return $this->execute( new CreateReview( $validated->request ));
+		return $this->execute( new CreateReview( $validated->request ) );
 	}
 }

plugin/Controllers/SettingsController.php

Spacing +9 added lines, -9 removed lines

@@ -21,11 +21,11 @@ 
 			return $input;
 		}
 		$triggered = true;
-		if( !is_array( $input )) {
+		if( !is_array( $input ) ) {
 			$input = ['settings' => []];
 		}
 		if( key( $input ) == 'settings' ) {
-			glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ));
+			glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ) );
 		}
 		$options = array_replace_recursive( glsr( OptionManager::class )->all(), $input );
 		$options = $this->sanitizeSubmissions( $input, $options );
@@ -43,7 +43,7 @@ 
 		foreach( $settings as $setting ) {
 			register_setting( Application::ID.'-'.$setting, OptionManager::databaseKey(), [
 				'sanitize_callback' => [$this, 'callbackRegisterSettings'],
-			]);
+			] );
 		}
 	}
 
@@ -52,9 +52,9 @@ 
 	 */
 	protected function sanitizeSubmissions( array $input, array $options )
 	{
-		if( isset( $input['settings']['submissions'] )) {
+		if( isset($input['settings']['submissions']) ) {
 			$inputForm = $input['settings']['submissions'];
-			$options['settings']['submissions']['required'] = isset( $inputForm['required'] )
+			$options['settings']['submissions']['required'] = isset($inputForm['required'])
 				? $inputForm['required']
 				: [];
 		}
@@ -66,13 +66,13 @@ 
 	 */
 	protected function sanitizeTranslations( array $input, array $options )
 	{
-		if( isset( $input['settings']['translations'] )) {
-			$options['settings']['translations'] = array_values( array_filter( $input['settings']['translations'] ));
+		if( isset($input['settings']['translations']) ) {
+			$options['settings']['translations'] = array_values( array_filter( $input['settings']['translations'] ) );
 			array_walk( $options['settings']['translations'], function( &$string ) {
-				if( isset( $string['s2'] )) {
+				if( isset($string['s2']) ) {
 					$string['s2'] = wp_strip_all_tags( $string['s2'] );
 				}
-				if( isset( $string['p2'] )) {
+				if( isset($string['p2']) ) {
 					$string['p2'] = wp_strip_all_tags( $string['p2'] );
 				}
 			});

plugin/Actions.php

Spacing +42 added lines, -42 removed lines

@@ -42,48 +42,48 @@
 	 */
 	public function run()
 	{
-		add_action( 'admin_enqueue_scripts',                        [$this->admin, 'enqueueAssets'] );
-		add_action( 'admin_enqueue_scripts',                        [$this->admin, 'registerPointers'], 13 );
-		add_action( 'admin_init',                                   [$this->admin, 'registerShortcodeButtons'] );
-		add_action( 'edit_form_after_title',                        [$this->admin, 'renderReviewEditor'] );
-		add_action( 'edit_form_top',                                [$this->admin, 'renderReviewNotice'] );
-		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( 'admin_enqueue_scripts',                        [$this->editor, 'customizePostStatusLabels'] );
-		add_action( 'site-reviews/create/review',                   [$this->editor, 'onCreateReview'], 10, 3 );
-		add_action( 'before_delete_post',                           [$this->editor, 'onDeleteReview'] );
-		add_action( 'save_post_'.Application::POST_TYPE,            [$this->editor, 'onSaveReview'], 20, 2 );
-		add_action( 'add_meta_boxes',                               [$this->editor, 'registerMetaBoxes'] );
-		add_action( 'admin_print_scripts',                          [$this->editor, 'removeAutosave'], 999 );
-		add_action( 'admin_menu',                                   [$this->editor, 'removeMetaBoxes'] );
-		add_action( 'post_submitbox_misc_actions',                  [$this->editor, 'renderPinnedInPublishMetaBox'] );
-		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'] );
-		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( 'wp_footer',                                    [$this->main, 'renderSchema'] );
-		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_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_enqueue_scripts', [$this->admin, 'registerPointers'], 13 );
+		add_action( 'admin_init', [$this->admin, 'registerShortcodeButtons'] );
+		add_action( 'edit_form_after_title', [$this->admin, 'renderReviewEditor'] );
+		add_action( 'edit_form_top', [$this->admin, 'renderReviewNotice'] );
+		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( 'admin_enqueue_scripts', [$this->editor, 'customizePostStatusLabels'] );
+		add_action( 'site-reviews/create/review', [$this->editor, 'onCreateReview'], 10, 3 );
+		add_action( 'before_delete_post', [$this->editor, 'onDeleteReview'] );
+		add_action( 'save_post_'.Application::POST_TYPE, [$this->editor, 'onSaveReview'], 20, 2 );
+		add_action( 'add_meta_boxes', [$this->editor, 'registerMetaBoxes'] );
+		add_action( 'admin_print_scripts', [$this->editor, 'removeAutosave'], 999 );
+		add_action( 'admin_menu', [$this->editor, 'removeMetaBoxes'] );
+		add_action( 'post_submitbox_misc_actions', [$this->editor, 'renderPinnedInPublishMetaBox'] );
+		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'] );
+		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( 'wp_footer', [$this->main, 'renderSchema'] );
+		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_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( 'admin_init',                                   [$this->router, 'routeWebhookRequest'] );
-		add_action( 'admin_init',                                   [$this->settings, 'registerSettings'] );
+		add_action( 'init', [$this->router, 'routePublicPostRequest'] );
+		add_action( 'admin_init', [$this->router, 'routeWebhookRequest'] );
+		add_action( 'admin_init', [$this->settings, 'registerSettings'] );
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
 	protected $router;
 	protected $settings;
 
-	public function __construct( Application $app ) {
+	public function __construct( Application $app )
+	{
 		$this->app = $app;
 		$this->admin = $app->make( AdminController::class );
 		$this->editor = $app->make( EditorController::class );

plugin/Modules/Validator/ValidateReview.php

Spacing +23 added lines, -23 removed lines

@@ -55,11 +55,11 @@ 
 	 */
 	public 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 );
@@ -73,14 +73,14 @@ 
 		$rules = array_intersect_key(
 			apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ),
 			array_flip( array_merge(
-				['rating','terms'],
+				['rating', 'terms'],
 				glsr( OptionManager::class )->get( 'settings.submissions.required', [] )
-			))
+			) )
 		);
-		$excluded = isset( $request['excluded'] )
+		$excluded = isset($request['excluded'])
 			? json_decode( $request['excluded'] )
 			: [];
-		return array_diff_key( $rules, array_flip( $excluded ));
+		return array_diff_key( $rules, array_flip( $excluded ) );
 	}
 
 	/**
@@ -93,14 +93,14 @@ 
 			return true;
 		}
 		$recaptchaResponse = filter_input( INPUT_POST, 'g-recaptcha-response' );
-		if( empty( $recaptchaResponse )) {
+		if( empty($recaptchaResponse) ) {
 			return null; //if response is empty we need to return null
 		}
 		if( $integration == 'custom' ) {
 			return $this->isRecaptchaValid( $recaptchaResponse );
 		}
 		if( $integration == 'invisible-recaptcha' ) {
-			return boolval( apply_filters( 'google_invre_is_valid_request_filter', true ));
+			return boolval( apply_filters( 'google_invre_is_valid_request_filter', true ) );
 		}
 		return false;
 	}
@@ -110,17 +110,17 @@ 
 	 */
 	protected function isRecaptchaValid( $recaptchaResponse )
 	{
-		$endpoint = add_query_arg([
+		$endpoint = add_query_arg( [
 			'remoteip' => glsr( Helper::class )->getIpAddress(),
 			'response' => $recaptchaResponse,
 			'secret' => glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.secret' ),
 		], 'https://www.google.com/recaptcha/api/siteverify' );
-		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 false;
 		}
-		$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 );
 		}
 		$errorCodes = [
@@ -143,7 +143,7 @@ 
 	{
 		$rules = $this->getValidationRules( $request );
 		$errors = glsr( Validator::class )->validate( $request, $rules );
-		if( empty( $errors )) {
+		if( empty($errors) ) {
 			return true;
 		}
 		$this->setSessionValues( 'errors', $errors );
@@ -160,7 +160,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 );
 		}
@@ -171,8 +171,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' );
 	}
@@ -182,8 +182,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 = glsr( OptionManager::class )->get( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'unapprove' ) {
 			$this->request['blacklisted'] = true;
@@ -199,7 +199,7 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request );
 		if( $validated === true )return;
 		$this->setSessionValues( 'errors', [] );
@@ -214,8 +214,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' );
 	}
@@ -225,9 +225,9 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$isValid = $this->isRecaptchaResponseValid();
-		if( is_null( $isValid )) {
+		if( is_null( $isValid ) ) {
 			$this->setSessionValues( 'recaptcha', true );
 			$this->recaptchaIsUnset = true;
 		}

Braces +27 added lines, -9 removed lines

@@ -171,8 +171,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' );
 	}
@@ -182,8 +186,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 = glsr( OptionManager::class )->get( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'unapprove' ) {
 			$this->request['blacklisted'] = true;
@@ -199,9 +207,13 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request );
-		if( $validated === true )return;
+		if( $validated === true ) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [] );
 		$this->setSessionValues( 'values', $this->request );
 		$this->error = is_string( $validated )
@@ -214,8 +226,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' );
 	}
@@ -225,7 +241,9 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$isValid = $this->isRecaptchaResponseValid();
 		if( is_null( $isValid )) {
 			$this->setSessionValues( 'recaptcha', true );

plugin/Modules/Translator.php

Spacing +28 added lines, -28 removed lines

@@ -30,7 +30,7 @@ 
 	{
 		$translations = $this->getTranslations();
 		$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->getTranslations();
 		}
-		$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 );
@@ -99,7 +99,7 @@ 
 	{
 		return $this->translate( $translation, $domain, [
 			'single' => $text,
-		]);
+		] );
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 		return $this->translate( $translation, $domain, [
 			'context' => $context,
 			'single' => $text,
-		]);
+		] );
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 			'number' => $number,
 			'plural' => $plural,
 			'single' => $single,
-		]);
+		] );
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 			'number' => $number,
 			'plural' => $plural,
 			'single' => $single,
-		]);
+		] );
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	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
 		);
 		ob_start();
@@ -197,13 +197,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' => wp_json_encode( $data ),
 				'text' => wp_strip_all_tags( $text ),
-			]);
+			] );
 		}
 		if( $resetAfterRender ) {
 			$this->reset();
@@ -236,12 +236,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;
 				}
 			}
@@ -264,7 +264,7 @@ 
 		}
 		$args = $this->normalizeTranslationArgs( $args );
 		$strings = $this->getTranslationStrings( $args['single'], $args['plural'] );
-		if( empty( $strings )) {
+		if( empty($strings) ) {
 			return $original;
 		}
 		$string = current( $strings );
@@ -279,8 +279,8 @@ 
 	 */
 	protected function getEntryString( array $entry, $key )
 	{
-		return isset( $entry[$key] )
-			? implode( '', (array) $entry[$key] )
+		return isset($entry[$key])
+			? implode( '', (array)$entry[$key] )
 			: '';
 	}
 
@@ -290,8 +290,8 @@ 
 	protected function getTranslations()
 	{
 		$settings = glsr( OptionManager::class )->get( 'settings' );
-		return isset( $settings['translations'] )
-			? $this->normalizeSettings( (array) $settings['translations'] )
+		return isset($settings['translations'])
+			? $this->normalizeSettings( (array)$settings['translations'] )
 			: [];
 	}
 
@@ -302,7 +302,7 @@ 
 	 */
 	protected function getTranslationStrings( $single, $plural )
 	{
-		return array_filter( $this->getTranslations(), function( $string ) use( $single, $plural ) {
+		return array_filter( $this->getTranslations(), 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' );
 		});
@@ -316,7 +316,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 );
 			}
@@ -330,7 +330,7 @@ 
 	 */
 	protected function normalizeEntryString( array $entry, $key )
 	{
-		if( isset( $entry[$key] )) {
+		if( isset($entry[$key]) ) {
 			$entry[$key] = $this->getEntryString( $entry, $key );
 		}
 		return $entry;
@@ -344,11 +344,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']);
 		});
 	}
 
@@ -372,7 +372,7 @@ 
 	 */
 	protected function translatePlural( $domain, array $string, array $args )
 	{
-		if( !empty( $string['p2'] )) {
+		if( !empty($string['p2']) ) {
 			$args['plural'] = $string['p2'];
 		}
 		return get_translations_for_domain( $domain )->translate_plural(
@@ -389,7 +389,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/Blacklist.php

Spacing +9 added lines, -9 removed lines

@@ -12,14 +12,14 @@ 
 	 */
 	public function isBlacklisted( CreateReview $review )
 	{
-		$target = implode( "\n", array_filter([
+		$target = implode( "\n", array_filter( [
 			$review->author,
 			$review->content,
 			$review->email,
 			$review->ipAddress,
 			$review->title,
-		]));
-		return (bool) apply_filters( 'site-reviews/blacklist/is-blacklisted',
+		] ) );
+		return (bool)apply_filters( 'site-reviews/blacklist/is-blacklisted',
 			$this->check( $target ),
 			$review
 		);
@@ -31,16 +31,16 @@ 
 	 */
 	protected function check( $target )
 	{
-		$blacklist = trim( glsr( OptionManager::class )->get( 'settings.submissions.blacklist.entries' ));
-		if( empty( $blacklist )) {
+		$blacklist = trim( glsr( OptionManager::class )->get( 'settings.submissions.blacklist.entries' ) );
+		if( empty($blacklist) ) {
 			return false;
 		}
 		$lines = explode( "\n", $blacklist );
-		foreach( (array) $lines as $line ) {
+		foreach( (array)$lines as $line ) {
 			$line = trim( $line );
-			if( empty( $line ) || 256 < strlen( $line ))continue;
-			$pattern = sprintf( '#%s#i', preg_quote( $line, '#' ));
-			if( preg_match( $pattern, $target )) {
+			if( empty($line) || 256 < strlen( $line ) )continue;
+			$pattern = sprintf( '#%s#i', preg_quote( $line, '#' ) );
+			if( preg_match( $pattern, $target ) ) {
 				return true;
 			}
 		}