Merge branch 'master' of github.com:mevdschee/php-crud-api

Author: mevdschee

.gitignore

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

README.md

@@ -119,10 +119,18 @@ The following features are supported:
 
 ## Compilation
 
+You can install all dependencies of this project using the following command:
+
+    php install.php
+
 You can compile all files into a single "`api.php`" file using:
 
     php build.php
 
+NB: The install script will patch the dependencies in the vendor directory for PHP 7.0 compatibility.
+
+### Development
+
 You can access the non-compiled code at the URL:
 
     http://localhost:8080/src/records/posts/1
@@ -137,7 +145,7 @@ You can update all dependencies of this project using the following command:
 
 This script will install and run [Composer](https://getcomposer.org/) to update the dependencies.
 
-NB: The update script will also patch the dependencies in the vendor directory for PHP 7.0 compatibility.
+NB: The update script will patch the dependencies in the vendor directory for PHP 7.0 compatibility.
 
 ## TreeQL, a pragmatic GraphQL
 

api.php

@@ -1498,6 +1498,11 @@ public function createRequest(string $method, $uri): RequestInterface
 
         public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
         {
+            if (2 > \func_num_args()) {
+                // This will make the Response class to use a custom reasonPhrase
+                $reasonPhrase = null;
+            }
+
             return new Response($code, [], null, '1.1', $reasonPhrase);
         }
 
@@ -1951,7 +1956,7 @@ public function __construct(int $status = 200, array $headers = [], $body = null
             if (null === $reason && isset(self::PHRASES[$this->statusCode])) {
                 $this->reasonPhrase = self::PHRASES[$status];
             } else {
-                $this->reasonPhrase = $reason;
+                $this->reasonPhrase = $reason ?? '';
             }
 
             $this->protocol = $version;
@@ -2226,7 +2231,7 @@ public static function create($body = ''): StreamInterface
                 $new = new self();
                 $new->stream = $body;
                 $meta = \stream_get_meta_data($new->stream);
-                $new->seekable = $meta['seekable'];
+                $new->seekable = $meta['seekable'] && 0 === \fseek($new->stream, 0, \SEEK_CUR);
                 $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');
@@ -2854,8 +2859,8 @@ private function filterPort($port) /*:?int*/
             }
 
             $port = (int) $port;
-            if (1 > $port || 0xffff < $port) {
-                throw new \InvalidArgumentException(\sprintf('Invalid port: %d. Must be between 1 and 65535', $port));
+            if (0 > $port || 0xffff < $port) {
+                throw new \InvalidArgumentException(\sprintf('Invalid port: %d. Must be between 0 and 65535', $port));
             }
 
             return self::isNonStandardPort($this->scheme, $port) ? $port : null;
@@ -10130,7 +10135,7 @@ private function addParsedBody(ServerRequestInterface $request): ServerRequestIn
         {
             $parsedBody = $request->getParsedBody();
             if ($parsedBody) {
-                $request = $this->applySlim3Hack($request);
+                $request = $this->applySlimHack($request);
             } else {
                 $body = $request->getBody();
                 if ($body->isReadable()) {
@@ -10150,9 +10155,10 @@ private function addParsedBody(ServerRequestInterface $request): ServerRequestIn
             return $request;
         }
 
-        private function applySlim3Hack(ServerRequestInterface $request): ServerRequestInterface
+        private function applySlimHack(ServerRequestInterface $request): ServerRequestInterface
         {
-            if (get_class($request) == 'Slim\Http\Request') {
+            $class = get_class($request);
+            if (substr($class, 0, 9) == 'Slim\Http') {
                 $parsedBody = $request->getParsedBody();
                 $contents = json_encode($parsedBody);
                 $parsedBody = $this->parseBody($contents);
@@ -10622,6 +10628,7 @@ public static function toString(ResponseInterface $response): string
         'username' => 'php-crud-api',
         'password' => 'php-crud-api',
         'database' => 'php-crud-api',
+        'controllers' => 'records,columns'
     ]);
     $request = RequestFactory::fromGlobals();
     $api = new Api($config);

build.php

@@ -1,5 +1,7 @@
 <?php
 
+// combine src and vendor directories into a single file
+
 function removeIgnored(string $dir, array &$entries, array $ignore)
 {
     foreach ($entries as $i => $entry) {
@@ -34,8 +36,8 @@ function runDir(string $base, string $dir, array &$lines, array $ignore): int
             $data = preg_replace('/\s*<\?php\s+/s', '', $data, 1);
             $data = preg_replace('/^.*?(vendor\/autoload|declare\s*\(\s*strict_types\s*=\s*1).*?$/m', '', $data);
             array_push($lines, "// file: $dir/$entry");
-            if (!preg_match('/^\s*(namespace[^;]*);/', $data)){
-                $data = "namespace;\n".$data;
+            if (!preg_match('/^\s*(namespace[^;]*);/', $data)) {
+                $data = "namespace;\n" . $data;
             }
             foreach (explode("\n", trim($data)) as $line) {
                 if ($line) {