domain_entity_query_alter() is interpreted by core as an implementation of hook_entity_query_alter()

Problem/Motivation

Drupal 10.3.0 introduced a new hook_entity_query_alter() API (see change record here).

Due to the following coincidences:

• This module's name equals the name of some other module (domain) plus the suffix _entity,
• This module implements hook_query_alter(),
• Drupal *.module files are loaded globally on all requests for all enabled modules.

The function domain_entity_query_alter() is considered by core to be an implementation of hook_entity_query_alter() for the domain module. (This is in addition to being considered an implementation of hook_query_alter() for the domain_entity module, as originally intended).

The only reason this does not throw an immediate Fatal Error (at least in my case) is because, of the following coincidences:

• hook_query_alter() is covariant in its parameter type with respect to hook_entity_query_alter(). (Entity Query instances implement the same AlterableInterface as DB queries do).
• domain_entity_query_alter() starts with quite a general check for method_exists($query, 'getTables') (added 8 years ago) which fails in the hook_entity_query_alter() case, skipping the function.

This is something I discovered while debugging something unrelated. In my situation it doesn't break anything, but I thought I'd bring it to the attention of the module maintainers, as surely it is not the intention for this to be so, it strikes me as quite fragile?

For example: If a getTables method were added to Entity queries, or if the Domain module added its own hook_entity_query_alter() implementation, things would break horribly.

Proposed resolution

I suppose renaming the module is out of the question, but perhaps it would be a good idea to add this kind of check to the top of the function?

// Due to various coincidences this function is incorrectly interpreted, as of Drupal 10.3.0,
// as an implementation of hook_entity_query_alter(). No thanks.
if ($query instanceof \Drupal\Core\Entity\Query\QueryInterface) {
  return;
}