lenevor / syscodes

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;

src/components/Http/Resources/HttpRequest.php

Indentation +116 added lines, -116 removed lines

@@ -31,33 +31,33 @@ 
  */
 trait HttpRequest
 {
-	/**
-	 * Holds the global active request instance.
-	 *
-	 * @var bool $requestURI
-	 */
-	protected static $requestURI;
-
-	/**
-	 * Get the http method parameter.
-	 * 
-	 * @var bool $httpMethodParameterOverride
-	 */
-	protected static $httpMethodParameterOverride = false;
+    /**
+     * Holds the global active request instance.
+     *
+     * @var bool $requestURI
+     */
+    protected static $requestURI;
+
+    /**
+     * Get the http method parameter.
+     * 
+     * @var bool $httpMethodParameterOverride
+     */
+    protected static $httpMethodParameterOverride = false;
 
     /**
-	 * Create a new Syscodes HTTP request from server variables.
-	 * 
-	 * @return static
-	 */
-	public static function capture(): static
-	{
-		static::enabledHttpMethodParameterOverride();
+     * Create a new Syscodes HTTP request from server variables.
+     * 
+     * @return static
+     */
+    public static function capture(): static
+    {
+        static::enabledHttpMethodParameterOverride();
 		
-		return static::createFromRequest(static::createFromRequestGlobals());
-	}
+        return static::createFromRequest(static::createFromRequestGlobals());
+    }
 
-	/**
+    /**
      * Enables support for the _method request parameter to determine the intended HTTP method.
      * 
      * @return void
@@ -67,101 +67,101 @@ 
         self::$httpMethodParameterOverride = true;
     }
 	
-	/**
-	 * Checks whether support for the _method request parameter is enabled.
-	 * 
-	 * @return bool
-	 */
-	public static function getHttpMethodParameterOverride(): bool
-	{
-		return self::$httpMethodParameterOverride;
-	}
-
-	/**
-	 * Creates an Syscodes request from of the Request class instance.
-	 * 
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 * 
-	 * @return static
-	 */
-	public static function createFromRequest($request): static
-	{
-		$newRequest = (new static)->duplicate(
-			$request->query->all(), $request->request->all(), $request->attributes->all(),
-			$request->cookies->all(), $request->files->all(), $request->server->all()
-		);
+    /**
+     * Checks whether support for the _method request parameter is enabled.
+     * 
+     * @return bool
+     */
+    public static function getHttpMethodParameterOverride(): bool
+    {
+        return self::$httpMethodParameterOverride;
+    }
+
+    /**
+     * Creates an Syscodes request from of the Request class instance.
+     * 
+     * @param  \Syscodes\Components\Http\Request  $request
+     * 
+     * @return static
+     */
+    public static function createFromRequest($request): static
+    {
+        $newRequest = (new static)->duplicate(
+            $request->query->all(), $request->request->all(), $request->attributes->all(),
+            $request->cookies->all(), $request->files->all(), $request->server->all()
+        );
 		
-		$newRequest->headers->replace($request->headers->all());
+        $newRequest->headers->replace($request->headers->all());
 		
-		$newRequest->content = $request->content;
+        $newRequest->content = $request->content;
 		
-		if ($newRequest->isJson()) {
-			$newRequest->request = $newRequest->json();
-		}
+        if ($newRequest->isJson()) {
+            $newRequest->request = $newRequest->json();
+        }
 		
-		return $newRequest;
-	}
-
-	/**
-	 * Creates a new request with value from PHP's super global.
-	 * 
-	 * @return static
-	 */
-	public static function createFromRequestGlobals(): static
-	{
-		$request = static::createFromRequestFactory($_GET, $_POST, [], $_COOKIE, $_FILES, $_SERVER);
-
-		if (Str::startsWith($request->headers->get('CONTENT_TYPE', ''), 'application/x-www-form-urlencoded')
-		    && in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), ['PUT', 'DELETE', 'PATCH'])) {
-			parse_str($request->getContent(), $data);
-			$request->request = new Inputs($data);
-		}
-
-		return $request;
-	}
-
-	/**
-	 * Creates a new request from a factory.
-	 * 
-	 * @param  array  $query
-	 * @param  array  $request
-	 * @param  array  $attributes
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * 
-	 * @return static
-	 */
-	private static function createFromRequestFactory(
-		array $query = [], 
-		array $request = [],
-		array $attributes = [] ,
-		array $cookies = [], 
-		array $files = [], 
-		array $server = []
-	): static {
-		if (self::$requestURI) {
-			$request = (self::$requestURI)($query, $request, [], $cookies, $files, $server);
-
-			if ( ! $request instanceof self) {
-				throw new LogicException('The Request active must return an instance of Syscodes\Components\Http\Request');
-			}
-
-			return $request;
-		}
-
-		return new static($query, $request, $attributes, $cookies, $files, $server);
-	}
-
-	/**
-	 * Returns the factory request currently being used.
-	 *
-	 * @param  \Syscodes\Components\Http\Request|callable|null  $request  
-	 *
-	 * @return void
-	 */
-	public static function setFactory(?callable $request): void
-	{
-		self::$requestURI = $request;
-	}
+        return $newRequest;
+    }
+
+    /**
+     * Creates a new request with value from PHP's super global.
+     * 
+     * @return static
+     */
+    public static function createFromRequestGlobals(): static
+    {
+        $request = static::createFromRequestFactory($_GET, $_POST, [], $_COOKIE, $_FILES, $_SERVER);
+
+        if (Str::startsWith($request->headers->get('CONTENT_TYPE', ''), 'application/x-www-form-urlencoded')
+            && in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), ['PUT', 'DELETE', 'PATCH'])) {
+            parse_str($request->getContent(), $data);
+            $request->request = new Inputs($data);
+        }
+
+        return $request;
+    }
+
+    /**
+     * Creates a new request from a factory.
+     * 
+     * @param  array  $query
+     * @param  array  $request
+     * @param  array  $attributes
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * 
+     * @return static
+     */
+    private static function createFromRequestFactory(
+        array $query = [], 
+        array $request = [],
+        array $attributes = [] ,
+        array $cookies = [], 
+        array $files = [], 
+        array $server = []
+    ): static {
+        if (self::$requestURI) {
+            $request = (self::$requestURI)($query, $request, [], $cookies, $files, $server);
+
+            if ( ! $request instanceof self) {
+                throw new LogicException('The Request active must return an instance of Syscodes\Components\Http\Request');
+            }
+
+            return $request;
+        }
+
+        return new static($query, $request, $attributes, $cookies, $files, $server);
+    }
+
+    /**
+     * Returns the factory request currently being used.
+     *
+     * @param  \Syscodes\Components\Http\Request|callable|null  $request  
+     *
+     * @return void
+     */
+    public static function setFactory(?callable $request): void
+    {
+        self::$requestURI = $request;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	private static function createFromRequestFactory(
 		array $query = [], 
 		array $request = [],
-		array $attributes = [] ,
+		array $attributes = [],
 		array $cookies = [], 
 		array $files = [], 
 		array $server = []

src/components/Http/Resources/HttpResponse.php

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      * 
      * @var \Syscodes\Components\Http\ResponseHeaders $headers
      */
-	public $headers;
+    public $headers;
 
     /**
      * The HTTP protocol version.

src/components/Http/RedirectResponse.php

Indentation +7 added lines, -7 removed lines

@@ -127,13 +127,13 @@
     }
 
     /**
-    * Redirects to another url. Sets the redirect header, sends the headers and exits.
-    * Can redirect via a Location header.
-    *
-    * @param  string  $url  The url
-    *
-    * @return static
-    */
+     * Redirects to another url. Sets the redirect header, sends the headers and exits.
+     * Can redirect via a Location header.
+     *
+     * @param  string  $url  The url
+     *
+     * @return static
+     */
     public function setTargetUrl($url): static
     {
         if ('' === ($url ?? '')) {