use PSR-7 for OpenAPI

mevdschee · mevdschee · commit 27e307dd0861 · 2021-04-27T11:04:29.000+02:00
diff --git a/api.include.php b/api.include.php
@@ -4633,7 +4633,7 @@ public function __construct(Router $router, Responder $responder, OpenApiService
 
         public function openapi(ServerRequestInterface $request): ResponseInterface
         {
-            return $this->responder->success($this->openApi->get());
+            return $this->responder->success($this->openApi->get($request));
         }
     }
 }
@@ -9195,6 +9195,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 // file: src/Tqdev/PhpCrudApi/OpenApi/OpenApiBuilder.php
 namespace Tqdev\PhpCrudApi\OpenApi {
 
+    use Psr\Http\Message\ServerRequestInterface;
     use Tqdev\PhpCrudApi\Column\ReflectionService;
     use Tqdev\PhpCrudApi\OpenApi\OpenApiDefinition;
 
@@ -9217,21 +9218,19 @@ public function __construct(ReflectionService $reflection, array $base, array $c
             }
         }
 
-        private function getServerUrl(): string
+        private function getServerUrl(ServerRequestInterface $request): string
         {
-            $protocol = @$_SERVER['HTTP_X_FORWARDED_PROTO'] ?: @$_SERVER['REQUEST_SCHEME'] ?: ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? "https" : "http");
-            $port = @intval($_SERVER['HTTP_X_FORWARDED_PORT']) ?: @intval($_SERVER["SERVER_PORT"]) ?: (($protocol === 'https') ? 443 : 80);
-            $host = @explode(":", $_SERVER['HTTP_HOST'])[0] ?: @$_SERVER['SERVER_NAME'] ?: @$_SERVER['SERVER_ADDR'];
-            $port = ($protocol === 'https' && $port === 443) || ($protocol === 'http' && $port === 80) ? '' : ':' . $port;
-            $path = @trim(substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], '/openapi')), '/');
-            return sprintf('%s://%s%s/%s', $protocol, $host, $port, $path);
+            $uri = $request->getUri();
+            $path = $uri->getPath();
+            $uri = $uri->withPath(trim(substr($path, 0, strpos($path, '/openapi')), '/'));
+            return $uri->__toString();
         }
 
-        public function build(): OpenApiDefinition
+        public function build(ServerRequestInterface $request): OpenApiDefinition
         {
             $this->openapi->set("openapi", "3.0.0");
             if (!$this->openapi->has("servers") && isset($_SERVER['REQUEST_URI'])) {
-                $this->openapi->set("servers|0|url", $this->getServerUrl());
+                $this->openapi->set("servers|0|url", $this->getServerUrl($request));
             }
             if ($this->records) {
                 $this->records->build();
@@ -9873,6 +9872,7 @@ private function setTag(int $index, string $tableName) /*: void*/
 // file: src/Tqdev/PhpCrudApi/OpenApi/OpenApiService.php
 namespace Tqdev\PhpCrudApi\OpenApi {
 
+    use Psr\Http\Message\ServerRequestInterface;
     use Tqdev\PhpCrudApi\Column\ReflectionService;
     use Tqdev\PhpCrudApi\OpenApi\OpenApiBuilder;
 
@@ -9885,9 +9885,9 @@ public function __construct(ReflectionService $reflection, array $base, array $c
             $this->builder = new OpenApiBuilder($reflection, $base, $controllers, $customBuilders);
         }
 
-        public function get(): OpenApiDefinition
+        public function get(ServerRequestInterface $request): OpenApiDefinition
         {
-            return $this->builder->build();
+            return $this->builder->build($request);
         }
     }
 }
diff --git a/api.php b/api.php
@@ -4633,7 +4633,7 @@ public function __construct(Router $router, Responder $responder, OpenApiService
 
         public function openapi(ServerRequestInterface $request): ResponseInterface
         {
-            return $this->responder->success($this->openApi->get());
+            return $this->responder->success($this->openApi->get($request));
         }
     }
 }
@@ -9195,6 +9195,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 // file: src/Tqdev/PhpCrudApi/OpenApi/OpenApiBuilder.php
 namespace Tqdev\PhpCrudApi\OpenApi {
 
+    use Psr\Http\Message\ServerRequestInterface;
     use Tqdev\PhpCrudApi\Column\ReflectionService;
     use Tqdev\PhpCrudApi\OpenApi\OpenApiDefinition;
 
@@ -9217,21 +9218,19 @@ public function __construct(ReflectionService $reflection, array $base, array $c
             }
         }
 
