src/Normalizer/ConfigEntityNormalizer.php | 3 ++- tests/src/Functional/BaseFieldOverrideTest.php | 2 -- tests/src/Functional/BlockContentTypeTest.php | 3 --- tests/src/Functional/BlockTest.php | 2 -- tests/src/Functional/CommentTypeTest.php | 2 -- tests/src/Functional/ConfigTestTest.php | 2 -- tests/src/Functional/ConfigurableLanguageTest.php | 2 -- tests/src/Functional/ContactFormTest.php | 2 -- tests/src/Functional/ContentLanguageSettingsTest.php | 2 -- tests/src/Functional/DateFormatTest.php | 2 -- tests/src/Functional/EditorTest.php | 2 -- tests/src/Functional/EntityFormDisplayTest.php | 2 -- tests/src/Functional/EntityFormModeTest.php | 2 -- tests/src/Functional/EntityViewDisplayTest.php | 2 -- tests/src/Functional/EntityViewModeTest.php | 2 -- tests/src/Functional/FieldConfigTest.php | 2 -- tests/src/Functional/FieldStorageConfigTest.php | 2 -- tests/src/Functional/FilterFormatTest.php | 2 -- tests/src/Functional/ImageStyleTest.php | 2 -- tests/src/Functional/MediaTypeTest.php | 2 -- tests/src/Functional/MenuTest.php | 2 -- tests/src/Functional/NodeTypeTest.php | 1 - tests/src/Functional/RdfMappingTest.php | 2 -- tests/src/Functional/ResponsiveImageStyleTest.php | 2 -- tests/src/Functional/RestResourceConfigTest.php | 2 -- tests/src/Functional/RoleTest.php | 2 -- tests/src/Functional/SearchPageTest.php | 2 -- tests/src/Functional/ShortcutSetTest.php | 2 -- tests/src/Functional/TourTest.php | 2 -- tests/src/Functional/ViewTest.php | 2 -- tests/src/Functional/VocabularyTest.php | 2 -- tests/src/Functional/WorkflowTest.php | 2 -- 32 files changed, 2 insertions(+), 63 deletions(-) diff --git a/src/Normalizer/ConfigEntityNormalizer.php b/src/Normalizer/ConfigEntityNormalizer.php index ec5c760..0f9b351 100644 --- a/src/Normalizer/ConfigEntityNormalizer.php +++ b/src/Normalizer/ConfigEntityNormalizer.php @@ -48,7 +48,8 @@ class ConfigEntityNormalizer extends EntityNormalizer { // - exposing its UUID as an attribute is useless (it's already part of the // mandatory "id" attribute in JSON API) // @see http://jsonapi.org/format/#document-resource-identifier-objects - unset($enabled_public_fields['id']); + $id_field_name = $entity->getEntityType()->getKey('id'); + unset($fields[$id_field_name]); unset($enabled_public_fields['uuid']); return $enabled_public_fields; diff --git a/tests/src/Functional/BaseFieldOverrideTest.php b/tests/src/Functional/BaseFieldOverrideTest.php index 28f3a44..c5ad39c 100644 --- a/tests/src/Functional/BaseFieldOverrideTest.php +++ b/tests/src/Functional/BaseFieldOverrideTest.php @@ -98,7 +98,6 @@ class BaseFieldOverrideTest extends ResourceTestBase { 'entity_type' => 'node', 'field_name' => 'promote', 'field_type' => 'boolean', - 'id' => 'node.camelids.promote', 'label' => NULL, 'langcode' => 'en', 'required' => FALSE, @@ -108,7 +107,6 @@ class BaseFieldOverrideTest extends ResourceTestBase { ], 'status' => TRUE, 'translatable' => TRUE, - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/BlockContentTypeTest.php b/tests/src/Functional/BlockContentTypeTest.php index 63ddeff..02c1862 100644 --- a/tests/src/Functional/BlockContentTypeTest.php +++ b/tests/src/Functional/BlockContentTypeTest.php @@ -83,13 +83,10 @@ class BlockContentTypeTest extends ResourceTestBase { 'attributes' => [ 'dependencies' => [], 'description' => 'Provides a competitive alternative to the "basic" type', - 'id' => 'pascal', 'label' => 'Pascal', 'langcode' => 'en', 'revision' => 0, 'status' => TRUE, - 'uuid' => $this->entity->uuid(), - ], ], ]; diff --git a/tests/src/Functional/BlockTest.php b/tests/src/Functional/BlockTest.php index e244c98..2e0d460 100644 --- a/tests/src/Functional/BlockTest.php +++ b/tests/src/Functional/BlockTest.php @@ -101,7 +101,6 @@ class BlockTest extends ResourceTestBase { 'self' => $self_url, ], 'attributes' => [ - 'id' => 'llama', 'weight' => NULL, 'langcode' => 'en', 'status' => TRUE, @@ -121,7 +120,6 @@ class BlockTest extends ResourceTestBase { 'label_display' => 'visible', ], 'visibility' => [], - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/CommentTypeTest.php b/tests/src/Functional/CommentTypeTest.php index 33c9310..3c5ebac 100644 --- a/tests/src/Functional/CommentTypeTest.php +++ b/tests/src/Functional/CommentTypeTest.php @@ -84,12 +84,10 @@ class CommentTypeTest extends ResourceTestBase { 'attributes' => [ 'dependencies' => [], 'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.', - 'id' => 'camelids', 'label' => 'Camelids', 'langcode' => 'en', 'status' => TRUE, 'target_entity_type_id' => 'node', - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/ConfigTestTest.php b/tests/src/Functional/ConfigTestTest.php index 746831d..4858165 100644 --- a/tests/src/Functional/ConfigTestTest.php +++ b/tests/src/Functional/ConfigTestTest.php @@ -78,8 +78,6 @@ class ConfigTestTest extends ResourceTestBase { 'self' => $self_url, ], 'attributes' => [ - 'uuid' => $this->entity->uuid(), - 'id' => 'llama', 'weight' => 0, 'langcode' => 'en', 'status' => TRUE, diff --git a/tests/src/Functional/ConfigurableLanguageTest.php b/tests/src/Functional/ConfigurableLanguageTest.php index fe538f1..6739d7a 100644 --- a/tests/src/Functional/ConfigurableLanguageTest.php +++ b/tests/src/Functional/ConfigurableLanguageTest.php @@ -84,12 +84,10 @@ class ConfigurableLanguageTest extends ResourceTestBase { 'attributes' => [ 'dependencies' => [], 'direction' => 'ltr', - 'id' => 'll', 'label' => 'Llama Language', 'langcode' => 'en', 'locked' => FALSE, 'status' => TRUE, - 'uuid' => $this->entity->uuid(), 'weight' => 0, ], ], diff --git a/tests/src/Functional/ContactFormTest.php b/tests/src/Functional/ContactFormTest.php index ca9bf99..0795025 100644 --- a/tests/src/Functional/ContactFormTest.php +++ b/tests/src/Functional/ContactFormTest.php @@ -85,7 +85,6 @@ class ContactFormTest extends ResourceTestBase { ], 'attributes' => [ 'dependencies' => [], - 'id' => 'llama', 'label' => 'Llama', 'langcode' => 'en', 'message' => 'Let us know what you think about llamas', @@ -96,7 +95,6 @@ class ContactFormTest extends ResourceTestBase { 'redirect' => NULL, 'reply' => 'Llamas are indeed awesome!', 'status' => TRUE, - 'uuid' => $this->entity->uuid(), 'weight' => 0, ], ], diff --git a/tests/src/Functional/ContentLanguageSettingsTest.php b/tests/src/Functional/ContentLanguageSettingsTest.php index 2afd8c2..4258f66 100644 --- a/tests/src/Functional/ContentLanguageSettingsTest.php +++ b/tests/src/Functional/ContentLanguageSettingsTest.php @@ -95,13 +95,11 @@ class ContentLanguageSettingsTest extends ResourceTestBase { 'node.type.camelids', ], ], - 'id' => 'node.camelids', 'langcode' => 'en', 'language_alterable' => FALSE, 'status' => TRUE, 'target_bundle' => 'camelids', 'target_entity_type_id' => 'node', - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/DateFormatTest.php b/tests/src/Functional/DateFormatTest.php index 403fb9a..c0f322a 100644 --- a/tests/src/Functional/DateFormatTest.php +++ b/tests/src/Functional/DateFormatTest.php @@ -87,13 +87,11 @@ class DateFormatTest extends ResourceTestBase { ], 'attributes' => [ 'dependencies' => [], - 'id' => 'llama', 'label' => 'Llama', 'langcode' => 'en', 'locked' => FALSE, 'pattern' => 'F d, Y', 'status' => TRUE, - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/EditorTest.php b/tests/src/Functional/EditorTest.php index 5ae870e..409a2d8 100644 --- a/tests/src/Functional/EditorTest.php +++ b/tests/src/Functional/EditorTest.php @@ -119,7 +119,6 @@ class EditorTest extends ResourceTestBase { ], ], 'editor' => 'ckeditor', - 'format' => 'llama', 'image_upload' => [ 'status' => FALSE, 'scheme' => 'public', @@ -179,7 +178,6 @@ class EditorTest extends ResourceTestBase { ], ], 'status' => TRUE, - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/EntityFormDisplayTest.php b/tests/src/Functional/EntityFormDisplayTest.php index a88d93e..ed501b6 100644 --- a/tests/src/Functional/EntityFormDisplayTest.php +++ b/tests/src/Functional/EntityFormDisplayTest.php @@ -152,12 +152,10 @@ class EntityFormDisplayTest extends ResourceTestBase { ], ], 'hidden' => [], - 'id' => 'node.camelids.default', 'langcode' => 'en', 'mode' => 'default', 'status' => NULL, 'targetEntityType' => 'node', - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/EntityFormModeTest.php b/tests/src/Functional/EntityFormModeTest.php index 6635971..ea0223f 100644 --- a/tests/src/Functional/EntityFormModeTest.php +++ b/tests/src/Functional/EntityFormModeTest.php @@ -86,12 +86,10 @@ class EntityFormModeTest extends ResourceTestBase { 'user', ], ], - 'id' => 'user.test', 'label' => 'Test', 'langcode' => 'en', 'status' => TRUE, 'targetEntityType' => 'user', - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/EntityViewDisplayTest.php b/tests/src/Functional/EntityViewDisplayTest.php index 2f67c69..f9054d4 100644 --- a/tests/src/Functional/EntityViewDisplayTest.php +++ b/tests/src/Functional/EntityViewDisplayTest.php @@ -105,12 +105,10 @@ class EntityViewDisplayTest extends ResourceTestBase { ], ], 'hidden' => [], - 'id' => 'node.camelids.default', 'langcode' => 'en', 'mode' => 'default', 'status' => TRUE, 'targetEntityType' => 'node', - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/EntityViewModeTest.php b/tests/src/Functional/EntityViewModeTest.php index 2b90618..6235bb0 100644 --- a/tests/src/Functional/EntityViewModeTest.php +++ b/tests/src/Functional/EntityViewModeTest.php @@ -86,12 +86,10 @@ class EntityViewModeTest extends ResourceTestBase { 'user', ], ], - 'id' => 'user.test', 'label' => 'Test', 'langcode' => 'en', 'status' => TRUE, 'targetEntityType' => 'user', - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/FieldConfigTest.php b/tests/src/Functional/FieldConfigTest.php index 575432a..5129e01 100644 --- a/tests/src/Functional/FieldConfigTest.php +++ b/tests/src/Functional/FieldConfigTest.php @@ -111,14 +111,12 @@ class FieldConfigTest extends ResourceTestBase { 'entity_type' => 'node', 'field_name' => 'field_llama', 'field_type' => 'text', - 'id' => 'node.camelids.field_llama', 'label' => 'field_llama', 'langcode' => 'en', 'required' => FALSE, 'settings' => [], 'status' => TRUE, 'translatable' => TRUE, - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/FieldStorageConfigTest.php b/tests/src/Functional/FieldStorageConfigTest.php index 13e7631..2bf7bf7 100644 --- a/tests/src/Functional/FieldStorageConfigTest.php +++ b/tests/src/Functional/FieldStorageConfigTest.php @@ -87,7 +87,6 @@ class FieldStorageConfigTest extends ResourceTestBase { ], 'entity_type' => 'node', 'field_name' => 'true_llama', - 'id' => 'node.true_llama', 'indexes' => [], 'langcode' => 'en', 'locked' => FALSE, @@ -97,7 +96,6 @@ class FieldStorageConfigTest extends ResourceTestBase { 'status' => TRUE, 'translatable' => TRUE, 'type' => 'boolean', - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/FilterFormatTest.php b/tests/src/Functional/FilterFormatTest.php index 629317e..44c95f3 100644 --- a/tests/src/Functional/FilterFormatTest.php +++ b/tests/src/Functional/FilterFormatTest.php @@ -100,11 +100,9 @@ class FilterFormatTest extends ResourceTestBase { ], ], ], - 'format' => 'pablo', 'langcode' => 'es', 'name' => 'Pablo Piccasso', 'status' => TRUE, - 'uuid' => $this->entity->uuid(), 'weight' => 0, ], ], diff --git a/tests/src/Functional/ImageStyleTest.php b/tests/src/Functional/ImageStyleTest.php index b2f3f85..76c69c3 100644 --- a/tests/src/Functional/ImageStyleTest.php +++ b/tests/src/Functional/ImageStyleTest.php @@ -113,9 +113,7 @@ class ImageStyleTest extends ResourceTestBase { ], 'label' => 'Camelids', 'langcode' => 'en', - 'name' => 'camelids', 'status' => TRUE, - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/MediaTypeTest.php b/tests/src/Functional/MediaTypeTest.php index 6da5a35..c8c247b 100644 --- a/tests/src/Functional/MediaTypeTest.php +++ b/tests/src/Functional/MediaTypeTest.php @@ -85,7 +85,6 @@ class MediaTypeTest extends ResourceTestBase { 'dependencies' => [], 'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.', 'field_map' => [], - 'id' => 'camelids', 'label' => NULL, 'langcode' => 'en', 'new_revision' => FALSE, @@ -95,7 +94,6 @@ class MediaTypeTest extends ResourceTestBase { 'source_field' => '', ], 'status' => TRUE, - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/MenuTest.php b/tests/src/Functional/MenuTest.php index b16ffce..5382842 100644 --- a/tests/src/Functional/MenuTest.php +++ b/tests/src/Functional/MenuTest.php @@ -86,12 +86,10 @@ class MenuTest extends ResourceTestBase { 'attributes' => [ 'dependencies' => [], 'description' => 'Menu', - 'id' => 'menu', 'label' => 'Menu', 'langcode' => 'en', 'locked' => FALSE, 'status' => TRUE, - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/NodeTypeTest.php b/tests/src/Functional/NodeTypeTest.php index 474d0bc..c10fa0e 100644 --- a/tests/src/Functional/NodeTypeTest.php +++ b/tests/src/Functional/NodeTypeTest.php @@ -91,7 +91,6 @@ class NodeTypeTest extends ResourceTestBase { 'preview_mode' => 1, 'status' => TRUE, 'type' => 'camelids', - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/RdfMappingTest.php b/tests/src/Functional/RdfMappingTest.php index ddb9f96..889409f 100644 --- a/tests/src/Functional/RdfMappingTest.php +++ b/tests/src/Functional/RdfMappingTest.php @@ -125,7 +125,6 @@ class RdfMappingTest extends ResourceTestBase { ], ], ], - 'id' => 'node.camelids', 'langcode' => 'en', 'status' => TRUE, 'targetEntityType' => 'node', @@ -133,7 +132,6 @@ class RdfMappingTest extends ResourceTestBase { 'sioc:Item', 'foaf:Document', ], - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/ResponsiveImageStyleTest.php b/tests/src/Functional/ResponsiveImageStyleTest.php index ad9f41e..54272cc 100644 --- a/tests/src/Functional/ResponsiveImageStyleTest.php +++ b/tests/src/Functional/ResponsiveImageStyleTest.php @@ -103,7 +103,6 @@ class ResponsiveImageStyleTest extends ResourceTestBase { ], ], 'fallback_image_style' => 'fallback', - 'id' => 'camelids', 'image_style_mappings' => [ 0 => [ 'breakpoint_id' => 'test_breakpoint', @@ -127,7 +126,6 @@ class ResponsiveImageStyleTest extends ResourceTestBase { 'label' => 'Camelids', 'langcode' => 'en', 'status' => TRUE, - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/RestResourceConfigTest.php b/tests/src/Functional/RestResourceConfigTest.php index fb8a74e..56d0d2e 100644 --- a/tests/src/Functional/RestResourceConfigTest.php +++ b/tests/src/Functional/RestResourceConfigTest.php @@ -89,7 +89,6 @@ class RestResourceConfigTest extends ResourceTestBase { 'self' => $self_url, ], 'attributes' => [ - 'uuid' => $this->entity->uuid(), 'langcode' => 'en', 'status' => TRUE, 'dependencies' => [ @@ -99,7 +98,6 @@ class RestResourceConfigTest extends ResourceTestBase { 'user', ], ], - 'id' => 'llama', 'plugin_id' => 'dblog', 'granularity' => 'method', 'configuration' => [ diff --git a/tests/src/Functional/RoleTest.php b/tests/src/Functional/RoleTest.php index 80a8b3b..5e72fd6 100644 --- a/tests/src/Functional/RoleTest.php +++ b/tests/src/Functional/RoleTest.php @@ -79,12 +79,10 @@ class RoleTest extends ResourceTestBase { 'self' => $self_url, ], 'attributes' => [ - 'uuid' => $this->entity->uuid(), 'weight' => 2, 'langcode' => 'en', 'status' => TRUE, 'dependencies' => [], - 'id' => 'llama', 'label' => NULL, 'is_admin' => NULL, 'permissions' => [], diff --git a/tests/src/Functional/SearchPageTest.php b/tests/src/Functional/SearchPageTest.php index 78aa492..38c9b75 100644 --- a/tests/src/Functional/SearchPageTest.php +++ b/tests/src/Functional/SearchPageTest.php @@ -97,13 +97,11 @@ class SearchPageTest extends ResourceTestBase { 'node', ], ], - 'id' => 'hinode_search', 'label' => 'Search of magnetic activity of the Sun', 'langcode' => 'en', 'path' => 'sun', 'plugin' => 'node_search', 'status' => TRUE, - 'uuid' => $this->entity->uuid(), 'weight' => 0, ], ], diff --git a/tests/src/Functional/ShortcutSetTest.php b/tests/src/Functional/ShortcutSetTest.php index e1b1bef..7f307db 100644 --- a/tests/src/Functional/ShortcutSetTest.php +++ b/tests/src/Functional/ShortcutSetTest.php @@ -90,8 +90,6 @@ class ShortcutSetTest extends ResourceTestBase { 'self' => $self_url, ], 'attributes' => [ - 'id' => 'llama_set', - 'uuid' => $this->entity->uuid(), 'label' => 'Llama Set', 'status' => TRUE, 'langcode' => 'en', diff --git a/tests/src/Functional/TourTest.php b/tests/src/Functional/TourTest.php index e2daee5..533e40c 100644 --- a/tests/src/Functional/TourTest.php +++ b/tests/src/Functional/TourTest.php @@ -98,7 +98,6 @@ class TourTest extends ResourceTestBase { ], 'attributes' => [ 'dependencies' => [], - 'id' => 'tour-llama', 'label' => 'Llama tour', 'langcode' => 'en', 'module' => 'tour', @@ -120,7 +119,6 @@ class TourTest extends ResourceTestBase { ], ], ], - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/ViewTest.php b/tests/src/Functional/ViewTest.php index 97644e6..daf18e4 100644 --- a/tests/src/Functional/ViewTest.php +++ b/tests/src/Functional/ViewTest.php @@ -101,13 +101,11 @@ class ViewTest extends ResourceTestBase { ], ], ], - 'id' => 'test_rest', 'label' => 'Test REST', 'langcode' => 'en', 'module' => 'views', 'status' => TRUE, 'tag' => '', - 'uuid' => $this->entity->uuid(), ], ], ]; diff --git a/tests/src/Functional/VocabularyTest.php b/tests/src/Functional/VocabularyTest.php index be4d04e..09849ab 100644 --- a/tests/src/Functional/VocabularyTest.php +++ b/tests/src/Functional/VocabularyTest.php @@ -78,8 +78,6 @@ class VocabularyTest extends ResourceTestBase { 'self' => $self_url, ], 'attributes' => [ - 'uuid' => $this->entity->uuid(), - 'vid' => 'llama', 'langcode' => 'en', 'status' => TRUE, 'dependencies' => [], diff --git a/tests/src/Functional/WorkflowTest.php b/tests/src/Functional/WorkflowTest.php index b4c41ab..0766a80 100644 --- a/tests/src/Functional/WorkflowTest.php +++ b/tests/src/Functional/WorkflowTest.php @@ -91,7 +91,6 @@ class WorkflowTest extends ResourceTestBase { 'workflow_type_test', ], ], - 'id' => 'rest_workflow', 'label' => 'REST Worklow', 'langcode' => 'en', 'status' => TRUE, @@ -111,7 +110,6 @@ class WorkflowTest extends ResourceTestBase { 'transitions' => [], 'example_setting' => 'foo', ], - 'uuid' => $this->entity->uuid(), ], ], ];