update

mevdschee · mevdschee · commit cd49732ff98a · 2023-03-29T15:48:24.000+02:00
diff --git a/composer.lock b/composer.lock
diff --git a/ui.include.php b/ui.include.php
@@ -8202,7 +8202,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;
@@ -8212,18 +8212,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;
                 }
             }
@@ -8264,9 +8264,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/ui.php b/ui.php
@@ -8202,7 +8202,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;
@@ -8212,18 +8212,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;
                 }
             }
@@ -8264,9 +8264,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
`@@ -8202,7 +8202,7 @@ class SimpleRouter implements Router`
`8202`	`8202`
`8203`	`8203`	`public function __construct(string $basePath, Responder $responder, Cache $cache, int $ttl)`
`8204`	`8204`	`{`
`8205`		`- $this->basePath = rtrim($basePath, '/');`
	`8205`	`+ $this->basePath = rtrim($basePath, '/') ?: rtrim($this->detectBasePath(), '/');;`
`8206`	`8206`	`$this->responder = $responder;`
`8207`	`8207`	`$this->cache = $cache;`
`8208`	`8208`	`$this->ttl = $ttl;`
`@@ -8212,18 +8212,18 @@ public function __construct(string $basePath, Responder $responder, Cache $cache`
`8212`	`8212`	`$this->middlewares = array();`
`8213`	`8213`	`}`
`8214`	`8214`
`8215`		`- private function detectBasePath(ServerRequestInterface $request): string`
	`8215`	`+ private function detectBasePath(): string`
`8216`	`8216`	`{`
`8217`		`- $serverParams = $request->getServerParams();`
`8218`		`- if (isset($serverParams['REQUEST_URI'])) {`
`8219`		`- $fullPath = urldecode(explode('?', $serverParams['REQUEST_URI'])[0]);`
`8220`		`- if (isset($serverParams['PATH_INFO'])) {`
`8221`		`- $path = $serverParams['PATH_INFO'];`
	`8217`	`+ if (isset($_SERVER['REQUEST_URI'])) {`
	`8218`	`+ $fullPath = urldecode(explode('?', $_SERVER['REQUEST_URI'])[0]);`
	`8219`	`+ if (isset($_SERVER['PATH_INFO'])) {`
	`8220`	`+ $path = $_SERVER['PATH_INFO'];`
`8222`	`8221`	`if (substr($fullPath, -1 * strlen($path)) == $path) {`
`8223`	`8222`	`return substr($fullPath, 0, -1 * strlen($path));`
`8224`	`8223`	`}`
`8225`	`8224`	`}`
`8226`		`- if ('/' . basename(__FILE__) == $fullPath) {`
	`8225`	`+ $path = '/' . basename(__FILE__);`
	`8226`	`+ if (substr($fullPath, -1 * strlen($path)) == $path) {`
`8227`	`8227`	`return $fullPath;`
`8228`	`8228`	`}`
`8229`	`8229`	`}`
`@@ -8264,9 +8264,6 @@ public function load(Middleware $middleware) /: void/`
`8264`	`8264`
`8265`	`8265`	`public function route(ServerRequestInterface $request): ResponseInterface`
`8266`	`8266`	`{`
`8267`		`- if (!$this->basePath) {`
`8268`		`- $this->basePath = rtrim($this->detectBasePath($request), '/');`
`8269`		`- }`
`8270`	`8267`	`if ($this->registration) {`
`8271`	`8268`	`$data = gzcompress(json_encode($this->routes, JSON_UNESCAPED_UNICODE));`
`8272`	`8269`	`$this->cache->set('PathTree', $data, $this->ttl);`