pryley / site-reviews

plugin/Controllers/SettingsController.php

Spacing +8 added lines, -8 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->sanitizeGeneral( $input, $options );
@@ -42,7 +42,7 @@ 
 	{
 		register_setting( Application::ID.'-settings', OptionManager::databaseKey(), [
 			'sanitize_callback' => [$this, 'callbackRegisterSettings'],
-		]);
+		] );
 	}
 
 	/**
@@ -62,7 +62,7 @@ 
 	protected function sanitizeSubmissions( array $input, array $options )
 	{
 		$inputForm = $input['settings']['submissions'];
-		$options['settings']['submissions']['required'] = isset( $inputForm['required'] )
+		$options['settings']['submissions']['required'] = isset($inputForm['required'])
 			? $inputForm['required']
 			: [];
 		return $options;
@@ -73,13 +73,13 @@ 
 	 */
 	protected function sanitizeTranslations( array $input, array $options )
 	{
-		if( isset( $input['settings']['strings'] )) {
-			$options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] ));
+		if( isset($input['settings']['strings']) ) {
+			$options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] ) );
 			array_walk( $options['settings']['strings'], 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/Controllers/AdminController.php

Braces +15 added lines, -5 removed lines

@@ -107,7 +107,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,
 		]);
@@ -119,7 +121,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( __( 'This review is read-only.', 'site-reviews' ));
 		glsr( Html::class )->renderTemplate( 'partials/editor/notice', [
 			'context' => [
@@ -134,13 +138,19 @@ 
 	 */
 	public function renderTinymceButton()
 	{
-		if( glsr_current_screen()->base != 'post' )return;
+		if( glsr_current_screen()->base != 'post' ) {
+			return;
+		}
 		$shortcodes = [];
 		foreach( glsr()->mceShortcodes as $shortcode => $values ) {
-			if( !apply_filters( sanitize_title( $shortcode ).'_condition', true ))continue;
+			if( !apply_filters( sanitize_title( $shortcode ).'_condition', true )) {
+				continue;
+			}
 			$shortcodes[$shortcode] = $values;
 		}
-		if( empty( $shortcodes ))return;
+		if( empty( $shortcodes )) {
+			return;
+		}
 		glsr()->render( 'partials/editor/tinymce', [
 			'shortcodes' => $shortcodes,
 		]);

Spacing +27 added lines, -27 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	public function enqueueAssets()
 	{
-		$command = new EnqueueAdminAssets([
+		$command = new EnqueueAdminAssets( [
 			'pointers' => [[
 				'content' => __( 'You can pin exceptional reviews so that they are always shown first.', 'site-reviews' ),
 				'id' => 'glsr-pointer-pinned',
@@ -35,7 +35,7 @@ 
 				'target' => '#misc-pub-pinned',
 				'title' => __( 'Pin Your Reviews', 'site-reviews' ),
 			]],
-		]);
+		] );
 		$this->execute( $command );
 	}
 
@@ -47,7 +47,7 @@ 
 	{
 		$links[] = glsr( Builder::class )->a( __( 'Settings', 'site-reviews' ), [
 			'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=settings' ),
-		]);
+		] );
 		return $links;
 	}
 
@@ -58,19 +58,19 @@ 
 	public function filterDashboardGlanceItems( array $items )
 	{
 		$postCount = wp_count_posts( Application::POST_TYPE );
-		if( empty( $postCount->publish )) {
+		if( empty($postCount->publish) ) {
 			return $items;
 		}
 		$text = _n( '%s Review', '%s Reviews', $postCount->publish, 'site-reviews' );
-		$text = sprintf( $text, number_format_i18n( $postCount->publish ));
+		$text = sprintf( $text, number_format_i18n( $postCount->publish ) );
 		$items[] = current_user_can( get_post_type_object( Application::POST_TYPE )->cap->edit_posts )
 			? glsr( Builder::class )->a( $text, [
 				'class' => 'glsr-review-count',
 				'href' => 'edit.php?post_type='.Application::POST_TYPE,
-			])
+			] )
 			: glsr( Builder::class )->span( $text, [
 				'class' => 'glsr-review-count',
-			]);
+			] );
 		return $items;
 	}
 
