src/ResourceType/ResourceTypeRepository.php | 34 +++++++++------------- tests/src/Functional/ActionTest.php | 1 + tests/src/Functional/BaseFieldOverrideTest.php | 1 + tests/src/Functional/BlockContentTest.php | 1 + tests/src/Functional/BlockContentTypeTest.php | 1 + tests/src/Functional/BlockTest.php | 1 + tests/src/Functional/CommentTest.php | 1 + tests/src/Functional/CommentTypeTest.php | 1 + tests/src/Functional/ConfigTestTest.php | 1 + tests/src/Functional/ConfigurableLanguageTest.php | 1 + tests/src/Functional/ContactFormTest.php | 1 + .../src/Functional/ContentLanguageSettingsTest.php | 1 + tests/src/Functional/DateFormatTest.php | 1 + tests/src/Functional/EditorTest.php | 1 + tests/src/Functional/EntityFormDisplayTest.php | 1 + tests/src/Functional/EntityFormModeTest.php | 1 + tests/src/Functional/EntityTestTest.php | 1 + tests/src/Functional/EntityViewDisplayTest.php | 1 + tests/src/Functional/EntityViewModeTest.php | 1 + tests/src/Functional/FeedTest.php | 1 + tests/src/Functional/FieldConfigTest.php | 1 + tests/src/Functional/FieldStorageConfigTest.php | 1 + tests/src/Functional/FileTest.php | 1 + tests/src/Functional/FilterFormatTest.php | 1 + tests/src/Functional/ImageStyleTest.php | 1 + tests/src/Functional/MediaTest.php | 1 + tests/src/Functional/MediaTypeTest.php | 1 + tests/src/Functional/MenuLinkContentTest.php | 1 + tests/src/Functional/MenuTest.php | 1 + tests/src/Functional/NodeTest.php | 1 + tests/src/Functional/NodeTypeTest.php | 1 + tests/src/Functional/RdfMappingTest.php | 1 + tests/src/Functional/ResponsiveImageStyleTest.php | 1 + tests/src/Functional/RestResourceConfigTest.php | 1 + tests/src/Functional/RoleTest.php | 1 + tests/src/Functional/SearchPageTest.php | 1 + tests/src/Functional/ShortcutSetTest.php | 1 + tests/src/Functional/ShortcutTest.php | 1 + tests/src/Functional/TermTest.php | 1 + tests/src/Functional/TourTest.php | 1 + tests/src/Functional/UserTest.php | 1 + tests/src/Functional/ViewTest.php | 1 + tests/src/Functional/VocabularyTest.php | 1 + tests/src/Functional/WorkflowTest.php | 1 + .../JsonApiDocumentTopLevelNormalizerTest.php | 4 +-- 45 files changed, 59 insertions(+), 22 deletions(-) diff --git a/src/ResourceType/ResourceTypeRepository.php b/src/ResourceType/ResourceTypeRepository.php index 9e6a888..25d345c 100644 --- a/src/ResourceType/ResourceTypeRepository.php +++ b/src/ResourceType/ResourceTypeRepository.php @@ -169,39 +169,33 @@ class ResourceTypeRepository implements ResourceTypeRepositoryInterface { assert(Inspector::assertAllStrings($field_names)); assert($entity_type instanceof ContentEntityTypeInterface || $entity_type instanceof ConfigEntityTypeInterface); + $mapping = []; + // JSON API resource identifier objects are sufficient to identify // entities. By exposing all fields as attributes, we expose unwanted, // confusing or duplicate information: - // - exposing an entity's ID (which is not a UUID) is bad + // - exposing an entity's ID (which is not a UUID) is bad, but it's + // necessary for certain Drupal-coupled clients, so we alias it. // - 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 - $omitted_fields = [$entity_type->getKey('id')]; - if ($entity_type instanceof ContentEntityTypeInterface) { - $omitted_fields[] = $entity_type->getKey('uuid'); - } - else { - $omitted_fields[] = 'uuid'; + $mapping[$entity_type->getKey('uuid')] = FALSE; + $id_field_name = $entity_type->getKey('id'); + $mapping[$id_field_name] = "💧$id_field_name"; + if ($entity_type instanceof ConfigEntityTypeInterface) { // The '_core' key is reserved by Drupal core to handle complex edge cases // correctly. Data in the '_core' key is irrelevant to clients reading // configuration, and is not allowed to be set by clients writing // configuration: it is for Drupal core only, and managed by Drupal core. // @see https://www.drupal.org/node/2653358 - $omitted_fields[] = '_core'; + $mapping['_core'] = FALSE; } - $mapping = []; - foreach ($field_names as $field_name) { - // Omitted fields depend on the type of entity type: config or content. - if (in_array($field_name, $omitted_fields, TRUE)) { - $mapping[$field_name] = FALSE; - continue; - } - - // By default the entity field name is the public field name. Unless the - // public name is "id" or "type" — then they're prefixed with the entity - // type ID because these are reserved by the JSON API spec. - // @see http://jsonapi.org/format/#document-resource-object-fields + // For all other fields, use their internal field name also as their public + // field name. Unless they're called "id" or "type": those names are + // reserved by the JSON API spec. + // @see http://jsonapi.org/format/#document-resource-object-fields + foreach (array_diff($field_names, array_keys($mapping)) as $field_name) { if ($field_name === 'id' || $field_name === 'type') { $alias = $entity_type->id() . '_' . $field_name; if (isset($field_name[$alias])) { diff --git a/tests/src/Functional/ActionTest.php b/tests/src/Functional/ActionTest.php index 17c1e45..fcd512c 100644 --- a/tests/src/Functional/ActionTest.php +++ b/tests/src/Functional/ActionTest.php @@ -96,6 +96,7 @@ class ActionTest extends ResourceTestBase { 'plugin' => 'user_add_role_action', 'status' => TRUE, 'action_type' => 'user', + '💧id' => 'user_add_role_action.anonymous', ], ], ]; diff --git a/tests/src/Functional/BaseFieldOverrideTest.php b/tests/src/Functional/BaseFieldOverrideTest.php index c5ad39c..ac9f0c5 100644 --- a/tests/src/Functional/BaseFieldOverrideTest.php +++ b/tests/src/Functional/BaseFieldOverrideTest.php @@ -107,6 +107,7 @@ class BaseFieldOverrideTest extends ResourceTestBase { ], 'status' => TRUE, 'translatable' => TRUE, + '💧id' => 'node.camelids.promote', ], ], ]; diff --git a/tests/src/Functional/BlockContentTest.php b/tests/src/Functional/BlockContentTest.php index aedeccd..d535010 100644 --- a/tests/src/Functional/BlockContentTest.php +++ b/tests/src/Functional/BlockContentTest.php @@ -117,6 +117,7 @@ class BlockContentTest extends ResourceTestBase { 'status' => FALSE, 'langcode' => 'en', 'default_langcode' => TRUE, + '💧id' => 1, ], 'relationships' => [ 'block_content_type' => [ diff --git a/tests/src/Functional/BlockContentTypeTest.php b/tests/src/Functional/BlockContentTypeTest.php index 02c1862..032b01d 100644 --- a/tests/src/Functional/BlockContentTypeTest.php +++ b/tests/src/Functional/BlockContentTypeTest.php @@ -87,6 +87,7 @@ class BlockContentTypeTest extends ResourceTestBase { 'langcode' => 'en', 'revision' => 0, 'status' => TRUE, + '💧id' => 'pascal', ], ], ]; diff --git a/tests/src/Functional/BlockTest.php b/tests/src/Functional/BlockTest.php index 2e0d460..5afee5f 100644 --- a/tests/src/Functional/BlockTest.php +++ b/tests/src/Functional/BlockTest.php @@ -120,6 +120,7 @@ class BlockTest extends ResourceTestBase { 'label_display' => 'visible', ], 'visibility' => [], + '💧id' => 'llama', ], ], ]; diff --git a/tests/src/Functional/CommentTest.php b/tests/src/Functional/CommentTest.php index 28ac3b9..8de8b7d 100644 --- a/tests/src/Functional/CommentTest.php +++ b/tests/src/Functional/CommentTest.php @@ -166,6 +166,7 @@ class CommentTest extends ResourceTestBase { 'status' => TRUE, 'subject' => 'Llama', 'thread' => '01/', + '💧cid' => 1, ], 'relationships' => [ 'uid' => [ diff --git a/tests/src/Functional/CommentTypeTest.php b/tests/src/Functional/CommentTypeTest.php index 3c5ebac..4ed5ad5 100644 --- a/tests/src/Functional/CommentTypeTest.php +++ b/tests/src/Functional/CommentTypeTest.php @@ -88,6 +88,7 @@ class CommentTypeTest extends ResourceTestBase { 'langcode' => 'en', 'status' => TRUE, 'target_entity_type_id' => 'node', + '💧id' => 'camelids', ], ], ]; diff --git a/tests/src/Functional/ConfigTestTest.php b/tests/src/Functional/ConfigTestTest.php index 4858165..30c2461 100644 --- a/tests/src/Functional/ConfigTestTest.php +++ b/tests/src/Functional/ConfigTestTest.php @@ -87,6 +87,7 @@ class ConfigTestTest extends ResourceTestBase { 'size' => NULL, 'size_value' => NULL, 'protected_property' => NULL, + '💧id' => 'llama', ], ], ]; diff --git a/tests/src/Functional/ConfigurableLanguageTest.php b/tests/src/Functional/ConfigurableLanguageTest.php index 6739d7a..6348a03 100644 --- a/tests/src/Functional/ConfigurableLanguageTest.php +++ b/tests/src/Functional/ConfigurableLanguageTest.php @@ -89,6 +89,7 @@ class ConfigurableLanguageTest extends ResourceTestBase { 'locked' => FALSE, 'status' => TRUE, 'weight' => 0, + '💧id' => 'll', ], ], ]; diff --git a/tests/src/Functional/ContactFormTest.php b/tests/src/Functional/ContactFormTest.php index 0795025..0a60e0c 100644 --- a/tests/src/Functional/ContactFormTest.php +++ b/tests/src/Functional/ContactFormTest.php @@ -96,6 +96,7 @@ class ContactFormTest extends ResourceTestBase { 'reply' => 'Llamas are indeed awesome!', 'status' => TRUE, 'weight' => 0, + '💧id' => 'llama', ], ], ]; diff --git a/tests/src/Functional/ContentLanguageSettingsTest.php b/tests/src/Functional/ContentLanguageSettingsTest.php index 4258f66..6422b7f 100644 --- a/tests/src/Functional/ContentLanguageSettingsTest.php +++ b/tests/src/Functional/ContentLanguageSettingsTest.php @@ -100,6 +100,7 @@ class ContentLanguageSettingsTest extends ResourceTestBase { 'status' => TRUE, 'target_bundle' => 'camelids', 'target_entity_type_id' => 'node', + '💧id' => 'node.camelids', ], ], ]; diff --git a/tests/src/Functional/DateFormatTest.php b/tests/src/Functional/DateFormatTest.php index c0f322a..7631fa9 100644 --- a/tests/src/Functional/DateFormatTest.php +++ b/tests/src/Functional/DateFormatTest.php @@ -92,6 +92,7 @@ class DateFormatTest extends ResourceTestBase { 'locked' => FALSE, 'pattern' => 'F d, Y', 'status' => TRUE, + '💧id' => 'llama', ], ], ]; diff --git a/tests/src/Functional/EditorTest.php b/tests/src/Functional/EditorTest.php index 409a2d8..6ec0c33 100644 --- a/tests/src/Functional/EditorTest.php +++ b/tests/src/Functional/EditorTest.php @@ -178,6 +178,7 @@ class EditorTest extends ResourceTestBase { ], ], 'status' => TRUE, + '💧format' => 'llama', ], ], ]; diff --git a/tests/src/Functional/EntityFormDisplayTest.php b/tests/src/Functional/EntityFormDisplayTest.php index c2b29bc..3966d02 100644 --- a/tests/src/Functional/EntityFormDisplayTest.php +++ b/tests/src/Functional/EntityFormDisplayTest.php @@ -156,6 +156,7 @@ class EntityFormDisplayTest extends ResourceTestBase { 'mode' => 'default', 'status' => NULL, 'targetEntityType' => 'node', + '💧id' => 'node.camelids.default', ], ], ]; diff --git a/tests/src/Functional/EntityFormModeTest.php b/tests/src/Functional/EntityFormModeTest.php index ea0223f..43116b1 100644 --- a/tests/src/Functional/EntityFormModeTest.php +++ b/tests/src/Functional/EntityFormModeTest.php @@ -90,6 +90,7 @@ class EntityFormModeTest extends ResourceTestBase { 'langcode' => 'en', 'status' => TRUE, 'targetEntityType' => 'user', + '💧id' => 'user.test', ], ], ]; diff --git a/tests/src/Functional/EntityTestTest.php b/tests/src/Functional/EntityTestTest.php index eab3a02..2dc285a 100644 --- a/tests/src/Functional/EntityTestTest.php +++ b/tests/src/Functional/EntityTestTest.php @@ -118,6 +118,7 @@ class EntityTestTest extends ResourceTestBase { 'langcode' => 'en', 'name' => 'Llama', 'entity_test_type' => 'entity_test', + '💧id' => 1, ], 'relationships' => [ 'user_id' => [ diff --git a/tests/src/Functional/EntityViewDisplayTest.php b/tests/src/Functional/EntityViewDisplayTest.php index 9c86774..07ab3d6 100644 --- a/tests/src/Functional/EntityViewDisplayTest.php +++ b/tests/src/Functional/EntityViewDisplayTest.php @@ -109,6 +109,7 @@ class EntityViewDisplayTest extends ResourceTestBase { 'mode' => 'default', 'status' => TRUE, 'targetEntityType' => 'node', + '💧id' => 'node.camelids.default', ], ], ]; diff --git a/tests/src/Functional/EntityViewModeTest.php b/tests/src/Functional/EntityViewModeTest.php index 6235bb0..0485f2a 100644 --- a/tests/src/Functional/EntityViewModeTest.php +++ b/tests/src/Functional/EntityViewModeTest.php @@ -90,6 +90,7 @@ class EntityViewModeTest extends ResourceTestBase { 'langcode' => 'en', 'status' => TRUE, 'targetEntityType' => 'user', + '💧id' => 'user.test', ], ], ]; diff --git a/tests/src/Functional/FeedTest.php b/tests/src/Functional/FeedTest.php index 4aba7f1..c5cf207 100644 --- a/tests/src/Functional/FeedTest.php +++ b/tests/src/Functional/FeedTest.php @@ -131,6 +131,7 @@ class FeedTest extends ResourceTestBase { 'etag' => 'hijklmn', 'modified' => '1973-11-29T21:33:09+00:00', 'langcode' => 'en', + '💧fid' => 1, ], ], ]; diff --git a/tests/src/Functional/FieldConfigTest.php b/tests/src/Functional/FieldConfigTest.php index 5129e01..a4735cd 100644 --- a/tests/src/Functional/FieldConfigTest.php +++ b/tests/src/Functional/FieldConfigTest.php @@ -117,6 +117,7 @@ class FieldConfigTest extends ResourceTestBase { 'settings' => [], 'status' => TRUE, 'translatable' => TRUE, + '💧id' => 'node.camelids.field_llama', ], ], ]; diff --git a/tests/src/Functional/FieldStorageConfigTest.php b/tests/src/Functional/FieldStorageConfigTest.php index d600a00..686b94e 100644 --- a/tests/src/Functional/FieldStorageConfigTest.php +++ b/tests/src/Functional/FieldStorageConfigTest.php @@ -96,6 +96,7 @@ class FieldStorageConfigTest extends ResourceTestBase { 'status' => TRUE, 'translatable' => TRUE, 'field_storage_config_type' => 'boolean', + '💧id' => 'node.true_llama', ], ], ]; diff --git a/tests/src/Functional/FileTest.php b/tests/src/Functional/FileTest.php index ae85d7e..e13032a 100644 --- a/tests/src/Functional/FileTest.php +++ b/tests/src/Functional/FileTest.php @@ -151,6 +151,7 @@ class FileTest extends ResourceTestBase { 'url' => base_path() . $this->siteDirectory . '/files/drupal.txt', 'value' => 'public://drupal.txt', ], + '💧fid' => 1, ], 'relationships' => [ 'uid' => [ diff --git a/tests/src/Functional/FilterFormatTest.php b/tests/src/Functional/FilterFormatTest.php index 44c95f3..db1d885 100644 --- a/tests/src/Functional/FilterFormatTest.php +++ b/tests/src/Functional/FilterFormatTest.php @@ -104,6 +104,7 @@ class FilterFormatTest extends ResourceTestBase { 'name' => 'Pablo Piccasso', 'status' => TRUE, 'weight' => 0, + '💧format' => 'pablo', ], ], ]; diff --git a/tests/src/Functional/ImageStyleTest.php b/tests/src/Functional/ImageStyleTest.php index 76c69c3..76956ad 100644 --- a/tests/src/Functional/ImageStyleTest.php +++ b/tests/src/Functional/ImageStyleTest.php @@ -114,6 +114,7 @@ class ImageStyleTest extends ResourceTestBase { 'label' => 'Camelids', 'langcode' => 'en', 'status' => TRUE, + '💧name' => 'camelids', ], ], ]; diff --git a/tests/src/Functional/MediaTest.php b/tests/src/Functional/MediaTest.php index 681ea1d..6d5c1fd 100644 --- a/tests/src/Functional/MediaTest.php +++ b/tests/src/Functional/MediaTest.php @@ -241,6 +241,7 @@ class MediaTest extends ResourceTestBase { 'type' => 'media--camelids', 'attributes' => [ 'name' => 'Dramallama', + '💧mid' => 1, ], 'relationships' => [ 'field_media_file' => [ diff --git a/tests/src/Functional/MediaTypeTest.php b/tests/src/Functional/MediaTypeTest.php index c8c247b..a2441b5 100644 --- a/tests/src/Functional/MediaTypeTest.php +++ b/tests/src/Functional/MediaTypeTest.php @@ -94,6 +94,7 @@ class MediaTypeTest extends ResourceTestBase { 'source_field' => '', ], 'status' => TRUE, + '💧id' => 'camelids', ], ], ]; diff --git a/tests/src/Functional/MenuLinkContentTest.php b/tests/src/Functional/MenuLinkContentTest.php index c214fa1..71f0e32 100644 --- a/tests/src/Functional/MenuLinkContentTest.php +++ b/tests/src/Functional/MenuLinkContentTest.php @@ -107,6 +107,7 @@ class MenuLinkContentTest extends ResourceTestBase { 'rediscover' => FALSE, 'title' => 'Llama Gabilondo', 'weight' => 0, + '💧id' => 1, ], ], ]; diff --git a/tests/src/Functional/MenuTest.php b/tests/src/Functional/MenuTest.php index 5382842..3f52290 100644 --- a/tests/src/Functional/MenuTest.php +++ b/tests/src/Functional/MenuTest.php @@ -90,6 +90,7 @@ class MenuTest extends ResourceTestBase { 'langcode' => 'en', 'locked' => FALSE, 'status' => TRUE, + '💧id' => 'menu', ], ], ]; diff --git a/tests/src/Functional/NodeTest.php b/tests/src/Functional/NodeTest.php index b1e3e0d..0ad97d5 100644 --- a/tests/src/Functional/NodeTest.php +++ b/tests/src/Functional/NodeTest.php @@ -150,6 +150,7 @@ class NodeTest extends ResourceTestBase { 'sticky' => FALSE, 'title' => 'Llama', 'vid' => 1, + '💧nid' => 1, ], 'relationships' => [ 'node_type' => [ diff --git a/tests/src/Functional/NodeTypeTest.php b/tests/src/Functional/NodeTypeTest.php index ae36c44..93849fc 100644 --- a/tests/src/Functional/NodeTypeTest.php +++ b/tests/src/Functional/NodeTypeTest.php @@ -90,6 +90,7 @@ class NodeTypeTest extends ResourceTestBase { 'new_revision' => TRUE, 'preview_mode' => 1, 'status' => TRUE, + '💧type' => 'camelids', ], ], ]; diff --git a/tests/src/Functional/RdfMappingTest.php b/tests/src/Functional/RdfMappingTest.php index 889409f..685efc6 100644 --- a/tests/src/Functional/RdfMappingTest.php +++ b/tests/src/Functional/RdfMappingTest.php @@ -132,6 +132,7 @@ class RdfMappingTest extends ResourceTestBase { 'sioc:Item', 'foaf:Document', ], + '💧id' => 'node.camelids', ], ], ]; diff --git a/tests/src/Functional/ResponsiveImageStyleTest.php b/tests/src/Functional/ResponsiveImageStyleTest.php index 54272cc..c6cd301 100644 --- a/tests/src/Functional/ResponsiveImageStyleTest.php +++ b/tests/src/Functional/ResponsiveImageStyleTest.php @@ -126,6 +126,7 @@ class ResponsiveImageStyleTest extends ResourceTestBase { 'label' => 'Camelids', 'langcode' => 'en', 'status' => TRUE, + '💧id' => 'camelids', ], ], ]; diff --git a/tests/src/Functional/RestResourceConfigTest.php b/tests/src/Functional/RestResourceConfigTest.php index 56d0d2e..312cef2 100644 --- a/tests/src/Functional/RestResourceConfigTest.php +++ b/tests/src/Functional/RestResourceConfigTest.php @@ -110,6 +110,7 @@ class RestResourceConfigTest extends ResourceTestBase { ], ], ], + '💧id' => 'llama', ], ], ]; diff --git a/tests/src/Functional/RoleTest.php b/tests/src/Functional/RoleTest.php index 5e72fd6..161e721 100644 --- a/tests/src/Functional/RoleTest.php +++ b/tests/src/Functional/RoleTest.php @@ -86,6 +86,7 @@ class RoleTest extends ResourceTestBase { 'label' => NULL, 'is_admin' => NULL, 'permissions' => [], + '💧id' => 'llama', ], ], ]; diff --git a/tests/src/Functional/SearchPageTest.php b/tests/src/Functional/SearchPageTest.php index 38c9b75..306e44e 100644 --- a/tests/src/Functional/SearchPageTest.php +++ b/tests/src/Functional/SearchPageTest.php @@ -103,6 +103,7 @@ class SearchPageTest extends ResourceTestBase { 'plugin' => 'node_search', 'status' => TRUE, 'weight' => 0, + '💧id' => 'hinode_search', ], ], ]; diff --git a/tests/src/Functional/ShortcutSetTest.php b/tests/src/Functional/ShortcutSetTest.php index 7f307db..bf44ac8 100644 --- a/tests/src/Functional/ShortcutSetTest.php +++ b/tests/src/Functional/ShortcutSetTest.php @@ -94,6 +94,7 @@ class ShortcutSetTest extends ResourceTestBase { 'status' => TRUE, 'langcode' => 'en', 'dependencies' => [], + '💧id' => 'llama_set', ], ], ]; diff --git a/tests/src/Functional/ShortcutTest.php b/tests/src/Functional/ShortcutTest.php index 212b56a..992a8e6 100644 --- a/tests/src/Functional/ShortcutTest.php +++ b/tests/src/Functional/ShortcutTest.php @@ -97,6 +97,7 @@ class ShortcutTest extends ResourceTestBase { 'langcode' => 'en', 'default_langcode' => TRUE, 'weight' => -20, + '💧id' => (int) $this->entity->id(), ], 'relationships' => [ 'shortcut_set' => [ diff --git a/tests/src/Functional/TermTest.php b/tests/src/Functional/TermTest.php index 5d933bc..555596f 100644 --- a/tests/src/Functional/TermTest.php +++ b/tests/src/Functional/TermTest.php @@ -252,6 +252,7 @@ class TermTest extends ResourceTestBase { 'langcode' => 'en', ], 'weight' => 0, + '💧tid' => 1, ], 'relationships' => [ 'parent' => $expected_parent_normalization, diff --git a/tests/src/Functional/TourTest.php b/tests/src/Functional/TourTest.php index 533e40c..63b906e 100644 --- a/tests/src/Functional/TourTest.php +++ b/tests/src/Functional/TourTest.php @@ -65,6 +65,7 @@ class TourTest extends ResourceTestBase { 'attributes' => [ 'data-id' => 'tour-llama-1', ], + '💧id' => 'tour-llama', ], ], ]); diff --git a/tests/src/Functional/UserTest.php b/tests/src/Functional/UserTest.php index 6795331..3484087 100644 --- a/tests/src/Functional/UserTest.php +++ b/tests/src/Functional/UserTest.php @@ -140,6 +140,7 @@ class UserTest extends ResourceTestBase { 'default_langcode' => TRUE, 'langcode' => 'en', 'name' => 'Llama', + '💧uid' => 3, ], ], ]; diff --git a/tests/src/Functional/ViewTest.php b/tests/src/Functional/ViewTest.php index daf18e4..de9eeaf 100644 --- a/tests/src/Functional/ViewTest.php +++ b/tests/src/Functional/ViewTest.php @@ -106,6 +106,7 @@ class ViewTest extends ResourceTestBase { 'module' => 'views', 'status' => TRUE, 'tag' => '', + '💧id' => 'test_rest', ], ], ]; diff --git a/tests/src/Functional/VocabularyTest.php b/tests/src/Functional/VocabularyTest.php index 43ca990..f78b3bc 100644 --- a/tests/src/Functional/VocabularyTest.php +++ b/tests/src/Functional/VocabularyTest.php @@ -85,6 +85,7 @@ class VocabularyTest extends ResourceTestBase { 'description' => NULL, 'hierarchy' => 0, 'weight' => 0, + '💧vid' => 'llama', ], ], ]; diff --git a/tests/src/Functional/WorkflowTest.php b/tests/src/Functional/WorkflowTest.php index 61cbc5b..ff311a2 100644 --- a/tests/src/Functional/WorkflowTest.php +++ b/tests/src/Functional/WorkflowTest.php @@ -111,6 +111,7 @@ class WorkflowTest extends ResourceTestBase { 'example_setting' => 'foo', ], ], + '💧id' => 'rest_workflow', ], ]; } diff --git a/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php b/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php index 626f303..9410372 100644 --- a/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php +++ b/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php @@ -268,7 +268,7 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase { $this->assertSame($this->term1->uuid(), $normalized['included'][1]['id']); $this->assertSame('taxonomy_term--tags', $normalized['included'][1]['type']); $this->assertSame($this->term1->label(), $normalized['included'][1]['attributes']['name']); - $this->assertCount(6, $normalized['included'][1]['attributes']); + $this->assertCount(7, $normalized['included'][1]['attributes']); $this->assertTrue(!isset($normalized['included'][1]['attributes']['created'])); // Make sure that the cache tags for the includes and the requested entities // are bubbling as expected. @@ -365,7 +365,7 @@ class JsonApiDocumentTopLevelNormalizerTest extends JsonapiKernelTestBase { $this->assertTrue(empty($normalized['meta']['errors'])); $this->assertEquals($this->user->uuid(), $normalized['included'][0]['id']); $this->assertCount(1, $normalized['included'][0]['attributes']); - $this->assertCount(6, $normalized['included'][1]['attributes']); + $this->assertCount(7, $normalized['included'][1]['attributes']); // Make sure that the cache tags for the includes and the requested entities // are bubbling as expected. $this->assertArraySubset(