miBadger / miBadger.Http

src/ServerRequest.php

Indentation +408 added lines, -408 removed lines

@@ -22,412 +22,412 @@
  */
 class ServerRequest extends Request implements ServerRequestInterface
 {
-	/** @var array The server parameters. */
-	private $serverParams;
-
-	/** @var array The cookie parameters. */
-	private $cookieParams;
-
-	/** @var array The query parameters. */
-	private $queryParams;
-
-	/** @var array The post parameters. */
-	private $postParams;
-
-	/** @var array The files parameters. */
-	private $filesParams;
-
-	/** @var array The uploaded files. */
-	private $uploadedFiles;
-
-	/** @var null|array|object The parsed body. */
-	private $parsedBody;
-
-	/** @var array The attributes. */
-	private $attributes;
-
-	/**
-	 * Construct a Request object with the given method, uri, version, headers & body.
-	 *
-	 * @global array $_SERVER The server parameters.
-	 * @global array $_COOKIE The cookie parameters.
-	 * @global array $_GET The query parameters.
-	 * @global array $_POST The post parameters.
-	 * @global array $_FILES The files parameters.
-	 *
-	 * @param string $method = ''
-	 * @param UriInterface|null $uri = null
-	 * @param string $version = self::DEFAULT_VERSION
-	 * @param array $headers = []
-	 * @param StreamInterface|null $body = null
-	 */
-	public function __construct($method = '', UriInterface $uri = null, $version = self::DEFAULT_VERSION, array $headers = [], StreamInterface $body = null)
-	{
-		if ($body === null) {
-			$body = new Stream(fopen('php://input', 'r'));
-		}
-
-		$this->serverParams = $_SERVER;
-		$this->cookieParams = $_COOKIE;
-		$this->queryParams = $this->initQueryParams($this->serverParams);
-		$this->postParams = $_POST;
-		$this->filesParams = $_FILES;
-		$this->uploadedFiles = $this->initUploadedFiles($this->filesParams);
-		$this->attributes = [];
-
-		parent::__construct($this->initMethod($method), $this->initUri($uri), $version, $this->initHeaders($headers), $body);
-	}
-
-	/**
-	 * Initialize the method.
-	 *
-	 * @param string $method
-	 * @return string the method.
-	 */
-	private function initMethod($method)
-	{
-		return $method === '' && isset($this->getServerParams()['REQUEST_METHOD']) ? $this->getServerParams()['REQUEST_METHOD'] : $method;
-	}
-
-	/**
-	 * Initialize the URI.
-	 *
-	 * @param UriInterface|null $uri
-	 * @return UriInterface the URI.
-	 */
-	private function initUri($uri)
-	{
-		if ($uri !== null) {
-			return $uri;
-		}
-
-		$scheme = isset($this->getServerParams()['HTTPS']) ? 'https://' : 'http://';
-		$host = isset($this->getServerParams()['HTTP_HOST']) ? $scheme . $this->getServerParams()['HTTP_HOST'] : '';
-		$path = isset($this->getServerParams()['REQUEST_URI']) ? $this->getServerParams()['REQUEST_URI'] : '';
-
-		return new URI($host . $path);
-	}
-
-	/**
-	 * Initialize the headers.
-	 *
-	 * @param array $headers
-	 * @return array the headers.
-	 */
-	private function initHeaders($headers)
-	{
-		return $headers ?: getallheaders();
-	}
-
-	/**
-	 * Initialize the headers.
-	 *
-	 * @param string $serverParams
-	 * @return array the headers.
-	 */
-	private function initQueryParams($serverParams)
-	{
-		$result = [];
-
-		if (isset($serverParams['REQUEST_URI']) && ($query = parse_url($serverParams['REQUEST_URI'], \PHP_URL_QUERY))) {
-			parse_str($query, $result);
-		}
-
-		return $result ?? [];
-	}
-
-	/**
-	 * Initialize the uploaded files.
-	 *
-	 * @param array $files
-	 * @return array the uploaded files.
-	 */
-	private function initUploadedFiles(array $files)
-	{
-		$result = [];
-
-		foreach ($files as $key => $value) {
-			$result[$key] = $this->parseUploadedFiles($value);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Parse uploaded files.
-	 *
-	 * @param array $files
-	 * @return UploadedFile|array uploaded files.
-	 */
-	private function parseUploadedFiles($files)
-	{
-		// Empty
-		$first = reset($files);
-
-		// Single
-		if (!is_array($first)) {
-			return $this->parseSingleUploadedFiles($files);
-		}
-
-		// Multiple
-		if (count(array_filter(array_keys($first), 'is_string')) === 0) {
-			return $this->parseMultipleUploadedFiles($files);
-		}
-
-		// Namespace
-		return $this->initUploadedFiles($files);
-	}
-
-	/**
-	 * Parse single uploaded file.
-	 *
-	 * @param array $file
-	 * @return UploadedFile single uploaded file.
-	 */
-	private function parseSingleUploadedFiles(array $file)
-	{
-		return new UploadedFile($file['name'], $file['type'], $file['tmp_name'], $file['error'], $file['size']);
-	}
-
-	/**
-	 * Parse multiple uploaded files.
-	 *
-	 * @param array $files
-	 * @return UploadedFiles[] multiple uploaded files.
-	 */
-	private function parseMultipleUploadedFiles(array $files)
-	{
-		$count = count($files['name']);
-		$result = [];
-
-		for ($i = 0; $i < $count; $i++) {
-			$result[] = new UploadedFile($files['name'][$i], $files['type'][$i], $files['tmp_name'][$i], $files['error'][$i], $files['size'][$i]);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getServerParams()
-	{
-		return $this->serverParams;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getCookieParams()
-	{
-		return $this->cookieParams;
-	}
-
-	/**
-	 * Set the cookie params.
-	 *
-	 * @param array $cookieParams
-	 * @return $this
-	 */
-	private function setCookieParams(array $cookieParams)
-	{
-		$this->cookieParams = $cookieParams;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withCookieParams(array $cookieParams)
-	{
-		$result = clone $this;
-
-		return $result->setCookieParams($cookieParams);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getQueryParams()
-	{
-		return $this->queryParams;
-	}
-
-	/**
-	 * Set the query params.
-	 *
-	 * @param array $queryParams
-	 * @return $this
-	 */
-	private function setQueryParams(array $queryParams)
-	{
-		$this->queryParams = $queryParams;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withQueryParams(array $queryParams)
-	{
-		$result = clone $this;
-
-		return $result->setQueryParams($queryParams);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getUploadedFiles()
-	{
-		return $this->uploadedFiles;
-	}
-
-	/**
-	 * Set the uploaded files.
-	 *
-	 * @param array $uploadedFiles
-	 * @return $this
-	 */
-	private function setUploadedFiles(array $uploadedFiles)
-	{
-		$this->uploadedFiles = $uploadedFiles;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withUploadedFiles(array $uploadedFiles)
-	{
-		$result = clone $this;
-
-		return $result->setUploadedFiles($uploadedFiles);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getParsedBody()
-	{
-		if ($this->parsedBody !== null) {
-			return $this->parsedBody;
-		}
-
-		if ($this->getMethod() === 'POST' && ($this->hasContentType('application/x-www-form-urlencoded') || $this->hasContentType('multipart/form-data'))) {
-			return $this->postParams;
-		}
-
-		if ($this->hasContentType('application/json')) {
-			return json_decode((string) $this->getBody());
-		}
-
-		return null;
-	}
-
-	/**
-	 * Checks if a content type header exists with the given content type.
-	 *
-	 * @param string $contentType
-	 * @return bool true if a content type header exists with the given content type.
-	 */
-	private function hasContentType($contentType)
-	{
-		foreach ($this->getHeader('Content-Type') as $key => $value) {
-			if (substr($value, 0, strlen($contentType)) == $contentType) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Set the parsed body.
-	 *
-	 * @param null|array|object $parsedBody
-	 * @return $this
-	 */
-	private function setParsedBody($parsedBody)
-	{
-		$this->parsedBody = $parsedBody;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withParsedBody($parsedBody)
-	{
-		$result = clone $this;
-
-		return $result->setParsedBody($parsedBody);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getAttributes()
-	{
-		return $this->attributes;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getAttribute($name, $default = null)
-	{
-		return isset($this->attributes[$name]) ? $this->attributes[$name] : $default;
-	}
-
-	/**
-	 * Set the attribute.
-	 *
-	 * @param string $name
-	 * @param mixed $value
-	 * @return $this
-	 */
-	private function setAttribute($name, $value)
-	{
-		$this->attributes[$name] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withAttribute($name, $value)
-	{
-		$result = clone $this;
-
-		return $result->setAttribute($name, $value);
-	}
-
-	/**
-	 * Remove the attribute.
-	 *
-	 * @param string $name
-	 * @return $this
-	 */
-	private function removeAttribute($name)
-	{
-		unset($this->attributes[$name]);
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withoutAttribute($name)
-	{
-		$result = clone $this;
-
-		return $result->removeAttribute($name);
-	}
+    /** @var array The server parameters. */
+    private $serverParams;
+
+    /** @var array The cookie parameters. */
+    private $cookieParams;
+
+    /** @var array The query parameters. */
+    private $queryParams;
+
+    /** @var array The post parameters. */
+    private $postParams;
+
+    /** @var array The files parameters. */
+    private $filesParams;
+
+    /** @var array The uploaded files. */
+    private $uploadedFiles;
+
+    /** @var null|array|object The parsed body. */
+    private $parsedBody;
+
+    /** @var array The attributes. */
+    private $attributes;
+
+    /**
+     * Construct a Request object with the given method, uri, version, headers & body.
+     *
+     * @global array $_SERVER The server parameters.
+     * @global array $_COOKIE The cookie parameters.
+     * @global array $_GET The query parameters.
+     * @global array $_POST The post parameters.
+     * @global array $_FILES The files parameters.
+     *
+     * @param string $method = ''
+     * @param UriInterface|null $uri = null
+     * @param string $version = self::DEFAULT_VERSION
+     * @param array $headers = []
+     * @param StreamInterface|null $body = null
+     */
+    public function __construct($method = '', UriInterface $uri = null, $version = self::DEFAULT_VERSION, array $headers = [], StreamInterface $body = null)
+    {
+        if ($body === null) {
+            $body = new Stream(fopen('php://input', 'r'));
+        }
+
+        $this->serverParams = $_SERVER;
+        $this->cookieParams = $_COOKIE;
+        $this->queryParams = $this->initQueryParams($this->serverParams);
+        $this->postParams = $_POST;
+        $this->filesParams = $_FILES;
+        $this->uploadedFiles = $this->initUploadedFiles($this->filesParams);
+        $this->attributes = [];
+
+        parent::__construct($this->initMethod($method), $this->initUri($uri), $version, $this->initHeaders($headers), $body);
+    }
+
+    /**
+     * Initialize the method.
+     *
+     * @param string $method
+     * @return string the method.
+     */
+    private function initMethod($method)
+    {
+        return $method === '' && isset($this->getServerParams()['REQUEST_METHOD']) ? $this->getServerParams()['REQUEST_METHOD'] : $method;
+    }
+
+    /**
+     * Initialize the URI.
+     *
+     * @param UriInterface|null $uri
+     * @return UriInterface the URI.
+     */
+    private function initUri($uri)
+    {
+        if ($uri !== null) {
+            return $uri;
+        }
+
+        $scheme = isset($this->getServerParams()['HTTPS']) ? 'https://' : 'http://';
+        $host = isset($this->getServerParams()['HTTP_HOST']) ? $scheme . $this->getServerParams()['HTTP_HOST'] : '';
+        $path = isset($this->getServerParams()['REQUEST_URI']) ? $this->getServerParams()['REQUEST_URI'] : '';
+
+        return new URI($host . $path);
+    }
+
+    /**
+     * Initialize the headers.
+     *
+     * @param array $headers
+     * @return array the headers.
+     */
+    private function initHeaders($headers)
+    {
+        return $headers ?: getallheaders();
+    }
+
+    /**
+     * Initialize the headers.
+     *
+     * @param string $serverParams
+     * @return array the headers.
+     */
+    private function initQueryParams($serverParams)
+    {
+        $result = [];
+
+        if (isset($serverParams['REQUEST_URI']) && ($query = parse_url($serverParams['REQUEST_URI'], \PHP_URL_QUERY))) {
+            parse_str($query, $result);
+        }
+
+        return $result ?? [];
+    }
+
+    /**
+     * Initialize the uploaded files.
+     *
+     * @param array $files
+     * @return array the uploaded files.
+     */
+    private function initUploadedFiles(array $files)
+    {
+        $result = [];
+
+        foreach ($files as $key => $value) {
+            $result[$key] = $this->parseUploadedFiles($value);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Parse uploaded files.
+     *
+     * @param array $files
+     * @return UploadedFile|array uploaded files.
+     */
+    private function parseUploadedFiles($files)
+    {
+        // Empty
+        $first = reset($files);
+
+        // Single
+        if (!is_array($first)) {
+            return $this->parseSingleUploadedFiles($files);
+        }
+
+        // Multiple
+        if (count(array_filter(array_keys($first), 'is_string')) === 0) {
+            return $this->parseMultipleUploadedFiles($files);
+        }
+
+        // Namespace
+        return $this->initUploadedFiles($files);
+    }
+
+    /**
+     * Parse single uploaded file.
+     *
+     * @param array $file
+     * @return UploadedFile single uploaded file.
+     */
+    private function parseSingleUploadedFiles(array $file)
+    {
+        return new UploadedFile($file['name'], $file['type'], $file['tmp_name'], $file['error'], $file['size']);
+    }
+
+    /**
+     * Parse multiple uploaded files.
+     *
+     * @param array $files
+     * @return UploadedFiles[] multiple uploaded files.
+     */
+    private function parseMultipleUploadedFiles(array $files)
+    {
+        $count = count($files['name']);
+        $result = [];
+
+        for ($i = 0; $i < $count; $i++) {
+            $result[] = new UploadedFile($files['name'][$i], $files['type'][$i], $files['tmp_name'][$i], $files['error'][$i], $files['size'][$i]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getServerParams()
+    {
+        return $this->serverParams;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCookieParams()
+    {
+        return $this->cookieParams;
+    }
+
+    /**
+     * Set the cookie params.
+     *
+     * @param array $cookieParams
+     * @return $this
+     */
+    private function setCookieParams(array $cookieParams)
+    {
+        $this->cookieParams = $cookieParams;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withCookieParams(array $cookieParams)
+    {
+        $result = clone $this;
+
+        return $result->setCookieParams($cookieParams);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueryParams()
+    {
+        return $this->queryParams;
+    }
+
+    /**
+     * Set the query params.
+     *
+     * @param array $queryParams
+     * @return $this
+     */
+    private function setQueryParams(array $queryParams)
+    {
+        $this->queryParams = $queryParams;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withQueryParams(array $queryParams)
+    {
+        $result = clone $this;
+
+        return $result->setQueryParams($queryParams);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getUploadedFiles()
+    {
+        return $this->uploadedFiles;
+    }
+
+    /**
+     * Set the uploaded files.
+     *
+     * @param array $uploadedFiles
+     * @return $this
+     */
+    private function setUploadedFiles(array $uploadedFiles)
+    {
+        $this->uploadedFiles = $uploadedFiles;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withUploadedFiles(array $uploadedFiles)
+    {
+        $result = clone $this;
+
+        return $result->setUploadedFiles($uploadedFiles);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParsedBody()
+    {
+        if ($this->parsedBody !== null) {
+            return $this->parsedBody;
+        }
+
+        if ($this->getMethod() === 'POST' && ($this->hasContentType('application/x-www-form-urlencoded') || $this->hasContentType('multipart/form-data'))) {
+            return $this->postParams;
+        }
+
+        if ($this->hasContentType('application/json')) {
+            return json_decode((string) $this->getBody());
+        }
+
+        return null;
+    }
+
+    /**
+     * Checks if a content type header exists with the given content type.
+     *
+     * @param string $contentType
+     * @return bool true if a content type header exists with the given content type.
+     */
+    private function hasContentType($contentType)
+    {
+        foreach ($this->getHeader('Content-Type') as $key => $value) {
+            if (substr($value, 0, strlen($contentType)) == $contentType) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Set the parsed body.
+     *
+     * @param null|array|object $parsedBody
+     * @return $this
+     */
+    private function setParsedBody($parsedBody)
+    {
+        $this->parsedBody = $parsedBody;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withParsedBody($parsedBody)
+    {
+        $result = clone $this;
+
+        return $result->setParsedBody($parsedBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAttribute($name, $default = null)
+    {
+        return isset($this->attributes[$name]) ? $this->attributes[$name] : $default;
+    }
+
+    /**
+     * Set the attribute.
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return $this
+     */
+    private function setAttribute($name, $value)
+    {
+        $this->attributes[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withAttribute($name, $value)
+    {
+        $result = clone $this;
+
+        return $result->setAttribute($name, $value);
+    }
+
+    /**
+     * Remove the attribute.
+     *
+     * @param string $name
+     * @return $this
+     */
+    private function removeAttribute($name)
+    {
+        unset($this->attributes[$name]);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withoutAttribute($name)
+    {
+        $result = clone $this;
+
+        return $result->removeAttribute($name);
+    }
 }

src/Request.php

Indentation +137 added lines, -137 removed lines

@@ -22,141 +22,141 @@
  */
 class Request extends Message implements RequestInterface
 {
-	/** @var string The request target. */
-	private $requestTarget;
-
-	/** @var string The method. */
-	private $method;
-
-	/** @var UriInterface The URI. */
-	private $uri;
-
-	/**
-	 * Construct a Request object with the given method, uri, version, headers & body.
-	 *
-	 * @param string $method
-	 * @param UriInterface $uri
-	 * @param string $version = self::DEFAULT_VERSION
-	 * @param array $headers = []
-	 * @param StreamInterface|null $body = null
-	 */
-	public function __construct($method, UriInterface $uri, $version = self::DEFAULT_VERSION, array $headers = [], StreamInterface $body = null)
-	{
-		parent::__construct($version, $headers, $body);
-
-		$this->setMethod($method);
-		$this->setUri($uri);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getRequestTarget()
-	{
-		if (isset($this->requestTarget)) {
-			return $this->requestTarget;
-		}
-
-		$result = $this->getUri()->getPath() ?: URI::DELIMITER_PATH;
-
-		if ($this->getUri()->getQuery()) {
-			$result .= URI::DELIMITER_QUERY . $this->getUri()->getQuery();
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Set the request target.
-	 *
-	 * @param string $requestTarget
-	 * @return $this
-	 */
-	private function setRequestTarget($requestTarget)
-	{
-		$this->requestTarget = $requestTarget;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withRequestTarget($requestTarget)
-	{
-		$result = clone $this;
-
-		return $result->setRequestTarget($requestTarget);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getMethod()
-	{
-		return $this->method;
-	}
-
-	/**
-	 * Set the method.
-	 *
-	 * @param string $method
-	 * @return $this
-	 */
-	private function setMethod($method)
-	{
-		$this->method = $method;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withMethod($method)
-	{
-		$result = clone $this;
-
-		return $result->setMethod($method);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getUri()
-	{
-		return $this->uri;
-	}
-
-	/**
-	 * Set the uri.
-	 *
-	 * @param UriInterface $uri
-	 * @param bool $preserveHost = false
-	 * @return $this
-	 */
-	private function setUri(UriInterface $uri, $preserveHost = false)
-	{
-		$this->uri = $uri;
-
-		if (!$preserveHost && ($host = $uri->getHost())) {
-			if ($uri->getPort() !== null) {
-				$host .= URI::DELIMITER_PORT . $uri->getPort();
-			}
-
-			$this->setHeader('Host', $host);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withUri(UriInterface $uri, $preserveHost = false)
-	{
-		$result = clone $this;
-
-		return $result->setUri($uri, $preserveHost);
-	}
+    /** @var string The request target. */
+    private $requestTarget;
+
+    /** @var string The method. */
+    private $method;
+
+    /** @var UriInterface The URI. */
+    private $uri;
+
+    /**
+     * Construct a Request object with the given method, uri, version, headers & body.
+     *
+     * @param string $method
+     * @param UriInterface $uri
+     * @param string $version = self::DEFAULT_VERSION
+     * @param array $headers = []
+     * @param StreamInterface|null $body = null
+     */
+    public function __construct($method, UriInterface $uri, $version = self::DEFAULT_VERSION, array $headers = [], StreamInterface $body = null)
+    {
+        parent::__construct($version, $headers, $body);
+
+        $this->setMethod($method);
+        $this->setUri($uri);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRequestTarget()
+    {
+        if (isset($this->requestTarget)) {
+            return $this->requestTarget;
+        }
+
+        $result = $this->getUri()->getPath() ?: URI::DELIMITER_PATH;
+
+        if ($this->getUri()->getQuery()) {
+            $result .= URI::DELIMITER_QUERY . $this->getUri()->getQuery();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Set the request target.
+     *
+     * @param string $requestTarget
+     * @return $this
+     */
+    private function setRequestTarget($requestTarget)
+    {
+        $this->requestTarget = $requestTarget;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withRequestTarget($requestTarget)
+    {
+        $result = clone $this;
+
+        return $result->setRequestTarget($requestTarget);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * Set the method.
+     *
+     * @param string $method
+     * @return $this
+     */
+    private function setMethod($method)
+    {
+        $this->method = $method;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withMethod($method)
+    {
+        $result = clone $this;
+
+        return $result->setMethod($method);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getUri()
+    {
+        return $this->uri;
+    }
+
+    /**
+     * Set the uri.
+     *
+     * @param UriInterface $uri
+     * @param bool $preserveHost = false
+     * @return $this
+     */
+    private function setUri(UriInterface $uri, $preserveHost = false)
+    {
+        $this->uri = $uri;
+
+        if (!$preserveHost && ($host = $uri->getHost())) {
+            if ($uri->getPort() !== null) {
+                $host .= URI::DELIMITER_PORT . $uri->getPort();
+            }
+
+            $this->setHeader('Host', $host);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withUri(UriInterface $uri, $preserveHost = false)
+    {
+        $result = clone $this;
+
+        return $result->setUri($uri, $preserveHost);
+    }
 }

src/Session.php

Indentation +147 added lines, -147 removed lines

@@ -19,151 +19,151 @@
  */
 class Session implements \IteratorAggregate
 {
-	use SingletonTrait;
-
-	/** @var array The session. */
-	private $session;
-
-	/**
-	 * Construct a Sesssion object.
-	 *
-	 * @global array $_SESSION The session parameters.
-	 */
-	protected function __construct()
-	{
-		$this->session = &$_SESSION;
-	}
-
-	/**
-	 * Initialize the session, if none exists.
-	 *
-	 * @param $name = null
-	 * @return null
-	 * @throws \RuntimeException on failure.
-	 */
-	public static function start($name = null)
-	{
-		if (session_status() !== PHP_SESSION_NONE) {
-			throw new \RuntimeException('Can\'t start a new session.');
-		}
-
-		if ($name !== null) {
-			session_name($name);
-		}
-
-		session_start();
-	}
-
-	/**
-	 * Destroy the session, if one exists.
-	 *
-	 * @return null
-	 * @throws \RuntimeException on failure.
-	 */
-	public static function destroy()
-	{
-		if (session_status() !== PHP_SESSION_ACTIVE) {
-			throw new \RuntimeException('Can\'t destroy the session. There is no active session.');
-		}
-
-		if (!session_destroy()) {
-			throw new \RuntimeException('Failed to destroy the active session.');
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getIterator()
-	{
-		return new \ArrayIterator(static::getInstance()->session);
-	}
-
-	/**
-	 * Returns the number of key-value mappings in the session map.
-	 *
-	 * @return int the number of key-value mappings in the session map.
-	 */
-	public static function count()
-	{
-		return count(static::getInstance()->session);
-	}
-
-	/**
-	 * Returns true if the session map contains no key-value mappings.
-	 *
-	 * @return bool true if the session map contains no key-value mappings.
-	 */
-	public static function isEmpty()
-	{
-		return empty(static::getInstance()->session);
-	}
-
-	/**
-	 * Returns true if the session map contains a mapping for the specified key.
-	 *
-	 * @param string $key
-	 * @return bool true if the session map contains a mapping for the specified key.
-	 */
-	public static function containsKey($key)
-	{
-		return isset(static::getInstance()->session[$key]);
-	}
-
-	/**
-	 * Returns true if the session map maps one or more keys to the specified value.
-	 *
-	 * @param string $value
-	 * @return bool true if the session map maps one or more keys to the specified value.
-	 */
-	public static function containsValue($value)
-	{
-		return in_array($value, static::getInstance()->session);
-	}
-
-	/**
-	 * Returns the value to which the specified key is mapped, or null if the session map contains no mapping for the key.
-	 *
-	 * @param string $key
-	 * @return string|null the value to which the specified key is mapped, or null if the session map contains no mapping for the key.
-	 */
-	public static function get($key)
-	{
-		return static::containsKey($key) ? static::getInstance()->session[$key] : null;
-	}
-
-	/**
-	 * Associates the specified value with the specified key in the session map.
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @return null
-	 */
-	public static function set($key, $value)
-	{
-		static::getInstance()->session[$key] = $value;
-	}
-
-	/**
-	 * Removes the mapping for the specified key from the session map if present.
-	 *
-	 * @param string $key
-	 * @return null
-	 */
-	public static function remove($key)
-	{
-		if (static::containsKey($key)) {
-			unset(static::getInstance()->session[$key]);
-		}
-	}
-
-	/**
-	 * Removes all of the mappings from the session map.
-	 *
-	 * @return null
-	 */
-	public static function clear()
-	{
-		static::getInstance()->session = [];
-	}
+    use SingletonTrait;
+
+    /** @var array The session. */
+    private $session;
+
+    /**
+     * Construct a Sesssion object.
+     *
+     * @global array $_SESSION The session parameters.
+     */
+    protected function __construct()
+    {
+        $this->session = &$_SESSION;
+    }
+
+    /**
+     * Initialize the session, if none exists.
+     *
+     * @param $name = null
+     * @return null
+     * @throws \RuntimeException on failure.
+     */
+    public static function start($name = null)
+    {
+        if (session_status() !== PHP_SESSION_NONE) {
+            throw new \RuntimeException('Can\'t start a new session.');
+        }
+
+        if ($name !== null) {
+            session_name($name);
+        }
+
+        session_start();
+    }
+
+    /**
+     * Destroy the session, if one exists.
+     *
+     * @return null
+     * @throws \RuntimeException on failure.
+     */
+    public static function destroy()
+    {
+        if (session_status() !== PHP_SESSION_ACTIVE) {
+            throw new \RuntimeException('Can\'t destroy the session. There is no active session.');
+        }
+
+        if (!session_destroy()) {
+            throw new \RuntimeException('Failed to destroy the active session.');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator(static::getInstance()->session);
+    }
+
+    /**
+     * Returns the number of key-value mappings in the session map.
+     *
+     * @return int the number of key-value mappings in the session map.
+     */
+    public static function count()
+    {
+        return count(static::getInstance()->session);
+    }
+
+    /**
+     * Returns true if the session map contains no key-value mappings.
+     *
+     * @return bool true if the session map contains no key-value mappings.
+     */
+    public static function isEmpty()
+    {
+        return empty(static::getInstance()->session);
+    }
+
+    /**
+     * Returns true if the session map contains a mapping for the specified key.
+     *
+     * @param string $key
+     * @return bool true if the session map contains a mapping for the specified key.
+     */
+    public static function containsKey($key)
+    {
+        return isset(static::getInstance()->session[$key]);
+    }
+
+    /**
+     * Returns true if the session map maps one or more keys to the specified value.
+     *
+     * @param string $value
+     * @return bool true if the session map maps one or more keys to the specified value.
+     */
+    public static function containsValue($value)
+    {
+        return in_array($value, static::getInstance()->session);
+    }
+
+    /**
+     * Returns the value to which the specified key is mapped, or null if the session map contains no mapping for the key.
+     *
+     * @param string $key
+     * @return string|null the value to which the specified key is mapped, or null if the session map contains no mapping for the key.
+     */
+    public static function get($key)
+    {
+        return static::containsKey($key) ? static::getInstance()->session[$key] : null;
+    }
+
+    /**
+     * Associates the specified value with the specified key in the session map.
+     *
+     * @param string $key
+     * @param string $value
+     * @return null
+     */
+    public static function set($key, $value)
+    {
+        static::getInstance()->session[$key] = $value;
+    }
+
+    /**
+     * Removes the mapping for the specified key from the session map if present.
+     *
+     * @param string $key
+     * @return null
+     */
+    public static function remove($key)
+    {
+        if (static::containsKey($key)) {
+            unset(static::getInstance()->session[$key]);
+        }
+    }
+
+    /**
+     * Removes all of the mappings from the session map.
+     *
+     * @return null
+     */
+    public static function clear()
+    {
+        static::getInstance()->session = [];
+    }
 }