@@ -81,7 +81,7 @@ 
 	public function filterTinymcePlugins( array $plugins )
 	{
 		if( user_can_richedit()
-			&& ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ))) {
+			&& (current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' )) ) {
 			$plugins['glsr_shortcode'] = glsr()->url( 'assets/scripts/mce-plugin.js' );
 		}
 		return $plugins;
@@ -93,11 +93,11 @@ 
 	 */
 	public function registerShortcodeButtons()
 	{
-		$command = new RegisterShortcodeButtons([
+		$command = new RegisterShortcodeButtons( [
 			'site_reviews' => esc_html__( 'Recent Reviews', 'site-reviews' ),
 			'site_reviews_form' => esc_html__( 'Submit a Review', 'site-reviews' ),
 			'site_reviews_summary' => esc_html__( 'Summary of Reviews', 'site-reviews' ),
-		]);
+		] );
 		$this->execute( $command );
 	}
 
@@ -107,10 +107,10 @@ 
 	 */
 	public function renderReviewEditor( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return;
+		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) )return;
 		glsr()->render( 'partials/editor/review', [
 			'post' => $post,
-		]);
+		] );
 	}
 
 	/**
@@ -119,13 +119,13 @@ 
 	 */
 	public function renderReviewNotice( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return;
-		glsr( Notice::class )->addWarning( __( 'This review is read-only.', 'site-reviews' ));
+		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) )return;
+		glsr( Notice::class )->addWarning( __( 'This review is read-only.', 'site-reviews' ) );
 		glsr( Html::class )->renderTemplate( 'partials/editor/notice', [
 			'context' => [
 				'notices' => glsr( Notice::class )->get(),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -137,13 +137,13 @@ 
 		if( glsr_current_screen()->base != 'post' )return;
 		$shortcodes = [];
 		foreach( glsr()->mceShortcodes as $shortcode => $values ) {
-			if( !apply_filters( sanitize_title( $shortcode ).'_condition', true ))continue;
+			if( !apply_filters( sanitize_title( $shortcode ).'_condition', true ) )continue;
 			$shortcodes[$shortcode] = $values;
 		}
-		if( empty( $shortcodes ))return;
+		if( empty($shortcodes) )return;
 		glsr()->render( 'partials/editor/tinymce', [
 			'shortcodes' => $shortcodes,
-		]);
+		] );
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	public function routerClearConsole()
 	{
 		glsr( Console::class )->clear();
-		glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ));
+		glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ) );
 	}
 
 	/**
@@ -186,17 +186,17 @@ 
 	{
 		$file = $_FILES['import-file'];
 		if( $file['error'] !== UPLOAD_ERR_OK ) {
-			return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ));
+			return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ) );
 		}
-		if( $file['type'] !== 'application/json' || !glsr( Helper::class )->endsWith( '.json', $file['name'] )) {
-			return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ));
+		if( $file['type'] !== 'application/json' || !glsr( Helper::class )->endsWith( '.json', $file['name'] ) ) {
+			return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ) );
 		}
 		$settings = json_decode( file_get_contents( $file['tmp_name'] ), true );
-		if( empty( $settings )) {
-			return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ));
+		if( empty($settings) ) {
+			return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ) );
 		}
-		glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ));
-		glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ));
+		glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ) );
+		glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ) );
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 			UPLOAD_ERR_CANT_WRITE => __( 'Failed to write file to disk.', 'site-reviews' ),
 			UPLOAD_ERR_EXTENSION => __( 'A PHP extension stopped the file upload.', 'site-reviews' ),
 		];
-		return !isset( $errors[$errorCode] )
+		return !isset($errors[$errorCode])
 			? __( 'Unknown upload error.', 'site-reviews' )
 			: $errors[$errorCode];
 	}

plugin/Modules/Email.php

Braces +9 added lines, -3 removed lines

@@ -72,7 +72,9 @@ 
 	 */
 	public function send()
 	{
-		if( !$this->message || !$this->subject || !$this->to )return;
+		if( !$this->message || !$this->subject || !$this->to ) {
+			return;
+		}
 		$sent = wp_mail(
 			$this->to,
 			$this->subject,
@@ -90,8 +92,12 @@ 
 	 */
 	public function buildPlainTextMessage( PHPMailer $phpmailer )
 	{
-		if( empty( $this->email ))return;
-		if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return;
+		if( empty( $this->email )) {
+			return;
+		}
+		if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody )) {
+			return;
+		}
 		$message = $this->stripHtmlTags( $phpmailer->Body );
 		$phpmailer->AltBody = apply_filters( 'site-reviews/email/message', $message, 'text', $this );
 	}

