lenevor / syscodes

src/bundles/WebResourceBundle/Autoloader/Autoload.php

Indentation +25 added lines, -25 removed lines

@@ -27,32 +27,32 @@
  */
 final class Autoload extends AutoloadConfig
 {
-	/**
-	 * Map of class names and locations.
-	 * 
-	 * @var array $classmap
-	 */
-	public $classmap = [];
+    /**
+     * Map of class names and locations.
+     * 
+     * @var array $classmap
+     */
+    public $classmap = [];
 	
-	/**
-	 * If true, then auto-enabled will happen across all namespaces
-	 * loaded by Composer, as well as the namespaces configured locally.
-	 * 
-	 * @var bool $enabledInComposer
-	 */
-	public $enabledInComposer = true;
+    /**
+     * If true, then auto-enabled will happen across all namespaces
+     * loaded by Composer, as well as the namespaces configured locally.
+     * 
+     * @var bool $enabledInComposer
+     */
+    public $enabledInComposer = true;
 	
-	/**
-	 * Array of files for autoloading.
-	 * 
-	 * @var array $files
-	 */
-	public $files = [];
+    /**
+     * Array of files for autoloading.
+     * 
+     * @var array $files
+     */
+    public $files = [];
 	
-	/**
-	 * Array of namespaces for autoloading.
-	 * 
-	 * @var array $psr4
-	 */
-	public $psr4 = [];
+    /**
+     * Array of namespaces for autoloading.
+     * 
+     * @var array $psr4
+     */
+    public $psr4 = [];
 }
\ No newline at end of file

src/components/Routing/Router.php

Indentation +657 added lines, -657 removed lines

