wip

Author: mevdschee

.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 @@ public function getBody();
     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 @@ public function getUri();
     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 @@ public function withStatus($code, $reasonPhrase = '');
     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 @@ public function withAttribute($name, $value);
     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 @@ public function getContents();
     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 @@ public function getClientFilename();
     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 @@ public function withFragment($fragment);
     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 @@ public function createServerRequest(string $method, $uri, array $serverParams =
     }
 }
 
-// file: src/Nyholm/Psr7/MessageTrait.php
+// file: vendor/nyholm/psr7/src/MessageTrait.php
 
 trait MessageTrait
 {
@@ -486,7 +486,7 @@ private function validateAndTrimHeader($header, $values): array
     }
 }
 
-// file: src/Nyholm/Psr7/Request.php
+// file: vendor/nyholm/psr7/src/Request.php
 
 final class Request implements RequestInterface
 {
@@ -514,7 +514,7 @@ public function __construct(string $method, $uri, array $headers = [], $body = n
     }
 }
 
-// file: src/Nyholm/Psr7/RequestTrait.php
+// file: vendor/nyholm/psr7/src/RequestTrait.php
 
 trait RequestTrait
 {
@@ -611,7 +611,7 @@ private function updateHostFromUri(): void
     }
 }
 
-// file: src/Nyholm/Psr7/Response.php
+// file: vendor/nyholm/psr7/src/Response.php
 
 final class Response implements ResponseInterface
 {
@@ -678,7 +678,7 @@ public function withStatus($code, $reasonPhrase = ''): self
     }
 }
 
-// file: src/Nyholm/Psr7/ServerRequest.php
+// file: vendor/nyholm/psr7/src/ServerRequest.php
 
 final class ServerRequest implements ServerRequestInterface
 {
@@ -815,7 +815,7 @@ public function withoutAttribute($attribute): self
     }
 }
 
-// file: src/Nyholm/Psr7/Stream.php
+// file: vendor/nyholm/psr7/src/Stream.php
 
 final class Stream implements StreamInterface
 {
@@ -1042,7 +1042,7 @@ public function getMetadata($key = null)
     }
 }
 
-// file: src/Nyholm/Psr7/UploadedFile.php
+// file: vendor/nyholm/psr7/src/UploadedFile.php
 
 final class UploadedFile implements UploadedFileInterface
 {
@@ -1184,7 +1184,7 @@ public function getClientMediaType(): ?string
     }
 }
 
-// file: src/Nyholm/Psr7/Uri.php
+// file: vendor/nyholm/psr7/src/Uri.php
 
 final class Uri implements UriInterface
 {
@@ -1463,7 +1463,7 @@ private static function rawurlencodeMatchZero(array $match): string
     }
 }
 
-// file: src/Nyholm/Psr7Server/ServerRequestCreator.php
+// file: vendor/nyholm/psr7-server/src/ServerRequestCreator.php
 
 final class ServerRequestCreator implements ServerRequestCreatorInterface
 {
@@ -1496,7 +1496,7 @@ public function fromGlobals(): ServerRequestInterface
 
         $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 @@ private function createUriFromArray(array $server): UriInterface
             $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 @@ private function createUriFromArray(array $server): UriInterface
     }
 }
 
-// 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 @@ private function getOptions(): array
         }
     }
 
-    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;