Spacing +10 added lines, -10 removed lines

@@ -90,8 +90,8 @@ 
 	 */
 	public function buildPlainTextMessage( PHPMailer $phpmailer )
 	{
-		if( empty( $this->email ))return;
-		if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return;
+		if( empty($this->email) )return;
+		if( $phpmailer->ContentType === 'text/plain' || !empty($phpmailer->AltBody) )return;
 		$message = $this->stripHtmlTags( $phpmailer->Body );
 		$phpmailer->AltBody = apply_filters( 'site-reviews/email/message', $message, 'text', $this );
 	}
@@ -104,10 +104,10 @@ 
 		$allowed = [
 			'bcc', 'cc', 'from', 'reply-to',
 		];
-		$headers = array_intersect_key( $this->email, array_flip( $allowed ));
+		$headers = array_intersect_key( $this->email, array_flip( $allowed ) );
 		$headers = array_filter( $headers );
 		foreach( $headers as $key => $value ) {
-			unset( $headers[$key] );
+			unset($headers[$key]);
 			$headers[] = $key.': '.$value;
 		}
 		$headers[] = 'Content-Type: text/html';
@@ -119,16 +119,16 @@ 
 	 */
 	protected function buildHtmlMessage()
 	{
-		$template = trim( glsr( OptionManager::class )->get( 'settings.general.notification_message' ));
-		if( !empty( $template )) {
+		$template = trim( glsr( OptionManager::class )->get( 'settings.general.notification_message' ) );
+		if( !empty($template) ) {
 			$message = glsr( Template::class )->interpolate( $template, $this->email['template-tags'] );
 		}
 		else if( $this->email['template'] ) {
 			$message = glsr( Template::class )->build( 'templates/'.$this->email['template'], [
 				'context' => $this->email['template-tags'],
-			]);
+			] );
 		}
-		if( !isset( $message )) {
+		if( !isset($message) ) {
 			$message = $this->email['message'];
 		}
 		$message = $this->email['before'].$message.$this->email['after'];
@@ -139,7 +139,7 @@ 
 		$message = str_replace( ']]>', ']]>', $message );
 		$message = glsr( Template::class )->build( 'partials/email/index', [
 			'context' => ['message' => $message],
-		]);
+		] );
 		return apply_filters( 'site-reviews/email/message', stripslashes( $message ), 'html', $this );
 	}
 
@@ -149,7 +149,7 @@ 
 	protected function normalize( array $email = [] )
 	{
 		$email = shortcode_atts( glsr( EmailDefaults::class )->defaults(), $email );
-		if( empty( $email['reply-to'] )) {
+		if( empty($email['reply-to']) ) {
 			$email['reply-to'] = $email['from'];
 		}
 		$this->email = apply_filters( 'site-reviews/email/compose', $email, $this );

plugin/Actions.php

Spacing +47 added lines, -47 removed lines

@@ -48,53 +48,53 @@
 	 */
 	public function run()
 	{
-		add_action( 'admin_enqueue_scripts',                        [$this->admin, 'enqueueAssets'] );
-		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'], 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_action( 'wp_footer',                                    [$this->public, 'renderSchema'] );
-		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, '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'], 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_action( 'wp_footer', [$this->public, 'renderSchema'] );
+		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( '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( 'admin_init', [$this->router, 'routeWebhookRequest'] );
+		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 );
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -29,7 +29,8 @@
 	protected $settings;
 	protected $taxonomy;
 
-	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 );

helpers.php

Spacing +5 added lines, -5 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,10 +15,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;
 }
@@ -53,11 +53,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 +14 added lines, -7 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 \WP_Screen|object
  */
