Better base path detection

mevdschee · mevdschee · commit 52d4ec34b2f5 · 2022-10-06T16:51:33.000+02:00
diff --git a/api.include.php b/api.include.php
@@ -7648,7 +7648,7 @@ class SimpleRouter implements Router
 
         public function __construct(string $basePath, Responder $responder, Cache $cache, int $ttl)
         {
-            $this->basePath = rtrim($basePath, '/');
+            $this->basePath = rtrim($basePath, '/') ?: rtrim($this->detectBasePath(), '/');;
             $this->responder = $responder;
             $this->cache = $cache;
             $this->ttl = $ttl;
@@ -7658,18 +7658,18 @@ public function __construct(string $basePath, Responder $responder, Cache $cache
             $this->middlewares = array();
         }
 
-        private function detectBasePath(ServerRequestInterface $request): string
+        private function detectBasePath(): string
         {
-            $serverParams = $request->getServerParams();
-            if (isset($serverParams['REQUEST_URI'])) {
-                $fullPath = urldecode(explode('?', $serverParams['REQUEST_URI'])[0]);
-                if (isset($serverParams['PATH_INFO'])) {
-                    $path = $serverParams['PATH_INFO'];
+            if (isset($_SERVER['REQUEST_URI'])) {
+                $fullPath = urldecode(explode('?', $_SERVER['REQUEST_URI'])[0]);
+                if (isset($_SERVER['PATH_INFO'])) {
+                    $path = $_SERVER['PATH_INFO'];
                     if (substr($fullPath, -1 * strlen($path)) == $path) {
                         return substr($fullPath, 0, -1 * strlen($path));
                     }
                 }
-                if ('/' . basename(__FILE__) == $fullPath) {
+                $path = '/' . basename(__FILE__);
+                if (substr($fullPath, -1 * strlen($path)) == $path) {
                     return $fullPath;
                 }
             }
@@ -7710,9 +7710,6 @@ public function load(Middleware $middleware) /*: void*/
 
         public function route(ServerRequestInterface $request): ResponseInterface
         {
-            if (!$this->basePath) {
-                $this->basePath = rtrim($this->detectBasePath($request), '/');
-            }
             if ($this->registration) {
                 $data = gzcompress(json_encode($this->routes, JSON_UNESCAPED_UNICODE));
                 $this->cache->set('PathTree', $data, $this->ttl);
diff --git a/api.php b/api.php
@@ -7648,7 +7648,7 @@ class SimpleRouter implements Router
 
         public function __construct(string $basePath, Responder $responder, Cache $cache, int $ttl)
         {
-            $this->basePath = rtrim($basePath, '/');
+            $this->basePath = rtrim($basePath, '/') ?: rtrim($this->detectBasePath(), '/');;
             $this->responder = $responder;
             $this->cache = $cache;
             $this->ttl = $ttl;
@@ -7658,18 +7658,18 @@ public function __construct(string $basePath, Responder $responder, Cache $cache
             $this->middlewares = array();
         }
 
-        private function detectBasePath(ServerRequestInterface $request): string
+        private function detectBasePath(): string
         {
-            $serverParams = $request->getServerParams();
-            if (isset($serverParams['REQUEST_URI'])) {
-                $fullPath = urldecode(explode('?', $serverParams['REQUEST_URI'])[0]);
-                if (isset($serverParams['PATH_INFO'])) {
-                    $path = $serverParams['PATH_INFO'];
+            if (isset($_SERVER['REQUEST_URI'])) {
+                $fullPath = urldecode(explode('?', $_SERVER['REQUEST_URI'])[0]);
+                if (isset($_SERVER['PATH_INFO'])) {
+                    $path = $_SERVER['PATH_INFO'];
                     if (substr($fullPath, -1 * strlen($path)) == $path) {
                         return substr($fullPath, 0, -1 * strlen($path));
                     }
                 }
-                if ('/' . basename(__FILE__) == $fullPath) {
+                $path = '/' . basename(__FILE__);
+                if (substr($fullPath, -1 * strlen($path)) == $path) {
                     return $fullPath;
                 }
             }
@@ -7710,9 +7710,6 @@ public function load(Middleware $middleware) /*: void*/
 
         public function route(ServerRequestInterface $request): ResponseInterface
         {
-            if (!$this->basePath) {
-                $this->basePath = rtrim($this->detectBasePath($request), '/');
-            }
             if ($this->registration) {
                 $data = gzcompress(json_encode($this->routes, JSON_UNESCAPED_UNICODE));
                 $this->cache->set('PathTree', $data, $this->ttl);
diff --git a/src/Tqdev/PhpCrudApi/Middleware/Router/SimpleRouter.php b/src/Tqdev/PhpCrudApi/Middleware/Router/SimpleRouter.php
@@ -24,7 +24,7 @@ class SimpleRouter implements Router
 
     public function __construct(string $basePath, Responder $responder, Cache $cache, int $ttl)
     {
-        $this->basePath = rtrim($basePath, '/');
+        $this->basePath = rtrim($basePath, '/') ?: rtrim($this->detectBasePath(), '/');;
         $this->responder = $responder;
         $this->cache = $cache;
         $this->ttl = $ttl;
@@ -34,18 +34,18 @@ public function __construct(string $basePath, Responder $responder, Cache $cache
         $this->middlewares = array();
     }
 
-    private function detectBasePath(ServerRequestInterface $request): string
+    private function detectBasePath(): string
     {
-        $serverParams = $request->getServerParams();
-        if (isset($serverParams['REQUEST_URI'])) {
-            $fullPath = urldecode(explode('?', $serverParams['REQUEST_URI'])[0]);
-            if (isset($serverParams['PATH_INFO'])) {
-                $path = $serverParams['PATH_INFO'];
+        if (isset($_SERVER['REQUEST_URI'])) {
+            $fullPath = urldecode(explode('?', $_SERVER['REQUEST_URI'])[0]);
+            if (isset($_SERVER['PATH_INFO'])) {
+                $path = $_SERVER['PATH_INFO'];
                 if (substr($fullPath, -1 * strlen($path)) == $path) {
                     return substr($fullPath, 0, -1 * strlen($path));
                 }
             }
-            if ('/' . basename(__FILE__) == $fullPath) {
+            $path = '/' . basename(__FILE__);
+            if (substr($fullPath, -1 * strlen($path)) == $path) {
                 return $fullPath;
             }
         }
@@ -86,9 +86,6 @@ public function load(Middleware $middleware) /*: void*/
 
     public function route(ServerRequestInterface $request): ResponseInterface
     {
-        if (!$this->basePath) {
-            $this->basePath = rtrim($this->detectBasePath($request), '/');
-        }
         if ($this->registration) {
             $data = gzcompress(json_encode($this->routes, JSON_UNESCAPED_UNICODE));
             $this->cache->set('PathTree', $data, $this->ttl);

Original file line number	Diff line number	Diff line change
`@@ -7648,7 +7648,7 @@ class SimpleRouter implements Router`
`7648`	`7648`
`7649`	`7649`	`public function __construct(string $basePath, Responder $responder, Cache $cache, int $ttl)`
`7650`	`7650`	`{`
`7651`		`- $this->basePath = rtrim($basePath, '/');`
	`7651`	`+ $this->basePath = rtrim($basePath, '/') ?: rtrim($this->detectBasePath(), '/');;`
`7652`	`7652`	`$this->responder = $responder;`
`7653`	`7653`	`$this->cache = $cache;`
`7654`	`7654`	`$this->ttl = $ttl;`
`@@ -7658,18 +7658,18 @@ public function __construct(string $basePath, Responder $responder, Cache $cache`
`7658`	`7658`	`$this->middlewares = array();`
`7659`	`7659`	`}`
`7660`	`7660`
`7661`		`- private function detectBasePath(ServerRequestInterface $request): string`
	`7661`	`+ private function detectBasePath(): string`
`7662`	`7662`	`{`
`7663`		`- $serverParams = $request->getServerParams();`
`7664`		`- if (isset($serverParams['REQUEST_URI'])) {`
`7665`		`- $fullPath = urldecode(explode('?', $serverParams['REQUEST_URI'])[0]);`
`7666`		`- if (isset($serverParams['PATH_INFO'])) {`
`7667`		`- $path = $serverParams['PATH_INFO'];`
	`7663`	`+ if (isset($_SERVER['REQUEST_URI'])) {`
	`7664`	`+ $fullPath = urldecode(explode('?', $_SERVER['REQUEST_URI'])[0]);`
	`7665`	`+ if (isset($_SERVER['PATH_INFO'])) {`
	`7666`	`+ $path = $_SERVER['PATH_INFO'];`
`7668`	`7667`	`if (substr($fullPath, -1 * strlen($path)) == $path) {`
`7669`	`7668`	`return substr($fullPath, 0, -1 * strlen($path));`
`7670`	`7669`	`}`
`7671`	`7670`	`}`
`7672`		`- if ('/' . basename(__FILE__) == $fullPath) {`
	`7671`	`+ $path = '/' . basename(__FILE__);`
	`7672`	`+ if (substr($fullPath, -1 * strlen($path)) == $path) {`
`7673`	`7673`	`return $fullPath;`
`7674`	`7674`	`}`
`7675`	`7675`	`}`
`@@ -7710,9 +7710,6 @@ public function load(Middleware $middleware) /: void/`
`7710`	`7710`
`7711`	`7711`	`public function route(ServerRequestInterface $request): ResponseInterface`
`7712`	`7712`	`{`
`7713`		`- if (!$this->basePath) {`
`7714`		`- $this->basePath = rtrim($this->detectBasePath($request), '/');`
`7715`		`- }`
`7716`	`7713`	`if ($this->registration) {`
`7717`	`7714`	`$data = gzcompress(json_encode($this->routes, JSON_UNESCAPED_UNICODE));`
`7718`	`7715`	`$this->cache->set('PathTree', $data, $this->ttl);`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class SimpleRouter implements Router`
`24`	`24`
`25`	`25`	`public function __construct(string $basePath, Responder $responder, Cache $cache, int $ttl)`
`26`	`26`	`{`
`27`		`- $this->basePath = rtrim($basePath, '/');`
	`27`	`+ $this->basePath = rtrim($basePath, '/') ?: rtrim($this->detectBasePath(), '/');;`
`28`	`28`	`$this->responder = $responder;`
`29`	`29`	`$this->cache = $cache;`
`30`	`30`	`$this->ttl = $ttl;`
`@@ -34,18 +34,18 @@ public function __construct(string $basePath, Responder $responder, Cache $cache`
`34`	`34`	`$this->middlewares = array();`
`35`	`35`	`}`
`36`	`36`
`37`		`- private function detectBasePath(ServerRequestInterface $request): string`
	`37`	`+ private function detectBasePath(): string`
`38`	`38`	`{`
`39`		`- $serverParams = $request->getServerParams();`
`40`		`- if (isset($serverParams['REQUEST_URI'])) {`
`41`		`- $fullPath = urldecode(explode('?', $serverParams['REQUEST_URI'])[0]);`
`42`		`- if (isset($serverParams['PATH_INFO'])) {`
`43`		`- $path = $serverParams['PATH_INFO'];`
	`39`	`+ if (isset($_SERVER['REQUEST_URI'])) {`
	`40`	`+ $fullPath = urldecode(explode('?', $_SERVER['REQUEST_URI'])[0]);`
	`41`	`+ if (isset($_SERVER['PATH_INFO'])) {`
	`42`	`+ $path = $_SERVER['PATH_INFO'];`
`44`	`43`	`if (substr($fullPath, -1 * strlen($path)) == $path) {`
`45`	`44`	`return substr($fullPath, 0, -1 * strlen($path));`
`46`	`45`	`}`
`47`	`46`	`}`
`48`		`- if ('/' . basename(__FILE__) == $fullPath) {`
	`47`	`+ $path = '/' . basename(__FILE__);`
	`48`	`+ if (substr($fullPath, -1 * strlen($path)) == $path) {`
`49`	`49`	`return $fullPath;`
`50`	`50`	`}`
`51`	`51`	`}`
`@@ -86,9 +86,6 @@ public function load(Middleware $middleware) /: void/`
`86`	`86`
`87`	`87`	`public function route(ServerRequestInterface $request): ResponseInterface`
`88`	`88`	`{`
`89`		`- if (!$this->basePath) {`
`90`		`- $this->basePath = rtrim($this->detectBasePath($request), '/');`
`91`		`- }`
`92`	`89`	`if ($this->registration) {`
`93`	`90`	`$data = gzcompress(json_encode($this->routes, JSON_UNESCAPED_UNICODE));`
`94`	`91`	`$this->cache->set('PathTree', $data, $this->ttl);`