From a2d501ac346901a4f31d7a610263e426d45eb3f4 Mon Sep 17 00:00:00 2001 From: i-just Date: Fri, 23 Jan 2026 09:35:20 +0100 Subject: [PATCH 1/5] replace legacy element namespace in twig files --- resources/templates/assets/_index.twig | 2 +- resources/templates/entries/index.twig | 6 +++--- resources/templates/settings/users/fields.twig | 2 +- resources/templates/users/_index.twig | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/templates/assets/_index.twig b/resources/templates/assets/_index.twig index 1cb10833368..2e1b4658e4b 100644 --- a/resources/templates/assets/_index.twig +++ b/resources/templates/assets/_index.twig @@ -1,6 +1,6 @@ {% extends '_layouts/elementindex.twig' %} {% set title = "Assets"|t('app') %} -{% set elementType = 'craft\\elements\\Asset' %} +{% set elementType = 'CraftCms\\Cms\\Entry\\Elements\\Asset' %} {% do view.registerAssetBundle("craft\\web\\assets\\fileupload\\FileUploadAsset") %} {% do view.registerAssetBundle("craft\\web\\assets\\prismjs\\PrismJsAsset") %} diff --git a/resources/templates/entries/index.twig b/resources/templates/entries/index.twig index 21c5e2906c0..dca494940ba 100644 --- a/resources/templates/entries/index.twig +++ b/resources/templates/entries/index.twig @@ -1,14 +1,14 @@ {% extends "_layouts/elementindex" %} -{% if page is defined and not craft.elementSources.pageExists("craft\\elements\\Entry", page) %} - {% set firstPage = craft.elementSources.getFirstPage("craft\\elements\\Entry") %} +{% if page is defined and not craft.elementSources.pageExists("CraftCms\\Cms\\Entry\\Elements\\Entry", page) %} + {% set firstPage = craft.elementSources.getFirstPage("CraftCms\\Cms\\Entry\\Elements\\Entry") %} {% if firstPage or (not firstPage and page != 'entries') %} {% redirect 'content/' ~ (firstPage ? firstPage|kebab : 'entries') %} {% endif %} {% endif %} {% set title = "Entries"|t('app') %} -{% set elementType = 'craft\\elements\\Entry' %} +{% set elementType = 'CraftCms\\Cms\\Entry\\Elements\\Entry' %} {% if sectionHandle is defined %} {% js %} diff --git a/resources/templates/settings/users/fields.twig b/resources/templates/settings/users/fields.twig index c6071b94270..e5ccae52024 100644 --- a/resources/templates/settings/users/fields.twig +++ b/resources/templates/settings/users/fields.twig @@ -16,7 +16,7 @@ {{ forms.fieldLayoutDesignerField({ first: true, - fieldLayout: fieldLayout ?? craft.fields.getLayoutByType('craft\\elements\\User'), + fieldLayout: fieldLayout ?? craft.fields.getLayoutByType('CraftCms\\Cms\\Entry\\Elements\\User'), withGeneratedFields: true, withCardViewDesigner: true, disabled: readOnly, diff --git a/resources/templates/users/_index.twig b/resources/templates/users/_index.twig index 9d136617f09..ba2044e74c1 100644 --- a/resources/templates/users/_index.twig +++ b/resources/templates/users/_index.twig @@ -3,7 +3,7 @@ {% endif %} {% extends "_layouts/elementindex" %} -{% set elementType = 'craft\\elements\\User' %} +{% set elementType = 'CraftCms\\Cms\\Entry\\Elements\\User' %} {% set canHaveDrafts = craft.users().drafts().draftOf(false).savedDraftsOnly().exists() %} From 8c43f3aeb3651bba5cc349f188e5cab4d1b64f63 Mon Sep 17 00:00:00 2001 From: i-just Date: Fri, 23 Jan 2026 11:22:28 +0100 Subject: [PATCH 2/5] table names and cast to bool --- yii2-adapter/legacy/helpers/ElementHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yii2-adapter/legacy/helpers/ElementHelper.php b/yii2-adapter/legacy/helpers/ElementHelper.php index 0fbfd7491db..b8916f8260c 100644 --- a/yii2-adapter/legacy/helpers/ElementHelper.php +++ b/yii2-adapter/legacy/helpers/ElementHelper.php @@ -385,7 +385,7 @@ public static function siteStatusesForElement(ElementInterface $element, bool $e ->status(null) ->trashed(null) ->asArray() - ->select(['elements_sites.siteId', 'elements_sites.enabled']) + ->select(['siteId', 'enabled']) ->pluck('enabled', 'siteId') ->map(fn($enabled) => (bool)$enabled) ->all(); From 10bcd79b819127f414dfc247b43a30c04bebbb80 Mon Sep 17 00:00:00 2001 From: i-just Date: Fri, 23 Jan 2026 11:45:48 +0100 Subject: [PATCH 3/5] cast to a boolean --- src/Element/Element.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Element/Element.php b/src/Element/Element.php index ec8196ad7f3..239f49aa17f 100644 --- a/src/Element/Element.php +++ b/src/Element/Element.php @@ -4461,7 +4461,7 @@ public function getEnabledForSite(?int $siteId = null): ?bool public function setEnabledForSite(array|bool $enabledForSite): void { if (is_array($enabledForSite)) { - $this->_enabledForSite = array_map(fn ($value) => $value, $enabledForSite); + $this->_enabledForSite = array_map(fn ($value) => (bool) $value, $enabledForSite); } else { $this->_enabledForSite = $enabledForSite; } From f05570b533f6db3b769914d08c1ca9b98fbb27b4 Mon Sep 17 00:00:00 2001 From: i-just Date: Fri, 23 Jan 2026 12:24:35 +0100 Subject: [PATCH 4/5] doh --- resources/templates/assets/_index.twig | 2 +- resources/templates/settings/users/fields.twig | 2 +- resources/templates/users/_index.twig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/templates/assets/_index.twig b/resources/templates/assets/_index.twig index 2e1b4658e4b..bff40dca4ab 100644 --- a/resources/templates/assets/_index.twig +++ b/resources/templates/assets/_index.twig @@ -1,6 +1,6 @@ {% extends '_layouts/elementindex.twig' %} {% set title = "Assets"|t('app') %} -{% set elementType = 'CraftCms\\Cms\\Entry\\Elements\\Asset' %} +{% set elementType = 'CraftCms\\Cms\\Asset\\Elements\\Asset' %} {% do view.registerAssetBundle("craft\\web\\assets\\fileupload\\FileUploadAsset") %} {% do view.registerAssetBundle("craft\\web\\assets\\prismjs\\PrismJsAsset") %} diff --git a/resources/templates/settings/users/fields.twig b/resources/templates/settings/users/fields.twig index e5ccae52024..0af1ccbfe86 100644 --- a/resources/templates/settings/users/fields.twig +++ b/resources/templates/settings/users/fields.twig @@ -16,7 +16,7 @@ {{ forms.fieldLayoutDesignerField({ first: true, - fieldLayout: fieldLayout ?? craft.fields.getLayoutByType('CraftCms\\Cms\\Entry\\Elements\\User'), + fieldLayout: fieldLayout ?? craft.fields.getLayoutByType('CraftCms\\Cms\\User\\Elements\\User'), withGeneratedFields: true, withCardViewDesigner: true, disabled: readOnly, diff --git a/resources/templates/users/_index.twig b/resources/templates/users/_index.twig index ba2044e74c1..699bb8cb82d 100644 --- a/resources/templates/users/_index.twig +++ b/resources/templates/users/_index.twig @@ -3,7 +3,7 @@ {% endif %} {% extends "_layouts/elementindex" %} -{% set elementType = 'CraftCms\\Cms\\Entry\\Elements\\User' %} +{% set elementType = 'CraftCms\\Cms\\User\\Elements\\User' %} {% set canHaveDrafts = craft.users().drafts().draftOf(false).savedDraftsOnly().exists() %} From 454d7a8179953961d4d53ff42bbe88f6ca93fcd5 Mon Sep 17 00:00:00 2001 From: i-just Date: Fri, 23 Jan 2026 12:55:26 +0100 Subject: [PATCH 5/5] keep rector happy --- src/Element/Element.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Element/Element.php b/src/Element/Element.php index 239f49aa17f..76fd1097bda 100644 --- a/src/Element/Element.php +++ b/src/Element/Element.php @@ -4461,7 +4461,7 @@ public function getEnabledForSite(?int $siteId = null): ?bool public function setEnabledForSite(array|bool $enabledForSite): void { if (is_array($enabledForSite)) { - $this->_enabledForSite = array_map(fn ($value) => (bool) $value, $enabledForSite); + $this->_enabledForSite = array_map(fn (bool $value) => $value, $enabledForSite); } else { $this->_enabledForSite = $enabledForSite; }