reverted: --- b/core/config/schema/core.data_types.schema.yml +++ a/core/config/schema/core.data_types.schema.yml @@ -587,9 +587,6 @@ type: mapping label: 'Entity reference field settings' mapping: - serialize_embedded_entities: - type: boolean - label: 'Serialize entity references together with the parent entity' handler: type: string label: 'Reference method' diff -u b/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php --- b/core/lib/Drupal/Core/Entity/ContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -158,10 +158,6 @@ /** * Whether to serialize the complete entity structure. * - * Depending on the field setting "serialize_embedded_entities" of entity - * reference fields a deeply serialized entity might contain the referenced - * entities. - * * @var bool */ protected $deepSerialization = FALSE; @@ -474,9 +470,7 @@ */ public function deepSerialize() { // When running a deep serialization the flag "deepSerialization" has to be - // set in order to serialize referenced entities as well, which are - // referenced by field having the setting "serialize_embedded_entities" set - // to TRUE. + // set in order to serialize referenced entities as well. $this->deepSerialization = TRUE; return serialize($this); } diff -u b/core/lib/Drupal/Core/Field/EntityReferenceFieldItemList.php b/core/lib/Drupal/Core/Field/EntityReferenceFieldItemList.php --- b/core/lib/Drupal/Core/Field/EntityReferenceFieldItemList.php +++ b/core/lib/Drupal/Core/Field/EntityReferenceFieldItemList.php @@ -15,8 +15,7 @@ */ public function getSerializationValue($deep_serialization) { if ($deep_serialization) { - $serialize_embedded_entities = $this->getFieldDefinition()->getSetting('serialize_embedded_entities'); - $values = $this->getValue($serialize_embedded_entities); + $values = $this->getValue(TRUE); foreach ($values as $delta => $item_values) { if (isset($values[$delta]['entity'])) { $values[$delta]['entity']->setDeepSerialization(); reverted: --- b/core/lib/Drupal/Core/Field/EntityReferenceInlineWidgetBase.php +++ /dev/null @@ -1,19 +0,0 @@ -getSetting('serialize_embedded_entities'); - } - -} diff -u b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php --- b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php @@ -54,7 +54,6 @@ */ public static function defaultFieldSettings() { return array( - 'serialize_embedded_entities' => FALSE, 'handler' => 'default', 'handler_settings' => array(), ) + parent::defaultFieldSettings(); reverted: --- b/core/modules/field/field.install +++ a/core/modules/field/field.install @@ -104,40 +104,3 @@ } } } - -/** - * @addtogroup updates-8.3.x - * @{ - */ - -/** - * Populate the new 'serialize_embedded_entities' setting for entity reference - * fields. - */ -function field_update_8300() { - $config_factory = \Drupal::configFactory(); - /** @var \Drupal\Core\Field\FieldTypePluginManager $field_type_manager */ - $field_type_manager = \Drupal::service('plugin.manager.field.field_type'); - - // Iterate over all fields. - foreach ($config_factory->listAll('field.field.') as $field_id) { - $field_config = $config_factory->getEditable($field_id); - $field_type = $field_config->get('field_type'); - $class = $field_type_manager->getPluginClass($field_type); - - // Deal only with entity reference fields and descendants. - if ($class == EntityReferenceItem::class || is_subclass_of($class, EntityReferenceItem::class)) { - $settings = $field_config->get('settings'); - - if (!isset($settings['serialize_embedded_entities'])) { - $settings['serialize_embedded_entities'] = FALSE; - } - - $field_config->set('settings', $settings)->save(TRUE); - } - } -} - -/** - * @} End of "addtogroup updates-8.3.x". - */ reverted: --- b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php +++ a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php @@ -81,7 +81,6 @@ 'uri_scheme' => 'public', 'handler' => 'default:file', 'handler_settings' => array(), - 'serialize_embedded_entities' => FALSE, ); $field_settings = $field->getSettings(); ksort($expected); reverted: --- b/core/modules/file/config/schema/file.schema.yml +++ a/core/modules/file/config/schema/file.schema.yml @@ -43,9 +43,6 @@ base_file_field_field_settings: type: mapping mapping: - serialize_embedded_entities: - type: boolean - label: 'Serialize entity references together with the parent entity' handler: type: string label: 'Reference method' reverted: --- b/core/modules/forum/config/optional/field.field.node.forum.taxonomy_forums.yml +++ a/core/modules/forum/config/optional/field.field.node.forum.taxonomy_forums.yml @@ -16,7 +16,6 @@ default_value: { } default_value_callback: '' settings: - serialize_embedded_entities: false handler: 'default:taxonomy_term' handler_settings: target_bundles: reverted: --- b/core/profiles/standard/config/install/field.field.node.article.field_image.yml +++ a/core/profiles/standard/config/install/field.field.node.article.field_image.yml @@ -32,7 +32,6 @@ title: '' width: null height: null - serialize_embedded_entities: false handler: 'default:file' handler_settings: { } field_type: image reverted: --- b/core/profiles/standard/config/install/field.field.node.article.field_tags.yml +++ a/core/profiles/standard/config/install/field.field.node.article.field_tags.yml @@ -16,7 +16,6 @@ default_value: { } default_value_callback: '' settings: - serialize_embedded_entities: false handler: 'default:taxonomy_term' handler_settings: target_bundles: reverted: --- b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml +++ a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml @@ -32,7 +32,6 @@ height: null alt_field_required: false title_field_required: false - serialize_embedded_entities: false handler: 'default:file' handler_settings: { } field_type: image diff -u b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntitySerializationTest.php b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntitySerializationTest.php --- b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntitySerializationTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntitySerializationTest.php @@ -81,11 +81,6 @@ */ protected function doTestSerialization($deep_serialization) { $field_name = $this->entityReferenceFieldName; - // Check that the 'target_bundle' setting contains the custom bundle. - $field_config = FieldConfig::loadByName($this->entityTypeId, $this->entityTypeId, $field_name); - $field_config->setSetting('serialize_embedded_entities', $deep_serialization) - ->save(); - $user = $this->createUser(); $initial_entity_name = 'test test';