Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts: # CHANGELOG.md
craftcms · Feb 3, 2023 · 5b7dbd1 · 5b7dbd1
2 parents e183807 + abd7235
commit 5b7dbd1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Removed the “Timeout” setting from the Gmail and SMTP mailer transporters, as they aren’t supported by Symfony Mailer’s transport configuration.
 - Removed the “Encryption Method” setting from the SMTP mailer transporter, as Symfony Mailer already uses TLS when port 465 is used (as it is by default).
 - The “Port” setting on the SMTP mailer transporter is no longer required. It will default to 465 or 25 depending on whether OpenSSL is installed.
+- Added more reserved field handles to avoid conflicts with `craft\base\Element` properties. ([#12577](https://github.com/craftcms/cms/issues/12577))
 - Fixed field status badge styling in some contexts. ([#12403](https://github.com/craftcms/cms/issues/12403))
 - Fixed a bug where exporting elements with multiple field layouts as a CSV file using the “Expanded” export type would result in mismatched column values.
 - Fixed a bug where cancelling a conflicting volume folder move would result in the moved folder getting deleted.

diff --git a/src/base/Field.php b/src/base/Field.php
@@ -281,31 +281,44 @@ protected function defineRules(): array
                 'archived',
                 'attributeLabel',
                 'attributes',
+                'awaitingFieldValues',
                 'behavior',
                 'behaviors',
                 'canSetProperties',
                 'canonical',
                 'children',
+                'contentId',
                 'contentTable',
                 'dateCreated',
+                'dateDeleted',
+                'dateLastMerged',
                 'dateUpdated',
                 'descendants',
+                'draftId',
+                'duplicateOf',
                 'enabled',
                 'enabledForSite',
                 'error',
-                'errors',
                 'errorSummary',
+                'errors',
+                'fieldLayoutId',
                 'fieldValue',
                 'fieldValues',
+                'firstSave',
+                'hardDelete',
                 'hasMethods',
                 'id',
+                'isNewForSite',
+                'isProvisionalDraft',
                 'language',
                 'level',
-                'localized',
                 'lft',
                 'link',
                 'localized',
+                'localized',
+                'mergingCanonicalChanges',
                 'name', // global set-specific
+                'newSiteIds',
                 'next',
                 'nextSibling',
                 'owner',
@@ -314,18 +327,29 @@ protected function defineRules(): array
                 'postDate', // entry-specific
                 'prev',
                 'prevSibling',
+                'previewing',
+                'propagateAll',
+                'propagating',
                 'ref',
+                'resaving',
+                'revisionId',
                 'rgt',
                 'root',
                 'scenario',
                 'searchScore',
                 'siblings',
                 'site',
+                'siteId',
+                'siteSettingsId',
                 'slug',
                 'sortOrder',
                 'status',
+                'structureId',
+                'tempId',
                 'title',
+                'trashed',
                 'uid',
+                'updatingFromDerivative',
                 'uri',
                 'url',
                 'username', // user-specific