wip

.gitignore

@@ -0,0 +1,3 @@
+vendor/
+composer.phar
+composer.lock

api.php

@@ -7,7 +7,65 @@
 
 namespace Tqdev\PhpCrudApi;
 
-// file: src/Psr/Http/Message/MessageInterface.php
+// file: vendor/psr/http-factory/src/RequestFactoryInterface.php
+
+interface RequestFactoryInterface
+{
+    
+    public function createRequest(string $method, $uri): RequestInterface;
+}
+
+// file: vendor/psr/http-factory/src/ResponseFactoryInterface.php
+
+interface ResponseFactoryInterface
+{
+    
+    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface;
+}
+
+// file: vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
+
+interface ServerRequestFactoryInterface
+{
+    
+    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface;
+}
+
+// file: vendor/psr/http-factory/src/StreamFactoryInterface.php
+
+interface StreamFactoryInterface
+{
+    
+    public function createStream(string $content = ''): StreamInterface;
+
+    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface;
+
+    public function createStreamFromResource($resource): StreamInterface;
+}
+
+// file: vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
+
+interface UploadedFileFactoryInterface
+{
+    
+    public function createUploadedFile(
+        StreamInterface $stream,
+        int $size = null,
+        int $error = \UPLOAD_ERR_OK,
+        string $clientFilename = null,
+        string $clientMediaType = null
+    ): UploadedFileInterface;
+}
+
+// file: vendor/psr/http-factory/src/UriFactoryInterface.php
+
+interface UriFactoryInterface
+{
+    
+    public function createUri(string $uri = ''): UriInterface;
+}
+
+// file: vendor/psr/http-message/src/MessageInterface.php
 
 interface MessageInterface
 {
@@ -35,15 +93,7 @@ interface MessageInterface
     public function withBody(StreamInterface $body);
 }
 
-// file: src/Psr/Http/Message/RequestFactoryInterface.php
-
-interface RequestFactoryInterface
-{
-    
-    public function createRequest(string $method, $uri): RequestInterface;
-}
-
-// file: src/Psr/Http/Message/RequestInterface.php
+// file: vendor/psr/http-message/src/RequestInterface.php
 
 interface RequestInterface extends MessageInterface
 {
@@ -61,15 +111,7 @@ interface RequestInterface extends MessageInterface
     public function withUri(UriInterface $uri, $preserveHost = false);
 }
 
-// file: src/Psr/Http/Message/ResponseFactoryInterface.php
-
-interface ResponseFactoryInterface
-{
-    
-    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface;
-}
-
-// file: src/Psr/Http/Message/ResponseInterface.php
+// file: vendor/psr/http-message/src/ResponseInterface.php
 
 interface ResponseInterface extends MessageInterface
 {
@@ -81,15 +123,7 @@ interface ResponseInterface extends MessageInterface
     public function getReasonPhrase();
 }
 
-// file: src/Psr/Http/Message/ServerRequestFactoryInterface.php
-
-interface ServerRequestFactoryInterface
-{
-    
-    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface;
-}
-
-// file: src/Psr/Http/Message/ServerRequestInterface.php
+// file: vendor/psr/http-message/src/ServerRequestInterface.php
 
 interface ServerRequestInterface extends RequestInterface
 {
@@ -121,19 +155,7 @@ interface ServerRequestInterface extends RequestInterface
     public function withoutAttribute($name);
 }
 
-// file: src/Psr/Http/Message/StreamFactoryInterface.php
-
-interface StreamFactoryInterface
-{
-    
-    public function createStream(string $content = ''): StreamInterface;
-
-    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface;
-
-    public function createStreamFromResource($resource): StreamInterface;
-}
-
-// file: src/Psr/Http/Message/StreamInterface.php
+// file: vendor/psr/http-message/src/StreamInterface.php
 
 interface StreamInterface
 {
@@ -169,21 +191,7 @@ interface StreamInterface
     public function getMetadata($key = null);
 }
 
-// file: src/Psr/Http/Message/UploadedFileFactoryInterface.php
-
-interface UploadedFileFactoryInterface
-{
-    
-    public function createUploadedFile(
-        StreamInterface $stream,
-        int $size = null,
-        int $error = \UPLOAD_ERR_OK,
-        string $clientFilename = null,
-        string $clientMediaType = null
-    ): UploadedFileInterface;
-}
-
-// file: src/Psr/Http/Message/UploadedFileInterface.php
+// file: vendor/psr/http-message/src/UploadedFileInterface.php
 
 interface UploadedFileInterface
 {
@@ -201,15 +209,7 @@ interface UploadedFileInterface
     public function getClientMediaType();
 }
 
-// file: src/Psr/Http/Message/UriFactoryInterface.php
-
-interface UriFactoryInterface
-{
-    
-    public function createUri(string $uri = ''): UriInterface;
-}
-
-// file: src/Psr/Http/Message/UriInterface.php
+// file: vendor/psr/http-message/src/UriInterface.php
 
 interface UriInterface
 {
@@ -247,23 +247,23 @@ interface UriInterface
     public function __toString();
 }
 
-// file: src/Psr/Http/Server/MiddlewareInterface.php
+// file: vendor/psr/http-server-handler/src/RequestHandlerInterface.php
 
-interface MiddlewareInterface
+interface RequestHandlerInterface
 {
     
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface;
+    public function handle(ServerRequestInterface $request): ResponseInterface;
 }
 
-// file: src/Psr/Http/Server/RequestHandlerInterface.php
+// file: vendor/psr/http-server-middleware/src/MiddlewareInterface.php
 
-interface RequestHandlerInterface
+interface MiddlewareInterface
 {
     
-    public function handle(ServerRequestInterface $request): ResponseInterface;
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface;
 }
 
-// file: src/Nyholm/Psr7/Factory/Psr17Factory.php
+// file: vendor/nyholm/psr7/src/Factory/Psr17Factory.php
 
 final class Psr17Factory implements RequestFactoryInterface, ResponseFactoryInterface, ServerRequestFactoryInterface, StreamFactoryInterface, UploadedFileFactoryInterface, UriFactoryInterface
 {
@@ -321,7 +321,7 @@ final class Psr17Factory implements RequestFactoryInterface, ResponseFactoryInte
     }
 }
 
-// file: src/Nyholm/Psr7/MessageTrait.php
+// file: vendor/nyholm/psr7/src/MessageTrait.php
 
 trait MessageTrait
 {
@@ -486,7 +486,7 @@ trait MessageTrait
     }
 }
 
-// file: src/Nyholm/Psr7/Request.php
+// file: vendor/nyholm/psr7/src/Request.php
 
 final class Request implements RequestInterface
 {
@@ -514,7 +514,7 @@ final class Request implements RequestInterface
     }
 }
 
-// file: src/Nyholm/Psr7/RequestTrait.php
+// file: vendor/nyholm/psr7/src/RequestTrait.php
 
 trait RequestTrait
 {
@@ -611,7 +611,7 @@ trait RequestTrait
     }
 }
 
-// file: src/Nyholm/Psr7/Response.php
+// file: vendor/nyholm/psr7/src/Response.php
 
 final class Response implements ResponseInterface
 {
@@ -678,7 +678,7 @@ final class Response implements ResponseInterface
     }
 }
 
-// file: src/Nyholm/Psr7/ServerRequest.php
+// file: vendor/nyholm/psr7/src/ServerRequest.php
 
 final class ServerRequest implements ServerRequestInterface
 {
@@ -815,7 +815,7 @@ final class ServerRequest implements ServerRequestInterface
     }
 }
 
-// file: src/Nyholm/Psr7/Stream.php
+// file: vendor/nyholm/psr7/src/Stream.php
 
 final class Stream implements StreamInterface
 {
@@ -1042,7 +1042,7 @@ final class Stream implements StreamInterface
     }
 }
 
-// file: src/Nyholm/Psr7/UploadedFile.php
+// file: vendor/nyholm/psr7/src/UploadedFile.php
 
 final class UploadedFile implements UploadedFileInterface
 {
@@ -1184,7 +1184,7 @@ final class UploadedFile implements UploadedFileInterface
     }
 }
 
-// file: src/Nyholm/Psr7/Uri.php
+// file: vendor/nyholm/psr7/src/Uri.php
 
 final class Uri implements UriInterface
 {
@@ -1463,7 +1463,7 @@ final class Uri implements UriInterface
     }
 }
 
-// file: src/Nyholm/Psr7Server/ServerRequestCreator.php
+// file: vendor/nyholm/psr7-server/src/ServerRequestCreator.php
 
 final class ServerRequestCreator implements ServerRequestCreatorInterface
 {
@@ -1496,7 +1496,7 @@ final class ServerRequestCreator implements ServerRequestCreatorInterface
 
         $headers = \function_exists('getallheaders') ? getallheaders() : static::getHeadersFromServer($_SERVER);
 
-        return $this->fromArrays($server, $headers, $_COOKIE, $_GET, $_POST, $_FILES, \fopen('php://input', 'r') ?: null);
+        return $this->fromArrays($server, $headers, $_COOKIE, $_GET, $_POST, $_FILES, fopen('php://input', 'r') ?: null);
     }
 
     public function fromArrays(array $server, array $headers = [], array $cookie = [], array $get = [], array $post = [], array $files = [], $body = null): ServerRequestInterface
@@ -1649,20 +1649,16 @@ final class ServerRequestCreator implements ServerRequestCreatorInterface
             $uri = $uri->withScheme('on' === $server['HTTPS'] ? 'https' : 'http');
         }
 
-        if (isset($server['SERVER_PORT'])) {
-            $uri = $uri->withPort($server['SERVER_PORT']);
-        }
-
         if (isset($server['HTTP_HOST'])) {
-            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) {
-                $uri = $uri->withHost($matches[1])->withPort($matches[2]);
-            } else {
-                $uri = $uri->withHost($server['HTTP_HOST']);
-            }
+            $uri = $uri->withHost($server['HTTP_HOST']);
         } elseif (isset($server['SERVER_NAME'])) {
             $uri = $uri->withHost($server['SERVER_NAME']);
         }
 
+        if (isset($server['SERVER_PORT'])) {
+            $uri = $uri->withPort($server['SERVER_PORT']);
+        }
+
         if (isset($server['REQUEST_URI'])) {
             $uri = $uri->withPath(\current(\explode('?', $server['REQUEST_URI'])));
         }
@@ -1675,7 +1671,7 @@ final class ServerRequestCreator implements ServerRequestCreatorInterface
     }
 }
 
