refactor: update ModelQueryBuilder generics to support static analysis

aidan-casey · web-flow · commit cea122e29389 · 2024-11-04T22:44:05.000-05:00
diff --git a/src/Tempest/Database/src/Builder/ModelQueryBuilder.php b/src/Tempest/Database/src/Builder/ModelQueryBuilder.php
@@ -35,8 +35,10 @@ public function __construct(
         $this->modelDefinition = new ModelDefinition($this->modelClass);
     }
 
-    /** @return TModelClass|null */
-    public function first(mixed ...$bindings): ?DatabaseModel
+    /**
+     * @return TModelClass|null
+     */
+    public function first(mixed ...$bindings)
     {
         $query = $this->build($bindings);
 
@@ -49,8 +51,10 @@ public function first(mixed ...$bindings): ?DatabaseModel
         return $result[array_key_first($result)];
     }
 
-    /** @return TModelClass|null */
-    public function find(Id $id): ?DatabaseModel
+    /**
+     * @return TModelClass|null
+     */
+    public function find(Id $id)
     {
         return $this
             ->whereField('id', $id)

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,10 @@ public function __construct(`
`35`	`35`	`$this->modelDefinition = new ModelDefinition($this->modelClass);`
`36`	`36`	`}`
`37`	`37`
`38`		`- /** @return TModelClass\|null */`
`39`		`- public function first(mixed ...$bindings): ?DatabaseModel`
	`38`	`+ /**`
	`39`	`+ * @return TModelClass\|null`
	`40`	`+ */`
	`41`	`+ public function first(mixed ...$bindings)`
`40`	`42`	`{`
`41`	`43`	`$query = $this->build($bindings);`
`42`	`44`
`@@ -49,8 +51,10 @@ public function first(mixed ...$bindings): ?DatabaseModel`
`49`	`51`	`return $result[array_key_first($result)];`
`50`	`52`	`}`
`51`	`53`
`52`		`- /** @return TModelClass\|null */`
`53`		`- public function find(Id $id): ?DatabaseModel`
	`54`	`+ /**`
	`55`	`+ * @return TModelClass\|null`
	`56`	`+ */`
	`57`	`+ public function find(Id $id)`
`54`	`58`	`{`
`55`	`59`	`return $this`
`56`	`60`	`->whereField('id', $id)`