Codexshaper / wpb-framework

bootstrap/app.php

Indentation +19 added lines, -19 removed lines

@@ -16,37 +16,37 @@
 use WPB\Application;
 
 $app = ( new Application(
-	array(
-		'paths' => array(
-			'root' => WPB_APP_ROOT,
-		),
-	)
+    array(
+        'paths' => array(
+            'root' => WPB_APP_ROOT,
+        ),
+    )
 ) );
 
 $container = $app->get_instance();
 
 $container->singleton(
-	Illuminate\Contracts\Http\Kernel::class,
-	\WPB\App\Http\Kernel::class
+    Illuminate\Contracts\Http\Kernel::class,
+    \WPB\App\Http\Kernel::class
 );
 $container->singleton(
-	\Illuminate\Contracts\Debug\ExceptionHandler::class,
-	\WPB\App\Exceptions\Handler::class
+    \Illuminate\Contracts\Debug\ExceptionHandler::class,
+    \WPB\App\Exceptions\Handler::class
 );
 
 if ( \WPB\Support\Facades\Route::exists( \Illuminate\Http\Request::capture() ) ) {
-	try {
+    try {
 
-		$kernel = $container->make( \Illuminate\Contracts\Http\Kernel::class );
+        $kernel = $container->make( \Illuminate\Contracts\Http\Kernel::class );
 
-		$response = $kernel->handle( \Illuminate\Http\Request::capture() );
+        $response = $kernel->handle( \Illuminate\Http\Request::capture() );
 
-		$response->send();
+        $response->send();
 
-	} catch ( \Exception $ex ) {
-		if ( ! \WPB\Support\Facades\Route::current() ) {
-			return true;
-		}
-		throw new \Exception( $ex, 1 );
-	}
+    } catch ( \Exception $ex ) {
+        if ( ! \WPB\Support\Facades\Route::current() ) {
+            return true;
+        }
+        throw new \Exception( $ex, 1 );
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -9,19 +9,19 @@ 
  * @subpackage WPB/bootstrap
  */
 
-require_once ABSPATH . 'wp-includes/pluggable.php';
-require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../src/helpers.php';
+require_once ABSPATH.'wp-includes/pluggable.php';
+require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__.'/../src/helpers.php';
 
 use WPB\Application;
 
-$app = ( new Application(
+$app = (new Application(
 	array(
 		'paths' => array(
 			'root' => WPB_APP_ROOT,
 		),
 	)
-) );
+));
 
 $container = $app->get_instance();
 
@@ -34,19 +34,19 @@ 
 	\WPB\App\Exceptions\Handler::class
 );
 
-if ( \WPB\Support\Facades\Route::exists( \Illuminate\Http\Request::capture() ) ) {
+if (\WPB\Support\Facades\Route::exists(\Illuminate\Http\Request::capture())) {
 	try {
 
-		$kernel = $container->make( \Illuminate\Contracts\Http\Kernel::class );
+		$kernel = $container->make(\Illuminate\Contracts\Http\Kernel::class);
 
-		$response = $kernel->handle( \Illuminate\Http\Request::capture() );
+		$response = $kernel->handle(\Illuminate\Http\Request::capture());
 
 		$response->send();
 
-	} catch ( \Exception $ex ) {
-		if ( ! \WPB\Support\Facades\Route::current() ) {
+	} catch (\Exception $ex) {
+		if (!\WPB\Support\Facades\Route::current()) {
 			return true;
 		}
-		throw new \Exception( $ex, 1 );
+		throw new \Exception($ex, 1);
 	}
 }

src/Http/Kernel.php

Indentation +406 added lines, -406 removed lines

@@ -31,410 +31,410 @@
  */
 class Kernel implements KernelContract {
 
-	/**
-	 * The application implementation.
-	 *
-	 * @var \Illuminate\Contracts\Foundation\Application
-	 */
-	protected $app;
-
-	/**
-	 * The router instance.
-	 *
-	 * @var \Illuminate\Routing\Router
-	 */
-	protected $router;
-
-	/**
-	 * The bootstrap classes for the application.
-	 *
-	 * @var array
-	 */
-	protected $bootstrappers = array();
-
-	/**
-	 * The application's middleware stack.
-	 *
-	 * @var array
-	 */
-	protected $middleware = array();
-
-	/**
-	 * The application's route middleware groups.
-	 *
-	 * @var array
-	 */
-	protected $middleware_groups = array();
-
-	/**
-	 * The application's route middleware.
-	 *
-	 * @var array
-	 */
-	protected $route_middleware = array();
-
-	/**
-	 * The priority-sorted list of middleware.
-	 *
-	 * Forces non-global middleware to always be in the given order.
-	 *
-	 * @var array
-	 */
-	protected $middleware_priority = array();
-
-	/**
-	 * Create a new HTTP kernel instance.
-	 *
-	 * @param \Illuminate\Contracts\Container\Container $app The app.
-	 * @param \Illuminate\Routing\Router                $router The app router.
-	 *
-	 * @return void
-	 */
-	public function __construct( Container $app, Router $router ) {
-		$this->app    = $app;
-		$this->router = $router;
-
-		$this->sync_middleware_to_router();
-	}
-
-	/**
-	 * Handle an incoming HTTP request.
-	 *
-	 * @param \Illuminate\Http\Request $request The app http request.
-	 *
-	 * @throws \Exception The throwable exception.
-	 *
-	 * @return \Illuminate\Http\Response
-	 */
-	public function handle( $request ) {
-		try {
-			$request->enableHttpMethodParameterOverride();
-			$response = $this->send_request_through_router( $request );
-		} catch ( Throwable $e ) {
-			$this->report_exception( $e );
-			$response = $this->render_exception( $request, $e );
-		}
-
-		$this->app['events']->dispatch(
-			new RequestHandled( $request, $response )
-		);
-
-		return $response;
-	}
-
-	/**
-	 * Send the given request through the middleware / router.
-	 *
-	 * @param \Illuminate\Http\Request $request The app http request.
-	 *
-	 * @return \Illuminate\Http\Response
-	 */
-	protected function send_request_through_router( $request ) {
-		$this->app->instance( 'request', $request );
-
-		Facade::clearResolvedInstance( 'request' );
-
-		$this->bootstrap();
-
-		return ( new Pipeline( $this->app ) )
-					->send( $request )
-					->through( $this->middleware )
-					->then( $this->dispatch_to_router() );
-	}
-
-	/**
-	 * Bootstrap the application for HTTP requests.
-	 *
-	 * @return void
-	 */
-	public function bootstrap() {}
-
-	/**
-	 * Get the route dispatcher callback.
-	 *
-	 * @return \Closure
-	 */
-	protected function dispatch_to_router() {
-		return function ( $request ) {
-			$this->app->instance( 'request', $request );
-
-			return $this->router->dispatch( $request );
-		};
-	}
-
-	/**
-	 * Call the terminate method on any terminable middleware.
-	 *
-	 * @param \Illuminate\Http\Request  $request The app http request.
-	 * @param \Illuminate\Http\Response $response The app http response.
-	 *
-	 * @return void
-	 */
-	public function terminate( $request, $response ) {
-		$this->terminate_middleware( $request, $response );
-
-		$this->app->terminate();
-	}
-
-	/**
-	 * Call the terminate method on any terminable middleware.
-	 *
-	 * @param \Illuminate\Http\Request  $request The app http request.
-	 * @param \Illuminate\Http\Response $response The app http response.
-	 *
-	 * @return void
-	 */
-	protected function terminate_middleware( $request, $response ) {
-		$middlewares = $this->app->shouldSkipMiddleware() ? array() : array_merge(
-			$this->gather_route_middleware( $request ),
-			$this->middleware
-		);
-
-		foreach ( $middlewares as $middleware ) {
-			if ( ! is_string( $middleware ) ) {
-				continue;
-			}
-
-			list( $name ) = $this->parse_middleware( $middleware );
-
-			$instance = $this->app->make( $name );
-
-			if ( method_exists( $instance, 'terminate' ) ) {
-				$instance->terminate( $request, $response );
-			}
-		}
-	}
-
-	/**
-	 * Gather the route middleware for the given request.
-	 *
-	 * @param \Illuminate\Http\Request $request The app http request.
-	 *
-	 * @return array
-	 */
-	protected function gather_route_middleware( $request ) {
-		$route = $request->route();
-		if ( $route ) {
-			return $this->router->gatherRouteMiddleware( $route );
-		}
-
-		return array();
-	}
-
-	/**
-	 * Parse a middleware string to get the name and parameters.
-	 *
-	 * @param string $middleware The app middleware.
-	 *
-	 * @return array
-	 */
-	protected function parse_middleware( $middleware ) {
-
-		list( $name, $parameters ) = array_pad( explode( ':', $middleware, 2 ), 2, array() );
-
-		if ( is_string( $parameters ) ) {
-			$parameters = explode( ',', $parameters );
-		}
-
-		return array( $name, $parameters );
-	}
-
-	/**
-	 * Determine if the kernel has a given middleware.
-	 *
-	 * @param string $middleware The app middleware.
-	 *
-	 * @return bool
-	 */
-	public function has_middleware( $middleware ) {
-		return in_array( $middleware, $this->middleware );
-	}
-
-	/**
-	 * Add a new middleware to beginning of the stack if it does not already exist.
-	 *
-	 * @param string $middleware The app middleware.
-	 *
-	 * @return $this
-	 */
-	public function prepend_middleware( $middleware ) {
-		if ( array_search( $middleware, $this->middleware ) === false ) {
-			array_unshift( $this->middleware, $middleware );
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Add a new middleware to end of the stack if it does not already exist.
-	 *
-	 * @param string $middleware The app middleware.
-	 *
-	 * @return $this
-	 */
-	public function push_middleware( $middleware ) {
-		if ( array_search( $middleware, $this->middleware ) === false ) {
-			$this->middleware[] = $middleware;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Prepend the given middleware to the given middleware group.
-	 *
-	 * @param string $group The app group.
-	 * @param string $middleware The app middleware.
-	 *
-	 * @throws \InvalidArgumentException The invalid argument exception.
-	 *
-	 * @return $this
-	 */
-	public function prepend_middleware_to_group( $group, $middleware ) {
-		if ( ! isset( $this->middleware_groups[ $group ] ) ) {
-			throw new InvalidArgumentException( "The [{$group}] middleware group has not been defined." );
-		}
-
-		if ( array_search( $middleware, $this->middleware_groups[ $group ] ) === false ) {
-			array_unshift( $this->middleware_groups[ $group ], $middleware );
-		}
-
-		$this->sync_middleware_to_router();
-
-		return $this;
-	}
-
-	/**
-	 * Append the given middleware to the given middleware group.
-	 *
-	 * @param string $group The app group.
-	 * @param string $middleware The app middleware.
-	 *
-	 * @throws \InvalidArgumentException The invalid argument exception.
-	 *
-	 * @return $this
-	 */
-	public function append_middleware_to_group( $group, $middleware ) {
-		if ( ! isset( $this->middleware_groups[ $group ] ) ) {
-			throw new InvalidArgumentException( "The [{$group}] middleware group has not been defined." );
-		}
-
-		if ( array_search( $middleware, $this->middleware_groups[ $group ] ) === false ) {
-			$this->middleware_groups[ $group ][] = $middleware;
-		}
-
-		$this->sync_middleware_to_router();
-
-		return $this;
-	}
-
-	/**
-	 * Prepend the given middleware to the middleware priority list.
-	 *
-	 * @param string $middleware The app middleware.
-	 *
-	 * @return $this
-	 */
-	public function prepend_to_middleware_priority( $middleware ) {
-		if ( ! in_array( $middleware, $this->middleware_priority ) ) {
-			array_unshift( $this->middleware_priority, $middleware );
-		}
-
-		$this->sync_middleware_to_router();
-
-		return $this;
-	}
-
-	/**
-	 * Append the given middleware to the middleware priority list.
-	 *
-	 * @param string $middleware The app middleware.
-	 *
-	 * @return $this
-	 */
-	public function append_to_middleware_priority( $middleware ) {
-		if ( ! in_array( $middleware, $this->middleware_priority ) ) {
-			$this->middleware_priority[] = $middleware;
-		}
-
-		$this->sync_middleware_to_router();
-
-		return $this;
-	}
-
-	/**
-	 * Sync the current state of the middleware to the router.
-	 *
-	 * @return void
-	 */
-	protected function sync_middleware_to_router() {
-		$this->router->middlewarePriority = $this->middleware_priority;
-
-		foreach ( $this->middleware_groups as $key => $middleware ) {
-			$this->router->middlewareGroup( $key, $middleware );
-		}
-
-		foreach ( $this->route_middleware as $key => $middleware ) {
-			$this->router->aliasMiddleware( $key, $middleware );
-		}
-	}
-
-	/**
-	 * Get the bootstrap classes for the application.
-	 *
-	 * @return array
-	 */
-	protected function bootstrappers() {
-		return $this->bootstrappers;
-	}
-
-	/**
-	 * Report the exception to the exception handler.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @return void
-	 */
-	protected function report_exception( Throwable $e ) {
-		$this->app[ ExceptionHandler::class ]->report( $e );
-	}
-
-	/**
-	 * Render the exception to a response.
-	 *
-	 * @param \Illuminate\Http\Request $request The app http request.
-	 * @param \Throwable               $e The throwable exception.
-	 *
-	 * @return \Symfony\Component\HttpFoundation\Response
-	 */
-	protected function render_exception( $request, Throwable $e ) {
-		return $this->app[ ExceptionHandler::class ]->render( $request, $e );
-	}
-
-	/**
-	 * Get the application's route middleware groups.
-	 *
-	 * @return array
-	 */
-	public function get_middleware_groups() {
-		return $this->middleware_groups;
-	}
-
-	/**
-	 * Get the application's route middleware.
-	 *
-	 * @return array
-	 */
-	public function get_route_middleware() {
-		return $this->route_middleware;
-	}
-
-	/**
-	 * Get the Laravel application instance.
-	 *
-	 * @return \Illuminate\Contracts\Foundation\Application
-	 */
-	public function get_application() {
-		return $this->app;
-	}
+    /**
+     * The application implementation.
+     *
+     * @var \Illuminate\Contracts\Foundation\Application
+     */
+    protected $app;
+
+    /**
+     * The router instance.
+     *
+     * @var \Illuminate\Routing\Router
+     */
+    protected $router;
+
+    /**
+     * The bootstrap classes for the application.
+     *
+     * @var array
+     */
+    protected $bootstrappers = array();
+
+    /**
+     * The application's middleware stack.
+     *
+     * @var array
+     */
+    protected $middleware = array();
+
+    /**
+     * The application's route middleware groups.
+     *
+     * @var array
+     */
+    protected $middleware_groups = array();
+
+    /**
+     * The application's route middleware.
+     *
+     * @var array
+     */
+    protected $route_middleware = array();
+
+    /**
+     * The priority-sorted list of middleware.
+     *
+     * Forces non-global middleware to always be in the given order.
+     *
+     * @var array
+     */
+    protected $middleware_priority = array();
+
+    /**
+     * Create a new HTTP kernel instance.
+     *
+     * @param \Illuminate\Contracts\Container\Container $app The app.
+     * @param \Illuminate\Routing\Router                $router The app router.
+     *
+     * @return void
+     */
+    public function __construct( Container $app, Router $router ) {
+        $this->app    = $app;
+        $this->router = $router;
+
+        $this->sync_middleware_to_router();
+    }
+
+    /**
+     * Handle an incoming HTTP request.
+     *
+     * @param \Illuminate\Http\Request $request The app http request.
+     *
+     * @throws \Exception The throwable exception.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function handle( $request ) {
+        try {
+            $request->enableHttpMethodParameterOverride();
+            $response = $this->send_request_through_router( $request );
+        } catch ( Throwable $e ) {
+            $this->report_exception( $e );
+            $response = $this->render_exception( $request, $e );
+        }
+
+        $this->app['events']->dispatch(
+            new RequestHandled( $request, $response )
+        );
+
+        return $response;
+    }
+
+    /**
+     * Send the given request through the middleware / router.
+     *
+     * @param \Illuminate\Http\Request $request The app http request.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    protected function send_request_through_router( $request ) {
+        $this->app->instance( 'request', $request );
+
+        Facade::clearResolvedInstance( 'request' );
+
+        $this->bootstrap();
+
+        return ( new Pipeline( $this->app ) )
+                    ->send( $request )
+                    ->through( $this->middleware )
+                    ->then( $this->dispatch_to_router() );
+    }
+
+    /**
+     * Bootstrap the application for HTTP requests.
+     *
+     * @return void
+     */
+    public function bootstrap() {}
+
+    /**
+     * Get the route dispatcher callback.
+     *
+     * @return \Closure
+     */
+    protected function dispatch_to_router() {
+        return function ( $request ) {
+            $this->app->instance( 'request', $request );
+
+            return $this->router->dispatch( $request );
+        };
+    }
+
+    /**
+     * Call the terminate method on any terminable middleware.
+     *
+     * @param \Illuminate\Http\Request  $request The app http request.
+     * @param \Illuminate\Http\Response $response The app http response.
+     *
+     * @return void
+     */
+    public function terminate( $request, $response ) {
+        $this->terminate_middleware( $request, $response );
+
+        $this->app->terminate();
+    }
+
+    /**
+     * Call the terminate method on any terminable middleware.
+     *
+     * @param \Illuminate\Http\Request  $request The app http request.
+     * @param \Illuminate\Http\Response $response The app http response.
+     *
+     * @return void
+     */
+    protected function terminate_middleware( $request, $response ) {
+        $middlewares = $this->app->shouldSkipMiddleware() ? array() : array_merge(
+            $this->gather_route_middleware( $request ),
+            $this->middleware
+        );
+
+        foreach ( $middlewares as $middleware ) {
+            if ( ! is_string( $middleware ) ) {
+                continue;
+            }
+
+            list( $name ) = $this->parse_middleware( $middleware );
+
+            $instance = $this->app->make( $name );
+
+            if ( method_exists( $instance, 'terminate' ) ) {
+                $instance->terminate( $request, $response );
+            }
+        }
+    }
+
+    /**
+     * Gather the route middleware for the given request.
+     *
+     * @param \Illuminate\Http\Request $request The app http request.
+     *
+     * @return array
+     */
+    protected function gather_route_middleware( $request ) {
+        $route = $request->route();
+        if ( $route ) {
+            return $this->router->gatherRouteMiddleware( $route );
+        }
+
+        return array();
+    }
+
+    /**
+     * Parse a middleware string to get the name and parameters.
+     *
+     * @param string $middleware The app middleware.
+     *
+     * @return array
+     */
+    protected function parse_middleware( $middleware ) {
+
+        list( $name, $parameters ) = array_pad( explode( ':', $middleware, 2 ), 2, array() );
+
+        if ( is_string( $parameters ) ) {
+            $parameters = explode( ',', $parameters );
+        }
+
+        return array( $name, $parameters );
+    }
+
+    /**
+     * Determine if the kernel has a given middleware.
+     *
+     * @param string $middleware The app middleware.
+     *
+     * @return bool
+     */
+    public function has_middleware( $middleware ) {
+        return in_array( $middleware, $this->middleware );
+    }
+
+    /**
+     * Add a new middleware to beginning of the stack if it does not already exist.
+     *
+     * @param string $middleware The app middleware.
+     *
+     * @return $this
+     */
+    public function prepend_middleware( $middleware ) {
+        if ( array_search( $middleware, $this->middleware ) === false ) {
+            array_unshift( $this->middleware, $middleware );
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add a new middleware to end of the stack if it does not already exist.
+     *
+     * @param string $middleware The app middleware.
+     *
+     * @return $this
+     */
+    public function push_middleware( $middleware ) {
+        if ( array_search( $middleware, $this->middleware ) === false ) {
+            $this->middleware[] = $middleware;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Prepend the given middleware to the given middleware group.
+     *
+     * @param string $group The app group.
+     * @param string $middleware The app middleware.
+     *
+     * @throws \InvalidArgumentException The invalid argument exception.
+     *
+     * @return $this
+     */
+    public function prepend_middleware_to_group( $group, $middleware ) {
+        if ( ! isset( $this->middleware_groups[ $group ] ) ) {
+            throw new InvalidArgumentException( "The [{$group}] middleware group has not been defined." );
+        }
+
+        if ( array_search( $middleware, $this->middleware_groups[ $group ] ) === false ) {
+            array_unshift( $this->middleware_groups[ $group ], $middleware );
+        }
+
+        $this->sync_middleware_to_router();
+
+        return $this;
+    }
+
+    /**
+     * Append the given middleware to the given middleware group.
+     *
+     * @param string $group The app group.
+     * @param string $middleware The app middleware.
+     *
+     * @throws \InvalidArgumentException The invalid argument exception.
+     *
+     * @return $this
+     */
+    public function append_middleware_to_group( $group, $middleware ) {
+        if ( ! isset( $this->middleware_groups[ $group ] ) ) {
+            throw new InvalidArgumentException( "The [{$group}] middleware group has not been defined." );
+        }
+
+        if ( array_search( $middleware, $this->middleware_groups[ $group ] ) === false ) {
+            $this->middleware_groups[ $group ][] = $middleware;
+        }
+
+        $this->sync_middleware_to_router();
+
+        return $this;
+    }
+
+    /**
+     * Prepend the given middleware to the middleware priority list.
+     *
+     * @param string $middleware The app middleware.
+     *
+     * @return $this
+     */
+    public function prepend_to_middleware_priority( $middleware ) {
+        if ( ! in_array( $middleware, $this->middleware_priority ) ) {
+            array_unshift( $this->middleware_priority, $middleware );
+        }
+
+        $this->sync_middleware_to_router();
+
+        return $this;
+    }
+
+    /**
+     * Append the given middleware to the middleware priority list.
+     *
+     * @param string $middleware The app middleware.
+     *
+     * @return $this
+     */
+    public function append_to_middleware_priority( $middleware ) {
+        if ( ! in_array( $middleware, $this->middleware_priority ) ) {
+            $this->middleware_priority[] = $middleware;
+        }
+
+        $this->sync_middleware_to_router();
+
+        return $this;
+    }
+
+    /**
+     * Sync the current state of the middleware to the router.
+     *
+     * @return void
+     */
+    protected function sync_middleware_to_router() {
+        $this->router->middlewarePriority = $this->middleware_priority;
+
+        foreach ( $this->middleware_groups as $key => $middleware ) {
+            $this->router->middlewareGroup( $key, $middleware );
+        }
+
+        foreach ( $this->route_middleware as $key => $middleware ) {
+            $this->router->aliasMiddleware( $key, $middleware );
+        }
+    }
+
+    /**
+     * Get the bootstrap classes for the application.
+     *
+     * @return array
+     */
+    protected function bootstrappers() {
+        return $this->bootstrappers;
+    }
+
+    /**
+     * Report the exception to the exception handler.
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @return void
+     */
+    protected function report_exception( Throwable $e ) {
+        $this->app[ ExceptionHandler::class ]->report( $e );
+    }
+
+    /**
+     * Render the exception to a response.
+     *
+     * @param \Illuminate\Http\Request $request The app http request.
+     * @param \Throwable               $e The throwable exception.
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function render_exception( $request, Throwable $e ) {
+        return $this->app[ ExceptionHandler::class ]->render( $request, $e );
+    }
+
+    /**
+     * Get the application's route middleware groups.
+     *
+     * @return array
+     */
+    public function get_middleware_groups() {
+        return $this->middleware_groups;
+    }
+
+    /**
+     * Get the application's route middleware.
+     *
+     * @return array
+     */
+    public function get_route_middleware() {
+        return $this->route_middleware;
+    }
+
+    /**
+     * Get the Laravel application instance.
+     *
+     * @return \Illuminate\Contracts\Foundation\Application
+     */
+    public function get_application() {
+        return $this->app;
+    }
 }

Spacing +65 added lines, -65 removed lines

@@ -90,7 +90,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function __construct( Container $app, Router $router ) {
+	public function __construct(Container $app, Router $router) {
 		$this->app    = $app;
 		$this->router = $router;
 
@@ -106,17 +106,17 @@ 
 	 *
 	 * @return \Illuminate\Http\Response
 	 */
-	public function handle( $request ) {
+	public function handle($request) {
 		try {
 			$request->enableHttpMethodParameterOverride();
-			$response = $this->send_request_through_router( $request );
-		} catch ( Throwable $e ) {
-			$this->report_exception( $e );
-			$response = $this->render_exception( $request, $e );
+			$response = $this->send_request_through_router($request);
+		} catch (Throwable $e) {
+			$this->report_exception($e);
+			$response = $this->render_exception($request, $e);
 		}
 
 		$this->app['events']->dispatch(
-			new RequestHandled( $request, $response )
+			new RequestHandled($request, $response)
 		);
 
 		return $response;
@@ -129,17 +129,17 @@ 
 	 *
 	 * @return \Illuminate\Http\Response
 	 */
-	protected function send_request_through_router( $request ) {
-		$this->app->instance( 'request', $request );
+	protected function send_request_through_router($request) {
+		$this->app->instance('request', $request);
 
-		Facade::clearResolvedInstance( 'request' );
+		Facade::clearResolvedInstance('request');
 
 		$this->bootstrap();
 
-		return ( new Pipeline( $this->app ) )
-					->send( $request )
-					->through( $this->middleware )
-					->then( $this->dispatch_to_router() );
+		return (new Pipeline($this->app))
+					->send($request)
+					->through($this->middleware)
+					->then($this->dispatch_to_router());
 	}
 
 	/**
@@ -155,10 +155,10 @@ 
 	 * @return \Closure
 	 */
 	protected function dispatch_to_router() {
-		return function ( $request ) {
-			$this->app->instance( 'request', $request );
+		return function($request) {
+			$this->app->instance('request', $request);
 
-			return $this->router->dispatch( $request );
+			return $this->router->dispatch($request);
 		};
 	}
 
@@ -170,8 +170,8 @@ 
 	 *
 	 * @return void
 	 */
-	public function terminate( $request, $response ) {
-		$this->terminate_middleware( $request, $response );
+	public function terminate($request, $response) {
+		$this->terminate_middleware($request, $response);
 
 		$this->app->terminate();
 	}
@@ -184,23 +184,23 @@ 
 	 *
 	 * @return void
 	 */
-	protected function terminate_middleware( $request, $response ) {
+	protected function terminate_middleware($request, $response) {
 		$middlewares = $this->app->shouldSkipMiddleware() ? array() : array_merge(
-			$this->gather_route_middleware( $request ),
+			$this->gather_route_middleware($request),
 			$this->middleware
 		);
 
-		foreach ( $middlewares as $middleware ) {
-			if ( ! is_string( $middleware ) ) {
+		foreach ($middlewares as $middleware) {
+			if (!is_string($middleware)) {
 				continue;
 			}
 
-			list( $name ) = $this->parse_middleware( $middleware );
+			list($name) = $this->parse_middleware($middleware);
 
-			$instance = $this->app->make( $name );
+			$instance = $this->app->make($name);
 
-			if ( method_exists( $instance, 'terminate' ) ) {
-				$instance->terminate( $request, $response );
+			if (method_exists($instance, 'terminate')) {
+				$instance->terminate($request, $response);
 			}
 		}
 	}
@@ -212,10 +212,10 @@ 
 	 *
 	 * @return array
 	 */
-	protected function gather_route_middleware( $request ) {
+	protected function gather_route_middleware($request) {
 		$route = $request->route();
-		if ( $route ) {
-			return $this->router->gatherRouteMiddleware( $route );
+		if ($route) {
+			return $this->router->gatherRouteMiddleware($route);
 		}
 
 		return array();
@@ -228,15 +228,15 @@ 
 	 *
 	 * @return array
 	 */
-	protected function parse_middleware( $middleware ) {
+	protected function parse_middleware($middleware) {
 
-		list( $name, $parameters ) = array_pad( explode( ':', $middleware, 2 ), 2, array() );
+		list($name, $parameters) = array_pad(explode(':', $middleware, 2), 2, array());
 
-		if ( is_string( $parameters ) ) {
-			$parameters = explode( ',', $parameters );
+		if (is_string($parameters)) {
+			$parameters = explode(',', $parameters);
 		}
 
-		return array( $name, $parameters );
+		return array($name, $parameters);
 	}
 
 	/**
@@ -246,8 +246,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function has_middleware( $middleware ) {
-		return in_array( $middleware, $this->middleware );
+	public function has_middleware($middleware) {
+		return in_array($middleware, $this->middleware);
 	}
 
 	/**
@@ -257,9 +257,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function prepend_middleware( $middleware ) {
-		if ( array_search( $middleware, $this->middleware ) === false ) {
-			array_unshift( $this->middleware, $middleware );
+	public function prepend_middleware($middleware) {
+		if (array_search($middleware, $this->middleware) === false) {
+			array_unshift($this->middleware, $middleware);
 		}
 
 		return $this;
@@ -272,8 +272,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function push_middleware( $middleware ) {
-		if ( array_search( $middleware, $this->middleware ) === false ) {
+	public function push_middleware($middleware) {
+		if (array_search($middleware, $this->middleware) === false) {
 			$this->middleware[] = $middleware;
 		}
 
@@ -290,13 +290,13 @@ 
 	 *
 	 * @return $this
 	 */
-	public function prepend_middleware_to_group( $group, $middleware ) {
-		if ( ! isset( $this->middleware_groups[ $group ] ) ) {
-			throw new InvalidArgumentException( "The [{$group}] middleware group has not been defined." );
+	public function prepend_middleware_to_group($group, $middleware) {
+		if (!isset($this->middleware_groups[$group])) {
+			throw new InvalidArgumentException("The [{$group}] middleware group has not been defined.");
 		}
 
-		if ( array_search( $middleware, $this->middleware_groups[ $group ] ) === false ) {
-			array_unshift( $this->middleware_groups[ $group ], $middleware );
+		if (array_search($middleware, $this->middleware_groups[$group]) === false) {
+			array_unshift($this->middleware_groups[$group], $middleware);
 		}
 
 		$this->sync_middleware_to_router();
@@ -314,13 +314,13 @@ 
 	 *
 	 * @return $this
 	 */
-	public function append_middleware_to_group( $group, $middleware ) {
-		if ( ! isset( $this->middleware_groups[ $group ] ) ) {
-			throw new InvalidArgumentException( "The [{$group}] middleware group has not been defined." );
+	public function append_middleware_to_group($group, $middleware) {
+		if (!isset($this->middleware_groups[$group])) {
+			throw new InvalidArgumentException("The [{$group}] middleware group has not been defined.");
 		}
 
-		if ( array_search( $middleware, $this->middleware_groups[ $group ] ) === false ) {
-			$this->middleware_groups[ $group ][] = $middleware;
+		if (array_search($middleware, $this->middleware_groups[$group]) === false) {
+			$this->middleware_groups[$group][] = $middleware;
 		}
 
 		$this->sync_middleware_to_router();
@@ -335,9 +335,9 @@ 
 	 *
 	 * @return $this
 	 */
-	public function prepend_to_middleware_priority( $middleware ) {
-		if ( ! in_array( $middleware, $this->middleware_priority ) ) {
-			array_unshift( $this->middleware_priority, $middleware );
+	public function prepend_to_middleware_priority($middleware) {
+		if (!in_array($middleware, $this->middleware_priority)) {
+			array_unshift($this->middleware_priority, $middleware);
 		}
 
 		$this->sync_middleware_to_router();
@@ -352,8 +352,8 @@ 
 	 *
 	 * @return $this
 	 */
-	public function append_to_middleware_priority( $middleware ) {
-		if ( ! in_array( $middleware, $this->middleware_priority ) ) {
+	public function append_to_middleware_priority($middleware) {
+		if (!in_array($middleware, $this->middleware_priority)) {
 			$this->middleware_priority[] = $middleware;
 		}
 
@@ -370,12 +370,12 @@ 
 	protected function sync_middleware_to_router() {
 		$this->router->middlewarePriority = $this->middleware_priority;
 
-		foreach ( $this->middleware_groups as $key => $middleware ) {
-			$this->router->middlewareGroup( $key, $middleware );
+		foreach ($this->middleware_groups as $key => $middleware) {
+			$this->router->middlewareGroup($key, $middleware);
 		}
 
-		foreach ( $this->route_middleware as $key => $middleware ) {
-			$this->router->aliasMiddleware( $key, $middleware );
+		foreach ($this->route_middleware as $key => $middleware) {
+			$this->router->aliasMiddleware($key, $middleware);
 		}
 	}
 
@@ -395,8 +395,8 @@ 
 	 *
 	 * @return void
 	 */
-	protected function report_exception( Throwable $e ) {
-		$this->app[ ExceptionHandler::class ]->report( $e );
+	protected function report_exception(Throwable $e) {
+		$this->app[ExceptionHandler::class]->report($e);
 	}
 
 	/**
@@ -407,8 +407,8 @@ 
 	 *
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	protected function render_exception( $request, Throwable $e ) {
-		return $this->app[ ExceptionHandler::class ]->render( $request, $e );
+	protected function render_exception($request, Throwable $e) {
+		return $this->app[ExceptionHandler::class]->render($request, $e);
 	}
 
 	/**