-        private function getServerUrl(): string
+        private function getServerUrl(ServerRequestInterface $request): string
         {
-            $protocol = @$_SERVER['HTTP_X_FORWARDED_PROTO'] ?: @$_SERVER['REQUEST_SCHEME'] ?: ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? "https" : "http");
-            $port = @intval($_SERVER['HTTP_X_FORWARDED_PORT']) ?: @intval($_SERVER["SERVER_PORT"]) ?: (($protocol === 'https') ? 443 : 80);
-            $host = @explode(":", $_SERVER['HTTP_HOST'])[0] ?: @$_SERVER['SERVER_NAME'] ?: @$_SERVER['SERVER_ADDR'];
-            $port = ($protocol === 'https' && $port === 443) || ($protocol === 'http' && $port === 80) ? '' : ':' . $port;
-            $path = @trim(substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], '/openapi')), '/');
-            return sprintf('%s://%s%s/%s', $protocol, $host, $port, $path);
+            $uri = $request->getUri();
+            $path = $uri->getPath();
+            $uri = $uri->withPath(trim(substr($path, 0, strpos($path, '/openapi')), '/'));
+            return $uri->__toString();
         }
 
-        public function build(): OpenApiDefinition
+        public function build(ServerRequestInterface $request): OpenApiDefinition
         {
             $this->openapi->set("openapi", "3.0.0");
             if (!$this->openapi->has("servers") && isset($_SERVER['REQUEST_URI'])) {
-                $this->openapi->set("servers|0|url", $this->getServerUrl());
+                $this->openapi->set("servers|0|url", $this->getServerUrl($request));
             }
             if ($this->records) {
                 $this->records->build();
@@ -9873,6 +9872,7 @@ private function setTag(int $index, string $tableName) /*: void*/
 // file: src/Tqdev/PhpCrudApi/OpenApi/OpenApiService.php
 namespace Tqdev\PhpCrudApi\OpenApi {
 
+    use Psr\Http\Message\ServerRequestInterface;
     use Tqdev\PhpCrudApi\Column\ReflectionService;
     use Tqdev\PhpCrudApi\OpenApi\OpenApiBuilder;
 
@@ -9885,9 +9885,9 @@ public function __construct(ReflectionService $reflection, array $base, array $c
             $this->builder = new OpenApiBuilder($reflection, $base, $controllers, $customBuilders);
         }
 
-        public function get(): OpenApiDefinition
+        public function get(ServerRequestInterface $request): OpenApiDefinition
         {
-            return $this->builder->build();
+            return $this->builder->build($request);
         }
     }
 }
diff --git a/src/Tqdev/PhpCrudApi/Controller/OpenApiController.php b/src/Tqdev/PhpCrudApi/Controller/OpenApiController.php
@@ -21,6 +21,6 @@ public function __construct(Router $router, Responder $responder, OpenApiService
 
     public function openapi(ServerRequestInterface $request): ResponseInterface
     {
-        return $this->responder->success($this->openApi->get());
+        return $this->responder->success($this->openApi->get($request));
     }
 }
diff --git a/src/Tqdev/PhpCrudApi/OpenApi/OpenApiBuilder.php b/src/Tqdev/PhpCrudApi/OpenApi/OpenApiBuilder.php
@@ -2,6 +2,7 @@
 
 namespace Tqdev\PhpCrudApi\OpenApi;
 
+use Psr\Http\Message\ServerRequestInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\OpenApi\OpenApiDefinition;
 
@@ -24,21 +25,19 @@ public function __construct(ReflectionService $reflection, array $base, array $c
         }
     }
 
-    private function getServerUrl(): string
+    private function getServerUrl(ServerRequestInterface $request): string
     {
-        $protocol = @$_SERVER['HTTP_X_FORWARDED_PROTO'] ?: @$_SERVER['REQUEST_SCHEME'] ?: ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? "https" : "http");
-        $port = @intval($_SERVER['HTTP_X_FORWARDED_PORT']) ?: @intval($_SERVER["SERVER_PORT"]) ?: (($protocol === 'https') ? 443 : 80);
-        $host = @explode(":", $_SERVER['HTTP_HOST'])[0] ?: @$_SERVER['SERVER_NAME'] ?: @$_SERVER['SERVER_ADDR'];
-        $port = ($protocol === 'https' && $port === 443) || ($protocol === 'http' && $port === 80) ? '' : ':' . $port;
-        $path = @trim(substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], '/openapi')), '/');
-        return sprintf('%s://%s%s/%s', $protocol, $host, $port, $path);
+        $uri = $request->getUri();
+        $path = $uri->getPath();
+        $uri = $uri->withPath(trim(substr($path, 0, strpos($path, '/openapi')), '/'));
+        return $uri->__toString();
     }
 
