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

Author: mevdschee

Dockerfile

@@ -1,7 +1,14 @@
 FROM php:apache
 
 RUN docker-php-ext-install pdo pdo_mysql
-    
+
+RUN apt-get update; \
+    apt-get install -y libpq5 libpq-dev; \
+    docker-php-ext-install pdo pdo_pgsql; \
+    apt-get autoremove --purge -y libpq-dev; \
+    apt-get clean ; \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*    
+
 RUN a2enmod rewrite
 
 COPY api.php /var/www/html/api.php

README.md

@@ -614,10 +614,10 @@ You can tune the middleware behavior using middleware specific configuration par
 - "firewall.reverseProxy": Set to "true" when a reverse proxy is used ("")
 - "firewall.allowedIpAddresses": List of IP addresses that are allowed to connect ("")
 - "cors.allowedOrigins": The origins allowed in the CORS headers ("*")
-- "cors.allowHeaders": The headers allowed in the CORS request ("Content-Type, X-XSRF-TOKEN")
+- "cors.allowHeaders": The headers allowed in the CORS request ("Content-Type, X-XSRF-TOKEN, X-Authorization, X-Debug-Info, X-Exception-Name, X-Exception-Message, X-Exception-File")
 - "cors.allowMethods": The methods allowed in the CORS request ("OPTIONS, GET, PUT, POST, DELETE, PATCH")
 - "cors.allowCredentials": To allow credentials in the CORS request ("true")
-- "cors.exposeHeaders": Whitelist headers that browsers are allowed to access ("")
+- "cors.exposeHeaders": Whitelist headers that browsers are allowed to access ("X-Debug-Info, X-Exception-Name, X-Exception-Message, X-Exception-File")
 - "cors.maxAge": The time that the CORS grant is valid in seconds ("1728000")
 - "xsrf.excludeMethods": The methods that do not require XSRF protection ("OPTIONS,GET")
 - "xsrf.cookieName": The name of the XSRF protection cookie ("XSRF-TOKEN")
@@ -1334,9 +1334,11 @@ There is a `Dockerfile` in the repository that is used to build an image at:
 
 [https://hub.docker.com/r/mevdschee/php-crud-api](https://hub.docker.com/r/mevdschee/php-crud-api)
 
+It will be automatically build on every release. The "latest" tag points to the last release.
+
 ### Docker compose
 
-This repository also contains a `docker-compose.yml` file that can be installed/built/ran using:
+This repository also contains a `docker-compose.yml` file that you can install/build/run using:
 
     sudo apt install docker-compose
     docker-compose build
@@ -1348,4 +1350,4 @@ Test the script (running in the container) by opening the following URL:
 
     http://localhost:8080/records/posts/1
 
-Enjoy!
+Enjoy!

api.php

@@ -7399,7 +7399,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 $response = $this->responder->error(ErrorCode::ORIGIN_FORBIDDEN, $origin);
             } elseif ($method == 'OPTIONS') {
                 $response = ResponseFactory::fromStatus(ResponseFactory::OK);
-                $allowHeaders = $this->getProperty('allowHeaders', 'Content-Type, X-XSRF-TOKEN, X-Authorization');
+                $allowHeaders = $this->getProperty('allowHeaders', 'Content-Type, X-XSRF-TOKEN, X-Authorization, X-Debug-Info, X-Exception-Name, X-Exception-Message, X-Exception-File');
                 if ($allowHeaders) {
                     $response = $response->withHeader('Access-Control-Allow-Headers', $allowHeaders);
                 }
@@ -7415,7 +7415,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 if ($maxAge) {
                     $response = $response->withHeader('Access-Control-Max-Age', $maxAge);
                 }
-                $exposeHeaders = $this->getProperty('exposeHeaders', '');
+                $exposeHeaders = $this->getProperty('exposeHeaders', 'X-Debug-Info, X-Exception-Name, X-Exception-Message, X-Exception-File');
                 if ($exposeHeaders) {
                     $response = $response->withHeader('Access-Control-Expose-Headers', $exposeHeaders);
                 }
@@ -7954,7 +7954,7 @@ private function getCondition(string $tableName, array $pairs): Condition
         private function getPairs($handler, string $operation, string $tableName): array
         {
             $result = array();
-            $pairs = call_user_func($handler, $operation, $tableName);
+            $pairs = call_user_func($handler, $operation, $tableName) ?: [];
             $table = $this->reflection->getTable($tableName);
             foreach ($pairs as $k => $v) {
                 if ($table->hasColumn($k)) {

src/Tqdev/PhpCrudApi/Middleware/CorsMiddleware.php

@@ -34,7 +34,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             $response = $this->responder->error(ErrorCode::ORIGIN_FORBIDDEN, $origin);
         } elseif ($method == 'OPTIONS') {
             $response = ResponseFactory::fromStatus(ResponseFactory::OK);
-            $allowHeaders = $this->getProperty('allowHeaders', 'Content-Type, X-XSRF-TOKEN, X-Authorization');
+            $allowHeaders = $this->getProperty('allowHeaders', 'Content-Type, X-XSRF-TOKEN, X-Authorization, X-Debug-Info, X-Exception-Name, X-Exception-Message, X-Exception-File');
             if ($allowHeaders) {
                 $response = $response->withHeader('Access-Control-Allow-Headers', $allowHeaders);
             }
@@ -50,7 +50,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             if ($maxAge) {
                 $response = $response->withHeader('Access-Control-Max-Age', $maxAge);
             }
-            $exposeHeaders = $this->getProperty('exposeHeaders', '');
+            $exposeHeaders = $this->getProperty('exposeHeaders', 'X-Debug-Info, X-Exception-Name, X-Exception-Message, X-Exception-File');
             if ($exposeHeaders) {
                 $response = $response->withHeader('Access-Control-Expose-Headers', $exposeHeaders);
             }

src/Tqdev/PhpCrudApi/Middleware/MultiTenancyMiddleware.php

@@ -38,7 +38,7 @@ private function getCondition(string $tableName, array $pairs): Condition
     private function getPairs($handler, string $operation, string $tableName): array
     {
         $result = array();
-        $pairs = call_user_func($handler, $operation, $tableName);
+        $pairs = call_user_func($handler, $operation, $tableName) ?: [];
         $table = $this->reflection->getTable($tableName);
         foreach ($pairs as $k => $v) {
             if ($table->hasColumn($k)) {