pryley / site-reviews

plugin/Router.php

Spacing +12 added lines, -12 removed lines

@@ -16,7 +16,7 @@ 
 	public function routeAdminPostRequest()
 	{
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request ) )return;
 		check_admin_referer( $request['action'] );
 		$this->routeRequest( 'admin', $request['action'], $request );
 	}
@@ -29,7 +29,7 @@ 
 	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();
 		}
@@ -46,8 +46,8 @@ 
 	{
 		if( is_admin() )return;
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
-		if( !$this->isValidPublicNonce( $request ))return;
+		if( !$this->isValidPostRequest( $request ) )return;
+		if( !$this->isValidPublicNonce( $request ) )return;
 		$this->routeRequest( 'public', $request['action'], $request );
 	}
 
@@ -67,11 +67,11 @@ 
 	protected function checkAjaxNonce( array $request )
 	{
 		if( !is_user_logged_in() )return;
-		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 );
 		}
@@ -84,7 +84,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 );
 	}
@@ -94,7 +94,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' ));
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	protected function isValidPublicNonce( array $request )
 	{
-		if( is_user_logged_in() && !wp_verify_nonce( $request['_wpnonce'], $request['action'] )) {
+		if( is_user_logged_in() && !wp_verify_nonce( $request['_wpnonce'], $request['action'] ) ) {
 			glsr_log()->error( 'Nonce check failed for public request' )->info( $request );
 			return false;
 		}
@@ -114,7 +114,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' ) {
@@ -131,11 +131,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 +21 added lines, -7 removed lines

@@ -16,7 +16,9 @@ 
 	public function routeAdminPostRequest()
 	{
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
+		if( !$this->isValidPostRequest( $request )) {
+			return;
+		}
 		check_admin_referer( $request['action'] );
 		$this->routeRequest( 'admin', $request['action'], $request );
 	}
@@ -44,10 +46,16 @@ 
 	 */
 	public function routePublicPostRequest()
 	{
-		if( is_admin() )return;
+		if( is_admin() ) {
+			return;
+		}
 		$request = $this->getRequest();
-		if( !$this->isValidPostRequest( $request ))return;
-		if( !$this->isValidPublicNonce( $request ))return;
+		if( !$this->isValidPostRequest( $request )) {
+			return;
+		}
+		if( !$this->isValidPublicNonce( $request )) {
+			return;
+		}
 		$this->routeRequest( 'public', $request['action'], $request );
 	}
 
@@ -57,7 +65,9 @@ 
 	public function routeWebhookRequest()
 	{
 		$request = filter_input( INPUT_GET, Application::PREFIX.'hook' );
-		if( !$request )return;
+		if( !$request ) {
+			return;
+		}
 		// @todo manage webhook here
 	}
 
@@ -66,7 +76,9 @@ 
 	 */
 	protected function checkAjaxNonce( array $request )
 	{
-		if( !is_user_logged_in() )return;
+		if( !is_user_logged_in() ) {
+			return;
+		}
 		if( !isset( $request['nonce'] )) {
 			glsr_log()->error( 'The AJAX request must include a nonce' )->info( $request );
 			wp_die();
@@ -84,7 +96,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 );
 	}

plugin/Controllers/AdminController.php

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['settings'] = 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];
 	}