Codexshaper / wpb-framework

src/Http/Events/RequestHandled.php

Indentation +24 added lines, -24 removed lines

@@ -21,30 +21,30 @@
  */
 class RequestHandled {
 
-	/**
-	 * The request instance.
-	 *
-	 * @var \Illuminate\Http\Request
-	 */
-	public $request;
+    /**
+     * The request instance.
+     *
+     * @var \Illuminate\Http\Request
+     */
+    public $request;
 
-	/**
-	 * The response instance.
-	 *
-	 * @var \Illuminate\Http\Response
-	 */
-	public $response;
+    /**
+     * The response instance.
+     *
+     * @var \Illuminate\Http\Response
+     */
+    public $response;
 
-	/**
-	 * Create a new event instance.
-	 *
-	 * @param \Illuminate\Http\Request  $request The app http request.
-	 * @param \Illuminate\Http\Response $response The app http response.
-	 *
-	 * @return void
-	 */
-	public function __construct( $request, $response ) {
-		$this->request  = $request;
-		$this->response = $response;
-	}
+    /**
+     * Create a new event instance.
+     *
+     * @param \Illuminate\Http\Request  $request The app http request.
+     * @param \Illuminate\Http\Response $response The app http response.
+     *
+     * @return void
+     */
+    public function __construct( $request, $response ) {
+        $this->request  = $request;
+        $this->response = $response;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	 *
 	 * @return void
 	 */
-	public function __construct( $request, $response ) {
+	public function __construct($request, $response) {
 		$this->request  = $request;
 		$this->response = $response;
 	}

src/Contracts/Http/Kernel.php

Indentation +27 added lines, -27 removed lines

@@ -21,34 +21,34 @@
  */
 interface Kernel {
 
-	/**
-	 * Bootstrap the application for HTTP requests.
-	 *
-	 * @return void
-	 */
-	public function bootstrap();
+    /**
+     * Bootstrap the application for HTTP requests.
+     *
+     * @return void
+     */
+    public function bootstrap();
 
-	/**
-	 * Handle an incoming HTTP request.
-	 *
-	 * @param  \Symfony\Component\HttpFoundation\Request $request The app http request.
-	 * @return \Symfony\Component\HttpFoundation\Response
-	 */
-	public function handle( $request);
+    /**
+     * Handle an incoming HTTP request.
+     *
+     * @param  \Symfony\Component\HttpFoundation\Request $request The app http request.
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function handle( $request);
 
-	/**
-	 * Perform any final actions for the request lifecycle.
-	 *
-	 * @param  \Symfony\Component\HttpFoundation\Request  $request The app http request.
-	 * @param  \Symfony\Component\HttpFoundation\Response $response The app http response.
-	 * @return void
-	 */
-	public function terminate( $request, $response);
+    /**
+     * Perform any final actions for the request lifecycle.
+     *
+     * @param  \Symfony\Component\HttpFoundation\Request  $request The app http request.
+     * @param  \Symfony\Component\HttpFoundation\Response $response The app http response.
+     * @return void
+     */
+    public function terminate( $request, $response);
 
-	/**
-	 * Get the Laravel application instance.
-	 *
-	 * @return \Illuminate\Contracts\Foundation\Application
-	 */
-	public function get_application();
+    /**
+     * Get the Laravel application instance.
+     *
+     * @return \Illuminate\Contracts\Foundation\Application
+     */
+    public function get_application();
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param  \Symfony\Component\HttpFoundation\Request $request The app http request.
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	public function handle( $request);
+	public function handle($request);
 
 	/**
 	 * Perform any final actions for the request lifecycle.
@@ -43,7 +43,7 @@ 
 	 * @param  \Symfony\Component\HttpFoundation\Response $response The app http response.
 	 * @return void
 	 */
-	public function terminate( $request, $response);
+	public function terminate($request, $response);
 
 	/**
 	 * Get the Laravel application instance.

src/Contracts/ExceptionHandler.php

Indentation +34 added lines, -34 removed lines

@@ -24,41 +24,41 @@
  */
 interface ExceptionHandler {
 
-	/**
-	 * Report or log an exception.
-	 *
-	 * @param  \Throwable $e The throwable exception.
-	 * @return void
-	 *
-	 * @throws \Exception Throw the exception.
-	 */
-	public function report( Throwable $e);
+    /**
+     * Report or log an exception.
+     *
+     * @param  \Throwable $e The throwable exception.
+     * @return void
+     *
+     * @throws \Exception Throw the exception.
+     */
+    public function report( Throwable $e);
 
-	/**
-	 * Determine if the exception should be reported.
-	 *
-	 * @param  \Throwable $e The throwable exception.
-	 * @return bool
-	 */
-	public function should_report( Throwable $e);
+    /**
+     * Determine if the exception should be reported.
+     *
+     * @param  \Throwable $e The throwable exception.
+     * @return bool
+     */
+    public function should_report( Throwable $e);
 
-	/**
-	 * Render an exception into an HTTP response.
-	 *
-	 * @param  \Illuminate\Http\Request $request The app request.
-	 * @param  \Throwable               $e The throwable exception.
-	 * @return \Symfony\Component\HttpFoundation\Response
-	 *
-	 * @throws \Throwable Throw the error.
-	 */
-	public function render( $request, Throwable $e);
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request $request The app request.
+     * @param  \Throwable               $e The throwable exception.
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Throwable Throw the error.
+     */
+    public function render( $request, Throwable $e);
 
-	/**
-	 * Render an exception to the console.
-	 *
-	 * @param  \Symfony\Component\Console\Output\OutputInterface $output Symfony output.
-	 * @param  \Throwable                                        $e The throwable exception.
-	 * @return void
-	 */
-	public function render_for_console( $output, Throwable $e);
+    /**
+     * Render an exception to the console.
+     *
+     * @param  \Symfony\Component\Console\Output\OutputInterface $output Symfony output.
+     * @param  \Throwable                                        $e The throwable exception.
+     * @return void
+     */
+    public function render_for_console( $output, Throwable $e);
 }

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @throws \Exception Throw the exception.
 	 */
-	public function report( Throwable $e);
+	public function report(Throwable $e);
 
 	/**
 	 * Determine if the exception should be reported.
@@ -40,7 +40,7 @@ 
 	 * @param  \Throwable $e The throwable exception.
 	 * @return bool
 	 */
-	public function should_report( Throwable $e);
+	public function should_report(Throwable $e);
 
 	/**
 	 * Render an exception into an HTTP response.
@@ -51,7 +51,7 @@ 
 	 *
 	 * @throws \Throwable Throw the error.
 	 */
-	public function render( $request, Throwable $e);
+	public function render($request, Throwable $e);
 
 	/**
 	 * Render an exception to the console.
@@ -60,5 +60,5 @@ 
 	 * @param  \Throwable                                        $e The throwable exception.
 	 * @return void
 	 */
-	public function render_for_console( $output, Throwable $e);
+	public function render_for_console($output, Throwable $e);
 }

src/Application.php

Indentation +249 added lines, -249 removed lines

@@ -30,253 +30,253 @@
  */
 class Application {
 
-	/**
-	 * The app container.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      \Illuminate\Contracts\Container\Container    $app    The app container.
-	 */
-	protected $app = null;
-
-	/**
-	 * The config.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      \WPB\Support\Facades\Config    $config    The config.
-	 */
-	protected $config;
-
-	/**
-	 * The database manager.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      \CodexShaper\Database\Database    $db    The database manager.
-	 */
-	protected $db;
-
-	/**
-	 * The default options.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      array    $options    The default options.
-	 */
-	protected $options;
-
-	/**
-	 * This string unique root path.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string    $root    This string unique root path.
-	 */
-	protected $root;
-
-	/**
-	 * The application factory.
-	 *
-	 * @since    1.0.0
-	 * @param array                                                           $options The site options.
-	 * @param \Illuminate\Contracts\Container\Container as ContainerInterface $container The app container.
-	 *
-	 * @return void
-	 */
-	public function __construct( $options = array(), ContainerInterface $container = null ) {
-		$this->options = $options;
-
-		$this->app = $container;
-
-		if ( is_null( $this->app ) ) {
-			$this->app = new Container();
-			Facade::setFacadeApplication( $this->app );
-			$this->app->instance( ContainerInterface::class, $this->app );
-		}
-
-		$this->app['app'] = $this->app;
-
-		$this->root = __DIR__ . '/../../../../';
-
-		if ( ! empty( $this->options ) && isset( $this->options['paths']['root'] ) ) {
-			$this->root = rtrim( $this->options['paths']['root'], '/' ) . '/';
-		}
-
-		if ( ! isset( $this->app['root'] ) ) {
-			$this->app['root'] = $this->root;
-		}
-
-		$this->config = new Config( $this->options );
-
-		$this->setup_env();
-		$this->register_config();
-		$this->setup_database();
-		$this->register_providers();
-		$this->register_request();
-		$this->register_router();
-		$this->load_routes( $this->app['router'] );
-	}
-
-	/**
-	 * Get the app container.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @return \Illuminate\Container\Container
-	 */
-	public function get_instance() {
-		if ( ! $this->app ) {
-			new self();
-		}
-
-		return $this->app;
-	}
-
-	/**
-	 * Setup the env.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @return void
-	 */
-	protected function setup_env() {
-		$this->app['env'] = $this->config->get( 'app.env' );
-	}
-
-	/**
-	 * Register config.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @return void
-	 */
-	protected function register_config() {
-		$this->app->bind(
-			'config',
-			function () {
-				return array(
-					'app'           => $this->config->get( 'app' ),
-					'view.paths'    => $this->config->get( 'view.paths' ),
-					'view.compiled' => $this->config->get( 'view.compiled' ),
-				);
-			},
-			true
-		);
-	}
-
-	/**
-	 * Setup the database.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @return void
-	 */
-	protected function setup_database() {
-		global $wpdb;
-
-		$this->db = new Database(
-			array(
-				'driver'    => 'mysql',
-				'host'      => $wpdb->dbhost,
-				'database'  => $wpdb->dbname,
-				'username'  => $wpdb->dbuser,
-				'password'  => $wpdb->dbpassword,
-				'prefix'    => $wpdb->prefix,
-				'charset'   => $wpdb->charset,
-				'collation' => $wpdb->collate,
-			)
-		);
-
-		$this->db->run();
-
-		$this->app->singleton(
-			'db',
-			function () {
-				return $this->db;
-			}
-		);
-	}
-
-	/**
-	 * Register providers.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @return void
-	 */
-	protected function register_providers() {
-		$providers = $this->config->get( 'app.providers' );
-
-		if ( $providers && count( $providers ) > 0 ) {
-			foreach ( $providers as $provider ) {
-				with( new $provider( $this->app ) )->register();
-			}
-		}
-	}
-
-	/**
-	 * Register request.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @return void
-	 */
-	protected function register_request() {
-		$this->app->bind(
-			Request::class,
-			function ( $app ) {
-				$request = Request::capture();
-				$wp_user = wp_get_current_user();
-				if ( $wp_user ) {
-					$user = User::find( $wp_user->ID );
-					$request->merge( array( 'user' => $user ) );
-					$request->setUserResolver(
-						function () use ( $user ) {
-							return $user;
-						}
-					);
-				}
-
-				return $request;
-			}
-		);
-	}
-
-	/**
-	 * Register router.
-	 *
-	 * @since    1.0.0
-	 *
-	 * @return void
-	 */
-	protected function register_router() {
-		$this->app->instance( \Illuminate\Routing\Router::class, $this->app['router'] );
-		$this->app->instance( \WPB\Router::class, $this->app['router'] );
-		$this->app->alias( 'Route', \WPB\Support\Facades\Route::class );
-	}
-
-	/**
-	 * Get the config value.
-	 *
-	 * @since    1.0.0
-	 * @param \Illuminate\Routing\Router $router The app router.
-	 * @param string                     $dir The custom routes directory.
-	 *
-	 * @return void
-	 */
-	public function load_routes( $router, $dir = null ) {
-		if ( ! $dir ) {
-			$dir = __DIR__ . '/../routes/';
-		}
-
-		require $dir . 'web.php';
-
-		$router->group(
-			array( 'prefix' => 'api' ),
-			function () use ( $dir, $router ) {
-				require $dir . 'api.php';
-			}
-		);
-	}
+    /**
+     * The app container.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      \Illuminate\Contracts\Container\Container    $app    The app container.
+     */
+    protected $app = null;
+
+    /**
+     * The config.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      \WPB\Support\Facades\Config    $config    The config.
+     */
+    protected $config;
+
+    /**
+     * The database manager.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      \CodexShaper\Database\Database    $db    The database manager.
+     */
+    protected $db;
+
+    /**
+     * The default options.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      array    $options    The default options.
+     */
+    protected $options;
+
+    /**
+     * This string unique root path.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string    $root    This string unique root path.
+     */
+    protected $root;
+
+    /**
+     * The application factory.
+     *
+     * @since    1.0.0
+     * @param array                                                           $options The site options.
+     * @param \Illuminate\Contracts\Container\Container as ContainerInterface $container The app container.
+     *
+     * @return void
+     */
+    public function __construct( $options = array(), ContainerInterface $container = null ) {
+        $this->options = $options;
+
+        $this->app = $container;
+
+        if ( is_null( $this->app ) ) {
+            $this->app = new Container();
+            Facade::setFacadeApplication( $this->app );
+            $this->app->instance( ContainerInterface::class, $this->app );
+        }
+
+        $this->app['app'] = $this->app;
+
+        $this->root = __DIR__ . '/../../../../';
+
+        if ( ! empty( $this->options ) && isset( $this->options['paths']['root'] ) ) {
+            $this->root = rtrim( $this->options['paths']['root'], '/' ) . '/';
+        }
+
+        if ( ! isset( $this->app['root'] ) ) {
+            $this->app['root'] = $this->root;
+        }
+
+        $this->config = new Config( $this->options );
+
+        $this->setup_env();
+        $this->register_config();
+        $this->setup_database();
+        $this->register_providers();
+        $this->register_request();
+        $this->register_router();
+        $this->load_routes( $this->app['router'] );
+    }
+
+    /**
+     * Get the app container.
+     *
+     * @since    1.0.0
+     *
+     * @return \Illuminate\Container\Container
+     */
+    public function get_instance() {
+        if ( ! $this->app ) {
+            new self();
+        }
+
+        return $this->app;
+    }
+
+    /**
+     * Setup the env.
+     *
+     * @since    1.0.0
+     *
+     * @return void
+     */
+    protected function setup_env() {
+        $this->app['env'] = $this->config->get( 'app.env' );
+    }
+
+    /**
+     * Register config.
+     *
+     * @since    1.0.0
+     *
+     * @return void
+     */
+    protected function register_config() {
+        $this->app->bind(
+            'config',
+            function () {
+                return array(
+                    'app'           => $this->config->get( 'app' ),
+                    'view.paths'    => $this->config->get( 'view.paths' ),
+                    'view.compiled' => $this->config->get( 'view.compiled' ),
+                );
+            },
+            true
+        );
+    }
+
+    /**
+     * Setup the database.
+     *
+     * @since    1.0.0
+     *
+     * @return void
+     */
+    protected function setup_database() {
+        global $wpdb;
+
+        $this->db = new Database(
+            array(
+                'driver'    => 'mysql',
+                'host'      => $wpdb->dbhost,
+                'database'  => $wpdb->dbname,
+                'username'  => $wpdb->dbuser,
+                'password'  => $wpdb->dbpassword,
+                'prefix'    => $wpdb->prefix,
+                'charset'   => $wpdb->charset,
+                'collation' => $wpdb->collate,
+            )
+        );
+
+        $this->db->run();
+
+        $this->app->singleton(
+            'db',
+            function () {
+                return $this->db;
+            }
+        );
+    }
+
+    /**
+     * Register providers.
+     *
+     * @since    1.0.0
+     *
+     * @return void
+     */
+    protected function register_providers() {
+        $providers = $this->config->get( 'app.providers' );
+
+        if ( $providers && count( $providers ) > 0 ) {
+            foreach ( $providers as $provider ) {
+                with( new $provider( $this->app ) )->register();
+            }
+        }
+    }
+
+    /**
+     * Register request.
+     *
+     * @since    1.0.0
+     *
+     * @return void
+     */
+    protected function register_request() {
+        $this->app->bind(
+            Request::class,
+            function ( $app ) {
+                $request = Request::capture();
+                $wp_user = wp_get_current_user();
+                if ( $wp_user ) {
+                    $user = User::find( $wp_user->ID );
+                    $request->merge( array( 'user' => $user ) );
+                    $request->setUserResolver(
+                        function () use ( $user ) {
+                            return $user;
+                        }
+                    );
+                }
+
+                return $request;
+            }
+        );
+    }
+
+    /**
+     * Register router.
+     *
+     * @since    1.0.0
+     *
+     * @return void
+     */
+    protected function register_router() {
+        $this->app->instance( \Illuminate\Routing\Router::class, $this->app['router'] );
+        $this->app->instance( \WPB\Router::class, $this->app['router'] );
+        $this->app->alias( 'Route', \WPB\Support\Facades\Route::class );
+    }
+
+    /**
+     * Get the config value.
+     *
+     * @since    1.0.0
+     * @param \Illuminate\Routing\Router $router The app router.
+     * @param string                     $dir The custom routes directory.
+     *
+     * @return void
+     */
+    public function load_routes( $router, $dir = null ) {
+        if ( ! $dir ) {
+            $dir = __DIR__ . '/../routes/';
+        }
+
+        require $dir . 'web.php';
+
+        $router->group(
+            array( 'prefix' => 'api' ),
+            function () use ( $dir, $router ) {
+                require $dir . 'api.php';
+            }
+        );
+    }
 }

Spacing +36 added lines, -36 removed lines

@@ -84,30 +84,30 @@ 
 	 *
 	 * @return void
 	 */
-	public function __construct( $options = array(), ContainerInterface $container = null ) {
+	public function __construct($options = array(), ContainerInterface $container = null) {
 		$this->options = $options;
 
 		$this->app = $container;
 
-		if ( is_null( $this->app ) ) {
+		if (is_null($this->app)) {
 			$this->app = new Container();
-			Facade::setFacadeApplication( $this->app );
-			$this->app->instance( ContainerInterface::class, $this->app );
+			Facade::setFacadeApplication($this->app);
+			$this->app->instance(ContainerInterface::class, $this->app);
 		}
 
 		$this->app['app'] = $this->app;
 
-		$this->root = __DIR__ . '/../../../../';
+		$this->root = __DIR__.'/../../../../';
 
-		if ( ! empty( $this->options ) && isset( $this->options['paths']['root'] ) ) {
-			$this->root = rtrim( $this->options['paths']['root'], '/' ) . '/';
+		if (!empty($this->options) && isset($this->options['paths']['root'])) {
+			$this->root = rtrim($this->options['paths']['root'], '/').'/';
 		}
 
-		if ( ! isset( $this->app['root'] ) ) {
+		if (!isset($this->app['root'])) {
 			$this->app['root'] = $this->root;
 		}
 
-		$this->config = new Config( $this->options );
+		$this->config = new Config($this->options);
 
 		$this->setup_env();
 		$this->register_config();
@@ -115,7 +115,7 @@ 
 		$this->register_providers();
 		$this->register_request();
 		$this->register_router();
-		$this->load_routes( $this->app['router'] );
+		$this->load_routes($this->app['router']);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 * @return \Illuminate\Container\Container
 	 */
 	public function get_instance() {
-		if ( ! $this->app ) {
+		if (!$this->app) {
 			new self();
 		}
 
@@ -141,7 +141,7 @@ 
 	 * @return void
 	 */
 	protected function setup_env() {
-		$this->app['env'] = $this->config->get( 'app.env' );
+		$this->app['env'] = $this->config->get('app.env');
 	}
 
 	/**
@@ -154,11 +154,11 @@ 
 	protected function register_config() {
 		$this->app->bind(
 			'config',
-			function () {
+			function() {
 				return array(
-					'app'           => $this->config->get( 'app' ),
-					'view.paths'    => $this->config->get( 'view.paths' ),
-					'view.compiled' => $this->config->get( 'view.compiled' ),
+					'app'           => $this->config->get('app'),
+					'view.paths'    => $this->config->get('view.paths'),
+					'view.compiled' => $this->config->get('view.compiled'),
 				);
 			},
 			true
@@ -192,7 +192,7 @@ 
 
 		$this->app->singleton(
 			'db',
-			function () {
+			function() {
 				return $this->db;
 			}
 		);
@@ -206,11 +206,11 @@ 
 	 * @return void
 	 */
 	protected function register_providers() {
-		$providers = $this->config->get( 'app.providers' );
+		$providers = $this->config->get('app.providers');
 
-		if ( $providers && count( $providers ) > 0 ) {
-			foreach ( $providers as $provider ) {
-				with( new $provider( $this->app ) )->register();
+		if ($providers && count($providers) > 0) {
+			foreach ($providers as $provider) {
+				with(new $provider($this->app))->register();
 			}
 		}
 	}
@@ -225,14 +225,14 @@ 
 	protected function register_request() {
 		$this->app->bind(
 			Request::class,
-			function ( $app ) {
+			function($app) {
 				$request = Request::capture();
 				$wp_user = wp_get_current_user();
-				if ( $wp_user ) {
-					$user = User::find( $wp_user->ID );
-					$request->merge( array( 'user' => $user ) );
+				if ($wp_user) {
+					$user = User::find($wp_user->ID);
+					$request->merge(array('user' => $user));
 					$request->setUserResolver(
-						function () use ( $user ) {
+						function() use ($user) {
 							return $user;
 						}
 					);
@@ -251,9 +251,9 @@ 
 	 * @return void
 	 */
 	protected function register_router() {
-		$this->app->instance( \Illuminate\Routing\Router::class, $this->app['router'] );
-		$this->app->instance( \WPB\Router::class, $this->app['router'] );
-		$this->app->alias( 'Route', \WPB\Support\Facades\Route::class );
+		$this->app->instance(\Illuminate\Routing\Router::class, $this->app['router']);
+		$this->app->instance(\WPB\Router::class, $this->app['router']);
+		$this->app->alias('Route', \WPB\Support\Facades\Route::class);
 	}
 
 	/**
@@ -265,17 +265,17 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_routes( $router, $dir = null ) {
-		if ( ! $dir ) {
-			$dir = __DIR__ . '/../routes/';
+	public function load_routes($router, $dir = null) {
+		if (!$dir) {
+			$dir = __DIR__.'/../routes/';
 		}
 
-		require $dir . 'web.php';
+		require $dir.'web.php';
 
 		$router->group(
-			array( 'prefix' => 'api' ),
-			function () use ( $dir, $router ) {
-				require $dir . 'api.php';
+			array('prefix' => 'api'),
+			function() use ($dir, $router) {
+				require $dir.'api.php';
 			}
 		);
 	}

src/Composer/ComposerScripts.php

Spacing +44 added lines, -44 removed lines

@@ -33,8 +33,8 @@ 
 	 * @param  \Composer\Script\Event $event The composer event.
 	 * @return void
 	 */
-	public static function post_install( Event $event ) {
-		require_once $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/autoload.php';
+	public static function post_install(Event $event) {
+		require_once $event->getComposer()->getConfig()->get('vendor-dir').'/autoload.php';
 	}
 
 	/**
@@ -43,8 +43,8 @@ 
 	 * @param  \Composer\Script\Event $event The composer event.
 	 * @return void
 	 */
-	public static function post_update( Event $event ) {
-		require_once $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/autoload.php';
+	public static function post_update(Event $event) {
+		require_once $event->getComposer()->getConfig()->get('vendor-dir').'/autoload.php';
 	}
 
 	/**
@@ -53,20 +53,20 @@ 
 	 * @param  \Composer\Script\Event $event The composer event.
 	 * @return void
 	 */
-	public static function post_autoload_dump( Event $event ) {
-		require_once $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/autoload.php';
+	public static function post_autoload_dump(Event $event) {
+		require_once $event->getComposer()->getConfig()->get('vendor-dir').'/autoload.php';
 
-		$dir  = $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/../';
-		$root = dirname( $event->getComposer()->getConfig()->get( 'vendor-dir' ) );
+		$dir  = $event->getComposer()->getConfig()->get('vendor-dir').'/../';
+		$root = dirname($event->getComposer()->getConfig()->get('vendor-dir'));
 
-		$vendor_name         = strtolower( basename( $root ) );
-		$partials            = explode( '-', $vendor_name );
+		$vendor_name         = strtolower(basename($root));
+		$partials            = explode('-', $vendor_name);
 		$camel_case_partials = array();
-		foreach ( $partials as $partial ) {
-			$camel_case_partials[] = ucfirst( strtolower( $partial ) );
+		foreach ($partials as $partial) {
+			$camel_case_partials[] = ucfirst(strtolower($partial));
 		}
-		$camel_case = implode( '_', $camel_case_partials );
-		$snake_case = implode( '_', $partials );
+		$camel_case = implode('_', $camel_case_partials);
+		$snake_case = implode('_', $partials);
 
 		$files = array(
 			'/admin/class-wpb-admin.php',
@@ -116,39 +116,39 @@ 
 			'/wpb.php',
 		);
 
-		foreach ( $files as $file ) {
-			$file = $root . $file;
-			if ( file_exists( $file ) ) {
+		foreach ($files as $file) {
+			$file = $root.$file;
+			if (file_exists($file)) {
 
 				$filesystem = new Filesystem();
 
-				$contents = $filesystem->get( $file );
-				$contents = str_replace( 'wpb_', $snake_case . '_', $contents );
-				$contents = str_replace( 'wpb', $vendor_name, $contents );
-				$contents = str_replace( 'WPB_APP_ROOT', strtoupper( $camel_case ) . '_APP_ROOT', $contents );
-				$contents = str_replace( 'WPB_FILE', strtoupper( $camel_case ) . '_FILE', $contents );
-				$contents = str_replace( 'WPB_PATH', strtoupper( $camel_case ) . '_PATH', $contents );
-				$contents = str_replace( 'WPB_INCLUDES', strtoupper( $camel_case ) . '_INCLUDES', $contents );
-				$contents = str_replace( 'WPB_URL', strtoupper( $camel_case ) . '_URL', $contents );
-				$contents = str_replace( 'WPB_ASSETS', strtoupper( $camel_case ) . '_ASSETS', $contents );
-				$contents = str_replace( 'WPB_VERSION', strtoupper( $camel_case ) . '_VERSION', $contents );
-				$contents = str_replace( 'WPB', $camel_case, $contents );
+				$contents = $filesystem->get($file);
+				$contents = str_replace('wpb_', $snake_case.'_', $contents);
+				$contents = str_replace('wpb', $vendor_name, $contents);
+				$contents = str_replace('WPB_APP_ROOT', strtoupper($camel_case).'_APP_ROOT', $contents);
+				$contents = str_replace('WPB_FILE', strtoupper($camel_case).'_FILE', $contents);
+				$contents = str_replace('WPB_PATH', strtoupper($camel_case).'_PATH', $contents);
+				$contents = str_replace('WPB_INCLUDES', strtoupper($camel_case).'_INCLUDES', $contents);
+				$contents = str_replace('WPB_URL', strtoupper($camel_case).'_URL', $contents);
+				$contents = str_replace('WPB_ASSETS', strtoupper($camel_case).'_ASSETS', $contents);
+				$contents = str_replace('WPB_VERSION', strtoupper($camel_case).'_VERSION', $contents);
+				$contents = str_replace('WPB', $camel_case, $contents);
 				$filesystem->put(
 					$file,
 					$contents
 				);
 
-				$dir           = dirname( $file );
-				$file_name     = basename( $file );
-				$new_file_name = str_replace( 'wpb', $vendor_name, $file_name );
+				$dir           = dirname($file);
+				$file_name     = basename($file);
+				$new_file_name = str_replace('wpb', $vendor_name, $file_name);
 
-				if ( $file_name !== $new_file_name ) {
-					rename( $file, $dir . '/' . $new_file_name );
+				if ($file_name !== $new_file_name) {
+					rename($file, $dir.'/'.$new_file_name);
 				}
 			}
 		}
 
-		static::update_composer( $filesystem, $root, $camel_case );
+		static::update_composer($filesystem, $root, $camel_case);
 	}
 
 	/**
@@ -163,11 +163,11 @@ 
 	 *
 	 * @return void
 	 */
-	protected static function update_bootstrap( $filesystem, $root, $camel_case ) {
-		$file = $root . '/bootstrap/app.php';
-		if ( file_exists( $file ) ) {
-			$contents = $filesystem->get( $file );
-			$contents = str_replace( 'WPB_APP_ROOT', strtoupper( $camel_case ) . '_APP_ROOT', $contents );
+	protected static function update_bootstrap($filesystem, $root, $camel_case) {
+		$file = $root.'/bootstrap/app.php';
+		if (file_exists($file)) {
+			$contents = $filesystem->get($file);
+			$contents = str_replace('WPB_APP_ROOT', strtoupper($camel_case).'_APP_ROOT', $contents);
 			$filesystem->put(
 				$file,
 				$contents
@@ -185,11 +185,11 @@ 
 	 *
 	 * @return void
 	 */
-	protected static function update_composer( $filesystem, $root, $camel_case ) {
-		$file = $root . '/composer.json';
-		if ( file_exists( $file ) ) {
-			$contents = $filesystem->get( $file );
-			$contents = str_replace( 'WPB', $camel_case, $contents );
+	protected static function update_composer($filesystem, $root, $camel_case) {
+		$file = $root.'/composer.json';
+		if (file_exists($file)) {
+			$contents = $filesystem->get($file);
+			$contents = str_replace('WPB', $camel_case, $contents);
 			$filesystem->put(
 				$file,
 				$contents

Indentation +172 added lines, -172 removed lines

@@ -27,176 +27,176 @@
  */
 class ComposerScripts {
 
-	/**
-	 * Handle the post-install Composer event.
-	 *
-	 * @param  \Composer\Script\Event $event The composer event.
-	 * @return void
-	 */
-	public static function post_install( Event $event ) {
-		require_once $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/autoload.php';
-	}
-
-	/**
-	 * Handle the post-update Composer event.
-	 *
-	 * @param  \Composer\Script\Event $event The composer event.
-	 * @return void
-	 */
-	public static function post_update( Event $event ) {
-		require_once $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/autoload.php';
-	}
-
-	/**
-	 * Handle the post-autoload-dump Composer event.
-	 *
-	 * @param  \Composer\Script\Event $event The composer event.
-	 * @return void
-	 */
-	public static function post_autoload_dump( Event $event ) {
-		require_once $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/autoload.php';
-
-		$dir  = $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/../';
-		$root = dirname( $event->getComposer()->getConfig()->get( 'vendor-dir' ) );
-
-		$vendor_name         = strtolower( basename( $root ) );
-		$partials            = explode( '-', $vendor_name );
-		$camel_case_partials = array();
-		foreach ( $partials as $partial ) {
-			$camel_case_partials[] = ucfirst( strtolower( $partial ) );
-		}
-		$camel_case = implode( '_', $camel_case_partials );
-		$snake_case = implode( '_', $partials );
-
-		$files = array(
-			'/admin/class-wpb-admin.php',
-			'/admin/class-wpb-admin-menu.php',
-			'/admin/class-wpb-admin-submenu.php',
-			'/admin/partials/wpb-admin-display.php',
-			'/admin/css/wpb-admin.css',
-			'/admin/js/wpb-admin.js',
-			'/app/Exceptions/Handler.php',
-			'/app/Http/Controllers/ProductController.php',
-			'/app/Http/Middleware/AuthMiddleware.php',
-			'/app/Http/Middleware/VerifyCsrfToken.php',
-			'/app/Http/Kernel.php',
-			'/app/User.php',
-			'/app/Post.php',
-			'/bootstrap/app.php',
-			'/config/app.php',
-			'/config/database.php',
-			'/config/view.php',
-			'/database/migrations/class-create-customers-table.php',
-			'/database/seeds/class-customers-table.php',
-			'/includes/class-wpb-activator.php',
-			'/includes/class-wpb-deactivator.php',
-			'/includes/class-wpb-i18n.php',
-			'/includes/class-wpb-loader.php',
-			'/includes/class-wpb.php',
-			'/public/class-wpb-public.php',
-			'/public/partials/wpb-public-display.php',
-			'/public/css/wpb-public.css',
-			'/public/js/wpb-public.js',
-			'/resources/js/admin/main.js',
-			'/resources/js/frontend/main.js',
-			'/resources/js/spa/main.js',
-			'/routes/web.php',
-			'/routes/api.php',
-			'/src/Contracts/Http/Kernel.php',
-			'/src/Contracts/ExceptionHandler.php',
-			'/src/Database/Eloquent/Scopes/PostAuthorScope.php',
-			'/src/Database/Eloquent/Scopes/PostStatusScope.php',
-			'/src/Database/Eloquent/Scopes/PostTypeScope.php',
-			'/src/Database/DB.php',
-			'/src/Exceptions/Handler.php',
-			'/src/Http/Events/RequestHandler.php',
-			'/src/Http/Kernel.php',
-			'/src/helpers.php',
-			'/src/Support/Facades/Config.php',
-			'/src/Support/Facades/Route.php',
-			'/src/Application.php',
-			'/tests/Application.php',
-			'/wpb.php',
-		);
-
-		foreach ( $files as $file ) {
-			$file = $root . $file;
-			if ( file_exists( $file ) ) {
-
-				$filesystem = new Filesystem();
-
-				$contents = $filesystem->get( $file );
-				$contents = str_replace( 'wpb_', $snake_case . '_', $contents );
-				$contents = str_replace( 'wpb', $vendor_name, $contents );
-				$contents = str_replace( 'WPB_APP_ROOT', strtoupper( $camel_case ) . '_APP_ROOT', $contents );
-				$contents = str_replace( 'WPB_FILE', strtoupper( $camel_case ) . '_FILE', $contents );
-				$contents = str_replace( 'WPB_PATH', strtoupper( $camel_case ) . '_PATH', $contents );
-				$contents = str_replace( 'WPB_INCLUDES', strtoupper( $camel_case ) . '_INCLUDES', $contents );
-				$contents = str_replace( 'WPB_URL', strtoupper( $camel_case ) . '_URL', $contents );
-				$contents = str_replace( 'WPB_ASSETS', strtoupper( $camel_case ) . '_ASSETS', $contents );
-				$contents = str_replace( 'WPB_VERSION', strtoupper( $camel_case ) . '_VERSION', $contents );
-				$contents = str_replace( 'WPB', $camel_case, $contents );
-				$filesystem->put(
-					$file,
-					$contents
-				);
-
-				$dir           = dirname( $file );
-				$file_name     = basename( $file );
-				$new_file_name = str_replace( 'wpb', $vendor_name, $file_name );
-
-				if ( $file_name !== $new_file_name ) {
-					rename( $file, $dir . '/' . $new_file_name );
-				}
-			}
-		}
-
-		static::update_composer( $filesystem, $root, $camel_case );
-	}
-
-	/**
-	 * Replace bootstrap file.
-	 *
-	 * @since    1.0.0
-	 * @access   public
-	 *
-	 * @param Illuminate\Filesystem\Filesystem $filesystem The illuminate filesystem.
-	 * @param string                           $root The string is unique root path for each plugin.
-	 * @param string                           $camel_case This string is camel case of project name.
-	 *
-	 * @return void
-	 */
-	protected static function update_bootstrap( $filesystem, $root, $camel_case ) {
-		$file = $root . '/bootstrap/app.php';
-		if ( file_exists( $file ) ) {
-			$contents = $filesystem->get( $file );
-			$contents = str_replace( 'WPB_APP_ROOT', strtoupper( $camel_case ) . '_APP_ROOT', $contents );
-			$filesystem->put(
-				$file,
-				$contents
-			);
-
-		}
-	}
-
-	/**
-	 * Update composer.
-	 *
-	 * @param Illuminate\Filesystem\Filesystem $filesystem The illuminate filesystem.
-	 * @param  string                           $root The app root.
-	 * @param  string                           $camel_case The composer event.
-	 *
-	 * @return void
-	 */
-	protected static function update_composer( $filesystem, $root, $camel_case ) {
-		$file = $root . '/composer.json';
-		if ( file_exists( $file ) ) {
-			$contents = $filesystem->get( $file );
-			$contents = str_replace( 'WPB', $camel_case, $contents );
-			$filesystem->put(
-				$file,
-				$contents
-			);
-		}
-	}
+    /**
+     * Handle the post-install Composer event.
+     *
+     * @param  \Composer\Script\Event $event The composer event.
+     * @return void
+     */
+    public static function post_install( Event $event ) {
+        require_once $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/autoload.php';
+    }
+
+    /**
+     * Handle the post-update Composer event.
+     *
+     * @param  \Composer\Script\Event $event The composer event.
+     * @return void
+     */
+    public static function post_update( Event $event ) {
+        require_once $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/autoload.php';
+    }
+
+    /**
+     * Handle the post-autoload-dump Composer event.
+     *
+     * @param  \Composer\Script\Event $event The composer event.
+     * @return void
+     */
+    public static function post_autoload_dump( Event $event ) {
+        require_once $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/autoload.php';
+
+        $dir  = $event->getComposer()->getConfig()->get( 'vendor-dir' ) . '/../';
+        $root = dirname( $event->getComposer()->getConfig()->get( 'vendor-dir' ) );
+
+        $vendor_name         = strtolower( basename( $root ) );
+        $partials            = explode( '-', $vendor_name );
+        $camel_case_partials = array();
+        foreach ( $partials as $partial ) {
+            $camel_case_partials[] = ucfirst( strtolower( $partial ) );
+        }
+        $camel_case = implode( '_', $camel_case_partials );
+        $snake_case = implode( '_', $partials );
+
+        $files = array(
+            '/admin/class-wpb-admin.php',
+            '/admin/class-wpb-admin-menu.php',
+            '/admin/class-wpb-admin-submenu.php',
+            '/admin/partials/wpb-admin-display.php',
+            '/admin/css/wpb-admin.css',
+            '/admin/js/wpb-admin.js',
+            '/app/Exceptions/Handler.php',
+            '/app/Http/Controllers/ProductController.php',
+            '/app/Http/Middleware/AuthMiddleware.php',
+            '/app/Http/Middleware/VerifyCsrfToken.php',
+            '/app/Http/Kernel.php',
+            '/app/User.php',
+            '/app/Post.php',
+            '/bootstrap/app.php',
+            '/config/app.php',
+            '/config/database.php',
+            '/config/view.php',
+            '/database/migrations/class-create-customers-table.php',
+            '/database/seeds/class-customers-table.php',
+            '/includes/class-wpb-activator.php',
+            '/includes/class-wpb-deactivator.php',
+            '/includes/class-wpb-i18n.php',
+            '/includes/class-wpb-loader.php',
+            '/includes/class-wpb.php',
+            '/public/class-wpb-public.php',
+            '/public/partials/wpb-public-display.php',
+            '/public/css/wpb-public.css',
+            '/public/js/wpb-public.js',
+            '/resources/js/admin/main.js',
+            '/resources/js/frontend/main.js',
+            '/resources/js/spa/main.js',
+            '/routes/web.php',
+            '/routes/api.php',
+            '/src/Contracts/Http/Kernel.php',
+            '/src/Contracts/ExceptionHandler.php',
+            '/src/Database/Eloquent/Scopes/PostAuthorScope.php',
+            '/src/Database/Eloquent/Scopes/PostStatusScope.php',
+            '/src/Database/Eloquent/Scopes/PostTypeScope.php',
+            '/src/Database/DB.php',
+            '/src/Exceptions/Handler.php',
+            '/src/Http/Events/RequestHandler.php',
+            '/src/Http/Kernel.php',
+            '/src/helpers.php',
+            '/src/Support/Facades/Config.php',
+            '/src/Support/Facades/Route.php',
+            '/src/Application.php',
+            '/tests/Application.php',
+            '/wpb.php',
+        );
+
+        foreach ( $files as $file ) {
+            $file = $root . $file;
+            if ( file_exists( $file ) ) {
+
+                $filesystem = new Filesystem();
+
+                $contents = $filesystem->get( $file );
+                $contents = str_replace( 'wpb_', $snake_case . '_', $contents );
+                $contents = str_replace( 'wpb', $vendor_name, $contents );
+                $contents = str_replace( 'WPB_APP_ROOT', strtoupper( $camel_case ) . '_APP_ROOT', $contents );
+                $contents = str_replace( 'WPB_FILE', strtoupper( $camel_case ) . '_FILE', $contents );
+                $contents = str_replace( 'WPB_PATH', strtoupper( $camel_case ) . '_PATH', $contents );
+                $contents = str_replace( 'WPB_INCLUDES', strtoupper( $camel_case ) . '_INCLUDES', $contents );
+                $contents = str_replace( 'WPB_URL', strtoupper( $camel_case ) . '_URL', $contents );
+                $contents = str_replace( 'WPB_ASSETS', strtoupper( $camel_case ) . '_ASSETS', $contents );
+                $contents = str_replace( 'WPB_VERSION', strtoupper( $camel_case ) . '_VERSION', $contents );
+                $contents = str_replace( 'WPB', $camel_case, $contents );
+                $filesystem->put(
+                    $file,
+                    $contents
+                );
+
+                $dir           = dirname( $file );
+                $file_name     = basename( $file );
+                $new_file_name = str_replace( 'wpb', $vendor_name, $file_name );
+
+                if ( $file_name !== $new_file_name ) {
+                    rename( $file, $dir . '/' . $new_file_name );
+                }
+            }
+        }
+
+        static::update_composer( $filesystem, $root, $camel_case );
+    }
+
+    /**
+     * Replace bootstrap file.
+     *
+     * @since    1.0.0
+     * @access   public
+     *
+     * @param Illuminate\Filesystem\Filesystem $filesystem The illuminate filesystem.
+     * @param string                           $root The string is unique root path for each plugin.
+     * @param string                           $camel_case This string is camel case of project name.
+     *
+     * @return void
+     */
+    protected static function update_bootstrap( $filesystem, $root, $camel_case ) {
+        $file = $root . '/bootstrap/app.php';
+        if ( file_exists( $file ) ) {
+            $contents = $filesystem->get( $file );
+            $contents = str_replace( 'WPB_APP_ROOT', strtoupper( $camel_case ) . '_APP_ROOT', $contents );
+            $filesystem->put(
+                $file,
+                $contents
+            );
+
+        }
+    }
+
+    /**
+     * Update composer.
+     *
+     * @param Illuminate\Filesystem\Filesystem $filesystem The illuminate filesystem.
+     * @param  string                           $root The app root.
+     * @param  string                           $camel_case The composer event.
+     *
+     * @return void
+     */
+    protected static function update_composer( $filesystem, $root, $camel_case ) {
+        $file = $root . '/composer.json';
+        if ( file_exists( $file ) ) {
+            $contents = $filesystem->get( $file );
+            $contents = str_replace( 'WPB', $camel_case, $contents );
+            $filesystem->put(
+                $file,
+                $contents
+            );
+        }
+    }
 }

src/Support/Facades/Config.php

Indentation +51 added lines, -51 removed lines

@@ -21,62 +21,62 @@
  */
 class Config {
 
-	/**
-	 * The config.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      array    $config    The config array.
-	 */
-	protected $config = array();
+    /**
+     * The config.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      array    $config    The config array.
+     */
+    protected $config = array();
 
-	/**
-	 * Factory class.
-	 *
-	 * @since    1.0.0
-	 * @param array $options The defaut configuration option.
-	 *
-	 * @return void
-	 */
-	public function __construct( $options = array() ) {
-		$dir = __DIR__ . '/../../../../../../';
+    /**
+     * Factory class.
+     *
+     * @since    1.0.0
+     * @param array $options The defaut configuration option.
+     *
+     * @return void
+     */
+    public function __construct( $options = array() ) {
+        $dir = __DIR__ . '/../../../../../../';
 
-		if ( ! empty( $options ) && isset( $options['paths']['root'] ) ) {
-			$dir = rtrim( $options['paths']['root'], '/' ) . '/';
-		}
+        if ( ! empty( $options ) && isset( $options['paths']['root'] ) ) {
+            $dir = rtrim( $options['paths']['root'], '/' ) . '/';
+        }
 
-		foreach ( glob( $dir . 'config/*.php' ) as $file ) {
-			$index                  = pathinfo( $file )['filename'];
-			$this->config[ $index ] = require_once $file;
-		}
-	}
+        foreach ( glob( $dir . 'config/*.php' ) as $file ) {
+            $index                  = pathinfo( $file )['filename'];
+            $this->config[ $index ] = require_once $file;
+        }
+    }
 
-	/**
-	 * Get the config value.
-	 *
-	 * @since    1.0.0
-	 * @param string $config The config key.
-	 * @param string $default The default config value.
-	 *
-	 * @return null|string
-	 */
-	public function get( $config, $default = null ) {
-		$keys     = explode( '.', $config );
-		$filename = array_shift( $keys );
-		$data     = $this->config[ $filename ];
+    /**
+     * Get the config value.
+     *
+     * @since    1.0.0
+     * @param string $config The config key.
+     * @param string $default The default config value.
+     *
+     * @return null|string
+     */
+    public function get( $config, $default = null ) {
+        $keys     = explode( '.', $config );
+        $filename = array_shift( $keys );
+        $data     = $this->config[ $filename ];
 
-		foreach ( $keys as $key ) {
-			if ( is_array( $data ) && array_key_exists( $key, $data ) ) {
-				$data = $data[ $key ];
-			} else {
-				$data = null;
-			}
-		}
+        foreach ( $keys as $key ) {
+            if ( is_array( $data ) && array_key_exists( $key, $data ) ) {
+                $data = $data[ $key ];
+            } else {
+                $data = null;
+            }
+        }
 
-		if ( ! $data ) {
-			$data = $default;
-		}
+        if ( ! $data ) {
+            $data = $default;
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -38,16 +38,16 @@ 
 	 *
 	 * @return void
 	 */
-	public function __construct( $options = array() ) {
-		$dir = __DIR__ . '/../../../../../../';
+	public function __construct($options = array()) {
+		$dir = __DIR__.'/../../../../../../';
 
-		if ( ! empty( $options ) && isset( $options['paths']['root'] ) ) {
-			$dir = rtrim( $options['paths']['root'], '/' ) . '/';
+		if (!empty($options) && isset($options['paths']['root'])) {
+			$dir = rtrim($options['paths']['root'], '/').'/';
 		}
 
-		foreach ( glob( $dir . 'config/*.php' ) as $file ) {
-			$index                  = pathinfo( $file )['filename'];
-			$this->config[ $index ] = require_once $file;
+		foreach (glob($dir.'config/*.php') as $file) {
+			$index                  = pathinfo($file)['filename'];
+			$this->config[$index] = require_once $file;
 		}
 	}
 
@@ -60,20 +60,20 @@ 
 	 *
 	 * @return null|string
 	 */
-	public function get( $config, $default = null ) {
-		$keys     = explode( '.', $config );
-		$filename = array_shift( $keys );
-		$data     = $this->config[ $filename ];
+	public function get($config, $default = null) {
+		$keys     = explode('.', $config);
+		$filename = array_shift($keys);
+		$data     = $this->config[$filename];
 
-		foreach ( $keys as $key ) {
-			if ( is_array( $data ) && array_key_exists( $key, $data ) ) {
-				$data = $data[ $key ];
+		foreach ($keys as $key) {
+			if (is_array($data) && array_key_exists($key, $data)) {
+				$data = $data[$key];
 			} else {
 				$data = null;
 			}
 		}
 
-		if ( ! $data ) {
+		if (!$data) {
 			$data = $default;
 		}
 

src/Support/Facades/Route.php

Indentation +8 added lines, -8 removed lines

@@ -23,12 +23,12 @@
  */
 class Route extends Facade {
 
-	/**
-	 * Get the registered name of the component.
-	 *
-	 * @return string
-	 */
-	protected static function getFacadeAccessor() {
-		return \WPB\Router::class;
-	}
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor() {
+        return \WPB\Router::class;
+    }
 }

src/helpers.php

Indentation +60 added lines, -60 removed lines

@@ -12,77 +12,77 @@
 use Illuminate\Container\Container;
 
 if ( ! function_exists( 'wpb_csrf_token' ) ) {
-	/**
-	 * Generate wp nonce.
-	 *
-	 * @param string|null $action   This is the nonce action name.
-	 *
-	 * @return null|string
-	 */
-	function wpb_csrf_token( $action = 'wpb_nonce' ) {
-		return wp_create_nonce( $action );
-	}
+    /**
+     * Generate wp nonce.
+     *
+     * @param string|null $action   This is the nonce action name.
+     *
+     * @return null|string
+     */
+    function wpb_csrf_token( $action = 'wpb_nonce' ) {
+        return wp_create_nonce( $action );
+    }
 }
 
 if ( ! function_exists( 'wpb_app' ) ) {
-	/**
-	 * Get the available container instance.
-	 *
-	 * @param string|null $abstract The abstruct.
-	 * @param array       $parameters The parameters.
-	 *
-	 * @return mixed|\Illuminate\Contracts\Foundation\Application
-	 */
-	function wpb_app( $abstract = null, array $parameters = array() ) {
-		$app = new Application();
-		if ( is_null( $abstract ) && $container != null ) {
-			return $container;
-		}
+    /**
+     * Get the available container instance.
+     *
+     * @param string|null $abstract The abstruct.
+     * @param array       $parameters The parameters.
+     *
+     * @return mixed|\Illuminate\Contracts\Foundation\Application
+     */
+    function wpb_app( $abstract = null, array $parameters = array() ) {
+        $app = new Application();
+        if ( is_null( $abstract ) && $container != null ) {
+            return $container;
+        }
 
-		return Container::getInstance()->make( $abstract, $parameters );
-	}
+        return Container::getInstance()->make( $abstract, $parameters );
+    }
 }
 
 if ( ! function_exists( 'wpb_config' ) ) {
-	/**
-	 * Get / set the specified configuration value.
-	 *
-	 * If an array is passed as the key, we will assume you want to set an array of values.
-	 *
-	 * @param array|string|null $key This is the key for config array.
-	 * @param mixed             $default This is the default config value.
-	 *
-	 * @return mixed|\Illuminate\Config\Repository
-	 */
-	function wpb_config( $key = null, $default = null ) {
-		if ( is_null( $key ) ) {
-			return app( 'config' );
-		}
+    /**
+     * Get / set the specified configuration value.
+     *
+     * If an array is passed as the key, we will assume you want to set an array of values.
+     *
+     * @param array|string|null $key This is the key for config array.
+     * @param mixed             $default This is the default config value.
+     *
+     * @return mixed|\Illuminate\Config\Repository
+     */
+    function wpb_config( $key = null, $default = null ) {
+        if ( is_null( $key ) ) {
+            return app( 'config' );
+        }
 
-		if ( is_array( $key ) ) {
-			return app( 'config' )->set( $key );
-		}
+        if ( is_array( $key ) ) {
+            return app( 'config' )->set( $key );
+        }
 
-		return app( 'config' )->get( $key, $default );
-	}
+        return app( 'config' )->get( $key, $default );
+    }
 }
 
 if ( ! function_exists( 'wpb_view' ) ) {
-	/**
-	 * Render blade view.
-	 *
-	 * @param string $view   This is the filename.
-	 * @param array  $data   This is the view data.
-	 * @param array  $merge_data   This is the merge data for view.
-	 *
-	 * @throws \Exception This will throw an exception if view class doesn't exists.
-	 * @return null|string
-	 */
-	function wpb_view( $view, $data = array(), $merge_data = array() ) {
-		if ( ! class_exists( \CodexShaper\Blade\View::class ) ) {
-			throw new \Exception( 'View not resolved. Please install View' );
-		}
+    /**
+     * Render blade view.
+     *
+     * @param string $view   This is the filename.
+     * @param array  $data   This is the view data.
+     * @param array  $merge_data   This is the merge data for view.
+     *
+     * @throws \Exception This will throw an exception if view class doesn't exists.
+     * @return null|string
+     */
+    function wpb_view( $view, $data = array(), $merge_data = array() ) {
+        if ( ! class_exists( \CodexShaper\Blade\View::class ) ) {
+            throw new \Exception( 'View not resolved. Please install View' );
+        }
 
-		return ( new \CodexShaper\Blade\View( array( __DIR__ . '/../resources/views' ), __DIR__ . '/../storage/cache' ) )->make( $view, $data = array(), $merge_data = array() );
-	}
+        return ( new \CodexShaper\Blade\View( array( __DIR__ . '/../resources/views' ), __DIR__ . '/../storage/cache' ) )->make( $view, $data = array(), $merge_data = array() );
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -11,7 +11,7 @@ 
 use WPB\Application;
 use Illuminate\Container\Container;
 
-if ( ! function_exists( 'wpb_csrf_token' ) ) {
+if (!function_exists('wpb_csrf_token')) {
 	/**
 	 * Generate wp nonce.
 	 *
@@ -19,12 +19,12 @@ 
 	 *
 	 * @return null|string
 	 */
-	function wpb_csrf_token( $action = 'wpb_nonce' ) {
-		return wp_create_nonce( $action );
+	function wpb_csrf_token($action = 'wpb_nonce') {
+		return wp_create_nonce($action);
 	}
 }
 
-if ( ! function_exists( 'wpb_app' ) ) {
+if (!function_exists('wpb_app')) {
 	/**
 	 * Get the available container instance.
 	 *
@@ -33,17 +33,17 @@ 
 	 *
 	 * @return mixed|\Illuminate\Contracts\Foundation\Application
 	 */
-	function wpb_app( $abstract = null, array $parameters = array() ) {
+	function wpb_app($abstract = null, array $parameters = array()) {
 		$app = new Application();
-		if ( is_null( $abstract ) && $container != null ) {
+		if (is_null($abstract) && $container != null) {
 			return $container;
 		}
 
-		return Container::getInstance()->make( $abstract, $parameters );
+		return Container::getInstance()->make($abstract, $parameters);
 	}
 }
 
-if ( ! function_exists( 'wpb_config' ) ) {
+if (!function_exists('wpb_config')) {
 	/**
 	 * Get / set the specified configuration value.
 	 *
@@ -54,20 +54,20 @@ 
 	 *
 	 * @return mixed|\Illuminate\Config\Repository
 	 */
-	function wpb_config( $key = null, $default = null ) {
-		if ( is_null( $key ) ) {
-			return app( 'config' );
+	function wpb_config($key = null, $default = null) {
+		if (is_null($key)) {
+			return app('config');
 		}
 
-		if ( is_array( $key ) ) {
-			return app( 'config' )->set( $key );
+		if (is_array($key)) {
+			return app('config')->set($key);
 		}
 
-		return app( 'config' )->get( $key, $default );
+		return app('config')->get($key, $default);
 	}
 }
 
-if ( ! function_exists( 'wpb_view' ) ) {
+if (!function_exists('wpb_view')) {
 	/**
 	 * Render blade view.
 	 *
@@ -78,11 +78,11 @@ 
 	 * @throws \Exception This will throw an exception if view class doesn't exists.
 	 * @return null|string
 	 */
-	function wpb_view( $view, $data = array(), $merge_data = array() ) {
-		if ( ! class_exists( \CodexShaper\Blade\View::class ) ) {
-			throw new \Exception( 'View not resolved. Please install View' );
+	function wpb_view($view, $data = array(), $merge_data = array()) {
+		if (!class_exists(\CodexShaper\Blade\View::class)) {
+			throw new \Exception('View not resolved. Please install View');
 		}
 
-		return ( new \CodexShaper\Blade\View( array( __DIR__ . '/../resources/views' ), __DIR__ . '/../storage/cache' ) )->make( $view, $data = array(), $merge_data = array() );
+		return (new \CodexShaper\Blade\View(array(__DIR__.'/../resources/views'), __DIR__.'/../storage/cache'))->make($view, $data = array(), $merge_data = array());
 	}
 }

src/Exceptions/Handler.php

Indentation +512 added lines, -512 removed lines

@@ -54,516 +54,516 @@
  */
 class Handler implements ExceptionHandlerContract {
 
-	/**
-	 * The container implementation.
-	 *
-	 * @var \Illuminate\Contracts\Container\Container
-	 */
-	protected $container;
-
-	/**
-	 * A list of the exception types that are not reported.
-	 *
-	 * @var array
-	 */
-	protected $dont_report = array();
-
-	/**
-	 * A list of the internal exception types that should not be reported.
-	 *
-	 * @var array
-	 */
-	protected $internal_dont_report = array(
-		AuthenticationException::class,
-		AuthorizationException::class,
-		HttpException::class,
-		HttpResponseException::class,
-		ModelNotFoundException::class,
-		SuspiciousOperationException::class,
-		TokenMismatchException::class,
-		ValidationException::class,
-	);
-
-	/**
-	 * A list of the inputs that are never flashed for validation exceptions.
-	 *
-	 * @var array
-	 */
-	protected $dont_flash = array(
-		'password',
-		'password_confirmation',
-	);
-
-	/**
-	 * Create a new exception handler instance.
-	 *
-	 * @param \Illuminate\Contracts\Container\Container $container The app container.
-	 *
-	 * @return void
-	 */
-	public function __construct( Container $container ) {
-		$this->container = $container;
-	}
-
-	/**
-	 * Report or log an exception.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @throws \Exception Throw the exception.
-	 *
-	 * @return void
-	 */
-	public function report( Throwable $e ) {
-		if ( $this->shouldnt_report( $e ) ) {
-			return;
-		}
-
-		$report_callable = array( $e, 'report' );
-
-		if ( is_callable( $report_callable ) ) {
-			$this->container->call( $report_callable );
-
-			return;
-		}
-
-		try {
-			$logger = $this->container->make( LoggerInterface::class );
-		} catch ( Exception $ex ) {
-			throw $e;
-		}
-
-		$logger->error(
-			$e->getMessage(),
-			array_merge(
-				$this->exception_context( $e ),
-				$this->context(),
-				array( 'exception' => $e )
-			)
-		);
-	}
-
-	/**
-	 * Determine if the exception should be reported.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @return bool
-	 */
-	public function should_report( Throwable $e ) {
-		return ! $this->shouldnt_report( $e );
-	}
-
-	/**
-	 * Determine if the exception is in the "do not report" list.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @return bool
-	 */
-	protected function shouldnt_report( Throwable $e ) {
-		$dont_report = array_merge( $this->dont_report, $this->internal_dont_report );
-
-		return ! is_null(
-			Arr::first(
-				$dont_report,
-				function ( $type ) use ( $e ) {
-					return $e instanceof $type;
-				}
-			)
-		);
-	}
-
-	/**
-	 * Get the default exception context variables for logging.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @return array
-	 */
-	protected function exception_context( Throwable $e ) {
-		return array();
-	}
-
-	/**
-	 * Get the default context variables for logging.
-	 *
-	 * @return array
-	 */
-	protected function context() {
-		try {
-			return array_filter(
-				array(
-					'userId' => Auth::id(),
-				// 'email' => optional(Auth::user())->email,
-				)
-			);
-		} catch ( Throwable $e ) {
-			return array();
-		}
-	}
-
-	/**
-	 * Render an exception into an HTTP response.
-	 *
-	 * @param \Illuminate\Http\Request $request The app request.
-	 * @param \Throwable               $e The throwable exception.
-	 *
-	 * @throws \Throwable Throw the exception.
-	 *
-	 * @return \Symfony\Component\HttpFoundation\Response
-	 */
-	public function render( $request, Throwable $e ) {
-		$response = $e->render( $request );
-		if ( method_exists( $e, 'render' ) && $response ) {
-			return Router::toResponse( $request, $response );
-		} elseif ( $e instanceof Responsable ) {
-			return $e->toResponse( $request );
-		}
-
-		$e = $this->prepare_exception( $e );
-
-		if ( $e instanceof HttpResponseException ) {
-			return $e->getResponse();
-		} elseif ( $e instanceof AuthenticationException ) {
-			return $this->unauthenticated( $request, $e );
-		} elseif ( $e instanceof ValidationException ) {
-			return $this->convert_validation_exception_to_response( $e, $request );
-		}
-
-		return $request->expectsJson()
-					? $this->prepare_json_response( $request, $e )
-					: $this->prepare_response( $request, $e );
-	}
-
-	/**
-	 * Prepare exception for rendering.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @return \Throwable
-	 */
-	protected function prepare_exception( Throwable $e ) {
-		if ( $e instanceof ModelNotFoundException ) {
-			$e = new NotFoundHttpException( $e->getMessage(), $e );
-		} elseif ( $e instanceof AuthorizationException ) {
-			$e = new AccessDeniedHttpException( $e->getMessage(), $e );
-		} elseif ( $e instanceof TokenMismatchException ) {
-			$e = new HttpException( 419, $e->getMessage(), $e );
-		} elseif ( $e instanceof SuspiciousOperationException ) {
-			$e = new NotFoundHttpException( 'Bad hostname provided.', $e );
-		}
-
-		return $e;
-	}
-
-	/**
-	 * Convert an authentication exception into a response.
-	 *
-	 * @param \Illuminate\Http\Request                 $request The app request.
-	 * @param \Illuminate\Auth\AuthenticationException $exception The authenticated exception.
-	 *
-	 * @return \Symfony\Component\HttpFoundation\Response
-	 */
-	protected function unauthenticated( $request, AuthenticationException $exception ) {
-		return $request->expectsJson()
-					? response()->json( array( 'message' => $exception->getMessage() ), 401 )
-					: redirect()->guest( $exception->redirectTo() ?? route( 'login' ) );
-	}
-
-	/**
-	 * Create a response object from the given validation exception.
-	 *
-	 * @param \Illuminate\Validation\ValidationException $e The validation exception.
-	 * @param \Illuminate\Http\Request                   $request The app request.
-	 *
-	 * @return \Symfony\Component\HttpFoundation\Response
-	 */
-	protected function convert_validation_exception_to_response( ValidationException $e, $request ) {
-		if ( $e->response ) {
-			return $e->response;
-		}
-
-		return $request->expectsJson()
-					? $this->invalid_json( $request, $e )
-					: $this->invalid( $request, $e );
-	}
-
-	/**
-	 * Convert a validation exception into a response.
-	 *
-	 * @param \Illuminate\Http\Request                   $request The app request.
-	 * @param \Illuminate\Validation\ValidationException $exception The validation exception.
-	 *
-	 * @return \Illuminate\Http\Response
-	 */
-	protected function invalid( $request, ValidationException $exception ) {
-		return redirect( $exception->redirectTo ?? url()->previous() )
-					->withInput( Arr::except( $request->input(), $this->dont_flash ) )
-					->withErrors( $exception->errors(), $exception->errorBag );
-	}
-
-	/**
-	 * Convert a validation exception into a JSON response.
-	 *
-	 * @param \Illuminate\Http\Request                   $request The app request.
-	 * @param \Illuminate\Validation\ValidationException $exception The validation exception.
-	 *
-	 * @return \Illuminate\Http\JsonResponse
-	 */
-	protected function invalid_json( $request, ValidationException $exception ) {
-		return response()->json(
-			array(
-				'message' => $exception->getMessage(),
-				'errors'  => $exception->errors(),
-			),
-			$exception->status
-		);
-	}
-
-	/**
-	 * Prepare a response for the given exception.
-	 *
-	 * @param \Illuminate\Http\Request $request The app request.
-	 * @param \Throwable               $e The throwable exception.
-	 *
-	 * @return \Symfony\Component\HttpFoundation\Response
-	 */
-	protected function prepare_response( $request, Throwable $e ) {
-		if ( ! $this->is_http_exception( $e ) && $this->container['config']['app.debug'] ) {
-			return $this->to_illuminate_response( $this->convert_exception_to_response( $e ), $e );
-		}
-
-		if ( ! $this->is_http_exception( $e ) ) {
-			$e = new HttpException( 500, $e->getMessage() );
-		}
-
-		return $this->to_illuminate_response(
-			$this->render_http_exception( $e ),
-			$e
-		);
-	}
-
-	/**
-	 * Create a Symfony response for the given exception.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @return \Symfony\Component\HttpFoundation\Response
-	 */
-	protected function convert_exception_to_response( Throwable $e ) {
-		return SymfonyResponse::create(
-			$this->render_exception_content( $e ),
-			$this->is_http_exception( $e ) ? $e->getStatusCode() : 500,
-			$this->is_http_exception( $e ) ? $e->getHeaders() : array()
-		);
-	}
-
-	/**
-	 * Get the response content for the given exception.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @return string
-	 */
-	protected function render_exception_content( Throwable $e ) {
-		try {
-			return $this->container['config']['app.debug'] && class_exists( Whoops::class )
-						? $this->render_exception_with_whoops( $e )
-						: $this->render_exception_with_symfony( $e, $this->container['config']['app.debug'] );
-		} catch ( Exception $e ) {
-			return $this->render_exception_with_symfony( $e, $this->container['config']['app.debug'] );
-		}
-	}
-
-	/**
-	 * Render an exception to a string using "Whoops".
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @return string
-	 */
-	protected function render_exception_with_whoops( Throwable $e ) {
-		return tap(
-			new Whoops(),
-			function ( $whoops ) {
-				$whoops->appendHandler( $this->whoops_handler() );
-
-				$whoops->writeToOutput( false );
-
-				$whoops->allowQuit( false );
-			}
-		)->handleException( $e );
-	}
-
-	/**
-	 * Get the Whoops handler for the application.
-	 *
-	 * @return \Whoops\Handler\Handler
-	 */
-	protected function whoops_handler() {
-		try {
-			return $this->container( HandlerInterface::class );
-		} catch ( BindingResolutionException $e ) {
-			return ( new WhoopsHandler() )->forDebug();
-		}
-	}
-
-	/**
-	 * Render an exception to a string using Symfony.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 * @param bool       $debug Enable or disable debug.
-	 *
-	 * @return string
-	 */
-	protected function render_exception_with_symfony( Throwable $e, $debug ) {
-		$renderer = new HtmlErrorRenderer( $debug );
-
-		return $renderer->getBody( $renderer->render( $e ) );
-	}
-
-	/**
-	 * Render the given HttpException.
-	 *
-	 * @param \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface $e The http exception.
-	 *
-	 * @return \Symfony\Component\HttpFoundation\Response
-	 */
-	protected function render_http_exception( HttpExceptionInterface $e ) {
-		$this->register_error_view_paths();
-		$view = $this->get_http_exception_view( $e );
-
-		if ( view()->exists( $view ) ) {
-			return response()->view(
-				$view,
-				array(
-					'errors'    => new ViewErrorBag(),
-					'exception' => $e,
-				),
-				$e->getStatusCode(),
-				$e->getHeaders()
-			);
-		}
-
-		return $this->convert_exception_to_response( $e );
-	}
-
-	/**
-	 * Register the error template hint paths.
-	 *
-	 * @return void
-	 */
-	protected function register_error_view_paths() {
-		$paths = collect( $this->container['config']['view.paths'] );
-
-		View::replaceNamespace(
-			'errors',
-			$paths->map(
-				function ( $path ) {
-					return "{$path}/errors";
-				}
-			)->push( __DIR__ . '/views' )->all()
-		);
-	}
-
-	/**
-	 * Get the view used to render HTTP exceptions.
-	 *
-	 * @param \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface $e The http exceptions.
-	 *
-	 * @return string
-	 */
-	protected function get_http_exception_view( HttpExceptionInterface $e ) {
-		return "errors::{$e->getStatusCode()}";
-	}
-
-	/**
-	 * Map the given exception into an Illuminate response.
-	 *
-	 * @param \Symfony\Component\HttpFoundation\Response $response The app http response.
-	 * @param \Throwable                                 $e The throwable exception.
-	 *
-	 * @return \Illuminate\Http\Response
-	 */
-	protected function to_illuminate_response( $response, Throwable $e ) {
-		if ( $response instanceof SymfonyRedirectResponse ) {
-			$response = new RedirectResponse(
-				$response->getTargetUrl(),
-				$response->getStatusCode(),
-				$response->headers->all()
-			);
-		} else {
-			$response = new Response(
-				$response->getContent(),
-				$response->getStatusCode(),
-				$response->headers->all()
-			);
-		}
-
-		return $response->withException( $e );
-	}
-
-	/**
-	 * Prepare a JSON response for the given exception.
-	 *
-	 * @param \Illuminate\Http\Request $request The app http request.
-	 * @param \Throwable               $e The throwable exception.
-	 *
-	 * @return \Illuminate\Http\JsonResponse
-	 */
-	protected function prepare_json_response( $request, Throwable $e ) {
-		return new Json_response(
-			$this->convert_exception_to_array( $e ),
-			$this->is_http_exception( $e ) ? $e->getStatusCode() : 500,
-			$this->is_http_exception( $e ) ? $e->getHeaders() : array(),
-			JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES
-		);
-	}
-
-	/**
-	 * Convert the given exception to an array.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @return array
-	 */
-	protected function convert_exception_to_array( Throwable $e ) {
-		return $this->container['config']['app.debug'] ? array(
-			'message'   => $e->getMessage(),
-			'exception' => get_class( $e ),
-			'file'      => $e->getFile(),
-			'line'      => $e->getLine(),
-			'trace'     => collect( $e->getTrace() )->map(
-				function ( $trace ) {
-					return Arr::except( $trace, array( 'args' ) );
-				}
-			)->all(),
-		) : array(
-			'message' => $this->is_http_exception( $e ) ? $e->getMessage() : 'Server Error',
-		);
-	}
-
-	/**
-	 * Render an exception to the console.
-	 *
-	 * @param \Symfony\Component\Console\Output\OutputInterface $output The symfony console output.
-	 * @param \Throwable                                        $e The throwable exception.
-	 *
-	 * @return void
-	 */
-	public function render_for_console( $output, Throwable $e ) {
-		( new ConsoleApplication() )->renderThrowable( $e, $output );
-	}
-
-	/**
-	 * Determine if the given exception is an HTTP exception.
-	 *
-	 * @param \Throwable $e The throwable exception.
-	 *
-	 * @return bool
-	 */
-	protected function is_http_exception( Throwable $e ) {
-		return $e instanceof HttpExceptionInterface;
-	}
+    /**
+     * The container implementation.
+     *
+     * @var \Illuminate\Contracts\Container\Container
+     */
+    protected $container;
+
+    /**
+     * A list of the exception types that are not reported.
+     *
+     * @var array
+     */
+    protected $dont_report = array();
+
+    /**
+     * A list of the internal exception types that should not be reported.
+     *
+     * @var array
+     */
+    protected $internal_dont_report = array(
+        AuthenticationException::class,
+        AuthorizationException::class,
+        HttpException::class,
+        HttpResponseException::class,
+        ModelNotFoundException::class,
+        SuspiciousOperationException::class,
+        TokenMismatchException::class,
+        ValidationException::class,
+    );
+
+    /**
+     * A list of the inputs that are never flashed for validation exceptions.
+     *
+     * @var array
+     */
+    protected $dont_flash = array(
+        'password',
+        'password_confirmation',
+    );
+
+    /**
+     * Create a new exception handler instance.
+     *
+     * @param \Illuminate\Contracts\Container\Container $container The app container.
+     *
+     * @return void
+     */
+    public function __construct( Container $container ) {
+        $this->container = $container;
+    }
+
+    /**
+     * Report or log an exception.
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @throws \Exception Throw the exception.
+     *
+     * @return void
+     */
+    public function report( Throwable $e ) {
+        if ( $this->shouldnt_report( $e ) ) {
+            return;
+        }
+
+        $report_callable = array( $e, 'report' );
+
+        if ( is_callable( $report_callable ) ) {
+            $this->container->call( $report_callable );
+
+            return;
+        }
+
+        try {
+            $logger = $this->container->make( LoggerInterface::class );
+        } catch ( Exception $ex ) {
+            throw $e;
+        }
+
+        $logger->error(
+            $e->getMessage(),
+            array_merge(
+                $this->exception_context( $e ),
+                $this->context(),
+                array( 'exception' => $e )
+            )
+        );
+    }
+
+    /**
+     * Determine if the exception should be reported.
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @return bool
+     */
+    public function should_report( Throwable $e ) {
+        return ! $this->shouldnt_report( $e );
+    }
+
+    /**
+     * Determine if the exception is in the "do not report" list.
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @return bool
+     */
+    protected function shouldnt_report( Throwable $e ) {
+        $dont_report = array_merge( $this->dont_report, $this->internal_dont_report );
+
+        return ! is_null(
+            Arr::first(
+                $dont_report,
+                function ( $type ) use ( $e ) {
+                    return $e instanceof $type;
+                }
+            )
+        );
+    }
+
+    /**
+     * Get the default exception context variables for logging.
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @return array
+     */
+    protected function exception_context( Throwable $e ) {
+        return array();
+    }
+
+    /**
+     * Get the default context variables for logging.
+     *
+     * @return array
+     */
+    protected function context() {
+        try {
+            return array_filter(
+                array(
+                    'userId' => Auth::id(),
+                // 'email' => optional(Auth::user())->email,
+                )
+            );
+        } catch ( Throwable $e ) {
+            return array();
+        }
+    }
+
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param \Illuminate\Http\Request $request The app request.
+     * @param \Throwable               $e The throwable exception.
+     *
+     * @throws \Throwable Throw the exception.
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function render( $request, Throwable $e ) {
+        $response = $e->render( $request );
+        if ( method_exists( $e, 'render' ) && $response ) {
+            return Router::toResponse( $request, $response );
+        } elseif ( $e instanceof Responsable ) {
+            return $e->toResponse( $request );
+        }
+
+        $e = $this->prepare_exception( $e );
+
+        if ( $e instanceof HttpResponseException ) {
+            return $e->getResponse();
+        } elseif ( $e instanceof AuthenticationException ) {
+            return $this->unauthenticated( $request, $e );
+        } elseif ( $e instanceof ValidationException ) {
+            return $this->convert_validation_exception_to_response( $e, $request );
+        }
+
+        return $request->expectsJson()
+                    ? $this->prepare_json_response( $request, $e )
+                    : $this->prepare_response( $request, $e );
+    }
+
+    /**
+     * Prepare exception for rendering.
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @return \Throwable
+     */
+    protected function prepare_exception( Throwable $e ) {
+        if ( $e instanceof ModelNotFoundException ) {
+            $e = new NotFoundHttpException( $e->getMessage(), $e );
+        } elseif ( $e instanceof AuthorizationException ) {
+            $e = new AccessDeniedHttpException( $e->getMessage(), $e );
+        } elseif ( $e instanceof TokenMismatchException ) {
+            $e = new HttpException( 419, $e->getMessage(), $e );
+        } elseif ( $e instanceof SuspiciousOperationException ) {
+            $e = new NotFoundHttpException( 'Bad hostname provided.', $e );
+        }
+
+        return $e;
+    }
+
+    /**
+     * Convert an authentication exception into a response.
+     *
+     * @param \Illuminate\Http\Request                 $request The app request.
+     * @param \Illuminate\Auth\AuthenticationException $exception The authenticated exception.
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function unauthenticated( $request, AuthenticationException $exception ) {
+        return $request->expectsJson()
+                    ? response()->json( array( 'message' => $exception->getMessage() ), 401 )
+                    : redirect()->guest( $exception->redirectTo() ?? route( 'login' ) );
+    }
+
+    /**
+     * Create a response object from the given validation exception.
+     *
+     * @param \Illuminate\Validation\ValidationException $e The validation exception.
+     * @param \Illuminate\Http\Request                   $request The app request.
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function convert_validation_exception_to_response( ValidationException $e, $request ) {
+        if ( $e->response ) {
+            return $e->response;
+        }
+
+        return $request->expectsJson()
+                    ? $this->invalid_json( $request, $e )
+                    : $this->invalid( $request, $e );
+    }
+
+    /**
+     * Convert a validation exception into a response.
+     *
+     * @param \Illuminate\Http\Request                   $request The app request.
+     * @param \Illuminate\Validation\ValidationException $exception The validation exception.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    protected function invalid( $request, ValidationException $exception ) {
+        return redirect( $exception->redirectTo ?? url()->previous() )
+                    ->withInput( Arr::except( $request->input(), $this->dont_flash ) )
+                    ->withErrors( $exception->errors(), $exception->errorBag );
+    }
+
+    /**
+     * Convert a validation exception into a JSON response.
+     *
+     * @param \Illuminate\Http\Request                   $request The app request.
+     * @param \Illuminate\Validation\ValidationException $exception The validation exception.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    protected function invalid_json( $request, ValidationException $exception ) {
+        return response()->json(
+            array(
+                'message' => $exception->getMessage(),
+                'errors'  => $exception->errors(),
+            ),
+            $exception->status
+        );
+    }
+
+    /**
+     * Prepare a response for the given exception.
+     *
+     * @param \Illuminate\Http\Request $request The app request.
+     * @param \Throwable               $e The throwable exception.
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function prepare_response( $request, Throwable $e ) {
+        if ( ! $this->is_http_exception( $e ) && $this->container['config']['app.debug'] ) {
+            return $this->to_illuminate_response( $this->convert_exception_to_response( $e ), $e );
+        }
+
+        if ( ! $this->is_http_exception( $e ) ) {
+            $e = new HttpException( 500, $e->getMessage() );
+        }
+
+        return $this->to_illuminate_response(
+            $this->render_http_exception( $e ),
+            $e
+        );
+    }
+
+    /**
+     * Create a Symfony response for the given exception.
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function convert_exception_to_response( Throwable $e ) {
+        return SymfonyResponse::create(
+            $this->render_exception_content( $e ),
+            $this->is_http_exception( $e ) ? $e->getStatusCode() : 500,
+            $this->is_http_exception( $e ) ? $e->getHeaders() : array()
+        );
+    }
+
+    /**
+     * Get the response content for the given exception.
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @return string
+     */
+    protected function render_exception_content( Throwable $e ) {
+        try {
+            return $this->container['config']['app.debug'] && class_exists( Whoops::class )
+                        ? $this->render_exception_with_whoops( $e )
+                        : $this->render_exception_with_symfony( $e, $this->container['config']['app.debug'] );
+        } catch ( Exception $e ) {
+            return $this->render_exception_with_symfony( $e, $this->container['config']['app.debug'] );
+        }
+    }
+
+    /**
+     * Render an exception to a string using "Whoops".
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @return string
+     */
+    protected function render_exception_with_whoops( Throwable $e ) {
+        return tap(
+            new Whoops(),
+            function ( $whoops ) {
+                $whoops->appendHandler( $this->whoops_handler() );
+
+                $whoops->writeToOutput( false );
+
+                $whoops->allowQuit( false );
+            }
+        )->handleException( $e );
+    }
+
+    /**
+     * Get the Whoops handler for the application.
+     *
+     * @return \Whoops\Handler\Handler
+     */
+    protected function whoops_handler() {
+        try {
+            return $this->container( HandlerInterface::class );
+        } catch ( BindingResolutionException $e ) {
+            return ( new WhoopsHandler() )->forDebug();
+        }
+    }
+
+    /**
+     * Render an exception to a string using Symfony.
+     *
+     * @param \Throwable $e The throwable exception.
+     * @param bool       $debug Enable or disable debug.
+     *
+     * @return string
+     */
+    protected function render_exception_with_symfony( Throwable $e, $debug ) {
+        $renderer = new HtmlErrorRenderer( $debug );
+
+        return $renderer->getBody( $renderer->render( $e ) );
+    }
+
+    /**
+     * Render the given HttpException.
+     *
+     * @param \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface $e The http exception.
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function render_http_exception( HttpExceptionInterface $e ) {
+        $this->register_error_view_paths();
+        $view = $this->get_http_exception_view( $e );
+
+        if ( view()->exists( $view ) ) {
+            return response()->view(
+                $view,
+                array(
+                    'errors'    => new ViewErrorBag(),
+                    'exception' => $e,
+                ),
+                $e->getStatusCode(),
+                $e->getHeaders()
+            );
+        }
+
+        return $this->convert_exception_to_response( $e );
+    }
+
+    /**
+     * Register the error template hint paths.
+     *
+     * @return void
+     */
+    protected function register_error_view_paths() {
+        $paths = collect( $this->container['config']['view.paths'] );
+
+        View::replaceNamespace(
+            'errors',
+            $paths->map(
+                function ( $path ) {
+                    return "{$path}/errors";
+                }
+            )->push( __DIR__ . '/views' )->all()
+        );
+    }
+
+    /**
+     * Get the view used to render HTTP exceptions.
+     *
+     * @param \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface $e The http exceptions.
+     *
+     * @return string
+     */
+    protected function get_http_exception_view( HttpExceptionInterface $e ) {
+        return "errors::{$e->getStatusCode()}";
+    }
+
+    /**
+     * Map the given exception into an Illuminate response.
+     *
+     * @param \Symfony\Component\HttpFoundation\Response $response The app http response.
+     * @param \Throwable                                 $e The throwable exception.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    protected function to_illuminate_response( $response, Throwable $e ) {
+        if ( $response instanceof SymfonyRedirectResponse ) {
+            $response = new RedirectResponse(
+                $response->getTargetUrl(),
+                $response->getStatusCode(),
+                $response->headers->all()
+            );
+        } else {
+            $response = new Response(
+                $response->getContent(),
+                $response->getStatusCode(),
+                $response->headers->all()
+            );
+        }
+
+        return $response->withException( $e );
+    }
+
+    /**
+     * Prepare a JSON response for the given exception.
+     *
+     * @param \Illuminate\Http\Request $request The app http request.
+     * @param \Throwable               $e The throwable exception.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    protected function prepare_json_response( $request, Throwable $e ) {
+        return new Json_response(
+            $this->convert_exception_to_array( $e ),
+            $this->is_http_exception( $e ) ? $e->getStatusCode() : 500,
+            $this->is_http_exception( $e ) ? $e->getHeaders() : array(),
+            JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES
+        );
+    }
+
+    /**
+     * Convert the given exception to an array.
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @return array
+     */
+    protected function convert_exception_to_array( Throwable $e ) {
+        return $this->container['config']['app.debug'] ? array(
+            'message'   => $e->getMessage(),
+            'exception' => get_class( $e ),
+            'file'      => $e->getFile(),
+            'line'      => $e->getLine(),
+            'trace'     => collect( $e->getTrace() )->map(
+                function ( $trace ) {
+                    return Arr::except( $trace, array( 'args' ) );
+                }
+            )->all(),
+        ) : array(
+            'message' => $this->is_http_exception( $e ) ? $e->getMessage() : 'Server Error',
+        );
+    }
+
+    /**
+     * Render an exception to the console.
+     *
+     * @param \Symfony\Component\Console\Output\OutputInterface $output The symfony console output.
+     * @param \Throwable                                        $e The throwable exception.
+     *
+     * @return void
+     */
+    public function render_for_console( $output, Throwable $e ) {
+        ( new ConsoleApplication() )->renderThrowable( $e, $output );
+    }
+
+    /**
+     * Determine if the given exception is an HTTP exception.
+     *
+     * @param \Throwable $e The throwable exception.
+     *
+     * @return bool
+     */
+    protected function is_http_exception( Throwable $e ) {
+        return $e instanceof HttpExceptionInterface;
+    }
 }

Spacing +105 added lines, -105 removed lines

@@ -101,7 +101,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function __construct( Container $container ) {
+	public function __construct(Container $container) {
 		$this->container = $container;
 	}
 
@@ -114,31 +114,31 @@ 
 	 *
 	 * @return void
 	 */
-	public function report( Throwable $e ) {
-		if ( $this->shouldnt_report( $e ) ) {
+	public function report(Throwable $e) {
+		if ($this->shouldnt_report($e)) {
 			return;
 		}
 
-		$report_callable = array( $e, 'report' );
+		$report_callable = array($e, 'report');
 
-		if ( is_callable( $report_callable ) ) {
-			$this->container->call( $report_callable );
+		if (is_callable($report_callable)) {
+			$this->container->call($report_callable);
 
 			return;
 		}
 
 		try {
-			$logger = $this->container->make( LoggerInterface::class );
-		} catch ( Exception $ex ) {
+			$logger = $this->container->make(LoggerInterface::class);
+		} catch (Exception $ex) {
 			throw $e;
 		}
 
 		$logger->error(
 			$e->getMessage(),
 			array_merge(
-				$this->exception_context( $e ),
+				$this->exception_context($e),
 				$this->context(),
-				array( 'exception' => $e )
+				array('exception' => $e)
 			)
 		);
 	}
@@ -150,8 +150,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function should_report( Throwable $e ) {
-		return ! $this->shouldnt_report( $e );
+	public function should_report(Throwable $e) {
+		return !$this->shouldnt_report($e);
 	}
 
 	/**
@@ -161,13 +161,13 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function shouldnt_report( Throwable $e ) {
-		$dont_report = array_merge( $this->dont_report, $this->internal_dont_report );
+	protected function shouldnt_report(Throwable $e) {
+		$dont_report = array_merge($this->dont_report, $this->internal_dont_report);
 
-		return ! is_null(
+		return !is_null(
 			Arr::first(
 				$dont_report,
-				function ( $type ) use ( $e ) {
+				function($type) use ($e) {
 					return $e instanceof $type;
 				}
 			)
@@ -181,7 +181,7 @@ 
 	 *
 	 * @return array
 	 */
-	protected function exception_context( Throwable $e ) {
+	protected function exception_context(Throwable $e) {
 		return array();
 	}
 
@@ -198,7 +198,7 @@ 
 				// 'email' => optional(Auth::user())->email,
 				)
 			);
-		} catch ( Throwable $e ) {
+		} catch (Throwable $e) {
 			return array();
 		}
 	}
@@ -213,27 +213,27 @@ 
 	 *
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	public function render( $request, Throwable $e ) {
-		$response = $e->render( $request );
-		if ( method_exists( $e, 'render' ) && $response ) {
-			return Router::toResponse( $request, $response );
-		} elseif ( $e instanceof Responsable ) {
-			return $e->toResponse( $request );
+	public function render($request, Throwable $e) {
+		$response = $e->render($request);
+		if (method_exists($e, 'render') && $response) {
+			return Router::toResponse($request, $response);
+		} elseif ($e instanceof Responsable) {
+			return $e->toResponse($request);
 		}
 
-		$e = $this->prepare_exception( $e );
+		$e = $this->prepare_exception($e);
 
-		if ( $e instanceof HttpResponseException ) {
+		if ($e instanceof HttpResponseException) {
 			return $e->getResponse();
-		} elseif ( $e instanceof AuthenticationException ) {
-			return $this->unauthenticated( $request, $e );
-		} elseif ( $e instanceof ValidationException ) {
-			return $this->convert_validation_exception_to_response( $e, $request );
+		} elseif ($e instanceof AuthenticationException) {
+			return $this->unauthenticated($request, $e);
+		} elseif ($e instanceof ValidationException) {
+			return $this->convert_validation_exception_to_response($e, $request);
 		}
 
 		return $request->expectsJson()
-					? $this->prepare_json_response( $request, $e )
-					: $this->prepare_response( $request, $e );
+					? $this->prepare_json_response($request, $e)
+					: $this->prepare_response($request, $e);
 	}
 
 	/**
@@ -243,15 +243,15 @@ 
 	 *
 	 * @return \Throwable
 	 */
-	protected function prepare_exception( Throwable $e ) {
-		if ( $e instanceof ModelNotFoundException ) {
-			$e = new NotFoundHttpException( $e->getMessage(), $e );
-		} elseif ( $e instanceof AuthorizationException ) {
-			$e = new AccessDeniedHttpException( $e->getMessage(), $e );
-		} elseif ( $e instanceof TokenMismatchException ) {
-			$e = new HttpException( 419, $e->getMessage(), $e );
-		} elseif ( $e instanceof SuspiciousOperationException ) {
-			$e = new NotFoundHttpException( 'Bad hostname provided.', $e );
+	protected function prepare_exception(Throwable $e) {
+		if ($e instanceof ModelNotFoundException) {
+			$e = new NotFoundHttpException($e->getMessage(), $e);
+		} elseif ($e instanceof AuthorizationException) {
+			$e = new AccessDeniedHttpException($e->getMessage(), $e);
+		} elseif ($e instanceof TokenMismatchException) {
+			$e = new HttpException(419, $e->getMessage(), $e);
+		} elseif ($e instanceof SuspiciousOperationException) {
+			$e = new NotFoundHttpException('Bad hostname provided.', $e);
 		}
 
 		return $e;
@@ -265,10 +265,10 @@ 
 	 *
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	protected function unauthenticated( $request, AuthenticationException $exception ) {
+	protected function unauthenticated($request, AuthenticationException $exception) {
 		return $request->expectsJson()
-					? response()->json( array( 'message' => $exception->getMessage() ), 401 )
-					: redirect()->guest( $exception->redirectTo() ?? route( 'login' ) );
+					? response()->json(array('message' => $exception->getMessage()), 401)
+					: redirect()->guest($exception->redirectTo() ?? route('login'));
 	}
 
 	/**
@@ -279,14 +279,14 @@ 
 	 *
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	protected function convert_validation_exception_to_response( ValidationException $e, $request ) {
-		if ( $e->response ) {
+	protected function convert_validation_exception_to_response(ValidationException $e, $request) {
+		if ($e->response) {
 			return $e->response;
 		}
 
 		return $request->expectsJson()
-					? $this->invalid_json( $request, $e )
-					: $this->invalid( $request, $e );
+					? $this->invalid_json($request, $e)
+					: $this->invalid($request, $e);
 	}
 
 	/**
@@ -297,10 +297,10 @@ 
 	 *
 	 * @return \Illuminate\Http\Response
 	 */
-	protected function invalid( $request, ValidationException $exception ) {
-		return redirect( $exception->redirectTo ?? url()->previous() )
-					->withInput( Arr::except( $request->input(), $this->dont_flash ) )
-					->withErrors( $exception->errors(), $exception->errorBag );
+	protected function invalid($request, ValidationException $exception) {
+		return redirect($exception->redirectTo ?? url()->previous())
+					->withInput(Arr::except($request->input(), $this->dont_flash))
+					->withErrors($exception->errors(), $exception->errorBag);
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 	 *
 	 * @return \Illuminate\Http\JsonResponse
 	 */
-	protected function invalid_json( $request, ValidationException $exception ) {
+	protected function invalid_json($request, ValidationException $exception) {
 		return response()->json(
 			array(
 				'message' => $exception->getMessage(),
@@ -329,17 +329,17 @@ 
 	 *
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	protected function prepare_response( $request, Throwable $e ) {
-		if ( ! $this->is_http_exception( $e ) && $this->container['config']['app.debug'] ) {
-			return $this->to_illuminate_response( $this->convert_exception_to_response( $e ), $e );
+	protected function prepare_response($request, Throwable $e) {
+		if (!$this->is_http_exception($e) && $this->container['config']['app.debug']) {
+			return $this->to_illuminate_response($this->convert_exception_to_response($e), $e);
 		}
 
-		if ( ! $this->is_http_exception( $e ) ) {
-			$e = new HttpException( 500, $e->getMessage() );
+		if (!$this->is_http_exception($e)) {
+			$e = new HttpException(500, $e->getMessage());
 		}
 
 		return $this->to_illuminate_response(
-			$this->render_http_exception( $e ),
+			$this->render_http_exception($e),
 			$e
 		);
 	}
@@ -351,11 +351,11 @@ 
 	 *
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	protected function convert_exception_to_response( Throwable $e ) {
+	protected function convert_exception_to_response(Throwable $e) {
 		return SymfonyResponse::create(
-			$this->render_exception_content( $e ),
-			$this->is_http_exception( $e ) ? $e->getStatusCode() : 500,
-			$this->is_http_exception( $e ) ? $e->getHeaders() : array()
+			$this->render_exception_content($e),
+			$this->is_http_exception($e) ? $e->getStatusCode() : 500,
+			$this->is_http_exception($e) ? $e->getHeaders() : array()
 		);
 	}
 
@@ -366,13 +366,13 @@ 
 	 *
 	 * @return string
 	 */
-	protected function render_exception_content( Throwable $e ) {
+	protected function render_exception_content(Throwable $e) {
 		try {
-			return $this->container['config']['app.debug'] && class_exists( Whoops::class )
-						? $this->render_exception_with_whoops( $e )
-						: $this->render_exception_with_symfony( $e, $this->container['config']['app.debug'] );
-		} catch ( Exception $e ) {
-			return $this->render_exception_with_symfony( $e, $this->container['config']['app.debug'] );
+			return $this->container['config']['app.debug'] && class_exists(Whoops::class)
+						? $this->render_exception_with_whoops($e)
+						: $this->render_exception_with_symfony($e, $this->container['config']['app.debug']);
+		} catch (Exception $e) {
+			return $this->render_exception_with_symfony($e, $this->container['config']['app.debug']);
 		}
 	}
 
@@ -383,17 +383,17 @@ 
 	 *
 	 * @return string
 	 */
-	protected function render_exception_with_whoops( Throwable $e ) {
+	protected function render_exception_with_whoops(Throwable $e) {
 		return tap(
 			new Whoops(),
-			function ( $whoops ) {
-				$whoops->appendHandler( $this->whoops_handler() );
+			function($whoops) {
+				$whoops->appendHandler($this->whoops_handler());
 
-				$whoops->writeToOutput( false );
+				$whoops->writeToOutput(false);
 
-				$whoops->allowQuit( false );
+				$whoops->allowQuit(false);
 			}
-		)->handleException( $e );
+		)->handleException($e);
 	}
 
 	/**
@@ -403,9 +403,9 @@ 
 	 */
 	protected function whoops_handler() {
 		try {
-			return $this->container( HandlerInterface::class );
-		} catch ( BindingResolutionException $e ) {
-			return ( new WhoopsHandler() )->forDebug();
+			return $this->container(HandlerInterface::class);
+		} catch (BindingResolutionException $e) {
+			return (new WhoopsHandler())->forDebug();
 		}
 	}
 
@@ -417,10 +417,10 @@ 
 	 *
 	 * @return string
 	 */
-	protected function render_exception_with_symfony( Throwable $e, $debug ) {
-		$renderer = new HtmlErrorRenderer( $debug );
+	protected function render_exception_with_symfony(Throwable $e, $debug) {
+		$renderer = new HtmlErrorRenderer($debug);
 
-		return $renderer->getBody( $renderer->render( $e ) );
+		return $renderer->getBody($renderer->render($e));
 	}
 
 	/**
@@ -430,11 +430,11 @@ 
 	 *
 	 * @return \Symfony\Component\HttpFoundation\Response
 	 */
-	protected function render_http_exception( HttpExceptionInterface $e ) {
+	protected function render_http_exception(HttpExceptionInterface $e) {
 		$this->register_error_view_paths();
-		$view = $this->get_http_exception_view( $e );
+		$view = $this->get_http_exception_view($e);
 
-		if ( view()->exists( $view ) ) {
+		if (view()->exists($view)) {
 			return response()->view(
 				$view,
 				array(
@@ -446,7 +446,7 @@ 
 			);
 		}
 
-		return $this->convert_exception_to_response( $e );
+		return $this->convert_exception_to_response($e);
 	}
 
 	/**
@@ -455,15 +455,15 @@ 
 	 * @return void
 	 */
 	protected function register_error_view_paths() {
-		$paths = collect( $this->container['config']['view.paths'] );
+		$paths = collect($this->container['config']['view.paths']);
 
 		View::replaceNamespace(
 			'errors',
 			$paths->map(
-				function ( $path ) {
+				function($path) {
 					return "{$path}/errors";
 				}
-			)->push( __DIR__ . '/views' )->all()
+			)->push(__DIR__.'/views')->all()
 		);
 	}
 
@@ -474,7 +474,7 @@ 
 	 *
 	 * @return string
 	 */
-	protected function get_http_exception_view( HttpExceptionInterface $e ) {
+	protected function get_http_exception_view(HttpExceptionInterface $e) {
 		return "errors::{$e->getStatusCode()}";
 	}
 
@@ -486,8 +486,8 @@ 
 	 *
 	 * @return \Illuminate\Http\Response
 	 */
-	protected function to_illuminate_response( $response, Throwable $e ) {
-		if ( $response instanceof SymfonyRedirectResponse ) {
+	protected function to_illuminate_response($response, Throwable $e) {
+		if ($response instanceof SymfonyRedirectResponse) {
 			$response = new RedirectResponse(
 				$response->getTargetUrl(),
 				$response->getStatusCode(),
@@ -501,7 +501,7 @@ 
 			);
 		}
 
-		return $response->withException( $e );
+		return $response->withException($e);
 	}
 
 	/**
@@ -512,11 +512,11 @@ 
 	 *
 	 * @return \Illuminate\Http\JsonResponse
 	 */
-	protected function prepare_json_response( $request, Throwable $e ) {
+	protected function prepare_json_response($request, Throwable $e) {
 		return new Json_response(
-			$this->convert_exception_to_array( $e ),
-			$this->is_http_exception( $e ) ? $e->getStatusCode() : 500,
-			$this->is_http_exception( $e ) ? $e->getHeaders() : array(),
+			$this->convert_exception_to_array($e),
+			$this->is_http_exception($e) ? $e->getStatusCode() : 500,
+			$this->is_http_exception($e) ? $e->getHeaders() : array(),
 			JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES
 		);
 	}
@@ -528,19 +528,19 @@ 
 	 *
 	 * @return array
 	 */
-	protected function convert_exception_to_array( Throwable $e ) {
+	protected function convert_exception_to_array(Throwable $e) {
 		return $this->container['config']['app.debug'] ? array(
 			'message'   => $e->getMessage(),
-			'exception' => get_class( $e ),
+			'exception' => get_class($e),
 			'file'      => $e->getFile(),
 			'line'      => $e->getLine(),
-			'trace'     => collect( $e->getTrace() )->map(
-				function ( $trace ) {
-					return Arr::except( $trace, array( 'args' ) );
+			'trace'     => collect($e->getTrace())->map(
+				function($trace) {
+					return Arr::except($trace, array('args'));
 				}
 			)->all(),
 		) : array(
-			'message' => $this->is_http_exception( $e ) ? $e->getMessage() : 'Server Error',
+			'message' => $this->is_http_exception($e) ? $e->getMessage() : 'Server Error',
 		);
 	}
 
@@ -552,8 +552,8 @@ 
 	 *
 	 * @return void
 	 */
-	public function render_for_console( $output, Throwable $e ) {
-		( new ConsoleApplication() )->renderThrowable( $e, $output );
+	public function render_for_console($output, Throwable $e) {
+		(new ConsoleApplication())->renderThrowable($e, $output);
 	}
 
 	/**
@@ -563,7 +563,7 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function is_http_exception( Throwable $e ) {
+	protected function is_http_exception(Throwable $e) {
 		return $e instanceof HttpExceptionInterface;
 	}
 }