Codexshaper / wpb-framework

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

src/Http/Kernel.php

Indentation +406 added lines, -406 removed lines

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

Spacing +65 added lines, -65 removed lines

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

includes/class-wpb.php

Indentation +319 added lines, -319 removed lines

@@ -28,323 +28,323 @@
  */
 class WPB {
 
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      WPB_Loader    $loader    Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string    $plugin_name    The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string    $version    The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		$this->define_constants();
-
-		if ( defined( 'WPB_VERSION' ) ) {
-			$this->version = WPB_VERSION;
-		} else {
-			$this->version = '1.0.0';
-		}
-		$this->plugin_name = 'wpb';
-		$this->load_dependencies();
-		$this->set_locale();
-		$this->define_admin_hooks();
-		$this->define_public_hooks();
-		$this->register_assets();
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - WPB_Loader. Orchestrates the hooks of the plugin.
-	 * - WPB_i18n. Defines internationalization functionality.
-	 * - WPB_Admin. Defines all hooks for the admin area.
-	 * - WPB_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wpb-loader.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wpb-i18n.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wpb-admin.php';
-
-		/**
-		 * The class responsible for defining all menu actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wpb-admin-menu.php';
-
-		/**
-		 * The class responsible for defining all submenu actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wpb-admin-submenu.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wpb-public.php';
-
-		$this->loader = new WPB_Loader();
-
-	}
-
-	/**
-	 * Define the locale for this plugin for internationalization.
-	 *
-	 * Uses the WPB_i18n class in order to set the domain and to register the hook
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function set_locale() {
-
-		$plugin_i18n = new WPB_I18n();
-
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the admin area functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_admin_hooks() {
-
-		$plugin_admin = new WPB_Admin( $this->get_plugin_name(), $this->get_version() );
-
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the public-facing functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_public_hooks() {
-
-		$plugin_public = new WPB_Public( $this->get_plugin_name(), $this->get_version() );
-
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The name of the plugin.
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    WPB_Loader    Orchestrates the hooks of the plugin.
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The version number of the plugin.
-	 */
-	public function get_version() {
-		return $this->version;
-	}
-
-	/**
-	 * Define the constants.
-	 *
-	 * @return void
-	 */
-	public function define_constants() {
-		define( 'WPB_VERSION', $this->version );
-	}
-
-	/**
-	 * Register our app scripts and styles.
-	 *
-	 * @return void
-	 */
-	public function register_assets() {
-		$this->register_scripts( $this->get_scripts() );
-		$this->register_styles( $this->get_styles() );
-	}
-
-	/**
-	 * Register scripts.
-	 *
-	 * @param  array $scripts All Scripts as an array.
-	 *
-	 * @return void
-	 */
-	private function register_scripts( $scripts ) {
-		foreach ( $scripts as $handle => $script ) {
-			$deps      = isset( $script['deps'] ) ? $script['deps'] : false;
-			$in_footer = isset( $script['in_footer'] ) ? $script['in_footer'] : false;
-			$version   = isset( $script['version'] ) ? $script['version'] : WPB_VERSION;
-
-			wp_register_script( $handle, $script['src'], $deps, $version, $in_footer );
-		}
-	}
-
-	/**
-	 * Register styles.
-	 *
-	 * @param  array $styles All styles as an array.
-	 *
-	 * @return void
-	 */
-	public function register_styles( $styles ) {
-		foreach ( $styles as $handle => $style ) {
-			$deps = isset( $style['deps'] ) ? $style['deps'] : false;
-
-			wp_register_style( $handle, $style['src'], $deps, WPB_VERSION );
-		}
-	}
-
-	/**
-	 * Get all registered scripts.
-	 *
-	 * @return array
-	 */
-	public function get_scripts() {
-
-		$prefix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.min' : '';
-
-		$scripts = array(
-			'wpb-runtime'  => array(
-				'src'       => WPB_ASSETS . '/js/runtime.js',
-				'version'   => filemtime( WPB_PATH . '/public/js/runtime.js' ),
-				'in_footer' => true,
-			),
-			'wpb-vendor'   => array(
-				'src'       => WPB_ASSETS . '/js/vendors.js',
-				'version'   => filemtime( WPB_PATH . '/public/js/vendors.js' ),
-				'in_footer' => true,
-			),
-			'wpb-frontend' => array(
-				'src'       => WPB_ASSETS . '/js/frontend.js',
-				'deps'      => array( 'jquery', 'wpb-vendor', 'wpb-runtime' ),
-				'version'   => filemtime( WPB_PATH . '/public/js/frontend.js' ),
-				'in_footer' => true,
-			),
-			'wpb-admin'    => array(
-				'src'       => WPB_ASSETS . '/js/admin.js',
-				'deps'      => array( 'jquery', 'wpb-vendor', 'wpb-runtime' ),
-				'version'   => filemtime( WPB_PATH . '/public/js/admin.js' ),
-				'in_footer' => true,
-			),
-			'wpb-spa'      => array(
-				'src'       => WPB_ASSETS . '/js/spa.js',
-				'deps'      => array( 'jquery', 'wpb-vendor', 'wpb-runtime' ),
-				'version'   => filemtime( WPB_PATH . '/public/js/spa.js' ),
-				'in_footer' => true,
-			),
-		);
-
-		return $scripts;
-	}
-
-	/**
-	 * Get registered styles.
-	 *
-	 * @return array
-	 */
-	public function get_styles() {
-
-		$styles = array(
-			'wpb-style'    => array(
-				'src' => WPB_ASSETS . '/css/style.css',
-			),
-			'wpb-frontend' => array(
-				'src' => WPB_ASSETS . '/css/frontend.css',
-			),
-			'wpb-admin'    => array(
-				'src' => WPB_ASSETS . '/css/admin.css',
-			),
-			'wpb-spa'      => array(
-				'src' => WPB_ASSETS . '/css/spa.css',
-			),
-			'wpb-vendors'  => array(
-				'src' => WPB_ASSETS . '/css/vendors.css',
-			),
-		);
-
-		return $styles;
-	}
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      WPB_Loader    $loader    Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string    $plugin_name    The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string    $version    The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        $this->define_constants();
+
+        if ( defined( 'WPB_VERSION' ) ) {
+            $this->version = WPB_VERSION;
+        } else {
+            $this->version = '1.0.0';
+        }
+        $this->plugin_name = 'wpb';
+        $this->load_dependencies();
+        $this->set_locale();
+        $this->define_admin_hooks();
+        $this->define_public_hooks();
+        $this->register_assets();
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - WPB_Loader. Orchestrates the hooks of the plugin.
+     * - WPB_i18n. Defines internationalization functionality.
+     * - WPB_Admin. Defines all hooks for the admin area.
+     * - WPB_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wpb-loader.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wpb-i18n.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wpb-admin.php';
+
+        /**
+         * The class responsible for defining all menu actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wpb-admin-menu.php';
+
+        /**
+         * The class responsible for defining all submenu actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wpb-admin-submenu.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wpb-public.php';
+
+        $this->loader = new WPB_Loader();
+
+    }
+
+    /**
+     * Define the locale for this plugin for internationalization.
+     *
+     * Uses the WPB_i18n class in order to set the domain and to register the hook
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function set_locale() {
+
+        $plugin_i18n = new WPB_I18n();
+
+        $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the admin area functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_admin_hooks() {
+
+        $plugin_admin = new WPB_Admin( $this->get_plugin_name(), $this->get_version() );
+
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the public-facing functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_public_hooks() {
+
+        $plugin_public = new WPB_Public( $this->get_plugin_name(), $this->get_version() );
+
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @since     1.0.0
+     * @return    string    The name of the plugin.
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @since     1.0.0
+     * @return    WPB_Loader    Orchestrates the hooks of the plugin.
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @since     1.0.0
+     * @return    string    The version number of the plugin.
+     */
+    public function get_version() {
+        return $this->version;
+    }
+
+    /**
+     * Define the constants.
+     *
+     * @return void
+     */
+    public function define_constants() {
+        define( 'WPB_VERSION', $this->version );
+    }
+
+    /**
+     * Register our app scripts and styles.
+     *
+     * @return void
+     */
+    public function register_assets() {
+        $this->register_scripts( $this->get_scripts() );
+        $this->register_styles( $this->get_styles() );
+    }
+
+    /**
+     * Register scripts.
+     *
+     * @param  array $scripts All Scripts as an array.
+     *
+     * @return void
+     */
+    private function register_scripts( $scripts ) {
+        foreach ( $scripts as $handle => $script ) {
+            $deps      = isset( $script['deps'] ) ? $script['deps'] : false;
+            $in_footer = isset( $script['in_footer'] ) ? $script['in_footer'] : false;
+            $version   = isset( $script['version'] ) ? $script['version'] : WPB_VERSION;
+
+            wp_register_script( $handle, $script['src'], $deps, $version, $in_footer );
+        }
+    }
+
+    /**
+     * Register styles.
+     *
+     * @param  array $styles All styles as an array.
+     *
+     * @return void
+     */
+    public function register_styles( $styles ) {
+        foreach ( $styles as $handle => $style ) {
+            $deps = isset( $style['deps'] ) ? $style['deps'] : false;
+
+            wp_register_style( $handle, $style['src'], $deps, WPB_VERSION );
+        }
+    }
+
+    /**
+     * Get all registered scripts.
+     *
+     * @return array
+     */
+    public function get_scripts() {
+
+        $prefix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.min' : '';
+
+        $scripts = array(
+            'wpb-runtime'  => array(
+                'src'       => WPB_ASSETS . '/js/runtime.js',
+                'version'   => filemtime( WPB_PATH . '/public/js/runtime.js' ),
+                'in_footer' => true,
+            ),
+            'wpb-vendor'   => array(
+                'src'       => WPB_ASSETS . '/js/vendors.js',
+                'version'   => filemtime( WPB_PATH . '/public/js/vendors.js' ),
+                'in_footer' => true,
+            ),
+            'wpb-frontend' => array(
+                'src'       => WPB_ASSETS . '/js/frontend.js',
+                'deps'      => array( 'jquery', 'wpb-vendor', 'wpb-runtime' ),
+                'version'   => filemtime( WPB_PATH . '/public/js/frontend.js' ),
+                'in_footer' => true,
+            ),
+            'wpb-admin'    => array(
+                'src'       => WPB_ASSETS . '/js/admin.js',
+                'deps'      => array( 'jquery', 'wpb-vendor', 'wpb-runtime' ),
+                'version'   => filemtime( WPB_PATH . '/public/js/admin.js' ),
+                'in_footer' => true,
+            ),
+            'wpb-spa'      => array(
+                'src'       => WPB_ASSETS . '/js/spa.js',
+                'deps'      => array( 'jquery', 'wpb-vendor', 'wpb-runtime' ),
+                'version'   => filemtime( WPB_PATH . '/public/js/spa.js' ),
+                'in_footer' => true,
+            ),
+        );
+
+        return $scripts;
+    }
+
+    /**
+     * Get registered styles.
+     *
+     * @return array
+     */
+    public function get_styles() {
+
+        $styles = array(
+            'wpb-style'    => array(
+                'src' => WPB_ASSETS . '/css/style.css',
+            ),
+            'wpb-frontend' => array(
+                'src' => WPB_ASSETS . '/css/frontend.css',
+            ),
+            'wpb-admin'    => array(
+                'src' => WPB_ASSETS . '/css/admin.css',
+            ),
+            'wpb-spa'      => array(
+                'src' => WPB_ASSETS . '/css/spa.css',
+            ),
+            'wpb-vendors'  => array(
+                'src' => WPB_ASSETS . '/css/vendors.css',
+            ),
+        );
+
+        return $styles;
+    }
 }

