[1.x] Adds missing URI on folio:list command (#127)

* Adds missing URI on `folio:list` command

* Fix code styling

---------

Co-authored-by: nunomaduro <[email protected]>

Author: nunomaduro

src/Console/ListCommand.php

@@ -76,15 +76,16 @@ protected function routesFromMountPaths(array $mountPaths): Collection
         return collect($mountPaths)->map(function (MountPath $mountPath) {
             $views = Finder::create()->in($mountPath->path)->name('*.blade.php')->files()->getIterator();
 
+            $baseUri = rtrim($mountPath->baseUri, '/');
             $domain = $mountPath->domain;
             $mountPath = str_replace(DIRECTORY_SEPARATOR, '/', $mountPath->path);
 
             $path = '/'.ltrim($mountPath, '/');
 
             return collect($views)
-                ->map(function (SplFileInfo $view) use ($domain, $mountPath) {
+                ->map(function (SplFileInfo $view) use ($baseUri, $domain, $mountPath) {
                     $viewPath = str_replace(DIRECTORY_SEPARATOR, '/', $view->getRealPath());
-                    $uri = str_replace($mountPath, '', $viewPath);
+                    $uri = $baseUri.str_replace($mountPath, '', $viewPath);
 
                     if (count($this->laravel->make(FolioManager::class)->mountPaths()) === 1) {
                         $action = str_replace($mountPath.'/', '', $viewPath);

src/FolioManager.php

@@ -40,7 +40,7 @@ class FolioManager
      *
      * @throws \InvalidArgumentException
      */
-    public function route(string $path = null, ?string $uri = '/', array $middleware = []): PendingRoute
+    public function route(?string $path = null, ?string $uri = '/', array $middleware = []): PendingRoute
     {
         return new PendingRoute(
             $this,
@@ -117,15 +117,15 @@ public function middlewareFor(string $uri): array
     /**
      * Get a piece of data from the route / view that was last matched by Folio.
      */
-    public function data(string $key = null, mixed $default = null): mixed
+    public function data(?string $key = null, mixed $default = null): mixed
     {
         return Arr::get($this->lastMatchedView?->data ?: [], $key, $default);
     }
 
     /**
      * Specify the callback that should be used to render matched views.
      */
-    public function renderUsing(Closure $callback = null): static
+    public function renderUsing(?Closure $callback = null): static
     {
         $this->renderUsing = $callback;
 
@@ -149,7 +149,7 @@ public function terminate(): void
     /**
      * Specify the callback that should be used when terminating the application.
      */
-    public function terminateUsing(Closure $callback = null): static
+    public function terminateUsing(?Closure $callback = null): static
     {
         $this->terminateUsing = $callback;
 

src/Pipeline/PotentiallyBindablePathSegment.php

@@ -67,7 +67,7 @@ public function capturesMultipleSegments(): bool
      * Resolve the binding or throw a ModelNotFoundException.
      */
     public function resolveOrFail(mixed $value,
-        UrlRoutable $parent = null,
+        ?UrlRoutable $parent = null,
         bool $withTrashed = false): UrlRoutable|BackedEnum
     {
         if (is_null($resolved = $this->resolve($value, $parent, $withTrashed))) {

tests/Feature/Console/ListCommandTest.php

@@ -248,3 +248,28 @@
 
         EOF);
 });
+
+it('prefixes URIs', function (string $uri) {
+    $output = new BufferedOutput();
+
+    Folio::path(__DIR__.'/../resources/views/more-pages')->uri($uri);
+
+    $exitCode = Artisan::call('folio:list', [], $output);
+
+    expect($exitCode)->toBe(0)
+        ->and($output->fetch())->toOutput(<<<'EOF'
+
+          GET       /api ................................................................................................ more-pages.index › index.blade.php
+          GET       /api/{...user} ..................................................................................................... [...User].blade.php
+          GET       /api/{...user}/detail .............................................................. more-pages.user.detail › [...User]/detail.blade.php
+
+                                                                                                                                          Showing [3] routes
+
+
+        EOF);
+})->with([
+    'api',
+    '/api',
+    'api/',
+    '/api/',
+]);