-function glsr_current_screen() {
+function glsr_current_screen()
+{
 	if( function_exists( 'get_current_screen' )) {
 		$screen = get_current_screen();
 	}
@@ -26,7 +28,8 @@ 
 /**
  * @return \GeminiLabs\SiteReviews\Database
  */
-function glsr_db() {
+function glsr_db()
+{
 	return glsr( 'Database' );
 }
 
@@ -34,7 +37,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 );
@@ -51,7 +55,8 @@ 
 /**
  * @return \GeminiLabs\SiteReviews\Modules\Console
  */
-function glsr_log() {
+function glsr_log()
+{
 	$args = func_get_args();
 	$context = isset( $args[1] )
 		? $args[1]
@@ -67,14 +72,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' );
 }
 

plugin/Controllers/AjaxController.php

Spacing +17 added lines, -17 removed lines

@@ -24,7 +24,7 @@ 
 	{
 		wp_send_json( glsr( Html::class )->renderPartial( 'link', [
 			'post_id' => $request['ID'],
-		]));
+		] ) );
 	}
 
 	/**
@@ -32,7 +32,7 @@ 
 	 */
 	public function routerChangeReviewStatus( array $request )
 	{
-		wp_send_json( $this->execute( new ChangeStatus( $request )));
+		wp_send_json( $this->execute( new ChangeStatus( $request ) ) );
 	}
 
 	/**
@@ -41,10 +41,10 @@ 
 	public function routerClearConsole()
 	{
 		glsr( AdminController::class )->routerClearConsole();
-		wp_send_json([
+		wp_send_json( [
 			'console' => glsr( Console::class )->get(),
 			'notices' => glsr( Notice::class )->get(),
-		]);
+		] );
 	}
 
 	/**
@@ -54,9 +54,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 = [
@@ -76,10 +76,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,
-		]);
+		] );
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function routerSearchTranslations( array $request )
 	{
-		if( empty( $request['exclude'] )) {
+		if( empty($request['exclude']) ) {
 			$request['exclude'] = [];
 		}
 		$results = glsr( Translator::class )
@@ -95,10 +95,10 @@ 
 			->exclude()
 			->exclude( $request['exclude'] )
 			->renderResults();
-		wp_send_json_success([
+		wp_send_json_success( [
 			'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
 			'items' => $results,
-		]);
+		] );
 	}
 
 	/**
@@ -107,11 +107,11 @@ 
 	public function routerSubmitReview( array $request )
 	{
 		glsr( PublicController::class )->routerSubmitReview( $request );
-		wp_send_json([
+		wp_send_json( [
 			'errors' => glsr( Session::class )->get( $request['form_id'].'errors', false, true ),
-			'message' => wpautop( glsr( Session::class )->get( $request['form_id'].'message', '', true )),
+			'message' => wpautop( glsr( Session::class )->get( $request['form_id'].'message', '', true ) ),
 			'recaptcha' => glsr( Session::class )->get( $request['form_id'].'recaptcha', false, true ),
-		]);
+		] );
 	}
 
 	/**
@@ -119,10 +119,10 @@ 
 	 */
 	public function routerTogglePinned( array $request )
 	{
-		$isPinned = $this->execute( new TogglePinned( $request ));
-		wp_send_json([
+		$isPinned = $this->execute( new TogglePinned( $request ) );
+		wp_send_json( [
 			'notices' => glsr( Notice::class )->get(),
 			'pinned' => $isPinned,
-		]);
+		] );
 	}
 }

plugin/Modules/Console.php

Braces +3 added lines, -1 removed lines