Spacing +46 added lines, -46 removed lines

@@ -69,7 +69,7 @@ 
 
 		$this->define_constants();
 
-		if ( defined( 'WPB_VERSION' ) ) {
+		if (defined('WPB_VERSION')) {
 			$this->version = WPB_VERSION;
 		} else {
 			$this->version = '1.0.0';
@@ -104,34 +104,34 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wpb-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wpb-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wpb-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wpb-i18n.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wpb-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wpb-admin.php';
 
 		/**
 		 * The class responsible for defining all menu actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wpb-admin-menu.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wpb-admin-menu.php';
 
 		/**
 		 * The class responsible for defining all submenu actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wpb-admin-submenu.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wpb-admin-submenu.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wpb-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wpb-public.php';
 
 		$this->loader = new WPB_Loader();
 
@@ -150,7 +150,7 @@ 
 
 		$plugin_i18n = new WPB_I18n();
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 
 	}
 
@@ -163,10 +163,10 @@ 
 	 */
 	private function define_admin_hooks() {
 
-		$plugin_admin = new WPB_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new WPB_Admin($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
 	}
 
@@ -179,10 +179,10 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new WPB_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new WPB_Public($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 	}
 
@@ -232,7 +232,7 @@ 
 	 * @return void
 	 */
 	public function define_constants() {
-		define( 'WPB_VERSION', $this->version );
+		define('WPB_VERSION', $this->version);
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * @return void
 	 */
 	public function register_assets() {
-		$this->register_scripts( $this->get_scripts() );
-		$this->register_styles( $this->get_styles() );
+		$this->register_scripts($this->get_scripts());
+		$this->register_styles($this->get_styles());
 	}
 
 	/**
@@ -252,13 +252,13 @@ 
 	 *
 	 * @return void
 	 */
-	private function register_scripts( $scripts ) {
-		foreach ( $scripts as $handle => $script ) {
-			$deps      = isset( $script['deps'] ) ? $script['deps'] : false;
-			$in_footer = isset( $script['in_footer'] ) ? $script['in_footer'] : false;
-			$version   = isset( $script['version'] ) ? $script['version'] : WPB_VERSION;
+	private function register_scripts($scripts) {
+		foreach ($scripts as $handle => $script) {
+			$deps      = isset($script['deps']) ? $script['deps'] : false;
+			$in_footer = isset($script['in_footer']) ? $script['in_footer'] : false;
+			$version   = isset($script['version']) ? $script['version'] : WPB_VERSION;
 
-			wp_register_script( $handle, $script['src'], $deps, $version, $in_footer );
+			wp_register_script($handle, $script['src'], $deps, $version, $in_footer);
 		}
 	}
 
@@ -269,11 +269,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function register_styles( $styles ) {
-		foreach ( $styles as $handle => $style ) {
-			$deps = isset( $style['deps'] ) ? $style['deps'] : false;
+	public function register_styles($styles) {
+		foreach ($styles as $handle => $style) {
+			$deps = isset($style['deps']) ? $style['deps'] : false;
 
-			wp_register_style( $handle, $style['src'], $deps, WPB_VERSION );
+			wp_register_style($handle, $style['src'], $deps, WPB_VERSION);
 		}
 	}
 
@@ -284,35 +284,35 @@ 
 	 */
 	public function get_scripts() {
 
-		$prefix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.min' : '';
+		$prefix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.min' : '';
 
 		$scripts = array(
 			'wpb-runtime'  => array(
-				'src'       => WPB_ASSETS . '/js/runtime.js',
-				'version'   => filemtime( WPB_PATH . '/public/js/runtime.js' ),
+				'src'       => WPB_ASSETS.'/js/runtime.js',
+				'version'   => filemtime(WPB_PATH.'/public/js/runtime.js'),
 				'in_footer' => true,
 			),
 			'wpb-vendor'   => array(
-				'src'       => WPB_ASSETS . '/js/vendors.js',
-				'version'   => filemtime( WPB_PATH . '/public/js/vendors.js' ),
+				'src'       => WPB_ASSETS.'/js/vendors.js',
+				'version'   => filemtime(WPB_PATH.'/public/js/vendors.js'),
 				'in_footer' => true,
 			),
 			'wpb-frontend' => array(
-				'src'       => WPB_ASSETS . '/js/frontend.js',
-				'deps'      => array( 'jquery', 'wpb-vendor', 'wpb-runtime' ),
-				'version'   => filemtime( WPB_PATH . '/public/js/frontend.js' ),
+				'src'       => WPB_ASSETS.'/js/frontend.js',
+				'deps'      => array('jquery', 'wpb-vendor', 'wpb-runtime'),
+				'version'   => filemtime(WPB_PATH.'/public/js/frontend.js'),
 				'in_footer' => true,
 			),
 			'wpb-admin'    => array(
-				'src'       => WPB_ASSETS . '/js/admin.js',
-				'deps'      => array( 'jquery', 'wpb-vendor', 'wpb-runtime' ),
-				'version'   => filemtime( WPB_PATH . '/public/js/admin.js' ),
+				'src'       => WPB_ASSETS.'/js/admin.js',
+				'deps'      => array('jquery', 'wpb-vendor', 'wpb-runtime'),
+				'version'   => filemtime(WPB_PATH.'/public/js/admin.js'),
 				'in_footer' => true,
 			),
 			'wpb-spa'      => array(
-				'src'       => WPB_ASSETS . '/js/spa.js',
-				'deps'      => array( 'jquery', 'wpb-vendor', 'wpb-runtime' ),
-				'version'   => filemtime( WPB_PATH . '/public/js/spa.js' ),
+				'src'       => WPB_ASSETS.'/js/spa.js',
+				'deps'      => array('jquery', 'wpb-vendor', 'wpb-runtime'),
+				'version'   => filemtime(WPB_PATH.'/public/js/spa.js'),
 				'in_footer' => true,
 			),
 		);
@@ -329,19 +329,19 @@ 
 
 		$styles = array(
 			'wpb-style'    => array(
-				'src' => WPB_ASSETS . '/css/style.css',
+				'src' => WPB_ASSETS.'/css/style.css',
 			),
 			'wpb-frontend' => array(
-				'src' => WPB_ASSETS . '/css/frontend.css',
+				'src' => WPB_ASSETS.'/css/frontend.css',
 			),
 			'wpb-admin'    => array(
-				'src' => WPB_ASSETS . '/css/admin.css',
+				'src' => WPB_ASSETS.'/css/admin.css',
 			),
 			'wpb-spa'      => array(
-				'src' => WPB_ASSETS . '/css/spa.css',
+				'src' => WPB_ASSETS.'/css/spa.css',
 			),
 			'wpb-vendors'  => array(
-				'src' => WPB_ASSETS . '/css/vendors.css',
+				'src' => WPB_ASSETS.'/css/vendors.css',
 			),
 		);
 

admin/class-wpb-admin.php

Indentation +89 added lines, -89 removed lines

@@ -21,106 +21,106 @@
  */
 class WPB_Admin {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string    $plugin_name    The ID of this plugin.
-	 */
-	private $plugin_name;
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string    $plugin_name    The ID of this plugin.
+     */
+    private $plugin_name;
 
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string    $version    The current version of this plugin.
-	 */
-	private $version;
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string    $version    The current version of this plugin.
+     */
+    private $version;
 
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since    1.0.0
-	 * @param      string $plugin_name       The name of this plugin.
-	 * @param      string $version    The version of this plugin.
-	 */
-	public function __construct( $plugin_name, $version ) {
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since    1.0.0
+     * @param      string $plugin_name       The name of this plugin.
+     * @param      string $version    The version of this plugin.
+     */
+    public function __construct( $plugin_name, $version ) {
 
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-		$this->register_menus();
-	}
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+        $this->register_menus();
+    }
 
-	/**
-	 * Register the stylesheets for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
+    /**
+     * Register the stylesheets for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
 
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in WPB_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The WPB_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in WPB_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The WPB_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wpb-admin.css', array(), $this->version, 'all' );
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wpb-admin.css', array(), $this->version, 'all' );
 
-	}
+    }
 
-	/**
-	 * Register the JavaScript for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
 
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in WPB_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The WPB_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in WPB_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The WPB_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
 
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wpb-admin.js', array( 'jquery' ), $this->version, false );
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wpb-admin.js', array( 'jquery' ), $this->version, false );
 
-	}
+    }
 
-	/**
-	 * Register all menus here.
-	 *
-	 * @since    1.0.0
-	 */
-	public function register_menus() {
-		// Registerv root menu.
-		$menu             = new WPB_Admin_Menu( $this->plugin_name );
-		$menu->page_title = 'WPB';
-		$menu->menu_title = 'WPB';
-		$menu->capability = 'manage_options';
-		$menu->slug       = 'wpb';
-		$menu->icon       = 'dashicons-text';
-		$menu->save();
-		// Register submenu for root menu.
-		$submenu              = new WPB_Admin_SubMenu( $this->plugin_name );
-		$submenu->parent_slug = $menu->slug;
-		$submenu->page_title  = 'Settings';
-		$submenu->menu_title  = 'Settings';
-		$submenu->capability  = 'manage_options';
-		$submenu->slug        = 'admin.php?page=' . $menu->slug . '#/settings';
-		$submenu->save();
-	}
+    /**
+     * Register all menus here.
+     *
+     * @since    1.0.0
+     */
+    public function register_menus() {
+        // Registerv root menu.
+        $menu             = new WPB_Admin_Menu( $this->plugin_name );
+        $menu->page_title = 'WPB';
+        $menu->menu_title = 'WPB';
+        $menu->capability = 'manage_options';
+        $menu->slug       = 'wpb';
+        $menu->icon       = 'dashicons-text';
+        $menu->save();
+        // Register submenu for root menu.
+        $submenu              = new WPB_Admin_SubMenu( $this->plugin_name );
+        $submenu->parent_slug = $menu->slug;
+        $submenu->page_title  = 'Settings';
+        $submenu->menu_title  = 'Settings';
+        $submenu->capability  = 'manage_options';
+        $submenu->slug        = 'admin.php?page=' . $menu->slug . '#/settings';
+        $submenu->save();
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
 	 * @param      string $plugin_name       The name of this plugin.
 	 * @param      string $version    The version of this plugin.
 	 */
-	public function __construct( $plugin_name, $version ) {
+	public function __construct($plugin_name, $version) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -72,7 +72,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wpb-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wpb-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -95,7 +95,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wpb-admin.js', array( 'jquery' ), $this->version, false );
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/wpb-admin.js', array('jquery'), $this->version, false);
 
 	}
 
@@ -106,7 +106,7 @@ 
 	 */
 	public function register_menus() {
 		// Registerv root menu.
-		$menu             = new WPB_Admin_Menu( $this->plugin_name );
+		$menu             = new WPB_Admin_Menu($this->plugin_name);
 		$menu->page_title = 'WPB';
 		$menu->menu_title = 'WPB';
 		$menu->capability = 'manage_options';
@@ -114,12 +114,12 @@ 
 		$menu->icon       = 'dashicons-text';
 		$menu->save();
 		// Register submenu for root menu.
-		$submenu              = new WPB_Admin_SubMenu( $this->plugin_name );
+		$submenu              = new WPB_Admin_SubMenu($this->plugin_name);
 		$submenu->parent_slug = $menu->slug;
 		$submenu->page_title  = 'Settings';
 		$submenu->menu_title  = 'Settings';
 		$submenu->capability  = 'manage_options';
-		$submenu->slug        = 'admin.php?page=' . $menu->slug . '#/settings';
+		$submenu->slug        = 'admin.php?page='.$menu->slug.'#/settings';
 		$submenu->save();
 	}
 

admin/class-wpb-admin-menu.php

Indentation +156 added lines, -156 removed lines

@@ -21,160 +21,160 @@
  */
 class WPB_Admin_Menu {
 
-	/**
-	 * The menu page title.
-	 *
-	 * @since    1.0.0
-	 * @access   public
-	 * @var      string    $page_title    The string used to set menu page title.
-	 */
-	public $page_title;
-
-	/**
-	 * The menu title.
-	 *
-	 * @since    1.0.0
-	 * @access   public
-	 * @var      string    $menu_title    The string used to set menu title.
-	 */
-	public $menu_title;
-
-	/**
-	 * The menu capability.
-	 *
-	 * @since    1.0.0
-	 * @access   public
-	 * @var      string    $capability    The string used to set menu capability.
-	 */
-	public $capability;
-
-	/**
-	 * The menu slug.
-	 *
-	 * @since    1.0.0
-	 * @access   public
-	 * @var      string    $slug    The string used to set menu slug.
-	 */
-	public $slug;
-
-	/**
-	 * The callback to render content.
-	 *
-	 * @since    1.0.0
-	 * @access   public
-	 * @var      callback    $callback    The callback used to render content.
-	 */
-	public $callback = null;
-
-	/**
-	 * The menu icon.
-	 *
-	 * @since    1.0.0
-	 * @access   public
-	 * @var      string    $icon    The string used to set menu icon.
-	 */
-	public $icon;
-
-	/**
-	 * The menu position.
-	 *
-	 * @since    1.0.0
-	 * @access   public
-	 * @var      int    $position    The string used to set menu position.
-	 */
-	public $position;
-
-	/**
-	 * The menu plugin name.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string    $plugin_name    The string used to uniquely identify this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * Boot Menu.
-	 *
-	 * @param  string $plugin_name The string used to uniquely identify this plugin.
-	 * @since    1.0.0
-	 * @access   public
-	 */
-	public function __construct( $plugin_name ) {
-		$this->plugin_name = $plugin_name;
-	}
-
-	/**
-	 * Create a new menu page.
-	 *
-	 * @since    1.0.0
-	 * @access   public
-	 */
-	public function save() {
-		add_action( 'admin_menu', array( $this, 'create_menu' ) );
-	}
-
-	/**
-	 * Create a new menu page.
-	 *
-	 * @since    1.0.0
-	 * @param    array $options Pass proprties as an array.
-	 * @access   public
-	 */
-	public function make( $options = array() ) {
-		foreach ( $options as $property => $value ) {
-			if ( property_exists( get_called_class(), $property ) ) {
-				$this->{$property} = $value;
-			}
-		}
-		add_action( 'admin_menu', array( $this, 'create_menu' ) );
-	}
-
-	/**
-	 * Register new menu page.
-	 *
-	 * @return void
-	 */
-	public function create_menu() {
-		$callback = $this->callback ?? array( $this, 'render_content' );
-		$hook     = add_menu_page(
-			$this->page_title,
-			$this->menu_title,
-			$this->capability,
-			$this->slug,
-			$callback,
-			$this->icon
-		);
-
-		add_action( 'load-' . $hook, array( $this, 'init_hooks' ) );
-	}
-
-	/**
-	 * Initialize hooks for the admin page.
-	 *
-	 * @return void
-	 */
-	public function init_hooks() {
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
-	}
-
-	/**
-	 * Load scripts and styles for the current menu page.
-	 *
-	 * @return void
-	 */
-	public function enqueue_scripts() {
-		wp_enqueue_style( $this->plugin_name . '-vendors' );
-		wp_enqueue_style( $this->plugin_name . '-admin' );
-		wp_enqueue_script( $this->plugin_name . '-admin' );
-	}
-
-	/**
-	 * Render app content.
-	 *
-	 * @return void
-	 */
-	public function render_content() {
-		echo '<div class="wrap"><div id="wpb-admin" base-url="' . esc_attr( get_site_url() ) . '" csrf-token="' . esc_attr( wpb_csrf_token() ) . '"></div></div>';
-	}
+    /**
+     * The menu page title.
+     *
+     * @since    1.0.0
+     * @access   public
+     * @var      string    $page_title    The string used to set menu page title.
+     */
+    public $page_title;
+
+    /**
+     * The menu title.
+     *
+     * @since    1.0.0
+     * @access   public
+     * @var      string    $menu_title    The string used to set menu title.
+     */
+    public $menu_title;
+
+    /**
+     * The menu capability.
+     *
+     * @since    1.0.0
+     * @access   public
+     * @var      string    $capability    The string used to set menu capability.
+     */
+    public $capability;
+
+    /**
+     * The menu slug.
+     *
+     * @since    1.0.0
+     * @access   public
+     * @var      string    $slug    The string used to set menu slug.
+     */
+    public $slug;
+
+    /**
+     * The callback to render content.
+     *
+     * @since    1.0.0
+     * @access   public
+     * @var      callback    $callback    The callback used to render content.
+     */
+    public $callback = null;
+
+    /**
+     * The menu icon.
+     *
+     * @since    1.0.0
+     * @access   public
+     * @var      string    $icon    The string used to set menu icon.
+     */
+    public $icon;
+
+    /**
+     * The menu position.
+     *
+     * @since    1.0.0
+     * @access   public
+     * @var      int    $position    The string used to set menu position.
+     */
+    public $position;
+
+    /**
+     * The menu plugin name.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string    $plugin_name    The string used to uniquely identify this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * Boot Menu.
+     *
+     * @param  string $plugin_name The string used to uniquely identify this plugin.
+     * @since    1.0.0
+     * @access   public
+     */
+    public function __construct( $plugin_name ) {
+        $this->plugin_name = $plugin_name;
+    }
+
+    /**
+     * Create a new menu page.
+     *
+     * @since    1.0.0
+     * @access   public
+     */
+    public function save() {
+        add_action( 'admin_menu', array( $this, 'create_menu' ) );
+    }
+
+    /**
+     * Create a new menu page.
+     *
+     * @since    1.0.0
+     * @param    array $options Pass proprties as an array.
+     * @access   public
+     */
+    public function make( $options = array() ) {
+        foreach ( $options as $property => $value ) {
+            if ( property_exists( get_called_class(), $property ) ) {
+                $this->{$property} = $value;
+            }
+        }
+        add_action( 'admin_menu', array( $this, 'create_menu' ) );
+    }
+
+    /**
+     * Register new menu page.
+     *
+     * @return void
+     */
+    public function create_menu() {
+        $callback = $this->callback ?? array( $this, 'render_content' );
+        $hook     = add_menu_page(
+            $this->page_title,
+            $this->menu_title,
+            $this->capability,
+            $this->slug,
+            $callback,
+            $this->icon
+        );
+
+        add_action( 'load-' . $hook, array( $this, 'init_hooks' ) );
+    }
+
+    /**
+     * Initialize hooks for the admin page.
+     *
+     * @return void
+     */
+    public function init_hooks() {
+        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+    }
+
+    /**
+     * Load scripts and styles for the current menu page.
+     *
+     * @return void
+     */
+    public function enqueue_scripts() {
+        wp_enqueue_style( $this->plugin_name . '-vendors' );
+        wp_enqueue_style( $this->plugin_name . '-admin' );
+        wp_enqueue_script( $this->plugin_name . '-admin' );
+    }
+
+    /**
+     * Render app content.
+     *
+     * @return void
+     */
+    public function render_content() {
+        echo '<div class="wrap"><div id="wpb-admin" base-url="' . esc_attr( get_site_url() ) . '" csrf-token="' . esc_attr( wpb_csrf_token() ) . '"></div></div>';
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -100,7 +100,7 @@ 
 	 * @since    1.0.0
 	 * @access   public
 	 */
-	public function __construct( $plugin_name ) {
+	public function __construct($plugin_name) {
 		$this->plugin_name = $plugin_name;
 	}
 
@@ -111,7 +111,7 @@ 
 	 * @access   public
 	 */
 	public function save() {
-		add_action( 'admin_menu', array( $this, 'create_menu' ) );
+		add_action('admin_menu', array($this, 'create_menu'));
 	}
 
 	/**
@@ -121,13 +121,13 @@ 
 	 * @param    array $options Pass proprties as an array.
 	 * @access   public
 	 */
-	public function make( $options = array() ) {
-		foreach ( $options as $property => $value ) {
-			if ( property_exists( get_called_class(), $property ) ) {
+	public function make($options = array()) {
+		foreach ($options as $property => $value) {
+			if (property_exists(get_called_class(), $property)) {
 				$this->{$property} = $value;
 			}
 		}
-		add_action( 'admin_menu', array( $this, 'create_menu' ) );
+		add_action('admin_menu', array($this, 'create_menu'));
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 * @return void
 	 */
 	public function create_menu() {
-		$callback = $this->callback ?? array( $this, 'render_content' );
+		$callback = $this->callback ?? array($this, 'render_content');
 		$hook     = add_menu_page(
 			$this->page_title,
 			$this->menu_title,
@@ -146,7 +146,7 @@ 
 			$this->icon
 		);
 
-		add_action( 'load-' . $hook, array( $this, 'init_hooks' ) );
+		add_action('load-'.$hook, array($this, 'init_hooks'));
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 * @return void
 	 */
 	public function init_hooks() {
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
 	}
 
 	/**
@@ -164,9 +164,9 @@ 
 	 * @return void
 	 */
 	public function enqueue_scripts() {
-		wp_enqueue_style( $this->plugin_name . '-vendors' );
-		wp_enqueue_style( $this->plugin_name . '-admin' );
-		wp_enqueue_script( $this->plugin_name . '-admin' );
+		wp_enqueue_style($this->plugin_name.'-vendors');
+		wp_enqueue_style($this->plugin_name.'-admin');
+		wp_enqueue_script($this->plugin_name.'-admin');
 	}
 
 	/**
@@ -175,6 +175,6 @@ 
 	 * @return void
 	 */
 	public function render_content() {
-		echo '<div class="wrap"><div id="wpb-admin" base-url="' . esc_attr( get_site_url() ) . '" csrf-token="' . esc_attr( wpb_csrf_token() ) . '"></div></div>';
+		echo '<div class="wrap"><div id="wpb-admin" base-url="'.esc_attr(get_site_url()).'" csrf-token="'.esc_attr(wpb_csrf_token()).'"></div></div>';
 	}
 }

bootstrap/app.php

Indentation +19 added lines, -19 removed lines

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

Spacing +11 added lines, -11 removed lines

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

src/helpers.php

Indentation +49 added lines, -49 removed lines

@@ -31,60 +31,60 @@ 
 use Illuminate\Contracts\Broadcasting\Factory as BroadcastFactory;
 
 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_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 );
-		}
-
-		return app( 'config' )->get( $key, $default );
-	}
+    /**
+     * 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 );
+        }
+
+        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' );
-		}
-
-		return ( new \CodexShaper\Blade\View( array( __DIR__ . '/../resources/views' ), __DIR__ . '/../storage/cache' ) )->make( $view, $data = array(), $merge_data = array() );
-	}
+    /**
+     * 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() );
+    }
 }
 
 if (! function_exists('wpb_abort')) {
@@ -178,7 +178,7 @@ 
      */
     function wpb_app($abstract = null, array $parameters = [])
     {
-    	global $wpb_app;
+        global $wpb_app;
 
         if (is_null($abstract)) {
             return $wpb_app;

Spacing +76 added lines, -76 removed lines

@@ -30,7 +30,7 @@ 
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Contracts\Broadcasting\Factory as BroadcastFactory;
 
-if ( ! function_exists( 'wpb_csrf_token' ) ) {
+if (!function_exists('wpb_csrf_token')) {
 	/**
 	 * Generate wp nonce.
 	 *
@@ -38,12 +38,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_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,16 +78,16 @@ 
 	 * @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());
 	}
 }
 
-if (! function_exists('wpb_abort')) {
+if (!function_exists('wpb_abort')) {
     /**
      * Throw an HttpException with the given data.
      *
@@ -111,7 +111,7 @@ 
     }
 }
 
-if (! function_exists('wpb_abort_if')) {
+if (!function_exists('wpb_abort_if')) {
     /**
      * Throw an HttpException with the given data if the given condition is true.
      *
@@ -132,7 +132,7 @@ 
     }
 }
 
-if (! function_exists('wpb_abort_unless')) {
+if (!function_exists('wpb_abort_unless')) {
     /**
      * Throw an HttpException with the given data unless the given condition is true.
      *
@@ -147,13 +147,13 @@ 
      */
     function wpb_abort_unless($boolean, $code, $message = '', array $headers = [])
     {
-        if (! $boolean) {
+        if (!$boolean) {
             wpb_abort($code, $message, $headers);
         }
     }
 }
 
-if (! function_exists('wpb_action')) {
+if (!function_exists('wpb_action')) {
     /**
      * Generate the URL to a controller action.
      *
@@ -168,7 +168,7 @@ 
     }
 }
 
-if (! function_exists('wpb_app')) {
+if (!function_exists('wpb_app')) {
     /**
      * Get the available container instance.
      *
@@ -188,7 +188,7 @@ 
     }
 }
 
-if (! function_exists('wpb_app_path')) {
+if (!function_exists('wpb_app_path')) {
     /**
      * Get the path to the application folder.
      *
@@ -201,7 +201,7 @@ 
     }
 }
 
-if (! function_exists('wpb_asset')) {
+if (!function_exists('wpb_asset')) {
     /**
      * Generate an asset path for the application.
      *
@@ -215,7 +215,7 @@ 
     }
 }
 
-if (! function_exists('wpb_auth')) {
+if (!function_exists('wpb_auth')) {
     /**
      * Get the available auth instance.
      *
@@ -232,7 +232,7 @@ 
     }
 }
 
-if (! function_exists('wpb_back')) {
+if (!function_exists('wpb_back')) {
     /**
      * Create a new redirect response to the previous location.
      *
@@ -247,7 +247,7 @@ 
     }
 }
 
-if (! function_exists('wpb_base_path')) {
+if (!function_exists('wpb_base_path')) {
     /**
      * Get the path to the base of the install.
      *
@@ -260,7 +260,7 @@ 
     }
 }
 
-if (! function_exists('wpb_bcrypt')) {
+if (!function_exists('wpb_bcrypt')) {
     /**
      * Hash the given value against the bcrypt algorithm.
      *
@@ -274,7 +274,7 @@ 
     }
 }
 
-if (! function_exists('wpb_broadcast')) {
+if (!function_exists('wpb_broadcast')) {
     /**
      * Begin broadcasting an event.
      *
@@ -287,7 +287,7 @@ 
     }
 }
 
-if (! function_exists('wpb_cache')) {
+if (!function_exists('wpb_cache')) {
     /**
      * Get / set the specified cache value.
      *
@@ -310,13 +310,13 @@ 
             return wpb_app('cache')->get($arguments[0], $arguments[1] ?? null);
         }
 
-        if (! is_array($arguments[0])) {
+        if (!is_array($arguments[0])) {
             throw new Exception(
                 'When setting a value in the cache, you must pass an array of key / value pairs.'
             );
         }
 
-        if (! isset($arguments[1])) {
+        if (!isset($arguments[1])) {
             throw new Exception(
                 'You must specify an expiration time when setting a value in the cache.'
             );
@@ -326,7 +326,7 @@ 
     }
 }
 
-if (! function_exists('wpb_config_path')) {
+if (!function_exists('wpb_config_path')) {
     /**
      * Get the configuration path.
      *
@@ -339,7 +339,7 @@ 
     }
 }
 
-if (! function_exists('wpb_cookie')) {
+if (!function_exists('wpb_cookie')) {
     /**
      * Create a new cookie instance.
      *
@@ -366,7 +366,7 @@ 
     }
 }
 
-if (! function_exists('wpb_csrf_field')) {
+if (!function_exists('wpb_csrf_field')) {
     /**
      * Generate a CSRF token form field.
      *
@@ -378,7 +378,7 @@ 
     }
 }
 
-if (! function_exists('wpb_database_path')) {
+if (!function_exists('wpb_database_path')) {
     /**
      * Get the database path.
      *
@@ -391,7 +391,7 @@ 
     }
 }
 
-if (! function_exists('wpb_decrypt')) {
+if (!function_exists('wpb_decrypt')) {
     /**
      * Decrypt the given value.
      *
@@ -405,7 +405,7 @@ 
     }
 }
 
-if (! function_exists('wpb_dispatch')) {
+if (!function_exists('wpb_dispatch')) {
     /**
      * Dispatch a job to its appropriate handler.
      *
@@ -418,7 +418,7 @@ 
     }
 }
 
-if (! function_exists('wpb_dispatch_now')) {
+if (!function_exists('wpb_dispatch_now')) {
     /**
      * Dispatch a command to its appropriate handler in the current process.
      *
@@ -432,7 +432,7 @@ 
     }
 }
 
-if (! function_exists('wpb_elixir')) {
+if (!function_exists('wpb_elixir')) {
     /**
      * Get the path to a versioned Elixir file.
      *
@@ -472,7 +472,7 @@ 
     }
 }
 
-if (! function_exists('wpb_encrypt')) {
+if (!function_exists('wpb_encrypt')) {
     /**
      * Encrypt the given value.
      *
@@ -486,7 +486,7 @@ 
     }
 }
 
-if (! function_exists('wpb_event')) {
+if (!function_exists('wpb_event')) {
     /**
      * Dispatch an event and call the listeners.
      *
@@ -501,7 +501,7 @@ 
     }
 }
 
-if (! function_exists('wpb_factory')) {
+if (!function_exists('wpb_factory')) {
     /**
      * Create a model factory builder for a given class, name, and amount.
      *
@@ -524,7 +524,7 @@ 
     }
 }
 
-if (! function_exists('wpb_info')) {
+if (!function_exists('wpb_info')) {
     /**
      * Write some information to the log.
      *
@@ -538,7 +538,7 @@ 
     }
 }
 
-if (! function_exists('wpb_logger')) {
+if (!function_exists('wpb_logger')) {
     /**
      * Log a debug message to the logs.
      *
@@ -556,7 +556,7 @@ 
     }
 }
 
-if (! function_exists('wpb_logs')) {
+if (!function_exists('wpb_logs')) {
     /**
      * Get a log driver instance.
      *
@@ -569,7 +569,7 @@ 
     }
 }
 
-if (! function_exists('wpb_method_field')) {
+if (!function_exists('wpb_method_field')) {
     /**
      * Generate a form field to spoof the HTTP verb used by forms.
      *
@@ -582,7 +582,7 @@ 
     }
 }
 
-if (! function_exists('wpb_mix')) {
+if (!function_exists('wpb_mix')) {
     /**
      * Get the path to a versioned Mix file.
      *
@@ -596,11 +596,11 @@ 
     {
         static $manifests = [];
 
-        if (! Str::startsWith($path, '/')) {
+        if (!Str::startsWith($path, '/')) {
             $path = "/{$path}";
         }
 
-        if ($manifestDirectory && ! Str::startsWith($manifestDirectory, '/')) {
+        if ($manifestDirectory && !Str::startsWith($manifestDirectory, '/')) {
             $manifestDirectory = "/{$manifestDirectory}";
         }
 
@@ -616,8 +616,8 @@ 
 
         $manifestPath = wpb_public_path($manifestDirectory.'/mix-manifest.json');
 
-        if (! isset($manifests[$manifestPath])) {
-            if (! file_exists($manifestPath)) {
+        if (!isset($manifests[$manifestPath])) {
+            if (!file_exists($manifestPath)) {
                 throw new Exception('The Mix manifest does not exist.');
             }
 
@@ -626,10 +626,10 @@ 
 
         $manifest = $manifests[$manifestPath];
 
-        if (! isset($manifest[$path])) {
+        if (!isset($manifest[$path])) {
             wpb_report(new Exception("Unable to locate Mix file: {$path}."));
 
-            if (! wpb_app('config')->get('app.debug')) {
+            if (!wpb_app('config')->get('app.debug')) {
                 return $path;
             }
         }
@@ -638,7 +638,7 @@ 
     }
 }
 
-if (! function_exists('wpb_now')) {
+if (!function_exists('wpb_now')) {
     /**
      * Create a new Carbon instance for the current time.
      *
@@ -651,7 +651,7 @@ 
     }
 }
 
-if (! function_exists('wpb_old')) {
+if (!function_exists('wpb_old')) {
     /**
      * Retrieve an old input item.
      *
@@ -665,7 +665,7 @@ 
     }
 }
 
-if (! function_exists('wpb_policy')) {
+if (!function_exists('wpb_policy')) {
     /**
      * Get a policy instance for a given class.
      *
@@ -680,7 +680,7 @@ 
     }
 }
 
-if (! function_exists('wpb_public_path')) {
+if (!function_exists('wpb_public_path')) {
     /**
      * Get the path to the public folder.
      *
@@ -693,7 +693,7 @@ 
     }
 }
 
-if (! function_exists('wpb_redirect')) {
+if (!function_exists('wpb_redirect')) {
     /**
      * Get an instance of the redirector.
      *
@@ -713,7 +713,7 @@ 
     }
 }
 
-if (! function_exists('wpb_report')) {
+if (!function_exists('wpb_report')) {
     /**
      * Report an exception.
      *
@@ -723,7 +723,7 @@ 
     function wpb_report($exception)
     {
         if ($exception instanceof Throwable &&
-            ! $exception instanceof Exception) {
+            !$exception instanceof Exception) {
             $exception = new FatalThrowableError($exception);
         }
 
@@ -731,7 +731,7 @@ 
     }
 }
 
-if (! function_exists('wpb_request')) {
+if (!function_exists('wpb_request')) {
     /**
      * Get an instance of the current request or an input item from the request.
      *
@@ -755,7 +755,7 @@ 
     }
 }
 
-if (! function_exists('wpb_rescue')) {
+if (!function_exists('wpb_rescue')) {
     /**
      * Catch a potential exception and return a default value.
      *
@@ -775,7 +775,7 @@ 
     }
 }
 
-if (! function_exists('wpb_resolve')) {
+if (!function_exists('wpb_resolve')) {
     /**
      * Resolve a service from the container.
      *
@@ -788,7 +788,7 @@ 
     }
 }
 
-if (! function_exists('wpb_resource_path')) {
+if (!function_exists('wpb_resource_path')) {
     /**
      * Get the path to the resources folder.
      *
@@ -801,7 +801,7 @@ 
     }
 }
 
-if (! function_exists('wpb_response')) {
+if (!function_exists('wpb_response')) {
     /**
      * Return a new response from the application.
      *
@@ -822,7 +822,7 @@ 
     }
 }
 
-if (! function_exists('wpb_route')) {
+if (!function_exists('wpb_route')) {
     /**
      * Generate the URL to a named route.
      *
@@ -837,7 +837,7 @@ 
     }
 }
 
-if (! function_exists('wpb_secure_asset')) {
+if (!function_exists('wpb_secure_asset')) {
     /**
      * Generate an asset path for the application.
      *
@@ -850,7 +850,7 @@ 
     }
 }
 
-if (! function_exists('wpb_secure_url')) {
+if (!function_exists('wpb_secure_url')) {
     /**
      * Generate a HTTPS url for the application.
      *
@@ -864,7 +864,7 @@ 
     }
 }
 
-if (! function_exists('wpb_session')) {
+if (!function_exists('wpb_session')) {
     /**
      * Get / set the specified session value.
      *
@@ -888,7 +888,7 @@ 
     }
 }
 
-if (! function_exists('wpb_storage_path')) {
+if (!function_exists('wpb_storage_path')) {
     /**
      * Get the path to the storage folder.
      *
@@ -901,7 +901,7 @@ 
     }
 }
 
-if (! function_exists('wpb_today')) {
+if (!function_exists('wpb_today')) {
     /**
      * Create a new Carbon instance for the current date.
      *
@@ -914,7 +914,7 @@ 
     }
 }
 
-if (! function_exists('wpb_trans')) {
+if (!function_exists('wpb_trans')) {
     /**
      * Translate the given message.
      *
@@ -933,7 +933,7 @@ 
     }
 }
 
-if (! function_exists('wpb_trans_choice')) {
+if (!function_exists('wpb_trans_choice')) {
     /**
      * Translates the given message based on a count.
      *
@@ -949,7 +949,7 @@ 
     }
 }
 
-if (! function_exists('__')) {
+if (!function_exists('__')) {
     /**
      * Translate the given message.
      *
@@ -964,7 +964,7 @@ 
     }
 }
 
-if (! function_exists('wpb_url')) {
+if (!function_exists('wpb_url')) {
     /**
      * Generate a url for the application.
      *
@@ -983,7 +983,7 @@ 
     }
 }
 
-if (! function_exists('wpb_validator')) {
+if (!function_exists('wpb_validator')) {
     /**
      * Create a new Validator instance.
      *