diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 3b22da654b36..e52baa39f570 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -836,7 +836,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
      * Generates a WHERE field IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param array|BaseBuilder|Closure(BaseBuilder):BaseBuilder|null $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|(Closure(BaseBuilder): BaseBuilder)|null $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -849,7 +849,7 @@ public function whereIn(?string $key = null, $values = null, ?bool $escape = nul
      * Generates a WHERE field IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param array|BaseBuilder|Closure(BaseBuilder):BaseBuilder|null $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|(Closure(BaseBuilder): BaseBuilder)|null $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -862,7 +862,7 @@ public function orWhereIn(?string $key = null, $values = null, ?bool $escape = n
      * Generates a WHERE field NOT IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param array|BaseBuilder|Closure(BaseBuilder):BaseBuilder|null $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|(Closure(BaseBuilder): BaseBuilder)|null $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -875,7 +875,7 @@ public function whereNotIn(?string $key = null, $values = null, ?bool $escape =
      * Generates a WHERE field NOT IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param array|BaseBuilder|Closure(BaseBuilder):BaseBuilder|null $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|(Closure(BaseBuilder): BaseBuilder)|null $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -888,7 +888,7 @@ public function orWhereNotIn(?string $key = null, $values = null, ?bool $escape
      * Generates a HAVING field IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param array|BaseBuilder|Closure(BaseBuilder):BaseBuilder|null $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|(Closure(BaseBuilder): BaseBuilder)|null $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -901,7 +901,7 @@ public function havingIn(?string $key = null, $values = null, ?bool $escape = nu
      * Generates a HAVING field IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param array|BaseBuilder|Closure(BaseBuilder):BaseBuilder|null $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|(Closure(BaseBuilder): BaseBuilder)|null $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -914,7 +914,7 @@ public function orHavingIn(?string $key = null, $values = null, ?bool $escape =
      * Generates a HAVING field NOT IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param array|BaseBuilder|Closure(BaseBuilder):BaseBuilder|null $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|(Closure(BaseBuilder):BaseBuilder)|null $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -927,7 +927,7 @@ public function havingNotIn(?string $key = null, $values = null, ?bool $escape =
      * Generates a HAVING field NOT IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param array|BaseBuilder|Closure(BaseBuilder):BaseBuilder|null $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|(Closure(BaseBuilder): BaseBuilder)|null $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -942,8 +942,8 @@ public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape
      * @used-by whereNotIn()
      * @used-by orWhereNotIn()
      *
-     * @param non-empty-string|null                                   $key
-     * @param array|BaseBuilder|Closure(BaseBuilder):BaseBuilder|null $values The values searched on, or anonymous function with subquery
+     * @param non-empty-string|null                                      $key
+     * @param array|BaseBuilder|(Closure(BaseBuilder): BaseBuilder)|null $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      *
@@ -1197,7 +1197,7 @@ protected function _like_statement(?string $prefix, string $column, ?string $not
     /**
      * Add UNION statement
      *
-     * @param BaseBuilder|Closure(BaseBuilder):BaseBuilder $union
+     * @param BaseBuilder|Closure(BaseBuilder): BaseBuilder $union
      *
      * @return $this
      */
@@ -1209,7 +1209,7 @@ public function union($union)
     /**
      * Add UNION ALL statement
      *
-     * @param BaseBuilder|Closure(BaseBuilder):BaseBuilder $union
+     * @param BaseBuilder|Closure(BaseBuilder): BaseBuilder $union
      *
      * @return $this
      */
@@ -1222,7 +1222,7 @@ public function unionAll($union)
      * @used-by union()
      * @used-by unionAll()
      *
-     * @param BaseBuilder|Closure(BaseBuilder):BaseBuilder $union
+     * @param BaseBuilder|Closure(BaseBuilder): BaseBuilder $union
      *
      * @return $this
      */
@@ -3558,9 +3558,9 @@ protected function isSubquery($value): bool
     }
 
     /**
-     * @param BaseBuilder|Closure(BaseBuilder):BaseBuilder $builder
-     * @param bool                                         $wrapped Wrap the subquery in brackets
-     * @param string                                       $alias   Subquery alias
+     * @param BaseBuilder|Closure(BaseBuilder): BaseBuilder $builder
+     * @param bool                                          $wrapped Wrap the subquery in brackets
+     * @param string                                        $alias   Subquery alias
      */
     protected function buildSubquery($builder, bool $wrapped = false, string $alias = ''): string
     {
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 9fe25a7a0988..0a88b00a4445 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -959,7 +959,7 @@ public function newQuery(): BaseBuilder
      *                     ->get();
      *           })
      *
-     * @param Closure(BaseConnection):mixed $func
+     * @param Closure(BaseConnection): mixed $func
      *
      * @return BasePreparedQuery|null
      */
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index ea44f373c444..ad5c01a4858f 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1159,7 +1159,7 @@ public function view(string $from, string $view, ?array $options = null): RouteC
     /**
      * Limits the routes to a specified ENVIRONMENT or they won't run.
      *
-     * @param Closure(RouteCollection):void $callback
+     * @param Closure(RouteCollection): void $callback
      */
     public function environment(string $env, Closure $callback): RouteCollectionInterface
     {
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index 45138a4c832a..5837e6e658a6 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -120,7 +120,7 @@ protected function setUpFilterTestTrait(): void
      * @param FilterInterface|string $filter   The filter instance, class, or alias
      * @param string                 $position "before" or "after"
      *
-     * @phpstan-return Closure(list<string>|null=):mixed
+     * @phpstan-return Closure(list<string>|null=): mixed
      */
     protected function getFilterCaller($filter, string $position): Closure
     {
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index a43f7f4cfcf5..a942a32bceea 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -467,7 +467,7 @@ private function processPermitEmpty($value, array $rules, array $data)
     }
 
     /**
-     * @param Closure(bool|float|int|list<mixed>|object|string|null, bool|float|int|list<mixed>|object|string|null, string|null, string|null):bool|string $rule
+     * @param Closure(bool|float|int|list<mixed>|object|string|null, bool|float|int|list<mixed>|object|string|null, string|null, string|null): (bool|string) $rule
      */
     private function isClosure($rule): bool
     {