diff --git a/docs/en/console-commands/option-parsers.md b/docs/en/console-commands/option-parsers.md
index 4ae45e25e3..a3fc362370 100644
--- a/docs/en/console-commands/option-parsers.md
+++ b/docs/en/console-commands/option-parsers.md
@@ -38,7 +38,7 @@ public function getOptionParser()
 
 ## Using Arguments
 
-`method` Cake\\Console\\ConsoleOptionParser::**addArgument**($name, $params = [])
+`method` Cake\\Console\\ConsoleOptionParser::**addArgument**(string $name, array $params = []): static
 
 Positional arguments are frequently used in command line tools,
 and `ConsoleOptionParser` allows you to define positional
@@ -73,7 +73,7 @@ The `separator` option was added.
 
 ### Adding Multiple Arguments
 
-`method` Cake\\Console\\ConsoleOptionParser::**addArguments**(array $args)
+`method` Cake\\Console\\ConsoleOptionParser::**addArguments**(array $args): static
 
 If you have an array with multiple arguments you can use
 `$parser->addArguments()` to add multiple arguments at once. :
@@ -109,7 +109,7 @@ will be raised and the shell will be stopped.
 
 ## Using Options
 
-`method` Cake\\Console\\ConsoleOptionParser::**addOption**($name, array $options = [])
+`method` Cake\\Console\\ConsoleOptionParser::**addOption**(string $name, array $options = []): static
 
 Options or flags are used in command line tools to provide unordered key/value
 arguments for your commands. Options can define both verbose and short aliases.
@@ -164,7 +164,7 @@ The `separator` option was added.
 
 ### Adding Multiple Options
 
-`method` Cake\\Console\\ConsoleOptionParser::**addOptions**(array $options)
+`method` Cake\\Console\\ConsoleOptionParser::**addOptions**(array $options): static
 
 If you have an array with multiple options you can use `$parser->addOptions()`
 to add multiple options at once. :
@@ -241,7 +241,7 @@ public function getOptionParser()
 
 ### Merging Option Parsers
 
-`method` Cake\\Console\\ConsoleOptionParser::**merge**($spec)
+`method` Cake\\Console\\ConsoleOptionParser::**merge**(ConsoleOptionParser $spec): static
 
 When building a group command, you maybe want to combine several parsers for
 this:
@@ -348,7 +348,7 @@ epilog.
 
 ### Set the Description
 
-`method` Cake\\Console\\ConsoleOptionParser::**setDescription**($text)
+`method` Cake\\Console\\ConsoleOptionParser::**setDescription**(array|string $text): static
 
 The description displays above the argument and option information. By passing
 in either an array or a string, you can set the value of the description:
@@ -363,7 +363,7 @@ $parser->getDescription();
 
 ### Set the Epilog
 
-`method` Cake\\Console\\ConsoleOptionParser::**setEpilog**($text)
+`method` Cake\\Console\\ConsoleOptionParser::**setEpilog**(array|string $text): static
 
 Gets or sets the epilog for the option parser. The epilog is displayed after the
 argument and option information. By passing in either an array or a string, you
diff --git a/docs/en/controllers.md b/docs/en/controllers.md
index 1c66ba908b..acc3fd5ac3 100644
--- a/docs/en/controllers.md
+++ b/docs/en/controllers.md
@@ -147,7 +147,7 @@ rendered from the controller.
 
 ### Setting View Variables
 
-`method` Cake\\Controller\\Controller::**set**(string $var, mixed $value)
+`method` Cake\\Controller\\Controller::**set**(string $var, mixed $value): void
 
 The `Controller::set()` method is the main way to send data from your
 controller to your view. Once you've used `Controller::set()`, the variable
@@ -290,7 +290,7 @@ This would render **plugins/Users/templates/UserDetails/custom_file.php**
 
 ## Content Type Negotiation
 
-`method` Cake\\Controller\\Controller::**addViewClasses**(array $viewClasses)
+`method` Cake\\Controller\\Controller::**addViewClasses**(array $viewClasses): static
 
 Controllers can define a list of view classes they support. After the
 controller's action is complete CakePHP will use the view list to perform
@@ -462,7 +462,7 @@ a life-cycle handler.
 
 ## Loading Additional Tables/Models
 
-`method` Cake\\Controller\\Controller::**fetchTable**(string $alias, array $config = [])
+`method` Cake\\Controller\\Controller::**fetchTable**(?string $alias = null, array $options = []): Table
 
 The `fetchTable()` method comes handy when you need to use an ORM table that is not
 the controller's default one:
@@ -478,7 +478,7 @@ $recentArticles = $this->fetchTable('Articles')->find('all',
 
 ### fetchModel()
 
-`method` Cake\\Controller\\Controller::**fetchModel**(string|null $modelClass = null, string|null $modelType = null)
+`method` Cake\\Controller\\Controller::**fetchModel**(?string $modelClass = null, ?string $modelType = null): object
 
 The `fetchModel()` method is useful to load non ORM models or ORM tables that
 are not the controller's default:
diff --git a/docs/en/controllers/request-response.md b/docs/en/controllers/request-response.md
index c9b10140cd..4c0d6b51e3 100644
--- a/docs/en/controllers/request-response.md
+++ b/docs/en/controllers/request-response.md
@@ -823,7 +823,7 @@ public function sendIcs()
 
 ### Setting Headers
 
-`method` Cake\\Http\\Response::**withHeader**($header, $value)
+`method` Cake\\Http\\Response::**withHeader**(string $header, string $value): static
 
 Setting headers is done with the `Cake\Http\Response::withHeader()`
 method. Like all of the PSR-7 interface methods, this method returns a *new*
@@ -863,7 +863,7 @@ $response = $response->withType('application/json')
     ->withStringBody(json_encode(['Foo' => 'bar']));
 ```
 
-`method` Cake\\Http\\Response::**withBody**($body)
+`method` Cake\\Http\\Response::**withBody**(StreamInterface $body): static
 
 To set the response body, use the `withBody()` method, which is provided by the
 `Laminas\Diactoros\MessageTrait`:
@@ -1193,17 +1193,17 @@ criteria are met:
 
 The `CorsBuilder` provides the following methods for configuring CORS:
 
-`method` Cake\\Http\\CorsBuilder::**allowOrigin**(array|string $domains)
+`method` Cake\\Http\\CorsBuilder::**allowOrigin**(array|string $domains): static
 
-`method` Cake\\Http\\CorsBuilder::**allowMethods**(array $methods)
+`method` Cake\\Http\\CorsBuilder::**allowMethods**(array $methods): static
 
-`method` Cake\\Http\\CorsBuilder::**allowHeaders**(array $headers)
+`method` Cake\\Http\\CorsBuilder::**allowHeaders**(array $headers): static
 
-`method` Cake\\Http\\CorsBuilder::**allowCredentials**()
+`method` Cake\\Http\\CorsBuilder::**allowCredentials**(): static
 
-`method` Cake\\Http\\CorsBuilder::**exposeHeaders**(array $headers)
+`method` Cake\\Http\\CorsBuilder::**exposeHeaders**(array $headers): static
 
-`method` Cake\\Http\\CorsBuilder::**maxAge**(string|int $age)
+`method` Cake\\Http\\CorsBuilder::**maxAge**(string|int $age): static
 
 `method` Cake\\Http\\CorsBuilder::**build**(): ResponseInterface
 
diff --git a/docs/en/core-libraries/app.md b/docs/en/core-libraries/app.md
index 8066e164e5..1ed344ae1c 100644
--- a/docs/en/core-libraries/app.md
+++ b/docs/en/core-libraries/app.md
@@ -8,7 +8,7 @@ The App class is responsible for resource location and path management.
 
 ### App::className()
 
-`static` Cake\\Core\\App::**className**($name, $type = '', $suffix = ''): string|null
+`static` Cake\\Core\\App::**className**(string $class, string $type = '', string $suffix = ''): ?string
 
 This method is used to resolve class names throughout CakePHP. It resolves
 the short form names CakePHP uses and returns the fully resolved class name:
diff --git a/docs/en/core-libraries/collections.md b/docs/en/core-libraries/collections.md
index 646c1dfdbd..4876dee2ea 100644
--- a/docs/en/core-libraries/collections.md
+++ b/docs/en/core-libraries/collections.md
@@ -70,7 +70,7 @@ application as well.
 
 ### each()
 
-`method` Cake\\Collection\\Collection::**each**($callback)
+`method` Cake\\Collection\\Collection::**each**(callable $callback): CollectionInterface
 
 Collections can be iterated and/or transformed into new collections with the
 `each()` and `map()` methods. The `each()` method will not create a new
@@ -88,7 +88,7 @@ collection immediately applying the callback to each value in the collection.
 
 ### map()
 
-`method` Cake\\Collection\\Collection::**map**($callback): CollectionInterface
+`method` Cake\\Collection\\Collection::**map**(callable $callback): CollectionInterface
 
 The `map()` method will create a new collection based on the output of the
 callback being applied to each object in the original collection:
@@ -113,7 +113,7 @@ the resulting items when iterated.
 
 ### extract()
 
-`method` Cake\\Collection\\Collection::**extract**($path): CollectionInterface
+`method` Cake\\Collection\\Collection::**extract**(callable|string $path): CollectionInterface
 
 One of the most common uses for a `map()` function is to extract a single
 column from a collection. If you are looking to build a list of elements
@@ -188,7 +188,7 @@ Unlike `Cake\Utility\Hash::extract()` this method only supports the
 
 ### combine()
 
-`method` Cake\\Collection\\Collection::**combine**($keyPath, $valuePath, $groupPath = null): CollectionInterface
+`method` Cake\\Collection\\Collection::**combine**(callable|string $keyPath, callable|string $valuePath, callable|string|null $groupPath = null): CollectionInterface
 
 Collections allow you to create a new collection made from keys and values in
 an existing collection. Both the key and value paths can be specified with
@@ -245,7 +245,7 @@ $combined = (new Collection($entities))->combine(
 
 ### stopWhen()
 
-`method` Cake\\Collection\\Collection::**stopWhen**(callable $c): CollectionInterface
+`method` Cake\\Collection\\Collection::**stopWhen**(callable|array $condition): CollectionInterface
 
 You can stop the iteration at any point using the `stopWhen()` method. Calling
 it in a collection will create a new one that will stop yielding results if the
@@ -266,7 +266,7 @@ $result = $new->toList();
 
 ### unfold()
 
-`method` Cake\\Collection\\Collection::**unfold**(callable $callback): CollectionInterface
+`method` Cake\\Collection\\Collection::**unfold**(?callable $callback = null): CollectionInterface
 
 Sometimes the internal items of a collection will contain arrays or iterators
 with more items. If you wish to flatten the internal structure to iterate once
@@ -314,7 +314,7 @@ $result = $new->toList();
 
 ### chunk()
 
-`method` Cake\\Collection\\Collection::**chunk**($chunkSize): CollectionInterface
+`method` Cake\\Collection\\Collection::**chunk**(int $chunkSize): CollectionInterface
 
 When dealing with large amounts of items in a collection, it may make sense to
 process the elements in batches instead of one by one. For splitting
@@ -345,7 +345,7 @@ $collection->map(function ($article) {
 
 ### chunkWithKeys()
 
-`method` Cake\\Collection\\Collection::**chunkWithKeys**($chunkSize): CollectionInterface
+`method` Cake\\Collection\\Collection::**chunkWithKeys**(int $chunkSize, bool $keepKeys = true): CollectionInterface
 
 Much like `chunk()`, `chunkWithKeys()` allows you to slice up
 a collection into smaller batches but with keys preserved. This is useful when
@@ -372,7 +372,7 @@ $result = $chunked->toList();
 
 ### filter()
 
-`method` Cake\\Collection\\Collection::**filter**($callback): CollectionInterface
+`method` Cake\\Collection\\Collection::**filter**(?callable $callback = null): CollectionInterface
 
 Collections allow you to filter and create new collections based on
 the result of callback functions. You can use `filter()` to create a new
@@ -390,7 +390,7 @@ $guys = $collection->filter(function ($person, $key) {
 
 ### reject()
 
-`method` Cake\\Collection\\Collection::**reject**(callable $c): CollectionInterface
+`method` Cake\\Collection\\Collection::**reject**(?callable $callback = null): CollectionInterface
 
 The inverse of `filter()` is `reject()`. This method does a negative filter,
 removing elements that match the filter function:
@@ -404,7 +404,7 @@ $ladies = $collection->reject(function ($person, $key) {
 
 ### every()
 
-`method` Cake\\Collection\\Collection::**every**($callback): bool
+`method` Cake\\Collection\\Collection::**every**(callable $callback): bool
 
 You can do truth tests with filter functions. To see if every element in
 a collection matches a test you can use `every()`:
@@ -418,11 +418,11 @@ $allYoungPeople = $collection->every(function ($person) {
 
 ### any()
 
-`method` Cake\\Collection\\Collection::**any**($callback): bool
+`method` Cake\\Collection\\Collection::**any**(callable $callback): bool
 
 ### some()
 
-`method` Cake\\Collection\\Collection::**some**($callback): bool
+`method` Cake\\Collection\\Collection::**some**(callable $callback): bool
 
 You can see if the collection contains at least one element matching a filter
 function using the `any()` method:
@@ -439,7 +439,7 @@ $hasYoungPeople = $collection->any(function ($person) {
 
 ### match()
 
-`method` Cake\\Collection\\Collection::**match**($conditions): CollectionInterface
+`method` Cake\\Collection\\Collection::**match**(array $conditions): CollectionInterface
 
 If you need to extract a new collection containing only the elements that
 contain a given set of properties, you should use the `match()` method:
@@ -451,7 +451,7 @@ $commentsFromMark = $collection->match(['user.name' => 'Mark']);
 
 ### firstMatch()
 
-`method` Cake\\Collection\\Collection::**firstMatch**($conditions): mixed
+`method` Cake\\Collection\\Collection::**firstMatch**(array $conditions): mixed
 
 The property name can be a dot-separated path. You can traverse into nested
 entities and match the values they contain. When you only need the first
@@ -474,7 +474,7 @@ against.
 
 ### reduce()
 
-`method` Cake\\Collection\\Collection::**reduce**($callback, $initial): mixed
+`method` Cake\\Collection\\Collection::**reduce**(callable $callback, mixed $initial = null): mixed
 
 The counterpart of a `map()` operation is usually a `reduce`. This
 function will help you build a single result out of all the elements in a
@@ -499,7 +499,7 @@ $allTags = $collection->reduce(function ($accumulated, $article) {
 
 ### min()
 
-`method` Cake\\Collection\\Collection::**min**(string|callable $callback, $type = SORT_NUMERIC): mixed
+`method` Cake\\Collection\\Collection::**min**(callable|string $path, int $sort = SORT_NUMERIC): mixed
 
 To extract the minimum value for a collection based on a property, just use the
 `min()` function. This will return the full element from the collection and
@@ -526,7 +526,7 @@ $personWithYoungestDad = $collection->min('dad.age');
 
 ### max()
 
-`method` Cake\\Collection\\Collection::**max**(string|callable $callback, $type = SORT_NUMERIC): mixed
+`method` Cake\\Collection\\Collection::**max**(callable|string $path, int $sort = SORT_NUMERIC): mixed
 
 The same can be applied to the `max()` function, which will return a single
 element from the collection having the highest property value:
@@ -544,7 +544,7 @@ $personWithOldestDad = $collection->max('dad.age');
 
 ### sumOf()
 
-`method` Cake\\Collection\\Collection::**sumOf**($path = null): float|int
+`method` Cake\\Collection\\Collection::**sumOf**(callable|string|null $path = null): float|int
 
 Finally, the `sumOf()` method will return the sum of a property of all
 elements:
@@ -562,7 +562,7 @@ $sumOfDadAges = $collection->sumOf('dad.age');
 
 ### avg()
 
-`method` Cake\\Collection\\Collection::**avg**($path = null): float|int|null
+`method` Cake\\Collection\\Collection::**avg**(callable|string|null $path = null): float|int|null
 
 Calculate the average value of the elements in the collection. Optionally
 provide a matcher path, or function to extract values to generate the average
@@ -580,7 +580,7 @@ $average = (new Collection($items))->avg('invoice.total');
 
 ### median()
 
-`method` Cake\\Collection\\Collection::**median**($path = null): float|int|null
+`method` Cake\\Collection\\Collection::**median**(callable|string|null $path = null): float|int|null
 
 Calculate the median value of a set of elements. Optionally provide a matcher
 path, or function to extract values to generate the median for:
@@ -602,7 +602,7 @@ $median = (new Collection($items))->median('invoice.total');
 
 ### groupBy()
 
-`method` Cake\\Collection\\Collection::**groupBy**($callback): CollectionInterface
+`method` Cake\\Collection\\Collection::**groupBy**(callable|string $path): CollectionInterface
 
 Collection values can be grouped by different keys in a new collection when they
 share the same value for a property:
@@ -644,7 +644,7 @@ $classResults = $students->groupBy(function ($student) {
 
 ### countBy()
 
-`method` Cake\\Collection\\Collection::**countBy**($callback): CollectionInterface
+`method` Cake\\Collection\\Collection::**countBy**(callable|string $path): CollectionInterface
 
 If you only wish to know the number of occurrences per group, you can do so by
 using the `countBy()` method. It takes the same arguments as `groupBy` so it
@@ -661,7 +661,7 @@ $classResults = $students->countBy(function ($student) {
 
 ### indexBy()
 
-`method` Cake\\Collection\\Collection::**indexBy**($callback): CollectionInterface
+`method` Cake\\Collection\\Collection::**indexBy**(callable|string $path): CollectionInterface
 
 There will be certain cases where you know an element is unique for the property
 you want to group by. If you wish a single result per group, you can use the
@@ -691,7 +691,7 @@ $filesByHash = $files->indexBy(function ($file) {
 
 ### zip()
 
-`method` Cake\\Collection\\Collection::**zip**($items): CollectionInterface
+`method` Cake\\Collection\\Collection::**zip**(iterable ...$items): CollectionInterface
 
 The elements of different collections can be grouped together using the
 `zip()` method. It will return a new collection containing an array grouping
@@ -750,7 +750,7 @@ $result = $firstYear->zip($data[0], $data[1])->toList();
 
 ### sortBy()
 
-`method` Cake\\Collection\\Collection::**sortBy**($callback, $order = SORT_DESC, $sort = SORT_NUMERIC): CollectionInterface
+`method` Cake\\Collection\\Collection::**sortBy**(callable|string $path, int $order = SORT_DESC, int $sort = SORT_NUMERIC): CollectionInterface
 
 Collection values can be sorted in ascending or descending order based on
 a column or custom function. To create a new sorted collection out of the values
@@ -818,7 +818,7 @@ $sorted = $collection->sortBy('title', SORT_ASC, SORT_NATURAL);
 
 ### nest()
 
-`method` Cake\\Collection\\Collection::**nest**($idPath, $parentPath, $nestingKey = 'children'): CollectionInterface
+`method` Cake\\Collection\\Collection::**nest**(callable|string $idPath, callable|string $parentPath, string $nestingKey = 'children'): CollectionInterface
 
 Not all data is meant to be represented in a linear way. Collections make it
 easier to construct and flatten hierarchical or nested structures. Creating
@@ -870,7 +870,7 @@ rendering menus or traversing elements up to certain level in the tree.
 
 ### listNested()
 
-`method` Cake\\Collection\\Collection::**listNested**($order = 'desc', $nestingKey = 'children'): CollectionInterface
+`method` Cake\\Collection\\Collection::**listNested**(string|int $order = 'desc', callable|string $nestingKey = 'children'): CollectionInterface
 
 The inverse of `nest()` is `listNested()`. This method allows you to flatten
 a tree structure back into a linear structure. It takes two parameters; the
@@ -961,7 +961,7 @@ $collection->isEmpty();
 
 ### contains()
 
-`method` Cake\\Collection\\Collection::**contains**($value): bool
+`method` Cake\\Collection\\Collection::**contains**(mixed $value): bool
 
 Collections allow you to quickly check if they contain one particular
 value: by using the `contains()` method:
@@ -1020,7 +1020,7 @@ $result = $transpose->toList();
 
 ### sample()
 
-`method` Cake\\Collection\\Collection::**sample**($length = 10): CollectionInterface
+`method` Cake\\Collection\\Collection::**sample**(int $length = 10): CollectionInterface
 
 Shuffling a collection is often useful when doing quick statistical analysis.
 Another common operation when doing this sort of task is withdrawing a few
@@ -1041,7 +1041,7 @@ sample, the full collection in a random order is returned.
 
 ### take()
 
-`method` Cake\\Collection\\Collection::**take**($length, $offset): CollectionInterface
+`method` Cake\\Collection\\Collection::**take**(int $length = 1, int $offset = 0): CollectionInterface
 
 Whenever you want to take a slice of a collection use the `take()` function,
 it will create a new collection with at most the number of values you specify in
@@ -1058,7 +1058,7 @@ Positions are zero-based, therefore the first position number is `0`.
 
 ### skip()
 
-`method` Cake\\Collection\\Collection::**skip**($length): CollectionInterface
+`method` Cake\\Collection\\Collection::**skip**(int $length): CollectionInterface
 
 While the second argument of `take()` can help you skip some elements before
 getting them from the collection, you can also use `skip()` for the same
@@ -1117,7 +1117,7 @@ $myTimeline->filter(function ($tweet) {
 
 ### appendItem()
 
-`method` Cake\\Collection\\Collection::**appendItem**($value, $key): CollectionInterface
+`method` Cake\\Collection\\Collection::**appendItem**(mixed $item, mixed $key = null): CollectionInterface
 
 Allows you to append an item with an optional key to the collection. If you
 specify a key that already exists in the collection, the value will not be
@@ -1130,7 +1130,7 @@ $myTimeline = $cakephpTweets->appendItem($newTweet, 99);
 
 ### prepend()
 
-`method` Cake\\Collection\\Collection::**prepend**($items): CollectionInterface
+`method` Cake\\Collection\\Collection::**prepend**(iterable $items): CollectionInterface
 
 The `prepend()` method will return a new collection containing the values from
 both sources:
@@ -1142,7 +1142,7 @@ $myTimeline = $cakephpTweets->prepend($phpTweets);
 
 ### prependItem()
 
-`method` Cake\\Collection\\Collection::**prependItem**($value, $key): CollectionInterface
+`method` Cake\\Collection\\Collection::**prependItem**(mixed $item, mixed $key = null): CollectionInterface
 
 Allows you to prepend an item with an optional key to the collection. If you
 specify a key that already exists in the collection, the value will not be
@@ -1165,7 +1165,7 @@ $myTimeline = $cakephpTweets->prependItem($newTweet, 99);
 
 ### insert()
 
-`method` Cake\\Collection\\Collection::**insert**($path, $items): CollectionInterface
+`method` Cake\\Collection\\Collection::**insert**(string $path, mixed $values): CollectionInterface
 
 At times, you may have two separate sets of data that you would like to insert
 the elements of one set into each of the elements of the other set. This is
@@ -1287,7 +1287,7 @@ $collection->map(new TotalOrderCalculator)
 
 ### through()
 
-`method` Cake\\Collection\\Collection::**through**($callback): CollectionInterface
+`method` Cake\\Collection\\Collection::**through**(callable $callback): CollectionInterface
 
 Sometimes a chain of collection method calls can become reusable in other parts
 of your application, but only if they are called in that specific order. In
@@ -1410,7 +1410,7 @@ $rewindable = (new Collection(results()))->buffered();
 
 ### compile()
 
-`method` Cake\\Collection\\Collection::**compile**($preserveKeys = true): CollectionInterface
+`method` Cake\\Collection\\Collection::**compile**(bool $keepKeys = true): CollectionInterface
 
 Sometimes you need to get a clone of the elements from another
 collection. This is useful when you need to iterate the same set from different
diff --git a/docs/en/core-libraries/email.md b/docs/en/core-libraries/email.md
index 24dc83edce..39e10d6291 100644
--- a/docs/en/core-libraries/email.md
+++ b/docs/en/core-libraries/email.md
@@ -257,7 +257,7 @@ following path:
 
 ### Mailer::setAttachments()
 
-`method` Cake\\Mailer\\Mailer::**setAttachments**($attachments)
+`method` Cake\\Mailer\\Mailer::**setAttachments**(array $attachments): static
 
 You can attach files to email messages as well. There are a few
 different formats depending on what kind of files you have, and how
@@ -310,7 +310,7 @@ You can also add attachments using the `addAttachment()` method.
 
 ### Mailer::setEmailPattern()
 
-`method` Cake\\Mailer\\Mailer::**setEmailPattern**($pattern)
+`method` Cake\\Mailer\\Mailer::**setEmailPattern**(?string $regex): static
 
 If you are having validation issues when sending to non-compliant addresses, you
 can relax the pattern used to validate email addresses. This is sometimes
diff --git a/docs/en/core-libraries/inflector.md b/docs/en/core-libraries/inflector.md
index a22af1b32d..5f5cedfbaf 100644
--- a/docs/en/core-libraries/inflector.md
+++ b/docs/en/core-libraries/inflector.md
@@ -118,11 +118,11 @@ when provided a multi-word argument:
 
 ### Inflector::singularize()
 
-`static` Cake\\Utility\\Inflector::**singularize**($singular): string
+`static` Cake\\Utility\\Inflector::**singularize**(string $word): string
 
 ### Inflector::pluralize()
 
-`static` Cake\\Utility\\Inflector::**pluralize**($singular): string
+`static` Cake\\Utility\\Inflector::**pluralize**(string $word): string
 
 Both `pluralize` and `singularize()` work on most English nouns. If you need
 to support other languages, you can use [Inflection Configuration](#inflection-configuration) to
@@ -148,11 +148,11 @@ echo Inflector::singularize('People');
 
 ### Inflector::camelize()
 
-`static` Cake\\Utility\\Inflector::**camelize**($underscored): string
+`static` Cake\\Utility\\Inflector::**camelize**(string $string, string $delimiter = '_'): string
 
 ### Inflector::underscore()
 
-`static` Cake\\Utility\\Inflector::**underscore**($camelCase): string
+`static` Cake\\Utility\\Inflector::**underscore**(string $string): string
 
 These methods are useful when creating class names, or property names:
 
@@ -172,7 +172,7 @@ underscore.
 
 ### Inflector::humanize()
 
-`static` Cake\\Utility\\Inflector::**humanize**($underscored): string
+`static` Cake\\Utility\\Inflector::**humanize**(string $string, string $delimiter = '_'): string
 
 This method is useful when converting underscored forms into "Title Case" forms
 for human readable values:
@@ -186,15 +186,15 @@ Inflector::humanize('apple_pie');
 
 ### Inflector::classify()
 
-`static` Cake\\Utility\\Inflector::**classify**($underscored): string
+`static` Cake\\Utility\\Inflector::**classify**(string $tableName): string
 
 ### Inflector::dasherize()
 
-`static` Cake\\Utility\\Inflector::**dasherize**($dashed): string
+`static` Cake\\Utility\\Inflector::**dasherize**(string $string): string
 
 ### Inflector::tableize()
 
-`static` Cake\\Utility\\Inflector::**tableize**($camelCase): string
+`static` Cake\\Utility\\Inflector::**tableize**(string $className): string
 
 When generating code, or using CakePHP's conventions you may need to inflect
 table names or class names:
@@ -214,7 +214,7 @@ Inflector::tableize('UserProfileSetting');
 
 ### Inflector::variable()
 
-`static` Cake\\Utility\\Inflector::**variable**($underscored): string
+`static` Cake\\Utility\\Inflector::**variable**(string $string): string
 
 Variable names are often useful when doing meta-programming tasks that involve
 generating code or doing work based on conventions:
@@ -244,7 +244,7 @@ special cases.
 
 ### Inflector::rules()
 
-`static` Cake\\Utility\\Inflector::**rules**($type, $rules, $reset = false): void
+`static` Cake\\Utility\\Inflector::**rules**(string $type, array $rules, bool $reset = false): void
 
 Define new inflection and transliteration rules for Inflector to use. Often,
 this method is used in your **config/bootstrap.php**:
diff --git a/docs/en/core-libraries/number.md b/docs/en/core-libraries/number.md
index fdc5704919..3663a58ba4 100644
--- a/docs/en/core-libraries/number.md
+++ b/docs/en/core-libraries/number.md
@@ -91,7 +91,7 @@ Number::setDefaultCurrencyFormat(Number::FORMAT_CURRENCY_ACCOUNTING);
 
 ### Number::setDefaultCurrency()
 
-`method` Cake\\I18n\\Number::**setDefaultCurrency**($currency): void
+`static` Cake\\I18n\\Number::**setDefaultCurrency**(?string $currency = null): void
 
 Setter for the default currency. This removes the need to always pass the
 currency to `Cake\I18n\Number::currency()` and change all
diff --git a/docs/en/core-libraries/text.md b/docs/en/core-libraries/text.md
index 221653f2d8..9b92149ba5 100644
--- a/docs/en/core-libraries/text.md
+++ b/docs/en/core-libraries/text.md
@@ -40,7 +40,7 @@ class UsersController extends AppController
 
 ### Text::transliterate()
 
-`static` Cake\\Utility\\Text::**transliterate**($string, $transliteratorId = null): string
+`static` Cake\\Utility\\Text::**transliterate**(string $string, Transliterator|string|null $transliterator = null): string
 
 Transliterate by default converts all characters in provided string into
 equivalent ASCII characters. The method expects UTF-8 encoding. The character
@@ -428,7 +428,7 @@ Output:
 
 ### Text::toList()
 
-`method` Cake\\Utility\\Text::**toList**(array $list, ?string $and = null, $separator = ', '): string
+`method` Cake\\Utility\\Text::**toList**(array $list, ?string $and = null, string $separator = ', '): string
 
 Creates a comma-separated list where the last two items are joined with 'and':
 
diff --git a/docs/en/core-libraries/time.md b/docs/en/core-libraries/time.md
index 2e5793f59a..8034568de6 100644
--- a/docs/en/core-libraries/time.md
+++ b/docs/en/core-libraries/time.md
@@ -149,7 +149,7 @@ echo $time->timezoneName; // America/New_York
 
 ### DateTime::setJsonEncodeFormat()
 
-`static` Cake\\I18n\\DateTime::**setJsonEncodeFormat**($format): void
+`static` Cake\\I18n\\DateTime::**setJsonEncodeFormat**(Closure|array|string|int $format): void
 
 This method sets the default format used when converting an object to json:
 
@@ -179,7 +179,7 @@ The `callable` parameter type was added.
 
 ### DateTime::i18nFormat()
 
-`method` Cake\\I18n\\DateTime::**i18nFormat**($format = null, $timezone = null, $locale = null): string|int
+`method` Cake\\I18n\\DateTime::**i18nFormat**(array|string|int|null $format = null, DateTimeZone|string|null $timezone = null, ?string $locale = null): string|int
 
 A very common thing to do with `Time` instances is to print out formatted
 dates. CakePHP makes this a snap:
@@ -415,19 +415,19 @@ $range = $time->toQuarterRange();
 
 ### DateTime::isYesterday()
 
-`method` Cake\\I18n\\DateTime::**isYesterday**()
+`method` Cake\\I18n\\DateTime::**isYesterday**(): bool
 
 ### DateTime::isThisWeek()
 
-`method` Cake\\I18n\\DateTime::**isThisWeek**()
+`method` Cake\\I18n\\DateTime::**isThisWeek**(): bool
 
 ### DateTime::isThisMonth()
 
-`method` Cake\\I18n\\DateTime::**isThisMonth**()
+`method` Cake\\I18n\\DateTime::**isThisMonth**(): bool
 
 ### DateTime::isThisYear()
 
-`method` Cake\\I18n\\DateTime::**isThisYear**()
+`method` Cake\\I18n\\DateTime::**isThisYear**(): bool
 
 You can compare a `DateTime` instance with the present in a variety of ways:
 
@@ -447,7 +447,7 @@ not the `DateTime` instance matches the present.
 
 ### DateTime::isWithinNext()
 
-`method` Cake\\I18n\\DateTime::**isWithinNext**($interval)
+`method` Cake\\I18n\\DateTime::**isWithinNext**(string|int $timeInterval): bool
 
 You can see if a `DateTime` instance falls within a given range using
 `wasWithinLast()` and `isWithinNext()`:
@@ -464,7 +464,7 @@ debug($time->isWithinNext('2 weeks'));
 
 ### DateTime::wasWithinLast()
 
-`method` Cake\\I18n\\DateTime::**wasWithinLast**($interval)
+`method` Cake\\I18n\\DateTime::**wasWithinLast**(string|int $timeInterval): bool
 
 You can also compare a `DateTime` instance within a range in the past:
 
diff --git a/docs/en/core-libraries/xml.md b/docs/en/core-libraries/xml.md
index 3993a274b0..a2279ce0ba 100644
--- a/docs/en/core-libraries/xml.md
+++ b/docs/en/core-libraries/xml.md
@@ -9,7 +9,7 @@ DOMDocument objects, and back into arrays again.
 
 ### Xml::build()
 
-`static` Cake\\Utility\\Xml::**build**($input, array $options = []): SimpleXMLElement|DOMDocument
+`static` Cake\\Utility\\Xml::**build**(object|array|string $input, array $options = []): SimpleXMLElement|DOMDocument
 
 You can load XML-ish data using `Xml::build()`. Depending on your
 `$options` parameter, this method will return a SimpleXMLElement (default)
@@ -79,7 +79,7 @@ can be enabled with the `loadEntities` and `parseHuge` options respectively.
 
 ### Xml::toArray()
 
-`static` Cake\\Utility\\Xml::**toArray**($obj): array
+`static` Cake\\Utility\\Xml::**toArray**(SimpleXMLElement|DOMNode $obj): array
 
 Converting XML strings into arrays is simple with the Xml class as well. By
 default you'll get a SimpleXml object back:
diff --git a/docs/en/orm/behaviors/counter-cache.md b/docs/en/orm/behaviors/counter-cache.md
index 656e7e6262..17c8066c10 100644
--- a/docs/en/orm/behaviors/counter-cache.md
+++ b/docs/en/orm/behaviors/counter-cache.md
@@ -168,7 +168,7 @@ Finally clear all caches with `bin/cake cache clear_all` and try it out.
 
 ## Manually updating counter caches
 
-`method` Cake\\ORM\\Behavior\\CounterCacheBehavior::**updateCounterCache(?string $assocName = null, int $limit = 100, ?int $page = null): void**()
+`method` Cake\\ORM\\Behavior\\CounterCacheBehavior::**updateCounterCache**(?string $assocName = null, int $limit = 100, ?int $page = null): void
 
 The `updateCounterCache()` method allows you to update the counter cache values
 for all records of one or all configured associations in batches. This can be useful,
diff --git a/docs/en/orm/database-basics.md b/docs/en/orm/database-basics.md
index 852267223b..eb8c0d3506 100644
--- a/docs/en/orm/database-basics.md
+++ b/docs/en/orm/database-basics.md
@@ -339,7 +339,7 @@ references to existing connections.
 
 ### Accessing Connections
 
-`static` Cake\\Datasource\\ConnectionManager::**get**($name): ConnectionInterface
+`static` Cake\\Datasource\\ConnectionManager::**get**(string $name): ConnectionInterface
 
 Once configured connections can be fetched using
 `Cake\Datasource\ConnectionManager::get()`. This method will
@@ -518,7 +518,7 @@ Maps to a native `DATETIME` column type. In PostgreSQL and SQL Server this
 turns into a `TIMESTAMP` type. The default return value of this column type is
 `Cake\I18n\DateTime` which extends [Chronos](https://github.com/cakephp/chronos) and the native `DateTimeImmutable`.
 
-`method` Cake\\Database\\DateTimeType::**setTimezone**(string|\\DateTimeZone|null $timezone)
+`method` Cake\\Database\\DateTimeType::**setTimezone**(string|DateTimeZone|null $timezone): static
 
 If your database server's timezone does not match your application's PHP timezone
 then you can use this method to specify your database's timezone. This timezone
@@ -646,7 +646,7 @@ Geospatial schema types were added.
 
 `class` Cake\\Database\\**TypeFactory**
 
-`static` Cake\\Database\\TypeFactory::**map**($name, $class): void
+`static` Cake\\Database\\TypeFactory::**map**(string $name, string $class): void
 
 If you need to use vendor specific types that are not built into CakePHP you can
 add additional new types to CakePHP's type system. Type classes are expected to
diff --git a/docs/en/orm/deleting-data.md b/docs/en/orm/deleting-data.md
index 81bb2577fe..20482f7b75 100644
--- a/docs/en/orm/deleting-data.md
+++ b/docs/en/orm/deleting-data.md
@@ -84,7 +84,7 @@ records with these method **will** trigger events.
 
 ### deleteAll()
 
-`method` Cake\\ORM\\Table::**deleteAll**($conditions): int
+`method` Cake\\ORM\\Table::**deleteAll**(QueryExpression|Closure|array|string|null $conditions): int
 
 There may be times when deleting rows one by one is not efficient or useful.
 In these cases it is more performant to use a bulk-delete to remove many rows at
diff --git a/docs/en/orm/entities.md b/docs/en/orm/entities.md
index c509b89e7a..bde3bcdf56 100644
--- a/docs/en/orm/entities.md
+++ b/docs/en/orm/entities.md
@@ -97,11 +97,11 @@ You can also use the `get()` and `set()` methods.
 
 ### set()
 
-`method` Cake\\ORM\\Entity::**set**($field, $value = null, array $options = [])
+`method` Cake\\ORM\\Entity::**set**(array|string $field, mixed $value = null, array $options = []): static
 
 ### get()
 
-`method` Cake\\ORM\\Entity::**get**($field)
+`method` Cake\\ORM\\Entity::**get**(string $field): mixed
 
 For example:
 
@@ -112,7 +112,7 @@ echo $article->get('title');
 
 ### patch()
 
-`method` Cake\\ORM\\Entity::**patch**(array $fields, array $options = [])
+`method` Cake\\ORM\\Entity::**patch**(array $fields, array $options = []): static
 
 Using `patch()` you can mass assign multiple fields at once:
 
diff --git a/docs/en/orm/saving-data.md b/docs/en/orm/saving-data.md
index 9b418d9ba8..0ef679264b 100644
--- a/docs/en/orm/saving-data.md
+++ b/docs/en/orm/saving-data.md
@@ -795,7 +795,7 @@ The `strictFields` option was added in 5.3.0.
 
 ## Saving Entities
 
-`method` Cake\\ORM\\Table::**save**(Entity $entity, array $options = []): EntityInterface|false
+`method` Cake\\ORM\\Table::**save**(EntityInterface $entity, array $options = []): EntityInterface|false
 
 When saving request data to your database you need to first hydrate a new entity
 using `newEntity()` for passing into `save()`. For example:
@@ -1285,7 +1285,7 @@ corresponding save events will be triggered.
 
 ## Find or Create an Entity
 
-`method` Cake\\ORM\\Table::**findOrCreate**($search, $callback = null, $options = []): EntityInterface
+`method` Cake\\ORM\\Table::**findOrCreate**(SelectQuery|callable|array $search, callable|array|null $callback = null, array $options = []): EntityInterface
 
 Find an existing record based on `$search` or create a new record using the
 properties in `$search` and calling the optional `$callback`. This method is
@@ -1371,7 +1371,7 @@ The result will be updated entities on success or `false` on failure.
 
 ## Bulk Updates
 
-`method` Cake\\ORM\\Table::**updateAll**($fields, $conditions): int
+`method` Cake\\ORM\\Table::**updateAll**(QueryExpression|Closure|array|string $fields, QueryExpression|Closure|array|string|null $conditions): int
 
 There may be times when updating rows individually is not efficient or
 necessary. In these cases it is more efficient to use a bulk-update to modify
diff --git a/docs/en/orm/table-objects.md b/docs/en/orm/table-objects.md
index 0a3c18bb2b..8c6ef190d2 100644
--- a/docs/en/orm/table-objects.md
+++ b/docs/en/orm/table-objects.md
@@ -273,14 +273,14 @@ Behaviors, can use this hook to add in validation methods.
 
 ### buildRules
 
-`method` Cake\\ORM\\Table::**buildRules(RulesChecker $rules): RulesChecker**()
+`method` Cake\\ORM\\Table::**buildRules**(RulesChecker $rules): RulesChecker
 
 The `Model.buildRules` event is fired after a rules instance has been
 created and after the `Table::buildRules()` method has been called.
 
 ### beforeRules
 
-`method` Cake\\ORM\\Table::**beforeRules**(EventInterface $event, EntityInterface $entity, ArrayObject $options, $operation): void
+`method` Cake\\ORM\\Table::**beforeRules**(EventInterface $event, EntityInterface $entity, ArrayObject $options, string $operation): void
 
 The `Model.beforeRules` event is fired before an entity has had rules applied. By
 stopping this event, you can halt the rules checking and set the result
@@ -288,7 +288,7 @@ of applying rules.
 
 ### afterRules
 
-`method` Cake\\ORM\\Table::**afterRules**(EventInterface $event, EntityInterface $entity, ArrayObject $options, $result, $operation): void
+`method` Cake\\ORM\\Table::**afterRules**(EventInterface $event, EntityInterface $entity, ArrayObject $options, bool $result, string $operation): void
 
 The `Model.afterRules` event is fired after an entity has rules applied. By
 stopping this event, you can return the final value of the rules checking
@@ -499,7 +499,7 @@ few other useful features as well.
 
 ### Configuring Table Objects
 
-`method` Cake\\ORM\\TableLocator::**get**($alias, $config)
+`method` Cake\\ORM\\TableLocator::**get**(string $alias, array $options = []): Table
 
 When loading tables from the registry you can customize their dependencies, or
 use mock objects by providing an `$options` array:
diff --git a/docs/en/views/helpers.md b/docs/en/views/helpers.md
index 5d8618d43f..bfa959570c 100644
--- a/docs/en/views/helpers.md
+++ b/docs/en/views/helpers.md
@@ -377,24 +377,24 @@ does not implement any of the callback methods.
 
 #### beforeRenderFile()
 
-`method` Helper::**beforeRenderFile**(EventInterface $event, $viewFile): void
+`method` Helper::**beforeRenderFile**(EventInterface $event, string $viewFile): void
 
 #### afterRenderFile()
 
-`method` Helper::**afterRenderFile**(EventInterface $event, $viewFile, $content): void
+`method` Helper::**afterRenderFile**(EventInterface $event, string $viewFile, string $content): void
 
 #### beforeRender()
 
-`method` Helper::**beforeRender**(EventInterface $event, $viewFile): void
+`method` Helper::**beforeRender**(EventInterface $event, string $viewFile): void
 
 #### afterRender()
 
-`method` Helper::**afterRender**(EventInterface $event, $viewFile): void
+`method` Helper::**afterRender**(EventInterface $event, string $viewFile): void
 
 #### beforeLayout()
 
-`method` Helper::**beforeLayout**(EventInterface $event, $layoutFile): void
+`method` Helper::**beforeLayout**(EventInterface $event, string $layoutFile): void
 
 #### afterLayout()
 
-`method` Helper::**afterLayout**(EventInterface $event, $layoutFile): void
+`method` Helper::**afterLayout**(EventInterface $event, string $layoutFile): void
diff --git a/docs/en/views/helpers/paginator.md b/docs/en/views/helpers/paginator.md
index 5c2920af47..72ce80709e 100644
--- a/docs/en/views/helpers/paginator.md
+++ b/docs/en/views/helpers/paginator.md
@@ -189,9 +189,9 @@ echo $this->Paginator->sort('user_id', null, ['direction' => 'asc', 'lock' => tr
 
 ### Getting Sort Direction and Key
 
-`method` Cake\\View\\Helper\\PaginatorHelper::**sortDir**(string $model = null, mixed $options = []): string
+`method` Cake\\View\\Helper\\PaginatorHelper::**sortDir**(?string $model = null, array $options = []): string
 
-`method` Cake\\View\\Helper\\PaginatorHelper::**sortKey**(string $model = null, mixed $options = [])
+`method` Cake\\View\\Helper\\PaginatorHelper::**sortKey**(?string $model = null, array $options = []): ?string
 
 ### Creating Page Number Links