@@ -190,7 +190,9 @@
 		if( $index === false
 			|| !isset( $caller[$index+2]['class'] )
 			|| !isset( $caller[$index+2]['function'] )
-		)return;
+		) {
+			return;
+		}
 		return sprintf( '[%s()->%s:%s] ',
 			$caller[$index+2]['class'],
 			$caller[$index+2]['function'],

Spacing +15 added lines, -15 removed lines

@@ -108,7 +108,7 @@ 
 	 */
 	public function get()
 	{
-		return empty( $this->log )
+		return empty($this->log)
 			? __( 'Log is empty', 'site-reviews' )
 			: $this->log;
 	}
@@ -120,11 +120,11 @@ 
 	public function humanSize( $valueIfEmpty = null )
 	{
 		$bytes = $this->size();
-		if( empty( $bytes ) && is_string( $valueIfEmpty )) {
+		if( empty($bytes) && is_string( $valueIfEmpty ) ) {
 			return $valueIfEmpty;
 		}
-		$exponent = floor( log( max( $bytes, 1 ), 1024 ));
-		return round( $bytes / pow( 1024, $exponent ), 2 ).['B','KB','MB','GB'][$exponent];
+		$exponent = floor( log( max( $bytes, 1 ), 1024 ) );
+		return round( $bytes / pow( 1024, $exponent ), 2 ).['B', 'KB', 'MB', 'GB'][$exponent];
 	}
 
 	/**
@@ -148,9 +148,9 @@ 
 	{
 		$constants = (new ReflectionClass( __CLASS__ ))->getConstants();
 		$constants = (array)apply_filters( 'site-reviews/log-levels', $constants );
-		if( in_array( $level, $constants, true )) {
+		if( in_array( $level, $constants, true ) ) {
 			$entry = $this->buildLogEntry( $level, $message, $context );
-			file_put_contents( $this->file, $entry, FILE_APPEND|LOCK_EX );
+			file_put_contents( $this->file, $entry, FILE_APPEND | LOCK_EX );
 			$this->reset();
 		}
 		return $this;
@@ -210,15 +210,15 @@ 
 	protected function getDebugInformation()
 	{
 		$caller = debug_backtrace( 0, 6 );
-		$index = array_search( 'log', array_column( $caller, 'function' ));
+		$index = array_search( 'log', array_column( $caller, 'function' ) );
 		if( $index === false
-			|| !isset( $caller[$index+2]['class'] )
-			|| !isset( $caller[$index+2]['function'] )
+			|| !isset($caller[$index + 2]['class'])
+			|| !isset($caller[$index + 2]['function'])
 		)return;
 		return sprintf( '[%s()->%s:%s] ',
-			$caller[$index+2]['class'],
-			$caller[$index+2]['function'],
-			$caller[$index+1]['line']
+			$caller[$index + 2]['class'],
+			$caller[$index + 2]['function'],
+			$caller[$index + 1]['line']
 		);
 	}
 
@@ -230,7 +230,7 @@ 
 	 */
 	protected function interpolate( $message, $context = [] )
 	{
-		if( $this->isObjectOrArray( $message ) || !is_array( $context )) {
+		if( $this->isObjectOrArray( $message ) || !is_array( $context ) ) {
 			return print_r( $message, true );
 		}
 		$replace = [];
@@ -258,7 +258,7 @@ 
 		if( $value instanceof DateTime ) {
 			$value = $value->format( 'Y-m-d H:i:s' );
 		}
-		else if( $this->isObjectOrArray( $value )) {
+		else if( $this->isObjectOrArray( $value ) ) {
 			$value = json_encode( $value );
 		}
 		return (string)$value;
@@ -273,7 +273,7 @@ 
 			$this->clear();
 			file_put_contents(
 				$this->file,
-				$this->buildLogEntry( 'info', __( 'Console was automatically reset (128 KB max size)', 'site-reviews' ))
+				$this->buildLogEntry( 'info', __( 'Console was automatically reset (128 KB max size)', 'site-reviews' ) )
 			);
 		}
 	}

plugin/Database/QueryBuilder.php

Spacing +14 added lines, -14 removed lines

@@ -16,11 +16,11 @@ 
 	{
 		$queries = [];
 		foreach( $keys as $key ) {
-			if( !array_key_exists( $key, $values ))continue;
+			if( !array_key_exists( $key, $values ) )continue;
 			$methodName = glsr( Helper::class )->buildMethodName( $key, __FUNCTION__ );
-			if( !method_exists( $this, $methodName ))continue;
+			if( !method_exists( $this, $methodName ) )continue;
 			$query = call_user_func( [$this, $methodName], $values[$key] );
-			if( is_array( $query )) {
+			if( is_array( $query ) ) {
 				$queries[] = $query;
 			}
 		}
@@ -35,11 +35,11 @@ 
 	 */
 	public function buildSqlOr( $values, $sprintfFormat )
 	{
-		if( !is_array( $values )) {
+		if( !is_array( $values ) ) {
 			$values = explode( ',', $values );
 		}
-		$values = array_filter( array_map( 'trim', (array)$values ));
-		$values = array_map( function( $value ) use( $sprintfFormat ) {
+		$values = array_filter( array_map( 'trim', (array)$values ) );
+		$values = array_map( function( $value ) use($sprintfFormat) {
 			return sprintf( $sprintfFormat, $value );
 		}, $values );
 		return implode( ' OR ', $values );
@@ -54,11 +54,11 @@ 
 	 */
 	public function filterSearchByTitle( $search, WP_Query $query )
 	{
-		if( empty( $search ) || empty( $query->get( 'search_terms' ))) {
+		if( empty($search) || empty($query->get( 'search_terms' )) ) {
 			return $search;
 		}
 		global $wpdb;
-		$n = empty( $query->get( 'exact' ))
+		$n = empty($query->get( 'exact' ))
 			? '%'
 			: '';
 		$search = [];
@@ -82,7 +82,7 @@ 
 			? Application::PAGED_QUERY_VAR
 			: 'page';
 		return $isEnabled
-			? max( 1, intval( get_query_var( $pagedQuery )))
+			? max( 1, intval( get_query_var( $pagedQuery ) ) )
 			: 1;
 	}
 
@@ -92,11 +92,11 @@ 
 	 */
 	protected function buildQueryAssignedTo( $value )
 	{
-		if( empty( $value ))return;
+		if( empty($value) )return;
 		return [
 			'compare' => 'IN',
 			'key' => 'assigned_to',
-			'value' => array_filter( array_map( 'trim', explode( ',', $value )), 'is_numeric' ),
+			'value' => array_filter( array_map( 'trim', explode( ',', $value ) ), 'is_numeric' ),
 		];
 	}
 
@@ -106,7 +106,7 @@ 
 	 */
 	protected function buildQueryCategory( $value )
 	{
-		if( empty( $value ))return;
+		if( empty($value) )return;
 		return [
 			'field' => 'term_id',
 			'taxonomy' => Application::TAXONOMY,
@@ -120,7 +120,7 @@ 
 	 */
 	protected function buildQueryRating( $value )
 	{
-		if( !is_numeric( $value ) || !in_array( intval( $value ), range( 1, 5 )))return;
+		if( !is_numeric( $value ) || !in_array( intval( $value ), range( 1, 5 ) ) )return;
 		return [
 			'compare' => '>=',
 			'key' => 'rating',
@@ -134,7 +134,7 @@ 
 	 */
 	protected function buildQueryType( $value )
 	{
-		if( in_array( $value, ['','all'] ))return;
+		if( in_array( $value, ['', 'all'] ) )return;
 		return [
 			'key' => 'review_type',
 			'value' => $value,

Braces +18 added lines, -6 removed lines

@@ -16,9 +16,13 @@ 
 	{
 		$queries = [];
 		foreach( $keys as $key ) {
-			if( !array_key_exists( $key, $values ))continue;
+			if( !array_key_exists( $key, $values )) {
+				continue;
+			}
 			$methodName = glsr( Helper::class )->buildMethodName( $key, __FUNCTION__ );
-			if( !method_exists( $this, $methodName ))continue;
+			if( !method_exists( $this, $methodName )) {
+				continue;
+			}
 			$query = call_user_func( [$this, $methodName], $values[$key] );
 			if( is_array( $query )) {
 				$queries[] = $query;
@@ -92,7 +96,9 @@ 
 	 */
 	protected function buildQueryAssignedTo( $value )
 	{
-		if( empty( $value ))return;
+		if( empty( $value )) {
+			return;
+		}
 		return [
 			'compare' => 'IN',
 			'key' => 'assigned_to',
@@ -106,7 +112,9 @@ 
 	 */
 	protected function buildQueryCategory( $value )
 	{
-		if( empty( $value ))return;
+		if( empty( $value )) {
+			return;
+		}
 		return [
 			'field' => 'term_id',
 			'taxonomy' => Application::TAXONOMY,
@@ -120,7 +128,9 @@ 
 	 */
 	protected function buildQueryRating( $value )
 	{
-		if( !is_numeric( $value ) || !in_array( intval( $value ), range( 1, 5 )))return;
+		if( !is_numeric( $value ) || !in_array( intval( $value ), range( 1, 5 ))) {
+			return;
+		}
 		return [
 			'compare' => '>=',
 			'key' => 'rating',
@@ -134,7 +144,9 @@ 
 	 */
 	protected function buildQueryType( $value )
 	{
-		if( in_array( $value, ['','all'] ))return;
+		if( in_array( $value, ['','all'] )) {
+			return;
+		}
 		return [
 			'key' => 'review_type',
 			'value' => $value,

plugin/Router.php

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
 	public function routeAdminPostRequest()
 	{
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request ) )return;
 		$this->checkAdminNonce( $request['action'] );
 		$this->routeRequest( 'admin', $request['action'], $request );
 	}
@@ -29,15 +29,15 @@ 
 	public function routeAjaxRequest()
 	{
 		$request = $this->getRequest();
-		if( !isset( $request['action'] )) {
+		if( !isset($request['action']) ) {
 			glsr_log()->error( 'The AJAX request must include an action' )->info( $request );
 			wp_die();
 		}
-		if( !isset( $request['nonce'] )) {
+		if( !isset($request['nonce']) ) {
 			glsr_log()->error( 'The AJAX request must include a nonce' )->info( $request );
 			wp_die();
 		}
-		if( !wp_verify_nonce( $request['nonce'], $request['action'] )) {
+		if( !wp_verify_nonce( $request['nonce'], $request['action'] ) ) {
 			glsr_log()->error( 'Nonce check failed for ajax request' )->info( $request );
 			wp_die( -1, 403 );
 		}
@@ -53,8 +53,8 @@ 
 	{
 		if( is_admin() )return;
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
-		if( !wp_verify_nonce( $request['_wpnonce'], $request['action'] )) {
+		if( !$this->isValidPostRequest( $request ) )return;
+		if( !wp_verify_nonce( $request['_wpnonce'], $request['action'] ) ) {
 			glsr_log()->error( 'Nonce check failed for public request' )->info( $request );
 			return;
 		}
@@ -92,7 +92,7 @@ 
 	{
 		foreach( ['request', Application::ID] as $key ) {
 			$request = glsr( Helper::class )->filterInputArray( $key );
-			if( !empty( $request ))break;
+			if( !empty($request) )break;
 		}
 		return $this->normalizeRequest( $request );
 	}
@@ -102,7 +102,7 @@ 
 	 */
 	protected function isValidPostRequest( array $request = [] )
 	{
-		return !empty( $request['action'] ) && empty( glsr( Helper::class )->filterInput( 'ajax_request' ));
+		return !empty($request['action']) && empty(glsr( Helper::class )->filterInput( 'ajax_request' ));
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	protected function normalizeRequest( array $request )
 	{
-		if( isset( $request[Application::ID]['action'] )) {
+		if( isset($request[Application::ID]['action']) ) {
 			$request = $request[Application::ID];
 		}
 		if( glsr( Helper::class )->filterInput( 'action', $request ) == 'submit-review' ) {
@@ -127,11 +127,11 @@ 
 	protected function routeRequest( $type, $action, array $request = [] )
 	{
 		$actionHook = 'site-reviews/route/'.$type.'/request';
-		$controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' ));
+		$controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' ) );
 		$method = glsr( Helper::class )->buildMethodName( $action, 'router' );
 		$request = apply_filters( 'site-reviews/route/request', $request, $action, $type );
 		do_action( $actionHook, $action, $request );
-		if( is_callable( [$controller, $method] )) {
+		if( is_callable( [$controller, $method] ) ) {
 			call_user_func( [$controller, $method], $request );
 			return;
 		}

Braces +15 added lines, -5 removed lines

@@ -16,7 +16,9 @@ 
 	public function routeAdminPostRequest()
 	{
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request )) {
+			return;
+		}
 		$this->checkAdminNonce( $request['action'] );
 		$this->routeRequest( 'admin', $request['action'], $request );
 	}
@@ -51,9 +53,13 @@ 
 	 */
 	public function routePublicPostRequest()
 	{
-		if( is_admin() )return;
+		if( is_admin() ) {
+			return;
+		}
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request )) {
+			return;
+		}
 		if( !wp_verify_nonce( $request['_wpnonce'], $request['action'] )) {
 			glsr_log()->error( 'Nonce check failed for public request' )->info( $request );
 			return;
@@ -67,7 +73,9 @@ 
 	public function routeWebhookRequest()
 	{
 		$request = filter_input( INPUT_GET, Application::PREFIX.'hook' );
-		if( !$request )return;
+		if( !$request ) {
+			return;
+		}
 		// @todo manage webhook here
 	}
 
@@ -92,7 +100,9 @@ 
 	{
 		foreach( ['request', Application::ID] as $key ) {
 			$request = glsr( Helper::class )->filterInputArray( $key );
-			if( !empty( $request ))break;
+			if( !empty( $request )) {
+				break;
+			}
 		}
 		return $this->normalizeRequest( $request );
 	}