-    public function build(): OpenApiDefinition
+    public function build(ServerRequestInterface $request): OpenApiDefinition
     {
         $this->openapi->set("openapi", "3.0.0");
         if (!$this->openapi->has("servers") && isset($_SERVER['REQUEST_URI'])) {
-            $this->openapi->set("servers|0|url", $this->getServerUrl());
+            $this->openapi->set("servers|0|url", $this->getServerUrl($request));
         }
         if ($this->records) {
             $this->records->build();
diff --git a/src/Tqdev/PhpCrudApi/OpenApi/OpenApiService.php b/src/Tqdev/PhpCrudApi/OpenApi/OpenApiService.php
@@ -2,6 +2,7 @@
 
 namespace Tqdev\PhpCrudApi\OpenApi;
 
+use Psr\Http\Message\ServerRequestInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\OpenApi\OpenApiBuilder;
 
@@ -14,8 +15,8 @@ public function __construct(ReflectionService $reflection, array $base, array $c
         $this->builder = new OpenApiBuilder($reflection, $base, $controllers, $customBuilders);
     }
 
-    public function get(): OpenApiDefinition
+    public function get(ServerRequestInterface $request): OpenApiDefinition
     {
-        return $this->builder->build();
+        return $this->builder->build($request);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4633,7 +4633,7 @@ public function __construct(Router $router, Responder $responder, OpenApiService`
`4633`	`4633`
`4634`	`4634`	`public function openapi(ServerRequestInterface $request): ResponseInterface`
`4635`	`4635`	`{`
`4636`		`- return $this->responder->success($this->openApi->get());`
	`4636`	`+ return $this->responder->success($this->openApi->get($request));`
`4637`	`4637`	`}`
`4638`	`4638`	`}`
`4639`	`4639`	`}`
`@@ -9195,6 +9195,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`9195`	`9195`	`// file: src/Tqdev/PhpCrudApi/OpenApi/OpenApiBuilder.php`
`9196`	`9196`	`namespace Tqdev\PhpCrudApi\OpenApi {`
`9197`	`9197`
	`9198`	`+ use Psr\Http\Message\ServerRequestInterface;`
`9198`	`9199`	`use Tqdev\PhpCrudApi\Column\ReflectionService;`
`9199`	`9200`	`use Tqdev\PhpCrudApi\OpenApi\OpenApiDefinition;`
`9200`	`9201`
`@@ -9217,21 +9218,19 @@ public function __construct(ReflectionService $reflection, array $base, array $c`
`9217`	`9218`	`}`
`9218`	`9219`	`}`
`9219`	`9220`
`9220`		`- private function getServerUrl(): string`
	`9221`	`+ private function getServerUrl(ServerRequestInterface $request): string`
`9221`	`9222`	`{`
`9222`		`- $protocol = @$_SERVER['HTTP_X_FORWARDED_PROTO'] ?: @$_SERVER['REQUEST_SCHEME'] ?: ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? "https" : "http");`
`9223`		`- $port = @intval($_SERVER['HTTP_X_FORWARDED_PORT']) ?: @intval($_SERVER["SERVER_PORT"]) ?: (($protocol === 'https') ? 443 : 80);`
`9224`		`- $host = @explode(":", $_SERVER['HTTP_HOST'])[0] ?: @$_SERVER['SERVER_NAME'] ?: @$_SERVER['SERVER_ADDR'];`
`9225`		`- $port = ($protocol === 'https' && $port === 443) \|\| ($protocol === 'http' && $port === 80) ? '' : ':' . $port;`
`9226`		`- $path = @trim(substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], '/openapi')), '/');`
`9227`		`- return sprintf('%s://%s%s/%s', $protocol, $host, $port, $path);`
	`9223`	`+ $uri = $request->getUri();`
	`9224`	`+ $path = $uri->getPath();`
	`9225`	`+ $uri = $uri->withPath(trim(substr($path, 0, strpos($path, '/openapi')), '/'));`
	`9226`	`+ return $uri->__toString();`
`9228`	`9227`	`}`
`9229`	`9228`
`9230`		`- public function build(): OpenApiDefinition`
	`9229`	`+ public function build(ServerRequestInterface $request): OpenApiDefinition`
`9231`	`9230`	`{`
`9232`	`9231`	`$this->openapi->set("openapi", "3.0.0");`
`9233`	`9232`	`if (!$this->openapi->has("servers") && isset($_SERVER['REQUEST_URI'])) {`
`9234`		`- $this->openapi->set("servers\|0\|url", $this->getServerUrl());`
	`9233`	`+ $this->openapi->set("servers\|0\|url", $this->getServerUrl($request));`
`9235`	`9234`	`}`
`9236`	`9235`	`if ($this->records) {`
`9237`	`9236`	`$this->records->build();`
`@@ -9873,6 +9872,7 @@ private function setTag(int $index, string $tableName) /: void/`
`9873`	`9872`	`// file: src/Tqdev/PhpCrudApi/OpenApi/OpenApiService.php`
`9874`	`9873`	`namespace Tqdev\PhpCrudApi\OpenApi {`
`9875`	`9874`
	`9875`	`+ use Psr\Http\Message\ServerRequestInterface;`
`9876`	`9876`	`use Tqdev\PhpCrudApi\Column\ReflectionService;`
`9877`	`9877`	`use Tqdev\PhpCrudApi\OpenApi\OpenApiBuilder;`
`9878`	`9878`
`@@ -9885,9 +9885,9 @@ public function __construct(ReflectionService $reflection, array $base, array $c`
`9885`	`9885`	`$this->builder = new OpenApiBuilder($reflection, $base, $controllers, $customBuilders);`
`9886`	`9886`	`}`
`9887`	`9887`
`9888`		`- public function get(): OpenApiDefinition`
	`9888`	`+ public function get(ServerRequestInterface $request): OpenApiDefinition`
`9889`	`9889`	`{`
`9890`		`- return $this->builder->build();`
	`9890`	`+ return $this->builder->build($request);`
`9891`	`9891`	`}`
`9892`	`9892`	`}`
`9893`	`9893`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ public function __construct(Router $router, Responder $responder, OpenApiService`
`21`	`21`
`22`	`22`	`public function openapi(ServerRequestInterface $request): ResponseInterface`
`23`	`23`	`{`
`24`		`- return $this->responder->success($this->openApi->get());`
	`24`	`+ return $this->responder->success($this->openApi->get($request));`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Tqdev\PhpCrudApi\OpenApi;`
`4`	`4`
	`5`	`+use Psr\Http\Message\ServerRequestInterface;`
`5`	`6`	`use Tqdev\PhpCrudApi\Column\ReflectionService;`
`6`	`7`	`use Tqdev\PhpCrudApi\OpenApi\OpenApiDefinition;`
`7`	`8`
`@@ -24,21 +25,19 @@ public function __construct(ReflectionService $reflection, array $base, array $c`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`
`27`		`- private function getServerUrl(): string`
	`28`	`+ private function getServerUrl(ServerRequestInterface $request): string`
`28`	`29`	`{`
`29`		`- $protocol = @$_SERVER['HTTP_X_FORWARDED_PROTO'] ?: @$_SERVER['REQUEST_SCHEME'] ?: ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? "https" : "http");`
`30`		`- $port = @intval($_SERVER['HTTP_X_FORWARDED_PORT']) ?: @intval($_SERVER["SERVER_PORT"]) ?: (($protocol === 'https') ? 443 : 80);`
`31`		`- $host = @explode(":", $_SERVER['HTTP_HOST'])[0] ?: @$_SERVER['SERVER_NAME'] ?: @$_SERVER['SERVER_ADDR'];`
`32`		`- $port = ($protocol === 'https' && $port === 443) \|\| ($protocol === 'http' && $port === 80) ? '' : ':' . $port;`
`33`		`- $path = @trim(substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], '/openapi')), '/');`
`34`		`- return sprintf('%s://%s%s/%s', $protocol, $host, $port, $path);`
	`30`	`+ $uri = $request->getUri();`
	`31`	`+ $path = $uri->getPath();`
	`32`	`+ $uri = $uri->withPath(trim(substr($path, 0, strpos($path, '/openapi')), '/'));`
	`33`	`+ return $uri->__toString();`
`35`	`34`	`}`
`36`	`35`
`37`		`- public function build(): OpenApiDefinition`
	`36`	`+ public function build(ServerRequestInterface $request): OpenApiDefinition`
`38`	`37`	`{`
`39`	`38`	`$this->openapi->set("openapi", "3.0.0");`
`40`	`39`	`if (!$this->openapi->has("servers") && isset($_SERVER['REQUEST_URI'])) {`
`41`		`- $this->openapi->set("servers\|0\|url", $this->getServerUrl());`
	`40`	`+ $this->openapi->set("servers\|0\|url", $this->getServerUrl($request));`
`42`	`41`	`}`
`43`	`42`	`if ($this->records) {`
`44`	`43`	`$this->records->build();`