@@ -43,691 +43,691 @@
  */
 class Router implements Routable
 {
-	use Concerns\RouteMap,
-	    Macroable {
-		    __call as macroCall;
-	    }
-
-	/**
-	 * The registered route value binders.
-	 * 
-	 * @var array $binders
-	 */
-	protected $binders = [];
-
-	/**
-	 * The container instance used by the router.
-	 * 
-	 * @var \Syscodes\Components\Contracts\Container\Container $container
-	 */
-	protected $container;
-
-	/**
-	 * Variable of group route.
-	 *  
-	 * @var array $groupStack
-	 */
-	protected $groupStack = [];
-
-	/**
-	 * Middleware for function of filters
-	 *  
-	 * @var array $middleware
-	 */
-	protected $middleware = [];
+    use Concerns\RouteMap,
+        Macroable {
+            __call as macroCall;
+        }
+
+    /**
+     * The registered route value binders.
+     * 
+     * @var array $binders
+     */
+    protected $binders = [];
+
+    /**
+     * The container instance used by the router.
+     * 
+     * @var \Syscodes\Components\Contracts\Container\Container $container
+     */
+    protected $container;
+
+    /**
+     * Variable of group route.
+     *  
+     * @var array $groupStack
+     */
+    protected $groupStack = [];
+
+    /**
+     * Middleware for function of filters
+     *  
+     * @var array $middleware
+     */
+    protected $middleware = [];
 	
-	/**
-	 * All of the middleware groups.
-	 * 
-	 * @var array $middlewareGroups
-	 */
-	protected $middlewareGroups = [];
+    /**
+     * All of the middleware groups.
+     * 
+     * @var array $middlewareGroups
+     */
+    protected $middlewareGroups = [];
 	
-	/**
-	 * The priority-sorted list of middleware.
-	 * 
-	 * @var array $middlewarePriority
-	 */
-	public $middlewarePriority = [];
+    /**
+     * The priority-sorted list of middleware.
+     * 
+     * @var array $middlewarePriority
+     */
+    public $middlewarePriority = [];
 	
-	/**
-	 * The globally available parameter patterns.
-	 * 
-	 * @var array $patterns
-	 */
-	protected $patterns = [];
-
-	/**
-	 * Resolve the given route.
-	 * 
-	 * @var \Syscodes\Components\Routing\Resolver\RouteResolver $resolves
-	 */
-	protected $resolves;
-
-	/**
-	 * The Resource instance.
-	 * 
-	 * @var \Syscodes\Components\Routing\Resources\ResourceRegister $resources
-	 */
-	protected $resources;
-
-	/** 
-	 * The route collection instance. 
-	 * 
-	 * @var \Syscodes\Components\Routing\Collections\RouteCollection $routes
-	 */
-	protected $routes;
-
-	/**
-	 * Constructor. Create a new Router instance.
-	 *
-	 * @param  \Syscodes\Components\Contracts\Container\Container|null  $container
-	 * 
-	 * @return void
-	 */
-	public function __construct(Container $container = null)
-	{
-		$this->routes    = new RouteCollection;
-		$this->container = $container ?: new Container;
-		$this->resolves  = new RouteResolver($this, $this->routes, $this->container);
-	}
-
-	/**
-	 * Get the prefix from the group on the stack.
-	 *
-	 * @return string
-	 */
-	public function getGroupPrefix(): string
-	{
-		if ($this->hasGroupStack()) {
-			$last = end($this->groupStack);
-
-			return $last['prefix'] ?? '';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Group a series of routes under a single URL segment. This is handy
-	 * for grouping items into an admin area, like:
-	 *
-	 *   Example:
-	 *      // Creates route: /admin show the word 'User'
-	 *      Route::group(['prefix' => 'admin'], function() {	 
-	 *
-	 *          Route::get('/user', function() {
-	 *	            echo 'Hello world..!';
-	 *          });
-	 *
-	 *      }); /admin/user
-	 *
-	 * @param  array  $attributes
-	 * @param  \Closure|array|string  $callback
-	 *
-	 * @return void
-	 */
-	public function group(array $attributes, $routes): void
-	{
-		foreach (Arr::wrap($routes) as $groupRoutes) {
-			$this->updateGroupStack($attributes);
+    /**
+     * The globally available parameter patterns.
+     * 
+     * @var array $patterns
+     */
+    protected $patterns = [];
+
+    /**
+     * Resolve the given route.
+     * 
+     * @var \Syscodes\Components\Routing\Resolver\RouteResolver $resolves
+     */
+    protected $resolves;
+
+    /**
+     * The Resource instance.
+     * 
+     * @var \Syscodes\Components\Routing\Resources\ResourceRegister $resources
+     */
+    protected $resources;
+
+    /** 
+     * The route collection instance. 
+     * 
+     * @var \Syscodes\Components\Routing\Collections\RouteCollection $routes
+     */
+    protected $routes;
+
+    /**
+     * Constructor. Create a new Router instance.
+     *
+     * @param  \Syscodes\Components\Contracts\Container\Container|null  $container
+     * 
+     * @return void
+     */
+    public function __construct(Container $container = null)
+    {
+        $this->routes    = new RouteCollection;
+        $this->container = $container ?: new Container;
+        $this->resolves  = new RouteResolver($this, $this->routes, $this->container);
+    }
+
+    /**
+     * Get the prefix from the group on the stack.
+     *
+     * @return string
+     */
+    public function getGroupPrefix(): string
+    {
+        if ($this->hasGroupStack()) {
+            $last = end($this->groupStack);
+
+            return $last['prefix'] ?? '';
+        }
+
+        return '';
+    }
+
+    /**
+     * Group a series of routes under a single URL segment. This is handy
+     * for grouping items into an admin area, like:
+     *
+     *   Example:
+     *      // Creates route: /admin show the word 'User'
+     *      Route::group(['prefix' => 'admin'], function() {	 
+     *
+     *          Route::get('/user', function() {
+     *	            echo 'Hello world..!';
+     *          });
+     *
+     *      }); /admin/user
+     *
+     * @param  array  $attributes
+     * @param  \Closure|array|string  $callback
+     *
+     * @return void
+     */
+    public function group(array $attributes, $routes): void
+    {
+        foreach (Arr::wrap($routes) as $groupRoutes) {
+            $this->updateGroupStack($attributes);
 	
-			$this->loadRoutes($groupRoutes);
+            $this->loadRoutes($groupRoutes);
 	
-			array_pop($this->groupStack);			
-		}
-	}
-
-	/**
-	 * Update the group stack with the given attributes.
-	 * 
-	 * @param  array  $attributes
-	 * 
-	 * @return void
-	 */
-	protected function updateGroupStack(array $attributes): void
-	{
-		if ($this->hasGroupStack()) {
-			$attributes = $this->mergeLastGroup($attributes);
-		}
-
-		$this->groupStack[] = $attributes;
-	}
-
-	/**
-	 * Merge the given group attributes.
-	 * 
-	 * @param  array  $new
-	 * @param  bool  $existsPrefix
-	 * 
-	 * @return array
-	 */
-	public function mergeLastGroup($new, bool $existsPrefix = true): array
-	{
-		return RouteGroup::mergeGroup($new, end($this->groupStack), $existsPrefix);
-	}
+            array_pop($this->groupStack);			
+        }
+    }
+
+    /**
+     * Update the group stack with the given attributes.
+     * 
+     * @param  array  $attributes
+     * 
+     * @return void
+     */
+    protected function updateGroupStack(array $attributes): void
+    {
+        if ($this->hasGroupStack()) {
+            $attributes = $this->mergeLastGroup($attributes);
+        }
+
+        $this->groupStack[] = $attributes;
+    }
+
+    /**
+     * Merge the given group attributes.
+     * 
+     * @param  array  $new
+     * @param  bool  $existsPrefix
+     * 
+     * @return array
+     */
+    public function mergeLastGroup($new, bool $existsPrefix = true): array
+    {
+        return RouteGroup::mergeGroup($new, end($this->groupStack), $existsPrefix);
+    }
 	
-	/**
-	 * Load the provided routes.
-	 * 
-	 * @param  \Closure|string  $callback
-	 * 
-	 * @return void
-	 */
-	protected function loadRoutes($callback): void
-	{
-		if ($callback instanceof Closure) {
-			$callback($this);
-		} else {
-			(new RouteFileRegister($this))->register($callback);
-		}
-	}
-
-	/**
-	 * Add a route to the underlying route collection. 
-	 *
-	 * @param  array|string  $method
-	 * @param  string  $route
-	 * @param  mixed  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function addRoute($method, $route, $action)
-	{
-		return $this->routes->add($this->map($method, $route, $action));
-	}
+    /**
+     * Load the provided routes.
+     * 
+     * @param  \Closure|string  $callback
+     * 
+     * @return void
+     */
+    protected function loadRoutes($callback): void
+    {
+        if ($callback instanceof Closure) {
+            $callback($this);
+        } else {
+            (new RouteFileRegister($this))->register($callback);
+        }
+    }
+
+    /**
+     * Add a route to the underlying route collection. 
+     *
+     * @param  array|string  $method
+     * @param  string  $route
+     * @param  mixed  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function addRoute($method, $route, $action)
+    {
+        return $this->routes->add($this->map($method, $route, $action));
+    }
 	
-	/**
-	 * Register a new fallback route with the router.
-	 * 
-	 * @param  array|string|callable|null  $action
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function fallback($action)
-	{
-		$placeholder = 'fallbackPlaceholder';
+    /**
+     * Register a new fallback route with the router.
+     * 
+     * @param  array|string|callable|null  $action
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function fallback($action)
+    {
+        $placeholder = 'fallbackPlaceholder';
 		
-		return $this->addRoute('GET', "{{$placeholder}}", $action)
-		            ->where($placeholder, '.*')
-		            ->fallback();
-	}
-
-	/**
-	 * Create a redirect from one URI to another.
-	 * 
-	 * @param  string  $uri
-	 * @param  string  $destination
-	 * @param  int  $status
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function redirect($uri, $destination, $status = 302)
-	{
-		return $this->any($uri, '\Syscodes\Components\Routing\Controllers\RedirectController')
-		            ->defaults('destination', $destination)
-		            ->defaults('status', $status);
-	}
+        return $this->addRoute('GET', "{{$placeholder}}", $action)
+                    ->where($placeholder, '.*')
+                    ->fallback();
+    }
+
+    /**
+     * Create a redirect from one URI to another.
+     * 
+     * @param  string  $uri
+     * @param  string  $destination
+     * @param  int  $status
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function redirect($uri, $destination, $status = 302)
+    {
+        return $this->any($uri, '\Syscodes\Components\Routing\Controllers\RedirectController')
+                    ->defaults('destination', $destination)
+                    ->defaults('status', $status);
+    }
 	
-	/**
-	 * Create a permanent redirect from one URI to another.
-	 * 
-	 * @param  string  $uri
-	 * @param  string  $destination
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function permanentRedirect($uri, $destination)
-	{
-		return $this->redirect($uri, $destination, 301);
-	}
-
-	/**
-	 * Register a new route that returns a view.
-	 * 
-	 * @param  string  $uri
-	 * @param  string  $view
-	 * @param  array  $data
-	 * @param  int|array  $status
-	 * @param  array  $headers
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function view($uri, $view, $data = [], $status = 200, array $headers = [])
-	{
-		return $this->match(['GET', 'HEAD'], $uri, '\Syscodes\Components\Routing\Controllers\ViewController')
-		            ->setDefaults([
-		                'view' => $view,
-		                'data' => $data,
-		                'status' => is_array($status) ? 200 : $status,
-		                'headers' => is_array($status) ? $status : $headers,
-		            ]);
-	}
-
-	/**
-	 * Add new route to routes array.
-	 *
-	 * @param  array|string  $method
-	 * @param  string  $route
-	 * @param  mixed  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function map($method, $route, $action): Route
-	{
-		if ($this->actionReferencesController($action)) {
-			$action = $this->convertToControllerAction($action);
-		}
-
-		$route = $this->newRoute(
-		              $method,
-		              $this->prefix($route),
-		              $action
-		         );
-
-		if ($this->hasGroupStack()) {
-			$this->mergeGroupAttributesIntoRoute($route);			
-		}
-
-		$this->addWhereClausesToRoute($route);
+    /**
+     * Create a permanent redirect from one URI to another.
+     * 
+     * @param  string  $uri
+     * @param  string  $destination
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function permanentRedirect($uri, $destination)
+    {
+        return $this->redirect($uri, $destination, 301);
+    }
+
+    /**
+     * Register a new route that returns a view.
+     * 
+     * @param  string  $uri
+     * @param  string  $view
+     * @param  array  $data
+     * @param  int|array  $status
+     * @param  array  $headers
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function view($uri, $view, $data = [], $status = 200, array $headers = [])
+    {
+        return $this->match(['GET', 'HEAD'], $uri, '\Syscodes\Components\Routing\Controllers\ViewController')
+                    ->setDefaults([
+                        'view' => $view,
+                        'data' => $data,
+                        'status' => is_array($status) ? 200 : $status,
+                        'headers' => is_array($status) ? $status : $headers,
+                    ]);
+    }
+
+    /**
+     * Add new route to routes array.
+     *
+     * @param  array|string  $method
+     * @param  string  $route
+     * @param  mixed  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function map($method, $route, $action): Route
+    {
+        if ($this->actionReferencesController($action)) {
+            $action = $this->convertToControllerAction($action);
+        }
+
+        $route = $this->newRoute(
+                        $method,
+                        $this->prefix($route),
+                        $action
+                    );
+
+        if ($this->hasGroupStack()) {
+            $this->mergeGroupAttributesIntoRoute($route);			
+        }
+
+        $this->addWhereClausesToRoute($route);
 		
-		return $route;
-	}
+        return $route;
+    }
 	
-	/**
-	 * Determine if the action is routing to a controller.
-	 * 
-	 * @param  array  $action
-	 * 
-	 * @return bool
-	 */
-	protected function actionReferencesController($action): bool
-	{
-		if ( ! $action instanceof Closure) {
-			return is_string($action) || (isset($action['uses']) && is_string($action['uses']));
-		}
+    /**
+     * Determine if the action is routing to a controller.
+     * 
+     * @param  array  $action
+     * 
+     * @return bool
+     */
+    protected function actionReferencesController($action): bool
+    {
+        if ( ! $action instanceof Closure) {
+            return is_string($action) || (isset($action['uses']) && is_string($action['uses']));
+        }
 		
-		return false;
-	}
+        return false;
+    }
 	
-	/**
-	 * Add a controller based route action to the action array.
-	 * 
-	 * @param  array|string  $action
-	 * 
-	 * @return array
-	 */
-	protected function convertToControllerAction($action): array
-	{
-		if (is_string($action)) {
-			$action = ['uses' => $action];
-		}
+    /**
+     * Add a controller based route action to the action array.
+     * 
+     * @param  array|string  $action
+     * 
+     * @return array
+     */
+    protected function convertToControllerAction($action): array
+    {
+        if (is_string($action)) {
+            $action = ['uses' => $action];
+        }
 		
-		if ($this->hasGroupStack()) {
-			$action['uses'] = $this->prependGroupController($action['uses']);
-			$action['uses'] = $this->prependGroupNamespace($action['uses']);
-		}
+        if ($this->hasGroupStack()) {
+            $action['uses'] = $this->prependGroupController($action['uses']);
+            $action['uses'] = $this->prependGroupNamespace($action['uses']);
+        }
 		
-		$action['controller'] = $action['uses'];
+        $action['controller'] = $action['uses'];
 		
-		return $action;
-	}
+        return $action;
+    }
 	
-	/**
-	 * Prepend the last group namespaces onto the use clause.
-	 * 
-	 * @param  string  $class
-	 * 
-	 * @return string
-	 */
-	protected function prependGroupNamespace($class): string
-	{
-		$group = end($this->groupStack);
+    /**
+     * Prepend the last group namespaces onto the use clause.
+     * 
+     * @param  string  $class
+     * 
+     * @return string
+     */
+    protected function prependGroupNamespace($class): string
+    {
+        $group = end($this->groupStack);
 		
-		return isset($group['namespace']) && ! Str::startsWith($class, '\\') && ! Str::startsWith($class, $group['namespace']) 
-		            ? $group['namespace'].'\\'.$class 
-					: $class;
-	}
+        return isset($group['namespace']) && ! Str::startsWith($class, '\\') && ! Str::startsWith($class, $group['namespace']) 
+                    ? $group['namespace'].'\\'.$class 
+                    : $class;
+    }
 	
-	/**
-	 * Prepend the last group controller onto the use clause.
-	 * 
-	 * @param  string  $class
-	 * 
-	 * @return string
-	 */
-	protected function prependGroupController($class): string
-	{
-		$group = end($this->groupStack);
+    /**
+     * Prepend the last group controller onto the use clause.
+     * 
+     * @param  string  $class
+     * 
+     * @return string
+     */
+    protected function prependGroupController($class): string
+    {
+        $group = end($this->groupStack);
 		
-		if ( ! isset($group['controller'])) {
-			return $class;
-		}
+        if ( ! isset($group['controller'])) {
+            return $class;
+        }
 		
-		if (class_exists($class)) {
-			return $class;
-		}
+        if (class_exists($class)) {
+            return $class;
+        }
 		
-		if (Str::contains($class, '@')) {
-			return $class;
-		}
+        if (Str::contains($class, '@')) {
+            return $class;
+        }
 		
-		return $group['controller'].'@'.$class;
-	}
-
-	/**
-	 * Create a new Route object.
-	 * 
-	 * @param  array|string  $method
-	 * @param  string  $uri
-	 * @param  mixed  $action
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function newRoute($method, $uri, $action): route
-	{
-		return take(new Route($method, $uri, $action))
-		                ->setContainer($this->container);
-	}
+        return $group['controller'].'@'.$class;
+    }
+
+    /**
+     * Create a new Route object.
+     * 
+     * @param  array|string  $method
+     * @param  string  $uri
+     * @param  mixed  $action
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function newRoute($method, $uri, $action): route
+    {
+        return take(new Route($method, $uri, $action))
+                        ->setContainer($this->container);
+    }
 	
-	/**
-	 * Determine if the router currently has a group stack.
-	 * 
-	 * @return bool
-	 */
-	public function hasGroupStack(): bool
-	{
-		return ! empty($this->groupStack);
-	}
+    /**
+     * Determine if the router currently has a group stack.
+     * 
+     * @return bool
+     */
+    public function hasGroupStack(): bool
+    {
+        return ! empty($this->groupStack);
+    }
 	
-	/**
-	 * Merge the group stack with the controller action.
-	 * 
-	 * @param  \Syscpde\Routing\Route  $route
-	 * 
-	 * @return void
-	 */
-	protected function mergeGroupAttributesIntoRoute($route): void
-	{
-		$action = $this->mergeLastGroup(
-			$route->getAction(),
-			$existsPrefix = false
-		);
+    /**
+     * Merge the group stack with the controller action.
+     * 
+     * @param  \Syscpde\Routing\Route  $route
+     * 
+     * @return void
+     */
+    protected function mergeGroupAttributesIntoRoute($route): void
+    {
+        $action = $this->mergeLastGroup(
+            $route->getAction(),
+            $existsPrefix = false
+        );
 		
-		$route->setAction($action);
-	}
+        $route->setAction($action);
+    }
 	
-	/**
-	 * Add the necessary where clauses to the route based on its initial registration.
-	 * 
-	 * @param  \Syscodes\Components\Routing\Route  $route
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	protected function addWhereClausesToRoute($route): Route
-	{
-		$route->where(array_merge(
-			$this->patterns, Arr::get($route->getAction(), 'where', [])
-		));
-
-		return $route;
-	}
-
-	/**
-	 * Add a prefix to the route URI.
-	 *
-	 * @param  string  $uri
-	 *
-	 * @return string
-	 */
-	protected function prefix($uri): string
-	{
-		return trim(trim($this->getGroupPrefix(), '/').'/'.trim($uri, '/'), '/') ?: '/';
-	}
-
-	/**
-	 * Set a global where pattern on all routes.
-	 * 
-	 * @param  string  $name
-	 * @param  string  $pattern
-	 * 
-	 * @return void
-	 */
-	public function pattern($name, $pattern): void
-	{
-		$this->patterns[$name] = $pattern;
-	}
-
-	/**
-	 * Set a group of global where patterns on all routes.
-	 * 
-	 * @param  array  $patterns
-	 * 
-	 * @return void
-	 */
-	public function patterns($patterns): void
-	{
-		foreach ($patterns as $key => $pattern) {
-			$this->patterns[$key] = $pattern;
-		}
-	}
-
-	/**
-	 * Get a Resource instance.
-	 * 
-	 * @return \Syscodes\Components\Routing\ResourceRegister
-	 */
-	public function getResource()
-	{
-		if (isset($this->resources)) {
-			return $this->resources;
-		}
-
-		return $this->resources = new ResourceRegister($this);
-	}
-
-	/**
-	 * Dispatches the given url and call the method that belongs to the route.
-	 *
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 *
-	 * @return mixed
-	 */
-	public function dispatch(Request $request)
-	{
-		return $this->resolves->resolve($request);
-	}
-
-	/**
-	 * Gather the middleware for the given route.
-	 * 
-	 * @param  \Syscodes\Components\Routing\Route  $route
-	 * 
-	 * @return array
-	 */
-	public function gatherRouteMiddleware(Route $route): array
-	{
-		$middleware = array_map(
-		                    fn ($name) => MiddlewareResolver::resolve($name, $this->middleware, $this->middlewareGroups),
-		                    $route->gatherMiddleware()
-		              );
+    /**
+     * Add the necessary where clauses to the route based on its initial registration.
+     * 
+     * @param  \Syscodes\Components\Routing\Route  $route
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    protected function addWhereClausesToRoute($route): Route
+    {
+        $route->where(array_merge(
+            $this->patterns, Arr::get($route->getAction(), 'where', [])
+        ));
+
+        return $route;
+    }
+
+    /**
+     * Add a prefix to the route URI.
+     *
+     * @param  string  $uri
+     *
+     * @return string
+     */
+    protected function prefix($uri): string
+    {
+        return trim(trim($this->getGroupPrefix(), '/').'/'.trim($uri, '/'), '/') ?: '/';
+    }
+
+    /**
+     * Set a global where pattern on all routes.
+     * 
+     * @param  string  $name
+     * @param  string  $pattern
+     * 
+     * @return void
+     */
+    public function pattern($name, $pattern): void
+    {
+        $this->patterns[$name] = $pattern;
+    }
+
+    /**
+     * Set a group of global where patterns on all routes.
+     * 
+     * @param  array  $patterns
+     * 
+     * @return void
+     */
+    public function patterns($patterns): void
+    {
+        foreach ($patterns as $key => $pattern) {
+            $this->patterns[$key] = $pattern;
+        }
+    }
+
+    /**
+     * Get a Resource instance.
+     * 
+     * @return \Syscodes\Components\Routing\ResourceRegister
+     */
+    public function getResource()
+    {
+        if (isset($this->resources)) {
+            return $this->resources;
+        }
+
+        return $this->resources = new ResourceRegister($this);
+    }
+
+    /**
+     * Dispatches the given url and call the method that belongs to the route.
+     *
+     * @param  \Syscodes\Components\Http\Request  $request
+     *
+     * @return mixed
+     */
+    public function dispatch(Request $request)
+    {
+        return $this->resolves->resolve($request);
+    }
+
+    /**
+     * Gather the middleware for the given route.
+     * 
+     * @param  \Syscodes\Components\Routing\Route  $route
+     * 
+     * @return array
+     */
+    public function gatherRouteMiddleware(Route $route): array
+    {
+        $middleware = array_map(
+                            fn ($name) => MiddlewareResolver::resolve($name, $this->middleware, $this->middlewareGroups),
+                            $route->gatherMiddleware()
+                        );
 		
-		return Arr::flatten($middleware);
-	}
-
-	/**
-	 * Get all of the defined middleware
-	 * 
-	 * @return array
-	 */
-	public function getMiddleware(): array
-	{
-		return $this->middleware;
-	}
-
-	/**
-	 * Register a short-hand name for a middleware.
-	 * 
-	 * @param  string  $name
-	 * @param  string  $class
-	 * 
-	 * @return static
-	 */
-	public function aliasMiddleware($name, $class): static
-	{
-		$this->middleware[$name] = $class;
-
-		return $this;
-	}
-
-	/**
-	 * Register a group of middleware.
-	 * 
-	 * @param  string  $name
-	 * @param  array  $middleware
-	 * 
-	 * @return static
-	 */
-	public function middlewareGroup($name, array $middleware): static
-	{
-		$this->middlewareGroups[$name] = $middleware;
-
-		return $this;
-	}
-
-	/**
-	 * Check if a route with the given name exists.
-	 * 
-	 * @param  string  $name
-	 * 
-	 * @return bool
-	 */
-	public function has($name): bool
-	{
-		$names = is_array($name) ? $name : func_get_args();
-
-		foreach ($names as $value) {
-			if ( ! $this->routes->hasNamedRoute($value)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Determine if the current route matches a pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function is(...$patterns): bool
-	{
-		return $this->currentRouteNamed(...$patterns);
-	}
-
-	/**
-	 * Determine if the current route matches a pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function currentRouteNamed(...$patterns): bool
-	{
-		return $this->resolves->current() && $this->resolves->current()->named(...$patterns);
-	}
-
-	/**
-	 * Register an array of resource controllers.
-	 * 
-	 * @param  array  $resources
-	 * @param  array  $options
-	 * 
-	 * @return void
-	 */
-	public function resources(array $resources, array $options = []): void
-	{
-		foreach ($resources as $name => $controller) {
-			$this->resource($name, $controller, $options);
-		}
-	}
-
-	/**
-	 * Route a resource to a controller.
-	 * 
-	 * @param  string  $name
-	 * @param  string  $controller
-	 * @param  array  $options
-	 * 
-	 * @return \Syscodes\Components\Routing\Resources\AwaitingResourceRegistration
-	 */
-	public function resource($name, $controller, array $options = []) 
-	{
-		if ($this->container) {
-			$register = $this->container->make(ResourceRegister::class);
-		} else {
-			$register = new ResourceRegister($this);
-		}
-
-		return new AwaitingResourceRegistration(
-			$register, $name, $controller, $options
-		);
-	}
-
-	/**
-	 * Get the route collection.
-	 *
-	 * @return array   
-	 */
-	public function getRoutes()
-	{
-		return $this->routes;
-	}
-
-	/**
-	 * Get or set the verbs used in the resource URIs.
-	 * 
-	 * @param  array  $verbs
-	 * 
-	 * @return array|null
-	 */
-	public function resourceVerbs(array $verbs = [])
-	{
-		ResourceRegister::verbs($verbs);
-	}
+        return Arr::flatten($middleware);
+    }
+
+    /**
+     * Get all of the defined middleware
+     * 
+     * @return array
+     */
+    public function getMiddleware(): array
+    {
+        return $this->middleware;
+    }
+
+    /**
+     * Register a short-hand name for a middleware.
+     * 
+     * @param  string  $name
+     * @param  string  $class
+     * 
+     * @return static
+     */
+    public function aliasMiddleware($name, $class): static
+    {
+        $this->middleware[$name] = $class;
+
+        return $this;
+    }
+
+    /**
+     * Register a group of middleware.
+     * 
+     * @param  string  $name
+     * @param  array  $middleware
+     * 
+     * @return static
+     */
+    public function middlewareGroup($name, array $middleware): static
+    {
+        $this->middlewareGroups[$name] = $middleware;
+
+        return $this;
+    }
+
+    /**
+     * Check if a route with the given name exists.
+     * 
+     * @param  string  $name
+     * 
+     * @return bool
+     */
+    public function has($name): bool
+    {
+        $names = is_array($name) ? $name : func_get_args();
+
+        foreach ($names as $value) {
+            if ( ! $this->routes->hasNamedRoute($value)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Determine if the current route matches a pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function is(...$patterns): bool
+    {
+        return $this->currentRouteNamed(...$patterns);
+    }
+
+    /**
+     * Determine if the current route matches a pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function currentRouteNamed(...$patterns): bool
+    {
+        return $this->resolves->current() && $this->resolves->current()->named(...$patterns);
+    }
+
+    /**
+     * Register an array of resource controllers.
+     * 
+     * @param  array  $resources
+     * @param  array  $options
+     * 
+     * @return void
+     */
+    public function resources(array $resources, array $options = []): void
+    {
+        foreach ($resources as $name => $controller) {
+            $this->resource($name, $controller, $options);
+        }
+    }
+
+    /**
+     * Route a resource to a controller.
+     * 
+     * @param  string  $name
+     * @param  string  $controller
+     * @param  array  $options
+     * 
+     * @return \Syscodes\Components\Routing\Resources\AwaitingResourceRegistration
+     */
+    public function resource($name, $controller, array $options = []) 
+    {
+        if ($this->container) {
+            $register = $this->container->make(ResourceRegister::class);
+        } else {
+            $register = new ResourceRegister($this);
+        }
+
+        return new AwaitingResourceRegistration(
+            $register, $name, $controller, $options
+        );
+    }
+
+    /**
+     * Get the route collection.
+     *
+     * @return array   
+     */
+    public function getRoutes()
+    {
+        return $this->routes;
+    }
+
+    /**
+     * Get or set the verbs used in the resource URIs.
+     * 
+     * @param  array  $verbs
+     * 
+     * @return array|null
+     */
+    public function resourceVerbs(array $verbs = [])
+    {
+        ResourceRegister::verbs($verbs);
+    }
 	
-	/**
-	 * Remove any duplicate middleware from the given array.
-	 * 
-	 * @param  array  $middleware
-	 * 
-	 * @return array
-	 */
-	public static function uniqueMiddleware(array $middleware): array
-	{
-		return array_unique($middleware, SORT_REGULAR);
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Dynamically handle calls into the router instance.
-	 * 
-	 * @param  string  $method
-	 * @param  array  $parameters
-	 * 
-	 * @return mixed
-	 */
-	public function __call($method, $parameters)
-	{
-		if (static::hasMacro($method)) {
-			return $this->macroCall($method, $parameters);
-		}
+    /**
+     * Remove any duplicate middleware from the given array.
+     * 
+     * @param  array  $middleware
+     * 
+     * @return array
+     */
+    public static function uniqueMiddleware(array $middleware): array
+    {
+        return array_unique($middleware, SORT_REGULAR);
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Dynamically handle calls into the router instance.
+     * 
+     * @param  string  $method
+     * @param  array  $parameters
+     * 
+     * @return mixed
+     */
+    public function __call($method, $parameters)
+    {
+        if (static::hasMacro($method)) {
+            return $this->macroCall($method, $parameters);
+        }
 		
-		return (new RouteRegister($this))->attribute($method, $parameters[0]);
-	}
+        return (new RouteRegister($this))->attribute($method, $parameters[0]);
+    }
 }
\ No newline at end of file

src/components/Http/Loaders/Parameters.php

Indentation +145 added lines, -145 removed lines

@@ -34,160 +34,160 @@
  */
 class Parameters implements IteratorAggregate, Countable
 {
-	/**
-	 * Array parameters from the Server global.
-	 *
-	 * @var array $parameters
-	 */
-	protected $parameters;
-
-	/**
-	 * Parameter Object Constructor.
-	 *
-	 * @param  array  $parameters
-	 *
-	 * @return array
-	 */
-	public function __construct(array $parameters = [])
-	{
-		$this->parameters = $parameters;
-	}
-
-	/**
-	 * Returns the parameters.
-	 * 
-	 * @param  string|null  $key
-	 * 
-	 * @return array
-	 */
-	public function all(string $key = null): array
-	{
-		if (null === $key) {
-			return $this->parameters;
-		}
-
-		if ( ! is_array($value = $this->parameters[$key] ?? [])) {
-			throw new BadRequestException(
-				sprintf('Unexpected value for parameter "%s", got "%s"', $key, get_debug_type($value))
-			);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Returns the parameter keys.
-	 * 
-	 * @return array
-	 */
-	public function keys(): array
-	{
-		return array_keys($this->parameters);
-	}
-
-	/**
-	 * Replaces the current parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function replace(array $parameters = []): void
-	{
-		$this->parameters = $parameters;
-	}
-
-	/**
-	 * Adds parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function add(array $parameters = []): void
-	{
-		$this->parameters = array_replace($this->parameters, $parameters);
-	}
-
-	/**
-	 * Get a parameter array item.
-	 *
-	 * @param  string  $key
-	 * @param  mixed  $default  
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key, mixed $default = null): mixed
-	{
-		return $this->has($key) ? $this->parameters[$key] : $default;
-	}
-
-	/**
-	 * Check if a parameter array item exists.
-	 *
-	 * @param  string  $key
-	 *
-	 * @return bool
-	 */
-	public function has(string $key): bool
-	{
-		return Arr::exists($this->parameters, $key);
-	}
-
-	/**
-	 * Set a parameter array item.
-	 *
-	 * @param  string  $key
-	 * @param  string  $value 
-	 *
-	 * @return void
-	 */
-	public function set(string $key, $value): void
-	{
-		$this->parameters[$key] = $value;
-	}
-
-	/**
-	 * Remove a parameter array item.
-	 *
-	 * @param  string  $key 
-	 *
-	 * @return void
-	 */
-	public function remove(string $key): void
-	{
-		unset($this->parameters[$key]);
-	}
-
-	/*
+    /**
+     * Array parameters from the Server global.
+     *
+     * @var array $parameters
+     */
+    protected $parameters;
+
+    /**
+     * Parameter Object Constructor.
+     *
+     * @param  array  $parameters
+     *
+     * @return array
+     */
+    public function __construct(array $parameters = [])
+    {
+        $this->parameters = $parameters;
+    }
+
+    /**
+     * Returns the parameters.
+     * 
+     * @param  string|null  $key
+     * 
+     * @return array
+     */
+    public function all(string $key = null): array
+    {
+        if (null === $key) {
+            return $this->parameters;
+        }
+
+        if ( ! is_array($value = $this->parameters[$key] ?? [])) {
+            throw new BadRequestException(
+                sprintf('Unexpected value for parameter "%s", got "%s"', $key, get_debug_type($value))
+            );
+        }
+
+        return $value;
+    }
+
+    /**
+     * Returns the parameter keys.
+     * 
+     * @return array
+     */
+    public function keys(): array
+    {
+        return array_keys($this->parameters);
+    }
+
+    /**
+     * Replaces the current parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function replace(array $parameters = []): void
+    {
+        $this->parameters = $parameters;
+    }
+
+    /**
+     * Adds parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function add(array $parameters = []): void
+    {
+        $this->parameters = array_replace($this->parameters, $parameters);
+    }
+
+    /**
+     * Get a parameter array item.
+     *
+     * @param  string  $key
+     * @param  mixed  $default  
+     *
+     * @return mixed
+     */
+    public function get(string $key, mixed $default = null): mixed
+    {
+        return $this->has($key) ? $this->parameters[$key] : $default;
+    }
+
+    /**
+     * Check if a parameter array item exists.
+     *
+     * @param  string  $key
+     *
+     * @return bool
+     */
+    public function has(string $key): bool
+    {
+        return Arr::exists($this->parameters, $key);
+    }
+
+    /**
+     * Set a parameter array item.
+     *
+     * @param  string  $key
+     * @param  string  $value 
+     *
+     * @return void
+     */
+    public function set(string $key, $value): void
+    {
+        $this->parameters[$key] = $value;
+    }
+
+    /**
+     * Remove a parameter array item.
+     *
+     * @param  string  $key 
+     *
+     * @return void
+     */
+    public function remove(string $key): void
+    {
+        unset($this->parameters[$key]);
+    }
+
+    /*
 	|-----------------------------------------------------------------
 	| IteratorAggregate Method
 	|-----------------------------------------------------------------
 	*/
 	
-	/**
-	 * Retrieve an external iterator.
-	 * 
-	 * @return \ArrayIterator
-	 */
-	public function getIterator(): Traversable
-	{
-		return new ArrayIterator($this->parameters);
-	}
+    /**
+     * Retrieve an external iterator.
+     * 
+     * @return \ArrayIterator
+     */
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->parameters);
+    }
 	
-	/*
+    /*
 	|-----------------------------------------------------------------
 	| Countable Method
 	|-----------------------------------------------------------------
 	*/
 	
-	/**
-	 * Returns the number of parameters.
-	 * 
-	 * @return int The number of parameters
-	 */
-	public function count(): int
-	{
-		return count($this->parameters);
-	}
+    /**
+     * Returns the number of parameters.
+     * 
+     * @return int The number of parameters
+     */
+    public function count(): int
+    {
+        return count($this->parameters);
+    }
 }
\ No newline at end of file

src/components/Http/Loaders/Inputs.php

Indentation +59 added lines, -59 removed lines

@@ -30,70 +30,70 @@
  */
 final class Inputs extends Parameters
 {
-	/**
-	 * Replaces the current parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function replace(array $inputs = []): void
-	{
-		$this->parameters = [];
-		$this->add($inputs);
-	}
+    /**
+     * Replaces the current parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function replace(array $inputs = []): void
+    {
+        $this->parameters = [];
+        $this->add($inputs);
+    }
 	
-	/**
-	 * Adds parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function add(array $inputs = []): void
-	{
-		foreach ($inputs as $input => $file) {
-			$this->set($input, $file);
-		}
-	}
+    /**
+     * Adds parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function add(array $inputs = []): void
+    {
+        foreach ($inputs as $input => $file) {
+            $this->set($input, $file);
+        }
+    }
 	
-	/**
-	 * Gets a string input value by name.
-	 * 
-	 * @param  string  $key
-	 * @param  mixed  $default  
-	 * 
-	 * @return string|int|float|bool|null
-	 */
-	public function get(string $key, mixed $default = null): string|int|float|bool|null
-	{
-		if (null !== $default && ! is_scalar($default) && ! method_exists($default, '__toString')) {
-			throw new BadRequestHttpException(sprintf('Passing a non-string value as 2nd argument to "%s()" is deprecated, pass a string or null instead', __METHOD__));
-		}
+    /**
+     * Gets a string input value by name.
+     * 
+     * @param  string  $key
+     * @param  mixed  $default  
+     * 
+     * @return string|int|float|bool|null
+     */
+    public function get(string $key, mixed $default = null): string|int|float|bool|null
+    {
+        if (null !== $default && ! is_scalar($default) && ! method_exists($default, '__toString')) {
+            throw new BadRequestHttpException(sprintf('Passing a non-string value as 2nd argument to "%s()" is deprecated, pass a string or null instead', __METHOD__));
+        }
 		
-		$value = parent::get($key, $this);
+        $value = parent::get($key, $this);
 		
-		if (null !== $value && $this !== $value && ! is_scalar($value) && ! method_exists($value, '__toString')) {
-			throw new BadRequestHttpException(sprintf('Retrieving a non-string value from "%s()" is deprecated, and will throw a exception in Syscodes, use "%s::all($key)" instead', __METHOD__, __CLASS__));
-		}
+        if (null !== $value && $this !== $value && ! is_scalar($value) && ! method_exists($value, '__toString')) {
+            throw new BadRequestHttpException(sprintf('Retrieving a non-string value from "%s()" is deprecated, and will throw a exception in Syscodes, use "%s::all($key)" instead', __METHOD__, __CLASS__));
+        }
 		
-		return $this === $value ? $default : $value;
-	}
+        return $this === $value ? $default : $value;
+    }
 	
-	/**
-	 * Sets an input by name.
-	 * 
-	 * @param  string  $key
-	 * @param  mixed  $value
-	 * 
-	 * @return void
-	 */
-	public function set(string $key, mixed $value): void
-	{
-		if (null !== $value && ! is_scalar($value) && ! is_array($value) && ! method_exists($value, '__toString')) {
-			throw new BadRequestHttpException(sprintf('Passing "%s" as a 2nd Argument to "%s()" is deprecated, pass a string, array, or null instead', get_debug_type($value), __METHOD__));
-		}
+    /**
+     * Sets an input by name.
+     * 
+     * @param  string  $key
+     * @param  mixed  $value
+     * 
+     * @return void
+     */
+    public function set(string $key, mixed $value): void
+    {
+        if (null !== $value && ! is_scalar($value) && ! is_array($value) && ! method_exists($value, '__toString')) {
+            throw new BadRequestHttpException(sprintf('Passing "%s" as a 2nd Argument to "%s()" is deprecated, pass a string, array, or null instead', get_debug_type($value), __METHOD__));
+        }
 		
-		$this->parameters[$key] = $value;
-	}
+        $this->parameters[$key] = $value;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 	 * 
 	 * @return string|int|float|bool|null
 	 */
-	public function get(string $key, mixed $default = null): string|int|float|bool|null
+	public function get(string $key, mixed $default = null): string | int | float | bool | null
 	{
 		if (null !== $default && ! is_scalar($default) && ! method_exists($default, '__toString')) {
 			throw new BadRequestHttpException(sprintf('Passing a non-string value as 2nd argument to "%s()" is deprecated, pass a string or null instead', __METHOD__));

src/components/Http/Loaders/Files.php

Indentation +20 added lines, -20 removed lines

@@ -40,29 +40,29 @@
     }
 
     /**
-	 * Replaces the current parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function replace(array $files = []): void
-	{
-		$this->parameters = [];
+     * Replaces the current parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function replace(array $files = []): void
+    {
+        $this->parameters = [];
         $this->add($files);
-	}
+    }
 
-	/**
-	 * Adds parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function add(array $files = []): void
-	{
+    /**
+     * Adds parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function add(array $files = []): void
+    {
         foreach ($files as $key => $file) {
             $this->set($key, $file);
         }
-	}
+    }
 }
\ No newline at end of file

src/components/Http/Loaders/Headers.php

Indentation +227 added lines, -227 removed lines

@@ -35,266 +35,266 @@
  */
 class Headers implements IteratorAggregate, Countable
 {
-	protected const STRING_UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-	protected const STRING_LOWER = '-abcdefghijklmnopqrstuvwxyz';
+    protected const STRING_UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    protected const STRING_LOWER = '-abcdefghijklmnopqrstuvwxyz';
 
-	/**
-	 * An array of HTTP headers.
-	 * 
-	 * @var array $herders
-	 */
-	protected $headers = [];
+    /**
+     * An array of HTTP headers.
+     * 
+     * @var array $herders
+     */
+    protected $headers = [];
 	
-	/**
-	 * Specifies the directives for the caching mechanisms in both
-	 * the requests and the responses.
-	 * 
-	 * @var array $cacheControl
-	 */
-	protected $cacheControl = [];
+    /**
+     * Specifies the directives for the caching mechanisms in both
+     * the requests and the responses.
+     * 
+     * @var array $cacheControl
+     */
+    protected $cacheControl = [];
 	
-	/**
-	 * Constructor. The Headers class instance.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function __construct(array $headers = [])
-	{
-		foreach ($headers as $key => $values) {
-			$this->set($key, $values);
-		}
-	}
+    /**
+     * Constructor. The Headers class instance.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function __construct(array $headers = [])
+    {
+        foreach ($headers as $key => $values) {
+            $this->set($key, $values);
+        }
+    }
 	
-	/**
-	 * Returns all the headers.
-	 * 
-	 * @param  string|null  $key  The name of the headers
-	 * 
-	 * @return array
-	 */
-	public function all(string $key = null): array
-	{
-		if (null !== $key) {
-			return $this->headers[strtr($key, self::STRING_UPPER, self::STRING_LOWER)] ?? [];
-		}
+    /**
+     * Returns all the headers.
+     * 
+     * @param  string|null  $key  The name of the headers
+     * 
+     * @return array
+     */
+    public function all(string $key = null): array
+    {
+        if (null !== $key) {
+            return $this->headers[strtr($key, self::STRING_UPPER, self::STRING_LOWER)] ?? [];
+        }
 
-		return $this->headers;
-	}
+        return $this->headers;
+    }
 	
-	/**
-	 * Returns the parameter keys.
-	 * 
-	 * @return array An array of parameter keys
-	 */
-	public function keys(): array
-	{
-		return array_keys($this->all());
-	}
+    /**
+     * Returns the parameter keys.
+     * 
+     * @return array An array of parameter keys
+     */
+    public function keys(): array
+    {
+        return array_keys($this->all());
+    }
 	
-	/**
-	 * Replaces the current HTTP headers by a new set.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function replace(array $headers = []): void
-	{
-		$this->headers = [];
-		$this->add($headers);
-	}
+    /**
+     * Replaces the current HTTP headers by a new set.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function replace(array $headers = []): void
+    {
+        $this->headers = [];
+        $this->add($headers);
+    }
 	
-	/**
-	 * Adds multiple header to the queue.
-	 * 
-	 * @param  array  $headers  The header name
-	 * 
-	 * @return mixed
-	 */
-	public function add(array $headers = [])
-	{
-		foreach ($headers as $key => $values) {
-			$this->set($key, $values);
-		}
-	}
+    /**
+     * Adds multiple header to the queue.
+     * 
+     * @param  array  $headers  The header name
+     * 
+     * @return mixed
+     */
+    public function add(array $headers = [])
+    {
+        foreach ($headers as $key => $values) {
+            $this->set($key, $values);
+        }
+    }
 	
-	/**
-	 * Gets a header value by name.
-	 *
-	 * @param  string  $key  The header name, or null for all headers
-	 * @param  string|null  $default  The default value
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key, string $default = null): ?string
-	{
-		$headers = $this->all($key);
+    /**
+     * Gets a header value by name.
+     *
+     * @param  string  $key  The header name, or null for all headers
+     * @param  string|null  $default  The default value
+     *
+     * @return mixed
+     */
+    public function get(string $key, string $default = null): ?string
+    {
+        $headers = $this->all($key);
 		
-		if ( ! $headers) {
-			return $default;
-		}
+        if ( ! $headers) {
+            return $default;
+        }
 		
-		if (null === $headers[0]) {
-			return null;
-		}
+        if (null === $headers[0]) {
+            return null;
+        }
 		
-		return (string) $headers[0];
-	}
+        return (string) $headers[0];
+    }
 
-	/**
-	 * Sets a header by name.
-	 * 
-	 * @param  string  $key  The header name
-	 * @param  string|string[]|null  $values  The value or an array of values
-	 * @param  bool  $replace  If you want to replace the value exists by the header, 
-	 * 					       it is not overwritten / overwritten when it is false
-	 *
-	 * @return void
-	 */
-	public function set(string $key, $values, bool $replace = true): void
-	{
-		$key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
+    /**
+     * Sets a header by name.
+     * 
+     * @param  string  $key  The header name
+     * @param  string|string[]|null  $values  The value or an array of values
+     * @param  bool  $replace  If you want to replace the value exists by the header, 
+     * 					       it is not overwritten / overwritten when it is false
+     *
+     * @return void
+     */
+    public function set(string $key, $values, bool $replace = true): void
+    {
+        $key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
 
-		if (is_array($values)) {
-			$values = array_values($values);
+        if (is_array($values)) {
+            $values = array_values($values);
 
-			if (true === $replace || ! isset($this->headers[$key])) {
-				$this->headers[$key] = $values;
-			} else {
-				$this->headers[$key] = array_merge($this->headers[$key], $values);
-			}
-		} else {
-			if (true === $replace || ! isset($this->headers[$key])) {
-				$this->headers[$key] = [$values];
-			} else {
-				$this->headers[$key][] = $values;
-			}
-		}
+            if (true === $replace || ! isset($this->headers[$key])) {
+                $this->headers[$key] = $values;
+            } else {
+                $this->headers[$key] = array_merge($this->headers[$key], $values);
+            }
+        } else {
+            if (true === $replace || ! isset($this->headers[$key])) {
+                $this->headers[$key] = [$values];
+            } else {
+                $this->headers[$key][] = $values;
+            }
+        }
 		
-		if ('cache-control' === $key) {
-			$this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key]));
-		}
-	}
+        if ('cache-control' === $key) {
+            $this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key]));
+        }
+    }
 
-	/**
-	 * Returns true if the HTTP header is defined.
-	 * 
-	 * @param  string  $key  The HTTP header
-	 * 
-	 * @return bool  true if the parameter exists, false otherwise
-	 */
-	public function has(string $key): bool
-	{
-		return array_key_exists(strtr($key, self::STRING_UPPER, self::STRING_LOWER), $this->all());
-	}
+    /**
+     * Returns true if the HTTP header is defined.
+     * 
+     * @param  string  $key  The HTTP header
+     * 
+     * @return bool  true if the parameter exists, false otherwise
+     */
+    public function has(string $key): bool
+    {
+        return array_key_exists(strtr($key, self::STRING_UPPER, self::STRING_LOWER), $this->all());
+    }
 
-	/**
-	 * Removes a header.
-	 * 
-	 * @param  string  $name  The header name
-	 * 
-	 * @return mixed
-	 */
-	public function remove(string $key)
-	{
-		$key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
+    /**
+     * Removes a header.
+     * 
+     * @param  string  $name  The header name
+     * 
+     * @return mixed
+     */
+    public function remove(string $key)
+    {
+        $key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
 
-		unset($this->headers[$key]);
+        unset($this->headers[$key]);
 
-		if ('cache-control' === $key) {
-			$this->cacheControl = [];
-		}
-	}
+        if ('cache-control' === $key) {
+            $this->cacheControl = [];
+        }
+    }
 	
-	/**
-	 * Returns the HTTP header value converted to a date.
-	 * 
-	 * @param  string  $key
-	 * @param  DateTime|null  $default
-	 * 
-	 * @throws \RuntimeException When the HTTP header is not parseable
-	 */
-	public function getDate(string $key, DateTime $default = null): ?DateTimeInterface
-	{
-		if (null === $value = $this->get($key)) {
-			return $default;
-		}
+    /**
+     * Returns the HTTP header value converted to a date.
+     * 
+     * @param  string  $key
+     * @param  DateTime|null  $default
+     * 
+     * @throws \RuntimeException When the HTTP header is not parseable
+     */
+    public function getDate(string $key, DateTime $default = null): ?DateTimeInterface
+    {
+        if (null === $value = $this->get($key)) {
+            return $default;
+        }
 		
-		if (false === $date = DateTime::createFromFormat(DATE_RFC2822, $value)) {
-			throw new RuntimeException(sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value));
-		}
+        if (false === $date = DateTime::createFromFormat(DATE_RFC2822, $value)) {
+            throw new RuntimeException(sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value));
+        }
 		
-		return $date;
-	}
+        return $date;
+    }
 	
-	/**
-	 * Returns an iterator for headers.
-	 * 
-	 * @return \ArrayIterator An \ArrayIterator instance
-	 */
-	public function getIterator(): Traversable
-	{
-		return new ArrayIterator($this->headers);
-	}
+    /**
+     * Returns an iterator for headers.
+     * 
+     * @return \ArrayIterator An \ArrayIterator instance
+     */
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->headers);
+    }
 	
-	/**
-	 * Returns the number of headers.
-	 * 
-	 * @return int The number of headers
-	 */
-	public function count(): int
-	{
-		return count($this->headers);
-	}
+    /**
+     * Returns the number of headers.
+     * 
+     * @return int The number of headers
+     */
+    public function count(): int
+    {
+        return count($this->headers);
+    }
 	
-	/**
-	 * Parses a Cache-Control HTTP header.
-	 * 
-	 * @param string $header The value of the Cache-Control HTTP header
-	 * 
-	 * @return array An array representing the attribute values
-	 */
-	protected function parseCacheControl($header): array
-	{
-		$cacheControl = [];
+    /**
+     * Parses a Cache-Control HTTP header.
+     * 
+     * @param string $header The value of the Cache-Control HTTP header
+     * 
+     * @return array An array representing the attribute values
+     */
+    protected function parseCacheControl($header): array
+    {
+        $cacheControl = [];
 		
-		preg_match_all('~([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?~', $header, $matches, PREG_SET_ORDER);
+        preg_match_all('~([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?~', $header, $matches, PREG_SET_ORDER);
 		
-		foreach ($matches as $match) {
-			$cacheControl[strtolower($match[1])] = isset($match[3]) ? $match[3] : (isset($match[2]) ? $match[2] : true);
-		}
+        foreach ($matches as $match) {
+            $cacheControl[strtolower($match[1])] = isset($match[3]) ? $match[3] : (isset($match[2]) ? $match[2] : true);
+        }
 		
-		return $cacheControl;
-	}
+        return $cacheControl;
+    }
 	
-	/**
-	 * Magic method.
-	 * 
-	 * Returns the headers as a string.
-	 * 
-	 * @return string The headers
-	 */
-	public function __toString(): string
-	{
-		if ( ! $headers = $this->all()) {
-			return '';
-		}
+    /**
+     * Magic method.
+     * 
+     * Returns the headers as a string.
+     * 
+     * @return string The headers
+     */
+    public function __toString(): string
+    {
+        if ( ! $headers = $this->all()) {
+            return '';
+        }
 		
-		ksort($headers);
+        ksort($headers);
 		
-		$max     = max(array_map('strlen', array_keys($headers))) + 1;
-		$content = '';
+        $max     = max(array_map('strlen', array_keys($headers))) + 1;
+        $content = '';
 		
-		foreach ($headers as $name => $values) {
-			$name = ucwords($name, '-');
+        foreach ($headers as $name => $values) {
+            $name = ucwords($name, '-');
 			
-			foreach ($values as $value) {
-				$content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
-			}
-		}
+            foreach ($values as $value) {
+                $content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
+            }
+        }
 
-		return $content;
-	}
+        return $content;
+    }
 }
\ No newline at end of file

src/components/Http/URI.php

Indentation +493 added lines, -493 removed lines

@@ -31,499 +31,499 @@
  */
 class URI
 {
-	/**
-	 * Returns default schemes/ports.
-	 * 
-	 * @var array $defaultPorts
-	 */
-	protected $defaultPorts = [
-		'http'  => 80,
-		'https' => 443,
-		'ftp'   => 21,
-		'sftp'  => 22
-	];
-
-	/**
-	 * The name of any fragment.
-	 * 
-	 * @var string $fragment
-	 */
-	protected $fragment = '';
-
-	/**
-	 * The URI Host.
-	 * 
-	 * @var string $host
-	 */
-	protected $host;
+    /**
+     * Returns default schemes/ports.
+     * 
+     * @var array $defaultPorts
+     */
+    protected $defaultPorts = [
+        'http'  => 80,
+        'https' => 443,
+        'ftp'   => 21,
+        'sftp'  => 22
+    ];
+
+    /**
+     * The name of any fragment.
+     * 
+     * @var string $fragment
+     */
+    protected $fragment = '';
+
+    /**
+     * The URI Host.
+     * 
+     * @var string $host
+     */
+    protected $host;
 	
-	/**
-	 * The URI User Password.
-	 * 
-	 * @var string $password
-	 */
-	protected $password;
-
-	/**
-	 * The URI path.
-	 * 
-	 * @var string $path
-	 */
-	protected $path;
-
-	/**
-	 * The URI Port.
-	 * 
-	 * @var int $port
-	 */
-	protected $port;
-
-	/**
-	 * The query string.
-	 * 
-	 * @var string $query
-	 */
-	protected $query;
-
-	/**
-	 * The URI Scheme.
-	 * 
-	 * @var string $scheme
-	 */
-	protected $scheme = 'http';
-
-	/**
-	 * Whether passwords should be shown in userInfo/authority calls.
-	 * 
-	 * @var boolean $showPassword
-	 */
-	protected $showPassword = false;
+    /**
+     * The URI User Password.
+     * 
+     * @var string $password
+     */
+    protected $password;
+
+    /**
+     * The URI path.
+     * 
+     * @var string $path
+     */
+    protected $path;
+
+    /**
+     * The URI Port.
+     * 
+     * @var int $port
+     */
+    protected $port;
+
+    /**
+     * The query string.
+     * 
+     * @var string $query
+     */
+    protected $query;
+
+    /**
+     * The URI Scheme.
+     * 
+     * @var string $scheme
+     */
+    protected $scheme = 'http';
+
+    /**
+     * Whether passwords should be shown in userInfo/authority calls.
+     * 
+     * @var boolean $showPassword
+     */
+    protected $showPassword = false;
 	
-	/**
-	 * The URI User Info.
-	 * 
-	 * @var string $user
-	 */
-	protected $user;
-
-	/**
-	 * Constructor. The URI class instance.
-	 * 
-	 * @param  string|null  $uri  
-	 * 
-	 * @return void
-	 * 
-	 * @throws \Syscodes\Components\Http\Exceptions\HttpURIException
-	 */
-	public function __construct(string $uri = null)
-	{
-		if ( ! is_null($uri)) {
-			$this->setUri($uri);
-		}
-	}
-
-	/**
-	 * Sets and overwrites any current URI information.
-	 * 
-	 * @param  string|null  $uri  
-	 * 
-	 * @return static
-	 * 
-	 * @throws \Syscodes\Components\Http\Exceptions\HttpURIException
-	 */
-	public function setUri(string $uri = null): static
-	{
-		if ( ! is_null($uri)) {
-			$parts = parse_url($uri);
-
-			if ($parts === false) {
-				throw HttpURIException::UnableToParseURI($uri);
-			}
-
-			$this->applyParts($parts);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns the full URI string.
-	 *
-	 * @return string  The URI string
-	 */
-	public function get(): string
-	{
-		return '/'.ltrim($this->path, '/');
-	}
-
-	/**
-	 * Sets of URI string.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return static
-	 */
-	public function set(string $uri): static
-	{
-		$this->path = $uri;
-
-		return $this;
-	}
-
-	/**
-	 * Retrieve the path component of the URI. The path can either be empty or absolute 
-	 * (starting with a slash) or rootless (not starting with a slash).
-	 * 
-	 * @return string
-	 */
-	public function getPath(): string
-	{
-		return (is_null($this->path) ? '' : $this->path);
-	}
-
-	/**
-	 * Sets the path portion of the URI.
-	 * 
-	 * @param  string  $uri
-	 *
-	 * @return array
-	 */
-	public function setPath(string $uri): array
-	{
-		$this->path = $this->filterPath($uri);
-
-		$tempPath = trim($this->path, '/');
-
-		return $this->filterSegments($tempPath);
-	} 
-
-	/**
-	 * Encodes any dangerous characters.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return string
-	 */
-	protected function filterPath(string $uri): string
-	{
-		return urldecode($uri);
-	}
-
-	/**
-	 * Filter the segments of path.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return string[]
-	 */
-	protected function filterSegments(string $uri): array
-	{
-		return ($uri == '') ? [] : explode('/', $uri);
-	}
-
-	/**
-	 * Get the specified URI segment, return default if it doesn't exist.
-	 * Segment index is 1 based, not 0 based.
-	 *
-	 * @param  int  $index  The 1-based segment index
-	 * @param  mixed  $default  The default value
-	 *
-	 * @return mixed
-	 */
-	public function getSegment(int $index, $default = null): mixed
-	{
-		return Arr::get($this->getSegments(), $index - 1, $default);
-	}
-
-	/**
-	 * Returns the segments of the path as an array.
-	 *
-	 * @return array  The URI segments
-	 */
-	public function getSegments(): array
-	{
-		$segments = $this->setPath(Request::decodedPath());
-
-		return array_values(array_filter($segments, fn ($value) => $value != ''));
-	}
-
-	/**
-	 * Returns the total number of segment.
-	 *
-	 * @return int  
-	 */
-	public function getTotalSegments(): int
-	{
-		return count($this->getSegments());
-	}
-
-	/**
-	 * Retrieve the scheme component of the URI.
-	 * 
-	 * @return string
-	 */
-	public function getScheme(): string
-	{
-		return $this->scheme;
-	}
-
-	/**
-	 * Sets the scheme for this URI.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return string
-	 */
-	public function setScheme(string $str): string
-	{
-		$str = preg_replace('~:(//)?$~', '', strtolower($str));
-
-		$this->scheme = $str;
-
-		return $this->scheme;
-	}
-
-	/**
-	 * Retrieve the user component of the URI.
-	 * 
-	 * @return string|null
-	 */
-	public function getUserInfo()
-	{
-		$user = $this->user;
-		$pass = $this->password;
-
-		if ($this->showPassword === true && ! empty($pass)) {
-			$user .= ":$pass";
-		}
-
-		return $user;
-	}
-
-	/**
-	 * Sets the user portion of the URI.
-	 * 
-	 * @param  string  $user
-	 * 
-	 * @return string|null
-	 */
-	public function setUser($user): string
-	{
-		$this->user = trim($user);
-
-		return $this->user;
-	}
-
-	/**
-	 * Sets the password portion of the URI.
-	 * 
-	 * @param  string  $password
-	 * 
-	 * @return string|null
-	 */
-	public function setPassword($password): string
-	{
-		$this->password = trim($password);
-
-		return $this->password;
-	}
-
-	/**
-	 * Temporarily sets the URI to show a password in userInfo.
-	 * 
-	 * @param  boolean  $option  
-	 * 
-	 * @return static
-	 */
-	public function showPassword(bool $option = true): static
-	{
-		$this->showPassword = $option;
-
-		return $this;
-	}
-
-	/**
-	 * Retrieve the authority component of the URI.
-	 * 
-	 * @param  boolean  $ignore  
-	 * 
-	 * @return string
-	 */
-	public function getAuthority(bool $ignore = false): string
-	{
-		if (empty($this->host)) {
-			return '';
-		}
-
-		$authority = $this->host;
-
-		if ( ! empty($this->getUserInfo())) {
-			$authority = $this->getUserInfo().'@'.$authority;
-		}
-
-		if ( ! empty($this->port) && ! $ignore) {
-			if ($this->port !== $this->defaultPorts[$this->scheme]) {
-				$authority .= ":$this->port";
-			}
-		}
-
-		$this->showPassword = false;
-
-		return $authority;
-	}
-
-	/**
-	 * Parses the given string an saves the appropriate authority pieces.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return static
-	 */
-	public function setAuthority(string $str): static
-	{
-		$parts = parse_url($str);
-
-		if (empty($parts['host']) && ! empty($parts['path'])) {
-			$parts['host'] = $parts['path'];
-			unset($parts['path']);
-		}
-
-		$this->applyParts($parts);
-
-		return $this;
-	}
-
-	/**
-	 * Retrieve the host component of the URI.
-	 * 
-	 * @return string
-	 */
-	public function getHost(): string
-	{
-		return $this->host;
-	}
-
-	/**
-	 * Sets the host name to use.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return string
-	 */
-	public function setHost(string $str): string
-	{
-		$this->host = trim($str);
-
-		return $this->host;
-	}
-
-	/**
-	 * Retrieve the port component of the URI.
-	 * 
-	 * @return int|null
-	 */
-	public function getPort()
-	{
-		return $this->port;
-	}
-
-	/**
-	 * Sets the port portion of the URI.
-	 * 
-	 * @param  int|null  $port  
-	 * 
-	 * @return string
-	 */
-	public function setPort(int $port = null): string
-	{
-		if (is_null($port)) {
-			return $this;
-		}
-
-		if ($port <= 0 || $port > 65355) {
-			throw HttpURIException::invalidPort($port);
-		}
-
-		$this->port = $port;
-
-		return $this->port;
-	}
-
-	/**
-	 * Retrieve a URI fragment.
-	 * 
-	 * @return string
-	 */
-	public function getFragment(): string
-	{
-		return is_null($this->fragment) ? '' : $this->fragment;
-	}
-
-	/**
-	 * Sets the fragment portion of the URI.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return string
-	 */
-	public function setFragment(string $str): string
-	{
-		$this->fragment = trim($str, '# ');
-
-		return $this->fragment;
-	}
-
-	/**
-	 * Saves our parts from a parse_url call.
-	 * 
-	 * @param  array  $parts
-	 * 
-	 * @return mixed
-	 */
-	public function applyParts(array $paths)
-	{
-		if (isset($parts['scheme'])) {
-			$this->SetScheme(rtrim($parts['scheme'], ':/'));
-		} else {
-			$this->setScheme('http');
-		}
-
-		if ( ! empty($parts['host'])) {
-			$this->host = $parts['host'];
-		}
-
-		if (isset($parts['port'])) {
-			if ( ! is_null($parts['port'])) {
-				$this->port = $parts['port'];
-			}
-		}
-
-		if ( ! empty($parts['user'])) {
-			$this->user = $parts['user'];
-		}
-
-		if ( ! empty($parts['pass'])) {
-			$this->password = $parts['pass'];
-		}
-
-		if ( ! empty($parts['path'])) {
-			$this->path = $this->filterPath($parts['path']);
-		}
-
-		if ( ! empty($parts['fragment'])) {
-			$this->fragment = $parts['fragment'];
-		}
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Returns the URI string.
-	 *
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-		return (string) $this->getPath();
-	}
+    /**
+     * The URI User Info.
+     * 
+     * @var string $user
+     */
+    protected $user;
+
+    /**
+     * Constructor. The URI class instance.
+     * 
+     * @param  string|null  $uri  
+     * 
+     * @return void
+     * 
+     * @throws \Syscodes\Components\Http\Exceptions\HttpURIException
+     */
+    public function __construct(string $uri = null)
+    {
+        if ( ! is_null($uri)) {
+            $this->setUri($uri);
+        }
+    }
+
+    /**
+     * Sets and overwrites any current URI information.
+     * 
+     * @param  string|null  $uri  
+     * 
+     * @return static
+     * 
+     * @throws \Syscodes\Components\Http\Exceptions\HttpURIException
+     */
+    public function setUri(string $uri = null): static
+    {
+        if ( ! is_null($uri)) {
+            $parts = parse_url($uri);
+
+            if ($parts === false) {
+                throw HttpURIException::UnableToParseURI($uri);
+            }
+
+            $this->applyParts($parts);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the full URI string.
+     *
+     * @return string  The URI string
+     */
+    public function get(): string
+    {
+        return '/'.ltrim($this->path, '/');
+    }
+
+    /**
+     * Sets of URI string.
+     * 
+     * @param  string  $uri
+     * 
+     * @return static
+     */
+    public function set(string $uri): static
+    {
+        $this->path = $uri;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the path component of the URI. The path can either be empty or absolute 
+     * (starting with a slash) or rootless (not starting with a slash).
+     * 
+     * @return string
+     */
+    public function getPath(): string
+    {
+        return (is_null($this->path) ? '' : $this->path);
+    }
+
+    /**
+     * Sets the path portion of the URI.
+     * 
+     * @param  string  $uri
+     *
+     * @return array
+     */
+    public function setPath(string $uri): array
+    {
+        $this->path = $this->filterPath($uri);
+
+        $tempPath = trim($this->path, '/');
+
+        return $this->filterSegments($tempPath);
+    } 
+
+    /**
+     * Encodes any dangerous characters.
+     * 
+     * @param  string  $uri
+     * 
+     * @return string
+     */
+    protected function filterPath(string $uri): string
+    {
+        return urldecode($uri);
+    }
+
+    /**
+     * Filter the segments of path.
+     * 
+     * @param  string  $uri
+     * 
+     * @return string[]
+     */
+    protected function filterSegments(string $uri): array
+    {
+        return ($uri == '') ? [] : explode('/', $uri);
+    }
+
+    /**
+     * Get the specified URI segment, return default if it doesn't exist.
+     * Segment index is 1 based, not 0 based.
+     *
+     * @param  int  $index  The 1-based segment index
+     * @param  mixed  $default  The default value
+     *
+     * @return mixed
+     */
+    public function getSegment(int $index, $default = null): mixed
+    {
+        return Arr::get($this->getSegments(), $index - 1, $default);
+    }
+
+    /**
+     * Returns the segments of the path as an array.
+     *
+     * @return array  The URI segments
+     */
+    public function getSegments(): array
+    {
+        $segments = $this->setPath(Request::decodedPath());
+
+        return array_values(array_filter($segments, fn ($value) => $value != ''));
+    }
+
+    /**
+     * Returns the total number of segment.
+     *
+     * @return int  
+     */
+    public function getTotalSegments(): int
+    {
+        return count($this->getSegments());
+    }
+
+    /**
+     * Retrieve the scheme component of the URI.
+     * 
+     * @return string
+     */
+    public function getScheme(): string
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * Sets the scheme for this URI.
+     * 
+     * @param  string  $str
+     * 
+     * @return string
+     */
+    public function setScheme(string $str): string
+    {
+        $str = preg_replace('~:(//)?$~', '', strtolower($str));
+
+        $this->scheme = $str;
+
+        return $this->scheme;
+    }
+
+    /**
+     * Retrieve the user component of the URI.
+     * 
+     * @return string|null
+     */
+    public function getUserInfo()
+    {
+        $user = $this->user;
+        $pass = $this->password;
+
+        if ($this->showPassword === true && ! empty($pass)) {
+            $user .= ":$pass";
+        }
+
+        return $user;
+    }
+
+    /**
+     * Sets the user portion of the URI.
+     * 
+     * @param  string  $user
+     * 
+     * @return string|null
+     */
+    public function setUser($user): string
+    {
+        $this->user = trim($user);
+
+        return $this->user;
+    }
+
+    /**
+     * Sets the password portion of the URI.
+     * 
+     * @param  string  $password
+     * 
+     * @return string|null
+     */
+    public function setPassword($password): string
+    {
+        $this->password = trim($password);
+
+        return $this->password;
+    }
+
+    /**
+     * Temporarily sets the URI to show a password in userInfo.
+     * 
+     * @param  boolean  $option  
+     * 
+     * @return static
+     */
+    public function showPassword(bool $option = true): static
+    {
+        $this->showPassword = $option;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the authority component of the URI.
+     * 
+     * @param  boolean  $ignore  
+     * 
+     * @return string
+     */
+    public function getAuthority(bool $ignore = false): string
+    {
+        if (empty($this->host)) {
+            return '';
+        }
+
+        $authority = $this->host;
+
+        if ( ! empty($this->getUserInfo())) {
+            $authority = $this->getUserInfo().'@'.$authority;
+        }
+
+        if ( ! empty($this->port) && ! $ignore) {
+            if ($this->port !== $this->defaultPorts[$this->scheme]) {
+                $authority .= ":$this->port";
+            }
+        }
+
+        $this->showPassword = false;
+
+        return $authority;
+    }
+
+    /**
+     * Parses the given string an saves the appropriate authority pieces.
+     * 
+     * @param  string  $str
+     * 
+     * @return static
+     */
+    public function setAuthority(string $str): static
+    {
+        $parts = parse_url($str);
+
+        if (empty($parts['host']) && ! empty($parts['path'])) {
+            $parts['host'] = $parts['path'];
+            unset($parts['path']);
+        }
+
+        $this->applyParts($parts);
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the host component of the URI.
+     * 
+     * @return string
+     */
+    public function getHost(): string
+    {
+        return $this->host;
+    }
+
+    /**
+     * Sets the host name to use.
+     * 
+     * @param  string  $str
+     * 
+     * @return string
+     */
+    public function setHost(string $str): string
+    {
+        $this->host = trim($str);
+
+        return $this->host;
+    }
+
+    /**
+     * Retrieve the port component of the URI.
+     * 
+     * @return int|null
+     */
+    public function getPort()
+    {
+        return $this->port;
+    }
+
+    /**
+     * Sets the port portion of the URI.
+     * 
+     * @param  int|null  $port  
+     * 
+     * @return string
+     */
+    public function setPort(int $port = null): string
+    {
+        if (is_null($port)) {
+            return $this;
+        }
+
+        if ($port <= 0 || $port > 65355) {
+            throw HttpURIException::invalidPort($port);
+        }
+
+        $this->port = $port;
+
+        return $this->port;
+    }
+
+    /**
+     * Retrieve a URI fragment.
+     * 
+     * @return string
+     */
+    public function getFragment(): string
+    {
+        return is_null($this->fragment) ? '' : $this->fragment;
+    }
+
+    /**
+     * Sets the fragment portion of the URI.
+     * 
+     * @param  string  $str
+     * 
+     * @return string
+     */
+    public function setFragment(string $str): string
+    {
+        $this->fragment = trim($str, '# ');
+
+        return $this->fragment;
+    }
+
+    /**
+     * Saves our parts from a parse_url call.
+     * 
+     * @param  array  $parts
+     * 
+     * @return mixed
+     */
+    public function applyParts(array $paths)
+    {
+        if (isset($parts['scheme'])) {
+            $this->SetScheme(rtrim($parts['scheme'], ':/'));
+        } else {
+            $this->setScheme('http');
+        }
+
+        if ( ! empty($parts['host'])) {
+            $this->host = $parts['host'];
+        }
+
+        if (isset($parts['port'])) {
+            if ( ! is_null($parts['port'])) {
+                $this->port = $parts['port'];
+            }
+        }
+
+        if ( ! empty($parts['user'])) {
+            $this->user = $parts['user'];
+        }
+
+        if ( ! empty($parts['pass'])) {
+            $this->password = $parts['pass'];
+        }
+
+        if ( ! empty($parts['path'])) {
+            $this->path = $this->filterPath($parts['path']);
+        }
+
+        if ( ! empty($parts['fragment'])) {
+            $this->fragment = $parts['fragment'];
+        }
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Returns the URI string.
+     *
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return (string) $this->getPath();
+    }
 }
\ No newline at end of file

src/components/Http/ResponseHeaders.php

Indentation +176 added lines, -176 removed lines

@@ -30,210 +30,210 @@
  */
 class ResponseHeaders extends Headers
 {
-	const COOKIE_FLAT = 'flat';
-	const COOKIE_ARRAY = 'array';
+    const COOKIE_FLAT = 'flat';
+    const COOKIE_ARRAY = 'array';
 	
-	/**
-	 * The list of cookies.
-	 * 
-	 * @var array $cookies
-	 */
-	protected $cookies = [];
+    /**
+     * The list of cookies.
+     * 
+     * @var array $cookies
+     */
+    protected $cookies = [];
 
     /**
      * The header names.
-	 * 
-	 * @var array $headerNames 
+     * 
+     * @var array $headerNames 
+     */
+    protected $headerNames = [];
+
+    /**
+     * Constructor. Create a new ResponseHeaders class instance.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void 
      */
-	protected $headerNames = [];
-
-	/**
-	 * Constructor. Create a new ResponseHeaders class instance.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void 
-	 */
-	public function __construct(array $headers = [])
-	{
-		parent::__construct($headers);
+    public function __construct(array $headers = [])
+    {
+        parent::__construct($headers);
 		
-		if ( ! isset($this->headers['cache-control'])) {
-			$this->set('Cache-Control', '');
-		}
-
-		if ( ! isset($this->headers['date'])) {
-			$this->initDate();
-		}
-	}
-
-	/**
-	 * Returns the headers, without cookies.
-	 * 
-	 * @return mixed
-	 */
-	public function allPreserveCaseWithoutCookies()
-	{
-		$headers = $this->allPreserveCase();
+        if ( ! isset($this->headers['cache-control'])) {
+            $this->set('Cache-Control', '');
+        }
+
+        if ( ! isset($this->headers['date'])) {
+            $this->initDate();
+        }
+    }
+
+    /**
+     * Returns the headers, without cookies.
+     * 
+     * @return mixed
+     */
+    public function allPreserveCaseWithoutCookies()
+    {
+        $headers = $this->allPreserveCase();
 		
-		if (isset($this->headerNames['set-cookie'])) {
-			unset($headers[$this->headerNames['set-cookie']]);
-		}
+        if (isset($this->headerNames['set-cookie'])) {
+            unset($headers[$this->headerNames['set-cookie']]);
+        }
 		
-		return $headers;
-	}
+        return $headers;
+    }
 
     /**
-	 * Returns the headers, with original capitalizations.
-	 * 
-	 * @return array An array of headers
-	 */
-	public function allPreserveCase(): array
-	{
-		$headers = [];
+     * Returns the headers, with original capitalizations.
+     * 
+     * @return array An array of headers
+     */
+    public function allPreserveCase(): array
+    {
+        $headers = [];
 		
-		foreach ($this->all() as $name => $value) {
-			$headers[$this->headerNames[$name] ?? $name] = $value;
-		}
+        foreach ($this->all() as $name => $value) {
+            $headers[$this->headerNames[$name] ?? $name] = $value;
+        }
 		
-		return $headers;
-	}
+        return $headers;
+    }
 	
-	/**
-	 * Returns all the headers.
-	 * 
-	 * @param  string|null  $key  The name of the headers
-	 * 
-	 * @return array
-	 */
-	public function all(string $key = null): array
-	{
-		$headers = parent::all();
+    /**
+     * Returns all the headers.
+     * 
+     * @param  string|null  $key  The name of the headers
+     * 
+     * @return array
+     */
+    public function all(string $key = null): array
+    {
+        $headers = parent::all();
 		
-		if (null !== $key) {
-			$key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
+        if (null !== $key) {
+            $key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
 			
-			return 'set-cookie' !== $key ? $headers[$key] ?? [] : array_map('strval', $this->getCookies());
-		}
+            return 'set-cookie' !== $key ? $headers[$key] ?? [] : array_map('strval', $this->getCookies());
+        }
 		
-		foreach ($this->getCookies() as $cookie) {
-			$headers['set-cookie'][] = (string) $cookie;
-		}
+        foreach ($this->getCookies() as $cookie) {
+            $headers['set-cookie'][] = (string) $cookie;
+        }
 		
-		return $headers;
-	}
-
-	/**
-	 * Replaces the current HTTP headers by a new set.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function replace(array $headers = []): void
-	{
-		$this->headerNames = [];
-
-		parent::replace($headers);
-
-		if ( ! isset($this->headers['cache-control'])) {
-			$this->set('Cache-Control', '');
-		}
+        return $headers;
+    }
+
+    /**
+     * Replaces the current HTTP headers by a new set.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function replace(array $headers = []): void
+    {
+        $this->headerNames = [];
+
+        parent::replace($headers);
+
+        if ( ! isset($this->headers['cache-control'])) {
+            $this->set('Cache-Control', '');
+        }
 		
-		if ( ! isset($this->headers['date'])) {
-			$this->initDate();
-		}
-	}
-
-	/**
-	 * Sets a header by name.
-	 * 
-	 * @param  string  $key  The header name
-	 * @param  string|string[]|null  $values  The value or an array of values
-	 * @param  bool  $replace  If you want to replace the value exists by the header, 
-	 * 					       it is not overwritten / overwritten when it is false
-	 *
-	 * @return void
-	 */
-	public function set(string $key, $values, bool $replace = true): void
-	{
-		$unique = strtr($key, self::STRING_UPPER, self::STRING_LOWER); 
+        if ( ! isset($this->headers['date'])) {
+            $this->initDate();
+        }
+    }
+
+    /**
+     * Sets a header by name.
+     * 
+     * @param  string  $key  The header name
+     * @param  string|string[]|null  $values  The value or an array of values
+     * @param  bool  $replace  If you want to replace the value exists by the header, 
+     * 					       it is not overwritten / overwritten when it is false
+     *
+     * @return void
+     */
+    public function set(string $key, $values, bool $replace = true): void
+    {
+        $unique = strtr($key, self::STRING_UPPER, self::STRING_LOWER); 
 		
-		if ('set-cookie' === $unique) {
-			if ($replace) {
-				$this->cookies = [];
-			}
+        if ('set-cookie' === $unique) {
+            if ($replace) {
+                $this->cookies = [];
+            }
 			
-			foreach ((array) $values as $cookie) {
-				$this->setCookie($cookie);
-			}
+            foreach ((array) $values as $cookie) {
+                $this->setCookie($cookie);
+            }
 			
-			$this->headerNames[$unique] = $key;
+            $this->headerNames[$unique] = $key;
 
-			return;
-		}
+            return;
+        }
 		
-		$this->headerNames[$unique] = $key;
+        $this->headerNames[$unique] = $key;
 		
-		parent::set($key, $values, $replace);
-	}
+        parent::set($key, $values, $replace);
+    }
 	
-	/**
-	 * Gets an array with all cookies.
-	 * 
-	 * @param  string  $format
-	 * 
-	 * @return Cookie[]
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function getCookies(string $format = self::COOKIE_FLAT): array
-	{
-		if ( ! in_array($format, [self::COOKIE_FLAT, self::COOKIE_ARRAY])) {
-			throw new InvalidArgumentException(
-				sprintf('Format "%s" invalid (%s)', $format, implode(', ', [self::COOKIE_FLAT, self::COOKIE_ARRAY])
-			));
-		}
+    /**
+     * Gets an array with all cookies.
+     * 
+     * @param  string  $format
+     * 
+     * @return Cookie[]
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function getCookies(string $format = self::COOKIE_FLAT): array
+    {
+        if ( ! in_array($format, [self::COOKIE_FLAT, self::COOKIE_ARRAY])) {
+            throw new InvalidArgumentException(
+                sprintf('Format "%s" invalid (%s)', $format, implode(', ', [self::COOKIE_FLAT, self::COOKIE_ARRAY])
+            ));
+        }
 		
-		if (self::COOKIE_ARRAY === $format) {
-			return $this->cookies;
-		}
+        if (self::COOKIE_ARRAY === $format) {
+            return $this->cookies;
+        }
 		
-		$stringCookies = [];
-
-		foreach ($this->cookies as $path) {
-			foreach ($path as $cookies) {
-				foreach ($cookies as $cookie) {
-					$stringCookies[] = $cookie;
-				}
-			}
-		}
+        $stringCookies = [];
+
+        foreach ($this->cookies as $path) {
+            foreach ($path as $cookies) {
+                foreach ($cookies as $cookie) {
+                    $stringCookies[] = $cookie;
+                }
+            }
+        }
 		
-		return $stringCookies;
+        return $stringCookies;
     }
 
-	/**
-	 * Sets the cookie.
-	 * 
-	 * @param  \Syscodes\Components\Http\Cookie  $cookie
-	 * 
-	 * @return static
-	 */
-	public function setCookie(Cookie $cookie): static
-	{
-		$this->cookies[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
-		$this->headerNames['set-cookie'] = 'Set-Cookie';
-
-		return $this;
-	}
-
-	/**
-	 * Initialize the date.
-	 * 
-	 * @return void
-	 */
-	private function initDate(): void
-	{
-		$this->set('Date', gmdate('D, d M Y H:i:s').' GMT');
-	}
+    /**
+     * Sets the cookie.
+     * 
+     * @param  \Syscodes\Components\Http\Cookie  $cookie
+     * 
+     * @return static
+     */
+    public function setCookie(Cookie $cookie): static
+    {
+        $this->cookies[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
+        $this->headerNames['set-cookie'] = 'Set-Cookie';
+
+        return $this;
+    }
+
+    /**
+     * Initialize the date.
+     * 
+     * @return void
+     */
+    private function initDate(): void
+    {
+        $this->set('Date', gmdate('D, d M Y H:i:s').' GMT');
+    }
 }
\ No newline at end of file

src/components/Http/Resources/HttpResources.php

Indentation +187 added lines, -187 removed lines

@@ -29,211 +29,211 @@
  */
 trait HttpResources
 {
-	/**
-	 * Filters a value from the start of a string in this case the passed URI string.
-	 *
-	 * @return string
-	 */
-	protected function parseRequestUri(): string
-	{
-		$requestUri = '';
-		
-		if ('1' == $this->server->get('IIS_WasUrlRewritten') && '' != $this->server->get('UNENCODED_URL')) {
-			// IIS7 with URL Rewrite: make sure we get the unencoded URL (double slash problem)
-			$requestUri = $this->server->get('UNENCODED_URL');
-			$this->server->remove('UNENCODED_URL');
-			$this->server->remove('IIS_WasUrlRewritten');
-		} elseif ($this->server->has('REQUEST_URI')) {
-			$requestUri = $this->server->get('REQUEST_URI');
+    /**
+     * Filters a value from the start of a string in this case the passed URI string.
+     *
+     * @return string
+     */
+    protected function parseRequestUri(): string
+    {
+        $requestUri = '';
+		
+        if ('1' == $this->server->get('IIS_WasUrlRewritten') && '' != $this->server->get('UNENCODED_URL')) {
+            // IIS7 with URL Rewrite: make sure we get the unencoded URL (double slash problem)
+            $requestUri = $this->server->get('UNENCODED_URL');
+            $this->server->remove('UNENCODED_URL');
+            $this->server->remove('IIS_WasUrlRewritten');
+        } elseif ($this->server->has('REQUEST_URI')) {
+            $requestUri = $this->server->get('REQUEST_URI');
 			
-			if ('' !== $requestUri && '/' === $requestUri[0]) {
-				// To only use path and query remove the fragment.
-				if (false !== $pos = strpos($requestUri, '#')) {
-					$requestUri = substr($requestUri, 0, $pos);
-				}
-			} else {
-				// HTTP proxy reqs setup request URI with scheme and host [and port] + the URL path,
-				// only use URL path.
-				$uriComponents = parse_url($requestUri);
+            if ('' !== $requestUri && '/' === $requestUri[0]) {
+                // To only use path and query remove the fragment.
+                if (false !== $pos = strpos($requestUri, '#')) {
+                    $requestUri = substr($requestUri, 0, $pos);
+                }
+            } else {
+                // HTTP proxy reqs setup request URI with scheme and host [and port] + the URL path,
+                // only use URL path.
+                $uriComponents = parse_url($requestUri);
 				
-				if (isset($uriComponents['path'])) {
-					$requestUri = $uriComponents['path'];
-				}
+                if (isset($uriComponents['path'])) {
+                    $requestUri = $uriComponents['path'];
+                }
 				
-				if (isset($uriComponents['query'])) {
-					$requestUri .= '?'.$uriComponents['query'];
-				}
-			}
-		} elseif ($this->server->has('ORIG_PATH_INFO')) {
-			// IIS 5.0, PHP as CGI
-			$requestUri = $this->server->get('ORIG_PATH_INFO');
+                if (isset($uriComponents['query'])) {
+                    $requestUri .= '?'.$uriComponents['query'];
+                }
+            }
+        } elseif ($this->server->has('ORIG_PATH_INFO')) {
+            // IIS 5.0, PHP as CGI
+            $requestUri = $this->server->get('ORIG_PATH_INFO');
 			
-			if ('' != $this->server->get('QUERY_STRING')) {
-				$requestUri .= '?'.$this->server->get('QUERY_STRING');
-			}
+            if ('' != $this->server->get('QUERY_STRING')) {
+                $requestUri .= '?'.$this->server->get('QUERY_STRING');
+            }
 			
-			$this->server->remove('ORIG_PATH_INFO');
-		}
+            $this->server->remove('ORIG_PATH_INFO');
+        }
 		
-		// normalize the request URI to ease creating sub-requests from this request
-		$this->server->set('REQUEST_URI', $requestUri);
+        // normalize the request URI to ease creating sub-requests from this request
+        $this->server->set('REQUEST_URI', $requestUri);
 		
-		return $this->filterDecode($requestUri);
-	}
+        return $this->filterDecode($requestUri);
+    }
 
-	/**
-	 * Will parse QUERY_STRING and automatically detect the URI from it.
-	 * 
-	 * @return string
-	 */
-	protected function parseQueryString(): string
-	{
-		$uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING');
+    /**
+     * Will parse QUERY_STRING and automatically detect the URI from it.
+     * 
+     * @return string
+     */
+    protected function parseQueryString(): string
+    {
+        $uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING');
 
-		if (trim($uri, '/') === '') {
-			return '';
-		} elseif (0 === strncmp($uri, '/', 1)) {
-			$uri    				 = explode('?', $uri, 2);
-			$_SERVER['QUERY_STRING'] = $uri[1] ?? '';
-			$uri    				 = $uri[0] ?? '';
-		}
+        if (trim($uri, '/') === '') {
+            return '';
+        } elseif (0 === strncmp($uri, '/', 1)) {
+            $uri    				 = explode('?', $uri, 2);
+            $_SERVER['QUERY_STRING'] = $uri[1] ?? '';
+            $uri    				 = $uri[0] ?? '';
+        }
 
-		parse_str($_SERVER['QUERY_STRING'], $_GET);
+        parse_str($_SERVER['QUERY_STRING'], $_GET);
 
-		return $this->filterDecode($uri);
-	}
+        return $this->filterDecode($uri);
+    }
 	
-	/**
-	 * Parse the base URL.
-	 * 
-	 * @return string
-	 */
-	public function parseBaseUrl(): string
-	{
-		$filename = basename($this->server('SCRIPT_FILENAME'));
-		
-		if ($filename === basename($this->server('SCRIPT_NAME'))) {
-			$baseUrl = $this->server('SCRIPT_NAME');
-		} elseif ($filename === basename($this->server('PHP_SELF'))) {
-			$baseUrl = $this->server('PHP_SELF');
-		} elseif ($filename === basename($this->server('ORIG_SCRIPT_NAME'))) {
-			$baseUrl = $this->server('ORIG_SCRIPT_NAME');
-		} else {
-			$path    = $this->server('PHP_SELF', '');
-			$file    = $this->server('SCRIPT_NAME', '');
-			$segs    = explode('/', trim($file, '/'));
-			$segs    = array_reverse($segs);
-			$index   = 0;
-			$last    = count($segs);
-			$baseUrl = '';
+    /**
+     * Parse the base URL.
+     * 
+     * @return string
+     */
+    public function parseBaseUrl(): string
+    {
+        $filename = basename($this->server('SCRIPT_FILENAME'));
+		
+        if ($filename === basename($this->server('SCRIPT_NAME'))) {
+            $baseUrl = $this->server('SCRIPT_NAME');
+        } elseif ($filename === basename($this->server('PHP_SELF'))) {
+            $baseUrl = $this->server('PHP_SELF');
+        } elseif ($filename === basename($this->server('ORIG_SCRIPT_NAME'))) {
+            $baseUrl = $this->server('ORIG_SCRIPT_NAME');
+        } else {
+            $path    = $this->server('PHP_SELF', '');
+            $file    = $this->server('SCRIPT_NAME', '');
+            $segs    = explode('/', trim($file, '/'));
+            $segs    = array_reverse($segs);
+            $index   = 0;
+            $last    = count($segs);
+            $baseUrl = '';
 			
-			do 	{
-				$seg     = $segs[$index];
-				$baseUrl = '/'.$seg.$baseUrl;
-				++$index;
-			} while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos);
-		}
-		
-		// Does the baseUrl have anything in common with the request_uri?
-		$requestUri = $this->getRequestUri();
-		
-		if ('' !== $requestUri && '/' !== $requestUri[0]) {
-			$requestUri = '/'.$requestUri;
-		}
-		
-		if ($baseUrl && null !== $uri = $this->getUrlencoded($requestUri, $baseUrl)) {
-			// Full $baseUrl matches
-			return $this->filterDecode($uri);
-		}
-		
-		if ($baseUrl && null !== $uri = $this->getUrlencoded($requestUri, rtrim(dirname($baseUrl), '/'.DIRECTORY_SEPARATOR))) {
-			// Directory portion of $baseUrl matches
-			return $this->filterDecode($uri);
-		}
+            do 	{
+                $seg     = $segs[$index];
+                $baseUrl = '/'.$seg.$baseUrl;
+                ++$index;
+            } while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos);
+        }
+		
+        // Does the baseUrl have anything in common with the request_uri?
+        $requestUri = $this->getRequestUri();
+		
+        if ('' !== $requestUri && '/' !== $requestUri[0]) {
+            $requestUri = '/'.$requestUri;
+        }
+		
+        if ($baseUrl && null !== $uri = $this->getUrlencoded($requestUri, $baseUrl)) {
+            // Full $baseUrl matches
+            return $this->filterDecode($uri);
+        }
+		
+        if ($baseUrl && null !== $uri = $this->getUrlencoded($requestUri, rtrim(dirname($baseUrl), '/'.DIRECTORY_SEPARATOR))) {
+            // Directory portion of $baseUrl matches
+            return $this->filterDecode($uri);
+        }
 
-		$baseUrl = dirname($baseUrl ?? '');
+        $baseUrl = dirname($baseUrl ?? '');
 		
-		// If using mod_rewrite or ISAPI_Rewrite strip the script filename
-		// out of baseUrl. $pos !== 0 makes sure it is not matching a value
-		// from PATH_INFO or QUERY_STRING
-		if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos) {
-			$baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
-		}
+        // If using mod_rewrite or ISAPI_Rewrite strip the script filename
+        // out of baseUrl. $pos !== 0 makes sure it is not matching a value
+        // from PATH_INFO or QUERY_STRING
+        if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos) {
+            $baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
+        }
 		
-		return $this->filterDecode($baseUrl);
-	}
+        return $this->filterDecode($baseUrl);
+    }
 	
-	/**
-	 * Returns the prefix as encoded in the string when the string starts with
-	 * the given prefix, null otherwise.
-	 *
-	 * return string|null
-	 */
-	private function getUrlencoded(string $string, string $prefix): ?string
-	{
-		if ( ! Str::startsWith(rawurldecode($string), $prefix)) {
-			return null;
-		}
-		
-		$length = strlen($prefix);
-		
-		if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $length), $string, $match)) {
-			return $match[0];
-		}
-		
-		return null;
-	}
+    /**
+     * Returns the prefix as encoded in the string when the string starts with
+     * the given prefix, null otherwise.
+     *
+     * return string|null
+     */
+    private function getUrlencoded(string $string, string $prefix): ?string
+    {
+        if ( ! Str::startsWith(rawurldecode($string), $prefix)) {
+            return null;
+        }
+		
+        $length = strlen($prefix);
+		
+        if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $length), $string, $match)) {
+            return $match[0];
+        }
+		
+        return null;
+    }
 
 
-	/**
-	 * Parse the path info.
-	 * 
-	 * @return string
-	 */
-	public function parsePathInfo(): string
-	{
-		if (null === ($requestUri = $this->getRequestUri())) {
-			return '/';
-		}
-		
-		// Remove the query string from REQUEST_URI
-		if (false !== $pos = strpos($requestUri, '?')) {
-			$requestUri = substr($requestUri, 0, $pos);
-		}
-		
-		if ('' !== $requestUri && '/' !== $requestUri[0]) {
-			$requestUri = '/'.$requestUri;
-		}
-		
-		if (null === ($baseUrl = $this->getBaseUrl())) {
-			return $requestUri;
-		}
-		
-		$pathInfo = substr($requestUri, \strlen($baseUrl));
-		
-		if (false === $pathInfo || '' === $pathInfo) {
-			// If substr() returns false then PATH_INFO is set to an empty string
-			return '/';
-		}
-		
-		return $this->filterDecode($pathInfo);
-	}
+    /**
+     * Parse the path info.
+     * 
+     * @return string
+     */
+    public function parsePathInfo(): string
+    {
+        if (null === ($requestUri = $this->getRequestUri())) {
+            return '/';
+        }
+		
+        // Remove the query string from REQUEST_URI
+        if (false !== $pos = strpos($requestUri, '?')) {
+            $requestUri = substr($requestUri, 0, $pos);
+        }
+		
+        if ('' !== $requestUri && '/' !== $requestUri[0]) {
+            $requestUri = '/'.$requestUri;
+        }
+		
+        if (null === ($baseUrl = $this->getBaseUrl())) {
+            return $requestUri;
+        }
+		
+        $pathInfo = substr($requestUri, \strlen($baseUrl));
+		
+        if (false === $pathInfo || '' === $pathInfo) {
+            // If substr() returns false then PATH_INFO is set to an empty string
+            return '/';
+        }
+		
+        return $this->filterDecode($pathInfo);
+    }
 
-	/**
-	 * Filters the uri string remove any malicious characters and inappropriate slashes.
-	 *
-	 * @param  string  $uri
-	 *
-	 * @return string
-	 */
-	protected function filterDecode($uri): string
-	{
-		// Remove all characters except letters,
-		// digits and $-_.+!*'(),{}|\\^~[]`<>#%";/?:@&=.
-		$uri = filter_var(rawurldecode($uri), FILTER_SANITIZE_URL);
-		$uri = mb_strtolower(trim($uri), 'UTF-8');
-		
-		// Return argument if not empty or return a single slash
-		return trim($uri);
-	}
+    /**
+     * Filters the uri string remove any malicious characters and inappropriate slashes.
+     *
+     * @param  string  $uri
+     *
+     * @return string
+     */
+    protected function filterDecode($uri): string
+    {
+        // Remove all characters except letters,
+        // digits and $-_.+!*'(),{}|\\^~[]`<>#%";/?:@&=.
+        $uri = filter_var(rawurldecode($uri), FILTER_SANITIZE_URL);
+        $uri = mb_strtolower(trim($uri), 'UTF-8');
+		
+        // Return argument if not empty or return a single slash
+        return trim($uri);
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 			$last    = count($segs);
 			$baseUrl = '';
 			
-			do 	{
+			do {
 				$seg     = $segs[$index];
 				$baseUrl = '/'.$seg.$baseUrl;
 				++$index;