diff --git a/VERSION.txt b/VERSION.txt
index 0a841b122e0..1dc53dd96d8 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -16,4 +16,4 @@
 // @license       https://opensource.org/licenses/mit-license.php MIT License
 // +--------------------------------------------------------------------------------------------+ //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-5.2.0
+5.2.1
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 9da2efe15eb..de94dccd0f9 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -45,7 +45,7 @@
         <ini name="error_reporting" value="32767"/>
         <env name="FIXTURE_SCHEMA_METADATA" value="./tests/schema.php"/>
 
-        <!-- Enable query logging output for the testrun.
+        <!-- Enable query logging output for the test run.
         <env name="LOG_QUERIES" value="1" />
         -->
         <!-- SQLite
diff --git a/src/Cache/Engine/MemcachedEngine.php b/src/Cache/Engine/MemcachedEngine.php
index 3180629a459..fc6149f16a8 100644
--- a/src/Cache/Engine/MemcachedEngine.php
+++ b/src/Cache/Engine/MemcachedEngine.php
@@ -355,7 +355,7 @@ public function get(string $key, mixed $default = null): mixed
      * @param iterable<string> $keys An array of identifiers for the data
      * @param mixed $default Default value to return for keys that do not exist.
      * @return iterable<string, mixed> An array containing, for each of the given $keys, the cached data or
-     *   false if cached data could not be retrieved.
+     *   `$default` if cached data could not be retrieved.
      */
     public function getMultiple(iterable $keys, mixed $default = null): iterable
     {
@@ -365,6 +365,10 @@ public function getMultiple(iterable $keys, mixed $default = null): iterable
         }
 
         $values = $this->_Memcached->getMulti($cacheKeys);
