wip

Author: brendt

packages/database/src/IsDatabaseModel.php

@@ -58,15 +58,15 @@ public static function new(mixed ...$params): self
     /**
      * Finds a model instance by its ID.
      */
-    public static function findById(string|int|PrimaryKey $id): static
+    public static function findById(string|int|PrimaryKey $id): self
     {
         return self::get($id);
     }
 
     /**
      * Finds a model instance by its ID.
      */
-    public static function resolve(string|int|PrimaryKey $id): static
+    public static function resolve(string|int|PrimaryKey $id): self
     {
         return query(self::class)->resolve($id);
     }

packages/router/src/Bindable.php

@@ -4,5 +4,9 @@
 
 interface Bindable
 {
+    public int|string $bindingValue {
+        get;
+    }
+
     public static function resolve(string $input): self;
 }

packages/router/src/GenericRouter.php

@@ -8,6 +8,7 @@
 use Psr\Http\Message\ServerRequestInterface as PsrRequest;
 use Tempest\Container\Container;
 use Tempest\Core\AppConfig;
+use Tempest\Database\PrimaryKey;
 use Tempest\Http\Mappers\PsrRequestToGenericRequestMapper;
 use Tempest\Http\Request;
 use Tempest\Http\Response;
@@ -126,6 +127,8 @@ public function toUri(array|string $action, ...$params): string
 
             if ($value instanceof BackedEnum) {
                 $value = $value->value;
+            } elseif ($value instanceof Bindable) {
+                $value = $value->bindingValue;
             }
 
             $uri = $uri->replaceRegex(

packages/router/src/Routing/Construction/DiscoveredRoute.php

@@ -24,7 +24,7 @@ public static function fromRoute(Route $route, MethodReflector $methodReflector)
             self::getRouteParams($route->uri),
             $route->middleware,
             $methodReflector,
-            $route->without,
+            $route->without ?? [],
         );
     }
 

tests/Fixtures/Modules/Books/Models/Author.php

@@ -24,4 +24,8 @@ public function __construct(
         public array $books = [],
         public ?Publisher $publisher = null,
     ) {}
+
+    public int|string $bindingValue {
+        get => $this->id->value;
+    }
 }

tests/Fixtures/Modules/Books/Models/Book.php

@@ -28,4 +28,8 @@ final class Book implements Bindable
 
     #[HasOne]
     public ?Isbn $isbn = null;
+
+    public int|string $bindingValue {
+        get => $this->id->value;
+    }
 }

tests/Integration/Route/RouterTest.php

@@ -11,6 +11,7 @@
 use ReflectionException;
 use Tempest\Core\AppConfig;
 use Tempest\Database\Migrations\CreateMigrationsTable;
+use Tempest\Database\PrimaryKey;
 use Tempest\Http\HttpRequestFailed;
 use Tempest\Http\Responses\Ok;
 use Tempest\Http\Status;
@@ -26,6 +27,7 @@
 use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
 use Tests\Tempest\Fixtures\Migrations\CreateBookTable;
 use Tests\Tempest\Fixtures\Migrations\CreatePublishersTable;
+use Tests\Tempest\Fixtures\Modules\Books\BookController;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Book;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
@@ -214,6 +216,30 @@ public function test_generate_uri_with_enum(): void
         );
     }
 
+    public function test_generate_uri_with_bindable_model(): void
+    {
+        $book = Book::new(
+            id: new PrimaryKey('abc'),
+        );
+
+        $this->assertSame(
+            '/books/abc',
+            uri([BookController::class, 'show'], book: $book),
+        );
+    }
+
+    public function test_generate_uri_with_primary_key(): void
+    {
+        $book = Book::new(
+            id: new PrimaryKey('abc'),
+        );
+
+        $this->assertSame(
+            '/books/abc',
+            uri([BookController::class, 'show'], book: $book->id),
+        );
+    }
+
     public function test_uri_with_query_param_that_collides_partially_with_route_param(): void
     {
         $this->assertSame(