miBadger / miBadger.Http

src/Message.php

Indentation +244 added lines, -244 removed lines

@@ -21,248 +21,248 @@
  */
 class Message implements MessageInterface
 {
-	const DEFAULT_VERSION = '1.1';
-	const VERSION_DELIMITER = 'HTTP/';
-	const HEADER_DELIMITER = ': ';
-	const HEADER_VALUE_DELIMITER = ',';
-
-	/** @var string The version. */
-	private $version;
-
-	/** @var array The header names. */
-	private $headerNames;
-
-	/** @var array The headers. */
-	private $headers;
-
-	/** @var StreamInterface The body. */
-	private $body;
-
-	/**
-	 * Construct a Message object with the given version, headers & body.
-	 *
-	 * @param string $version = self::DEFAULT_VERSION
-	 * @param array $headers = []
-	 * @param StreamInterface|null $body = null
-	 */
-	public function __construct($version = self::DEFAULT_VERSION, array $headers = [], StreamInterface $body = null)
-	{
-		if ($body === null) {
-			$body = new Stream(fopen('php://temp', 'r+'));
-		}
-
-		$this->setProtocolVersion($version);
-		$this->setHeaders($headers);
-		$this->setBody($body);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getProtocolVersion()
-	{
-		return $this->version;
-	}
-
-	/**
-	 * Set the protocol version.
-	 *
-	 * @param string $version
-	 * @return $this
-	 */
-	private function setProtocolVersion($version)
-	{
-		$this->version = $version;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withProtocolVersion($version)
-	{
-		$result = clone $this;
-
-		return $result->setProtocolVersion($version);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getHeaders()
-	{
-		return $this->headers;
-	}
-
-	/**
-	 * Set the headers.
-	 *
-	 * @param array $headers
-	 * @return $this
-	 */
-	private function setHeaders(array $headers)
-	{
-		$this->headerNames = [];
-		$this->headers = [];
-
-		foreach ($headers as $name => $value) {
-			$this->setHeader($name, $value);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function hasHeader($name)
-	{
-		return array_key_exists(strtolower($name), $this->headerNames);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getHeader($name)
-	{
-		if (!$this->hasHeader($name)) {
-			return [];
-		}
-
-		return $this->headers[$this->headerNames[strtolower($name)]];
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getHeaderLine($name)
-	{
-		if (!$this->hasHeader($name)) {
-			return null;
-		}
-
-		return implode(',', $this->getHeader($name));
-	}
-
-	/**
-	 * Set the header.
-	 *
-	 * @param string $name
-	 * @param string|string[] $value
-	 * @return $this
-	 */
-	protected function setHeader($name, $value)
-	{
-		if (!is_array($value)) {
-			$value = [$value];
-		}
-
-		$this->headerNames[strtolower($name)] = $name;
-		array_merge($this->headers[$name] = $value);
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withHeader($name, $value)
-	{
-		$result = clone $this;
-
-		return $result->setHeader($name, $value);
-	}
-
-	/**
-	 * Add the header.
-	 *
-	 * @param string $name
-	 * @param string|string[] $value
-	 * @return $this
-	 */
-	private function addHeader($name, $value)
-	{
-		if (!$this->hasHeader($name)) {
-			return $this->setHeader($name, $value);
-		}
-
-		if (!is_array($value)) {
-			$value = [$value];
-		}
-
-		foreach ($value as $element) {
-			$this->headers[$this->headerNames[strtolower($name)]][] = $element;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withAddedHeader($name, $value)
-	{
-		$result = clone $this;
-
-		return $result->addHeader($name, $value);
-	}
-
-	/**
-	 * Remove the header.
-	 *
-	 * @param string $name
-	 * @return $this
-	 */
-	private function removeHeader($name)
-	{
-		if ($this->hasHeader($name)) {
-			$normalized = strtolower($name);
-
-			unset($this->headers[$this->headerNames[$normalized]], $this->headerNames[$normalized]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withoutHeader($name)
-	{
-		$result = clone $this;
-
-		return $result->removeHeader($name);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getBody()
-	{
-		return $this->body;
-	}
-
-	/**
-	 * Sets the body.
-	 *
-	 * @param StreamInterface $body
-	 * @return $this
-	 */
-	private function setBody(StreamInterface $body)
-	{
-		$this->body = $body;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withBody(StreamInterface $body)
-	{
-		$result = clone $this;
-
-		return $result->setBody($body);
-	}
+    const DEFAULT_VERSION = '1.1';
+    const VERSION_DELIMITER = 'HTTP/';
+    const HEADER_DELIMITER = ': ';
+    const HEADER_VALUE_DELIMITER = ',';
+
+    /** @var string The version. */
+    private $version;
+
+    /** @var array The header names. */
+    private $headerNames;
+
+    /** @var array The headers. */
+    private $headers;
+
+    /** @var StreamInterface The body. */
+    private $body;
+
+    /**
+     * Construct a Message object with the given version, headers & body.
+     *
+     * @param string $version = self::DEFAULT_VERSION
+     * @param array $headers = []
+     * @param StreamInterface|null $body = null
+     */
+    public function __construct($version = self::DEFAULT_VERSION, array $headers = [], StreamInterface $body = null)
+    {
+        if ($body === null) {
+            $body = new Stream(fopen('php://temp', 'r+'));
+        }
+
+        $this->setProtocolVersion($version);
+        $this->setHeaders($headers);
+        $this->setBody($body);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getProtocolVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     * Set the protocol version.
+     *
+     * @param string $version
+     * @return $this
+     */
+    private function setProtocolVersion($version)
+    {
+        $this->version = $version;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withProtocolVersion($version)
+    {
+        $result = clone $this;
+
+        return $result->setProtocolVersion($version);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+    /**
+     * Set the headers.
+     *
+     * @param array $headers
+     * @return $this
+     */
+    private function setHeaders(array $headers)
+    {
+        $this->headerNames = [];
+        $this->headers = [];
+
+        foreach ($headers as $name => $value) {
+            $this->setHeader($name, $value);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasHeader($name)
+    {
+        return array_key_exists(strtolower($name), $this->headerNames);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHeader($name)
+    {
+        if (!$this->hasHeader($name)) {
+            return [];
+        }
+
+        return $this->headers[$this->headerNames[strtolower($name)]];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHeaderLine($name)
+    {
+        if (!$this->hasHeader($name)) {
+            return null;
+        }
+
+        return implode(',', $this->getHeader($name));
+    }
+
+    /**
+     * Set the header.
+     *
+     * @param string $name
+     * @param string|string[] $value
+     * @return $this
+     */
+    protected function setHeader($name, $value)
+    {
+        if (!is_array($value)) {
+            $value = [$value];
+        }
+
+        $this->headerNames[strtolower($name)] = $name;
+        array_merge($this->headers[$name] = $value);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withHeader($name, $value)
+    {
+        $result = clone $this;
+
+        return $result->setHeader($name, $value);
+    }
+
+    /**
+     * Add the header.
+     *
+     * @param string $name
+     * @param string|string[] $value
+     * @return $this
+     */
+    private function addHeader($name, $value)
+    {
+        if (!$this->hasHeader($name)) {
+            return $this->setHeader($name, $value);
+        }
+
+        if (!is_array($value)) {
+            $value = [$value];
+        }
+
+        foreach ($value as $element) {
+            $this->headers[$this->headerNames[strtolower($name)]][] = $element;
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withAddedHeader($name, $value)
+    {
+        $result = clone $this;
+
+        return $result->addHeader($name, $value);
+    }
+
+    /**
+     * Remove the header.
+     *
+     * @param string $name
+     * @return $this
+     */
+    private function removeHeader($name)
+    {
+        if ($this->hasHeader($name)) {
+            $normalized = strtolower($name);
+
+            unset($this->headers[$this->headerNames[$normalized]], $this->headerNames[$normalized]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withoutHeader($name)
+    {
+        $result = clone $this;
+
+        return $result->removeHeader($name);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * Sets the body.
+     *
+     * @param StreamInterface $body
+     * @return $this
+     */
+    private function setBody(StreamInterface $body)
+    {
+        $this->body = $body;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withBody(StreamInterface $body)
+    {
+        $result = clone $this;
+
+        return $result->setBody($body);
+    }
 }

src/Response.php

Indentation +116 added lines, -116 removed lines

@@ -21,131 +21,131 @@
  */
 class Response extends Message implements ResponseInterface
 {
-	/** @var int The status code. */
-	private $statusCode;
+    /** @var int The status code. */
+    private $statusCode;
 
-	/** @var string The reason phrase. */
-	private $reasonPhrase;
+    /** @var string The reason phrase. */
+    private $reasonPhrase;
 
-	/** @var array The reason phrases */
-	private static $reasonPhrases = [
-		100 => 'Continue',
-		101 => 'Switching Protocols',
-		102 => 'Processing',
-		200 => 'OK',
-		201 => 'Created',
-		202 => 'Accepted',
-		203 => 'Non-Authoritative Information',
-		204 => 'No Content',
-		205 => 'Reset Content',
-		206 => 'Partial Content',
-		207 => 'Multi-status',
-		208 => 'Already Reported',
-		300 => 'Multiple Choices',
-		301 => 'Moved Permanently',
-		302 => 'Found',
-		303 => 'See Other',
-		304 => 'Not Modified',
-		305 => 'Use Proxy',
-		306 => 'Switch Proxy',
-		307 => 'Temporary Redirect',
-		400 => 'Bad Request',
-		401 => 'Unauthorized',
-		402 => 'Payment Required',
-		403 => 'Forbidden',
-		404 => 'Not Found',
-		405 => 'Method Not Allowed',
-		406 => 'Not Acceptable',
-		407 => 'Proxy Authentication Required',
-		408 => 'Request Time-out',
-		409 => 'Conflict',
-		410 => 'Gone',
-		411 => 'Length Required',
-		412 => 'Precondition Failed',
-		413 => 'Request Entity Too Large',
-		414 => 'Request-URI Too Large',
-		415 => 'Unsupported Media Type',
-		416 => 'Requested range not satisfiable',
-		417 => 'Expectation Failed',
-		418 => 'I\'m a teapot',
-		422 => 'Unprocessable Entity',
-		423 => 'Locked',
-		424 => 'Failed Dependency',
-		425 => 'Unordered Collection',
-		426 => 'Upgrade Required',
-		428 => 'Precondition Required',
-		429 => 'Too Many Requests',
-		431 => 'Request Header Fields Too Large',
-		500 => 'Internal Server Error',
-		501 => 'Not Implemented',
-		502 => 'Bad Gateway',
-		503 => 'Service Unavailable',
-		504 => 'Gateway Time-out',
-		505 => 'HTTP Version not supported',
-		506 => 'Variant Also Negotiates',
-		507 => 'Insufficient Storage',
-		508 => 'Loop Detected',
-		511 => 'Network Authentication Required',
-	];
+    /** @var array The reason phrases */
+    private static $reasonPhrases = [
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing',
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+        207 => 'Multi-status',
+        208 => 'Already Reported',
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        306 => 'Switch Proxy',
+        307 => 'Temporary Redirect',
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Time-out',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Large',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested range not satisfiable',
+        417 => 'Expectation Failed',
+        418 => 'I\'m a teapot',
+        422 => 'Unprocessable Entity',
+        423 => 'Locked',
+        424 => 'Failed Dependency',
+        425 => 'Unordered Collection',
+        426 => 'Upgrade Required',
+        428 => 'Precondition Required',
+        429 => 'Too Many Requests',
+        431 => 'Request Header Fields Too Large',
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Time-out',
+        505 => 'HTTP Version not supported',
+        506 => 'Variant Also Negotiates',
+        507 => 'Insufficient Storage',
+        508 => 'Loop Detected',
+        511 => 'Network Authentication Required',
+    ];
 
-	/**
-	 * Construct a Response object with the given status code, reason phrase, version, headers & body.
-	 *
-	 * @param int $statusCode
-	 * @param string $reasonPhrase = ''
-	 * @param string $version = self::DEFAULT_VERSION
-	 * @param array $headers = []
-	 * @param StreamInterface|null $body = null
-	 */
-	public function __construct($statusCode, $reasonPhrase = '', $version = self::DEFAULT_VERSION, array $headers = [], StreamInterface $body = null)
-	{
-		parent::__construct($version, $headers, $body);
+    /**
+     * Construct a Response object with the given status code, reason phrase, version, headers & body.
+     *
+     * @param int $statusCode
+     * @param string $reasonPhrase = ''
+     * @param string $version = self::DEFAULT_VERSION
+     * @param array $headers = []
+     * @param StreamInterface|null $body = null
+     */
+    public function __construct($statusCode, $reasonPhrase = '', $version = self::DEFAULT_VERSION, array $headers = [], StreamInterface $body = null)
+    {
+        parent::__construct($version, $headers, $body);
 
-		$this->setStatus($statusCode, $reasonPhrase);
-	}
+        $this->setStatus($statusCode, $reasonPhrase);
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getStatusCode()
-	{
-		return $this->statusCode;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
 
-	/**
-	 * Set the status.
-	 *
-	 * @param int $statusCode
-	 * @param string $reasonPhrase = ''
-	 * @return $this
-	 */
-	private function setStatus($statusCode, $reasonPhrase = '')
-	{
-		if ($reasonPhrase === '' && isset(self::$reasonPhrases[$statusCode])) {
-			$reasonPhrase = self::$reasonPhrases[$statusCode];
-		}
+    /**
+     * Set the status.
+     *
+     * @param int $statusCode
+     * @param string $reasonPhrase = ''
+     * @return $this
+     */
+    private function setStatus($statusCode, $reasonPhrase = '')
+    {
+        if ($reasonPhrase === '' && isset(self::$reasonPhrases[$statusCode])) {
+            $reasonPhrase = self::$reasonPhrases[$statusCode];
+        }
 
-		$this->statusCode = $statusCode;
-		$this->reasonPhrase = $reasonPhrase;
+        $this->statusCode = $statusCode;
+        $this->reasonPhrase = $reasonPhrase;
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withStatus($statusCode, $reasonPhrase = '')
-	{
-		$result = clone $this;
+    /**
+     * {@inheritdoc}
+     */
+    public function withStatus($statusCode, $reasonPhrase = '')
+    {
+        $result = clone $this;
 
-		return $result->setStatus($statusCode, $reasonPhrase);
-	}
+        return $result->setStatus($statusCode, $reasonPhrase);
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getReasonPhrase()
-	{
-		return $this->reasonPhrase;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getReasonPhrase()
+    {
+        return $this->reasonPhrase;
+    }
 }

src/ServerResponseException.php

Indentation +22 added lines, -22 removed lines

@@ -17,29 +17,29 @@
  */
 class ServerResponseException extends \Exception
 {
-	/** @var ServerResponse The server response. */
-	private $serverResponse;
+    /** @var ServerResponse The server response. */
+    private $serverResponse;
 
-	/**
-	 * Contract a server response exception with the gieven server response.
-	 *
-	 * @param ServerResponse $serverResponse
-	 * @param \Exception|null $exception = null
-	 */
-	public function __construct(ServerResponse $serverResponse, \Exception $exception = null)
-	{
-		parent::__construct($serverResponse->getReasonPhrase(), $serverResponse->getStatusCode(), $exception);
+    /**
+     * Contract a server response exception with the gieven server response.
+     *
+     * @param ServerResponse $serverResponse
+     * @param \Exception|null $exception = null
+     */
+    public function __construct(ServerResponse $serverResponse, \Exception $exception = null)
+    {
+        parent::__construct($serverResponse->getReasonPhrase(), $serverResponse->getStatusCode(), $exception);
 
-		$this->serverResponse = $serverResponse;
-	}
+        $this->serverResponse = $serverResponse;
+    }
 
-	/**
-	 * Returns the server response.
-	 *
-	 * @return ServerResponse the server response.
-	 */
-	public function getServerResponse()
-	{
-		return $this->serverResponse;
-	}
+    /**
+     * Returns the server response.
+     *
+     * @return ServerResponse the server response.
+     */
+    public function getServerResponse()
+    {
+        return $this->serverResponse;
+    }
 }

src/UploadedFile.php

Indentation +71 added lines, -71 removed lines

@@ -20,86 +20,86 @@
  */
 class UploadedFile implements UploadedFileInterface
 {
-	/** @var string The name */
-	private $name;
+    /** @var string The name */
+    private $name;
 
-	/** @var string The type. */
-	private $type;
+    /** @var string The type. */
+    private $type;
 
-	/** @var string The tmp name. */
-	private $tmpName;
+    /** @var string The tmp name. */
+    private $tmpName;
 
-	/** @var int The error. */
-	private $error;
+    /** @var int The error. */
+    private $error;
 
-	/** @var int The size. */
-	private $size;
+    /** @var int The size. */
+    private $size;
 
-	/**
-	 * Construct a Stream object with the given name, type, tmp name, error and size.
-	 *
-	 * @param string $name
-	 * @param string $type
-	 * @param string $tmpName
-	 * @param int $error
-	 * @param int $size
-	 */
-	public function __construct($name, $type, $tmpName, $error, $size)
-	{
-		$this->name = $name;
-		$this->type = $type;
-		$this->tmpName = $tmpName;
-		$this->error = $error;
-		$this->size = $size;
-	}
+    /**
+     * Construct a Stream object with the given name, type, tmp name, error and size.
+     *
+     * @param string $name
+     * @param string $type
+     * @param string $tmpName
+     * @param int $error
+     * @param int $size
+     */
+    public function __construct($name, $type, $tmpName, $error, $size)
+    {
+        $this->name = $name;
+        $this->type = $type;
+        $this->tmpName = $tmpName;
+        $this->error = $error;
+        $this->size = $size;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getStream()
-	{
-		return new Stream(fopen($this->tmpName, 'r'));
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getStream()
+    {
+        return new Stream(fopen($this->tmpName, 'r'));
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function moveTo($targetPath)
-	{
-		if ($this->getError() != UPLOAD_ERR_OK || !is_uploaded_file($this->tmpName) || !move_uploaded_file($this->tmpName, $targetPath)) {
-			throw new \RuntimeException('Can\'t move the file');
-		}
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function moveTo($targetPath)
+    {
+        if ($this->getError() != UPLOAD_ERR_OK || !is_uploaded_file($this->tmpName) || !move_uploaded_file($this->tmpName, $targetPath)) {
+            throw new \RuntimeException('Can\'t move the file');
+        }
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getSize()
-	{
-		return $this->size;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getError()
-	{
-		return $this->error;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getClientFilename()
-	{
-		return $this->name;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getClientFilename()
+    {
+        return $this->name;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getClientMediaType()
-	{
-		return $this->type;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function getClientMediaType()
+    {
+        return $this->type;
+    }
 }

src/StatusCode.php

Indentation +57 added lines, -57 removed lines

@@ -19,61 +19,61 @@
  */
 class StatusCode extends Enum
 {
-	const INFORMATIONAL_CONTINUE = 100;
-	const INFORMATIONAL_SWITCHING_PROTOCOL = 101;
-	const INFORMATIONAL_PROGRESSING = 102;
-	const SUCCESFULL_OK = 200;
-	const SUCCESFULL_CREATED = 201;
-	const SUCCESFULL_ACCEPTED = 202;
-	const SUCCESFULL_NON_AUTORITATIVE_INFORMATION = 203;
-	const SUCCESFULL_NO_CONTENT = 204;
-	const SUCCESFULL_RESET_CONTENT = 205;
-	const SUCCESFULL_PARTIAL_CONTENT = 206;
-	const MULTI_STATUS = 207;
-	const ALREADY_REPORTED = 208;
-	const REDIRECTION_MULTIPLE_CHOICES = 300;
-	const REDIRECTION_MOVED_PERMANENTLY = 301;
-	const REDIRECTION_FOUND = 302;
-	const REDIRECTION_SEE_OTHER = 303;
-	const REDIRECTION_NOT_MODIFIED = 304;
-	const REDIRECTION_USE_PROXY = 305;
-	const SWITCH_PROXY = 306;
-	const REDIRECTION_TEMPORARY_REDIRECT = 307;
-	const ERROR_CLIENT_BAD_REQUEST = 400;
-	const ERROR_CLIENT_UNAUTHORIZED = 401;
-	const ERROR_CLIENT_PAYMENT_REQUIRED = 402;
-	const ERROR_CLIENT_FORBIDDEN = 403;
-	const ERROR_CLIENT_NOT_FOUND = 404;
-	const ERROR_CLIENT_METHOD_NOT_ALLOWED = 405;
-	const ERROR_CLIENT_NOT_ACCEPTABLE = 406;
-	const ERROR_CLIENT_PROXY_AUTHENTICATION_REQUIRED = 407;
-	const ERROR_CLIENT_REQUEST_TIME_OUT = 408;
-	const ERROR_CLIENT_CONFLICT = 409;
-	const ERROR_CLIENT_GONE = 410;
-	const ERROR_CLIENT_LENGTH_REQUIRED = 411;
-	const ERROR_CLIENT_PRECONDITION_FAILED = 412;
-	const ERROR_CLIENT_REQUEST_ENTITY_TOO_LARGE = 413;
-	const ERROR_CLIENT_REQUEST_URI_TOO_LONG = 414;
-	const ERROR_CLIENT_UNSUPPORTED_MEDIA = 415;
-	const ERROR_CLIENT_REQUEST_RANGE_NOT_SATISFIABLE = 416;
-	const ERROR_CLIENT_EXPECTATION_FAILED = 417;
-	const I_AM_A_TEAPOT = 418;
-	const UNPROCESSABLE_ENTITY = 422;
-	const LOCKED = 423;
-	const FAILED_DEPENDENCY = 424;
-	const UNORDERED_COLLECTION = 425;
-	const UPGRADE_REQUIRED = 426;
-	const PRECONDITION_REQUIRED = 428;
-	const TOO_MANY_REQUESTS = 429;
-	const REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
-	const ERROR_SERVER_INTERNAL_ERROR_SERVER = 500;
-	const ERROR_SERVER_NOT_IMPLEMENTED = 501;
-	const ERROR_SERVER_BAD_GATEWAY = 502;
-	const ERROR_SERVER_SERVICE_UNAVAILABLE = 503;
-	const ERROR_SERVER_GATEWAY_TIMEOUT = 504;
-	const ERROR_SERVER_HTTP_VERSION_NOT_SUPPORTED = 505;
-	const VARIANT_ALSO_NEGOTIATES = 506;
-	const INSUFFICIENT_STORAGE = 507;
-	const LOOP_DETECTED = 508;
-	const NETWORK_AUTHENTICATION_REQUIRED = 511;
+    const INFORMATIONAL_CONTINUE = 100;
+    const INFORMATIONAL_SWITCHING_PROTOCOL = 101;
+    const INFORMATIONAL_PROGRESSING = 102;
+    const SUCCESFULL_OK = 200;
+    const SUCCESFULL_CREATED = 201;
+    const SUCCESFULL_ACCEPTED = 202;
+    const SUCCESFULL_NON_AUTORITATIVE_INFORMATION = 203;
+    const SUCCESFULL_NO_CONTENT = 204;
+    const SUCCESFULL_RESET_CONTENT = 205;
+    const SUCCESFULL_PARTIAL_CONTENT = 206;
+    const MULTI_STATUS = 207;
+    const ALREADY_REPORTED = 208;
+    const REDIRECTION_MULTIPLE_CHOICES = 300;
+    const REDIRECTION_MOVED_PERMANENTLY = 301;
+    const REDIRECTION_FOUND = 302;
+    const REDIRECTION_SEE_OTHER = 303;
+    const REDIRECTION_NOT_MODIFIED = 304;
+    const REDIRECTION_USE_PROXY = 305;
+    const SWITCH_PROXY = 306;
+    const REDIRECTION_TEMPORARY_REDIRECT = 307;
+    const ERROR_CLIENT_BAD_REQUEST = 400;
+    const ERROR_CLIENT_UNAUTHORIZED = 401;
+    const ERROR_CLIENT_PAYMENT_REQUIRED = 402;
+    const ERROR_CLIENT_FORBIDDEN = 403;
+    const ERROR_CLIENT_NOT_FOUND = 404;
+    const ERROR_CLIENT_METHOD_NOT_ALLOWED = 405;
+    const ERROR_CLIENT_NOT_ACCEPTABLE = 406;
+    const ERROR_CLIENT_PROXY_AUTHENTICATION_REQUIRED = 407;
+    const ERROR_CLIENT_REQUEST_TIME_OUT = 408;
+    const ERROR_CLIENT_CONFLICT = 409;
+    const ERROR_CLIENT_GONE = 410;
+    const ERROR_CLIENT_LENGTH_REQUIRED = 411;
+    const ERROR_CLIENT_PRECONDITION_FAILED = 412;
+    const ERROR_CLIENT_REQUEST_ENTITY_TOO_LARGE = 413;
+    const ERROR_CLIENT_REQUEST_URI_TOO_LONG = 414;
+    const ERROR_CLIENT_UNSUPPORTED_MEDIA = 415;
+    const ERROR_CLIENT_REQUEST_RANGE_NOT_SATISFIABLE = 416;
+    const ERROR_CLIENT_EXPECTATION_FAILED = 417;
+    const I_AM_A_TEAPOT = 418;
+    const UNPROCESSABLE_ENTITY = 422;
+    const LOCKED = 423;
+    const FAILED_DEPENDENCY = 424;
+    const UNORDERED_COLLECTION = 425;
+    const UPGRADE_REQUIRED = 426;
+    const PRECONDITION_REQUIRED = 428;
+    const TOO_MANY_REQUESTS = 429;
+    const REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
+    const ERROR_SERVER_INTERNAL_ERROR_SERVER = 500;
+    const ERROR_SERVER_NOT_IMPLEMENTED = 501;
+    const ERROR_SERVER_BAD_GATEWAY = 502;
+    const ERROR_SERVER_SERVICE_UNAVAILABLE = 503;
+    const ERROR_SERVER_GATEWAY_TIMEOUT = 504;
+    const ERROR_SERVER_HTTP_VERSION_NOT_SUPPORTED = 505;
+    const VARIANT_ALSO_NEGOTIATES = 506;
+    const INSUFFICIENT_STORAGE = 507;
+    const LOOP_DETECTED = 508;
+    const NETWORK_AUTHENTICATION_REQUIRED = 511;
 }

src/Stream.php

Indentation +219 added lines, -219 removed lines

@@ -20,223 +20,223 @@
  */
 class Stream implements StreamInterface
 {
-	/** @var resource The resource. */
-	private $resource;
-
-	/** @var array The metadata. */
-	private $metadata;
-
-	/** @var string[] The read modes. */
-	private static $readModes = ['r', 'w+', 'r+', 'x+', 'c+', 'rb', 'w+b', 'r+b', 'x+b', 'c+b', 'rt', 'w+t', 'r+t', 'x+t', 'c+t', 'a+'];
-
-	/** @var string[] The write modes. */
-	private static $writeModes = ['w', 'w+', 'rw', 'r+', 'x+', 'c+', 'wb', 'w+b', 'r+b', 'x+b', 'c+b', 'w+t', 'r+t', 'x+t', 'c+t', 'a', 'a+'];
-
-	/**
-	 * Construct a Stream object with the given resource.
-	 *
-	 * @param resource $resource
-	 */
-	public function __construct($resource)
-	{
-		if (!is_resource($resource)) {
-			throw new \InvalidArgumentException('Invalid resource');
-		}
-
-		$this->resource = $resource;
-		$this->metadata = stream_get_meta_data($resource);
-	}
-
-	/**
-	 * Destruct the Stream object.
-	 */
-	public function __destruct()
-	{
-		$this->close();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function __toString()
-	{
-		try {
-			$this->seek(0);
-
-			return $this->getContents();
-		} catch (\Exception $e) {
-			return '';
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function close()
-	{
-		if (isset($this->resource)) {
-			if (is_resource($this->resource)) {
-				fclose($this->resource);
-			}
-
-			$this->detach();
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function detach()
-	{
-		if (!isset($this->resource)) {
-			return null;
-		}
-
-		$result = $this->resource;
-		unset($this->resource);
-
-		return $result;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getSize()
-	{
-		if (!isset($this->resource)) {
-			return null;
-		}
-
-		if ($this->getMetadata('uri')) {
-			clearstatcache(true, $this->getMetadata('uri'));
-		}
-
-		$stats = fstat($this->resource);
-
-		return isset($stats['size']) ? $stats['size'] : null;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function tell()
-	{
-		$result = ftell($this->resource);
-
-		if ($result === false) {
-			throw new \RuntimeException('Error while getting the position of the pointer');
-		}
-
-		return $result;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function eof()
-	{
-		return isset($this->resource) && feof($this->resource);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function isSeekable()
-	{
-		return isset($this->resource) && $this->getMetadata('seekable');
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function seek($offset, $whence = SEEK_SET)
-	{
-		if (!$this->isSeekable()) {
-			throw new \RuntimeException('Stream is not seekable');
-		}
-
-		if (fseek($this->resource, $offset, $whence) === false) {
-			throw new \RuntimeException('Error while seeking the stream');
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function rewind()
-	{
-		$this->seek(0);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function isWritable()
-	{
-		return isset($this->resource) && in_array($this->getMetadata('mode'), self::$writeModes);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function write($string)
-	{
-		if (!$this->isWritable()) {
-			throw new \RuntimeException('Stream is not writable');
-		}
-
-		$result = fwrite($this->resource, $string);
-
-		if ($result === false) {
-			throw new \RuntimeException('Error while writing the stream');
-		}
-
-		return $result;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function isReadable()
-	{
-		return isset($this->resource) && in_array($this->getMetadata('mode'), self::$readModes);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function read($length)
-	{
-		if (!$this->isReadable()) {
-			throw new \RuntimeException('Stream is not readable');
-		}
-
-		$result = stream_get_contents($this->resource, $length);
-
-		if ($result === false) {
-			throw new \RuntimeException('Error while reading the stream');
-		}
-
-		return $result;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getContents()
-	{
-		return $this->read(-1);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getMetadata($key = null)
-	{
-		if ($key === null) {
-			return $this->metadata;
-		}
-
-		return isset($this->metadata[$key]) ? $this->metadata[$key] : null;
-	}
+    /** @var resource The resource. */
+    private $resource;
+
+    /** @var array The metadata. */
+    private $metadata;
+
+    /** @var string[] The read modes. */
+    private static $readModes = ['r', 'w+', 'r+', 'x+', 'c+', 'rb', 'w+b', 'r+b', 'x+b', 'c+b', 'rt', 'w+t', 'r+t', 'x+t', 'c+t', 'a+'];
+
+    /** @var string[] The write modes. */
+    private static $writeModes = ['w', 'w+', 'rw', 'r+', 'x+', 'c+', 'wb', 'w+b', 'r+b', 'x+b', 'c+b', 'w+t', 'r+t', 'x+t', 'c+t', 'a', 'a+'];
+
+    /**
+     * Construct a Stream object with the given resource.
+     *
+     * @param resource $resource
+     */
+    public function __construct($resource)
+    {
+        if (!is_resource($resource)) {
+            throw new \InvalidArgumentException('Invalid resource');
+        }
+
+        $this->resource = $resource;
+        $this->metadata = stream_get_meta_data($resource);
+    }
+
+    /**
+     * Destruct the Stream object.
+     */
+    public function __destruct()
+    {
+        $this->close();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        try {
+            $this->seek(0);
+
+            return $this->getContents();
+        } catch (\Exception $e) {
+            return '';
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        if (isset($this->resource)) {
+            if (is_resource($this->resource)) {
+                fclose($this->resource);
+            }
+
+            $this->detach();
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function detach()
+    {
+        if (!isset($this->resource)) {
+            return null;
+        }
+
+        $result = $this->resource;
+        unset($this->resource);
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSize()
+    {
+        if (!isset($this->resource)) {
+            return null;
+        }
+
+        if ($this->getMetadata('uri')) {
+            clearstatcache(true, $this->getMetadata('uri'));
+        }
+
+        $stats = fstat($this->resource);
+
+        return isset($stats['size']) ? $stats['size'] : null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function tell()
+    {
+        $result = ftell($this->resource);
+
+        if ($result === false) {
+            throw new \RuntimeException('Error while getting the position of the pointer');
+        }
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function eof()
+    {
+        return isset($this->resource) && feof($this->resource);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isSeekable()
+    {
+        return isset($this->resource) && $this->getMetadata('seekable');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        if (!$this->isSeekable()) {
+            throw new \RuntimeException('Stream is not seekable');
+        }
+
+        if (fseek($this->resource, $offset, $whence) === false) {
+            throw new \RuntimeException('Error while seeking the stream');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        $this->seek(0);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isWritable()
+    {
+        return isset($this->resource) && in_array($this->getMetadata('mode'), self::$writeModes);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($string)
+    {
+        if (!$this->isWritable()) {
+            throw new \RuntimeException('Stream is not writable');
+        }
+
+        $result = fwrite($this->resource, $string);
+
+        if ($result === false) {
+            throw new \RuntimeException('Error while writing the stream');
+        }
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isReadable()
+    {
+        return isset($this->resource) && in_array($this->getMetadata('mode'), self::$readModes);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($length)
+    {
+        if (!$this->isReadable()) {
+            throw new \RuntimeException('Stream is not readable');
+        }
+
+        $result = stream_get_contents($this->resource, $length);
+
+        if ($result === false) {
+            throw new \RuntimeException('Error while reading the stream');
+        }
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getContents()
+    {
+        return $this->read(-1);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata($key = null)
+    {
+        if ($key === null) {
+            return $this->metadata;
+        }
+
+        return isset($this->metadata[$key]) ? $this->metadata[$key] : null;
+    }
 }

src/ServerRequest.php

Spacing +2 added lines, -2 removed lines

@@ -103,10 +103,10 @@
 		}
 
 		$scheme = isset($this->getServerParams()['HTTPS']) ? 'https://' : 'http://';
-		$host = isset($this->getServerParams()['HTTP_HOST']) ? $scheme . $this->getServerParams()['HTTP_HOST'] : '';
+		$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);
+		return new URI($host.$path);
 	}
 
 	/**

Indentation +406 added lines, -406 removed lines

@@ -21,410 +21,410 @@
  */
 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') || $this->hasContentType('text/plain')) {
-			return json_decode((string) $this->getBody(), true);
-		}
-		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 (mb_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') || $this->hasContentType('text/plain')) {
+            return json_decode((string) $this->getBody(), true);
+        }
+        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 (mb_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/URI.php

Spacing +7 added lines, -7 removed lines

@@ -132,7 +132,7 @@ 
 				$scheme = $this->getScheme();
 
 				if ($scheme) {
-					$result .= $scheme . static::DELIMITER_SCHEME;
+					$result .= $scheme.static::DELIMITER_SCHEME;
 				}
 
 				if ($end === static::SCHEME) {
@@ -146,7 +146,7 @@ 
 				$username = $this->getUserInfo();
 
 				if ($username && $this->getHost()) {
-					$result .= static::DELIMITER_AUTHORITY . $username . static::DELIMITER_USER;
+					$result .= static::DELIMITER_AUTHORITY.$username.static::DELIMITER_USER;
 				}
 
 				if ($end === static::USERNAME) {
@@ -174,7 +174,7 @@ 
 				$port = $this->getPort();
 
 				if ($port !== null && $this->getHost()) {
-					$result .= static::DELIMITER_PORT . $port;
+					$result .= static::DELIMITER_PORT.$port;
 				}
 
 				if ($end === static::PORT || $end === static::AUTHORITY) {
@@ -218,7 +218,7 @@ 
 				$query = $this->getQuery();
 
 				if ($query) {
-					$result .= static::DELIMITER_QUERY . $query;
+					$result .= static::DELIMITER_QUERY.$query;
 				}
 
 				if ($end === static::QUERY) {
@@ -231,7 +231,7 @@ 
 				$fragment = $this->getFragment();
 
 				if ($fragment) {
-					$result .= static::DELIMITER_FRAGMENT . $fragment;
+					$result .= static::DELIMITER_FRAGMENT.$fragment;
 				}
 
 				// no break
@@ -291,7 +291,7 @@ 
 		$result = $this->username;
 
 		if ($this->password !== null) {
-			$result .= static::DELIMITER_PASSWORD . $this->password;
+			$result .= static::DELIMITER_PASSWORD.$this->password;
 		}
 
 		return $result;
@@ -400,7 +400,7 @@ 
 			$result .= static::DELIMITER_PATH;
 		}
 
-		return $result . $this->getFile();
+		return $result.$this->getFile();
 	}
 
 	/**

Indentation +638 added lines, -638 removed lines

@@ -19,648 +19,648 @@
  */
 class URI implements UriInterface
 {
-	const DELIMITER_SCHEME = ':';
-	const DELIMITER_AUTHORITY = '//';
-	const DELIMITER_USER = '@';
-	const DELIMITER_PASSWORD = ':';
-	const DELIMITER_PORT = ':';
-	const DELIMITER_PATH = '/';
-	const DELIMITER_QUERY = '?';
-	const DELIMITER_QUERY_PAIR = '&';
-	const DELIMITER_QUERY_KEY_VALUE = '=';
-	const DELIMITER_FRAGMENT = '#';
-
-	const SCHEME = 'scheme';
-	const AUTHORITY = 'authority';
-	const USERNAME = 'user';
-	const PASSWORD = 'pass';
-	const HOST = 'host';
-	const PORT = 'port';
-	const PATH = 'path';
-	const DIRECTORY = 'directory';
-	const FILE = 'file';
-	const QUERY = 'query';
-	const FRAGMENT = 'fragment';
-
-	/** @var string The scheme. */
-	private $scheme;
-
-	/** @var string The username. */
-	private $username;
-
-	/** @var string|null The password. */
-	private $password;
-
-	/** @var string The host. */
-	private $host;
-
-	/** @var int|null The port. */
-	private $port;
-
-	/** @var string The directory. */
-	private $directory;
-
-	/** @var string The file. */
-	private $file;
-
-	/** @var array The query. */
-	private $query;
-
-	/** @var string The fragment. */
-	private $fragment;
-
-	/**
-	 * Construct a URI object with the given URI.
-	 *
-	 * @param string $uri
-	 * @throws \UnexpectedValueException
-	 */
-	public function __construct($uri)
-	{
-		$component = parse_url($uri);
-
-		if ($component === false) {
-			throw new \UnexpectedValueException('Invalid uri');
-		}
-
-		// Replace with the null coalescing in PHP7. E.g. $component[scheme] ?? ''
-		$component += [
-			static::SCHEME => '',
-			static::USERNAME => '',
-			static::PASSWORD => null,
-			static::HOST => '',
-			static::PORT => null,
-			static::PATH => '',
-			static::QUERY => '',
-			static::FRAGMENT => ''
-		];
-
-		$this->setScheme($component[static::SCHEME]);
-		$this->setUserInfo($component[static::USERNAME], $component[static::PASSWORD]);
-		$this->setHost($component[static::HOST]);
-		$this->setPort($component[static::PORT]);
-		$this->setPath($component[static::PATH]);
-		$this->setQuery($component[static::QUERY]);
-		$this->setFragment($component[static::FRAGMENT]);
-	}
-
-	/**
-	 * Returns a string representation of the URI object.
-	 *
-	 * @return string a string representation of the URI object.
-	 */
-	public function __toString()
-	{
-		return $this->getUri();
-	}
-
-	/**
-	 * Returns the URI with the given start and stop component.
-	 *
-	 * @param string $start = self::SCHEME
-	 * @param string $end = self::FRAGMENT
-	 * @return string the URI.
-	 */
-	public function getUri($start = self::SCHEME, $end = self::FRAGMENT)
-	{
-		$result = '';
-
-		switch ($start) {
-			default:
-			case static::SCHEME:
-				$scheme = $this->getScheme();
-
-				if ($scheme) {
-					$result .= $scheme . static::DELIMITER_SCHEME;
-				}
-
-				if ($end === static::SCHEME) {
-					break;
-				}
+    const DELIMITER_SCHEME = ':';
+    const DELIMITER_AUTHORITY = '//';
+    const DELIMITER_USER = '@';
+    const DELIMITER_PASSWORD = ':';
+    const DELIMITER_PORT = ':';
+    const DELIMITER_PATH = '/';
+    const DELIMITER_QUERY = '?';
+    const DELIMITER_QUERY_PAIR = '&';
+    const DELIMITER_QUERY_KEY_VALUE = '=';
+    const DELIMITER_FRAGMENT = '#';
+
+    const SCHEME = 'scheme';
+    const AUTHORITY = 'authority';
+    const USERNAME = 'user';
+    const PASSWORD = 'pass';
+    const HOST = 'host';
+    const PORT = 'port';
+    const PATH = 'path';
+    const DIRECTORY = 'directory';
+    const FILE = 'file';
+    const QUERY = 'query';
+    const FRAGMENT = 'fragment';
+
+    /** @var string The scheme. */
+    private $scheme;
+
+    /** @var string The username. */
+    private $username;
+
+    /** @var string|null The password. */
+    private $password;
+
+    /** @var string The host. */
+    private $host;
+
+    /** @var int|null The port. */
+    private $port;
+
+    /** @var string The directory. */
+    private $directory;
+
+    /** @var string The file. */
+    private $file;
+
+    /** @var array The query. */
+    private $query;
+
+    /** @var string The fragment. */
+    private $fragment;
+
+    /**
+     * Construct a URI object with the given URI.
+     *
+     * @param string $uri
+     * @throws \UnexpectedValueException
+     */
+    public function __construct($uri)
+    {
+        $component = parse_url($uri);
+
+        if ($component === false) {
+            throw new \UnexpectedValueException('Invalid uri');
+        }
+
+        // Replace with the null coalescing in PHP7. E.g. $component[scheme] ?? ''
+        $component += [
+            static::SCHEME => '',
+            static::USERNAME => '',
+            static::PASSWORD => null,
+            static::HOST => '',
+            static::PORT => null,
+            static::PATH => '',
+            static::QUERY => '',
+            static::FRAGMENT => ''
+        ];
+
+        $this->setScheme($component[static::SCHEME]);
+        $this->setUserInfo($component[static::USERNAME], $component[static::PASSWORD]);
+        $this->setHost($component[static::HOST]);
+        $this->setPort($component[static::PORT]);
+        $this->setPath($component[static::PATH]);
+        $this->setQuery($component[static::QUERY]);
+        $this->setFragment($component[static::FRAGMENT]);
+    }
+
+    /**
+     * Returns a string representation of the URI object.
+     *
+     * @return string a string representation of the URI object.
+     */
+    public function __toString()
+    {
+        return $this->getUri();
+    }
+
+    /**
+     * Returns the URI with the given start and stop component.
+     *
+     * @param string $start = self::SCHEME
+     * @param string $end = self::FRAGMENT
+     * @return string the URI.
+     */
+    public function getUri($start = self::SCHEME, $end = self::FRAGMENT)
+    {
+        $result = '';
+
+        switch ($start) {
+            default:
+            case static::SCHEME:
+                $scheme = $this->getScheme();
+
+                if ($scheme) {
+                    $result .= $scheme . static::DELIMITER_SCHEME;
+                }
+
+                if ($end === static::SCHEME) {
+                    break;
+                }
 
-				// no break
+                // no break
 
-			case static::AUTHORITY:
-			case static::USERNAME:
-				$username = $this->getUserInfo();
+            case static::AUTHORITY:
+            case static::USERNAME:
+                $username = $this->getUserInfo();
 
-				if ($username && $this->getHost()) {
-					$result .= static::DELIMITER_AUTHORITY . $username . static::DELIMITER_USER;
-				}
+                if ($username && $this->getHost()) {
+                    $result .= static::DELIMITER_AUTHORITY . $username . static::DELIMITER_USER;
+                }
 
-				if ($end === static::USERNAME) {
-					break;
-				}
-
-				// no break
-
-			case static::HOST:
-				$host = $this->getHost();
-
-				if ($host && ($result === '' || !$this->getUserInfo())) {
-					$result .= static::DELIMITER_AUTHORITY;
-				}
-
-				$result .= $host;
-
-				if ($end === static::HOST) {
-					break;
-				}
-
-				// no break
-
-			case static::PORT:
-				$port = $this->getPort();
-
-				if ($port !== null && $this->getHost()) {
-					$result .= static::DELIMITER_PORT . $port;
-				}
-
-				if ($end === static::PORT || $end === static::AUTHORITY) {
-					break;
-				}
-
-				// no break
-
-			case static::PATH:
-			case static::DIRECTORY:
-				$directory = $this->getDirectory();
-
-				if ($result !== '' && $directory !== '' && mb_substr($directory, 0, 1) !== static::DELIMITER_PATH) {
-					$result .= static::DELIMITER_PATH;
-				}
-
-				$result .= $directory;
-
-				if ($end === static::DIRECTORY) {
-					break;
-				}
-
-				// no break
-
-			case static::FILE:
-				$file = $this->getFile();
-
-				if ($result !== '' && mb_substr($result, -1) !== static::DELIMITER_PATH && $file !== '') {
-					$result .= static::DELIMITER_PATH;
-				}
-
-				$result .= $this->getFile();
-
-				if ($end === static::FILE || $end === static::PATH) {
-					break;
-				}
-
-				// no break
-
-			case static::QUERY:
-				$query = $this->getQuery();
-
-				if ($query) {
-					$result .= static::DELIMITER_QUERY . $query;
-				}
-
-				if ($end === static::QUERY) {
-					break;
-				}
+                if ($end === static::USERNAME) {
+                    break;
+                }
+
+                // no break
+
+            case static::HOST:
+                $host = $this->getHost();
+
+                if ($host && ($result === '' || !$this->getUserInfo())) {
+                    $result .= static::DELIMITER_AUTHORITY;
+                }
+
+                $result .= $host;
+
+                if ($end === static::HOST) {
+                    break;
+                }
+
+                // no break
+
+            case static::PORT:
+                $port = $this->getPort();
+
+                if ($port !== null && $this->getHost()) {
+                    $result .= static::DELIMITER_PORT . $port;
+                }
+
+                if ($end === static::PORT || $end === static::AUTHORITY) {
+                    break;
+                }
+
+                // no break
+
+            case static::PATH:
+            case static::DIRECTORY:
+                $directory = $this->getDirectory();
+
+                if ($result !== '' && $directory !== '' && mb_substr($directory, 0, 1) !== static::DELIMITER_PATH) {
+                    $result .= static::DELIMITER_PATH;
+                }
+
+                $result .= $directory;
+
+                if ($end === static::DIRECTORY) {
+                    break;
+                }
+
+                // no break
+
+            case static::FILE:
+                $file = $this->getFile();
+
+                if ($result !== '' && mb_substr($result, -1) !== static::DELIMITER_PATH && $file !== '') {
+                    $result .= static::DELIMITER_PATH;
+                }
+
+                $result .= $this->getFile();
+
+                if ($end === static::FILE || $end === static::PATH) {
+                    break;
+                }
+
+                // no break
+
+            case static::QUERY:
+                $query = $this->getQuery();
+
+                if ($query) {
+                    $result .= static::DELIMITER_QUERY . $query;
+                }
+
+                if ($end === static::QUERY) {
+                    break;
+                }
 
-				// no break
-
-			case static::FRAGMENT:
-				$fragment = $this->getFragment();
+                // no break
+
+            case static::FRAGMENT:
+                $fragment = $this->getFragment();
 
-				if ($fragment) {
-					$result .= static::DELIMITER_FRAGMENT . $fragment;
-				}
-
-				// no break
-		}
-
-		return $result;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getScheme()
-	{
-		return $this->scheme;
-	}
-
-	/**
-	 * Set the scheme.
-	 *
-	 * @param string $scheme
-	 * @return $this
-	 */
-	private function setScheme($scheme)
-	{
-		$this->scheme = strtolower($scheme);
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withScheme($scheme)
-	{
-		$result = clone $this;
-
-		return $result->setScheme($scheme);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getAuthority()
-	{
-		if (!$this->getHost()) {
-			return '';
-		}
-
-		return mb_substr($this->getUri(self::USERNAME, self::PORT), 2);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getUserInfo()
-	{
-		$result = $this->username;
-
-		if ($this->password !== null) {
-			$result .= static::DELIMITER_PASSWORD . $this->password;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Set the user info.
-	 *
-	 * @param string $username
-	 * @param string|null $password = null
-	 * @return $this
-	 */
-	private function setUserInfo($username, $password = null)
-	{
-		$this->username = $username;
-		$this->password = $password;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withUserInfo($username, $password = null)
-	{
-		$result = clone $this;
-
-		return $result->setUserInfo($username, $password);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getHost()
-	{
-		return $this->host;
-	}
-
-	/**
-	 * Set the host.
-	 *
-	 * @param string $host
-	 * @return $this
-	 */
-	private function setHost($host)
-	{
-		$this->host = strtolower($host);
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withHost($host)
-	{
-		$result = clone $this;
-
-		return $result->setHost($host);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getPort()
-	{
-		return $this->port;
-	}
-
-	/**
-	 * Set the port.
-	 *
-	 * @param int|null $port
-	 * @return $this
-	 * @throws \InvalidArgumentException
-	 */
-	private function setPort($port = null)
-	{
-		if ($port !== null && (1 > $port || 0xffff < $port)) {
-			throw new \InvalidArgumentException('Invalid port');
-		}
-
-		$this->port = $port;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withPort($port)
-	{
-		$result = clone $this;
-
-		return $result->setPort($port);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getPath()
-	{
-		$result = $this->getDirectory();
-
-		if ($result !== '' && mb_substr($result, -1) !== static::DELIMITER_PATH && $this->getFile()) {
-			$result .= static::DELIMITER_PATH;
-		}
-
-		return $result . $this->getFile();
-	}
-
-	/**
-	 * Set the path.
-	 *
-	 * @param string $path
-	 * @return $this
-	 */
-	private function setPath($path)
-	{
-		$directory = dirname($path);
-		$file = basename($path);
-
-		// If dirname is '.'. Then remove it.
-		if ($directory === '.') {
-			$directory = '';
-		}
-
-		// If the path ends with '/'. Then there is no file.
-		if (mb_substr($path, -1) === static::DELIMITER_PATH) {
-			$directory = $path;
-			$file = '';
-		}
-
-		// If the dirname and basename are both set. Then add the missing '/'.
-		if (mb_substr($directory, -1) !== static::DELIMITER_PATH && $directory !== '' && $file !== '') {
-			$directory .= static::DELIMITER_PATH;
-		}
-
-		$this->setDirectory($directory);
-		$this->setFile($file);
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withPath($path)
-	{
-		$result = clone $this;
-
-		return $result->setPath($path);
-	}
-
-	/**
-	 * Returns the URI segements
-	 *
-	 * @return string[] the URI segments
-	 */
-	public function getSegments()
-	{
-		// array_values reindexes the array and array_diff removes the empty elements.
-		return array_values(array_diff(explode(static::DELIMITER_PATH, $this->getPath()), ['']));
-	}
-
-	/**
-	 * Returns the segment at the given index or null if the segment at the given index doesn't exists.
-	 *
-	 * @param int $index
-	 * @return string|null the segment at the given index or null if the segment at the given index doesn't exists
-	 */
-	public function getSegment($index)
-	{
-		$result = $this->getSegments();
-
-		return isset($result[$index]) ? $result[$index] : null;
-	}
-
-	/**
-	 * Returns the directory.
-	 *
-	 * @return string the directory.
-	 */
-	public function getDirectory()
-	{
-		return $this->directory;
-	}
-
-	/**
-	 * Set the directory.
-	 *
-	 * @param string $directory
-	 * @return $this
-	 */
-	private function setDirectory($directory)
-	{
-		$this->directory = $directory;
-
-		return $this;
-	}
-
-	/**
-	 * Return an instance with the specified directory.
-	 *
-	 * @param string $directory
-	 * @return self
-	 */
-	public function withDirectory($directory)
-	{
-		$result = clone $this;
-
-		return $result->setDirectory($directory);
-	}
-
-	/**
-	 * Returns the file.
-	 *
-	 * @return string the file.
-	 */
-	public function getFile()
-	{
-		return $this->file;
-	}
-
-	/**
-	 * Set the file.
-	 *
-	 * @param string $file
-	 * @return $this
-	 */
-	private function setFile($file)
-	{
-		$this->file = $file;
-
-		return $this;
-	}
-
-	/**
-	 * Return an instance with the specified file.
-	 *
-	 * @param string $file
-	 * @return self
-	 */
-	public function withFile($file)
-	{
-		$result = clone $this;
-
-		return $result->setFile($file);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getQuery()
-	{
-		return http_build_query($this->query);
-	}
-
-	/**
-	 * Set the query.
-	 *
-	 * @param string $query
-	 * @return $this
-	 */
-	private function setQuery($query)
-	{
-		$this->query = [];
-
-		parse_str($query, $this->query);
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withQuery($query)
-	{
-		$result = clone $this;
-
-		return $result->setQuery($query);
-	}
-
-	/**
-	 * Returns the value to which the specified key is mapped, or null if the query map contains no mapping for the key.
-	 *
-	 * @param string $key
-	 * @return string the value to which the specified key is mapped, or null if the query map contains no mapping for the key.
-	 */
-	public function getQueryValue($key)
-	{
-		return isset($this->query[$key]) ? $this->query[$key] : null;
-	}
-
-	/**
-	 * Associates the specified value with the specified key in the query map.
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @return $this
-	 */
-	private function setQueryValue($key, $value)
-	{
-		$this->query[$key] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Return an instance with the specified query value.
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @return self
-	 */
-	public function withQueryValue($key, $value)
-	{
-		$result = clone $this;
-
-		return $result->setQueryValue($key, $value);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getFragment()
-	{
-		return $this->fragment;
-	}
-
-	/**
-	 * Set the fragment.
-	 *
-	 * @param string $fragment
-	 * @return $this
-	 */
-	private function setFragment($fragment)
-	{
-		$this->fragment = $fragment;
-
-		return $this;
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function withFragment($fragment)
-	{
-		$result = clone $this;
-
-		return $result->setFragment($fragment);
-	}
-
-	/**
-	 * Returns an instance with the decoded URI.
-	 *
-	 * @return self
-	 */
-	public function decode()
-	{
-		return new URI(html_entity_decode($this));
-	}
-
-	/**
-	 * Returns an instance with the encoded URI.
-	 *
-	 * @return self
-	 */
-	public function encode()
-	{
-		return new URI(htmlentities($this));
-	}
+                if ($fragment) {
+                    $result .= static::DELIMITER_FRAGMENT . $fragment;
+                }
+
+                // no break
+        }
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getScheme()
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * Set the scheme.
+     *
+     * @param string $scheme
+     * @return $this
+     */
+    private function setScheme($scheme)
+    {
+        $this->scheme = strtolower($scheme);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withScheme($scheme)
+    {
+        $result = clone $this;
+
+        return $result->setScheme($scheme);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthority()
+    {
+        if (!$this->getHost()) {
+            return '';
+        }
+
+        return mb_substr($this->getUri(self::USERNAME, self::PORT), 2);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getUserInfo()
+    {
+        $result = $this->username;
+
+        if ($this->password !== null) {
+            $result .= static::DELIMITER_PASSWORD . $this->password;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Set the user info.
+     *
+     * @param string $username
+     * @param string|null $password = null
+     * @return $this
+     */
+    private function setUserInfo($username, $password = null)
+    {
+        $this->username = $username;
+        $this->password = $password;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withUserInfo($username, $password = null)
+    {
+        $result = clone $this;
+
+        return $result->setUserInfo($username, $password);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    /**
+     * Set the host.
+     *
+     * @param string $host
+     * @return $this
+     */
+    private function setHost($host)
+    {
+        $this->host = strtolower($host);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withHost($host)
+    {
+        $result = clone $this;
+
+        return $result->setHost($host);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPort()
+    {
+        return $this->port;
+    }
+
+    /**
+     * Set the port.
+     *
+     * @param int|null $port
+     * @return $this
+     * @throws \InvalidArgumentException
+     */
+    private function setPort($port = null)
+    {
+        if ($port !== null && (1 > $port || 0xffff < $port)) {
+            throw new \InvalidArgumentException('Invalid port');
+        }
+
+        $this->port = $port;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withPort($port)
+    {
+        $result = clone $this;
+
+        return $result->setPort($port);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPath()
+    {
+        $result = $this->getDirectory();
+
+        if ($result !== '' && mb_substr($result, -1) !== static::DELIMITER_PATH && $this->getFile()) {
+            $result .= static::DELIMITER_PATH;
+        }
+
+        return $result . $this->getFile();
+    }
+
+    /**
+     * Set the path.
+     *
+     * @param string $path
+     * @return $this
+     */
+    private function setPath($path)
+    {
+        $directory = dirname($path);
+        $file = basename($path);
+
+        // If dirname is '.'. Then remove it.
+        if ($directory === '.') {
+            $directory = '';
+        }
+
+        // If the path ends with '/'. Then there is no file.
+        if (mb_substr($path, -1) === static::DELIMITER_PATH) {
+            $directory = $path;
+            $file = '';
+        }
+
+        // If the dirname and basename are both set. Then add the missing '/'.
+        if (mb_substr($directory, -1) !== static::DELIMITER_PATH && $directory !== '' && $file !== '') {
+            $directory .= static::DELIMITER_PATH;
+        }
+
+        $this->setDirectory($directory);
+        $this->setFile($file);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withPath($path)
+    {
+        $result = clone $this;
+
+        return $result->setPath($path);
+    }
+
+    /**
+     * Returns the URI segements
+     *
+     * @return string[] the URI segments
+     */
+    public function getSegments()
+    {
+        // array_values reindexes the array and array_diff removes the empty elements.
+        return array_values(array_diff(explode(static::DELIMITER_PATH, $this->getPath()), ['']));
+    }
+
+    /**
+     * Returns the segment at the given index or null if the segment at the given index doesn't exists.
+     *
+     * @param int $index
+     * @return string|null the segment at the given index or null if the segment at the given index doesn't exists
+     */
+    public function getSegment($index)
+    {
+        $result = $this->getSegments();
+
+        return isset($result[$index]) ? $result[$index] : null;
+    }
+
+    /**
+     * Returns the directory.
+     *
+     * @return string the directory.
+     */
+    public function getDirectory()
+    {
+        return $this->directory;
+    }
+
+    /**
+     * Set the directory.
+     *
+     * @param string $directory
+     * @return $this
+     */
+    private function setDirectory($directory)
+    {
+        $this->directory = $directory;
+
+        return $this;
+    }
+
+    /**
+     * Return an instance with the specified directory.
+     *
+     * @param string $directory
+     * @return self
+     */
+    public function withDirectory($directory)
+    {
+        $result = clone $this;
+
+        return $result->setDirectory($directory);
+    }
+
+    /**
+     * Returns the file.
+     *
+     * @return string the file.
+     */
+    public function getFile()
+    {
+        return $this->file;
+    }
+
+    /**
+     * Set the file.
+     *
+     * @param string $file
+     * @return $this
+     */
+    private function setFile($file)
+    {
+        $this->file = $file;
+
+        return $this;
+    }
+
+    /**
+     * Return an instance with the specified file.
+     *
+     * @param string $file
+     * @return self
+     */
+    public function withFile($file)
+    {
+        $result = clone $this;
+
+        return $result->setFile($file);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQuery()
+    {
+        return http_build_query($this->query);
+    }
+
+    /**
+     * Set the query.
+     *
+     * @param string $query
+     * @return $this
+     */
+    private function setQuery($query)
+    {
+        $this->query = [];
+
+        parse_str($query, $this->query);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withQuery($query)
+    {
+        $result = clone $this;
+
+        return $result->setQuery($query);
+    }
+
+    /**
+     * Returns the value to which the specified key is mapped, or null if the query map contains no mapping for the key.
+     *
+     * @param string $key
+     * @return string the value to which the specified key is mapped, or null if the query map contains no mapping for the key.
+     */
+    public function getQueryValue($key)
+    {
+        return isset($this->query[$key]) ? $this->query[$key] : null;
+    }
+
+    /**
+     * Associates the specified value with the specified key in the query map.
+     *
+     * @param string $key
+     * @param string $value
+     * @return $this
+     */
+    private function setQueryValue($key, $value)
+    {
+        $this->query[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Return an instance with the specified query value.
+     *
+     * @param string $key
+     * @param string $value
+     * @return self
+     */
+    public function withQueryValue($key, $value)
+    {
+        $result = clone $this;
+
+        return $result->setQueryValue($key, $value);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFragment()
+    {
+        return $this->fragment;
+    }
+
+    /**
+     * Set the fragment.
+     *
+     * @param string $fragment
+     * @return $this
+     */
+    private function setFragment($fragment)
+    {
+        $this->fragment = $fragment;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withFragment($fragment)
+    {
+        $result = clone $this;
+
+        return $result->setFragment($fragment);
+    }
+
+    /**
+     * Returns an instance with the decoded URI.
+     *
+     * @return self
+     */
+    public function decode()
+    {
+        return new URI(html_entity_decode($this));
+    }
+
+    /**
+     * Returns an instance with the encoded URI.
+     *
+     * @return self
+     */
+    public function encode()
+    {
+        return new URI(htmlentities($this));
+    }
 }

src/Request.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 		$result = $this->getUri()->getPath() ?: URI::DELIMITER_PATH;
 
 		if ($this->getUri()->getQuery()) {
-			$result .= URI::DELIMITER_QUERY . $this->getUri()->getQuery();
+			$result .= URI::DELIMITER_QUERY.$this->getUri()->getQuery();
 		}
 
 		return $result;
@@ -141,7 +141,7 @@ 
 
 		if (!$preserveHost && ($host = $uri->getHost())) {
 			if ($uri->getPort() !== null) {
-				$host .= URI::DELIMITER_PORT . $uri->getPort();
+				$host .= URI::DELIMITER_PORT.$uri->getPort();
 			}
 
 			$this->setHeader('Host', $host);

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);
+    }
 }