+        if ($values === false) {
+            return array_fill_keys(array_keys($cacheKeys), $default);
+        }
+
         $return = [];
         foreach ($cacheKeys as $original => $prefixed) {
             $return[$original] = array_key_exists($prefixed, $values) ? $values[$prefixed] : $default;
diff --git a/src/Cache/Engine/RedisEngine.php b/src/Cache/Engine/RedisEngine.php
index b6ed5e53f26..6490a0d361d 100644
--- a/src/Cache/Engine/RedisEngine.php
+++ b/src/Cache/Engine/RedisEngine.php
@@ -433,7 +433,7 @@ public function clearGroup(string $group): bool
      * Serialize value for saving to Redis.
      *
      * This is needed instead of using Redis' in built serialization feature
-     * as it creates problems incrementing/decrementing intially set integer value.
+     * as it creates problems incrementing/decrementing initially set integer value.
      *
      * @param mixed $value Value to serialize.
      * @return string
diff --git a/src/Cache/composer.json b/src/Cache/composer.json
index 44562ce2a65..e978f708ce1 100644
--- a/src/Cache/composer.json
+++ b/src/Cache/composer.json
@@ -37,7 +37,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Collection/composer.json b/src/Collection/composer.json
index 54ced32df0d..aa4fe5caef3 100644
--- a/src/Collection/composer.json
+++ b/src/Collection/composer.json
@@ -35,7 +35,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Console/composer.json b/src/Console/composer.json
index 7793fba15a9..d3a061fe511 100644
--- a/src/Console/composer.json
+++ b/src/Console/composer.json
@@ -41,7 +41,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Core/ObjectRegistry.php b/src/Core/ObjectRegistry.php
index 5b29f588255..6cd472edd68 100644
--- a/src/Core/ObjectRegistry.php
+++ b/src/Core/ObjectRegistry.php
@@ -344,8 +344,6 @@ public function reset()
      */
     public function set(string $name, object $object)
     {
-        [, $objName] = pluginSplit($name);
-
         // Just call unload if the object was loaded before
         if (array_key_exists($name, $this->_loaded)) {
             $this->unload($name);
@@ -353,7 +351,7 @@ public function set(string $name, object $object)
         if ($this instanceof EventDispatcherInterface && $object instanceof EventListenerInterface) {
             $this->getEventManager()->on($object);
         }
-        $this->_loaded[$objName] = $object;
+        $this->_loaded[$name] = $object;
 
         return $this;
     }
@@ -368,9 +366,8 @@ public function set(string $name, object $object)
      */
     public function unload(string $name)
     {
-        if (empty($this->_loaded[$name])) {
-            [$plugin, $name] = pluginSplit($name);
-            $this->_throwMissingClassError($name, $plugin);
+        if (!isset($this->_loaded[$name])) {
+            throw new CakeException(sprintf('Object named `%s` is not loaded.', $name));
         }
 
         $object = $this->_loaded[$name];
diff --git a/src/Core/composer.json b/src/Core/composer.json
index cd8c5b232a6..55812cf1829 100644
--- a/src/Core/composer.json
+++ b/src/Core/composer.json
@@ -46,7 +46,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Database/Driver/Postgres.php b/src/Database/Driver/Postgres.php
index 2de0fdcc614..678a43bdae3 100644
--- a/src/Database/Driver/Postgres.php
+++ b/src/Database/Driver/Postgres.php
@@ -248,7 +248,7 @@ protected function _expressionTranslators(): array
     /**
      * Changes identifer expression into postgresql format.
      *
-     * @param \Cake\Database\Expression\IdentifierExpression $expression The expression to tranform.
+     * @param \Cake\Database\Expression\IdentifierExpression $expression The expression to transform.
      * @return void
      */
     protected function _transformIdentifierExpression(IdentifierExpression $expression): void
@@ -340,7 +340,7 @@ protected function _transformFunctionExpression(FunctionExpression $expression):
     /**
      * Changes string expression into postgresql format.
      *
-     * @param \Cake\Database\Expression\StringExpression $expression The string expression to tranform.
+     * @param \Cake\Database\Expression\StringExpression $expression The string expression to transform.
      * @return void
      */
     protected function _transformStringExpression(StringExpression $expression): void
diff --git a/src/Database/Expression/QueryExpression.php b/src/Database/Expression/QueryExpression.php
index 0843973d446..1c2eaae3a65 100644
--- a/src/Database/Expression/QueryExpression.php
+++ b/src/Database/Expression/QueryExpression.php
@@ -413,7 +413,7 @@ public function notExists(ExpressionInterface $expression)
      * Adds a new condition to the expression object in the form
      * "field BETWEEN from AND to".
      *
-     * @param \Cake\Database\ExpressionInterface|string $field The field name to compare for values inbetween the range.
+     * @param \Cake\Database\ExpressionInterface|string $field The field name to compare for values in between the range.
      * @param mixed $from The initial value of the range.
      * @param mixed $to The ending value in the comparison range.
      * @param string|null $type the type name for $value as configured using the Type map.
diff --git a/src/Database/Query.php b/src/Database/Query.php
index f27c868c9fb..618480ba492 100644
--- a/src/Database/Query.php
+++ b/src/Database/Query.php
@@ -1465,7 +1465,7 @@ public function identifier(string $identifier): ExpressionInterface
      *  ->epilog('RETURNING id');
      * ```
      *
-     * Epliog content is raw SQL and not suitable for use with user supplied data.
+     * Epilog content is raw SQL and not suitable for use with user supplied data.
      *
      * @param \Cake\Database\ExpressionInterface|string|null $expression The expression to be appended
      * @return $this
diff --git a/src/Database/Query/SelectQuery.php b/src/Database/Query/SelectQuery.php
index 5040d822302..9e2d6ceba7e 100644
--- a/src/Database/Query/SelectQuery.php
+++ b/src/Database/Query/SelectQuery.php
@@ -81,7 +81,7 @@ class SelectQuery extends Query implements IteratorAggregate
     protected array $_resultDecorators = [];
 
     /**
-     * Result set from exeuted SELCT query.
+     * Result set from executed SELECT query.
      *
      * @var iterable|null
      */
diff --git a/src/Database/Query/UpdateQuery.php b/src/Database/Query/UpdateQuery.php
index 21fd9ea8b48..4f72902d6be 100644
--- a/src/Database/Query/UpdateQuery.php
+++ b/src/Database/Query/UpdateQuery.php
@@ -117,7 +117,7 @@ public function set(QueryExpression|Closure|array|string $key, mixed $value = nu
             return $this;
         }
 
-        if (is_array($key)) {
+        if (is_array($key) && !isset($key[0])) {
             $typeMap = $this->getTypeMap()->setTypes($value ?? []);
             /** @var \Cake\Database\Expression\QueryExpression $setExpr */
             $setExpr = $this->_parts['set'];
@@ -128,7 +128,7 @@ public function set(QueryExpression|Closure|array|string $key, mixed $value = nu
             return $this;
         }
 
-        if ($key instanceof ExpressionInterface) {
+        if (is_array($key) || $key instanceof ExpressionInterface) {
             $types = (array)$value;
             /** @var \Cake\Database\Expression\QueryExpression $setExpr */
             $setExpr = $this->_parts['set'];
diff --git a/src/Database/Schema/SqliteSchemaDialect.php b/src/Database/Schema/SqliteSchemaDialect.php
index b6efef13b98..9ae13f120cc 100644
--- a/src/Database/Schema/SqliteSchemaDialect.php
+++ b/src/Database/Schema/SqliteSchemaDialect.php
@@ -840,6 +840,9 @@ public function columnDefinitionSql(array $column): string
         if (isset($column['default'])) {
             $out .= ' DEFAULT ' . $this->_driver->schemaValue($column['default']);
         }
+        if (isset($column['comment']) && $column['comment']) {
+            $out .= " /* {$column['comment']} */";
+        }
 
         return $out;
     }
diff --git a/src/Database/composer.json b/src/Database/composer.json
index bf367eb5225..00b65f86f94 100644
--- a/src/Database/composer.json
+++ b/src/Database/composer.json
@@ -46,7 +46,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Datasource/Paging/NumericPaginator.php b/src/Datasource/Paging/NumericPaginator.php
index e6933994545..b0bd5d58608 100644
--- a/src/Datasource/Paging/NumericPaginator.php
+++ b/src/Datasource/Paging/NumericPaginator.php
@@ -238,7 +238,7 @@ public function paginate(
     }
 
     /**
-     * Build paginated resultset.
+     * Build paginated result set.
      *
      * @param \Cake\Datasource\ResultSetInterface $items
      * @param array $pagingParams
diff --git a/src/Datasource/Paging/PaginatedResultSet.php b/src/Datasource/Paging/PaginatedResultSet.php
index bf938b44e33..bf1e8fd4b05 100644
--- a/src/Datasource/Paging/PaginatedResultSet.php
+++ b/src/Datasource/Paging/PaginatedResultSet.php
@@ -22,7 +22,7 @@
 use function Cake\Core\deprecationWarning;
 
 /**
- * Paginated resultset.
+ * Paginated result set.
  *
  * @template T of mixed
  * @template-implements \IteratorAggregate<mixed>
diff --git a/src/Datasource/Paging/SimplePaginator.php b/src/Datasource/Paging/SimplePaginator.php
index 24d20d28e29..746d62955cd 100644
--- a/src/Datasource/Paging/SimplePaginator.php
+++ b/src/Datasource/Paging/SimplePaginator.php
@@ -20,7 +20,7 @@
 use Cake\Datasource\ResultSetInterface;
 
 /**
- * Simplified paginator which avoids potentially expensives queries
+ * Simplified paginator which avoids potentially expensive queries
  * to get the total count of records.
  *
  * When using a simple paginator you will not be able to generate page numbers.
@@ -61,7 +61,7 @@ protected function buildParams(array $data): array
     }
 
     /**
-     * Build paginated resultset.
+     * Build paginated result set.
      *
      * Since the query fetches an extra record, drop the last record if records
      * fetched exceeds the limit/per page.
diff --git a/src/Datasource/composer.json b/src/Datasource/composer.json
index 31007314d88..26f53418b56 100644
--- a/src/Datasource/composer.json
+++ b/src/Datasource/composer.json
@@ -46,7 +46,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Error/Debug/dumpHeader.html b/src/Error/Debug/dumpHeader.html
index 71a3df3086f..82595f16e07 100644
--- a/src/Error/Debug/dumpHeader.html
+++ b/src/Error/Debug/dumpHeader.html
@@ -167,7 +167,7 @@
                 }
 
                 // Don't show toggles for empty arrays/objects
-                if (node.childNodes.length == 0) {
+                if (node.childNodes.length === 0) {
                     return;
                 }
 
diff --git a/src/Event/composer.json b/src/Event/composer.json
index c1efeb306fd..600b926c865 100644
--- a/src/Event/composer.json
+++ b/src/Event/composer.json
@@ -34,7 +34,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Form/composer.json b/src/Form/composer.json
index 6e1b938aaff..9458465d8b9 100644
--- a/src/Form/composer.json
+++ b/src/Form/composer.json
@@ -33,7 +33,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Http/Client/Exception/RequestException.php b/src/Http/Client/Exception/RequestException.php
index ce58731e046..f57ae507144 100644
--- a/src/Http/Client/Exception/RequestException.php
+++ b/src/Http/Client/Exception/RequestException.php
@@ -38,7 +38,7 @@ class RequestException extends RuntimeException implements RequestExceptionInter
     /**
      * Constructor.
      *
-     * @param string $message Exeception message.
+     * @param string $message Exception message.
      * @param \Psr\Http\Message\RequestInterface $request Request instance.
      * @param \Throwable|null $previous Previous Exception
      */
diff --git a/src/Http/Client/Response.php b/src/Http/Client/Response.php
index b78ba54d881..8ee6ffda78b 100644
--- a/src/Http/Client/Response.php
+++ b/src/Http/Client/Response.php
@@ -168,7 +168,7 @@ protected function _decodeGzipBody(string $body): string
     /**
      * Parses headers if necessary.
      *
-     * - Decodes the status code and reasonphrase.
+     * - Decodes the status code and reason phrase.
      * - Parses and normalizes header names + values.
      *
      * @param array<string> $headers Headers to parse.
diff --git a/src/Http/Response.php b/src/Http/Response.php
index 110fba34b80..96e9c1f065f 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -528,7 +528,7 @@ public function getMimeType(string $alias): array|string|false
     public function mapType(array|string $ctype): array|string|null
     {
         if (is_array($ctype)) {
-            return array_map('\Cake\Http\MimeType::getExtension', $ctype);
+            return array_map($this->mapType(...), $ctype);
         }
 
         return MimeType::getExtension($ctype);
diff --git a/src/Http/ServerRequestFactory.php b/src/Http/ServerRequestFactory.php
index 0e683dacf47..47df6fb0341 100644
--- a/src/Http/ServerRequestFactory.php
+++ b/src/Http/ServerRequestFactory.php
@@ -76,7 +76,7 @@ public static function fromGlobals(
         $request = static::marshalBodyAndRequestMethod($parsedBody ?? $_POST, $request);
         // This is required as `ServerRequest::scheme()` ignores the value of
         // `HTTP_X_FORWARDED_PROTO` unless `trustProxy` is enabled, while the
-        // `Uri` instance intially created always takes values of `HTTP_X_FORWARDED_PROTO`
+        // `Uri` instance initially created always takes values of `HTTP_X_FORWARDED_PROTO`
         // into account.
         $uri = $request->getUri()->withScheme($request->scheme());
         $request = $request->withUri($uri, true);
diff --git a/src/Http/Session.php b/src/Http/Session.php
index e8f45f412f1..fff5a0a6dc1 100644
--- a/src/Http/Session.php
+++ b/src/Http/Session.php
@@ -136,7 +136,7 @@ public static function create(array $sessionConfig = []): static
     }
 
     /**
-     * Get one of the prebaked default session configurations.
+     * Get one of the pre-baked default session configurations.
      *
      * @param string $name Config name.
      * @return array
@@ -155,8 +155,8 @@ protected static function _defaultConfig(string $name): array
                     'session.use_trans_sid' => 0,
                     'session.serialize_handler' => 'php',
                     'session.use_cookies' => 1,
-                    'session.save_path' => defined('TMP') ? TMP : sys_get_temp_dir()
-                        . DIRECTORY_SEPARATOR . 'sessions',
+                    'session.save_path' => (defined('TMP') ? TMP : sys_get_temp_dir() . DIRECTORY_SEPARATOR)
+                         . 'sessions',
                     'session.save_handler' => 'files',
                 ],
             ],
diff --git a/src/Http/composer.json b/src/Http/composer.json
index f79da51cf8f..2b58c60848a 100644
--- a/src/Http/composer.json
+++ b/src/Http/composer.json
@@ -64,7 +64,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/I18n/composer.json b/src/I18n/composer.json
index 4cb684eb1f4..19a27250d18 100644
--- a/src/I18n/composer.json
+++ b/src/I18n/composer.json
@@ -47,7 +47,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Log/composer.json b/src/Log/composer.json
index 38119f6f6c4..593de4ff139 100644
--- a/src/Log/composer.json
+++ b/src/Log/composer.json
@@ -38,7 +38,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Mailer/Mailer.php b/src/Mailer/Mailer.php
index 5a8dd354234..56b5eb675eb 100644
--- a/src/Mailer/Mailer.php
+++ b/src/Mailer/Mailer.php
@@ -118,7 +118,7 @@
  * @method $this setHeaders(array $headers) Sets headers for the message. {@see \Cake\Mailer\Message::setHeaders()}
  * @method $this addHeaders(array $headers) Add header for the message. {@see \Cake\Mailer\Message::addHeaders()}
  * @method $this getHeaders(array $include = []) Get list of headers. {@see \Cake\Mailer\Message::getHeaders()}
- * @method $this setEmailFormat($format) Sets email format. {@see \Cake\Mailer\Message::getHeaders()}
+ * @method $this setEmailFormat($format) Sets email format. {@see \Cake\Mailer\Message::setEmailFormat()}
  * @method string getEmailFormat() Gets email format. {@see \Cake\Mailer\Message::getEmailFormat()}
  * @method $this setMessageId($message) Sets message ID. {@see \Cake\Mailer\Message::setMessageId()}
  * @method string|bool getMessageId() Gets message ID. {@see \Cake\Mailer\Message::getMessageId()}
diff --git a/src/ORM/Behavior/TranslateBehavior.php b/src/ORM/Behavior/TranslateBehavior.php
index 0198fddb263..bf32e2d625d 100644
--- a/src/ORM/Behavior/TranslateBehavior.php
+++ b/src/ORM/Behavior/TranslateBehavior.php
@@ -95,7 +95,7 @@ class TranslateBehavior extends Behavior implements PropertyMarshalInterface
      *   using `ShadowTableStrategy` then the list will be auto generated based on
      *   shadow table schema.
      * - `defaultLocale`: The locale which is treated as default by the behavior.
-     *   Fields values for defaut locale will be stored in the primary table itself
+     *   Fields values for default locale will be stored in the primary table itself
      *   and the rest in translation table. If not explicitly set the value of
      *   `I18n::getDefaultLocale()` will be used to get default locale.
      *   If you do not want any default locale and want translated fields
diff --git a/src/ORM/BehaviorRegistry.php b/src/ORM/BehaviorRegistry.php
index c531e4a493a..82db5cffec2 100644
--- a/src/ORM/BehaviorRegistry.php
+++ b/src/ORM/BehaviorRegistry.php
@@ -211,6 +211,24 @@ protected function _getMethods(Behavior $instance, string $class, string $alias)
         return compact('methods', 'finders');
     }
 
+    /**
+     * Set an object directly into the registry by name.
+     *
+     * @param string $name The name of the object to set in the registry.
+     * @param \Cake\ORM\Behavior $object instance to store in the registry
+     * @return $this
+     */
+    public function set(string $name, object $object)
+    {
+        parent::set($name, $object);
+
+        $methods = $this->_getMethods($object, $object::class, $name);
+        $this->_methodMap += $methods['methods'];
+        $this->_finderMap += $methods['finders'];
+
+        return $this;
+    }
+
     /**
      * Remove an object from the registry.
      *
diff --git a/src/ORM/Query/SelectQuery.php b/src/ORM/Query/SelectQuery.php
index c3796452a03..e276b2ed71a 100644
--- a/src/ORM/Query/SelectQuery.php
+++ b/src/ORM/Query/SelectQuery.php
@@ -142,7 +142,7 @@ class SelectQuery extends DbSelectQuery implements JsonSerializable, QueryInterf
     protected ?int $_resultsCount = null;
 
     /**
-     * Resultset factory
+     * Result set factory
      *
      * @var \Cake\ORM\ResultSetFactory<\Cake\Datasource\EntityInterface|array>
      */
@@ -205,7 +205,7 @@ public function __construct(Table $table)
     /**
      * Set the result set for a query.
      *
-     * Setting the resultset of a query will make execute() a no-op. Instead
+     * Setting the result set of a query will make execute() a no-op. Instead
      * of executing the SQL query and fetching results, the ResultSet provided to this
      * method will be returned.
      *
@@ -1578,7 +1578,7 @@ protected function _execute(): iterable
     }
 
     /**
-     * Get resultset factory.
+     * Get result set factory.
      *
      * @return \Cake\ORM\ResultSetFactory
      */
diff --git a/src/ORM/ResultSetFactory.php b/src/ORM/ResultSetFactory.php
index 95da2632cbb..171fc5aa07a 100644
--- a/src/ORM/ResultSetFactory.php
+++ b/src/ORM/ResultSetFactory.php
@@ -39,7 +39,7 @@ class ResultSetFactory
     protected string $resultSetClass = ResultSet::class;
 
     /**
-     * Create a resultset instance.
+     * Create a result set instance.
      *
      * @param iterable $results Results.
      * @param \Cake\ORM\Query\SelectQuery<T>|null $query Query from where results came.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
index 24c7b7303e8..fc4c6012e7e 100644
--- a/src/ORM/Table.php
+++ b/src/ORM/Table.php
@@ -110,6 +110,8 @@
  *   for the provided named validator.
  *
  * - `Model.buildRules` Allows listeners to modify the rules checker by adding more rules.
+ *   Behaviors or custom listerners can subscribe to this even. For tables you don't
+ *   need to subscribe to this event, simply override the `Table::buildRules()` method.
  *
  * - `Model.beforeRules` Fired before an entity is validated using the rules checker.
  *   By stopping this event, you can return the final value of the rules checking operation.
@@ -142,7 +144,6 @@
  * - `beforeMarshal(EventInterface $event, ArrayObject $data, ArrayObject $options)`
  * - `afterMarshal(EventInterface $event, EntityInterface $entity, ArrayObject $options)`
  * - `buildValidator(EventInterface $event, Validator $validator, string $name)`
- * - `buildRules(RulesChecker $rules)`
  * - `beforeRules(EventInterface $event, EntityInterface $entity, ArrayObject $options, string $operation)`
  * - `afterRules(EventInterface $event, EntityInterface $entity, ArrayObject $options, bool $result, string $operation)`
  * - `beforeSave(EventInterface $event, EntityInterface $entity, ArrayObject $options)`
@@ -891,11 +892,11 @@ public function getAssociation(string $name): Association
     {
         $association = $this->findAssociation($name);
         if (!$association) {
-            $assocations = $this->associations()->keys();
+            $associations = $this->associations()->keys();
 
             $message = "The `{$name}` association is not defined on `{$this->getAlias()}`.";
-            if ($assocations) {
-                $message .= "\nValid associations are: " . implode(', ', $assocations);
+            if ($associations) {
+                $message .= "\nValid associations are: " . implode(', ', $associations);
             }
             throw new InvalidArgumentException($message);
         }
diff --git a/src/ORM/composer.json b/src/ORM/composer.json
index cddef59fe9c..c3f67a12f45 100644
--- a/src/ORM/composer.json
+++ b/src/ORM/composer.json
@@ -51,7 +51,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/ORM/phpstan.neon.dist b/src/ORM/phpstan.neon.dist
index 684a761c923..239541a0f84 100644
--- a/src/ORM/phpstan.neon.dist
+++ b/src/ORM/phpstan.neon.dist
@@ -18,3 +18,38 @@ parameters:
 		- "#^PHPDoc tag @return with type Cake\\\\ORM\\\\Query\\\\SelectQuery\\<TSubject of array\\|Cake\\\\Datasource\\\\EntityInterface\\> is not subtype of native type static\\(Cake\\\\ORM\\\\Query\\\\SelectQuery\\<TSubject of array\\|Cake\\\\Datasource\\\\EntityInterface\\>\\)\\.$#"
 		- "#^Method Cake\\\\ORM\\\\Query\\\\SelectQuery\\:\\:find\\(\\) should return static\\(Cake\\\\ORM\\\\Query\\\\SelectQuery\\<TSubject of array\\|Cake\\\\Datasource\\\\EntityInterface\\>\\) but returns Cake\\\\ORM\\\\Query\\\\SelectQuery\\<TSubject of array\\|Cake\\\\Datasource\\\\EntityInterface\\>\\.$#"
 		- '#^PHPDoc tag @var with type callable\(\): mixed is not subtype of native type Closure\(string\): string\.$#'
+		-
+			message: '#^Call to function method_exists\(\) with Cake\\Datasource\\EntityInterface and ''patch'' will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: Association/BelongsTo.php
+
+		-
+			message: '#^Call to function method_exists\(\) with Cake\\Datasource\\EntityInterface and ''patch'' will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: Association/HasMany.php
+
+		-
+			message: '#^Call to function method_exists\(\) with Cake\\Datasource\\EntityInterface and ''patch'' will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: Association/HasOne.php
+
+		-
+			message: '#^Call to function method_exists\(\) with Cake\\Datasource\\EntityInterface and ''patch'' will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: Behavior/TreeBehavior.php
+
+		-
+			message: '#^Call to function method_exists\(\) with Cake\\Datasource\\EntityInterface and ''patch'' will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 2
+			path: Marshaller.php
+
+		-
+			message: '#^Call to function method_exists\(\) with Cake\\Datasource\\EntityInterface and ''patch'' will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: Table.php
diff --git a/src/Utility/Hash.php b/src/Utility/Hash.php
index 9335cbd90a4..cb07e66474b 100644
--- a/src/Utility/Hash.php
+++ b/src/Utility/Hash.php
@@ -1203,7 +1203,7 @@ public static function normalize(array $data, bool $assoc = true, mixed $default
      *
      * ### Options:
      *
-     * - `children` The key name to use in the resultset for children.
+     * - `children` The key name to use in the result set for children.
      * - `idPath` The path to a key that identifies each entry. Should be
      *   compatible with Hash::extract(). Defaults to `{n}.$alias.id`
      * - `parentPath` The path to a key that identifies the parent of each entry.
diff --git a/src/Utility/composer.json b/src/Utility/composer.json
index 98fbbac631f..563b1c34d7d 100644
--- a/src/Utility/composer.json
+++ b/src/Utility/composer.json
@@ -43,7 +43,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/Validation/ValidationRule.php b/src/Validation/ValidationRule.php
index 84a03b99434..822d45e65d8 100644
--- a/src/Validation/ValidationRule.php
+++ b/src/Validation/ValidationRule.php
@@ -20,6 +20,7 @@
  */
 namespace Cake\Validation;
 
+use Cake\ORM\Table;
 use Closure;
 use ReflectionFunction;
 
@@ -121,6 +122,20 @@ public function process(mixed $value, array $providers, array $context = []): ar
 
         if (is_string($this->_rule)) {
             $provider = $providers[$this->_provider];
+            if (
+                class_exists(Table::class)
+                && $provider instanceof Table
+                && !method_exists($provider, $this->_rule)
+                && $provider->behaviors()->hasMethod($this->_rule)
+            ) {
+                foreach ($provider->behaviors() as $behavior) {
+                    if (in_array($this->_rule, $behavior->implementedMethods(), true)) {
+                        $provider = $behavior;
+                        break;
+                    }
+                }
+            }
+
             /** @phpstan-ignore-next-line */
             $callable = [$provider, $this->_rule](...);
         } else {
diff --git a/src/Validation/ValidationSet.php b/src/Validation/ValidationSet.php
index eb4daff0d26..6e8d70f533c 100644
--- a/src/Validation/ValidationSet.php
+++ b/src/Validation/ValidationSet.php
@@ -40,7 +40,7 @@ class ValidationSet implements ArrayAccess, IteratorAggregate, Countable
     protected array $_rules = [];
 
     /**
-     * Denotes whether the fieldname key must be present in data array
+     * Denotes whether the field name key must be present in data array
      *
      * @var callable|string|bool
      */
diff --git a/src/Validation/Validator.php b/src/Validation/Validator.php
index 339388b32a7..d2204942d18 100644
--- a/src/Validation/Validator.php
+++ b/src/Validation/Validator.php
@@ -273,7 +273,7 @@ public function validate(array $data, bool $newRecord = true): array
      * passed a ValidationSet as second argument, it will replace any other rule set defined
      * before
      *
-     * @param string $name [optional] The fieldname to fetch.
+     * @param string $name [optional] The field name to fetch.
      * @param \Cake\Validation\ValidationSet|null $set The set of rules for field
      * @return \Cake\Validation\ValidationSet
      */
diff --git a/src/Validation/composer.json b/src/Validation/composer.json
index 41cf76012f5..c5d6c13e93f 100644
--- a/src/Validation/composer.json
+++ b/src/Validation/composer.json
@@ -41,7 +41,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-5.next": "5.2.x-dev"
+            "dev-5.x": "5.2.x-dev"
         }
     }
 }
diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
index 43758c80b8f..7bc4e1b3208 100644
--- a/src/View/Helper/FormHelper.php
+++ b/src/View/Helper/FormHelper.php
@@ -378,7 +378,7 @@ public function contextFactory(?ContextFactory $instance = null, array $contexts
      * - `templateVars` Provide template variables for the formStart template.
      *
      * @param mixed $context The context for which the form is being defined.
-     *   Can be a ContextInterface instance, ORM entity, ORM resultset, or an
+     *   Can be a ContextInterface instance, ORM entity, ORM result set, or an
      *   array of meta data. You can use `null` to make a context-less form.
      * @param array<string, mixed> $options An array of html attributes and options.
      * @return string An formatted opening FORM tag.
diff --git a/src/View/Helper/NumberHelper.php b/src/View/Helper/NumberHelper.php
index 081fa1c6824..a46c4c805e0 100644
--- a/src/View/Helper/NumberHelper.php
+++ b/src/View/Helper/NumberHelper.php
@@ -56,15 +56,20 @@ public function __call(string $method, array $params): mixed
      * - `locale` - The locale name to use for formatting the number, e.g. fr_FR
      * - `before` - The string to place before whole numbers, e.g. '['
      * - `after` - The string to place after decimal numbers, e.g. ']'
-     * - `escape` - Whether to escape html in resulting string
+     * - `escape` - Whether to escape HTML in resulting string
+     * - `default` - The default value in case passed value is null
      *
-     * @param string|float|int $number A floating point number.
+     * @param string|float|int|null $number A floating point number.
      * @param array<string, mixed> $options An array with options.
      * @return string Formatted number
      * @link https://book.cakephp.org/5/en/views/helpers/number.html#formatting-numbers
      */
-    public function format(string|float|int $number, array $options = []): string
+    public function format(string|float|int|null $number, array $options = []): string
     {
+        if ($number === null) {
+            return $options['default'] ?? '';
+        }
+
         $formatted = Number::format($number, $options);
         $options += ['escape' => true];
 
@@ -90,15 +95,20 @@ public function format(string|float|int $number, array $options = []): string
      * - `pattern` - An ICU number pattern to use for formatting the number. e.g #,##0.00
      * - `useIntlCode` - Whether to replace the currency symbol with the international
      *   currency code.
-     * - `escape` - Whether to escape html in resulting string
+     * - `escape` - Whether to escape HTML in resulting string
+     * - `default` - The default value in case passed value is null
      *
-     * @param string|float $number Value to format.
+     * @param string|float|null $number Value to format.
      * @param string|null $currency International currency name such as 'USD', 'EUR', 'JPY', 'CAD'
      * @param array<string, mixed> $options Options list.
      * @return string Number formatted as a currency.
      */
-    public function currency(string|float $number, ?string $currency = null, array $options = []): string
+    public function currency(string|float|null $number, ?string $currency = null, array $options = []): string
     {
+        if ($number === null) {
+            return $options['default'] ?? '';
+        }
+
         $formatted = Number::currency($number, $currency, $options);
         $options += ['escape' => true];
 
diff --git a/src/View/Helper/PaginatorHelper.php b/src/View/Helper/PaginatorHelper.php
index fea97277021..96294c063b8 100644
--- a/src/View/Helper/PaginatorHelper.php
+++ b/src/View/Helper/PaginatorHelper.php
@@ -154,9 +154,9 @@ protected function paginated(): PaginatedInterface
     }
 
     /**
-     * Gets the current paging parameters from the resultset for the given model
+     * Gets the current paging parameters from the result set for the given model
      *
-     * @return array The array of paging parameters for the paginated resultset.
+     * @return array The array of paging parameters for the paginated result set.
      */
     public function params(): array
     {
@@ -380,7 +380,7 @@ public function next(string $title = 'Next >>', array $options = []): string
      *   for the title and will be generated by inflection. It can also be an array
      *   with keys `asc` and `desc` for specifying separate titles based on the direction.
      * @param array<string, mixed> $options Options for sorting link. See above for list of keys.
-     * @return string A link sorting default by 'asc'. If the resultset is sorted 'asc' by the specified
+     * @return string A link sorting default by 'asc'. If the result set is sorted 'asc' by the specified
      *  key the returned link will sort by 'desc'.
      * @link https://book.cakephp.org/5/en/views/helpers/paginator.html#creating-sort-links
      */
diff --git a/src/View/SerializedView.php b/src/View/SerializedView.php
index e97fc2265b4..f17cbdc5e54 100644
--- a/src/View/SerializedView.php
+++ b/src/View/SerializedView.php
@@ -28,7 +28,7 @@ abstract class SerializedView extends View
     /**
      * Default config options.
      *
-     * Use ViewBuilder::setOption()/setOptions() in your controlle to set these options.
+     * Use ViewBuilder::setOption()/setOptions() in your controller to set these options.
      *
      * - `serialize`: Option to convert a set of view variables into a serialized response.
      *   Its value can be a string for single variable name or array for multiple
diff --git a/src/View/View.php b/src/View/View.php
index 5d208f45784..e2d81accb6a 100644
--- a/src/View/View.php
+++ b/src/View/View.php
@@ -1523,8 +1523,8 @@ protected function getElementPaths(?string $plugin): Generator
     {
         $elementPaths = $this->_getSubPaths(static::TYPE_ELEMENT);
         foreach ($this->_paths($plugin) as $path) {
-            foreach ($elementPaths as $subdir) {
-                yield $path . $subdir . DIRECTORY_SEPARATOR;
+            foreach ($elementPaths as $subDir) {
+                yield $path . $subDir . DIRECTORY_SEPARATOR;
             }
         }
     }
diff --git a/src/View/ViewBuilder.php b/src/View/ViewBuilder.php
index 374b199a540..ab3741c18af 100644
--- a/src/View/ViewBuilder.php
+++ b/src/View/ViewBuilder.php
@@ -601,7 +601,7 @@ public function build(
      *
      * There are  limitations for viewVars that are good to know:
      *
-     * - ORM\Query executed and stored as resultset
+     * - ORM\Query executed and stored as result set
      * - SimpleXMLElements stored as associative array
      * - Exceptions stored as strings
      * - Resources, \Closure and \PDO are not supported.
diff --git a/tests/TestCase/Controller/ComponentRegistryTest.php b/tests/TestCase/Controller/ComponentRegistryTest.php
index 5223c79b03e..f0857379936 100644
--- a/tests/TestCase/Controller/ComponentRegistryTest.php
+++ b/tests/TestCase/Controller/ComponentRegistryTest.php
@@ -22,6 +22,7 @@
 use Cake\Controller\Controller;
 use Cake\Controller\Exception\MissingComponentException;
 use Cake\Core\Container;
+use Cake\Core\Exception\CakeException;
 use Cake\Event\EventManager;
 use Cake\Http\ServerRequest;
 use Cake\TestSuite\TestCase;
@@ -262,8 +263,8 @@ public function testUnset(): void
      */
     public function testUnloadUnknown(): void
     {
-        $this->expectException(MissingComponentException::class);
-        $this->expectExceptionMessage('Component class `FooComponent` could not be found.');
+        $this->expectException(CakeException::class);
+        $this->expectExceptionMessage('Object named `Foo` is not loaded.');
         $this->Components->unload('Foo');
     }
 
diff --git a/tests/TestCase/Database/Query/UpdateQueryTest.php b/tests/TestCase/Database/Query/UpdateQueryTest.php
index 5331d8614b4..f097abe6793 100644
--- a/tests/TestCase/Database/Query/UpdateQueryTest.php
+++ b/tests/TestCase/Database/Query/UpdateQueryTest.php
@@ -22,6 +22,7 @@
 use Cake\Database\Driver\Sqlserver;
 use Cake\Database\Exception\DatabaseException;
 use Cake\Database\Expression\IdentifierExpression;
+use Cake\Database\Expression\QueryExpression;
 use Cake\Database\ExpressionInterface;
 use Cake\Database\Query\SelectQuery;
 use Cake\Database\Query\UpdateQuery;
@@ -273,6 +274,23 @@ public function testUpdateSetCallable(): void
         $this->assertSame(1, $result->rowCount());
     }
 
+    /**
+     * Ensure that queries build when they contain expressions.
+     */
+    public function testUpdateExpression(): void
+    {
+        $expression = new QueryExpression(['post_count = post_count + 10']);
+        $query = new UpdateQuery($this->connection);
+        $query
+            ->update('counter_cache_users')
+            ->set($expression)
+            ->where(['id' => 1]);
+        $this->assertStringContainsString(
+            'SET post_count = post_count + 10',
+            $query->sql(),
+        );
+    }
+
     /**
      * Tests that aliases are stripped from update query conditions
      * where possible.
diff --git a/tests/TestCase/Database/Schema/SqliteSchemaDialectTest.php b/tests/TestCase/Database/Schema/SqliteSchemaDialectTest.php
index 52be0200cdc..4e39a559809 100644
--- a/tests/TestCase/Database/Schema/SqliteSchemaDialectTest.php
+++ b/tests/TestCase/Database/Schema/SqliteSchemaDialectTest.php
@@ -917,8 +917,8 @@ public static function columnSqlProvider(): array
             // Text
             [
                 'body',
-                ['type' => 'text', 'null' => false],
-                '"body" TEXT NOT NULL',
+                ['type' => 'text', 'null' => false, 'comment' => 'a comment'],
+                '"body" TEXT NOT NULL /* a comment */',
             ],
             [
                 'body',
diff --git a/tests/TestCase/Http/ResponseTest.php b/tests/TestCase/Http/ResponseTest.php
index a77a27d0937..828aeb09b24 100644
--- a/tests/TestCase/Http/ResponseTest.php
+++ b/tests/TestCase/Http/ResponseTest.php
@@ -355,9 +355,37 @@ public function testMapType(): void
         $this->assertSame('xml', $response->mapType('text/xml'));
         $this->assertSame('html', $response->mapType('*/*'));
         $this->assertSame('csv', $response->mapType('application/vnd.ms-excel'));
+
         $expected = ['json', 'xhtml', 'css'];
         $result = $response->mapType(['application/json', 'application/xhtml+xml', 'text/css']);
         $this->assertEquals($expected, $result);
+
+        $array = [
+            '1.0' => [
+                'text/csv',
+                'text/xml',
+            ],
+            '0.8' => [
+                'application/json',
+            ],
+            '0.7' => [
+                'application/xml',
+            ],
+        ];
+        $expected = [
+            '1.0' => [
+                'csv',
+                'xml',
+            ],
+            '0.8' => [
+                'json',
+            ],
+            '0.7' => [
+                'xml',
+            ],
+        ];
+        $result = $response->mapType($array);
+        $this->assertEquals($expected, $result);
     }
 
     /**
diff --git a/tests/TestCase/ORM/Behavior/TranslateBehaviorEavTest.php b/tests/TestCase/ORM/Behavior/TranslateBehaviorEavTest.php
index a938e29900c..6bc6dbf22f1 100644
--- a/tests/TestCase/ORM/Behavior/TranslateBehaviorEavTest.php
+++ b/tests/TestCase/ORM/Behavior/TranslateBehaviorEavTest.php
@@ -1217,7 +1217,7 @@ public function testSaveMultipleNewTranslations(): void
     }
 
     /**
-     * Tests that iterating a resultset twice when using the translations finder
+     * Tests that iterating a result set twice when using the translations finder
      * will not cause any errors nor information loss
      */
     public function testUseCountInFindTranslations(): void
diff --git a/tests/TestCase/ORM/BehaviorRegistryTest.php b/tests/TestCase/ORM/BehaviorRegistryTest.php
index cbf9175703c..f977c6aa842 100644
--- a/tests/TestCase/ORM/BehaviorRegistryTest.php
+++ b/tests/TestCase/ORM/BehaviorRegistryTest.php
@@ -221,6 +221,14 @@ public function testLoadDuplicateFinderAliasing(): void
         $this->assertTrue($this->Behaviors->hasFinder('renamed'));
     }
 
+    public function testSet()
+    {
+        $this->Behaviors->set('Sluggable', new SluggableBehavior($this->Table, ['replacement' => '_']));
+
+        $this->assertEquals(['replacement' => '_'], $this->Behaviors->get('Sluggable')->getConfig());
+        $this->assertTrue($this->Behaviors->hasMethod('slugify'));
+    }
+
     /**
      * test hasMethod()
      */
diff --git a/tests/TestCase/ORM/ResultSetTest.php b/tests/TestCase/ORM/ResultSetTest.php
index f6917995ead..764cb0fd263 100644
--- a/tests/TestCase/ORM/ResultSetTest.php
+++ b/tests/TestCase/ORM/ResultSetTest.php
@@ -135,7 +135,7 @@ public function testIteratorAfterSerializationHydrated(): void
     }
 
     /**
-     * Test converting resultsets into JSON
+     * Test converting result sets into JSON
      */
     public function testJsonSerialize(): void
     {
diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
index af8193f6f36..3d28a77a228 100644
--- a/tests/TestCase/ORM/TableTest.php
+++ b/tests/TestCase/ORM/TableTest.php
@@ -1169,6 +1169,24 @@ public function testUpdateAll(): void
         $this->assertEquals($expected, $result);
     }
 
+    public function testUpdateExpression(): void
+    {
+        $table = new Table([
+            'table' => 'counter_cache_users',
+            'connection' => $this->connection,
+        ]);
+        $entity = new Entity([
+            'name' => 'test',
+            'post_count' => 0,
+            'comment_count' => 0,
+            'posts_published' => 0,
+        ]);
+        $table->save($entity);
+        $expression = new QueryExpression(['post_count = post_count + 1']);
+        $result = $table->updateAll([$expression], ['id' => 1]);
+        $this->assertNotEmpty($result);
+    }
+
     /**
      * Test that exceptions from the Query bubble up.
      */
@@ -3480,6 +3498,34 @@ public function testValidatorBehavior(): void
         $this->assertArrayHasKey('behaviorRule', $set);
     }
 
+    /**
+     * https://github.com/cakephp/cakephp/issues/18273
+     */
+    public function testValidatorWithMethodInBehavior(): void
+    {
+        $table = new Table();
+        $table->addBehavior('Validation');
+
+        $table->getValidator('default')->add(
+            'name',
+            'customValidationRule',
+            ['rule' => 'customValidationRule', 'provider' => 'table'],
+        );
+
+        $result = $table->getValidator('default')->validate([
+            'name' => 'test',
+        ], true);
+
+        $this->assertSame(
+            [
+                'name' => [
+                    'customValidationRule' => 'The provided value is invalid',
+                ],
+            ],
+            $result,
+        );
+    }
+
     /**
      * Tests that a InvalidArgumentException is thrown if the custom validator method does not exist.
      */
diff --git a/tests/TestCase/View/Helper/NumberHelperTest.php b/tests/TestCase/View/Helper/NumberHelperTest.php
index 753f5cd7768..1ffef5ad53b 100644
--- a/tests/TestCase/View/Helper/NumberHelperTest.php
+++ b/tests/TestCase/View/Helper/NumberHelperTest.php
@@ -77,4 +77,44 @@ public function testMethodProxying(string $method, mixed $arg): void
         $helper = new NumberHelper($this->View);
         $this->assertNotNull($helper->{$method}($arg));
     }
+
+    /**
+     * test format() and empty values
+     */
+    public function testFormatEmpty(): void
+    {
+        $helper = new NumberHelper($this->View);
+
+        $value = null;
+        $result = $helper->format($value);
+        $this->assertSame('', $result);
+
+        $result = $helper->format($value, ['default' => '-']);
+        $this->assertSame('-', $result);
+
+        // We should revisit this for 6.x
+        $value = '';
+        $result = $helper->format($value);
+        $this->assertSame('0', $result);
+    }
+
+    /**
+     * test currency() and empty values
+     */
+    public function testCurrencyEmpty(): void
+    {
+        $helper = new NumberHelper($this->View);
+
+        $value = null;
+        $result = $helper->currency($value);
+        $this->assertSame('', $result);
+
+        $result = $helper->currency($value, null, ['default' => '-']);
+        $this->assertSame('-', $result);
+
+        // We should revisit this for 6.x
+        $value = '';
+        $result = $helper->currency($value);
+        $this->assertNotEmpty($result);
+    }
 }
diff --git a/tests/TestCase/View/HelperRegistryTest.php b/tests/TestCase/View/HelperRegistryTest.php
index 693f81f78c1..93e2dde8eb8 100644
--- a/tests/TestCase/View/HelperRegistryTest.php
+++ b/tests/TestCase/View/HelperRegistryTest.php
@@ -249,8 +249,8 @@ public function testUnload(): void
      */
     public function testUnloadUnknown(): void
     {
-        $this->expectException(MissingHelperException::class);
-        $this->expectExceptionMessage('Helper class `FooHelper` could not be found.');
+        $this->expectException(CakeException::class);
+        $this->expectExceptionMessage('Object named `Foo` is not loaded.');
         $this->Helpers->unload('Foo');
     }
 
diff --git a/tests/test_app/TestApp/Model/Behavior/ValidationBehavior.php b/tests/test_app/TestApp/Model/Behavior/ValidationBehavior.php
index 71455a6aba5..176b49fff2c 100644
--- a/tests/test_app/TestApp/Model/Behavior/ValidationBehavior.php
+++ b/tests/test_app/TestApp/Model/Behavior/ValidationBehavior.php
@@ -35,4 +35,9 @@ public function validationBehavior(Validator $validator)
     {
         return $validator->add('name', 'behaviorRule');
     }
+
+    public function customValidationRule(mixed $value, array $context): bool
+    {
+        return false;
+    }
 }