[4.x]: String resolution of type in EntryQuery doesnt appear to work correctly

[jlawrence-yellostudio]

What happened?

Description

The logic at the following line checks if the $item is an instance of EntryType:

cms/src/elements/db/EntryQuery.php

Line 428 in b5f17cd

return $item instanceof EntryType ? $item->id : null;

However the getEntryTypesByHandle method returns an array so it can never be true, resulting in typeId always being queried from the database:

cms/src/elements/db/EntryQuery.php

Line 426 in b5f17cd

$item = Craft::$app->getSections()->getEntryTypesByHandle($item);

Steps to reproduce

1. Run the following code (two queries for the same type twice in succession).

$query = Entry::find();
Craft::configure($query, ['type' => 'myTypeHandle']);

$query = Entry::find();
Craft::configure($query, ['type' => 'myTypeHandle']);

Expected behavior

Type is resolved from Memoized array from the Sections service.

Actual behavior

Type is always queried from the database.

Craft CMS version

4.16.15

PHP version

8.3.22

Operating system and version

No response

Database type and version

No response

Image driver and version

No response

Installed plugins and versions

[linear]

CMS-1746

[jlawrence-yellostudio]

Also appears that this is fixed in Craft 5:

cms/src/elements/db/EntryQuery.php

Line 436 in 5e98bc9

$item = Craft::$app->getEntries()->getEntryTypeByHandle($item);

It calls getEntryTypeByHandle not Types

So i guess a simple fix would be to add the same method from the Craft 5 entries service to the Craft 4 sections service of:

    /**
     * Returns an entry type by its handle.
     *
     * ---
     *
     * ```php
     * $entryType = Craft::$app->sections->getEntryTypeByHandle('article');
     * ```
     *
     * @param string $entryTypeHandle
     * @return EntryType|null
     * @since 4.x.x
     */
    public function getEntryTypeByHandle(string $entryTypeHandle): ?EntryType
    {
        return $this->_entryTypes()->firstWhere('handle', $entryTypeHandle, true);
    }

and update EntryQuery to call that singular version.

[i-just]

Hi, thanks for getting in touch!

In v4, there can be multiple entry types that have the same handle; that’s why the method mentions entry types (plural) and why it always returns an array. For example, you can have a section myChannel with entry types default and article and a section myStructure with entry types article, mySecondType. In such a case, if you were to query for an entry type by handle article, you’d get two results back.

In v5, all entry types are “global”, and the handles have to be unique, so the method name is singular and can return an EntryType object.

That said, I raised a PR that could improve this slightly.

[jlawrence-yellostudio]

Hi @i-just

Thanks for your reply.

Edit I have just read your PR.

In addition, if you do define two entry types with the same handle across different sections then there is no check to ensure the typeId is valid for the sectionId also defined in the entry query:

cms/src/elements/db/EntryQuery.php

Lines 432 to 436 in b5f17cd

	$this->typeId = (new Query())
	->select(['id'])
	->from([Table::ENTRYTYPES])
	->where(Db::parseParam('handle', $value))
	->column();

Although I guess it would just return those that match the sectionId and the array typeIds (excluding one typeId that doesn't match the sectionId), but it's far from ideal. I'm currently having to work around this resolution in a helper proxying all EntryQuery's currently to remove all the unnecessary SELECTs for typeId.

We don't really have an upgrade path to Craft 5 due to the changes of the content table to a single JSON column.