fix: patch up router base path issues

Author: mychidarko

src/Router.php

@@ -98,9 +98,9 @@ class Router
     protected static $namespace = '';
 
     /**
-     * The Server Base Path for Router Execution
+     * The Server Base Path for Router Execution (null = not yet resolved)
      */
-    protected static $serverBasePath = '';
+    protected static $serverBasePath = null;
 
     /**
      * Cached URI for the current request
@@ -787,8 +787,17 @@ public function registerMiddleware(string $name, callable $middleware)
      */
     public static function getBasePath(): string
     {
-        if (static::$serverBasePath === '') {
-            static::$serverBasePath = implode('/', array_slice(explode('/', $_SERVER['SCRIPT_NAME']), 0, -1)) . '/';
+        if (static::$serverBasePath === null) {
+            $scriptDir = implode('/', array_slice(explode('/', $_SERVER['SCRIPT_NAME'] ?? ''), 0, -1)) . '/';
+            $requestPath = rawurldecode(parse_url($_SERVER['REQUEST_URI'] ?? '/', PHP_URL_PATH) ?: '/');
+
+            // the script directory is only a base path when the request actually
+            // lives under it (classic subfolder deployments) — under php -S or
+            // the CLI it usually isn't, and stripping it would eat URI segments
+            // https://github.com/leafsphp/leaf/issues/323
+            static::$serverBasePath = ($scriptDir !== '/' && strncmp($requestPath, $scriptDir, strlen($scriptDir)) === 0)
+                ? $scriptDir
+                : '/';
         }
 
         return static::$serverBasePath;
@@ -802,7 +811,7 @@ public static function getBasePath(): string
      */
     public static function setBasePath($serverBasePath)
     {
-        static::$serverBasePath = $serverBasePath;
+        static::$serverBasePath = ($serverBasePath === '' || $serverBasePath === null) ? '/' : $serverBasePath;
         static::$currentUri = null;
     }
 
@@ -822,16 +831,11 @@ public static function getCurrentUri(): string
         $requestPath = parse_url($requestUri, PHP_URL_PATH) ?: '/';
         $requestPath = rawurldecode($requestPath);
 
-        // Early exit If base path doesn't match
+        // if an explicit base path doesn't prefix the request, don't strip
+        // anything (and never fire handlers from a getter) — unmatched routes
+        // 404 through the normal dispatch flow
         if (strncmp($requestPath, $basePath, strlen($basePath)) !== 0) {
-            if (!static::$notFoundHandler) {
-                static::$notFoundHandler = function () {
-                    \Leaf\Exception\General::default404();
-                };
-            }
-            static::invoke(static::$notFoundHandler);
-
-            return '/';
+            return static::$currentUri = '/' . trim($requestPath, '/');
         }
 
         // Get the current Request URI and remove rewrite base path from it (= allows one to run the router in a sub folder)
@@ -1107,7 +1111,7 @@ public static function reset(): void
         static::$sitemapOptions = [];
         static::$groupRoute = '';
         static::$namespace = '';
-        static::$serverBasePath = '';
+        static::$serverBasePath = null;
         static::$currentUri = null;
         static::$currentMethod = null;
     }

tests/router.test.php

@@ -209,3 +209,62 @@
 
     expect(app()->config('testKey.hooked'))->toBe('original');
 });
+
+test('base path is not auto-stripped when the request does not live under the script dir', function () {
+    // https://github.com/leafsphp/leaf/issues/323 — php -S serving from a subdir
+    \Leaf\Router::reset();
+    $_SERVER['SCRIPT_NAME'] = '/public/index.php';
+    $_SERVER['REQUEST_METHOD'] = 'GET';
+    $_SERVER['REQUEST_URI'] = '/practices/42';
+
+    $matched = null;
+    app()->get('/practices/{id}', function ($id) use (&$matched) {
+        $matched = $id;
+    });
+
+    app()->run();
+
+    expect(\Leaf\Router::getBasePath())->toBe('/')
+        ->and($matched)->toBe('42');
+});
+
+test('base path is stripped for real subfolder deployments', function () {
+    \Leaf\Router::reset();
+    $_SERVER['SCRIPT_NAME'] = '/subdir/index.php';
+    $_SERVER['REQUEST_METHOD'] = 'GET';
+    $_SERVER['REQUEST_URI'] = '/subdir/users/5';
+
+    $matched = null;
+    app()->get('/users/{id}', function ($id) use (&$matched) {
+        $matched = $id;
+    });
+
+    app()->run();
+
+    expect(\Leaf\Router::getBasePath())->toBe('/subdir/')
+        ->and($matched)->toBe('5');
+});
+
+test('setBasePath with an empty string means no base path', function () {
+    \Leaf\Router::reset();
+    app()->setBasePath('');
+
+    expect(\Leaf\Router::getBasePath())->toBe('/');
+});
+
+test('getCurrentUri never fires the 404 handler as a side effect', function () {
+    \Leaf\Router::reset();
+    $_SERVER['REQUEST_METHOD'] = 'GET';
+    $_SERVER['REQUEST_URI'] = '/outside';
+    app()->setBasePath('/api/');
+
+    $fired = false;
+    app()->set404(function () use (&$fired) {
+        $fired = true;
+    });
+
+    $uri = \Leaf\Router::getCurrentUri();
+
+    expect($fired)->toBeFalse()
+        ->and($uri)->toBe('/outside'); // path untouched when base doesn't prefix it
+});