-// file: src/Nyholm/Psr7Server/ServerRequestCreatorInterface.php
+// file: vendor/nyholm/psr7-server/src/ServerRequestCreatorInterface.php
 
 interface ServerRequestCreatorInterface
 {
@@ -3466,7 +3462,7 @@ class GenericDB
     private $columns;
     private $converter;
 
-    private function getDsn(string $address, string $port, string $database): string
+    private function getDsn(string $address, int $port, string $database): string
     {
         switch ($this->driver) {
             case 'mysql':return "$this->driver:host=$address;port=$port;dbname=$database;charset=utf8mb4";
@@ -3514,7 +3510,7 @@ class GenericDB
         }
     }
 
-    public function __construct(string $driver, string $address, string $port, string $database, string $username, string $password)
+    public function __construct(string $driver, string $address, int $port, string $database, string $username, string $password)
     {
         $this->driver = $driver;
         $this->database = $database;

build.php

@@ -1,35 +1,42 @@
 <?php
 
-function prioritySort(string $dir, array $entries, array $priority): array
+function removeIgnored(string $dir, array &$entries, array $ignore)
 {
-    $result = array();
-    foreach ($priority as $file) {
-        if (dirname($file) == $dir) {
-            if (in_array(basename($file), $entries)) {
-                array_push($result, basename($file));
-            }
+    foreach ($entries as $i => $entry) {
+        if (isset($ignore[$dir . '/' . $entry])) {
+            unset($entries[$i]);
+        }
+    }
+}
+
+function prioritySort(string $dir, array &$entries, array $priority)
+{
+    $first = array();
+    foreach ($entries as $i => $entry) {
+        if (isset($priority[$dir . '/' . $entry])) {
+            array_push($first, $entry);
+            unset($entries[$i]);
         }
     }
-    $entries = array_diff($entries, $result);
     sort($entries);
-    foreach ($entries as $entry) {
-        array_push($result, $entry);
+    foreach ($first as $entry) {
+        array_unshift($entries, $entry);
     }
-    return $result;
 }
 
-function runDir(string $base, string $dir, array &$lines, array $priority): int
+function runDir(string $base, string $dir, array &$lines, array $ignore, array $priority): int
 {
     $count = 0;
     $entries = scandir($dir);
-    $entries = prioritySort($dir, $entries, $priority);
+    removeIgnored($dir, $entries, $ignore);
+    prioritySort($dir, $entries, $priority);
     foreach ($entries as $entry) {
         if ($entry === '.' || $entry === '..') {
             continue;
         }
         $filename = "$base/$dir/$entry";
         if (is_dir($filename)) {
-            $count += runDir($base, "$dir/$entry", $lines, $priority);
+            $count += runDir($base, "$dir/$entry", $lines, $ignore, $priority);
         }
     }
     foreach ($entries as $entry) {
@@ -70,12 +77,17 @@ EOF;
     }
 }
 
-function run(string $base, string $dir, string $filename, array $priority)
+function run(string $base, array $dirs, string $filename, array $ignore, array $priority)
 {
     $lines = [];
     $start = microtime(true);
     addHeader($lines);
-    $count = runDir($base, 'src', $lines, $priority);
+    $ignore = array_flip($ignore);
+    $priority = array_flip($priority);
+    $count = 0;
+    foreach ($dirs as $dir) {
+        $count += runDir($base, $dir, $lines, $ignore, $priority);
+    }
     $data = implode("\n", $lines);
     $data = preg_replace('/\n\s*\n\s*\n/', "\n\n", $data);
     file_put_contents('tmp_' . $filename, $data);
@@ -88,4 +100,15 @@ function run(string $base, string $dir, string $filename, array $priority)
     echo sprintf("%d files combined in %d ms into '%s'\n", $count, $time, $filename);
 }
 
-run(__DIR__, 'src', 'api.php', ['src/Psr']);
+$ignore = [
+    'vendor/autoload.php',
+    'vendor/composer',
+    'vendor/php-http',
+    'vendor/nyholm/psr7/src/Factory/HttplugFactory.php',
+];
+
+$priority = [
+    'vendor/psr',
+];
+
+run(__DIR__, ['vendor', 'src'], 'api.php', $ignore, $priority);

composer.json

@@ -35,7 +35,13 @@
       "php": ">=7.0.0",
       "ext-zlib": "*",
       "ext-json": "*",
-      "ext-pdo": "*"
+      "ext-pdo": "*",
+      "psr/http-message": "*",
+      "psr/http-factory": "*",
+      "psr/http-server-handler": "*",
+      "psr/http-server-middleware": "*",
+      "nyholm/psr7": "*",
+      "nyholm/psr7-server": "*"
     },
     "suggest": {
       "ext-memcache": "*",

src/Nyholm/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Tobias Nyholm
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

src/Nyholm/Psr7/Factory/Psr17Factory.php

@@ -1,68 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7\Factory;
-
-use Nyholm\Psr7\{Request, Response, ServerRequest, Stream, UploadedFile, Uri};
-use Psr\Http\Message\{RequestFactoryInterface, RequestInterface, ResponseFactoryInterface, ResponseInterface, ServerRequestFactoryInterface, ServerRequestInterface, StreamFactoryInterface, StreamInterface, UploadedFileFactoryInterface, UploadedFileInterface, UriFactoryInterface, UriInterface};
-
-/**
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- */
-final class Psr17Factory implements RequestFactoryInterface, ResponseFactoryInterface, ServerRequestFactoryInterface, StreamFactoryInterface, UploadedFileFactoryInterface, UriFactoryInterface
-{
-    public function createRequest(string $method, $uri): RequestInterface
-    {
-        return new Request($method, $uri);
-    }
-
-    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
-    {
-        return new Response($code, [], null, '1.1', $reasonPhrase);
-    }
-
-    public function createStream(string $content = ''): StreamInterface
-    {
-        return Stream::create($content);
-    }
-
-    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
-    {
-        $resource = @\fopen($filename, $mode);
-        if (false === $resource) {
-            if ('' === $mode || false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'])) {
-                throw new \InvalidArgumentException('The mode ' . $mode . ' is invalid.');
-            }
-
-            throw new \RuntimeException('The file ' . $filename . ' cannot be opened.');
-        }
-
-        return Stream::create($resource);
-    }
-
-    public function createStreamFromResource($resource): StreamInterface
-    {
-        return Stream::create($resource);
-    }
-
-    public function createUploadedFile(StreamInterface $stream, int $size = null, int $error = \UPLOAD_ERR_OK, string $clientFilename = null, string $clientMediaType = null): UploadedFileInterface
-    {
-        if (null === $size) {
-            $size = $stream->getSize();
-        }
-
-        return new UploadedFile($stream, $size, $error, $clientFilename, $clientMediaType);
-    }
-
-    public function createUri(string $uri = ''): UriInterface
-    {
-        return new Uri($uri);
-    }
-
-    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface
-    {
-        return new ServerRequest($method, $uri, [], null, '1.1', $serverParams);
-    }
-}

src/Nyholm/Psr7/MessageTrait.php

@@ -1,202 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Trait implementing functionality common to requests and responses.
- *
- * @author Michael Dowling and contributors to guzzlehttp/psr7
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- *
- * @internal should not be used outside of Nyholm/Psr7 as it does not fall under our BC promise
- */
-trait MessageTrait
-{
-    /** @var array Map of all registered headers, as original name => array of values */
-    private $headers = [];
-
-    /** @var array Map of lowercase header name => original name at registration */
-    private $headerNames = [];
-
-    /** @var string */
-    private $protocol = '1.1';
-
-    /** @var StreamInterface|null */
-    private $stream;
-
-    public function getProtocolVersion(): string
-    {
-        return $this->protocol;
-    }
-
-    public function withProtocolVersion($version): self
-    {
-        if ($this->protocol === $version) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->protocol = $version;
-
-        return $new;
-    }
-
-    public function getHeaders(): array
-    {
-        return $this->headers;
-    }
-
-    public function hasHeader($header): bool
-    {
-        return isset($this->headerNames[\strtolower($header)]);
-    }
-
-    public function getHeader($header): array
-    {
-        $header = \strtolower($header);
-        if (!isset($this->headerNames[$header])) {
-            return [];
-        }
-
-        $header = $this->headerNames[$header];
-
-        return $this->headers[$header];
-    }
-
-    public function getHeaderLine($header): string
-    {
-        return \implode(', ', $this->getHeader($header));
-    }
-
-    public function withHeader($header, $value): self
-    {
-        $value = $this->validateAndTrimHeader($header, $value);
-        $normalized = \strtolower($header);
-
-        $new = clone $this;
-        if (isset($new->headerNames[$normalized])) {
-            unset($new->headers[$new->headerNames[$normalized]]);
-        }
-        $new->headerNames[$normalized] = $header;
-        $new->headers[$header] = $value;
-
-        return $new;
-    }
-
-    public function withAddedHeader($header, $value): self
-    {
-        if (!\is_string($header) || '' === $header) {
-            throw new \InvalidArgumentException('Header name must be an RFC 7230 compatible string.');
-        }
-
-        $new = clone $this;
-        $new->setHeaders([$header => $value]);
-
-        return $new;
-    }
-
-    public function withoutHeader($header): self
-    {
-        $normalized = \strtolower($header);
-        if (!isset($this->headerNames[$normalized])) {
-            return $this;
-        }
-
-        $header = $this->headerNames[$normalized];
-        $new = clone $this;
-        unset($new->headers[$header], $new->headerNames[$normalized]);
-
-        return $new;
-    }
-
-    public function getBody(): StreamInterface
-    {
-        if (null === $this->stream) {
-            $this->stream = Stream::create('');
-        }
-
-        return $this->stream;
-    }
-
-    public function withBody(StreamInterface $body): self
-    {
-        if ($body === $this->stream) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->stream = $body;
-
-        return $new;
-    }
-
-    private function setHeaders(array $headers): void
-    {
-        foreach ($headers as $header => $value) {
-            $value = $this->validateAndTrimHeader($header, $value);
-            $normalized = \strtolower($header);
-            if (isset($this->headerNames[$normalized])) {
-                $header = $this->headerNames[$normalized];
-                $this->headers[$header] = \array_merge($this->headers[$header], $value);
-            } else {
-                $this->headerNames[$normalized] = $header;
-                $this->headers[$header] = $value;
-            }
-        }
-    }
-
-    /**
-     * Make sure the header complies with RFC 7230.
-     *
-     * Header names must be a non-empty string consisting of token characters.
-     *
-     * Header values must be strings consisting of visible characters with all optional
-     * leading and trailing whitespace stripped. This method will always strip such
-     * optional whitespace. Note that the method does not allow folding whitespace within
-     * the values as this was deprecated for almost all instances by the RFC.
-     *
-     * header-field = field-name ":" OWS field-value OWS
-     * field-name   = 1*( "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." / "^"
-     *              / "_" / "`" / "|" / "~" / %x30-39 / ( %x41-5A / %x61-7A ) )
-     * OWS          = *( SP / HTAB )
-     * field-value  = *( ( %x21-7E / %x80-FF ) [ 1*( SP / HTAB ) ( %x21-7E / %x80-FF ) ] )
-     *
-     * @see https://tools.ietf.org/html/rfc7230#section-3.2.4
-     */
-    private function validateAndTrimHeader($header, $values): array
-    {
-        if (!\is_string($header) || 1 !== \preg_match("@^[!#$%&'*+.^_`|~0-9A-Za-z-]+$@", $header)) {
-            throw new \InvalidArgumentException('Header name must be an RFC 7230 compatible string.');
-        }
-
-        if (!\is_array($values)) {
-            // This is simple, just one value.
-            if ((!\is_numeric($values) && !\is_string($values)) || 1 !== \preg_match("@^[ \t\x21-\x7E\x80-\xFF]*$@", (string) $values)) {
-                throw new \InvalidArgumentException('Header values must be RFC 7230 compatible strings.');
-            }
-
-            return [\trim((string) $values, " \t")];
-        }
-
-        if (empty($values)) {
-            throw new \InvalidArgumentException('Header values must be a string or an array of strings, empty array given.');
-        }
-
-        // Assert Non empty array
-        $returnValues = [];
-        foreach ($values as $v) {
-            if ((!\is_numeric($v) && !\is_string($v)) || 1 !== \preg_match("@^[ \t\x21-\x7E\x80-\xFF]*$@", (string) $v)) {
-                throw new \InvalidArgumentException('Header values must be RFC 7230 compatible strings.');
-            }
-
-            $returnValues[] = \trim((string) $v, " \t");
-        }
-
-        return $returnValues;
-    }
-}

src/Nyholm/Psr7/Request.php

@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7;
-
-use Psr\Http\Message\{RequestInterface, StreamInterface, UriInterface};
-
-/**
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- */
-final class Request implements RequestInterface
-{
-    use MessageTrait;
-    use RequestTrait;
-
-    /**
-     * @param string $method HTTP method
-     * @param string|UriInterface $uri URI
-     * @param array $headers Request headers
-     * @param string|resource|StreamInterface|null $body Request body
-     * @param string $version Protocol version
-     */
-    public function __construct(string $method, $uri, array $headers = [], $body = null, string $version = '1.1')
-    {
-        if (!($uri instanceof UriInterface)) {
-            $uri = new Uri($uri);
-        }
-
-        $this->method = $method;
-        $this->uri = $uri;
-        $this->setHeaders($headers);
-        $this->protocol = $version;
-
-        if (!$this->hasHeader('Host')) {
-            $this->updateHostFromUri();
-        }
-
-        // If we got no body, defer initialization of the stream until Request::getBody()
-        if ('' !== $body && null !== $body) {
-            $this->stream = Stream::create($body);
-        }
-    }
-}

src/Nyholm/Psr7/RequestTrait.php

@@ -1,113 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7;
-
-use Psr\Http\Message\UriInterface;
-
-/**
- * @author Michael Dowling and contributors to guzzlehttp/psr7
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- *
- * @internal should not be used outside of Nyholm/Psr7 as it does not fall under our BC promise
- */
-trait RequestTrait
-{
-    /** @var string */
-    private $method;
-
-    /** @var string|null */
-    private $requestTarget;
-
-    /** @var UriInterface|null */
-    private $uri;
-
-    public function getRequestTarget(): string
-    {
-        if (null !== $this->requestTarget) {
-            return $this->requestTarget;
-        }
-
-        if ('' === $target = $this->uri->getPath()) {
-            $target = '/';
-        }
-        if ('' !== $this->uri->getQuery()) {
-            $target .= '?' . $this->uri->getQuery();
-        }
-
-        return $target;
-    }
-
-    public function withRequestTarget($requestTarget): self
-    {
-        if (\preg_match('#\s#', $requestTarget)) {
-            throw new \InvalidArgumentException('Invalid request target provided; cannot contain whitespace');
-        }
-
-        $new = clone $this;
-        $new->requestTarget = $requestTarget;
-
-        return $new;
-    }
-
-    public function getMethod(): string
-    {
-        return $this->method;
-    }
-
-    public function withMethod($method): self
-    {
-        if (!\is_string($method)) {
-            throw new \InvalidArgumentException('Method must be a string');
-        }
-
-        $new = clone $this;
-        $new->method = $method;
-
-        return $new;
-    }
-
-    public function getUri(): UriInterface
-    {
-        return $this->uri;
-    }
-
-    public function withUri(UriInterface $uri, $preserveHost = false): self
-    {
-        if ($uri === $this->uri) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->uri = $uri;
-
-        if (!$preserveHost || !$this->hasHeader('Host')) {
-            $new->updateHostFromUri();
-        }
-
-        return $new;
-    }
-
-    private function updateHostFromUri(): void
-    {
-        if ('' === $host = $this->uri->getHost()) {
-            return;
-        }
-
-        if (null !== ($port = $this->uri->getPort())) {
-            $host .= ':' . $port;
-        }
-
-        if (isset($this->headerNames['host'])) {
-            $header = $this->headerNames['host'];
-        } else {
-            $this->headerNames['host'] = $header = 'Host';
-        }
-
-        // Ensure Host is the first header.
-        // See: http://tools.ietf.org/html/rfc7230#section-5.4
-        $this->headers = [$header => [$host]] + $this->headers;
-    }
-}

src/Nyholm/Psr7/Response.php

@@ -1,88 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7;
-
-use Psr\Http\Message\{ResponseInterface, StreamInterface};
-
-/**
- * @author Michael Dowling and contributors to guzzlehttp/psr7
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- */
-final class Response implements ResponseInterface
-{
-    use MessageTrait;
-
-    /** @var array Map of standard HTTP status code/reason phrases */
-    private const PHRASES = [
-        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', 451 => 'Unavailable For Legal Reasons',
-        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 string */
-    private $reasonPhrase = '';
-
-    /** @var int */
-    private $statusCode;
-
-    /**
-     * @param int $status Status code
-     * @param array $headers Response headers
-     * @param string|resource|StreamInterface|null $body Response body
-     * @param string $version Protocol version
-     * @param string|null $reason Reason phrase (when empty a default will be used based on the status code)
-     */
-    public function __construct(int $status = 200, array $headers = [], $body = null, string $version = '1.1', string $reason = null)
-    {
-        // If we got no body, defer initialization of the stream until Response::getBody()
-        if ('' !== $body && null !== $body) {
-            $this->stream = Stream::create($body);
-        }
-
-        $this->statusCode = $status;
-        $this->setHeaders($headers);
-        if (null === $reason && isset(self::PHRASES[$this->statusCode])) {
-            $this->reasonPhrase = self::PHRASES[$status];
-        } else {
-            $this->reasonPhrase = $reason;
-        }
-
-        $this->protocol = $version;
-    }
-
-    public function getStatusCode(): int
-    {
-        return $this->statusCode;
-    }
-
-    public function getReasonPhrase(): string
-    {
-        return $this->reasonPhrase;
-    }
-
-    public function withStatus($code, $reasonPhrase = ''): self
-    {
-        if (!\is_int($code) && !\is_string($code)) {
-            throw new \InvalidArgumentException('Status code has to be an integer');
-        }
-
-        $code = (int) $code;
-        if ($code < 100 || $code > 599) {
-            throw new \InvalidArgumentException('Status code has to be an integer between 100 and 599');
-        }
-
-        $new = clone $this;
-        $new->statusCode = $code;
-        if ((null === $reasonPhrase || '' === $reasonPhrase) && isset(self::PHRASES[$new->statusCode])) {
-            $reasonPhrase = self::PHRASES[$new->statusCode];
-        }
-        $new->reasonPhrase = $reasonPhrase;
-
-        return $new;
-    }
-}

src/Nyholm/Psr7/ServerRequest.php

@@ -1,162 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7;
-
-use Psr\Http\Message\{ServerRequestInterface, StreamInterface, UploadedFileInterface, UriInterface};
-
-/**
- * @author Michael Dowling and contributors to guzzlehttp/psr7
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- */
-final class ServerRequest implements ServerRequestInterface
-{
-    use MessageTrait;
-    use RequestTrait;
-
-    /** @var array */
-    private $attributes = [];
-
-    /** @var array */
-    private $cookieParams = [];
-
-    /** @var array|object|null */
-    private $parsedBody;
-
-    /** @var array */
-    private $queryParams = [];
-
-    /** @var array */
-    private $serverParams;
-
-    /** @var UploadedFileInterface[] */
-    private $uploadedFiles = [];
-
-    /**
-     * @param string $method HTTP method
-     * @param string|UriInterface $uri URI
-     * @param array $headers Request headers
-     * @param string|resource|StreamInterface|null $body Request body
-     * @param string $version Protocol version
-     * @param array $serverParams Typically the $_SERVER superglobal
-     */
-    public function __construct(string $method, $uri, array $headers = [], $body = null, string $version = '1.1', array $serverParams = [])
-    {
-        $this->serverParams = $serverParams;
-
-        if (!($uri instanceof UriInterface)) {
-            $uri = new Uri($uri);
-        }
-
-        $this->method = $method;
-        $this->uri = $uri;
-        $this->setHeaders($headers);
-        $this->protocol = $version;
-
-        if (!$this->hasHeader('Host')) {
-            $this->updateHostFromUri();
-        }
-
-        // If we got no body, defer initialization of the stream until ServerRequest::getBody()
-        if ('' !== $body && null !== $body) {
-            $this->stream = Stream::create($body);
-        }
-    }
-
-    public function getServerParams(): array
-    {
-        return $this->serverParams;
-    }
-
-    public function getUploadedFiles(): array
-    {
-        return $this->uploadedFiles;
-    }
-
-    public function withUploadedFiles(array $uploadedFiles)
-    {
-        $new = clone $this;
-        $new->uploadedFiles = $uploadedFiles;
-
-        return $new;
-    }
-
-    public function getCookieParams(): array
-    {
-        return $this->cookieParams;
-    }
-
-    public function withCookieParams(array $cookies)
-    {
-        $new = clone $this;
-        $new->cookieParams = $cookies;
-
-        return $new;
-    }
-
-    public function getQueryParams(): array
-    {
-        return $this->queryParams;
-    }
-
-    public function withQueryParams(array $query)
-    {
-        $new = clone $this;
-        $new->queryParams = $query;
-
-        return $new;
-    }
-
-    public function getParsedBody()
-    {
-        return $this->parsedBody;
-    }
-
-    public function withParsedBody($data)
-    {
-        if (!\is_array($data) && !\is_object($data) && null !== $data) {
-            throw new \InvalidArgumentException('First parameter to withParsedBody MUST be object, array or null');
-        }
-
-        $new = clone $this;
-        $new->parsedBody = $data;
-
-        return $new;
-    }
-
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
-
-    public function getAttribute($attribute, $default = null)
-    {
-        if (false === \array_key_exists($attribute, $this->attributes)) {
-            return $default;
-        }
-
-        return $this->attributes[$attribute];
-    }
-
-    public function withAttribute($attribute, $value): self
-    {
-        $new = clone $this;
-        $new->attributes[$attribute] = $value;
-
-        return $new;
-    }
-
-    public function withoutAttribute($attribute): self
-    {
-        if (false === \array_key_exists($attribute, $this->attributes)) {
-            return $this;
-        }
-
-        $new = clone $this;
-        unset($new->attributes[$attribute]);
-
-        return $new;
-    }
-}

src/Nyholm/Psr7/Stream.php

@@ -1,257 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * @author Michael Dowling and contributors to guzzlehttp/psr7
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- */
-final class Stream implements StreamInterface
-{
-    /** @var resource|null A resource reference */
-    private $stream;
-
-    /** @var bool */
-    private $seekable;
-
-    /** @var bool */
-    private $readable;
-
-    /** @var bool */
-    private $writable;
-
-    /** @var array|mixed|void|null */
-    private $uri;
-
-    /** @var int|null */
-    private $size;
-
-    /** @var array Hash of readable and writable stream types */
-    private const READ_WRITE_HASH = [
-        'read' => [
-            'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true,
-            'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true,
-            'c+b' => true, 'rt' => true, 'w+t' => true, 'r+t' => true,
-            'x+t' => true, 'c+t' => true, 'a+' => true,
-        ],
-        'write' => [
-            'w' => true, 'w+' => true, 'rw' => true, 'r+' => true, 'x+' => true,
-            'c+' => true, 'wb' => true, 'w+b' => true, 'r+b' => true,
-            'x+b' => true, 'c+b' => true, 'w+t' => true, 'r+t' => true,
-            'x+t' => true, 'c+t' => true, 'a' => true, 'a+' => true,
-        ],
-    ];
-
-    private function __construct()
-    {
-    }
-
-    /**
-     * Creates a new PSR-7 stream.
-     *
-     * @param string|resource|StreamInterface $body
-     *
-     * @return StreamInterface
-     *
-     * @throws \InvalidArgumentException
-     */
-    public static function create($body = ''): StreamInterface
-    {
-        if ($body instanceof StreamInterface) {
-            return $body;
-        }
-
-        if (\is_string($body)) {
-            $resource = \fopen('php://temp', 'rw+');
-            \fwrite($resource, $body);
-            $body = $resource;
-        }
-
-        if (\is_resource($body)) {
-            $new = new self();
-            $new->stream = $body;
-            $meta = \stream_get_meta_data($new->stream);
-            $new->seekable = $meta['seekable'];
-            $new->readable = isset(self::READ_WRITE_HASH['read'][$meta['mode']]);
-            $new->writable = isset(self::READ_WRITE_HASH['write'][$meta['mode']]);
-            $new->uri = $new->getMetadata('uri');
-
-            return $new;
-        }
-
-        throw new \InvalidArgumentException('First argument to Stream::create() must be a string, resource or StreamInterface.');
-    }
-
-    /**
-     * Closes the stream when the destructed.
-     */
-    public function __destruct()
-    {
-        $this->close();
-    }
-
-    public function __toString(): string
-    {
-        try {
-            if ($this->isSeekable()) {
-                $this->seek(0);
-            }
-
-            return $this->getContents();
-        } catch (\Exception $e) {
-            return '';
-        }
-    }
-
-    public function close(): void
-    {
-        if (isset($this->stream)) {
-            if (\is_resource($this->stream)) {
-                \fclose($this->stream);
-            }
-            $this->detach();
-        }
-    }
-
-    public function detach()
-    {
-        if (!isset($this->stream)) {
-            return null;
-        }
-
-        $result = $this->stream;
-        unset($this->stream);
-        $this->size = $this->uri = null;
-        $this->readable = $this->writable = $this->seekable = false;
-
-        return $result;
-    }
-
-    public function getSize(): ?int
-    {
-        if (null !== $this->size) {
-            return $this->size;
-        }
-
-        if (!isset($this->stream)) {
-            return null;
-        }
-
-        // Clear the stat cache if the stream has a URI
-        if ($this->uri) {
-            \clearstatcache(true, $this->uri);
-        }
-
-        $stats = \fstat($this->stream);
-        if (isset($stats['size'])) {
-            $this->size = $stats['size'];
-
-            return $this->size;
-        }
-
-        return null;
-    }
-
-    public function tell(): int
-    {
-        if (false === $result = \ftell($this->stream)) {
-            throw new \RuntimeException('Unable to determine stream position');
-        }
-
-        return $result;
-    }
-
-    public function eof(): bool
-    {
-        return !$this->stream || \feof($this->stream);
-    }
-
-    public function isSeekable(): bool
-    {
-        return $this->seekable;
-    }
-
-    public function seek($offset, $whence = \SEEK_SET): void
-    {
-        if (!$this->seekable) {
-            throw new \RuntimeException('Stream is not seekable');
-        }
-
-        if (-1 === \fseek($this->stream, $offset, $whence)) {
-            throw new \RuntimeException('Unable to seek to stream position ' . $offset . ' with whence ' . \var_export($whence, true));
-        }
-    }
-
-    public function rewind(): void
-    {
-        $this->seek(0);
-    }
-
-    public function isWritable(): bool
-    {
-        return $this->writable;
-    }
-
-    public function write($string): int
-    {
-        if (!$this->writable) {
-            throw new \RuntimeException('Cannot write to a non-writable stream');
-        }
-
-        // We can't know the size after writing anything
-        $this->size = null;
-
-        if (false === $result = \fwrite($this->stream, $string)) {
-            throw new \RuntimeException('Unable to write to stream');
-        }
-
-        return $result;
-    }
-
-    public function isReadable(): bool
-    {
-        return $this->readable;
-    }
-
-    public function read($length): string
-    {
-        if (!$this->readable) {
-            throw new \RuntimeException('Cannot read from non-readable stream');
-        }
-
-        return \fread($this->stream, $length);
-    }
-
-    public function getContents(): string
-    {
-        if (!isset($this->stream)) {
-            throw new \RuntimeException('Unable to read stream contents');
-        }
-
-        if (false === $contents = \stream_get_contents($this->stream)) {
-            throw new \RuntimeException('Unable to read stream contents');
-        }
-
-        return $contents;
-    }
-
-    public function getMetadata($key = null)
-    {
-        if (!isset($this->stream)) {
-            return $key ? null : [];
-        }
-
-        $meta = \stream_get_meta_data($this->stream);
-
-        if (null === $key) {
-            return $meta;
-        }
-
-        return $meta[$key] ?? null;
-    }
-}

src/Nyholm/Psr7/UploadedFile.php

@@ -1,171 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7;
-
-use Psr\Http\Message\{StreamInterface, UploadedFileInterface};
-
-/**
- * @author Michael Dowling and contributors to guzzlehttp/psr7
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- */
-final class UploadedFile implements UploadedFileInterface
-{
-    /** @var array */
-    private const ERRORS = [
-        \UPLOAD_ERR_OK => 1,
-        \UPLOAD_ERR_INI_SIZE => 1,
-        \UPLOAD_ERR_FORM_SIZE => 1,
-        \UPLOAD_ERR_PARTIAL => 1,
-        \UPLOAD_ERR_NO_FILE => 1,
-        \UPLOAD_ERR_NO_TMP_DIR => 1,
-        \UPLOAD_ERR_CANT_WRITE => 1,
-        \UPLOAD_ERR_EXTENSION => 1,
-    ];
-
-    /** @var string */
-    private $clientFilename;
-
-    /** @var string */
-    private $clientMediaType;
-
-    /** @var int */
-    private $error;
-
-    /** @var string|null */
-    private $file;
-
-    /** @var bool */
-    private $moved = false;
-
-    /** @var int */
-    private $size;
-
-    /** @var StreamInterface|null */
-    private $stream;
-
-    /**
-     * @param StreamInterface|string|resource $streamOrFile
-     * @param int $size
-     * @param int $errorStatus
-     * @param string|null $clientFilename
-     * @param string|null $clientMediaType
-     */
-    public function __construct($streamOrFile, $size, $errorStatus, $clientFilename = null, $clientMediaType = null)
-    {
-        if (false === \is_int($errorStatus) || !isset(self::ERRORS[$errorStatus])) {
-            throw new \InvalidArgumentException('Upload file error status must be an integer value and one of the "UPLOAD_ERR_*" constants.');
-        }
-
-        if (false === \is_int($size)) {
-            throw new \InvalidArgumentException('Upload file size must be an integer');
-        }
-
-        if (null !== $clientFilename && !\is_string($clientFilename)) {
-            throw new \InvalidArgumentException('Upload file client filename must be a string or null');
-        }
-
-        if (null !== $clientMediaType && !\is_string($clientMediaType)) {
-            throw new \InvalidArgumentException('Upload file client media type must be a string or null');
-        }
-
-        $this->error = $errorStatus;
-        $this->size = $size;
-        $this->clientFilename = $clientFilename;
-        $this->clientMediaType = $clientMediaType;
-
-        if (\UPLOAD_ERR_OK === $this->error) {
-            // Depending on the value set file or stream variable.
-            if (\is_string($streamOrFile)) {
-                $this->file = $streamOrFile;
-            } elseif (\is_resource($streamOrFile)) {
-                $this->stream = Stream::create($streamOrFile);
-            } elseif ($streamOrFile instanceof StreamInterface) {
-                $this->stream = $streamOrFile;
-            } else {
-                throw new \InvalidArgumentException('Invalid stream or file provided for UploadedFile');
-            }
-        }
-    }
-
-    /**
-     * @throws \RuntimeException if is moved or not ok
-     */
-    private function validateActive(): void
-    {
-        if (\UPLOAD_ERR_OK !== $this->error) {
-            throw new \RuntimeException('Cannot retrieve stream due to upload error');
-        }
-
-        if ($this->moved) {
-            throw new \RuntimeException('Cannot retrieve stream after it has already been moved');
-        }
-    }
-
-    public function getStream(): StreamInterface
-    {
-        $this->validateActive();
-
-        if ($this->stream instanceof StreamInterface) {
-            return $this->stream;
-        }
-
-        $resource = \fopen($this->file, 'r');
-
-        return Stream::create($resource);
-    }
-
-    public function moveTo($targetPath): void
-    {
-        $this->validateActive();
-
-        if (!\is_string($targetPath) || '' === $targetPath) {
-            throw new \InvalidArgumentException('Invalid path provided for move operation; must be a non-empty string');
-        }
-
-        if (null !== $this->file) {
-            $this->moved = 'cli' === \PHP_SAPI ? \rename($this->file, $targetPath) : \move_uploaded_file($this->file, $targetPath);
-        } else {
-            $stream = $this->getStream();
-            if ($stream->isSeekable()) {
-                $stream->rewind();
-            }
-
-            // Copy the contents of a stream into another stream until end-of-file.
-            $dest = Stream::create(\fopen($targetPath, 'w'));
-            while (!$stream->eof()) {
-                if (!$dest->write($stream->read(1048576))) {
-                    break;
-                }
-            }
-
-            $this->moved = true;
-        }
-
-        if (false === $this->moved) {
-            throw new \RuntimeException(\sprintf('Uploaded file could not be moved to %s', $targetPath));
-        }
-    }
-
-    public function getSize(): int
-    {
-        return $this->size;
-    }
-
-    public function getError(): int
-    {
-        return $this->error;
-    }
-
-    public function getClientFilename(): ?string
-    {
-        return $this->clientFilename;
-    }
-
-    public function getClientMediaType(): ?string
-    {
-        return $this->clientMediaType;
-    }
-}

src/Nyholm/Psr7/Uri.php

@@ -1,310 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7;
-
-use Psr\Http\Message\UriInterface;
-
-/**
- * PSR-7 URI implementation.
- *
- * @author Michael Dowling
- * @author Tobias Schultze
- * @author Matthew Weier O'Phinney
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- */
-final class Uri implements UriInterface
-{
-    private const SCHEMES = ['http' => 80, 'https' => 443];
-
-    private const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
-
-    private const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
-
-    /** @var string Uri scheme. */
-    private $scheme = '';
-
-    /** @var string Uri user info. */
-    private $userInfo = '';
-
-    /** @var string Uri host. */
-    private $host = '';
-
-    /** @var int|null Uri port. */
-    private $port;
-
-    /** @var string Uri path. */
-    private $path = '';
-
-    /** @var string Uri query string. */
-    private $query = '';
-
-    /** @var string Uri fragment. */
-    private $fragment = '';
-
-    public function __construct(string $uri = '')
-    {
-        if ('' !== $uri) {
-            if (false === $parts = \parse_url($uri)) {
-                throw new \InvalidArgumentException("Unable to parse URI: $uri");
-            }
-
-            // Apply parse_url parts to a URI.
-            $this->scheme = isset($parts['scheme']) ? \strtolower($parts['scheme']) : '';
-            $this->userInfo = $parts['user'] ?? '';
-            $this->host = isset($parts['host']) ? \strtolower($parts['host']) : '';
-            $this->port = isset($parts['port']) ? $this->filterPort($parts['port']) : null;
-            $this->path = isset($parts['path']) ? $this->filterPath($parts['path']) : '';
-            $this->query = isset($parts['query']) ? $this->filterQueryAndFragment($parts['query']) : '';
-            $this->fragment = isset($parts['fragment']) ? $this->filterQueryAndFragment($parts['fragment']) : '';
-            if (isset($parts['pass'])) {
-                $this->userInfo .= ':' . $parts['pass'];
-            }
-        }
-    }
-
-    public function __toString(): string
-    {
-        return self::createUriString($this->scheme, $this->getAuthority(), $this->path, $this->query, $this->fragment);
-    }
-
-    public function getScheme(): string
-    {
-        return $this->scheme;
-    }
-
-    public function getAuthority(): string
-    {
-        if ('' === $this->host) {
-            return '';
-        }
-
-        $authority = $this->host;
-        if ('' !== $this->userInfo) {
-            $authority = $this->userInfo . '@' . $authority;
-        }
-
-        if (null !== $this->port) {
-            $authority .= ':' . $this->port;
-        }
-
-        return $authority;
-    }
-
-    public function getUserInfo(): string
-    {
-        return $this->userInfo;
-    }
-
-    public function getHost(): string
-    {
-        return $this->host;
-    }
-
-    public function getPort(): ?int
-    {
-        return $this->port;
-    }
-
-    public function getPath(): string
-    {
-        return $this->path;
-    }
-
-    public function getQuery(): string
-    {
-        return $this->query;
-    }
-
-    public function getFragment(): string
-    {
-        return $this->fragment;
-    }
-
-    public function withScheme($scheme): self
-    {
-        if (!\is_string($scheme)) {
-            throw new \InvalidArgumentException('Scheme must be a string');
-        }
-
-        if ($this->scheme === $scheme = \strtolower($scheme)) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->scheme = $scheme;
-        $new->port = $new->filterPort($new->port);
-
-        return $new;
-    }
-
-    public function withUserInfo($user, $password = null): self
-    {
-        $info = $user;
-        if (null !== $password && '' !== $password) {
-            $info .= ':' . $password;
-        }
-
-        if ($this->userInfo === $info) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->userInfo = $info;
-
-        return $new;
-    }
-
-    public function withHost($host): self
-    {
-        if (!\is_string($host)) {
-            throw new \InvalidArgumentException('Host must be a string');
-        }
-
-        if ($this->host === $host = \strtolower($host)) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->host = $host;
-
-        return $new;
-    }
-
-    public function withPort($port): self
-    {
-        if ($this->port === $port = $this->filterPort($port)) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->port = $port;
-
-        return $new;
-    }
-
-    public function withPath($path): self
-    {
-        if ($this->path === $path = $this->filterPath($path)) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->path = $path;
-
-        return $new;
-    }
-
-    public function withQuery($query): self
-    {
-        if ($this->query === $query = $this->filterQueryAndFragment($query)) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->query = $query;
-
-        return $new;
-    }
-
-    public function withFragment($fragment): self
-    {
-        if ($this->fragment === $fragment = $this->filterQueryAndFragment($fragment)) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->fragment = $fragment;
-
-        return $new;
-    }
-
-    /**
-     * Create a URI string from its various parts.
-     */
-    private static function createUriString(string $scheme, string $authority, string $path, string $query, string $fragment): string
-    {
-        $uri = '';
-        if ('' !== $scheme) {
-            $uri .= $scheme . ':';
-        }
-
-        if ('' !== $authority) {
-            $uri .= '//' . $authority;
-        }
-
-        if ('' !== $path) {
-            if ('/' !== $path[0]) {
-                if ('' !== $authority) {
-                    // If the path is rootless and an authority is present, the path MUST be prefixed by "/"
-                    $path = '/' . $path;
-                }
-            } elseif (isset($path[1]) && '/' === $path[1]) {
-                if ('' === $authority) {
-                    // If the path is starting with more than one "/" and no authority is present, the
-                    // starting slashes MUST be reduced to one.
-                    $path = '/' . \ltrim($path, '/');
-                }
-            }
-
-            $uri .= $path;
-        }
-
-        if ('' !== $query) {
-            $uri .= '?' . $query;
-        }
-
-        if ('' !== $fragment) {
-            $uri .= '#' . $fragment;
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Is a given port non-standard for the current scheme?
-     */
-    private static function isNonStandardPort(string $scheme, int $port): bool
-    {
-        return !isset(self::SCHEMES[$scheme]) || $port !== self::SCHEMES[$scheme];
-    }
-
-    private function filterPort($port): ?int
-    {
-        if (null === $port) {
-            return null;
-        }
-
-        $port = (int) $port;
-        if (1 > $port || 0xffff < $port) {
-            throw new \InvalidArgumentException(\sprintf('Invalid port: %d. Must be between 1 and 65535', $port));
-        }
-
-        return self::isNonStandardPort($this->scheme, $port) ? $port : null;
-    }
-
-    private function filterPath($path): string
-    {
-        if (!\is_string($path)) {
-            throw new \InvalidArgumentException('Path must be a string');
-        }
-
-        return \preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $path);
-    }
-
-    private function filterQueryAndFragment($str): string
-    {
-        if (!\is_string($str)) {
-            throw new \InvalidArgumentException('Query and fragment must be a string');
-        }
-
-        return \preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $str);
-    }
-
-    private static function rawurlencodeMatchZero(array $match): string
-    {
-        return \rawurlencode($match[0]);
-    }
-}

src/Nyholm/Psr7Server/ServerRequestCreator.php

@@ -1,275 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7Server;
-
-use Psr\Http\Message\ServerRequestFactoryInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\StreamFactoryInterface;
-use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UploadedFileFactoryInterface;
-use Psr\Http\Message\UploadedFileInterface;
-use Psr\Http\Message\UriFactoryInterface;
-use Psr\Http\Message\UriInterface;
-
-/**
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- */
-final class ServerRequestCreator implements ServerRequestCreatorInterface
-{
-    private $serverRequestFactory;
-
-    private $uriFactory;
-
-    private $uploadedFileFactory;
-
-    private $streamFactory;
-
-    public function __construct(
-        ServerRequestFactoryInterface $serverRequestFactory,
-        UriFactoryInterface $uriFactory,
-        UploadedFileFactoryInterface $uploadedFileFactory,
-        StreamFactoryInterface $streamFactory
-    ) {
-        $this->serverRequestFactory = $serverRequestFactory;
-        $this->uriFactory = $uriFactory;
-        $this->uploadedFileFactory = $uploadedFileFactory;
-        $this->streamFactory = $streamFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fromGlobals(): ServerRequestInterface
-    {
-        $server = $_SERVER;
-        if (false === isset($server['REQUEST_METHOD'])) {
-            $server['REQUEST_METHOD'] = 'GET';
-        }
-
-        $headers = \function_exists('getallheaders') ? getallheaders() : static::getHeadersFromServer($_SERVER);
-
-        return $this->fromArrays($server, $headers, $_COOKIE, $_GET, $_POST, $_FILES, \fopen('php://input', 'r') ?: null);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fromArrays(array $server, array $headers = [], array $cookie = [], array $get = [], array $post = [], array $files = [], $body = null): ServerRequestInterface
-    {
-        $method = $this->getMethodFromEnv($server);
-        $uri = $this->getUriFromEnvWithHTTP($server);
-        $protocol = isset($server['SERVER_PROTOCOL']) ? \str_replace('HTTP/', '', $server['SERVER_PROTOCOL']) : '1.1';
-
-        $serverRequest = $this->serverRequestFactory->createServerRequest($method, $uri, $server);
-        foreach ($headers as $name => $value) {
-            $serverRequest = $serverRequest->withAddedHeader($name, $value);
-        }
-
-        $serverRequest = $serverRequest
-            ->withProtocolVersion($protocol)
-            ->withCookieParams($cookie)
-            ->withQueryParams($get)
-            ->withParsedBody($post)
-            ->withUploadedFiles($this->normalizeFiles($files));
-
-        if (null === $body) {
-            return $serverRequest;
-        }
-
-        if (\is_resource($body)) {
-            $body = $this->streamFactory->createStreamFromResource($body);
-        } elseif (\is_string($body)) {
-            $body = $this->streamFactory->createStream($body);
-        } elseif (!$body instanceof StreamInterface) {
-            throw new \InvalidArgumentException('The $body parameter to ServerRequestCreator::fromArrays must be string, resource or StreamInterface');
-        }
-
-        return $serverRequest->withBody($body);
-    }
-
-    /**
-     * Implementation from Zend\Diactoros\marshalHeadersFromSapi().
-     */
-    public static function getHeadersFromServer(array $server): array
-    {
-        $headers = [];
-        foreach ($server as $key => $value) {
-            // Apache prefixes environment variables with REDIRECT_
-            // if they are added by rewrite rules
-            if (0 === \strpos($key, 'REDIRECT_')) {
-                $key = \substr($key, 9);
-
-                // We will not overwrite existing variables with the
-                // prefixed versions, though
-                if (\array_key_exists($key, $server)) {
-                    continue;
-                }
-            }
-
-            if ($value && 0 === \strpos($key, 'HTTP_')) {
-                $name = \strtr(\strtolower(\substr($key, 5)), '_', '-');
-                $headers[$name] = $value;
-
-                continue;
-            }
-
-            if ($value && 0 === \strpos($key, 'CONTENT_')) {
-                $name = 'content-'.\strtolower(\substr($key, 8));
-                $headers[$name] = $value;
-
-                continue;
-            }
-        }
-
-        return $headers;
-    }
-
-    private function getMethodFromEnv(array $environment): string
-    {
-        if (false === isset($environment['REQUEST_METHOD'])) {
-            throw new \InvalidArgumentException('Cannot determine HTTP method');
-        }
-
-        return $environment['REQUEST_METHOD'];
-    }
-
-    private function getUriFromEnvWithHTTP(array $environment): UriInterface
-    {
-        $uri = $this->createUriFromArray($environment);
-        if (empty($uri->getScheme())) {
-            $uri = $uri->withScheme('http');
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Return an UploadedFile instance array.
-     *
-     * @param array $files A array which respect $_FILES structure
-     *
-     * @return UploadedFileInterface[]
-     *
-     * @throws \InvalidArgumentException for unrecognized values
-     */
-    private function normalizeFiles(array $files): array
-    {
-        $normalized = [];
-
-        foreach ($files as $key => $value) {
-            if ($value instanceof UploadedFileInterface) {
-                $normalized[$key] = $value;
-            } elseif (\is_array($value) && isset($value['tmp_name'])) {
-                $normalized[$key] = $this->createUploadedFileFromSpec($value);
-            } elseif (\is_array($value)) {
-                $normalized[$key] = $this->normalizeFiles($value);
-            } else {
-                throw new \InvalidArgumentException('Invalid value in files specification');
-            }
-        }
-
-        return $normalized;
-    }
-
-    /**
-     * Create and return an UploadedFile instance from a $_FILES specification.
-     *
-     * If the specification represents an array of values, this method will
-     * delegate to normalizeNestedFileSpec() and return that return value.
-     *
-     * @param array $value $_FILES struct
-     *
-     * @return array|UploadedFileInterface
-     */
-    private function createUploadedFileFromSpec(array $value)
-    {
-        if (\is_array($value['tmp_name'])) {
-            return $this->normalizeNestedFileSpec($value);
-        }
-
-        try {
-            $stream = $this->streamFactory->createStreamFromFile($value['tmp_name']);
-        } catch (\RuntimeException $e) {
-            $stream = $this->streamFactory->createStream();
-        }
-
-        return $this->uploadedFileFactory->createUploadedFile(
-            $stream,
-            (int) $value['size'],
-            (int) $value['error'],
-            $value['name'],
-            $value['type']
-        );
-    }
-
-    /**
-     * Normalize an array of file specifications.
-     *
-     * Loops through all nested files and returns a normalized array of
-     * UploadedFileInterface instances.
-     *
-     * @param array $files
-     *
-     * @return UploadedFileInterface[]
-     */
-    private function normalizeNestedFileSpec(array $files = []): array
-    {
-        $normalizedFiles = [];
-
-        foreach (\array_keys($files['tmp_name']) as $key) {
-            $spec = [
-                'tmp_name' => $files['tmp_name'][$key],
-                'size' => $files['size'][$key],
-                'error' => $files['error'][$key],
-                'name' => $files['name'][$key],
-                'type' => $files['type'][$key],
-            ];
-            $normalizedFiles[$key] = $this->createUploadedFileFromSpec($spec);
-        }
-
-        return $normalizedFiles;
-    }
-
-    /**
-     * Create a new uri from server variable.
-     *
-     * @param array $server typically $_SERVER or similar structure
-     */
-    private function createUriFromArray(array $server): UriInterface
-    {
-        $uri = $this->uriFactory->createUri('');
-
-        if (isset($server['REQUEST_SCHEME'])) {
-            $uri = $uri->withScheme($server['REQUEST_SCHEME']);
-        } elseif (isset($server['HTTPS'])) {
-            $uri = $uri->withScheme('on' === $server['HTTPS'] ? 'https' : 'http');
-        }
-
-        if (isset($server['SERVER_PORT'])) {
-            $uri = $uri->withPort($server['SERVER_PORT']);
-        }
-
-        if (isset($server['HTTP_HOST'])) {
-            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) {
-                $uri = $uri->withHost($matches[1])->withPort($matches[2]);
-            } else {
-                $uri = $uri->withHost($server['HTTP_HOST']);
-            }
-        } elseif (isset($server['SERVER_NAME'])) {
-            $uri = $uri->withHost($server['SERVER_NAME']);
-        }
-
-        if (isset($server['REQUEST_URI'])) {
-            $uri = $uri->withPath(\current(\explode('?', $server['REQUEST_URI'])));
-        }
-
-        if (isset($server['QUERY_STRING'])) {
-            $uri = $uri->withQuery($server['QUERY_STRING']);
-        }
-
-        return $uri;
-    }
-}

src/Nyholm/Psr7Server/ServerRequestCreatorInterface.php

@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7Server;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\StreamInterface;
-
-/**
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- */
-interface ServerRequestCreatorInterface
-{
-    /**
-     * Create a new server request from the current environment variables.
-     * Defaults to a GET request to minimise the risk of an \InvalidArgumentException.
-     * Includes the current request headers as supplied by the server through `getallheaders()`.
-     * If `getallheaders()` is unavailable on the current server it will fallback to its own `getHeadersFromServer()` method.
-     * Defaults to php://input for the request body.
-     *
-     * @throws \InvalidArgumentException if no valid method or URI can be determined
-     */
-    public function fromGlobals(): ServerRequestInterface;
-
-    /**
-     * Create a new server request from a set of arrays.
-     *
-     * @param array                                $server  typically $_SERVER or similar structure
-     * @param array                                $headers typically the output of getallheaders() or similar structure
-     * @param array                                $cookie  typically $_COOKIE or similar structure
-     * @param array                                $get     typically $_GET or similar structure
-     * @param array                                $post    typically $_POST or similar structure
-     * @param array                                $files   typically $_FILES or similar structure
-     * @param StreamInterface|resource|string|null $body    Typically stdIn
-     *
-     * @throws \InvalidArgumentException if no valid method or URI can be determined
-     */
-    public function fromArrays(
-        array $server,
-        array $headers = [],
-        array $cookie = [],
-        array $get = [],
-        array $post = [],
-        array $files = [],
-        $body = null
-    ): ServerRequestInterface;
-
-    /**
-     * Get parsed headers from ($_SERVER) array.
-     *
-     * @param array $server typically $_SERVER or similar structure
-     *
-     * @return array
-     */
-    public static function getHeadersFromServer(array $server): array;
-}

src/Psr/Http/Message/MessageInterface.php

@@ -1,187 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * HTTP messages consist of requests from a client to a server and responses
- * from a server to a client. This interface defines the methods common to
- * each.
- *
- * Messages are considered immutable; all methods that might change state MUST
- * be implemented such that they retain the internal state of the current
- * message and return an instance that contains the changed state.
- *
- * @link http://www.ietf.org/rfc/rfc7230.txt
- * @link http://www.ietf.org/rfc/rfc7231.txt
- */
-interface MessageInterface
-{
-    /**
-     * Retrieves the HTTP protocol version as a string.
-     *
-     * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
-     *
-     * @return string HTTP protocol version.
-     */
-    public function getProtocolVersion();
-
-    /**
-     * Return an instance with the specified HTTP protocol version.
-     *
-     * The version string MUST contain only the HTTP version number (e.g.,
-     * "1.1", "1.0").
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new protocol version.
-     *
-     * @param string $version HTTP protocol version
-     * @return static
-     */
-    public function withProtocolVersion($version);
-
-    /**
-     * Retrieves all message header values.
-     *
-     * The keys represent the header name as it will be sent over the wire, and
-     * each value is an array of strings associated with the header.
-     *
-     *     // Represent the headers as a string
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         echo $name . ": " . implode(", ", $values);
-     *     }
-     *
-     *     // Emit headers iteratively:
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         foreach ($values as $value) {
-     *             header(sprintf('%s: %s', $name, $value), false);
-     *         }
-     *     }
-     *
-     * While header names are not case-sensitive, getHeaders() will preserve the
-     * exact case in which headers were originally specified.
-     *
-     * @return string[][] Returns an associative array of the message's headers. Each
-     *     key MUST be a header name, and each value MUST be an array of strings
-     *     for that header.
-     */
-    public function getHeaders();
-
-    /**
-     * Checks if a header exists by the given case-insensitive name.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return bool Returns true if any header names match the given header
-     *     name using a case-insensitive string comparison. Returns false if
-     *     no matching header name is found in the message.
-     */
-    public function hasHeader($name);
-
-    /**
-     * Retrieves a message header value by the given case-insensitive name.
-     *
-     * This method returns an array of all the header values of the given
-     * case-insensitive header name.
-     *
-     * If the header does not appear in the message, this method MUST return an
-     * empty array.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string[] An array of string values as provided for the given
-     *    header. If the header does not appear in the message, this method MUST
-     *    return an empty array.
-     */
-    public function getHeader($name);
-
-    /**
-     * Retrieves a comma-separated string of the values for a single header.
-     *
-     * This method returns all of the header values of the given
-     * case-insensitive header name as a string concatenated together using
-     * a comma.
-     *
-     * NOTE: Not all header values may be appropriately represented using
-     * comma concatenation. For such headers, use getHeader() instead
-     * and supply your own delimiter when concatenating.
-     *
-     * If the header does not appear in the message, this method MUST return
-     * an empty string.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string A string of values as provided for the given header
-     *    concatenated together using a comma. If the header does not appear in
-     *    the message, this method MUST return an empty string.
-     */
-    public function getHeaderLine($name);
-
-    /**
-     * Return an instance with the provided value replacing the specified header.
-     *
-     * While header names are case-insensitive, the casing of the header will
-     * be preserved by this function, and returned from getHeaders().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new and/or updated header and value.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withHeader($name, $value);
-
-    /**
-     * Return an instance with the specified header appended with the given value.
-     *
-     * Existing values for the specified header will be maintained. The new
-     * value(s) will be appended to the existing list. If the header did not
-     * exist previously, it will be added.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new header and/or value.
-     *
-     * @param string $name Case-insensitive header field name to add.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withAddedHeader($name, $value);
-
-    /**
-     * Return an instance without the specified header.
-     *
-     * Header resolution MUST be done without case-sensitivity.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that removes
-     * the named header.
-     *
-     * @param string $name Case-insensitive header field name to remove.
-     * @return static
-     */
-    public function withoutHeader($name);
-
-    /**
-     * Gets the body of the message.
-     *
-     * @return StreamInterface Returns the body as a stream.
-     */
-    public function getBody();
-
-    /**
-     * Return an instance with the specified message body.
-     *
-     * The body MUST be a StreamInterface object.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return a new instance that has the
-     * new body stream.
-     *
-     * @param StreamInterface $body Body.
-     * @return static
-     * @throws \InvalidArgumentException When the body is not valid.
-     */
-    public function withBody(StreamInterface $body);
-}

src/Psr/Http/Message/RequestFactoryInterface.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface RequestFactoryInterface
-{
-    /**
-     * Create a new request.
-     *
-     * @param string $method The HTTP method associated with the request.
-     * @param UriInterface|string $uri The URI associated with the request. If
-     *     the value is a string, the factory MUST create a UriInterface
-     *     instance based on it.
-     *
-     * @return RequestInterface
-     */
-    public function createRequest(string $method, $uri): RequestInterface;
-}

src/Psr/Http/Message/RequestInterface.php

@@ -1,129 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * Representation of an outgoing, client-side request.
- *
- * Per the HTTP specification, this interface includes properties for
- * each of the following:
- *
- * - Protocol version
- * - HTTP method
- * - URI
- * - Headers
- * - Message body
- *
- * During construction, implementations MUST attempt to set the Host header from
- * a provided URI if no Host header is provided.
- *
- * Requests are considered immutable; all methods that might change state MUST
- * be implemented such that they retain the internal state of the current
- * message and return an instance that contains the changed state.
- */
-interface RequestInterface extends MessageInterface
-{
-    /**
-     * Retrieves the message's request target.
-     *
-     * Retrieves the message's request-target either as it will appear (for
-     * clients), as it appeared at request (for servers), or as it was
-     * specified for the instance (see withRequestTarget()).
-     *
-     * In most cases, this will be the origin-form of the composed URI,
-     * unless a value was provided to the concrete implementation (see
-     * withRequestTarget() below).
-     *
-     * If no URI is available, and no request-target has been specifically
-     * provided, this method MUST return the string "/".
-     *
-     * @return string
-     */
-    public function getRequestTarget();
-
-    /**
-     * Return an instance with the specific request-target.
-     *
-     * If the request needs a non-origin-form request-target — e.g., for
-     * specifying an absolute-form, authority-form, or asterisk-form —
-     * this method may be used to create an instance with the specified
-     * request-target, verbatim.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * changed request target.
-     *
-     * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
-     *     request-target forms allowed in request messages)
-     * @param mixed $requestTarget
-     * @return static
-     */
-    public function withRequestTarget($requestTarget);
-
-    /**
-     * Retrieves the HTTP method of the request.
-     *
-     * @return string Returns the request method.
-     */
-    public function getMethod();
-
-    /**
-     * Return an instance with the provided HTTP method.
-     *
-     * While HTTP method names are typically all uppercase characters, HTTP
-     * method names are case-sensitive and thus implementations SHOULD NOT
-     * modify the given string.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * changed request method.
-     *
-     * @param string $method Case-sensitive method.
-     * @return static
-     * @throws \InvalidArgumentException for invalid HTTP methods.
-     */
-    public function withMethod($method);
-
-    /**
-     * Retrieves the URI instance.
-     *
-     * This method MUST return a UriInterface instance.
-     *
-     * @link http://tools.ietf.org/html/rfc3986#section-4.3
-     * @return UriInterface Returns a UriInterface instance
-     *     representing the URI of the request.
-     */
-    public function getUri();
-
-    /**
-     * Returns an instance with the provided URI.
-     *
-     * This method MUST update the Host header of the returned request by
-     * default if the URI contains a host component. If the URI does not
-     * contain a host component, any pre-existing Host header MUST be carried
-     * over to the returned request.
-     *
-     * You can opt-in to preserving the original state of the Host header by
-     * setting `$preserveHost` to `true`. When `$preserveHost` is set to
-     * `true`, this method interacts with the Host header in the following ways:
-     *
-     * - If the Host header is missing or empty, and the new URI contains
-     *   a host component, this method MUST update the Host header in the returned
-     *   request.
-     * - If the Host header is missing or empty, and the new URI does not contain a
-     *   host component, this method MUST NOT update the Host header in the returned
-     *   request.
-     * - If a Host header is present and non-empty, this method MUST NOT update
-     *   the Host header in the returned request.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new UriInterface instance.
-     *
-     * @link http://tools.ietf.org/html/rfc3986#section-4.3
-     * @param UriInterface $uri New request URI to use.
-     * @param bool $preserveHost Preserve the original state of the Host header.
-     * @return static
-     */
-    public function withUri(UriInterface $uri, $preserveHost = false);
-}

src/Psr/Http/Message/ResponseFactoryInterface.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface ResponseFactoryInterface
-{
-    /**
-     * Create a new response.
-     *
-     * @param int $code HTTP status code; defaults to 200
-     * @param string $reasonPhrase Reason phrase to associate with status code
-     *     in generated response; if none is provided implementations MAY use
-     *     the defaults as suggested in the HTTP specification.
-     *
-     * @return ResponseInterface
-     */
-    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface;
-}

src/Psr/Http/Message/ResponseInterface.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * Representation of an outgoing, server-side response.
- *
- * Per the HTTP specification, this interface includes properties for
- * each of the following:
- *
- * - Protocol version
- * - Status code and reason phrase
- * - Headers
- * - Message body
- *
- * Responses are considered immutable; all methods that might change state MUST
- * be implemented such that they retain the internal state of the current
- * message and return an instance that contains the changed state.
- */
-interface ResponseInterface extends MessageInterface
-{
-    /**
-     * Gets the response status code.
-     *
-     * The status code is a 3-digit integer result code of the server's attempt
-     * to understand and satisfy the request.
-     *
-     * @return int Status code.
-     */
-    public function getStatusCode();
-
-    /**
-     * Return an instance with the specified status code and, optionally, reason phrase.
-     *
-     * If no reason phrase is specified, implementations MAY choose to default
-     * to the RFC 7231 or IANA recommended reason phrase for the response's
-     * status code.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated status and reason phrase.
-     *
-     * @link http://tools.ietf.org/html/rfc7231#section-6
-     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-     * @param int $code The 3-digit integer result code to set.
-     * @param string $reasonPhrase The reason phrase to use with the
-     *     provided status code; if none is provided, implementations MAY
-     *     use the defaults as suggested in the HTTP specification.
-     * @return static
-     * @throws \InvalidArgumentException For invalid status code arguments.
-     */
-    public function withStatus($code, $reasonPhrase = '');
-
-    /**
-     * Gets the response reason phrase associated with the status code.
-     *
-     * Because a reason phrase is not a required element in a response
-     * status line, the reason phrase value MAY be null. Implementations MAY
-     * choose to return the default RFC 7231 recommended reason phrase (or those
-     * listed in the IANA HTTP Status Code Registry) for the response's
-     * status code.
-     *
-     * @link http://tools.ietf.org/html/rfc7231#section-6
-     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-     * @return string Reason phrase; must return an empty string if none present.
-     */
-    public function getReasonPhrase();
-}

src/Psr/Http/Message/ServerRequestFactoryInterface.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface ServerRequestFactoryInterface
-{
-    /**
-     * Create a new server request.
-     *
-     * Note that server-params are taken precisely as given - no parsing/processing
-     * of the given values is performed, and, in particular, no attempt is made to
-     * determine the HTTP method or URI, which must be provided explicitly.
-     *
-     * @param string $method The HTTP method associated with the request.
-     * @param UriInterface|string $uri The URI associated with the request. If
-     *     the value is a string, the factory MUST create a UriInterface
-     *     instance based on it.
-     * @param array $serverParams Array of SAPI parameters with which to seed
-     *     the generated request instance.
-     *
-     * @return ServerRequestInterface
-     */
-    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface;
-}

src/Psr/Http/Message/ServerRequestInterface.php

@@ -1,261 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * Representation of an incoming, server-side HTTP request.
- *
- * Per the HTTP specification, this interface includes properties for
- * each of the following:
- *
- * - Protocol version
- * - HTTP method
- * - URI
- * - Headers
- * - Message body
- *
- * Additionally, it encapsulates all data as it has arrived to the
- * application from the CGI and/or PHP environment, including:
- *
- * - The values represented in $_SERVER.
- * - Any cookies provided (generally via $_COOKIE)
- * - Query string arguments (generally via $_GET, or as parsed via parse_str())
- * - Upload files, if any (as represented by $_FILES)
- * - Deserialized body parameters (generally from $_POST)
- *
- * $_SERVER values MUST be treated as immutable, as they represent application
- * state at the time of request; as such, no methods are provided to allow
- * modification of those values. The other values provide such methods, as they
- * can be restored from $_SERVER or the request body, and may need treatment
- * during the application (e.g., body parameters may be deserialized based on
- * content type).
- *
- * Additionally, this interface recognizes the utility of introspecting a
- * request to derive and match additional parameters (e.g., via URI path
- * matching, decrypting cookie values, deserializing non-form-encoded body
- * content, matching authorization headers to users, etc). These parameters
- * are stored in an "attributes" property.
- *
- * Requests are considered immutable; all methods that might change state MUST
- * be implemented such that they retain the internal state of the current
- * message and return an instance that contains the changed state.
- */
-interface ServerRequestInterface extends RequestInterface
-{
-    /**
-     * Retrieve server parameters.
-     *
-     * Retrieves data related to the incoming request environment,
-     * typically derived from PHP's $_SERVER superglobal. The data IS NOT
-     * REQUIRED to originate from $_SERVER.
-     *
-     * @return array
-     */
-    public function getServerParams();
-
-    /**
-     * Retrieve cookies.
-     *
-     * Retrieves cookies sent by the client to the server.
-     *
-     * The data MUST be compatible with the structure of the $_COOKIE
-     * superglobal.
-     *
-     * @return array
-     */
-    public function getCookieParams();
-
-    /**
-     * Return an instance with the specified cookies.
-     *
-     * The data IS NOT REQUIRED to come from the $_COOKIE superglobal, but MUST
-     * be compatible with the structure of $_COOKIE. Typically, this data will
-     * be injected at instantiation.
-     *
-     * This method MUST NOT update the related Cookie header of the request
-     * instance, nor related values in the server params.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated cookie values.
-     *
-     * @param array $cookies Array of key/value pairs representing cookies.
-     * @return static
-     */
-    public function withCookieParams(array $cookies);
-
-    /**
-     * Retrieve query string arguments.
-     *
-     * Retrieves the deserialized query string arguments, if any.
-     *
-     * Note: the query params might not be in sync with the URI or server
-     * params. If you need to ensure you are only getting the original
-     * values, you may need to parse the query string from `getUri()->getQuery()`
-     * or from the `QUERY_STRING` server param.
-     *
-     * @return array
-     */
-    public function getQueryParams();
-
-    /**
-     * Return an instance with the specified query string arguments.
-     *
-     * These values SHOULD remain immutable over the course of the incoming
-     * request. They MAY be injected during instantiation, such as from PHP's
-     * $_GET superglobal, or MAY be derived from some other value such as the
-     * URI. In cases where the arguments are parsed from the URI, the data
-     * MUST be compatible with what PHP's parse_str() would return for
-     * purposes of how duplicate query parameters are handled, and how nested
-     * sets are handled.
-     *
-     * Setting query string arguments MUST NOT change the URI stored by the
-     * request, nor the values in the server params.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated query string arguments.
-     *
-     * @param array $query Array of query string arguments, typically from
-     *     $_GET.
-     * @return static
-     */
-    public function withQueryParams(array $query);
-
-    /**
-     * Retrieve normalized file upload data.
-     *
-     * This method returns upload metadata in a normalized tree, with each leaf
-     * an instance of Psr\Http\Message\UploadedFileInterface.
-     *
-     * These values MAY be prepared from $_FILES or the message body during
-     * instantiation, or MAY be injected via withUploadedFiles().
-     *
-     * @return array An array tree of UploadedFileInterface instances; an empty
-     *     array MUST be returned if no data is present.
-     */
-    public function getUploadedFiles();
-
-    /**
-     * Create a new instance with the specified uploaded files.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated body parameters.
-     *
-     * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
-     * @return static
-     * @throws \InvalidArgumentException if an invalid structure is provided.
-     */
-    public function withUploadedFiles(array $uploadedFiles);
-
-    /**
-     * Retrieve any parameters provided in the request body.
-     *
-     * If the request Content-Type is either application/x-www-form-urlencoded
-     * or multipart/form-data, and the request method is POST, this method MUST
-     * return the contents of $_POST.
-     *
-     * Otherwise, this method may return any results of deserializing
-     * the request body content; as parsing returns structured content, the
-     * potential types MUST be arrays or objects only. A null value indicates
-     * the absence of body content.
-     *
-     * @return null|array|object The deserialized body parameters, if any.
-     *     These will typically be an array or object.
-     */
-    public function getParsedBody();
-
-    /**
-     * Return an instance with the specified body parameters.
-     *
-     * These MAY be injected during instantiation.
-     *
-     * If the request Content-Type is either application/x-www-form-urlencoded
-     * or multipart/form-data, and the request method is POST, use this method
-     * ONLY to inject the contents of $_POST.
-     *
-     * The data IS NOT REQUIRED to come from $_POST, but MUST be the results of
-     * deserializing the request body content. Deserialization/parsing returns
-     * structured data, and, as such, this method ONLY accepts arrays or objects,
-     * or a null value if nothing was available to parse.
-     *
-     * As an example, if content negotiation determines that the request data
-     * is a JSON payload, this method could be used to create a request
-     * instance with the deserialized parameters.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated body parameters.
-     *
-     * @param null|array|object $data The deserialized body data. This will
-     *     typically be in an array or object.
-     * @return static
-     * @throws \InvalidArgumentException if an unsupported argument type is
-     *     provided.
-     */
-    public function withParsedBody($data);
-
-    /**
-     * Retrieve attributes derived from the request.
-     *
-     * The request "attributes" may be used to allow injection of any
-     * parameters derived from the request: e.g., the results of path
-     * match operations; the results of decrypting cookies; the results of
-     * deserializing non-form-encoded message bodies; etc. Attributes
-     * will be application and request specific, and CAN be mutable.
-     *
-     * @return array Attributes derived from the request.
-     */
-    public function getAttributes();
-
-    /**
-     * Retrieve a single derived request attribute.
-     *
-     * Retrieves a single derived request attribute as described in
-     * getAttributes(). If the attribute has not been previously set, returns
-     * the default value as provided.
-     *
-     * This method obviates the need for a hasAttribute() method, as it allows
-     * specifying a default value to return if the attribute is not found.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @param mixed $default Default value to return if the attribute does not exist.
-     * @return mixed
-     */
-    public function getAttribute($name, $default = null);
-
-    /**
-     * Return an instance with the specified derived request attribute.
-     *
-     * This method allows setting a single derived request attribute as
-     * described in getAttributes().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated attribute.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @param mixed $value The value of the attribute.
-     * @return static
-     */
-    public function withAttribute($name, $value);
-
-    /**
-     * Return an instance that removes the specified derived request attribute.
-     *
-     * This method allows removing a single derived request attribute as
-     * described in getAttributes().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that removes
-     * the attribute.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @return static
-     */
-    public function withoutAttribute($name);
-}

src/Psr/Http/Message/StreamFactoryInterface.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface StreamFactoryInterface
-{
-    /**
-     * Create a new stream from a string.
-     *
-     * The stream SHOULD be created with a temporary resource.
-     *
-     * @param string $content String content with which to populate the stream.
-     *
-     * @return StreamInterface
-     */
-    public function createStream(string $content = ''): StreamInterface;
-
-    /**
-     * Create a stream from an existing file.
-     *
-     * The file MUST be opened using the given mode, which may be any mode
-     * supported by the `fopen` function.
-     *
-     * The `$filename` MAY be any string supported by `fopen()`.
-     *
-     * @param string $filename Filename or stream URI to use as basis of stream.
-     * @param string $mode Mode with which to open the underlying filename/stream.
-     *
-     * @return StreamInterface
-     */
-    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface;
-
-    /**
-     * Create a new stream from an existing resource.
-     *
-     * The stream MUST be readable and may be writable.
-     *
-     * @param resource $resource PHP resource to use as basis of stream.
-     *
-     * @return StreamInterface
-     */
-    public function createStreamFromResource($resource): StreamInterface;
-}

src/Psr/Http/Message/StreamInterface.php

@@ -1,158 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * Describes a data stream.
- *
- * Typically, an instance will wrap a PHP stream; this interface provides
- * a wrapper around the most common operations, including serialization of
- * the entire stream to a string.
- */
-interface StreamInterface
-{
-    /**
-     * Reads all data from the stream into a string, from the beginning to end.
-     *
-     * This method MUST attempt to seek to the beginning of the stream before
-     * reading data and read the stream until the end is reached.
-     *
-     * Warning: This could attempt to load a large amount of data into memory.
-     *
-     * This method MUST NOT raise an exception in order to conform with PHP's
-     * string casting operations.
-     *
-     * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
-     * @return string
-     */
-    public function __toString();
-
-    /**
-     * Closes the stream and any underlying resources.
-     *
-     * @return void
-     */
-    public function close();
-
-    /**
-     * Separates any underlying resources from the stream.
-     *
-     * After the stream has been detached, the stream is in an unusable state.
-     *
-     * @return resource|null Underlying PHP stream, if any
-     */
-    public function detach();
-
-    /**
-     * Get the size of the stream if known.
-     *
-     * @return int|null Returns the size in bytes if known, or null if unknown.
-     */
-    public function getSize();
-
-    /**
-     * Returns the current position of the file read/write pointer
-     *
-     * @return int Position of the file pointer
-     * @throws \RuntimeException on error.
-     */
-    public function tell();
-
-    /**
-     * Returns true if the stream is at the end of the stream.
-     *
-     * @return bool
-     */
-    public function eof();
-
-    /**
-     * Returns whether or not the stream is seekable.
-     *
-     * @return bool
-     */
-    public function isSeekable();
-
-    /**
-     * Seek to a position in the stream.
-     *
-     * @link http://www.php.net/manual/en/function.fseek.php
-     * @param int $offset Stream offset
-     * @param int $whence Specifies how the cursor position will be calculated
-     *     based on the seek offset. Valid values are identical to the built-in
-     *     PHP $whence values for `fseek()`.  SEEK_SET: Set position equal to
-     *     offset bytes SEEK_CUR: Set position to current location plus offset
-     *     SEEK_END: Set position to end-of-stream plus offset.
-     * @throws \RuntimeException on failure.
-     */
-    public function seek($offset, $whence = SEEK_SET);
-
-    /**
-     * Seek to the beginning of the stream.
-     *
-     * If the stream is not seekable, this method will raise an exception;
-     * otherwise, it will perform a seek(0).
-     *
-     * @see seek()
-     * @link http://www.php.net/manual/en/function.fseek.php
-     * @throws \RuntimeException on failure.
-     */
-    public function rewind();
-
-    /**
-     * Returns whether or not the stream is writable.
-     *
-     * @return bool
-     */
-    public function isWritable();
-
-    /**
-     * Write data to the stream.
-     *
-     * @param string $string The string that is to be written.
-     * @return int Returns the number of bytes written to the stream.
-     * @throws \RuntimeException on failure.
-     */
-    public function write($string);
-
-    /**
-     * Returns whether or not the stream is readable.
-     *
-     * @return bool
-     */
-    public function isReadable();
-
-    /**
-     * Read data from the stream.
-     *
-     * @param int $length Read up to $length bytes from the object and return
-     *     them. Fewer than $length bytes may be returned if underlying stream
-     *     call returns fewer bytes.
-     * @return string Returns the data read from the stream, or an empty string
-     *     if no bytes are available.
-     * @throws \RuntimeException if an error occurs.
-     */
-    public function read($length);
-
-    /**
-     * Returns the remaining contents in a string
-     *
-     * @return string
-     * @throws \RuntimeException if unable to read or an error occurs while
-     *     reading.
-     */
-    public function getContents();
-
-    /**
-     * Get stream metadata as an associative array or retrieve a specific key.
-     *
-     * The keys returned are identical to the keys returned from PHP's
-     * stream_get_meta_data() function.
-     *
-     * @link http://php.net/manual/en/function.stream-get-meta-data.php
-     * @param string $key Specific metadata to retrieve.
-     * @return array|mixed|null Returns an associative array if no key is
-     *     provided. Returns a specific key value if a key is provided and the
-     *     value is found, or null if the key is not found.
-     */
-    public function getMetadata($key = null);
-}

src/Psr/Http/Message/UploadedFileFactoryInterface.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface UploadedFileFactoryInterface
-{
-    /**
-     * Create a new uploaded file.
-     *
-     * If a size is not provided it will be determined by checking the size of
-     * the file.
-     *
-     * @see http://php.net/manual/features.file-upload.post-method.php
-     * @see http://php.net/manual/features.file-upload.errors.php
-     *
-     * @param StreamInterface $stream Underlying stream representing the
-     *     uploaded file content.
-     * @param int $size in bytes
-     * @param int $error PHP file upload error
-     * @param string $clientFilename Filename as provided by the client, if any.
-     * @param string $clientMediaType Media type as provided by the client, if any.
-     *
-     * @return UploadedFileInterface
-     *
-     * @throws \InvalidArgumentException If the file resource is not readable.
-     */
-    public function createUploadedFile(
-        StreamInterface $stream,
-        int $size = null,
-        int $error = \UPLOAD_ERR_OK,
-        string $clientFilename = null,
-        string $clientMediaType = null
-    ): UploadedFileInterface;
-}

src/Psr/Http/Message/UploadedFileInterface.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * Value object representing a file uploaded through an HTTP request.
- *
- * Instances of this interface are considered immutable; all methods that
- * might change state MUST be implemented such that they retain the internal
- * state of the current instance and return an instance that contains the
- * changed state.
- */
-interface UploadedFileInterface
-{
-    /**
-     * Retrieve a stream representing the uploaded file.
-     *
-     * This method MUST return a StreamInterface instance, representing the
-     * uploaded file. The purpose of this method is to allow utilizing native PHP
-     * stream functionality to manipulate the file upload, such as
-     * stream_copy_to_stream() (though the result will need to be decorated in a
-     * native PHP stream wrapper to work with such functions).
-     *
-     * If the moveTo() method has been called previously, this method MUST raise
-     * an exception.
-     *
-     * @return StreamInterface Stream representation of the uploaded file.
-     * @throws \RuntimeException in cases when no stream is available or can be
-     *     created.
-     */
-    public function getStream();
-
-    /**
-     * Move the uploaded file to a new location.
-     *
-     * Use this method as an alternative to move_uploaded_file(). This method is
-     * guaranteed to work in both SAPI and non-SAPI environments.
-     * Implementations must determine which environment they are in, and use the
-     * appropriate method (move_uploaded_file(), rename(), or a stream
-     * operation) to perform the operation.
-     *
-     * $targetPath may be an absolute path, or a relative path. If it is a
-     * relative path, resolution should be the same as used by PHP's rename()
-     * function.
-     *
-     * The original file or stream MUST be removed on completion.
-     *
-     * If this method is called more than once, any subsequent calls MUST raise
-     * an exception.
-     *
-     * When used in an SAPI environment where $_FILES is populated, when writing
-     * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
-     * used to ensure permissions and upload status are verified correctly.
-     *
-     * If you wish to move to a stream, use getStream(), as SAPI operations
-     * cannot guarantee writing to stream destinations.
-     *
-     * @see http://php.net/is_uploaded_file
-     * @see http://php.net/move_uploaded_file
-     * @param string $targetPath Path to which to move the uploaded file.
-     * @throws \InvalidArgumentException if the $targetPath specified is invalid.
-     * @throws \RuntimeException on any error during the move operation, or on
-     *     the second or subsequent call to the method.
-     */
-    public function moveTo($targetPath);
-    
-    /**
-     * Retrieve the file size.
-     *
-     * Implementations SHOULD return the value stored in the "size" key of
-     * the file in the $_FILES array if available, as PHP calculates this based
-     * on the actual size transmitted.
-     *
-     * @return int|null The file size in bytes or null if unknown.
-     */
-    public function getSize();
-    
-    /**
-     * Retrieve the error associated with the uploaded file.
-     *
-     * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
-     *
-     * If the file was uploaded successfully, this method MUST return
-     * UPLOAD_ERR_OK.
-     *
-     * Implementations SHOULD return the value stored in the "error" key of
-     * the file in the $_FILES array.
-     *
-     * @see http://php.net/manual/en/features.file-upload.errors.php
-     * @return int One of PHP's UPLOAD_ERR_XXX constants.
-     */
-    public function getError();
-    
-    /**
-     * Retrieve the filename sent by the client.
-     *
-     * Do not trust the value returned by this method. A client could send
-     * a malicious filename with the intention to corrupt or hack your
-     * application.
-     *
-     * Implementations SHOULD return the value stored in the "name" key of
-     * the file in the $_FILES array.
-     *
-     * @return string|null The filename sent by the client or null if none
-     *     was provided.
-     */
-    public function getClientFilename();
-    
-    /**
-     * Retrieve the media type sent by the client.
-     *
-     * Do not trust the value returned by this method. A client could send
-     * a malicious media type with the intention to corrupt or hack your
-     * application.
-     *
-     * Implementations SHOULD return the value stored in the "type" key of
-     * the file in the $_FILES array.
-     *
-     * @return string|null The media type sent by the client or null if none
-     *     was provided.
-     */
-    public function getClientMediaType();
-}

src/Psr/Http/Message/UriFactoryInterface.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface UriFactoryInterface
-{
-    /**
-     * Create a new URI.
-     *
-     * @param string $uri
-     *
-     * @return UriInterface
-     *
-     * @throws \InvalidArgumentException If the given URI cannot be parsed.
-     */
-    public function createUri(string $uri = ''): UriInterface;
-}

src/Psr/Http/Message/UriInterface.php

@@ -1,323 +0,0 @@
-<?php
-namespace Psr\Http\Message;
-
-/**
- * Value object representing a URI.
- *
- * This interface is meant to represent URIs according to RFC 3986 and to
- * provide methods for most common operations. Additional functionality for
- * working with URIs can be provided on top of the interface or externally.
- * Its primary use is for HTTP requests, but may also be used in other
- * contexts.
- *
- * Instances of this interface are considered immutable; all methods that
- * might change state MUST be implemented such that they retain the internal
- * state of the current instance and return an instance that contains the
- * changed state.
- *
- * Typically the Host header will be also be present in the request message.
- * For server-side requests, the scheme will typically be discoverable in the
- * server parameters.
- *
- * @link http://tools.ietf.org/html/rfc3986 (the URI specification)
- */
-interface UriInterface
-{
-    /**
-     * Retrieve the scheme component of the URI.
-     *
-     * If no scheme is present, this method MUST return an empty string.
-     *
-     * The value returned MUST be normalized to lowercase, per RFC 3986
-     * Section 3.1.
-     *
-     * The trailing ":" character is not part of the scheme and MUST NOT be
-     * added.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-3.1
-     * @return string The URI scheme.
-     */
-    public function getScheme();
-
-    /**
-     * Retrieve the authority component of the URI.
-     *
-     * If no authority information is present, this method MUST return an empty
-     * string.
-     *
-     * The authority syntax of the URI is:
-     *
-     * <pre>
-     * [user-info@]host[:port]
-     * </pre>
-     *
-     * If the port component is not set or is the standard port for the current
-     * scheme, it SHOULD NOT be included.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-3.2
-     * @return string The URI authority, in "[user-info@]host[:port]" format.
-     */
-    public function getAuthority();
-
-    /**
-     * Retrieve the user information component of the URI.
-     *
-     * If no user information is present, this method MUST return an empty
-     * string.
-     *
-     * If a user is present in the URI, this will return that value;
-     * additionally, if the password is also present, it will be appended to the
-     * user value, with a colon (":") separating the values.
-     *
-     * The trailing "@" character is not part of the user information and MUST
-     * NOT be added.
-     *
-     * @return string The URI user information, in "username[:password]" format.
-     */
-    public function getUserInfo();
-
-    /**
-     * Retrieve the host component of the URI.
-     *
-     * If no host is present, this method MUST return an empty string.
-     *
-     * The value returned MUST be normalized to lowercase, per RFC 3986
-     * Section 3.2.2.
-     *
-     * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
-     * @return string The URI host.
-     */
-    public function getHost();
-
-    /**
-     * Retrieve the port component of the URI.
-     *
-     * If a port is present, and it is non-standard for the current scheme,
-     * this method MUST return it as an integer. If the port is the standard port
-     * used with the current scheme, this method SHOULD return null.
-     *
-     * If no port is present, and no scheme is present, this method MUST return
-     * a null value.
-     *
-     * If no port is present, but a scheme is present, this method MAY return
-     * the standard port for that scheme, but SHOULD return null.
-     *
-     * @return null|int The URI port.
-     */
-    public function getPort();
-
-    /**
-     * Retrieve the path component of the URI.
-     *
-     * The path can either be empty or absolute (starting with a slash) or
-     * rootless (not starting with a slash). Implementations MUST support all
-     * three syntaxes.
-     *
-     * Normally, the empty path "" and absolute path "/" are considered equal as
-     * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
-     * do this normalization because in contexts with a trimmed base path, e.g.
-     * the front controller, this difference becomes significant. It's the task
-     * of the user to handle both "" and "/".
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.3.
-     *
-     * As an example, if the value should include a slash ("/") not intended as
-     * delimiter between path segments, that value MUST be passed in encoded
-     * form (e.g., "%2F") to the instance.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.3
-     * @return string The URI path.
-     */
-    public function getPath();
-
-    /**
-     * Retrieve the query string of the URI.
-     *
-     * If no query string is present, this method MUST return an empty string.
-     *
-     * The leading "?" character is not part of the query and MUST NOT be
-     * added.
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.4.
-     *
-     * As an example, if a value in a key/value pair of the query string should
-     * include an ampersand ("&") not intended as a delimiter between values,
-     * that value MUST be passed in encoded form (e.g., "%26") to the instance.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.4
-     * @return string The URI query string.
-     */
-    public function getQuery();
-
-    /**
-     * Retrieve the fragment component of the URI.
-     *
-     * If no fragment is present, this method MUST return an empty string.
-     *
-     * The leading "#" character is not part of the fragment and MUST NOT be
-     * added.
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.5.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.5
-     * @return string The URI fragment.
-     */
-    public function getFragment();
-
-    /**
-     * Return an instance with the specified scheme.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified scheme.
-     *
-     * Implementations MUST support the schemes "http" and "https" case
-     * insensitively, and MAY accommodate other schemes if required.
-     *
-     * An empty scheme is equivalent to removing the scheme.
-     *
-     * @param string $scheme The scheme to use with the new instance.
-     * @return static A new instance with the specified scheme.
-     * @throws \InvalidArgumentException for invalid or unsupported schemes.
-     */
-    public function withScheme($scheme);
-
-    /**
-     * Return an instance with the specified user information.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified user information.
-     *
-     * Password is optional, but the user information MUST include the
-     * user; an empty string for the user is equivalent to removing user
-     * information.
-     *
-     * @param string $user The user name to use for authority.
-     * @param null|string $password The password associated with $user.
-     * @return static A new instance with the specified user information.
-     */
-    public function withUserInfo($user, $password = null);
-
-    /**
-     * Return an instance with the specified host.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified host.
-     *
-     * An empty host value is equivalent to removing the host.
-     *
-     * @param string $host The hostname to use with the new instance.
-     * @return static A new instance with the specified host.
-     * @throws \InvalidArgumentException for invalid hostnames.
-     */
-    public function withHost($host);
-
-    /**
-     * Return an instance with the specified port.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified port.
-     *
-     * Implementations MUST raise an exception for ports outside the
-     * established TCP and UDP port ranges.
-     *
-     * A null value provided for the port is equivalent to removing the port
-     * information.
-     *
-     * @param null|int $port The port to use with the new instance; a null value
-     *     removes the port information.
-     * @return static A new instance with the specified port.
-     * @throws \InvalidArgumentException for invalid ports.
-     */
-    public function withPort($port);
-
-    /**
-     * Return an instance with the specified path.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified path.
-     *
-     * The path can either be empty or absolute (starting with a slash) or
-     * rootless (not starting with a slash). Implementations MUST support all
-     * three syntaxes.
-     *
-     * If the path is intended to be domain-relative rather than path relative then
-     * it must begin with a slash ("/"). Paths not starting with a slash ("/")
-     * are assumed to be relative to some base path known to the application or
-     * consumer.
-     *
-     * Users can provide both encoded and decoded path characters.
-     * Implementations ensure the correct encoding as outlined in getPath().
-     *
-     * @param string $path The path to use with the new instance.
-     * @return static A new instance with the specified path.
-     * @throws \InvalidArgumentException for invalid paths.
-     */
-    public function withPath($path);
-
-    /**
-     * Return an instance with the specified query string.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified query string.
-     *
-     * Users can provide both encoded and decoded query characters.
-     * Implementations ensure the correct encoding as outlined in getQuery().
-     *
-     * An empty query string value is equivalent to removing the query string.
-     *
-     * @param string $query The query string to use with the new instance.
-     * @return static A new instance with the specified query string.
-     * @throws \InvalidArgumentException for invalid query strings.
-     */
-    public function withQuery($query);
-
-    /**
-     * Return an instance with the specified URI fragment.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified URI fragment.
-     *
-     * Users can provide both encoded and decoded fragment characters.
-     * Implementations ensure the correct encoding as outlined in getFragment().
-     *
-     * An empty fragment value is equivalent to removing the fragment.
-     *
-     * @param string $fragment The fragment to use with the new instance.
-     * @return static A new instance with the specified fragment.
-     */
-    public function withFragment($fragment);
-
-    /**
-     * Return the string representation as a URI reference.
-     *
-     * Depending on which components of the URI are present, the resulting
-     * string is either a full URI or relative reference according to RFC 3986,
-     * Section 4.1. The method concatenates the various components of the URI,
-     * using the appropriate delimiters:
-     *
-     * - If a scheme is present, it MUST be suffixed by ":".
-     * - If an authority is present, it MUST be prefixed by "//".
-     * - The path can be concatenated without delimiters. But there are two
-     *   cases where the path has to be adjusted to make the URI reference
-     *   valid as PHP does not allow to throw an exception in __toString():
-     *     - If the path is rootless and an authority is present, the path MUST
-     *       be prefixed by "/".
-     *     - If the path is starting with more than one "/" and no authority is
-     *       present, the starting slashes MUST be reduced to one.
-     * - If a query is present, it MUST be prefixed by "?".
-     * - If a fragment is present, it MUST be prefixed by "#".
-     *
-     * @see http://tools.ietf.org/html/rfc3986#section-4.1
-     * @return string
-     */
-    public function __toString();
-}

src/Psr/Http/Server/MiddlewareInterface.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Psr\Http\Server;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * Participant in processing a server request and response.
- *
- * An HTTP middleware component participates in processing an HTTP message:
- * by acting on the request, generating the response, or forwarding the
- * request to a subsequent middleware and possibly acting on its response.
- */
-interface MiddlewareInterface
-{
-    /**
-     * Process an incoming server request.
-     *
-     * Processes an incoming server request in order to produce a response.
-     * If unable to produce the response itself, it may delegate to the provided
-     * request handler to do so.
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface;
-}

src/Psr/Http/Server/RequestHandlerInterface.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace Psr\Http\Server;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * Handles a server request and produces a response.
- *
- * An HTTP request handler process an HTTP request in order to produce an
- * HTTP response.
- */
-interface RequestHandlerInterface
-{
-    /**
-     * Handles a request and produces a response.
-     *
-     * May call other collaborating code to generate the response.
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface;
-}

src/Psr/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 PHP-FIG
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.