diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 20d72ed..4a62081 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -600,7 +600,7 @@ function content_translation_form_alter(array &$form, array &$form_state) { if (!$entity->isNew() && (!isset($translations[$form_langcode]) || count($translations) > 1)) { foreach ($entity->getPropertyDefinitions() as $property_name => $definition) { if (isset($form[$property_name])) { - $form[$property_name]['#multilingual'] = !empty($definition['translatable']); + $form[$property_name]['#multilingual'] = $definition->isFieldTranslatable(); } } } diff --git a/core/modules/field/field.deprecated.inc b/core/modules/field/field.deprecated.inc index 6f4a643..100a60e 100644 --- a/core/modules/field/field.deprecated.inc +++ b/core/modules/field/field.deprecated.inc @@ -615,7 +615,7 @@ function field_attach_form_validate(ContentEntityInterface $entity, $form, &$for $has_violations = FALSE; foreach ($entity as $field_name => $field) { $definition = $field->getDefinition(); - if (!empty($definition['configurable']) && (empty($options['field_name']) || $options['field_name'] == $field_name)) { + if ($definition->isFieldConfigurable() && (empty($options['field_name']) || $options['field_name'] == $field_name)) { $field_violations = $field->validate(); if (count($field_violations)) { $has_violations = TRUE; diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php b/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php index 93821ef..7df8d2c 100644 --- a/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php +++ b/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php @@ -12,6 +12,7 @@ use Drupal\Core\Annotation\Translation; use Drupal\Core\Config\Entity\ConfigEntityBase; use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\TypedData\DataDefinition; use Drupal\field\FieldException; use Drupal\field\FieldInstanceInterface; diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php b/core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php index a4f54f0..6cdbc99 100644 --- a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php +++ b/core/modules/hal/lib/Drupal/hal/Normalizer/EntityReferenceItemNormalizer.php @@ -65,7 +65,7 @@ public function normalize($field_item, $format = NULL, array $context = array()) protected function constructValue($data, $context) { $field_item = $context['target_instance']; $field_definition = $field_item->getDefinition(); - $target_type = $field_definition['settings']['target_type']; + $target_type = $field_definition->getFieldSetting('target_type'); if ($id = $this->entityResolver->resolve($this, $data, $target_type)) { return array('target_id' => $id); } diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/FieldItemNormalizer.php b/core/modules/hal/lib/Drupal/hal/Normalizer/FieldItemNormalizer.php index fdd8156..7caf380 100644 --- a/core/modules/hal/lib/Drupal/hal/Normalizer/FieldItemNormalizer.php +++ b/core/modules/hal/lib/Drupal/hal/Normalizer/FieldItemNormalizer.php @@ -57,8 +57,8 @@ public function denormalize($data, $class, $format = NULL, array $context = arra if (isset($data['lang'])) { $langcode = $data['lang']; unset($data['lang']); - $field_definition = $field_item->getDefinition(); - if ($field_definition['translatable']) { + $field_definition = $field_item->getFieldDefinition(); + if ($field_definition->isFieldTranslatable()) { $field_item = $this->createTranslatedInstance($field_item, $langcode); } } diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/FieldNormalizer.php b/core/modules/hal/lib/Drupal/hal/Normalizer/FieldNormalizer.php index cbf8b29..e5eaac1 100644 --- a/core/modules/hal/lib/Drupal/hal/Normalizer/FieldNormalizer.php +++ b/core/modules/hal/lib/Drupal/hal/Normalizer/FieldNormalizer.php @@ -33,11 +33,11 @@ public function normalize($field, $format = NULL, array $context = array()) { // Get the field definition. $entity = $field->getEntity(); $field_name = $field->getName(); - $field_definition = $entity->getPropertyDefinition($field_name); + $field_definition = $field->getFieldDefinition(); // If this field is not translatable, it can simply be normalized without // separating it into different translations. - if (empty($field_definition['translatable'])) { + if (!$field_definition->isFieldTranslatable()) { $normalized_field_items = $this->normalizeFieldItems($field, $format, $context); } // Otherwise, the languages have to be extracted from the entity and passed