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 );
 	}