From b09c15b96c4af3ee033d93526fb8aeb5f6b6fbc4 Mon Sep 17 00:00:00 2001 From: Mac_Weber Date: Sat, 31 Aug 2013 17:40:53 -0300 Subject: [PATCH] Issue #2078593 by Mac_Weber: In WizardPluginBase Rename Views properties to core standards. --- core/includes/entity.api.php | 10 +- core/includes/entity.inc | 8 +- .../Drupal/Core/Entity/Annotation/EntityType.php | 4 +- .../Core/Entity/DatabaseStorageController.php | 12 +- .../Core/Entity/DatabaseStorageControllerNG.php | 16 +- .../Core/Entity/Enhancer/EntityRouteEnhancer.php | 8 +- core/lib/Drupal/Core/Entity/Entity.php | 2 +- core/lib/Drupal/Core/Entity/EntityAccessCheck.php | 2 +- .../Drupal/Core/Entity/EntityFormController.php | 2 +- core/lib/Drupal/Core/Entity/EntityManager.php | 8 +- core/lib/Drupal/Core/Entity/EntityNG.php | 2 +- .../Drupal/Core/Entity/EntityRenderController.php | 2 +- .../Plugin/DataType/Deriver/EntityDeriver.php | 2 +- .../Drupal/Core/Entity/Query/QueryInterface.php | 2 +- core/lib/Drupal/Core/Entity/Query/Sql/Query.php | 20 +-- core/lib/Drupal/Core/Entity/Query/Sql/Tables.php | 12 +- .../Drupal/Core/Extension/UpdateModuleHandler.php | 2 +- .../Drupal/Core/Routing/UrlGeneratorInterface.php | 4 +- .../config/views.view.test_bulk_form.yml | 2 +- .../config/views.view.aggregator_rss_feed.yml | 2 +- .../lib/Drupal/aggregator/Entity/Feed.php | 2 +- .../lib/Drupal/aggregator/Entity/Item.php | 2 +- .../views.view.test_aggregator_items.yml | 2 +- core/modules/block/block.install | 2 +- core/modules/block/block.routing.yml | 2 +- .../modules/block/custom_block/custom_block.module | 2 +- .../custom_block/CustomBlockTypeFormController.php | 2 +- .../lib/Drupal/custom_block/Entity/CustomBlock.php | 4 +- .../Drupal/custom_block/Entity/CustomBlockType.php | 2 +- .../custom_block/Tests/CustomBlockFieldTest.php | 2 +- .../block/lib/Drupal/block/Entity/Block.php | 2 +- .../test_views/views.view.test_view_block.yml | 2 +- .../test_views/views.view.test_view_block2.yml | 2 +- core/modules/book/lib/Drupal/book/BookManager.php | 2 +- core/modules/comment/comment.module | 10 +- core/modules/comment/comment.routing.yml | 2 +- .../comment/lib/Drupal/comment/Entity/Comment.php | 2 +- .../selection/CommentSelection.php | 2 +- .../Drupal/comment/Plugin/views/wizard/Comment.php | 2 +- .../test_views/views.view.test_comment_row.yml | 2 +- .../test_views/views.view.test_comment_rss.yml | 2 +- .../views.view.test_comment_user_uid.yml | 2 +- .../tests/config_test/config_test.routing.yml | 10 +- .../contact/Tests/Views/ContactFieldsTest.php | 2 +- .../test_views/views.view.test_contact_link.yml | 2 +- .../content_translation.install | 4 +- .../content_translation/content_translation.module | 28 +-- .../Tests/ContentTranslationSettingsTest.php | 4 +- .../Tests/ContentTranslationSyncImageTest.php | 2 +- .../Tests/ContentTranslationTestBase.php | 2 +- .../Tests/Views/TranslationLinkTest.php | 2 +- .../views.view.test_entity_translations_link.yml | 2 +- .../lib/Drupal/datetime/Tests/DateTimeItemTest.php | 2 +- .../Drupal/datetime/Tests/DatetimeFieldTest.php | 2 +- core/modules/edit/edit.module | 2 +- core/modules/edit/edit.routing.yml | 4 +- .../Drupal/edit/Access/EditEntityAccessCheck.php | 2 +- .../edit/Access/EditEntityFieldAccessCheck.php | 2 +- .../edit/lib/Drupal/edit/EditController.php | 2 +- .../edit/lib/Drupal/edit/Form/EditFieldForm.php | 2 +- .../edit/lib/Drupal/edit/Tests/EditLoadingTest.php | 2 +- .../edit/lib/Drupal/edit/Tests/EditTestBase.php | 2 +- .../edit/Access/EditEntityAccessCheckTest.php | 6 +- .../edit/Access/EditEntityFieldAccessCheckTest.php | 14 +- core/modules/editor/editor.module | 2 +- core/modules/editor/editor.routing.yml | 2 +- .../lib/Drupal/email/Tests/EmailFieldTest.php | 2 +- .../email/lib/Drupal/email/Tests/EmailItemTest.php | 2 +- core/modules/entity/entity.routing.yml | 4 +- .../lib/Drupal/entity/Entity/EntityFormMode.php | 2 +- .../lib/Drupal/entity/Entity/EntityViewMode.php | 2 +- .../lib/Drupal/entity/Tests/EntityDisplayTest.php | 4 +- .../Drupal/entity/Tests/EntityFormDisplayTest.php | 2 +- .../entity_reference/entity_reference.module | 2 +- .../entity_reference/entity_reference.routing.yml | 2 +- .../EntityReferenceAutocomplete.php | 2 +- .../Plugin/Derivative/SelectionBase.php | 2 +- .../entity_reference/selection/SelectionBase.php | 4 +- .../field_type/ConfigurableEntityReferenceItem.php | 2 +- .../formatter/EntityReferenceEntityFormatter.php | 2 +- .../Plugin/views/display/EntityReference.php | 2 +- .../Tests/EntityReferenceAutoCreateTest.php | 2 +- .../Tests/EntityReferenceSelectionAccessTest.php | 6 +- .../Tests/EntityReferenceSelectionSortTest.php | 4 +- .../entity_reference/Tests/Views/SelectionTest.php | 2 +- .../config/views.view.test_entity_reference.yml | 2 +- core/modules/field/config/schema/field.schema.yml | 2 +- core/modules/field/field.api.php | 34 ++-- core/modules/field/field.attach.inc | 8 +- core/modules/field/field.deprecated.inc | 28 +-- core/modules/field/field.info.inc | 4 +- core/modules/field/field.install | 6 +- core/modules/field/field.module | 6 +- core/modules/field/field.multilingual.inc | 2 +- core/modules/field/field.purge.inc | 4 +- core/modules/field/field.views.inc | 12 +- .../field/lib/Drupal/field/Entity/Field.php | 2 +- .../lib/Drupal/field/Entity/FieldInstance.php | 12 +- core/modules/field/lib/Drupal/field/FieldInfo.php | 8 +- .../field/FieldInstanceStorageController.php | 4 +- .../field/Plugin/Type/Formatter/FormatterBase.php | 2 +- .../Drupal/field/Plugin/Type/Widget/WidgetBase.php | 2 +- .../field/Plugin/Type/Widget/WidgetInterface.php | 2 +- .../lib/Drupal/field/Plugin/views/field/Field.php | 12 +- .../lib/Drupal/field/Tests/BulkDeleteTest.php | 4 +- .../field/lib/Drupal/field/Tests/CrudTest.php | 6 +- .../lib/Drupal/field/Tests/DisplayApiTest.php | 6 +- .../lib/Drupal/field/Tests/FieldAccessTest.php | 2 +- .../Drupal/field/Tests/FieldAttachOtherTest.php | 2 +- .../Drupal/field/Tests/FieldAttachStorageTest.php | 8 +- .../field/lib/Drupal/field/Tests/FieldInfoTest.php | 16 +- .../Drupal/field/Tests/FieldInstanceCrudTest.php | 6 +- .../lib/Drupal/field/Tests/FieldUnitTestBase.php | 2 +- .../field/lib/Drupal/field/Tests/FormTest.php | 38 ++--- .../lib/Drupal/field/Tests/NestedFormTest.php | 6 +- .../field/lib/Drupal/field/Tests/ShapeItemTest.php | 2 +- .../field/lib/Drupal/field/Tests/TestItemTest.php | 2 +- .../lib/Drupal/field/Tests/TranslationTest.php | 4 +- .../lib/Drupal/field/Tests/TranslationWebTest.php | 2 +- .../lib/Drupal/field/Tests/Views/ApiDataTest.php | 18 +- .../lib/Drupal/field/Tests/Views/FieldTestBase.php | 2 +- .../Drupal/field/Tests/reEnableModuleFieldTest.php | 2 +- ...e.entity_test.entity_test.field_test_import.yml | 2 +- ...entity_test.entity_test.field_test_import_2.yml | 2 +- ...entity_test.test_bundle.field_test_import_2.yml | 2 +- ..._test.entity_test.field_test_import_staging.yml | 2 +- ...est.test_bundle.field_test_import_staging_2.yml | 2 +- ...t.test_bundle_2.field_test_import_staging_2.yml | 2 +- .../test_views/views.view.test_view_fieldapi.yml | 2 +- .../field_sql_storage/field_sql_storage.install | 10 +- .../field_sql_storage/field_sql_storage.module | 34 ++-- .../Tests/FieldSqlStorageTest.php | 10 +- .../Drupal/field_ui/Access/FormModeAccessCheck.php | 2 +- .../Drupal/field_ui/Access/ViewModeAccessCheck.php | 2 +- .../lib/Drupal/field_ui/DisplayOverviewBase.php | 2 +- .../field_ui/lib/Drupal/field_ui/FieldOverview.php | 6 +- .../lib/Drupal/field_ui/Form/FieldEditForm.php | 2 +- .../Drupal/field_ui/Form/FieldInstanceEditForm.php | 6 +- .../Drupal/field_ui/Routing/RouteSubscriber.php | 2 +- .../lib/Drupal/field_ui/Tests/ManageFieldsTest.php | 12 +- core/modules/file/config/views.view.files.yml | 2 +- core/modules/file/file.module | 2 +- core/modules/file/file.views.inc | 4 +- core/modules/file/lib/Drupal/file/Entity/File.php | 2 +- .../file/lib/Drupal/file/FileStorageController.php | 4 +- .../lib/Drupal/file/Plugin/views/wizard/File.php | 2 +- .../lib/Drupal/file/Tests/FileFieldTestBase.php | 4 +- .../file/lib/Drupal/file/Tests/FileItemTest.php | 2 +- .../test_views/views.view.file_extension_view.yml | 2 +- core/modules/filter/filter.routing.yml | 2 +- .../lib/Drupal/filter/Entity/FilterFormat.php | 2 +- .../lib/Drupal/filter/Tests/FilterSettingsTest.php | 2 +- core/modules/forum/forum.install | 2 +- core/modules/forum/forum.module | 4 +- .../forum/Plugin/Block/ActiveTopicsBlock.php | 2 +- .../Drupal/forum/Plugin/Block/NewTopicsBlock.php | 2 +- .../test_views/views.view.test_forum_index.yml | 2 +- .../lib/Drupal/hal/Normalizer/EntityNormalizer.php | 4 +- .../lib/Drupal/hal/Tests/NormalizerTestBase.php | 6 +- core/modules/image/image.views.inc | 4 +- .../image/lib/Drupal/image/Entity/ImageStyle.php | 6 +- .../image/Tests/ImageFieldDefaultImagesTest.php | 4 +- .../lib/Drupal/image/Tests/ImageFieldTestBase.php | 2 +- .../image/lib/Drupal/image/Tests/ImageItemTest.php | 2 +- core/modules/language/language.admin.inc | 4 +- core/modules/language/language.module | 4 +- .../lib/Drupal/language/Entity/Language.php | 2 +- .../language_elements_test.module | 2 +- .../link/lib/Drupal/link/Tests/LinkFieldTest.php | 8 +- .../link/lib/Drupal/link/Tests/LinkItemTest.php | 2 +- .../menu/lib/Drupal/menu/MenuFormController.php | 2 +- .../lib/Drupal/menu_link/Entity/MenuLink.php | 2 +- .../Drupal/menu_link/MenuLinkStorageController.php | 6 +- core/modules/node/config/views.view.content.yml | 2 +- core/modules/node/config/views.view.frontpage.yml | 2 +- core/modules/node/lib/Drupal/node/Entity/Node.php | 2 +- .../node/lib/Drupal/node/Entity/NodeType.php | 2 +- .../lib/Drupal/node/NodeTypeFormController.php | 2 +- .../lib/Drupal/node/Plugin/views/wizard/Node.php | 8 +- .../node/Plugin/views/wizard/NodeRevision.php | 2 +- .../Tests/MultiStepNodeFormBasicOptionsTest.php | 2 +- .../lib/Drupal/node/Tests/NodeAccessFieldTest.php | 2 +- .../node/lib/Drupal/node/Tests/PagePreviewTest.php | 2 +- core/modules/node/node.api.php | 2 +- core/modules/node/node.module | 10 +- core/modules/node/node.routing.yml | 2 +- core/modules/node/node.views_execution.inc | 2 +- .../node_access_test_language.module | 2 +- .../test_views/views.view.test_field_type.yml | 2 +- .../views.view.test_filter_node_uid_revision.yml | 2 +- .../test_views/views.view.test_node_bulk_form.yml | 2 +- .../views.view.test_node_revision_nid.yml | 2 +- .../views.view.test_node_revision_vid.yml | 2 +- .../test_views/views.view.test_node_row_plugin.yml | 2 +- .../test_views/views.view.test_node_view.yml | 2 +- .../test_views/views.view.test_status_extra.yml | 2 +- .../lib/Drupal/number/Tests/NumberFieldTest.php | 2 +- .../lib/Drupal/number/Tests/NumberItemTest.php | 2 +- .../options/Tests/OptionsDynamicValuesTest.php | 2 +- .../lib/Drupal/options/Tests/OptionsFieldTest.php | 2 +- .../Drupal/options/Tests/OptionsFieldUITest.php | 2 +- .../options/Tests/OptionsFieldUnitTestBase.php | 2 +- .../Drupal/options/Tests/OptionsWidgetsTest.php | 12 +- core/modules/options/options.module | 2 +- .../lib/Drupal/picture/Entity/PictureMapping.php | 2 +- .../Drupal/rdf/Tests/Field/FieldRdfaTestBase.php | 2 +- .../rdf/Tests/TaxonomyTermFieldAttributesTest.php | 2 +- core/modules/rdf/rdf.module | 2 +- .../rest/LinkManager/RelationLinkManager.php | 4 +- .../Drupal/rest/LinkManager/TypeLinkManager.php | 8 +- .../rest/LinkManager/TypeLinkManagerInterface.php | 2 +- .../rest/Plugin/Derivative/EntityDerivative.php | 2 +- .../rest/Plugin/rest/resource/EntityResource.php | 10 +- .../views.view.test_serializer_display_entity.yml | 2 +- .../views.view.test_serializer_display_field.yml | 2 +- .../Drupal/search/Plugin/views/argument/Search.php | 2 +- .../Drupal/search/Plugin/views/filter/Search.php | 2 +- .../serialization/Tests/EntityResolverTest.php | 2 +- .../serialization/Tests/NormalizerTestBase.php | 2 +- .../lib/Drupal/shortcut/Entity/ShortcutSet.php | 2 +- .../simpletest/Tests/DrupalUnitTestBaseTest.php | 2 +- .../views.view.test_statistics_integration.yml | 2 +- .../system/lib/Drupal/system/Entity/Action.php | 2 +- .../system/lib/Drupal/system/Entity/DateFormat.php | 2 +- .../lib/Drupal/system/Tests/Ajax/MultiFormTest.php | 2 +- .../Drupal/system/Tests/Entity/EntityApiTest.php | 12 +- .../Tests/Entity/EntityFieldDefaultValueTest.php | 4 +- .../Drupal/system/Tests/Entity/EntityFieldTest.php | 188 ++++++++++----------- .../Drupal/system/Tests/Entity/EntityFormTest.php | 10 +- .../Tests/Entity/EntityQueryAggregateTest.php | 2 +- .../Tests/Entity/EntityQueryRelationshipTest.php | 2 +- .../Drupal/system/Tests/Entity/EntityQueryTest.php | 4 +- .../system/Tests/Entity/EntityRevisionsTest.php | 16 +- .../system/Tests/Entity/EntityTranslationTest.php | 84 ++++----- .../system/Tests/Form/ArbitraryRebuildTest.php | 2 +- .../lib/Drupal/system/Tests/Form/RebuildTest.php | 2 +- .../Drupal/system/Tests/Module/ModuleTestBase.php | 4 +- .../system/Tests/Upgrade/FieldUpgradePathTest.php | 2 +- core/modules/system/system.api.php | 2 +- .../tests/modules/entity_test/entity_test.install | 2 +- .../tests/modules/entity_test/entity_test.module | 2 +- .../lib/Drupal/entity_test/Entity/EntityTest.php | 2 +- .../Drupal/entity_test/Entity/EntityTestCache.php | 2 +- .../entity_test/Entity/EntityTestDefaultAccess.php | 2 +- .../Drupal/entity_test/Entity/EntityTestLabel.php | 2 +- .../entity_test/Entity/EntityTestLabelCallback.php | 2 +- .../Drupal/entity_test/Entity/EntityTestMul.php | 2 +- .../Drupal/entity_test/Entity/EntityTestMulRev.php | 2 +- .../entity_test/Entity/EntityTestNoLabel.php | 2 +- .../Drupal/entity_test/Entity/EntityTestRender.php | 2 +- .../Drupal/entity_test/Entity/EntityTestRev.php | 2 +- .../entity_test/EntityTestFormController.php | 6 +- .../tests/upgrade/drupal-7.field.database.php | 22 +-- .../tests/upgrade/drupal-7.language.database.php | 20 +-- .../taxonomy/lib/Drupal/taxonomy/Entity/Term.php | 2 +- .../lib/Drupal/taxonomy/Entity/Vocabulary.php | 2 +- .../Plugin/views/field/TaxonomyIndexTid.php | 4 +- .../Plugin/views/filter/TaxonomyIndexTidDepth.php | 4 +- .../taxonomy/Plugin/views/wizard/TaxonomyTerm.php | 2 +- .../taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php | 4 +- .../taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php | 2 +- .../Tests/TaxonomyTermReferenceItemTest.php | 2 +- .../Tests/TermFieldMultipleVocabularyTest.php | 2 +- .../lib/Drupal/taxonomy/Tests/TermFieldTest.php | 2 +- .../lib/Drupal/taxonomy/Tests/TermIndexTest.php | 4 +- .../lib/Drupal/taxonomy/Tests/TermTest.php | 6 +- .../lib/Drupal/taxonomy/Tests/TokenReplaceTest.php | 2 +- .../taxonomy/Tests/Views/TaxonomyTestBase.php | 2 +- .../Drupal/taxonomy/Tests/VocabularyUnitTest.php | 4 +- .../Drupal/taxonomy/VocabularyFormController.php | 2 +- core/modules/taxonomy/taxonomy.module | 2 +- core/modules/taxonomy/taxonomy.views.inc | 4 +- .../views.view.test_filter_taxonomy_index_tid.yml | 2 +- .../test_views/views.view.test_groupwise_term.yml | 2 +- .../views.view.test_taxonomy_node_term_data.yml | 2 +- .../Drupal/telephone/Tests/TelephoneFieldTest.php | 2 +- .../Drupal/telephone/Tests/TelephoneItemTest.php | 2 +- .../text/Tests/Formatter/TextPlainUnitTest.php | 4 +- .../text/lib/Drupal/text/Tests/TextFieldTest.php | 6 +- .../views.view.test_tracker_user_uid.yml | 2 +- core/modules/tracker/tracker.pages.inc | 4 +- .../user/config/views.view.user_admin_people.yml | 2 +- core/modules/user/lib/Drupal/user/Entity/Role.php | 2 +- core/modules/user/lib/Drupal/user/Entity/User.php | 2 +- .../entity_reference/selection/UserSelection.php | 2 +- .../lib/Drupal/user/Plugin/views/wizard/Users.php | 2 +- .../user/lib/Drupal/user/Tests/UserCreateTest.php | 2 +- .../lib/Drupal/user/Tests/UserRegistrationTest.php | 2 +- .../test_views/views.view.test_access_perm.yml | 2 +- .../test_views/views.view.test_access_role.yml | 2 +- .../views.view.test_field_permission.yml | 2 +- .../views.view.test_filter_permission.yml | 2 +- .../test_views/views.view.test_groupwise_user.yml | 2 +- ...w.test_plugin_argument_default_current_user.yml | 2 +- .../test_views/views.view.test_user_bulk_form.yml | 2 +- .../test_views/views.view.test_user_data.yml | 2 +- .../test_views/views.view.test_user_name.yml | 2 +- .../views.view.test_user_relationship.yml | 2 +- .../views.view.test_user_uid_argument.yml | 2 +- ...views.view.test_view_argument_validate_user.yml | 2 +- .../views.view.test_views_handler_field_role.yml | 2 +- ...ews.view.test_views_handler_field_user_name.yml | 2 +- core/modules/user/user.install | 10 +- core/modules/views/config/schema/views.schema.yml | 2 +- core/modules/views/config/views.view.archive.yml | 2 +- core/modules/views/config/views.view.backlinks.yml | 2 +- .../views/config/views.view.comments_recent.yml | 2 +- core/modules/views/config/views.view.glossary.yml | 2 +- .../views/config/views.view.taxonomy_term.yml | 2 +- core/modules/views/config/views.view.tracker.yml | 2 +- .../modules/views/lib/Drupal/views/Entity/View.php | 4 +- .../views/lib/Drupal/views/ManyToOneHelper.php | 2 +- .../Plugin/Derivative/DefaultWizardDeriver.php | 2 +- .../views/Plugin/Derivative/ViewsEntityRow.php | 6 +- .../entity_reference/selection/ViewsSelection.php | 2 +- .../lib/Drupal/views/Plugin/views/HandlerBase.php | 4 +- .../lib/Drupal/views/Plugin/views/area/Entity.php | 2 +- .../Plugin/views/argument/ArgumentPluginBase.php | 2 +- .../Plugin/views/display/DisplayPluginBase.php | 18 +- .../lib/Drupal/views/Plugin/views/display/Feed.php | 2 +- .../views/Plugin/views/field/FieldPluginBase.php | 4 +- .../lib/Drupal/views/Plugin/views/query/Sql.php | 58 +++---- .../Plugin/views/relationship/GroupwiseMax.php | 2 +- .../Drupal/views/Plugin/views/row/EntityRow.php | 4 +- .../views/Plugin/views/wizard/WizardPluginBase.php | 54 +++--- .../lib/Drupal/views/Tests/DefaultViewsTest.php | 2 +- .../Drupal/views/Tests/Handler/AreaEntityTest.php | 4 +- .../Drupal/views/Tests/Handler/HandlerAllTest.php | 2 +- .../lib/Drupal/views/Tests/ViewExecutableTest.php | 2 +- .../lib/Drupal/views/Tests/ViewStorageTest.php | 6 +- .../Drupal/views/Tests/Wizard/TaggedWithTest.php | 2 +- .../Tests/Wizard/WizardPluginBaseUnitTest.php | 4 +- .../views/lib/Drupal/views/ViewExecutable.php | 4 +- .../views/lib/Drupal/views/ViewsDataHelper.php | 6 +- .../test_views/views.view.test_access_none.yml | 2 +- .../test_views/views.view.test_aggregate_count.yml | 2 +- .../test_views/views.view.test_alias.yml | 2 +- .../test_views/views.view.test_area_title.yml | 2 +- .../test_views/views.view.test_argument_date.yml | 2 +- ...ews.view.test_argument_default_current_user.yml | 2 +- .../views.view.test_argument_default_fixed.yml | 2 +- .../test_views/views.view.test_attachment_ui.yml | 2 +- .../test_views/views.view.test_cache.yml | 2 +- .../test_views/views.view.test_click_sort.yml | 2 +- .../test_views/views.view.test_destroy.yml | 2 +- .../test_views/views.view.test_display.yml | 2 +- .../views.view.test_display_attachment.yml | 2 +- .../views.view.test_display_defaults.yml | 2 +- .../test_views/views.view.test_display_invalid.yml | 2 +- .../test_views/views.view.test_display_more.yml | 2 +- .../test_views/views.view.test_dropbutton.yml | 2 +- .../test_views/views.view.test_entity_area.yml | 2 +- .../test_views/views.view.test_entity_row.yml | 2 +- .../views.view.test_entity_type_filter.yml | 2 +- .../test_views/views.view.test_example_area.yml | 2 +- .../views.view.test_executable_displays.yml | 2 +- .../views.view.test_exposed_admin_ui.yml | 2 +- .../test_views/views.view.test_exposed_block.yml | 2 +- .../test_views/views.view.test_exposed_form.yml | 2 +- .../test_views/views.view.test_feed_display.yml | 2 +- .../test_views/views.view.test_field_classes.yml | 2 +- .../views.view.test_field_get_entity.yml | 2 +- .../test_views/views.view.test_field_output.yml | 2 +- .../test_views/views.view.test_field_tokens.yml | 2 +- .../test_views/views.view.test_field_type.yml | 2 +- .../test_views/views.view.test_filter.yml | 2 +- .../views.view.test_filter_date_between.yml | 2 +- .../views.view.test_filter_group_override.yml | 2 +- .../test_views/views.view.test_filter_groups.yml | 2 +- .../views.view.test_filter_in_operator_ui.yml | 2 +- .../views.view.test_get_attach_displays.yml | 2 +- .../test_views/views.view.test_glossary.yml | 2 +- .../test_views/views.view.test_grid.yml | 2 +- .../test_views/views.view.test_group_by_count.yml | 2 +- .../views.view.test_group_by_in_filters.yml | 2 +- .../views.view.test_handler_relationships.yml | 2 +- .../views.view.test_handler_test_access.yml | 2 +- .../test_views/views.view.test_history.yml | 2 +- .../views.view.test_http_status_code.yml | 2 +- .../test_views/views.view.test_mini_pager.yml | 2 +- .../test_views/views.view.test_page_display.yml | 2 +- .../views.view.test_page_display_arguments.yml | 2 +- .../views.view.test_page_display_menu.yml | 2 +- .../views.view.test_page_display_route.yml | 2 +- .../test_views/views.view.test_page_view.yml | 2 +- .../test_views/views.view.test_pager_full.yml | 2 +- .../test_views/views.view.test_pager_none.yml | 2 +- .../test_views/views.view.test_pager_some.yml | 2 +- .../test_views/views.view.test_preview.yml | 2 +- .../test_views/views.view.test_redirect_view.yml | 2 +- .../test_views/views.view.test_reset_button.yml | 2 +- .../test_views/views.view.test_simple_argument.yml | 2 +- .../views.view.test_store_pager_settings.yml | 2 +- .../test_views/views.view.test_style_mapping.yml | 2 +- .../test_views/views.view.test_table.yml | 2 +- .../test_views/views.view.test_tokens.yml | 2 +- .../test_views/views.view.test_view.yml | 2 +- ...ws.view.test_view_argument_validate_numeric.yml | 2 +- .../views.view.test_view_argument_validate_php.yml | 2 +- .../test_views/views.view.test_view_delete.yml | 2 +- .../views.view.test_view_display_template.yml | 2 +- .../test_views/views.view.test_view_empty.yml | 2 +- .../views.view.test_view_handler_weight.yml | 2 +- ...ew.test_view_pager_full_zero_items_per_page.yml | 2 +- .../test_views/views.view.test_view_render.yml | 2 +- .../test_views/views.view.test_view_status.yml | 2 +- .../test_views/views.view.test_view_storage.yml | 2 +- .../views.view.test_views_groupby_save.yml | 2 +- .../test_views/views.view.test_access_static.yml | 2 +- core/modules/views/views.module | 2 +- core/modules/views/views.tokens.inc | 2 +- core/modules/views/views.views.inc | 2 +- .../views_ui/Controller/ViewsUIController.php | 2 +- .../lib/Drupal/views_ui/Form/Ajax/ConfigItem.php | 2 +- .../lib/Drupal/views_ui/Form/Ajax/EditDetails.php | 4 +- .../lib/Drupal/views_ui/ViewEditFormController.php | 4 +- .../field.instance.node.article.field_image.yml | 2 +- .../field.instance.node.article.field_tags.yml | 2 +- core/scripts/generate-d7-content.sh | 6 +- .../Entity/Enhancer/EntityRouteEnhancerTest.php | 2 +- 420 files changed, 943 insertions(+), 943 deletions(-) diff --git a/core/includes/entity.api.php b/core/includes/entity.api.php index 8e60f00..52cc380 100644 --- a/core/includes/entity.api.php +++ b/core/includes/entity.api.php @@ -26,7 +26,7 @@ function hook_entity_info(&$entity_info) { // Add a form controller for a custom node form without overriding the default // node form. To override the default node form, use hook_entity_info_alter() - // to alter $entity_info['node']['controllers']['form']['default']. + // to alter $entityInfo['node']['controllers']['form']['default']. $entity_info['node']['controllers']['form']['mymodule_foo'] = 'Drupal\mymodule\NodeFooFormController'; } @@ -476,13 +476,13 @@ function hook_entity_view_mode_alter(&$view_mode, Drupal\Core\Entity\EntityInter * components. * @param array $context * An associative array containing: - * - entity_type: The entity type, e.g., 'node' or 'user'. + * - entityType: The entity type, e.g., 'node' or 'user'. * - bundle: The bundle, e.g., 'page' or 'article'. * - view_mode: The view mode, e.g. 'full', 'teaser'... */ function hook_entity_display_alter(\Drupal\entity\Entity\EntityDisplay $display, array $context) { // Leave field labels out of the search index. - if ($context['entity_type'] == 'node' && $context['view_mode'] == 'search_index') { + if ($context['entityType'] == 'node' && $context['view_mode'] == 'search_index') { foreach ($display->getComponents() as $name => $options) { if (isset($options['label'])) { $options['label'] = 'hidden'; @@ -525,13 +525,13 @@ function hook_entity_prepare_form(\Drupal\Core\Entity\EntityInterface $entity, $ * components. * @param array $context * An associative array containing: - * - entity_type: The entity type, e.g., 'node' or 'user'. + * - entityType: The entity type, e.g., 'node' or 'user'. * - bundle: The bundle, e.g., 'page' or 'article'. * - form_mode: The form mode, e.g. 'default', 'profile', 'register'... */ function hook_entity_form_display_alter(\Drupal\entity\Entity\EntityFormDisplay $form_display, array $context) { // Hide the 'user_picture' field from the register form. - if ($context['entity_type'] == 'user' && $context['form_mode'] == 'register') { + if ($context['entityType'] == 'user' && $context['form_mode'] == 'register') { $form_display->setComponent('user_picture', array( 'type' => 'hidden', )); diff --git a/core/includes/entity.inc b/core/includes/entity.inc index 8071a0d..36f772b 100644 --- a/core/includes/entity.inc +++ b/core/includes/entity.inc @@ -19,7 +19,7 @@ * * @return array * An array containing the entity type's definition, as retrieved with - * \Drupal\Core\Entity\EntityManager. If $entity_type is NULL, an associative + * \Drupal\Core\Entity\EntityManager. If $entityType is NULL, an associative * array of all entity type definitions keyed by entity type is returned. * * @see \Drupal\Core\Entity\EntityManager @@ -73,7 +73,7 @@ function entity_get_bundles($entity_type = NULL) { } } drupal_alter('entity_bundle_info', $bundles); - cache()->set("entity_bundle_info:$langcode", $bundles, CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE)); + cache()->set("entity_bundle_info:$langcode", $bundles, CacheBackendInterface::CACHE_PERMANENT, array('entityInfo' => TRUE)); } } @@ -129,7 +129,7 @@ function entity_get_form_modes($entity_type = NULL) { $form_modes[$form_mode_entity_type][$form_mode_name] = (array) $form_mode; } drupal_alter('entity_form_mode_info', $form_modes); - cache()->set("entity_form_mode_info:$langcode", $form_modes, CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE)); + cache()->set("entity_form_mode_info:$langcode", $form_modes, CacheBackendInterface::CACHE_PERMANENT, array('entityInfo' => TRUE)); } } @@ -167,7 +167,7 @@ function entity_get_view_modes($entity_type = NULL) { $view_modes[$view_mode_entity_type][$view_mode_name] = (array) $view_mode; } drupal_alter('entity_view_mode_info', $view_modes); - cache()->set("entity_view_mode_info:$langcode", $view_modes, CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE)); + cache()->set("entity_view_mode_info:$langcode", $view_modes, CacheBackendInterface::CACHE_PERMANENT, array('entityInfo' => TRUE)); } } diff --git a/core/lib/Drupal/Core/Entity/Annotation/EntityType.php b/core/lib/Drupal/Core/Entity/Annotation/EntityType.php index 0bf08f0..f57c3c6 100644 --- a/core/lib/Drupal/Core/Entity/Annotation/EntityType.php +++ b/core/lib/Drupal/Core/Entity/Annotation/EntityType.php @@ -301,11 +301,11 @@ class EntityType extends Plugin { /** * Specifies whether a module exposing permissions for the current entity type * should use entity-type level granularity, bundle level granularity or just - * skip this entity. The allowed values are respectively "entity_type", + * skip this entity. The allowed values are respectively "entityType", * "bundle" or FALSE. * * @var string|bool (optional) */ - public $permission_granularity = 'entity_type'; + public $permission_granularity = 'entityType'; } diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php index ea370cf..08b8b19 100644 --- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php +++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php @@ -274,7 +274,7 @@ protected function buildPropertyQuery(QueryInterface $entity_query, array $value * A SelectQuery object for loading the entity. */ protected function buildQuery($ids, $revision_id = FALSE) { - $query = $this->database->select($this->entityInfo['base_table'], 'base'); + $query = $this->database->select($this->entityInfo['baseTable'], 'base'); $query->addTag($this->entityType . '_load_multiple'); @@ -286,7 +286,7 @@ protected function buildQuery($ids, $revision_id = FALSE) { } // Add fields from the {entity} table. - $entity_fields = drupal_schema_fields_sql($this->entityInfo['base_table']); + $entity_fields = drupal_schema_fields_sql($this->entityInfo['baseTable']); if ($this->revisionKey) { // Add all fields from the {entity_revision} table. @@ -400,7 +400,7 @@ public function delete(array $entities) { } $ids = array_keys($entities); - $this->database->delete($this->entityInfo['base_table']) + $this->database->delete($this->entityInfo['baseTable']) ->condition($this->idKey, $ids, 'IN') ->execute(); @@ -445,7 +445,7 @@ public function save(EntityInterface $entity) { if (!$entity->isNew()) { if ($entity->isDefaultRevision()) { - $return = drupal_write_record($this->entityInfo['base_table'], $entity, $this->idKey); + $return = drupal_write_record($this->entityInfo['baseTable'], $entity, $this->idKey); } else { // @todo, should a different value be returned when saving an entity @@ -461,7 +461,7 @@ public function save(EntityInterface $entity) { $this->invokeHook('update', $entity); } else { - $return = drupal_write_record($this->entityInfo['base_table'], $entity); + $return = drupal_write_record($this->entityInfo['baseTable'], $entity); if ($this->revisionKey) { $this->saveRevision($entity); } @@ -513,7 +513,7 @@ protected function saveRevision(EntityInterface $entity) { if ($entity->isNewRevision()) { drupal_write_record($this->revisionTable, $record); if ($entity->isDefaultRevision()) { - $this->database->update($this->entityInfo['base_table']) + $this->database->update($this->entityInfo['baseTable']) ->fields(array($this->revisionKey => $record[$this->revisionKey])) ->condition($this->idKey, $entity->id()) ->execute(); diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php index ad361d7..68ce6af 100644 --- a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php +++ b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php @@ -165,7 +165,7 @@ protected function buildPropertyQuery(QueryInterface $entity_query, array $value * {@inheritdoc} */ protected function buildQuery($ids, $revision_id = FALSE) { - $query = $this->database->select($this->entityInfo['base_table'], 'base'); + $query = $this->database->select($this->entityInfo['baseTable'], 'base'); $is_revision_query = $this->revisionKey && ($revision_id || !$this->dataTable); $query->addTag($this->entityType . '_load_multiple'); @@ -178,7 +178,7 @@ protected function buildQuery($ids, $revision_id = FALSE) { } // Add fields from the {entity} table. - $entity_fields = drupal_schema_fields_sql($this->entityInfo['base_table']); + $entity_fields = drupal_schema_fields_sql($this->entityInfo['baseTable']); if ($is_revision_query) { // Add all fields from the {entity_revision} table. @@ -290,7 +290,7 @@ protected function attachPropertyData(array &$entities, $revision_id = FALSE) { $field_definition = \Drupal::entityManager()->getFieldDefinitions($this->entityType); $translations = array(); if ($this->revisionTable) { - $data_fields = array_flip(array_diff(drupal_schema_fields_sql($this->entityInfo['revision_table']), drupal_schema_fields_sql($this->entityInfo['base_table']))); + $data_fields = array_flip(array_diff(drupal_schema_fields_sql($this->entityInfo['revision_table']), drupal_schema_fields_sql($this->entityInfo['baseTable']))); } else { $data_fields = array_flip(drupal_schema_fields_sql($this->entityInfo['data_table'])); @@ -351,7 +351,7 @@ public function save(EntityInterface $entity) { if (!$entity->isNew()) { if ($entity->isDefaultRevision()) { - $return = drupal_write_record($this->entityInfo['base_table'], $record, $this->idKey); + $return = drupal_write_record($this->entityInfo['baseTable'], $record, $this->idKey); } else { // @todo, should a different value be returned when saving an entity @@ -373,7 +373,7 @@ public function save(EntityInterface $entity) { } } else { - $return = drupal_write_record($this->entityInfo['base_table'], $record); + $return = drupal_write_record($this->entityInfo['baseTable'], $record); $entity->{$this->idKey}->value = $record->{$this->idKey}; if ($this->revisionKey) { $record->{$this->revisionKey} = $this->saveRevision($entity); @@ -444,7 +444,7 @@ protected function saveRevision(EntityInterface $entity) { if ($entity->isNewRevision()) { drupal_write_record($this->revisionTable, $record); if ($entity->isDefaultRevision()) { - $this->database->update($this->entityInfo['base_table']) + $this->database->update($this->entityInfo['baseTable']) ->fields(array($this->revisionKey => $record->{$this->revisionKey})) ->condition($this->idKey, $record->{$this->idKey}) ->execute(); @@ -500,7 +500,7 @@ protected function savePropertyData(EntityInterface $entity) { */ protected function mapToStorageRecord(EntityInterface $entity) { $record = new \stdClass(); - foreach (drupal_schema_fields_sql($this->entityInfo['base_table']) as $name) { + foreach (drupal_schema_fields_sql($this->entityInfo['baseTable']) as $name) { $record->$name = $entity->$name->value; } return $record; @@ -581,7 +581,7 @@ public function delete(array $entities) { } $ids = array_keys($entities); - $this->database->delete($this->entityInfo['base_table']) + $this->database->delete($this->entityInfo['baseTable']) ->condition($this->idKey, $ids) ->execute(); diff --git a/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php index 2cf8d47..8eeabd4 100644 --- a/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php +++ b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php @@ -45,14 +45,14 @@ public function enhance(array $defaults, Request $request) { elseif (!empty($defaults['_entity_list'])) { $defaults['_controller'] = 'controller.page:content'; $defaults['_content'] = '\Drupal\Core\Entity\Controller\EntityListController::listing'; - $defaults['entity_type'] = $defaults['_entity_list']; + $defaults['entityType'] = $defaults['_entity_list']; unset($defaults['_entity_list']); } elseif (!empty($defaults['_entity_view'])) { $defaults['_controller'] = 'controller.page:content'; $defaults['_content'] = '\Drupal\Core\Entity\Controller\EntityViewController::view'; if (strpos($defaults['_entity_view'], '.') !== FALSE) { - // The _entity_view entry is of the form entity_type.view_mode. + // The _entity_view entry is of the form entityType.view_mode. list($entity_type, $view_mode) = explode('.', $defaults['_entity_view']); $defaults['view_mode'] = $view_mode; } @@ -66,7 +66,7 @@ public function enhance(array $defaults, Request $request) { $defaults['_entity'] = &$defaults[$entity_type]; } else { - // The entity is not keyed by its entity_type. Attempt to find it + // The entity is not keyed by its entityType. Attempt to find it // using a converter. $route = $defaults[RouteObjectInterface::ROUTE_OBJECT]; if ($route && is_object($route)) { @@ -75,7 +75,7 @@ public function enhance(array $defaults, Request $request) { foreach ($options['parameters'] as $name => $details) { if (!empty($details['type'])) { $type = $details['type']; - // Type is of the form entity:{entity_type}. + // Type is of the form entity:{entityType}. $parameter_entity_type = substr($type, strlen('entity:')); if ($entity_type == $parameter_entity_type) { // We have the matching entity type. Set the '_entity' key diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php index 0422c26..d2f3563 100644 --- a/core/lib/Drupal/Core/Entity/Entity.php +++ b/core/lib/Drupal/Core/Entity/Entity.php @@ -176,7 +176,7 @@ public function uri() { } // Pass the entity data to url() so that alter functions do not need to // look up this entity again. - $uri['options']['entity_type'] = $this->entityType; + $uri['options']['entityType'] = $this->entityType; $uri['options']['entity'] = $this; return $uri; } diff --git a/core/lib/Drupal/Core/Entity/EntityAccessCheck.php b/core/lib/Drupal/Core/Entity/EntityAccessCheck.php index 281fb09..541609c 100644 --- a/core/lib/Drupal/Core/Entity/EntityAccessCheck.php +++ b/core/lib/Drupal/Core/Entity/EntityAccessCheck.php @@ -28,7 +28,7 @@ public function appliesTo() { * Implements \Drupal\Core\Access\AccessCheckInterface::access(). * * The value of the '_entity_access' key must be in the pattern - * 'entity_type.operation.' The entity type must match the {entity_type} + * 'entityType.operation.' The entity type must match the {entityType} * parameter in the route pattern. This will check a node for 'update' access: * @code * pattern: '/foo/{node}/bar' diff --git a/core/lib/Drupal/Core/Entity/EntityFormController.php b/core/lib/Drupal/Core/Entity/EntityFormController.php index bc84d16..9e48217 100644 --- a/core/lib/Drupal/Core/Entity/EntityFormController.php +++ b/core/lib/Drupal/Core/Entity/EntityFormController.php @@ -131,7 +131,7 @@ protected function init(array &$form_state) { // Let modules alter the form display. $form_display_context = array( - 'entity_type' => $this->entity->entityType(), + 'entityType' => $this->entity->entityType(), 'bundle' => $this->entity->bundle(), 'form_mode' => $this->getOperation(), ); diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php index f41facf..c5f2d5c 100644 --- a/core/lib/Drupal/Core/Entity/EntityManager.php +++ b/core/lib/Drupal/Core/Entity/EntityManager.php @@ -124,9 +124,9 @@ public function __construct(\Traversable $namespaces, ContainerInterface $contai $this->translationManager = $translation_manager; $this->discovery = new AnnotatedClassDiscovery('Entity', $namespaces, $annotation_namespaces, 'Drupal\Core\Entity\Annotation\EntityType'); - $this->discovery = new InfoHookDecorator($this->discovery, 'entity_info'); - $this->discovery = new AlterDecorator($this->discovery, 'entity_info'); - $this->discovery = new CacheDecorator($this->discovery, 'entity_info:' . $this->languageManager->getLanguage(Language::TYPE_INTERFACE)->id, 'cache', CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE)); + $this->discovery = new InfoHookDecorator($this->discovery, 'entityInfo'); + $this->discovery = new AlterDecorator($this->discovery, 'entityInfo'); + $this->discovery = new CacheDecorator($this->discovery, 'entityInfo:' . $this->languageManager->getLanguage(Language::TYPE_INTERFACE)->id, 'cache', CacheBackendInterface::CACHE_PERMANENT, array('entityInfo' => TRUE)); $this->factory = new DefaultFactory($this->discovery); $this->container = $container; @@ -421,7 +421,7 @@ public function getFieldDefinitions($entity_type, $bundle = NULL) { foreach ($this->entityFieldInfo[$entity_type]['optional'] as &$definition) { $definition['list'] = TRUE; } - $this->cache->set($cid, $this->entityFieldInfo[$entity_type], CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE, 'entity_field_info' => TRUE)); + $this->cache->set($cid, $this->entityFieldInfo[$entity_type], CacheBackendInterface::CACHE_PERMANENT, array('entityInfo' => TRUE, 'entity_field_info' => TRUE)); } } diff --git a/core/lib/Drupal/Core/Entity/EntityNG.php b/core/lib/Drupal/Core/Entity/EntityNG.php index ac975d1..ad70f8f 100644 --- a/core/lib/Drupal/Core/Entity/EntityNG.php +++ b/core/lib/Drupal/Core/Entity/EntityNG.php @@ -235,7 +235,7 @@ public function uri($rel = 'canonical') { // Pass the entity data to url() so that alter functions do not need to // look up this entity again. - $uri['options']['entity_type'] = $this->entityType; + $uri['options']['entityType'] = $this->entityType; $uri['options']['entity'] = $this; return $uri; } diff --git a/core/lib/Drupal/Core/Entity/EntityRenderController.php b/core/lib/Drupal/Core/Entity/EntityRenderController.php index 860c044..fea0059 100644 --- a/core/lib/Drupal/Core/Entity/EntityRenderController.php +++ b/core/lib/Drupal/Core/Entity/EntityRenderController.php @@ -119,7 +119,7 @@ public function viewMultiple(array $entities = array(), $view_mode = 'full', $la // Let modules alter the display. $display_context = array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'bundle' => $bundle, 'view_mode' => $entity_view_mode, ); diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php index 4abe86e..1755ebb 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php +++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/Deriver/EntityDeriver.php @@ -87,7 +87,7 @@ public function getDerivativeDefinitions(array $base_plugin_definition) { 'constraints' => array('EntityType' => $entity_type), ) + $base_plugin_definition; - // Incorporate the bundles as entity:$entity_type:$bundle, if any. + // Incorporate the bundles as entity:$entityType:$bundle, if any. foreach (entity_get_bundles($entity_type) as $bundle => $bundle_info) { if ($bundle !== $entity_type) { $this->derivatives[$entity_type . ':' . $bundle] = array( diff --git a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php index c82a3da..2110059 100644 --- a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php +++ b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php @@ -37,7 +37,7 @@ public function getEntityType(); * For example, to find all entities containing both the Turkish 'merhaba' * and the Polish 'siema' within a 'greetings' text field: * @code - * $entity_ids = Drupal::entityQuery($entity_type) + * $entity_ids = Drupal::entityQuery($entityType) * ->condition('greetings', 'merhaba', '=', 'tr'); * ->condition('greetings.value', 'siema', '=', 'pl'); * ->execute(); diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php index debc403..f5428f7 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php @@ -111,32 +111,32 @@ public function execute() { protected function prepare() { $entity_type = $this->entityType; $this->entityInfo = $this->entityManager->getDefinition($entity_type); - if (!isset($this->entityInfo['base_table'])) { + if (!isset($this->entityInfo['baseTable'])) { throw new QueryException("No base table, invalid query."); } - $base_table = $this->entityInfo['base_table']; + $base_table = $this->entityInfo['baseTable']; $simple_query = TRUE; if (isset($this->entityInfo['data_table'])) { $simple_query = FALSE; } - $this->sqlQuery = $this->connection->select($base_table, 'base_table', array('conjunction' => $this->conjunction)); - $this->sqlQuery->addMetaData('entity_type', $entity_type); + $this->sqlQuery = $this->connection->select($base_table, 'baseTable', array('conjunction' => $this->conjunction)); + $this->sqlQuery->addMetaData('entityType', $entity_type); $id_field = $this->entityInfo['entity_keys']['id']; // Add the key field for fetchAllKeyed(). if (empty($this->entityInfo['entity_keys']['revision'])) { // When there is no revision support, the key field is the entity key. - $this->sqlFields["base_table.$id_field"] = array('base_table', $id_field); + $this->sqlFields["baseTable.$id_field"] = array('baseTable', $id_field); // Now add the value column for fetchAllKeyed(). This is always the // entity id. - $this->sqlFields["base_table.$id_field" . '_1'] = array('base_table', $id_field); + $this->sqlFields["baseTable.$id_field" . '_1'] = array('baseTable', $id_field); } else { // When there is revision support, the key field is the revision key. $revision_field = $this->entityInfo['entity_keys']['revision']; - $this->sqlFields["base_table.$revision_field"] = array('base_table', $revision_field); + $this->sqlFields["baseTable.$revision_field"] = array('baseTable', $revision_field); // Now add the value column for fetchAllKeyed(). This is always the // entity id. - $this->sqlFields["base_table.$id_field"] = array('base_table', $id_field); + $this->sqlFields["baseTable.$id_field"] = array('baseTable', $id_field); } if ($this->accessCheck) { $this->sqlQuery->addTag($entity_type . '_access'); @@ -279,13 +279,13 @@ protected function result() { * * @return string * An expression that will select the given field for the given language in - * a SELECT query, such as 'base_table.id'. + * a SELECT query, such as 'baseTable.id'. */ protected function getSqlField($field, $langcode) { if (!isset($this->tables)) { $this->tables = $this->getTables($this->sqlQuery); } - $base_property = "base_table.$field"; + $base_property = "baseTable.$field"; if (isset($this->sqlFields[$base_property])) { return $base_property; } diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php index e288a21..90ee992 100644 --- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php +++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php @@ -54,7 +54,7 @@ public function __construct(SelectInterface $sql_query) { * {@inheritdoc} */ public function addField($field, $type, $langcode) { - $entity_type = $this->sqlQuery->getMetaData('entity_type'); + $entity_type = $this->sqlQuery->getMetaData('entityType'); $entity_manager = \Drupal::entityManager(); $field_info = FieldInfo::fieldInfo(); $age = $this->sqlQuery->getMetaData('age'); @@ -67,7 +67,7 @@ public function addField($field, $type, $langcode) { // while the third will be 'node_reference.nid.tags'. $index_prefix = ''; $specifiers = explode('.', $field); - $base_table = 'base_table'; + $base_table = 'baseTable'; $count = count($specifiers) - 1; // This will contain the definitions of the last specifier seen by the // system. @@ -174,7 +174,7 @@ public function addField($field, $type, $langcode) { $this->sqlQuery->addMetaData('simple_query', FALSE); $entity_tables[$entity_info['data_table']] = drupal_get_schema($entity_info['data_table']); } - $entity_tables[$entity_info['base_table']] = drupal_get_schema($entity_info['base_table']); + $entity_tables[$entity_info['baseTable']] = drupal_get_schema($entity_info['baseTable']); $sql_column = $specifier; $table = $this->ensureEntityTable($index_prefix, $specifier, $type, $langcode, $base_table, $entity_id_field, $entity_tables); } @@ -207,7 +207,7 @@ public function addField($field, $type, $langcode) { $entity_info = $entity_manager->getDefinition($entity_type); // Add the new entity base table using the table and sql column. $join_condition= '%alias.' . $entity_info['entity_keys']['id'] . " = $table.$sql_column"; - $base_table = $this->sqlQuery->leftJoin($entity_info['base_table'], NULL, $join_condition); + $base_table = $this->sqlQuery->leftJoin($entity_info['baseTable'], NULL, $join_condition); $propertyDefinitions = array(); $key++; $index_prefix .= "$next_index_prefix."; @@ -254,8 +254,8 @@ protected function ensureFieldTable($index_prefix, &$field, $type, $langcode, $b if ($field['cardinality'] != 1) { $this->sqlQuery->addMetaData('simple_query', FALSE); } - $entity_type = $this->sqlQuery->getMetaData('entity_type'); - $this->fieldTables[$index_prefix . $field_name] = $this->addJoin($type, $table, "%alias.$field_id_field = $base_table.$entity_id_field AND %alias.entity_type = '$entity_type'", $langcode); + $entity_type = $this->sqlQuery->getMetaData('entityType'); + $this->fieldTables[$index_prefix . $field_name] = $this->addJoin($type, $table, "%alias.$field_id_field = $base_table.$entity_id_field AND %alias.entityType = '$entity_type'", $langcode); } return $this->fieldTables[$index_prefix . $field_name]; } diff --git a/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php b/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php index 78553d9..9ffca67 100644 --- a/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php +++ b/core/lib/Drupal/Core/Extension/UpdateModuleHandler.php @@ -42,7 +42,7 @@ public function getImplementations($hook) { // This is called during rebuild to find testing themes. case 'system_theme_info': // Those are needed by user_access() to check access on update.php. - case 'entity_info': + case 'entityInfo': case 'entity_load': case 'user_role_load': return array(); diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php index 62fe1ef..8a2cca9 100644 --- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php +++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php @@ -13,7 +13,7 @@ /** * Defines an interface for generating a url from a route or system path. * - * Provides additional methods and options not present in the base interface. + * Provides additional methods and options not present in the base interface. */ interface UrlGeneratorInterface extends VersatileGeneratorInterface { @@ -67,7 +67,7 @@ * - 'script': Added to the URL between the base path and the path prefix. * Defaults to empty string when clean URLs are in effect, and to * 'index.php/' when they are not. - * - 'entity_type': The entity type of the object that called url(). Only + * - 'entityType': The entity type of the object that called url(). Only * set if url() is invoked by Drupal\Core\Entity\Entity::uri(). * - 'entity': The entity object (such as a node) for which the URL is being * generated. Only set if url() is invoked by Drupal\Core\Entity\Entity::uri(). diff --git a/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml b/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml index a16655c..a098c8d 100644 --- a/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml +++ b/core/modules/action/tests/action_bulk_test/config/views.view.test_bulk_form.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node id: test_bulk_form description: '' tag: '' diff --git a/core/modules/aggregator/config/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/views.view.aggregator_rss_feed.yml index deef238..a30e4ee 100644 --- a/core/modules/aggregator/config/views.view.aggregator_rss_feed.yml +++ b/core/modules/aggregator/config/views.view.aggregator_rss_feed.yml @@ -1,5 +1,5 @@ base_field: iid -base_table: aggregator_item +baseTable: aggregator_item core: 8.x description: '' status: '1' diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php index 610d474..88da16e 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php @@ -30,7 +30,7 @@ * "remove_items" = "Drupal\aggregator\Form\FeedItemsRemoveForm" * } * }, - * base_table = "aggregator_feed", + * baseTable = "aggregator_feed", * fieldable = TRUE, * entity_keys = { * "id" = "fid", diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php index c24ad1e..d81cf42 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php @@ -24,7 +24,7 @@ * "storage" = "Drupal\aggregator\ItemStorageController", * "render" = "Drupal\aggregator\ItemRenderController" * }, - * base_table = "aggregator_item", + * baseTable = "aggregator_item", * fieldable = TRUE, * entity_keys = { * "id" = "iid", diff --git a/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml b/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml index c4e51f7..81821ae 100644 --- a/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml +++ b/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml @@ -1,5 +1,5 @@ base_field: iid -base_table: aggregator_item +baseTable: aggregator_item core: 8.x description: '' status: '1' diff --git a/core/modules/block/block.install b/core/modules/block/block.install index 3c1755f..0ef022a 100644 --- a/core/modules/block/block.install +++ b/core/modules/block/block.install @@ -285,7 +285,7 @@ function block_update_8008() { $instance = array( 'id' => 'custom_block.basic.block_body', - 'entity_type' => 'custom_block', + 'entityType' => 'custom_block', 'bundle' => 'basic', 'label' => 'Block body', 'settings' => array('display_summary' => FALSE), diff --git a/core/modules/block/block.routing.yml b/core/modules/block/block.routing.yml index a2ca6e5..b282cd5 100644 --- a/core/modules/block/block.routing.yml +++ b/core/modules/block/block.routing.yml @@ -16,7 +16,7 @@ block_admin_display: pattern: '/admin/structure/block' defaults: _content: '\Drupal\block\Controller\BlockListController::listing' - entity_type: 'block' + entityType: 'block' requirements: _permission: 'administer blocks' diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module index 725e3e7..7df0777 100644 --- a/core/modules/block/custom_block/custom_block.module +++ b/core/modules/block/custom_block/custom_block.module @@ -216,7 +216,7 @@ function custom_block_add_body_field($block_type_id, $label = 'Block body') { if (empty($instance)) { $instance = entity_create('field_instance', array( 'field_name' => 'block_body', - 'entity_type' => 'custom_block', + 'entityType' => 'custom_block', 'bundle' => $block_type_id, 'label' => $label, 'settings' => array('display_summary' => FALSE), diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php index 06e92a5..56149a5 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php @@ -66,7 +66,7 @@ public function form(array $form, array &$form_state) { $form['language']['language_configuration'] = array( '#type' => 'language_configuration', '#entity_information' => array( - 'entity_type' => 'custom_block', + 'entityType' => 'custom_block', 'bundle' => $block_type->id(), ), '#default_value' => $language_configuration, diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php index 698c39c..8b42d60 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php @@ -34,7 +34,7 @@ * }, * "translation" = "Drupal\custom_block\CustomBlockTranslationController" * }, - * base_table = "custom_block", + * baseTable = "custom_block", * revision_table = "custom_block_revision", * route_base_path = "admin/structure/custom-blocks/manage/{bundle}", * menu_base_path = "block/%custom_block", @@ -181,7 +181,7 @@ public function uri() { return array( 'path' => 'block/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ) ); diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php index b74c1d7..3e41a4e 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php @@ -84,7 +84,7 @@ public function uri() { return array( 'path' => 'admin/structure/custom-blocks/manage/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ) ); diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php index c59b435..840f1e7 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php @@ -72,7 +72,7 @@ public function testBlockFields() { $this->field->save(); $this->instance = entity_create('field_instance', array( 'field_name' => $this->field->id(), - 'entity_type' => 'custom_block', + 'entityType' => 'custom_block', 'bundle' => 'link', 'settings' => array( 'title' => DRUPAL_OPTIONAL, diff --git a/core/modules/block/lib/Drupal/block/Entity/Block.php b/core/modules/block/lib/Drupal/block/Entity/Block.php index e465455..0d7d4d3 100644 --- a/core/modules/block/lib/Drupal/block/Entity/Block.php +++ b/core/modules/block/lib/Drupal/block/Entity/Block.php @@ -121,7 +121,7 @@ public function uri() { return array( 'path' => 'admin/structure/block/manage/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml index f4723b1..f035b07 100644 --- a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml +++ b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml @@ -1,5 +1,5 @@ base_field: id -base_table: views_test_data +baseTable: views_test_data core: 8.x description: '' status: '1' diff --git a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml index e693732..33b854b 100644 --- a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml +++ b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml @@ -1,5 +1,5 @@ base_field: id -base_table: views_test_data +baseTable: views_test_data core: 8.x description: '' status: '1' diff --git a/core/modules/book/lib/Drupal/book/BookManager.php b/core/modules/book/lib/Drupal/book/BookManager.php index 19140fa..7ab0cec 100644 --- a/core/modules/book/lib/Drupal/book/BookManager.php +++ b/core/modules/book/lib/Drupal/book/BookManager.php @@ -76,7 +76,7 @@ protected function loadBooks() { $query->orderBy('ml.weight'); $query->orderBy('ml.link_title'); $query->addTag('node_access'); - $query->addMetaData('base_table', 'book'); + $query->addMetaData('baseTable', 'book'); $book_links = $query->execute(); $nodes = $this->entityManager->getStorageController('node')->loadMultiple($nids); diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index 921abba..ea8a3b4 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -333,7 +333,7 @@ function _comment_body_field_create($info) { $instance = entity_create('field_instance', array( 'field_name' => 'comment_body', 'label' => 'Comment', - 'entity_type' => 'comment', + 'entityType' => 'comment', 'bundle' => 'comment_node_' . $info->type, 'settings' => array('text_processing' => 1), 'required' => TRUE, @@ -395,7 +395,7 @@ function comment_get_recent($number = 10) { $query = db_select('comment', 'c'); $query->innerJoin('node_field_data', 'n', 'n.nid = c.nid'); $query->addTag('node_access'); - $query->addMetaData('base_table', 'comment'); + $query->addMetaData('baseTable', 'comment'); $comments = $query ->fields('c') ->condition('c.status', COMMENT_PUBLISHED) @@ -760,7 +760,7 @@ function comment_get_thread(EntityInterface $node, $mode, $comments_per_page) { ->condition('c.nid', $node->id()) ->addTag('node_access') ->addTag('comment_filter') - ->addMetaData('base_table', 'comment') + ->addMetaData('baseTable', 'comment') ->addMetaData('node', $node) ->limit($comments_per_page); @@ -770,7 +770,7 @@ function comment_get_thread(EntityInterface $node, $mode, $comments_per_page) { ->condition('c.nid', $node->id()) ->addTag('node_access') ->addTag('comment_filter') - ->addMetaData('base_table', 'comment') + ->addMetaData('baseTable', 'comment') ->addMetaData('node', $node); if (!user_access('administer comments')) { @@ -1042,7 +1042,7 @@ function comment_translation_configuration_element_submit($form, &$form_state) { $key = 'language_configuration'; $comment_form_state = array( 'content_translation' => array('key' => $key), - 'language' => array($key => array('entity_type' => 'comment', 'bundle' => 'comment_node_' . $form_state['controller']->getEntity()->id())), + 'language' => array($key => array('entityType' => 'comment', 'bundle' => 'comment_node_' . $form_state['controller']->getEntity()->id())), 'values' => array($key => array('content_translation' => $form_state['values']['content_translation'])), ); content_translation_language_configuration_element_submit($form, $comment_form_state); diff --git a/core/modules/comment/comment.routing.yml b/core/modules/comment/comment.routing.yml index 7768cd0..69e6502 100644 --- a/core/modules/comment/comment.routing.yml +++ b/core/modules/comment/comment.routing.yml @@ -9,7 +9,7 @@ comment_approve: pattern: '/comment/{comment}/approve' defaults: _content: '\Drupal\comment\Controller\CommentController::commentApprove' - entity_type: 'comment' + entityType: 'comment' requirements: _entity_access: 'comment.approve' diff --git a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php index 59c122b..9e14990 100644 --- a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php +++ b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php @@ -32,7 +32,7 @@ * }, * "translation" = "Drupal\comment\CommentTranslationController" * }, - * base_table = "comment", + * baseTable = "comment", * uri_callback = "comment_uri", * fieldable = TRUE, * translatable = TRUE, diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php b/core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php index fff8d59..28622c5 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php @@ -45,7 +45,7 @@ public function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS') { */ public function entityQueryAlter(SelectInterface $query) { $tables = $query->getTables(); - $base_table = $tables['base_table']['alias']; + $base_table = $tables['baseTable']['alias']; // The Comment module doesn't implement any proper comment access, // and as a consequence doesn't make sure that comments cannot be viewed diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php index 410025b..20ac4de 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php @@ -21,7 +21,7 @@ * @ViewsWizard( * id = "comment", * module = "comment", - * base_table = "comment", + * baseTable = "comment", * title = @Translation("Comments") * ) */ diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml index 40c25a0..5a9ba85 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml @@ -1,5 +1,5 @@ base_field: cid -base_table: comment +baseTable: comment core: 8.x description: '' status: '1' diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml index e87ac87..ed718e0 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml @@ -1,5 +1,5 @@ base_field: cid -base_table: comment +baseTable: comment core: 8.x description: '' status: '1' diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml index d7c3f3e..06855e1 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/config/tests/config_test/config_test.routing.yml b/core/modules/config/tests/config_test/config_test.routing.yml index c26a438..4002d93 100644 --- a/core/modules/config/tests/config_test/config_test.routing.yml +++ b/core/modules/config/tests/config_test/config_test.routing.yml @@ -16,7 +16,7 @@ config_test_entity: pattern: 'admin/structure/config_test/manage/{config_test}' defaults: _controller: '\Drupal\config_test\ConfigTestController::edit' - entity_type: 'config_test' + entityType: 'config_test' requirements: _access: 'TRUE' @@ -24,7 +24,7 @@ config_test_entity_edit: pattern: 'admin/structure/config_test/manage/{config_test}/edit' defaults: _controller: '\Drupal\config_test\ConfigTestController::edit' - entity_type: 'config_test' + entityType: 'config_test' requirements: _access: 'TRUE' @@ -32,7 +32,7 @@ config_test_entity_enable: pattern: 'admin/structure/config_test/manage/{config_test}/enable' defaults: _content: '\Drupal\config_test\ConfigTestController::enable' - entity_type: 'config_test' + entityType: 'config_test' requirements: _access: 'TRUE' @@ -40,7 +40,7 @@ config_test_entity_disable: pattern: 'admin/structure/config_test/manage/{config_test}/disable' defaults: _content: '\Drupal\config_test\ConfigTestController::disable' - entity_type: 'config_test' + entityType: 'config_test' requirements: _access: 'TRUE' @@ -48,6 +48,6 @@ config_test_entity_delete: pattern: 'admin/structure/config_test/manage/{config_test}/delete' defaults: _entity_form: 'config_test.delete' - entity_type: 'config_test' + entityType: 'config_test' requirements: _access: 'TRUE' diff --git a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php b/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php index 1e835e2..f608f67 100644 --- a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php +++ b/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php @@ -47,7 +47,7 @@ protected function setUp() { entity_create('field_instance', array( 'field_name' => $this->field->id(), - 'entity_type' => 'contact_message', + 'entityType' => 'contact_message', 'bundle' => 'contact_message', ))->save(); diff --git a/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml b/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml index 341e925..b4a1c2e 100644 --- a/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml +++ b/core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml @@ -1,5 +1,5 @@ base_field: uid -base_table: users +baseTable: users core: 8.x description: '' status: '1' diff --git a/core/modules/content_translation/content_translation.install b/core/modules/content_translation/content_translation.install index bd817bc..1af5cea 100644 --- a/core/modules/content_translation/content_translation.install +++ b/core/modules/content_translation/content_translation.install @@ -14,7 +14,7 @@ function content_translation_schema() { $schema['content_translation'] = array( 'description' => 'Table to track content translations', 'fields' => array( - 'entity_type' => array( + 'entityType' => array( 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, @@ -73,7 +73,7 @@ function content_translation_schema() { 'default' => 0, ), ), - 'primary key' => array('entity_type', 'entity_id', 'langcode'), + 'primary key' => array('entityType', 'entity_id', 'langcode'), ); return $schema; } diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module index 34e918c..25cd899 100644 --- a/core/modules/content_translation/content_translation.module +++ b/core/modules/content_translation/content_translation.module @@ -91,7 +91,7 @@ function content_translation_entity_info_alter(array &$entity_info) { $info['controllers'] += array('translation' => 'Drupal\content_translation\ContentTranslationController'); // If no menu base path is provided we default to the usual - // "entity_type/%entity_type" pattern. + // "entityType/%entityType" pattern. if (!isset($info['menu_base_path'])) { $path = "$entity_type/%$entity_type"; $info['menu_base_path'] = $path; @@ -229,8 +229,8 @@ function content_translation_menu_alter(array &$items) { $items["$path/translations/add/%language/%language"], $items["$path/translations/delete/%language"] ); - $t_args = array('@entity_type' => isset($info['label']) ? $info['label'] : $entity_type); - watchdog('content translation', 'The entities of type @entity_type do not define a valid base path: it will not be possible to translate them.', $t_args, WATCHDOG_WARNING); + $t_args = array('@entityType' => isset($info['label']) ? $info['label'] : $entity_type); + watchdog('content translation', 'The entities of type @entityType do not define a valid base path: it will not be possible to translate them.', $t_args, WATCHDOG_WARNING); } else { $entity_position = count(explode('/', $path)) - 1; @@ -580,7 +580,7 @@ function content_translation_permission() { } break; - case 'entity_type': + case 'entityType': if (content_translation_enabled($entity_type)) { $permission["translate $entity_type"] = array( 'title' => t('Translate @entity_label', $t_args), @@ -695,9 +695,9 @@ function content_translation_entity_load(array $entities, $entity_type) { * The type of the entities. */ function content_translation_load_translation_metadata(array $entities, $entity_type) { - $query = 'SELECT * FROM {content_translation} te WHERE te.entity_type = :entity_type AND te.entity_id IN (:entity_id)'; - $result = db_query($query, array(':entity_type' => $entity_type, ':entity_id' => array_keys($entities))); - $exclude = array('entity_type', 'entity_id', 'langcode'); + $query = 'SELECT * FROM {content_translation} te WHERE te.entityType = :entityType AND te.entity_id IN (:entity_id)'; + $result = db_query($query, array(':entityType' => $entity_type, ':entity_id' => array_keys($entities))); + $exclude = array('entityType', 'entity_id', 'langcode'); foreach ($result as $record) { $entity = $entities[$record->entity_id]; // @todo Declare these as entity (translation?) properties. @@ -722,7 +722,7 @@ function content_translation_entity_insert(EntityInterface $entity) { return; } - $fields = array('entity_type', 'entity_id', 'langcode', 'source', 'outdated', 'uid', 'status', 'created', 'changed'); + $fields = array('entityType', 'entity_id', 'langcode', 'source', 'outdated', 'uid', 'status', 'created', 'changed'); $query = db_insert('content_translation')->fields($fields); foreach ($entity->getTranslationLanguages() as $langcode => $language) { @@ -737,7 +737,7 @@ function content_translation_entity_insert(EntityInterface $entity) { 'changed' => REQUEST_TIME, ); - $translation['entity_type'] = $entity->entityType(); + $translation['entityType'] = $entity->entityType(); $translation['entity_id'] = $entity->id(); $translation['langcode'] = $langcode; @@ -763,7 +763,7 @@ function content_translation_entity_delete(EntityInterface $entity) { } db_delete('content_translation') - ->condition('entity_type', $entity->entityType()) + ->condition('entityType', $entity->entityType()) ->condition('entity_id', $entity->id()) ->execute(); } @@ -906,7 +906,7 @@ function content_translation_enable_widget($entity_type, $bundle, array &$form, if (!isset($form_state['language'][$key])) { $form_state['language'][$key] = array(); } - $form_state['language'][$key] += array('entity_type' => $entity_type, 'bundle' => $bundle); + $form_state['language'][$key] += array('entityType' => $entity_type, 'bundle' => $bundle); $element = content_translation_language_configuration_element_process(array('#name' => $key), $form_state, $form); unset($element['content_translation']['#element_validate']); return $element; @@ -929,7 +929,7 @@ function content_translation_language_configuration_element_process(array $eleme $element['content_translation'] = array( '#type' => 'checkbox', '#title' => t('Enable translation'), - '#default_value' => content_translation_enabled($context['entity_type'], $context['bundle']), + '#default_value' => content_translation_enabled($context['entityType'], $context['bundle']), '#element_validate' => array('content_translation_language_configuration_element_validate'), '#prefix' => '', ); @@ -974,8 +974,8 @@ function content_translation_language_configuration_element_submit(array $form, $context = $form_state['language'][$key]; $enabled = $form_state['values'][$key]['content_translation']; - if (content_translation_enabled($context['entity_type'], $context['bundle']) != $enabled) { - content_translation_set_config($context['entity_type'], $context['bundle'], 'enabled', $enabled); + if (content_translation_enabled($context['entityType'], $context['bundle']) != $enabled) { + content_translation_set_config($context['entityType'], $context['bundle'], 'enabled', $enabled); entity_info_cache_clear(); menu_router_rebuild(); } diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php index c17bd06..f31f2e4 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php @@ -132,8 +132,8 @@ function testSettingsUI() { */ protected function assertSettings($entity_type, $bundle, $enabled, $edit) { $this->drupalPost('admin/config/regional/content-language', $edit, t('Save')); - $args = array('@entity_type' => $entity_type, '@bundle' => $bundle, '@enabled' => $enabled ? 'enabled' : 'disabled'); - $message = format_string('Translation for entity @entity_type (@bundle) is @enabled.', $args); + $args = array('@entityType' => $entity_type, '@bundle' => $bundle, '@enabled' => $enabled ? 'enabled' : 'disabled'); + $message = format_string('Translation for entity @entityType (@bundle) is @enabled.', $args); field_info_cache_clear(); entity_info_cache_clear(); return $this->assertEqual(content_translation_enabled($entity_type, $bundle), $enabled, $message); diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php index 54d234e..f871971 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSyncImageTest.php @@ -64,7 +64,7 @@ protected function setupTestFields() { ))->save(); entity_create('field_instance', array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'field_name' => $this->fieldName, 'bundle' => $this->entityType, 'label' => 'Test translatable image field', diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php index b635c45..5ffa991 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationTestBase.php @@ -168,7 +168,7 @@ protected function setupTestFields() { 'translatable' => TRUE, ))->save(); entity_create('field_instance', array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'field_name' => $this->fieldName, 'bundle' => $this->bundle, 'label' => 'Test translatable text-field', diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/TranslationLinkTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/TranslationLinkTest.php index b26b0a5..bac9feb 100644 --- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/TranslationLinkTest.php +++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/Views/TranslationLinkTest.php @@ -41,7 +41,7 @@ public static function getInfo() { } function setUp() { - // @todo Use entity_type once it is has multilingual Views integration. + // @todo Use entityType once it is has multilingual Views integration. $this->entityType = 'user'; parent::setUp(); diff --git a/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml b/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml index 8d530cc..7fd1b6b 100644 --- a/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml +++ b/core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml @@ -1,5 +1,5 @@ base_field: uid -base_table: users +baseTable: users core: 8.x description: '' status: '1' diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeItemTest.php b/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeItemTest.php index 16731a2..8d7da76 100644 --- a/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeItemTest.php +++ b/core/modules/datetime/lib/Drupal/datetime/Tests/DateTimeItemTest.php @@ -43,7 +43,7 @@ public function setUp() { $this->field->save(); $this->instance = entity_create('field_instance', array( 'field_name' => $this->field['field_name'], - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'settings' => array( 'default_value' => 'blank', diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php b/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php index 867e67d..011df8b 100644 --- a/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php +++ b/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php @@ -64,7 +64,7 @@ function setUp() { $this->field->save(); $this->instance = entity_create('field_instance', array( 'field_name' => $this->field->id(), - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'settings' => array( 'default_value' => 'blank', diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module index 071073c..5a6deec 100644 --- a/core/modules/edit/edit.module +++ b/core/modules/edit/edit.module @@ -60,7 +60,7 @@ function edit_page_build(&$page) { $page['#attached']['js'][] = array( 'type' => 'setting', 'data' => array('edit' => array( - 'fieldFormURL' => url('edit/form/!entity_type/!id/!field_name/!langcode/!view_mode'), + 'fieldFormURL' => url('edit/form/!entityType/!id/!field_name/!langcode/!view_mode'), 'context' => 'body', )), ); diff --git a/core/modules/edit/edit.routing.yml b/core/modules/edit/edit.routing.yml index adef7f1..7e003a0 100644 --- a/core/modules/edit/edit.routing.yml +++ b/core/modules/edit/edit.routing.yml @@ -13,7 +13,7 @@ edit_attachments: _permission: 'access in-place editing' edit_field_form: - pattern: '/edit/form/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}' + pattern: '/edit/form/{entityType}/{entity}/{field_name}/{langcode}/{view_mode_id}' defaults: _controller: '\Drupal\edit\EditController::fieldForm' options: @@ -23,7 +23,7 @@ edit_field_form: _access_edit_entity_field: 'TRUE' edit_entity_save: - pattern: '/edit/entity/{entity_type}/{entity}' + pattern: '/edit/entity/{entityType}/{entity}' defaults: _controller: '\Drupal\edit\EditController::entitySave' options: diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php b/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php index 95c7ba2..e435a0f 100644 --- a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php +++ b/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php @@ -70,7 +70,7 @@ protected function validateAndUpcastRequestAttributes(Request $request) { // Load the entity. if (!is_object($entity = $request->attributes->get('entity'))) { $entity_id = $entity; - $entity_type = $request->attributes->get('entity_type'); + $entity_type = $request->attributes->get('entityType'); if (!$entity_type || !$this->entityManager->getDefinition($entity_type)) { throw new NotFoundHttpException(); } diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php b/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php index afa4e3d..75d4cc5 100644 --- a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php +++ b/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php @@ -81,7 +81,7 @@ protected function validateAndUpcastRequestAttributes(Request $request) { // Load the entity. if (!is_object($entity = $request->attributes->get('entity'))) { $entity_id = $entity; - $entity_type = $request->attributes->get('entity_type'); + $entity_type = $request->attributes->get('entityType'); if (!$entity_type || !$this->entityManager->getDefinition($entity_type)) { throw new NotFoundHttpException(); } diff --git a/core/modules/edit/lib/Drupal/edit/EditController.php b/core/modules/edit/lib/Drupal/edit/EditController.php index 0b9ce71..4e0c3b5 100644 --- a/core/modules/edit/lib/Drupal/edit/EditController.php +++ b/core/modules/edit/lib/Drupal/edit/EditController.php @@ -254,7 +254,7 @@ public function entitySave(EntityInterface $entity) { // Return information about the entity that allows a front end application // to identify it. $output = array( - 'entity_type' => $entity->entityType(), + 'entityType' => $entity->entityType(), 'entity_id' => $entity->id() ); diff --git a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php index 6faa0c9..d2d584a 100644 --- a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php +++ b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php @@ -72,7 +72,7 @@ protected function init(array &$form_state, EntityInterface $entity, $field_name // Let modules alter the form display. $form_display_context = array( - 'entity_type' => $entity->entityType(), + 'entityType' => $entity->entityType(), 'bundle' => $entity->bundle(), 'form_mode' => 'default', ); diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php b/core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php index 7b01ade..2b42081 100644 --- a/core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php +++ b/core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php @@ -212,7 +212,7 @@ function testUserWithPermission() { $ajax_commands = drupal_json_decode($response); $this->assertIdentical(1, count($ajax_commands), 'The entity submission HTTP request results in one AJAX command.'); $this->assertIdentical('editEntitySaved', $ajax_commands[0]['command'], 'The first AJAX command is an editEntitySaved command.'); - $this->assertIdentical($ajax_commands[0]['data']['entity_type'], 'node', 'Saved entity is of type node.'); + $this->assertIdentical($ajax_commands[0]['data']['entityType'], 'node', 'Saved entity is of type node.'); $this->assertIdentical($ajax_commands[0]['data']['entity_id'], '1', 'Entity id is 1.'); // Ensure the text on the original node did change. diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php b/core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php index c288284..5979df9 100644 --- a/core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php +++ b/core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php @@ -64,7 +64,7 @@ function createFieldWithInstance($field_name, $type, $cardinality, $label, $inst $instance = $field_name . '_instance'; $this->$instance = entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'label' => $label, 'description' => $label, diff --git a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php b/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php index de50fbf..472f646 100644 --- a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php +++ b/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php @@ -117,7 +117,7 @@ public function testAccess(EntityInterface $entity, $expected_result) { // Prepare the request to be valid. $request->attributes->set('entity', $entity); - $request->attributes->set('entity_type', 'test_entity'); + $request->attributes->set('entityType', 'test_entity'); $access = $this->editAccessCheck->access($route, $request); $this->assertSame($expected_result, $access); @@ -131,7 +131,7 @@ public function testAccess(EntityInterface $entity, $expected_result) { public function testAccessWithUndefinedEntityType() { $route = new Route('/edit/form/test_entity/1/body/und/full', array(), array('_access_edit_entity' => 'TRUE')); $request = new Request(); - $request->attributes->set('entity_type', 'non_valid'); + $request->attributes->set('entityType', 'non_valid'); $this->entityManager->expects($this->once()) ->method('getDefinition') @@ -149,7 +149,7 @@ public function testAccessWithUndefinedEntityType() { public function testAccessWithNotExistingEntity() { $route = new Route('/edit/form/test_entity/1/body/und/full', array(), array('_access_edit_entity_field' => 'TRUE')); $request = new Request(); - $request->attributes->set('entity_type', 'entity_test'); + $request->attributes->set('entityType', 'entity_test'); $request->attributes->set('entity', 1); $this->entityManager->expects($this->once()) diff --git a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php b/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php index 962b9ed..b7bcdbc 100644 --- a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php +++ b/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php @@ -152,7 +152,7 @@ public function testAccess(EntityInterface $entity, FieldInterface $field = NULL // Prepare the request to be valid. $request->attributes->set('entity', $entity); - $request->attributes->set('entity_type', 'test_entity'); + $request->attributes->set('entityType', 'test_entity'); $request->attributes->set('field_name', 'example'); $request->attributes->set('langcode', Language::LANGCODE_NOT_SPECIFIED); @@ -176,7 +176,7 @@ public function testAccess(EntityInterface $entity, FieldInterface $field = NULL public function testAccessWithUndefinedEntityType() { $route = new Route('/edit/form/test_entity/1/body/und/full', array(), array('_access_edit_entity_field' => 'TRUE')); $request = new Request(); - $request->attributes->set('entity_type', 'non_valid'); + $request->attributes->set('entityType', 'non_valid'); $this->entityManager->expects($this->once()) ->method('getDefinition') @@ -194,7 +194,7 @@ public function testAccessWithUndefinedEntityType() { public function testAccessWithNotExistingEntity() { $route = new Route('/edit/form/test_entity/1/body/und/full', array(), array('_access_edit_entity_field' => 'TRUE')); $request = new Request(); - $request->attributes->set('entity_type', 'entity_test'); + $request->attributes->set('entityType', 'entity_test'); $request->attributes->set('entity', 1); $this->entityManager->expects($this->once()) @@ -218,7 +218,7 @@ public function testAccessWithNotExistingEntity() { public function testAccessWithNotPassedFieldName() { $route = new Route('/edit/form/test_entity/1/body/und/full', array(), array('_access_edit_entity_field' => 'TRUE')); $request = new Request(); - $request->attributes->set('entity_type', 'entity_test'); + $request->attributes->set('entityType', 'entity_test'); $entity = $this->getMockBuilder('Drupal\entity_test\Entity\EntityTest') ->disableOriginalConstructor() @@ -237,7 +237,7 @@ public function testAccessWithNotPassedFieldName() { public function testAccessWithNonExistingField() { $route = new Route('/edit/form/test_entity/1/body/und/full', array(), array('_access_edit_entity_field' => 'TRUE')); $request = new Request(); - $request->attributes->set('entity_type', 'entity_test'); + $request->attributes->set('entityType', 'entity_test'); $entity = $this->getMockBuilder('Drupal\entity_test\Entity\EntityTest') ->disableOriginalConstructor() @@ -268,7 +268,7 @@ public function testAccessWithNonExistingField() { public function testAccessWithNotPassedLanguage() { $route = new Route('/edit/form/test_entity/1/body/und/full', array(), array('_access_edit_entity_field' => 'TRUE')); $request = new Request(); - $request->attributes->set('entity_type', 'entity_test'); + $request->attributes->set('entityType', 'entity_test'); $entity = $this->getMockBuilder('Drupal\entity_test\Entity\EntityTest') ->disableOriginalConstructor() @@ -296,7 +296,7 @@ public function testAccessWithNotPassedLanguage() { public function testAccessWithInvalidLanguage() { $route = new Route('/edit/form/test_entity/1/body/und/full', array(), array('_access_edit_entity_field' => 'TRUE')); $request = new Request(); - $request->attributes->set('entity_type', 'entity_test'); + $request->attributes->set('entityType', 'entity_test'); $entity = $this->getMockBuilder('Drupal\entity_test\Entity\EntityTest') ->disableOriginalConstructor() diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module index fd95b0f..e7537ed 100644 --- a/core/modules/editor/editor.module +++ b/core/modules/editor/editor.module @@ -123,7 +123,7 @@ function editor_library_info() { 'type' => 'setting', 'data' => array( 'editor' => array( - 'getUntransformedTextURL' => url('editor/!entity_type/!id/!field_name/!langcode/!view_mode'), + 'getUntransformedTextURL' => url('editor/!entityType/!id/!field_name/!langcode/!view_mode'), ) ) ), diff --git a/core/modules/editor/editor.routing.yml b/core/modules/editor/editor.routing.yml index 9e5fcd1..095b28d 100644 --- a/core/modules/editor/editor.routing.yml +++ b/core/modules/editor/editor.routing.yml @@ -1,5 +1,5 @@ editor_field_untransformed_text: - pattern: '/editor/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}' + pattern: '/editor/{entityType}/{entity}/{field_name}/{langcode}/{view_mode_id}' defaults: _controller: '\Drupal\editor\EditorController::getUntransformedText' options: diff --git a/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php b/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php index e6a2bc0..0ba95b3 100644 --- a/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php +++ b/core/modules/email/lib/Drupal/email/Tests/EmailFieldTest.php @@ -68,7 +68,7 @@ function testEmailField() { $this->field->save(); $this->instance = entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', )); $this->instance->save(); diff --git a/core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php b/core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php index 7e72163..be418ea 100644 --- a/core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php +++ b/core/modules/email/lib/Drupal/email/Tests/EmailItemTest.php @@ -40,7 +40,7 @@ public function setUp() { 'type' => 'email', ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => 'field_email', 'bundle' => 'entity_test', ))->save(); diff --git a/core/modules/entity/entity.routing.yml b/core/modules/entity/entity.routing.yml index 05d7092..1f4d9cb 100644 --- a/core/modules/entity/entity.routing.yml +++ b/core/modules/entity/entity.routing.yml @@ -13,7 +13,7 @@ entity_view_mode.add: _permission: 'administer display modes' entity_view_mode.add_type: - pattern: '/admin/structure/display-modes/view/add/{entity_type}' + pattern: '/admin/structure/display-modes/view/add/{entityType}' defaults: _entity_form: 'view_mode.add' requirements: @@ -48,7 +48,7 @@ entity_form_mode.add: _permission: 'administer display modes' entity_form_mode.add_type: - pattern: '/admin/structure/display-modes/form/add/{entity_type}' + pattern: '/admin/structure/display-modes/form/add/{entityType}' defaults: _entity_form: 'form_mode.add' requirements: diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php index f2aa4bd..eec48e8 100644 --- a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php +++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php @@ -60,7 +60,7 @@ public function uri() { return array( 'path' => 'admin/structure/display-modes/form/manage/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php index e7f2a10..17f69d3 100644 --- a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php +++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php @@ -61,7 +61,7 @@ public function uri() { return array( 'path' => 'admin/structure/display-modes/view/manage/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php index fdeaa1b..13ff942 100644 --- a/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php +++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityDisplayTest.php @@ -148,7 +148,7 @@ public function testFieldComponent() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', )); $instance->save(); @@ -250,7 +250,7 @@ public function testDeleteFieldInstance() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', )); $instance->save(); diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityFormDisplayTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityFormDisplayTest.php index 8d7df46..7d65247 100644 --- a/core/modules/entity/lib/Drupal/entity/Tests/EntityFormDisplayTest.php +++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityFormDisplayTest.php @@ -70,7 +70,7 @@ public function testFieldComponent() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', )); $instance->save(); diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module index 4d1554d..727a011 100644 --- a/core/modules/entity_reference/entity_reference.module +++ b/core/modules/entity_reference/entity_reference.module @@ -243,7 +243,7 @@ function entity_reference_create_instance($entity_type, $bundle, $field_name, $f if (empty($instance)) { $instance = array( 'field_name' => $field_name, - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $bundle, 'label' => $field_label, 'settings' => array( diff --git a/core/modules/entity_reference/entity_reference.routing.yml b/core/modules/entity_reference/entity_reference.routing.yml index e0b23b8..d29c51c 100644 --- a/core/modules/entity_reference/entity_reference.routing.yml +++ b/core/modules/entity_reference/entity_reference.routing.yml @@ -1,5 +1,5 @@ entity_reference.autocomplete: - pattern: '/entity_reference/autocomplete/{type}/{field_name}/{entity_type}/{bundle_name}/{entity_id}' + pattern: '/entity_reference/autocomplete/{type}/{field_name}/{entityType}/{bundle_name}/{entity_id}' defaults: _controller: '\Drupal\entity_reference\EntityReferenceController::handleAutocomplete' entity_id: 'NULL' diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceAutocomplete.php b/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceAutocomplete.php index 492fa25..176331e 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceAutocomplete.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/EntityReferenceAutocomplete.php @@ -85,7 +85,7 @@ public function getMatches($field, $instance, $entity_type, $entity_id = '', $pr if (isset($string)) { // Get an array of matching entities. - $widget = entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default')->getComponent($instance['field_name']); + $widget = entity_get_form_display($instance['entityType'], $instance['bundle'], 'default')->getComponent($instance['field_name']); $match_operator = !empty($widget['settings']['match_operator']) ? $widget['settings']['match_operator'] : 'CONTAINS'; $entity_labels = $handler->getReferenceableEntities($string, $match_operator, 10); diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionBase.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionBase.php index a1d7991..d2af8e4 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionBase.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Derivative/SelectionBase.php @@ -27,7 +27,7 @@ public function getDerivativeDefinitions(array $base_plugin_definition) { foreach (entity_get_info() as $entity_type => $info) { if (!in_array($entity_type, $supported_entities)) { $this->derivatives[$entity_type] = $base_plugin_definition; - $this->derivatives[$entity_type]['label'] = t('@entity_type selection', array('@entity_type' => $info['label'])); + $this->derivatives[$entity_type]['label'] = t('@entityType selection', array('@entityType' => $info['label'])); } } return parent::getDerivativeDefinitions($base_plugin_definition); diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php index 5ee7fa9..7f76786 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php @@ -104,7 +104,7 @@ public static function settingsForm(FieldDefinitionInterface $field_definition) // @todo Use Entity::getPropertyDefinitions() when all entity types are // converted to the new Field API. - $fields = drupal_map_assoc(drupal_schema_fields_sql($entity_info['base_table'])); + $fields = drupal_map_assoc(drupal_schema_fields_sql($entity_info['baseTable'])); foreach (field_info_instances($target_type) as $bundle_instances) { foreach ($bundle_instances as $instance_name => $instance_info) { $field_info = field_info_field($instance_name); @@ -307,7 +307,7 @@ protected function reAlterQuery(AlterableInterface $query, $tag, $base_table) { $old_metadata = $query->alterMetaData; $query->alterTags = array($tag => TRUE); - $query->alterMetaData['base_table'] = $base_table; + $query->alterMetaData['baseTable'] = $base_table; drupal_alter(array('query', 'query_' . $tag), $query); // Restore the tags and metadata. diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/field_type/ConfigurableEntityReferenceItem.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/field_type/ConfigurableEntityReferenceItem.php index 786f0da..ea1ba39 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/field_type/ConfigurableEntityReferenceItem.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/field_type/ConfigurableEntityReferenceItem.php @@ -71,7 +71,7 @@ public static function schema(FieldInterface $field) { if (is_subclass_of($entity_manager->getControllerClass($field['settings']['target_type'], 'storage'), 'Drupal\Core\Entity\DatabaseStorageController')) { $entity_info = $entity_manager->getDefinition($field['settings']['target_type']); - $base_table = $entity_info['base_table']; + $base_table = $entity_info['baseTable']; $id_column = $entity_info['entity_keys']['id']; $schema['foreign keys'][$base_table] = array( diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php index dd054f2..6a25a78 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/field/formatter/EntityReferenceEntityFormatter.php @@ -95,7 +95,7 @@ public function viewElements(EntityInterface $entity, $langcode, FieldInterface static $depth = 0; $depth++; if ($depth > 20) { - throw new RecursiveRenderingException(format_string('Recursive rendering detected when rendering entity @entity_type(@entity_id). Aborting rendering.', array('@entity_type' => $entity_type, '@entity_id' => $item->target_id))); + throw new RecursiveRenderingException(format_string('Recursive rendering detected when rendering entity @entityType(@entity_id). Aborting rendering.', array('@entityType' => $entity_type, '@entity_id' => $item->target_id))); } if (!empty($item->target_id)) { diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php index 496b5ea..04009b8 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php @@ -123,7 +123,7 @@ public function query() { // Make sure the id field is included in the results. $id_field = $this->view->storage->get('base_field'); - $this->id_field_alias = $this->view->query->addField($this->view->storage->get('base_table'), $id_field); + $this->id_field_alias = $this->view->query->addField($this->view->storage->get('baseTable'), $id_field); $options = $this->getOption('entity_reference_options'); diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php index a19e1a9..955194c 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutoCreateTest.php @@ -49,7 +49,7 @@ function setUp() { entity_create('field_instance', array( 'label' => 'Entity reference field', 'field_name' => 'test_field', - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => $referencing->type, 'settings' => array( 'handler' => 'default', diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php index c3107ec..5f8e261 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php @@ -73,7 +73,7 @@ public function testNodeHandler() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => 'test_field', - 'entity_type' => 'test_entity', + 'entityType' => 'test_entity', 'bundle' => 'test_bundle', 'settings' => array( 'handler' => 'default', @@ -217,7 +217,7 @@ public function testUserHandler() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => 'test_field', - 'entity_type' => 'test_entity', + 'entityType' => 'test_entity', 'bundle' => 'test_bundle', 'settings' => array( 'handler' => 'default', @@ -363,7 +363,7 @@ public function testCommentHandler() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => 'test_field', - 'entity_type' => 'test_entity', + 'entityType' => 'test_entity', 'bundle' => 'test_bundle', 'settings' => array( 'handler' => 'default', diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php index b44c54d..e638dd6 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionSortTest.php @@ -45,7 +45,7 @@ public function testSort() { entity_create('field_instance', array( 'label' => 'Text Field', 'field_name' => 'field_text', - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'article', 'settings' => array(), 'required' => FALSE, @@ -66,7 +66,7 @@ public function testSort() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => 'test_field', - 'entity_type' => 'test_entity', + 'entityType' => 'test_entity', 'bundle' => 'test_bundle', 'settings' => array( 'handler' => 'default', diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php index c9b8d62..ea9ae00 100644 --- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php +++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/Views/SelectionTest.php @@ -53,7 +53,7 @@ public function testSelectionHandler() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => 'test_field', - 'entity_type' => 'test_entity', + 'entityType' => 'test_entity', 'bundle' => 'test_bundle', 'settings' => array( 'handler' => 'views', diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml b/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml index c3f265a..8ce2000 100644 --- a/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml +++ b/core/modules/entity_reference/tests/modules/entity_reference_test/config/views.view.test_entity_reference.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8.x module: entity_reference_test id: test_entity_reference diff --git a/core/modules/field/config/schema/field.schema.yml b/core/modules/field/config/schema/field.schema.yml index 1b23198..c23baca 100644 --- a/core/modules/field/config/schema/field.schema.yml +++ b/core/modules/field/config/schema/field.schema.yml @@ -101,7 +101,7 @@ field.instance.*.*.*: field_uuid: type: string label: 'Field UUID' - entity_type: + entityType: type: string label: 'Allowed entity types' bundle: diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php index 9deadaf..1f71771 100644 --- a/core/modules/field/field.api.php +++ b/core/modules/field/field.api.php @@ -495,7 +495,7 @@ function hook_field_language_alter(&$display_langcode, $context) { * A reference to an array of language codes to be made available. * @param $context * An associative array containing: - * - entity_type: The type of the entity the field is attached to. + * - entityType: The type of the entity the field is attached to. * - field: A field data structure. */ function hook_field_available_languages_alter(&$langcodes, $context) { @@ -664,7 +664,7 @@ function hook_field_storage_load($entity_type, $entities, $age, $fields, $option $query = db_select($table, 't') ->fields('t') - ->condition('entity_type', $entity_type) + ->condition('entityType', $entity_type) ->condition($load_current ? 'entity_id' : 'revision_id', $ids, 'IN') ->condition('langcode', field_available_languages($entity_type, $field), 'IN') ->orderBy('delta'); @@ -737,12 +737,12 @@ function hook_field_storage_write(\Drupal\Core\Entity\EntityInterface $entity, $ $langcodes = !empty($entity->$field_name) ? $field_langcodes : $all_langcodes; if ($langcodes) { db_delete($table_name) - ->condition('entity_type', $entity->entityType()) + ->condition('entityType', $entity->entityType()) ->condition('entity_id', $id) ->condition('langcode', $langcodes, 'IN') ->execute(); db_delete($revision_name) - ->condition('entity_type', $entity->entityType()) + ->condition('entityType', $entity->entityType()) ->condition('entity_id', $id) ->condition('revision_id', $vid) ->condition('langcode', $langcodes, 'IN') @@ -752,7 +752,7 @@ function hook_field_storage_write(\Drupal\Core\Entity\EntityInterface $entity, $ // Prepare the multi-insert query. $do_insert = FALSE; - $columns = array('entity_type', 'entity_id', 'revision_id', 'bundle', 'delta', 'langcode'); + $columns = array('entityType', 'entity_id', 'revision_id', 'bundle', 'delta', 'langcode'); foreach ($field['columns'] as $column => $attributes) { $columns[] = _field_sql_storage_columnname($field_name, $column); } @@ -766,7 +766,7 @@ function hook_field_storage_write(\Drupal\Core\Entity\EntityInterface $entity, $ // We now know we have someting to insert. $do_insert = TRUE; $record = array( - 'entity_type' => $entity->entityType(), + 'entityType' => $entity->entityType(), 'entity_id' => $id, 'revision_id' => $vid, 'bundle' => $bundle, @@ -838,7 +838,7 @@ function hook_field_storage_delete_revision(\Drupal\Core\Entity\EntityInterface $field = field_info_field_by_id($field_id); $revision_name = _field_sql_storage_revision_tablename($field); db_delete($revision_name) - ->condition('entity_type', $entity_type) + ->condition('entityType', $entity_type) ->condition('entity_id', $entity->id()) ->condition('revision_id', $vid) ->execute(); @@ -878,13 +878,13 @@ function hook_field_storage_query($query) { $table_alias = $tablename . $key; $table_aliases[$key] = $table_alias; if ($key) { - $select_query->join($tablename, $table_alias, "$table_alias.entity_type = $field_base_table.entity_type AND $table_alias.$id_key = $field_base_table.$id_key"); + $select_query->join($tablename, $table_alias, "$table_alias.entityType = $field_base_table.entityType AND $table_alias.$id_key = $field_base_table.$id_key"); } else { $select_query = db_select($tablename, $table_alias); $select_query->addTag('entity_field_access'); - $select_query->addMetaData('base_table', $tablename); - $select_query->fields($table_alias, array('entity_type', 'entity_id', 'revision_id', 'bundle')); + $select_query->addMetaData('baseTable', $tablename); + $select_query->fields($table_alias, array('entityType', 'entity_id', 'revision_id', 'bundle')); $field_base_table = $table_alias; } if ($field['cardinality'] != 1) { @@ -926,12 +926,12 @@ function hook_field_storage_query($query) { } if ($query->propertyConditions || $has_property_order) { - if (empty($query->entityConditions['entity_type']['value'])) { + if (empty($query->entityConditions['entityType']['value'])) { throw new EntityFieldQueryException('Property conditions and orders must have an entity type defined.'); } - $entity_type = $query->entityConditions['entity_type']['value']; + $entity_type = $query->entityConditions['entityType']['value']; $entity_base_table = _field_sql_storage_query_join_entity($select_query, $entity_type, $field_base_table); - $query->entityConditions['entity_type']['operator'] = '='; + $query->entityConditions['entityType']['operator'] = '='; foreach ($query->propertyConditions as $property_condition) { $query->addCondition($select_query, "$entity_base_table." . $property_condition['column'], $property_condition); } @@ -1055,12 +1055,12 @@ function hook_field_storage_delete_instance($instance) { $revision_name = _field_sql_storage_revision_tablename($field); db_update($table_name) ->fields(array('deleted' => 1)) - ->condition('entity_type', $instance['entity_type']) + ->condition('entityType', $instance['entityType']) ->condition('bundle', $instance['bundle']) ->execute(); db_update($revision_name) ->fields(array('deleted' => 1)) - ->condition('entity_type', $instance['entity_type']) + ->condition('entityType', $instance['entityType']) ->condition('bundle', $instance['bundle']) ->execute(); } @@ -1347,11 +1347,11 @@ function hook_field_storage_purge(\Drupal\Core\Entity\EntityInterface $entity, $ $table_name = _field_sql_storage_tablename($field); $revision_name = _field_sql_storage_revision_tablename($field); db_delete($table_name) - ->condition('entity_type', $entity->entityType()) + ->condition('entityType', $entity->entityType()) ->condition('entity_id', $entity->id()) ->execute(); db_delete($revision_name) - ->condition('entity_type', $entity->entityType()) + ->condition('entityType', $entity->entityType()) ->condition('entity_id', $entity->id()) ->execute(); } diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc index 3125584..24b5cd2 100644 --- a/core/modules/field/field.attach.inc +++ b/core/modules/field/field.attach.inc @@ -56,8 +56,8 @@ * structures, and perform a variety of other functions for field data attached * to individual entities. * - * Field Attach API functions generally take $entity_type and $entity arguments - * along with additional function-specific arguments. $entity_type is the type + * Field Attach API functions generally take $entityType and $entity arguments + * along with additional function-specific arguments. $entityType is the type * of the fieldable entity, such as 'node' or 'user', and $entity is the entity * itself. * @@ -120,7 +120,7 @@ * A function that receives an $instance object and returns the object on * which the method should be invoked. * @param Drupal\Core\Entity\EntityInterface $entity - * The fully formed $entity_type entity. + * The fully formed $entityType entity. * @param mixed $a * (optional) A parameter for the invoked method. Defaults to NULL. * @param mixed $b @@ -342,7 +342,7 @@ function _field_invoke_get_instances($entity_type, $bundle, $options) { if ($options['deleted']) { // Deleted fields are not included in field_info_instances(), and need to // be fetched from the database with field_read_instances(). - $params = array('entity_type' => $entity_type, 'bundle' => $bundle); + $params = array('entityType' => $entity_type, 'bundle' => $bundle); if (isset($options['field_id'])) { // Single-field mode by field id: field_read_instances() does the filtering. // Single-field mode by field name is not compatible with the 'deleted' diff --git a/core/modules/field/field.deprecated.inc b/core/modules/field/field.deprecated.inc index 1b1d8f9..02fce5e 100644 --- a/core/modules/field/field.deprecated.inc +++ b/core/modules/field/field.deprecated.inc @@ -239,7 +239,7 @@ function field_info_field_by_id($field_id) { * statically caches a potentially large array of information. * * When iterating over the fields present in a given bundle after a call to - * field_info_instances($entity_type, $bundle), it is recommended to use + * field_info_instances($entityType, $bundle), it is recommended to use * field_info_field() on each individual field instead. * * @return @@ -266,26 +266,26 @@ function field_info_field_by_ids() { * Use field_info_field_map() instead. * * When retrieving the instances of a specific bundle (i.e. when both - * $entity_type and $bundle_name are provided), the function also populates a + * $entityType and $bundle_name are provided), the function also populates a * static cache with the corresponding field definitions, allowing fast * retrieval of field_info_field() later in the request. * * @param $entity_type * (optional) The entity type for which to return instances. * @param $bundle_name - * (optional) The bundle name for which to return instances. If $entity_type + * (optional) The bundle name for which to return instances. If $entityType * is NULL, the $bundle_name parameter is ignored. * * @return - * If $entity_type is not set, return all instances keyed by entity type and - * bundle name. If $entity_type is set, return all instances for that entity - * type, keyed by bundle name. If $entity_type and $bundle_name are set, + * If $entityType is not set, return all instances keyed by entity type and + * bundle name. If $entityType is set, return all instances for that entity + * type, keyed by bundle name. If $entityType and $bundle_name are set, * return all instances for that bundle. * * @deprecated as of Drupal 8.0. Use * Field::fieldInfo()->getInstances(), - * Field::fieldInfo()->getInstances($entity_type) or - * Field::fieldInfo()->getBundleInstances($entity_type, $bundle_name). + * Field::fieldInfo()->getInstances($entityType) or + * Field::fieldInfo()->getBundleInstances($entityType, $bundle_name). */ function field_info_instances($entity_type = NULL, $bundle_name = NULL) { $cache = Field::fieldInfo(); @@ -320,7 +320,7 @@ function field_info_instances($entity_type = NULL, $bundle_name = NULL) { * NULL if the instance does not exist. * * @deprecated as of Drupal 8.0. Use - * Field::fieldInfo()->getInstance($entity_type, $bundle_name, $field_name). + * Field::fieldInfo()->getInstance($entityType, $bundle_name, $field_name). */ function field_info_instance($entity_type, $field_name, $bundle_name) { return Field::fieldInfo()->getInstance($entity_type, $bundle_name, $field_name); @@ -412,7 +412,7 @@ function field_read_fields($conditions = array(), $include_additional = array()) * entity_load('field_instance', 'field_name'). */ function field_read_instance($entity_type, $field_name, $bundle, $include_additional = array()) { - $instances = field_read_instances(array('entity_type' => $entity_type, 'field_name' => $field_name, 'bundle' => $bundle), $include_additional); + $instances = field_read_instances(array('entityType' => $entity_type, 'field_name' => $field_name, 'bundle' => $bundle), $include_additional); return $instances ? current($instances) : FALSE; } @@ -469,7 +469,7 @@ function field_read_instances($conditions = array(), $include_additional = array * Sample resulting structure in $form: * @code * '#parents' => The location of field values in $form_state['values'], - * '#entity_type' => The name of the entity type, + * '#entityType' => The name of the entity type, * '#bundle' => The name of the bundle, * // One sub-array per field appearing in the entity, keyed by field name. * // The structure of the array differs slightly depending on whether the @@ -500,7 +500,7 @@ function field_read_instances($conditions = array(), $include_additional = array * '#cardinality' => The field cardinality, * // One sub-array per copy of the widget, keyed by delta. * 0 => array( - * '#entity_type' => The name of the entity type, + * '#entityType' => The name of the entity type, * '#bundle' => The name of the bundle, * '#field_name' => The name of the field, * '#field_parents' => The 'parents' space for the field in the form, @@ -519,7 +519,7 @@ function field_read_instances($conditions = array(), $include_additional = array * ), * * // Only for multiple widgets: - * '#entity_type' => The name of the entity type, + * '#entityType' => The name of the entity type, * '#bundle' => $instance['bundle'], * // The remaining elements in the sub-array depend on the widget. * '#type' => The type of the widget, @@ -570,7 +570,7 @@ function field_attach_form(EntityInterface $entity, &$form, &$form_state, $langc $options['langcode'] = field_valid_language($langcode); $form += (array) field_invoke_method('form', _field_invoke_widget_target($form_display), $entity, $form, $form_state, $options); - $form['#entity_type'] = $entity->entityType(); + $form['#entityType'] = $entity->entityType(); $form['#bundle'] = $entity->bundle(); // Let other modules make changes to the form. diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc index f32fb95..dcbe685 100644 --- a/core/modules/field/field.info.inc +++ b/core/modules/field/field.info.inc @@ -128,7 +128,7 @@ function _field_info_collate_types_reset() { */ function field_behaviors_widget($op, $instance) { $info = array(); - if ($component = entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default')->getComponent($instance['field_name'])) { + if ($component = entity_get_form_display($instance['entityType'], $instance['bundle'], 'default')->getComponent($instance['field_name'])) { $info = \Drupal::service('plugin.manager.field.widget')->getDefinition($component['type']); } return isset($info[$op]) ? $info[$op] : FIELD_BEHAVIOR_DEFAULT; @@ -167,7 +167,7 @@ function field_info_storage_types($storage_type = NULL) { * field_info_field_map() instead. * * When iterating over the fields present in a given bundle after a call to - * field_info_instances($entity_type, $bundle), it is recommended to use + * field_info_instances($entityType, $bundle), it is recommended to use * field_info_field() on each individual field instead. * * @return diff --git a/core/modules/field/field.install b/core/modules/field/field.install index d692373..59715fb 100644 --- a/core/modules/field/field.install +++ b/core/modules/field/field.install @@ -326,11 +326,11 @@ function field_update_8003() { $record['data'] = unserialize($record['data']); $config = array( - 'id' => $record['entity_type'] . '.' . $record['bundle'] . '.' . $record['field_name'], + 'id' => $record['entityType'] . '.' . $record['bundle'] . '.' . $record['field_name'], 'uuid' => $uuid->generate(), 'field_uuid' => $field_data[$record['field_id']]['uuid'], 'field_type' => $field_data[$record['field_id']]['type'], - 'entity_type' => $record['entity_type'], + 'entityType' => $record['entityType'], 'bundle' => $record['bundle'], 'label' => $record['data']['label'], 'description' => $record['data']['description'], @@ -401,7 +401,7 @@ function field_update_8005() { ); foreach (config_get_storage_names_with_prefix('field.instance') as $config_id) { $instance_config = Drupal::config($config_id); - if ($instance_config->get('entity_type') == 'user' && $instance_config->get('settings.user_register_form')) { + if ($instance_config->get('entityType') == 'user' && $instance_config->get('settings.user_register_form')) { list(, , $field_id) = explode('.', $instance_config->get('id')); $user_register_config_data['content'][$field_id] = $user_default_form_display->get('content.' . $field_id); } diff --git a/core/modules/field/field.module b/core/modules/field/field.module index c355e67..1329932 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -308,7 +308,7 @@ function field_entity_bundle_rename($entity_type, $bundle_old, $bundle_new) { $instances = field_read_instances(); foreach ($instances as $instance) { if ($instance->entity_type == $entity_type && $instance->bundle == $bundle_old) { - $id_new = $instance['entity_type'] . '.' . $bundle_new . '.' . $instance['field_name']; + $id_new = $instance['entityType'] . '.' . $bundle_new . '.' . $instance['field_name']; $instance->id = $id_new; $instance->bundle = $bundle_new; $instance->allowBundleRename(); @@ -339,7 +339,7 @@ function field_entity_bundle_delete($entity_type, $bundle) { // Get the instances on the bundle. field_read_instances() must be used // here since field_info_instances() does not return instances for disabled // entity types or bundles. - $instances = field_read_instances(array('entity_type' => $entity_type, 'bundle' => $bundle), array('include_inactive' => TRUE)); + $instances = field_read_instances(array('entityType' => $entity_type, 'bundle' => $bundle), array('include_inactive' => TRUE)); foreach ($instances as $instance) { $instance->delete(); } @@ -1007,7 +1007,7 @@ function theme_field($variables) { * Assembles a partial entity structure with initial IDs. * * @param stdClass $ids - * An object with the properties entity_type (required), entity_id (required), + * An object with the properties entityType (required), entity_id (required), * revision_id (optional) and bundle (optional). * * @return \Drupal\Core\Entity\EntityInterface diff --git a/core/modules/field/field.multilingual.inc b/core/modules/field/field.multilingual.inc index d02595c..af9e746 100644 --- a/core/modules/field/field.multilingual.inc +++ b/core/modules/field/field.multilingual.inc @@ -138,7 +138,7 @@ function field_available_languages($entity_type, $field) { if (field_is_translatable($entity_type, $field)) { $langcodes = field_content_languages(); // Let other modules alter the available languages. - $context = array('entity_type' => $entity_type, 'field' => $field); + $context = array('entityType' => $entity_type, 'field' => $field); drupal_alter('field_available_languages', $langcodes, $context); $field_langcodes[$entity_type][$field_name] = $langcodes; } diff --git a/core/modules/field/field.purge.inc b/core/modules/field/field.purge.inc index e280187..96f0ecc 100644 --- a/core/modules/field/field.purge.inc +++ b/core/modules/field/field.purge.inc @@ -98,7 +98,7 @@ function field_purge_batch($batch_size) { $factory = Drupal::service('entity.query'); $info = entity_get_info(); foreach ($instances as $instance) { - $entity_type = $instance['entity_type']; + $entity_type = $instance['entityType']; // EntityFieldQuery currently fails on conditions on comment bundle. // Remove when http://drupal.org/node/731724 is fixed. @@ -107,7 +107,7 @@ function field_purge_batch($batch_size) { } $ids = (object) array( - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $instance['bundle'], ); // field_purge_data() will need the field array. diff --git a/core/modules/field/field.views.inc b/core/modules/field/field.views.inc index e5dea3b..e4cd688 100644 --- a/core/modules/field/field.views.inc +++ b/core/modules/field/field.views.inc @@ -127,21 +127,21 @@ function field_views_field_default_views_data($field) { $group_name = $groups[$entity]; } - if (!isset($entity_info['base_table'])) { + if (!isset($entity_info['baseTable'])) { continue; } - $entity_tables[$entity_info['base_table']] = $entity; - $current_tables[$entity] = $entity_info['base_table']; + $entity_tables[$entity_info['baseTable']] = $entity; + $current_tables[$entity] = $entity_info['baseTable']; if (isset($entity_info['revision_table'])) { $entity_tables[$entity_info['revision_table']] = $entity; $revision_tables[$entity] = $entity_info['revision_table']; } - $data[$current_table]['table']['join'][$entity_info['base_table']] = array( + $data[$current_table]['table']['join'][$entity_info['baseTable']] = array( 'left_field' => $entity_info['entity_keys']['id'], 'field' => 'entity_id', 'extra' => array( - array('field' => 'entity_type', 'value' => $entity), + array('field' => 'entityType', 'value' => $entity), array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE), ), ); @@ -151,7 +151,7 @@ function field_views_field_default_views_data($field) { 'left_field' => $entity_info['entity_keys']['revision'], 'field' => 'revision_id', 'extra' => array( - array('field' => 'entity_type', 'value' => $entity), + array('field' => 'entityType', 'value' => $entity), array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE), ), ); diff --git a/core/modules/field/lib/Drupal/field/Entity/Field.php b/core/modules/field/lib/Drupal/field/Entity/Field.php index 3d9f6a1..14ffee4 100644 --- a/core/modules/field/lib/Drupal/field/Entity/Field.php +++ b/core/modules/field/lib/Drupal/field/Entity/Field.php @@ -732,7 +732,7 @@ public function hasData() { foreach ($this->getBundles() as $entity_type => $bundle) { // Entity Query throws an exception if there is no base table. $entity_info = \Drupal::entityManager()->getDefinition($entity_type); - if (!isset($entity_info['base_table'])) { + if (!isset($entity_info['baseTable'])) { continue; } $query = $factory->get($entity_type); diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php b/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php index c954345..5f7aeec 100644 --- a/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php +++ b/core/modules/field/lib/Drupal/field/Entity/FieldInstance.php @@ -221,7 +221,7 @@ class FieldInstance extends ConfigEntityBase implements FieldInstanceInterface { * - field_uuid: optional. Either field_uuid or field_name is required * to build field instance. field_name will gain higher priority. * If field_name is not provided, field_uuid will be checked then. - * - entity_type: required. + * - entityType: required. * - bundle: required. * * In most cases, Field instance entities are created via @@ -266,7 +266,7 @@ public function __construct(array $values, $entity_type = 'field_instance') { unset($values['field_type']); // Check required properties. - if (empty($values['entity_type'])) { + if (empty($values['entityType'])) { throw new FieldException(format_string('Attempt to create an instance of field @field_id without an entity type.', array('@field_id' => $this->field->id))); } if (empty($values['bundle'])) { @@ -298,7 +298,7 @@ public function getExportProperties() { 'status', 'langcode', 'field_uuid', - 'entity_type', + 'entityType', 'bundle', 'label', 'description', @@ -359,7 +359,7 @@ protected function saveNew() { // Check that the field can be attached to this entity type. if (!empty($this->field->entity_types) && !in_array($this->entity_type, $this->field->entity_types)) { - throw new FieldException(format_string('Attempt to create an instance of field @field_id on forbidden entity type @entity_type.', array('@field_id' => $this->field->id, '@entity_type' => $this->entity_type))); + throw new FieldException(format_string('Attempt to create an instance of field @field_id on forbidden entity type @entityType.', array('@field_id' => $this->field->id, '@entityType' => $this->entity_type))); } // Ensure the field instance is unique within the bundle. @@ -400,7 +400,7 @@ protected function saveUpdated() { // Some updates are always disallowed. if ($this->entity_type != $original->entity_type) { - throw new FieldException("Cannot change an existing instance's entity_type."); + throw new FieldException("Cannot change an existing instance's entityType."); } if ($this->bundle != $original->bundle && empty($this->bundle_rename_allowed)) { throw new FieldException("Cannot change an existing instance's bundle."); @@ -551,7 +551,7 @@ public function uri() { return array( 'path' => $path . '/fields/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/field/lib/Drupal/field/FieldInfo.php b/core/modules/field/lib/Drupal/field/FieldInfo.php index e97a412..ebe7739 100644 --- a/core/modules/field/lib/Drupal/field/FieldInfo.php +++ b/core/modules/field/lib/Drupal/field/FieldInfo.php @@ -203,7 +203,7 @@ public function getFieldMap() { // entity types. if (isset($fields[$field_uuid])) { $field = $fields[$field_uuid]; - $map[$field['id']]['bundles'][$instance_config['entity_type']][] = $instance_config['bundle']; + $map[$field['id']]['bundles'][$instance_config['entityType']][] = $instance_config['bundle']; $map[$field['id']]['type'] = $field['type']; } } @@ -260,8 +260,8 @@ public function getFields() { * (optional) The entity type. * * @return - * If $entity_type is not set, all instances keyed by entity type and bundle - * name. If $entity_type is set, all instances for that entity type, keyed + * If $entityType is not set, all instances keyed by entity type and bundle + * name. If $entityType is set, all instances for that entity type, keyed * by bundle name. */ public function getInstances($entity_type = NULL) { @@ -282,7 +282,7 @@ public function getInstances($entity_type = NULL) { foreach (field_read_instances() as $instance) { $field = $this->getField($instance['field_name']); $instance = $this->prepareInstance($instance, $field['type']); - $this->bundleInstances[$instance['entity_type']][$instance['bundle']][$instance['field_name']] = $instance; + $this->bundleInstances[$instance['entityType']][$instance['bundle']][$instance['field_name']] = $instance; } // Store in persistent cache. diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php index f9ce249..4412f4d 100644 --- a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php +++ b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php @@ -115,9 +115,9 @@ public function loadByProperties(array $conditions = array()) { unset($conditions['include_deleted']); // Get instances stored in configuration. - if (isset($conditions['entity_type']) && isset($conditions['bundle']) && isset($conditions['field_name'])) { + if (isset($conditions['entityType']) && isset($conditions['bundle']) && isset($conditions['field_name'])) { // Optimize for the most frequent case where we do have a specific ID. - $id = $conditions['entity_type'] . '.' . $conditions['bundle'] . '.' . $conditions['field_name']; + $id = $conditions['entityType'] . '.' . $conditions['bundle'] . '.' . $conditions['field_name']; $instances = $this->entityManager->getStorageController($this->entityType)->loadMultiple(array($id)); } else { diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php b/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php index aa93124..aa083ac 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php +++ b/core/modules/field/lib/Drupal/field/Plugin/Type/Formatter/FormatterBase.php @@ -91,7 +91,7 @@ public function view(EntityInterface $entity, $langcode, FieldInterface $items) '#field_name' => $field_name, '#field_type' => $this->fieldDefinition->getFieldType(), '#field_translatable' => $this->fieldDefinition->isFieldTranslatable(), - '#entity_type' => $entity_type, + '#entityType' => $entity_type, '#bundle' => $entity->bundle(), '#object' => $entity, '#items' => $items->getValue(TRUE), diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php b/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php index 4cf4556..c88920d 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php +++ b/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetBase.php @@ -246,7 +246,7 @@ protected function formMultipleElements(EntityInterface $entity, FieldInterface */ protected function formSingleElement(EntityInterface $entity, FieldInterface $items, $delta, $langcode, array $element, array &$form, array &$form_state) { $element += array( - '#entity_type' => $entity->entityType(), + '#entityType' => $entity->entityType(), '#bundle' => $entity->bundle(), '#entity' => $entity, '#field_name' => $this->fieldDefinition->getFieldName(), diff --git a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php b/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php index e27484e..f150d54 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php +++ b/core/modules/field/lib/Drupal/field/Plugin/Type/Widget/WidgetInterface.php @@ -81,7 +81,7 @@ public function settingsSummary(); * The order of this item in the array of subelements (0, 1, 2, etc). * @param array $element * A form element array containing basic properties for the widget: - * - #entity_type: The name of the entity the field is attached to. + * - #entityType: The name of the entity the field is attached to. * - #bundle: The name of the field bundle the field is contained in. * - #entity: The entity the field is attached to. * - #field_name: The name of the field. diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php index a487a7a..7d39955 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php @@ -55,7 +55,7 @@ class Field extends FieldPluginBase { public $limit_values; /** - * A shortcut for $view->base_table. + * A shortcut for $view->baseTable. * * @var string */ @@ -149,15 +149,15 @@ public function access() { } /** - * Set the base_table and base_table_alias. + * Set the baseTable and base_table_alias. * * @return string * The base table which is used in the current view "context". */ function get_base_table() { if (!isset($this->base_table)) { - // This base_table is coming from the entity not the field. - $this->base_table = $this->view->storage->get('base_table'); + // This baseTable is coming from the entity not the field. + $this->base_table = $this->view->storage->get('baseTable'); // If the current field is under a relationship you can't be sure that the // base table of the view is the base table of the current field. @@ -187,7 +187,7 @@ public function query($use_groupby = FALSE) { $entity_type = $this->definition['entity_tables'][$this->base_table]; $fields = $this->additional_fields; // No need to add the entity type. - $entity_type_key = array_search('entity_type', $fields); + $entity_type_key = array_search('entityType', $fields); if ($entity_type_key !== FALSE) { unset($fields[$entity_type_key]); } @@ -587,7 +587,7 @@ public function buildGroupByForm(&$form, &$form_state) { '#options' => $group_columns, ); - $options = drupal_map_assoc(array('bundle', 'language', 'entity_type'), 'ucfirst'); + $options = drupal_map_assoc(array('bundle', 'language', 'entityType'), 'ucfirst'); // Add on defined fields, noting that they're prefixed with the field name. $form['group_columns'] = array( diff --git a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php index 58799f5..817b281 100644 --- a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php @@ -135,7 +135,7 @@ function setUp() { foreach ($this->fields as $field) { entity_create('field_instance', array( 'field_name' => $field->id(), - 'entity_type' => $this->entity_type, + 'entityType' => $this->entity_type, 'bundle' => $bundle, ))->save(); } @@ -199,7 +199,7 @@ function testDeleteFieldInstance() { ->sort('id') ->execute(); $ids = (object) array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => $bundle, ); $entities = array(); diff --git a/core/modules/field/lib/Drupal/field/Tests/CrudTest.php b/core/modules/field/lib/Drupal/field/Tests/CrudTest.php index 8e16c3e..6494049 100644 --- a/core/modules/field/lib/Drupal/field/Tests/CrudTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/CrudTest.php @@ -234,7 +234,7 @@ function testReadFields() { // Create an instance of the field. $instance_definition = array( 'field_name' => $field_definition['field_name'], - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ); entity_create('field_instance', $instance_definition)->save(); @@ -301,7 +301,7 @@ function testDeleteField() { // Create instances for each. $this->instance_definition = array( 'field_name' => $this->field['field_name'], - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ); entity_create('field_instance', $this->instance_definition)->save(); @@ -394,7 +394,7 @@ function testUpdateField() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => 'field_update', - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', )); $instance->save(); diff --git a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php b/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php index e2fb2f9..a2f4c7c 100644 --- a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php @@ -76,7 +76,7 @@ function setUp() { ); $instance = array( 'field_name' => $this->field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'label' => $this->label, ); @@ -99,11 +99,11 @@ function setUp() { entity_create('field_entity', $field)->save(); entity_create('field_instance', $instance)->save(); // Create a display for the default view mode. - entity_get_display($instance['entity_type'], $instance['bundle'], 'default') + entity_get_display($instance['entityType'], $instance['bundle'], 'default') ->setComponent($this->field_name, $this->display_options['default']) ->save(); // Create a display for the teaser view mode. - entity_get_display($instance['entity_type'], $instance['bundle'], 'teaser') + entity_get_display($instance['entityType'], $instance['bundle'], 'teaser') ->setComponent($this->field_name, $this->display_options['teaser']) ->save(); diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php index 0f86ac5..5f17fb0 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldAccessTest.php @@ -58,7 +58,7 @@ function setUp() { entity_create('field_entity', $field)->save(); $instance = array( 'field_name' => $field['field_name'], - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => $content_type, ); entity_create('field_instance', $instance)->save(); diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php index 4739d5f..da01077 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldAttachOtherTest.php @@ -263,7 +263,7 @@ function testFieldAttachCache() { $entity_type = 'entity_test_cache'; $cid = "field:$entity_type:" . $entity_init->id(); $instance_definition = $this->instance_definition; - $instance_definition['entity_type'] = $entity_type; + $instance_definition['entityType'] = $entity_type; $instance_definition['bundle'] = $entity_type; entity_create('field_instance', $instance_definition)->save(); diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php index 5d422af..ba3b6f4 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldAttachStorageTest.php @@ -136,7 +136,7 @@ function testFieldAttachLoadMultiple() { foreach ($field_bundles_map[$i] as $bundle) { entity_create('field_instance', array( 'field_name' => $field_names[$i], - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $bundles[$bundle], 'settings' => array( // Configure the instance so that we test hook_field_load() @@ -206,7 +206,7 @@ function testFieldAttachSaveLoadDifferentStorage() { entity_create('field_entity', $field)->save(); $instance = array( 'field_name' => $field['field_name'], - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $entity_type, ); entity_create('field_instance', $instance)->save(); @@ -247,7 +247,7 @@ function testFieldStorageDetailsAlter() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', )); $instance->save(); @@ -480,7 +480,7 @@ function testEntityDeleteBundle() { entity_create('field_entity', $field)->save(); $instance = array( 'field_name' => $field_name, - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $this->instance['bundle'], 'label' => $this->randomName() . '_label', 'description' => $this->randomName() . '_description', diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php index 70f99f1..4d111c9 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldInfoTest.php @@ -70,7 +70,7 @@ function testFieldInfo() { // Create an instance, verify that it shows up $instance_definition = array( 'field_name' => $field['field_name'], - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'label' => $this->randomName(), 'description' => $this->randomName(), @@ -154,7 +154,7 @@ function testInstancePrepare() { entity_create('field_entity', $field_definition)->save(); $instance_definition = array( 'field_name' => $field_definition['field_name'], - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ); $instance = entity_create('field_instance', $instance_definition); @@ -169,7 +169,7 @@ function testInstancePrepare() { field_info_cache_clear(); // Read the instance back. - $instance = field_info_instance($instance_definition['entity_type'], $instance_definition['field_name'], $instance_definition['bundle']); + $instance = field_info_instance($instance_definition['entityType'], $instance_definition['field_name'], $instance_definition['bundle']); // Check that all expected instance settings are in place. $field_type = \Drupal::service('plugin.manager.entity.field.field_type')->getDefinition($field_definition['type']); @@ -189,7 +189,7 @@ function testInstanceDisabledEntityType() { entity_create('field_entity', $field_definition)->save(); $instance_definition = array( 'field_name' => 'field', - 'entity_type' => 'comment', + 'entityType' => 'comment', 'bundle' => 'comment_node_article', ); entity_create('field_instance', $instance_definition)->save(); @@ -228,22 +228,22 @@ function testFieldMap() { $instances = array( array( 'field_name' => 'field_1', - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ), array( 'field_name' => 'field_1', - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'test_bundle_2', ), array( 'field_name' => 'field_2', - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ), array( 'field_name' => 'field_2', - 'entity_type' => 'entity_test_cache', + 'entityType' => 'entity_test_cache', 'bundle' => 'entity_test', ), ); diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php index 0ba7eb5..c9fc620 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php @@ -51,7 +51,7 @@ function setUp() { $this->field->save(); $this->instance_definition = array( 'field_name' => $this->field['field_name'], - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ); } @@ -117,7 +117,7 @@ function testCreateFieldInstance() { try { $instance = $this->instance_definition; $instance['field_name'] = $field_restricted_definition['field_name']; - $instance['entity_type'] = 'entity_test_cache'; + $instance['entityType'] = 'entity_test_cache'; entity_create('field_instance', $instance)->save(); $this->pass(t('Can create an instance on an entity type allowed by the field.')); } @@ -149,7 +149,7 @@ function testReadFieldInstance() { // Read the instance back. $instance = field_read_instance('entity_test', $this->instance_definition['field_name'], $this->instance_definition['bundle']); $this->assertTrue($this->instance_definition['field_name'] == $instance['field_name'], 'The field was properly read.'); - $this->assertTrue($this->instance_definition['entity_type'] == $instance['entity_type'], 'The field was properly read.'); + $this->assertTrue($this->instance_definition['entityType'] == $instance['entityType'], 'The field was properly read.'); $this->assertTrue($this->instance_definition['bundle'] == $instance['bundle'], 'The field was properly read.'); } diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php b/core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php index 4580e7b..7340c6e 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldUnitTestBase.php @@ -70,7 +70,7 @@ function createFieldWithInstance($suffix = '', $entity_type = 'entity_test', $bu $this->$field_id = $this->{$field}['uuid']; $this->$instance_definition = array( 'field_name' => $this->$field_name, - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $bundle, 'label' => $this->randomName() . '_label', 'description' => $this->randomName() . '_description', diff --git a/core/modules/field/lib/Drupal/field/Tests/FormTest.php b/core/modules/field/lib/Drupal/field/Tests/FormTest.php index b263859..cc68b02 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FormTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/FormTest.php @@ -66,7 +66,7 @@ function setUp() { $this->field_unlimited = array('field_name' => 'field_unlimited', 'type' => 'test_field', 'cardinality' => FIELD_CARDINALITY_UNLIMITED); $this->instance = array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'label' => $this->randomName() . '_label', 'description' => '[site:name]_description', @@ -83,7 +83,7 @@ function testFieldFormSingle() { $this->instance['field_name'] = $field_name; entity_create('field_entity', $field)->save(); entity_create('field_instance', $this->instance)->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($field_name) ->save(); $langcode = Language::LANGCODE_NOT_SPECIFIED; @@ -168,7 +168,7 @@ function testFieldFormDefaultValue() { $this->instance['default_value'] = array(array('value' => $default)); entity_create('field_entity', $field)->save(); entity_create('field_instance', $this->instance)->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($field_name) ->save(); $langcode = Language::LANGCODE_NOT_SPECIFIED; @@ -199,7 +199,7 @@ function testFieldFormSingleRequired() { $this->instance['required'] = TRUE; entity_create('field_entity', $field)->save(); entity_create('field_instance', $this->instance)->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($field_name) ->save(); $langcode = Language::LANGCODE_NOT_SPECIFIED; @@ -248,7 +248,7 @@ function testFieldFormUnlimited() { $this->instance['field_name'] = $field_name; entity_create('field_entity', $field)->save(); entity_create('field_instance', $this->instance)->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($field_name) ->save(); $langcode = Language::LANGCODE_NOT_SPECIFIED; @@ -335,7 +335,7 @@ function testFieldFormMultivalueWithRequiredRadio() { $this->instance['field_name'] = $field_name; entity_create('field_entity', $field)->save(); entity_create('field_instance', $this->instance)->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($field_name) ->save(); $langcode = Language::LANGCODE_NOT_SPECIFIED; @@ -350,12 +350,12 @@ function testFieldFormMultivalueWithRequiredRadio() { ))->save(); $instance = array( 'field_name' => 'required_radio_test', - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'required' => TRUE, ); entity_create('field_instance', $instance)->save(); - entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default') + entity_get_form_display($instance['entityType'], $instance['bundle'], 'default') ->setComponent($instance['field_name'], array( 'type' => 'options_buttons', )) @@ -382,7 +382,7 @@ function testFieldFormJSAddMore() { $this->instance['field_name'] = $field_name; entity_create('field_entity', $field)->save(); entity_create('field_instance', $this->instance)->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($field_name) ->save(); $langcode = Language::LANGCODE_NOT_SPECIFIED; @@ -444,7 +444,7 @@ function testFieldFormMultipleWidget() { $this->instance['field_name'] = $field_name; entity_create('field_entity', $field)->save(); entity_create('field_instance', $this->instance)->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($field_name, array( 'type' => 'test_field_widget_multiple', )) @@ -491,7 +491,7 @@ function testFieldFormAccess() { $entity_type = 'entity_test_rev'; $instance = $this->instance; $instance['field_name'] = $field_name; - $instance['entity_type'] = $entity_type; + $instance['entityType'] = $entity_type; $instance['bundle'] = $entity_type; entity_create('field_entity', $field)->save(); entity_create('field_instance', $instance)->save(); @@ -507,13 +507,13 @@ function testFieldFormAccess() { $field_name_no_access = $field_no_access['field_name']; $instance_no_access = array( 'field_name' => $field_name_no_access, - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $entity_type, 'default_value' => array(0 => array('value' => 99)), ); entity_create('field_entity', $field_no_access)->save(); entity_create('field_instance', $instance_no_access)->save(); - entity_get_form_display($instance_no_access['entity_type'], $instance_no_access['bundle'], 'default') + entity_get_form_display($instance_no_access['entityType'], $instance_no_access['bundle'], 'default') ->setComponent($field_name_no_access) ->save(); @@ -528,7 +528,7 @@ function testFieldFormAccess() { $form_state['form_display'] = entity_get_form_display($entity_type, $entity_type, 'default'); field_attach_form($entity, $form, $form_state); - $this->assertEqual($form[$field_name_no_access][$langcode][0]['value']['#entity_type'], $entity_type, 'The correct entity type is set in the field structure.'); + $this->assertEqual($form[$field_name_no_access][$langcode][0]['value']['#entityType'], $entity_type, 'The correct entity type is set in the field structure.'); $this->assertFalse($form[$field_name_no_access]['#access'], 'Field #access is FALSE for the field without edit access.'); // Display creation form. @@ -566,7 +566,7 @@ function testFieldFormAccess() { $this->assertEqual($entity->$field_name->value, 2, 'New revision has the expected value for the field with edit access.'); // Check that the revision is also saved in the revisions table. -// $entity = entity_revision_load($entity_type, $entity->getRevisionId()); +// $entity = entity_revision_load($entityType, $entity->getRevisionId()); $this->assertEqual($entity->$field_name_no_access->value, 99, 'New revision has the expected value for the field with no edit access.'); $this->assertEqual($entity->$field_name->value, 2, 'New revision has the expected value for the field with edit access.'); } @@ -580,12 +580,12 @@ function testFieldFormHiddenWidget() { $field_name = $field['field_name']; $this->instance['field_name'] = $field_name; $this->instance['default_value'] = array(0 => array('value' => 99)); - $this->instance['entity_type'] = $entity_type; + $this->instance['entityType'] = $entity_type; $this->instance['bundle'] = $entity_type; entity_create('field_entity', $field)->save(); $this->instance = entity_create('field_instance', $this->instance); $this->instance->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($this->instance['field_name'], array( 'type' => 'hidden', )) @@ -609,7 +609,7 @@ function testFieldFormHiddenWidget() { // default widget. $this->instance['default_value'] = NULL; $this->instance->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($this->instance['field_name'], array( 'type' => 'test_field_widget', )) @@ -629,7 +629,7 @@ function testFieldFormHiddenWidget() { $this->assertEqual($entity->{$field_name}->value, $value, 'Field value was updated'); // Update the form display and switch to the Hidden widget again. - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($this->instance['field_name'], array( 'type' => 'hidden', )) diff --git a/core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php b/core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php index 3d180f6..74373b1 100644 --- a/core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/NestedFormTest.php @@ -37,7 +37,7 @@ public function setUp() { $this->field_unlimited = array('field_name' => 'field_unlimited', 'type' => 'test_field', 'cardinality' => FIELD_CARDINALITY_UNLIMITED); $this->instance = array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'label' => $this->randomName() . '_label', 'description' => '[site:name]_description', @@ -58,13 +58,13 @@ function testNestedFieldForm() { $this->instance['field_name'] = 'field_single'; $this->instance['label'] = 'Single field'; entity_create('field_instance', $this->instance)->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($this->instance['field_name']) ->save(); $this->instance['field_name'] = 'field_unlimited'; $this->instance['label'] = 'Unlimited field'; entity_create('field_instance', $this->instance)->save(); - entity_get_form_display($this->instance['entity_type'], $this->instance['bundle'], 'default') + entity_get_form_display($this->instance['entityType'], $this->instance['bundle'], 'default') ->setComponent($this->instance['field_name']) ->save(); diff --git a/core/modules/field/lib/Drupal/field/Tests/ShapeItemTest.php b/core/modules/field/lib/Drupal/field/Tests/ShapeItemTest.php index 6f7f3a0..328b36c 100644 --- a/core/modules/field/lib/Drupal/field/Tests/ShapeItemTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/ShapeItemTest.php @@ -47,7 +47,7 @@ public function setUp() { ); entity_create('field_entity', $field)->save(); $instance = array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => $this->field_name, 'bundle' => 'entity_test', ); diff --git a/core/modules/field/lib/Drupal/field/Tests/TestItemTest.php b/core/modules/field/lib/Drupal/field/Tests/TestItemTest.php index e8b85d1..b9f2f8d 100644 --- a/core/modules/field/lib/Drupal/field/Tests/TestItemTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/TestItemTest.php @@ -47,7 +47,7 @@ public function setUp() { ); entity_create('field_entity', $field)->save(); $instance = array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => $this->field_name, 'bundle' => 'entity_test', ); diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php index 85c14e2..d5c1dc7 100644 --- a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php @@ -95,7 +95,7 @@ function setUp() { $this->instance_definition = array( 'field_name' => $this->field_name, - 'entity_type' => $this->entity_type, + 'entityType' => $this->entity_type, 'bundle' => 'entity_test', ); entity_create('field_instance', $this->instance_definition)->save(); @@ -253,7 +253,7 @@ function testFieldDisplayLanguage() { $instance = array( 'field_name' => $field['field_name'], - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => 'entity_test', ); entity_create('field_instance', $instance)->save(); diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php b/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php index 69b4c48..a117f94 100644 --- a/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/TranslationWebTest.php @@ -75,7 +75,7 @@ function setUp() { $instance = array( 'field_name' => $this->field_name, - 'entity_type' => $this->entity_type, + 'entityType' => $this->entity_type, 'bundle' => $this->entity_type, ); entity_create('field_instance', $instance)->save(); diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php b/core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php index 4bf2625..88062de 100644 --- a/core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/Views/ApiDataTest.php @@ -33,7 +33,7 @@ function setUp() { // The first one will be attached to nodes only. $instance = array( 'field_name' => $field_names[0], - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', ); entity_create('field_instance', $instance)->save(); @@ -41,7 +41,7 @@ function setUp() { // The second one will be attached to users only. $instance = array( 'field_name' => $field_names[1], - 'entity_type' => 'user', + 'entityType' => 'user', 'bundle' => 'user', ); entity_create('field_instance', $instance)->save(); @@ -49,13 +49,13 @@ function setUp() { // The third will be attached to both nodes and users. $instance = array( 'field_name' => $field_names[2], - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', ); entity_create('field_instance', $instance)->save(); $instance = array( 'field_name' => $field_names[2], - 'entity_type' => 'user', + 'entityType' => 'user', 'bundle' => 'user', ); entity_create('field_instance', $instance)->save(); @@ -99,7 +99,7 @@ function testViewsData() { 'left_field' => 'nid', 'field' => 'entity_id', 'extra' => array( - array('field' => 'entity_type', 'value' => 'node'), + array('field' => 'entityType', 'value' => 'node'), array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE), ), ); @@ -108,7 +108,7 @@ function testViewsData() { 'left_field' => 'vid', 'field' => 'revision_id', 'extra' => array( - array('field' => 'entity_type', 'value' => 'node'), + array('field' => 'entityType', 'value' => 'node'), array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE), ), ); @@ -133,7 +133,7 @@ function testViewsData() { 'left_field' => 'nid', 'field' => 'entity_id', 'extra' => array( - array('field' => 'entity_type', 'value' => 'node'), + array('field' => 'entityType', 'value' => 'node'), array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE), ) ); @@ -142,7 +142,7 @@ function testViewsData() { 'left_field' => 'vid', 'field' => 'revision_id', 'extra' => array( - array('field' => 'entity_type', 'value' => 'node'), + array('field' => 'entityType', 'value' => 'node'), array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE), ) ); @@ -151,7 +151,7 @@ function testViewsData() { 'left_field' => 'uid', 'field' => 'entity_id', 'extra' => array( - array('field' => 'entity_type', 'value' => 'user'), + array('field' => 'entityType', 'value' => 'user'), array('field' => 'deleted', 'value' => 0, 'numeric' => TRUE), ) ); diff --git a/core/modules/field/lib/Drupal/field/Tests/Views/FieldTestBase.php b/core/modules/field/lib/Drupal/field/Tests/Views/FieldTestBase.php index 3cba44c..1125d99 100644 --- a/core/modules/field/lib/Drupal/field/Tests/Views/FieldTestBase.php +++ b/core/modules/field/lib/Drupal/field/Tests/Views/FieldTestBase.php @@ -71,7 +71,7 @@ function setUpInstances($bundle = 'page') { foreach ($this->fields as $key => $field) { $instance = array( 'field_name' => $field['field_name'], - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', ); $this->instances[$key] = entity_create('field_instance', $instance); diff --git a/core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php b/core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php index 6d4ed4a..439b622 100644 --- a/core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/reEnableModuleFieldTest.php @@ -58,7 +58,7 @@ function testReEnabledField() { entity_create('field_instance', array( 'field_name' => 'field_telephone', 'label' => 'Telephone Number', - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'article', ))->save(); diff --git a/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import.yml b/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import.yml index 55f2980..98db0a3 100644 --- a/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import.yml +++ b/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import.yml @@ -1,7 +1,7 @@ id: entity_test.entity_test.field_test_import langcode: und field_name: field_test_import -entity_type: entity_test +entityType: entity_test bundle: entity_test label: 'Test import field' description: '' diff --git a/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import_2.yml index 7bb59cf..b85ffa5 100644 --- a/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import_2.yml +++ b/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.entity_test.field_test_import_2.yml @@ -1,7 +1,7 @@ id: entity_test.entity_test.field_test_import_2 langcode: und field_name: field_test_import_2 -entity_type: entity_test +entityType: entity_test bundle: entity_test label: 'Test import field 2 on entity_test bundle' description: '' diff --git a/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.test_bundle.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.test_bundle.field_test_import_2.yml index e58e846..b1f0a5b 100644 --- a/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.test_bundle.field_test_import_2.yml +++ b/core/modules/field/tests/modules/field_test_config/config/field.instance.entity_test.test_bundle.field_test_import_2.yml @@ -1,7 +1,7 @@ id: entity_test.test_bundle.field_test_import_2 langcode: und field_name: field_test_import_2 -entity_type: entity_test +entityType: entity_test bundle: test_bundle label: 'Test import field 2 on test bundle' description: '' diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml index d4a2a7a..7bc4c26 100644 --- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml +++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml @@ -2,7 +2,7 @@ id: entity_test.entity_test.field_test_import_staging uuid: ea711065-6940-47cd-813d-618f64095481 langcode: und field_uuid: 0bf654cc-f14a-4881-b94c-76959e47466b -entity_type: entity_test +entityType: entity_test bundle: entity_test label: 'Import from staging' description: '' diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml index 3754676..b3e87fe 100644 --- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml +++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml @@ -2,7 +2,7 @@ id: entity_test.test_bundle.field_test_import_staging_2 uuid: f07794a2-d7cc-45b6-b40d-13cf021b5552 langcode: und field_uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00 -entity_type: entity_test +entityType: entity_test bundle: test_bundle label: 'Test import field 2 on test bundle' description: '' diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml index 0321af9..474ca88 100644 --- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml +++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml @@ -2,7 +2,7 @@ id: entity_test.test_bundle_2.field_test_import_staging_2 uuid: 49d6dd19-5097-443d-8f00-fc79525bebce langcode: und field_uuid: 2165d9aa-9a0c-41a1-be02-2a49f3405c00 -entity_type: entity_test +entityType: entity_test bundle: test_bundle_2 label: 'Test import field 2 on test bundle 2' description: '' diff --git a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml index 940848f..b3ab806 100644 --- a/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml +++ b/core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/field_sql_storage/field_sql_storage.install b/core/modules/field_sql_storage/field_sql_storage.install index 523e0e0..159c8c4 100644 --- a/core/modules/field_sql_storage/field_sql_storage.install +++ b/core/modules/field_sql_storage/field_sql_storage.install @@ -17,11 +17,11 @@ function _update_8000_field_sql_storage_write($entity_type, $bundle, $entity_id, $revision_name = "field_revision_{$field_name}"; db_delete($table_name) - ->condition('entity_type', $entity_type) + ->condition('entityType', $entity_type) ->condition('entity_id', $entity_id) ->execute(); db_delete($revision_name) - ->condition('entity_type', $entity_type) + ->condition('entityType', $entity_type) ->condition('entity_id', $entity_id) ->condition('revision_id', $revision_id) ->execute(); @@ -30,7 +30,7 @@ function _update_8000_field_sql_storage_write($entity_type, $bundle, $entity_id, foreach ($data as $langcode => $items) { foreach ($items as $delta => $item) { $record = array( - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'entity_id' => $entity_id, 'revision_id' => $revision_id, 'bundle' => $bundle, @@ -107,14 +107,14 @@ function field_sql_storage_update_8000(&$sandbox) { // Prepare updated schema data structures. $primary_key_data = array( - 'entity_type', + 'entityType', 'entity_id', 'deleted', 'delta', 'langcode', ); $primary_key_revision = array( - 'entity_type', + 'entityType', 'entity_id', 'revision_id', 'deleted', diff --git a/core/modules/field_sql_storage/field_sql_storage.module b/core/modules/field_sql_storage/field_sql_storage.module index 3e5e25f..022b241 100644 --- a/core/modules/field_sql_storage/field_sql_storage.module +++ b/core/modules/field_sql_storage/field_sql_storage.module @@ -130,7 +130,7 @@ function _field_sql_storage_schema($field) { $current = array( 'description' => "Data storage for {$deleted}field {$field['id']} ({$field['field_name']})", 'fields' => array( - 'entity_type' => array( + 'entityType' => array( 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, @@ -178,9 +178,9 @@ function _field_sql_storage_schema($field) { 'description' => 'The sequence number for this data item, used for multi-value fields', ), ), - 'primary key' => array('entity_type', 'entity_id', 'deleted', 'delta', 'langcode'), + 'primary key' => array('entityType', 'entity_id', 'deleted', 'delta', 'langcode'), 'indexes' => array( - 'entity_type' => array('entity_type'), + 'entityType' => array('entityType'), 'bundle' => array('bundle'), 'deleted' => array('deleted'), 'entity_id' => array('entity_id'), @@ -228,7 +228,7 @@ function _field_sql_storage_schema($field) { // Construct the revision table. $revision = $current; $revision['description'] = "Revision archive storage for {$deleted}field {$field['id']} ({$field['field_name']})"; - $revision['primary key'] = array('entity_type', 'entity_id', 'revision_id', 'deleted', 'delta', 'langcode'); + $revision['primary key'] = array('entityType', 'entity_id', 'revision_id', 'deleted', 'delta', 'langcode'); $revision['fields']['revision_id']['not null'] = TRUE; $revision['fields']['revision_id']['description'] = 'The entity revision id this data is attached to'; @@ -383,7 +383,7 @@ function field_sql_storage_field_storage_load($entity_type, $entities, $age, $fi $query = db_select($table, 't') ->fields('t') - ->condition('entity_type', $entity_type) + ->condition('entityType', $entity_type) ->condition($load_current ? 'entity_id' : 'revision_id', $ids, 'IN') ->condition('langcode', field_available_languages($entity_type, $field), 'IN') ->orderBy('delta'); @@ -449,13 +449,13 @@ function field_sql_storage_field_storage_write(EntityInterface $entity, $op, $fi // of an entity. if ($entity->isDefaultRevision()) { db_delete($table_name) - ->condition('entity_type', $entity_type) + ->condition('entityType', $entity_type) ->condition('entity_id', $id) ->condition('langcode', $langcodes, 'IN') ->execute(); } db_delete($revision_name) - ->condition('entity_type', $entity_type) + ->condition('entityType', $entity_type) ->condition('entity_id', $id) ->condition('revision_id', $vid) ->condition('langcode', $langcodes, 'IN') @@ -465,7 +465,7 @@ function field_sql_storage_field_storage_write(EntityInterface $entity, $op, $fi // Prepare the multi-insert query. $do_insert = FALSE; - $columns = array('entity_type', 'entity_id', 'revision_id', 'bundle', 'delta', 'langcode'); + $columns = array('entityType', 'entity_id', 'revision_id', 'bundle', 'delta', 'langcode'); foreach ($field['columns'] as $column => $attributes) { $columns[] = _field_sql_storage_columnname($field_name, $column); } @@ -479,7 +479,7 @@ function field_sql_storage_field_storage_write(EntityInterface $entity, $op, $fi // We now know we have someting to insert. $do_insert = TRUE; $record = array( - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'entity_id' => $id, 'revision_id' => $vid, 'bundle' => $bundle, @@ -539,11 +539,11 @@ function field_sql_storage_field_storage_purge(EntityInterface $entity, $field, $table_name = _field_sql_storage_tablename($field); $revision_name = _field_sql_storage_revision_tablename($field); db_delete($table_name) - ->condition('entity_type', $entity->entityType()) + ->condition('entityType', $entity->entityType()) ->condition('entity_id', $entity->id()) ->execute(); db_delete($revision_name) - ->condition('entity_type', $entity->entityType()) + ->condition('entityType', $entity->entityType()) ->condition('entity_id', $entity->id()) ->execute(); } @@ -560,7 +560,7 @@ function field_sql_storage_field_storage_delete_revision(EntityInterface $entity $field = field_info_field_by_id($field_id); $revision_name = _field_sql_storage_revision_tablename($field); db_delete($revision_name) - ->condition('entity_type', $entity->entityType()) + ->condition('entityType', $entity->entityType()) ->condition('entity_id', $entity->id()) ->condition('revision_id', $vid) ->execute(); @@ -579,12 +579,12 @@ function field_sql_storage_field_storage_delete_instance($instance) { $revision_name = _field_sql_storage_revision_tablename($field); db_update($table_name) ->fields(array('deleted' => 1)) - ->condition('entity_type', $instance['entity_type']) + ->condition('entityType', $instance['entityType']) ->condition('bundle', $instance['bundle']) ->execute(); db_update($revision_name) ->fields(array('deleted' => 1)) - ->condition('entity_type', $instance['entity_type']) + ->condition('entityType', $instance['entityType']) ->condition('bundle', $instance['bundle']) ->execute(); } @@ -594,7 +594,7 @@ function field_sql_storage_field_storage_delete_instance($instance) { */ function field_sql_storage_entity_bundle_rename($entity_type, $bundle_old, $bundle_new) { // We need to account for deleted or inactive fields and instances. - $instances = field_read_instances(array('entity_type' => $entity_type, 'bundle' => $bundle_new), array('include_deleted' => TRUE, 'include_inactive' => TRUE)); + $instances = field_read_instances(array('entityType' => $entity_type, 'bundle' => $bundle_new), array('include_deleted' => TRUE, 'include_inactive' => TRUE)); foreach ($instances as $instance) { $field = field_info_field_by_id($instance['field_id']); if ($field['storage']['type'] == 'field_sql_storage') { @@ -602,12 +602,12 @@ function field_sql_storage_entity_bundle_rename($entity_type, $bundle_old, $bund $revision_name = _field_sql_storage_revision_tablename($field); db_update($table_name) ->fields(array('bundle' => $bundle_new)) - ->condition('entity_type', $entity_type) + ->condition('entityType', $entity_type) ->condition('bundle', $bundle_old) ->execute(); db_update($revision_name) ->fields(array('bundle' => $bundle_new)) - ->condition('entity_type', $entity_type) + ->condition('entityType', $entity_type) ->condition('bundle', $bundle_old) ->execute(); } diff --git a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php index 58d64b2..9c93a70 100644 --- a/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php +++ b/core/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php @@ -78,7 +78,7 @@ function setUp() { $this->field->save(); $this->instance = entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $entity_type )); $this->instance->save(); @@ -95,7 +95,7 @@ function testFieldAttachLoad() { $eid = 0; $langcode = Language::LANGCODE_NOT_SPECIFIED; - $columns = array('entity_type', 'entity_id', 'revision_id', 'delta', 'langcode', $this->field_name . '_value'); + $columns = array('entityType', 'entity_id', 'revision_id', 'delta', 'langcode', $this->field_name . '_value'); // Insert data for four revisions to the field revisions table $query = db_insert($this->revision_table)->fields($columns); @@ -301,7 +301,7 @@ function testFieldAttachSaveMissingData() { // Add a translation in an unavailable language. $unavailable_langcode = 'xx'; db_insert($this->table) - ->fields(array('entity_type', 'bundle', 'deleted', 'entity_id', 'revision_id', 'delta', 'langcode')) + ->fields(array('entityType', 'bundle', 'deleted', 'entity_id', 'revision_id', 'delta', 'langcode')) ->values(array($entity_type, $this->instance->bundle, 0, 0, 0, 0, $unavailable_langcode)) ->execute(); $count = db_select($this->table) @@ -354,7 +354,7 @@ function testUpdateFieldSchemaWithData() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => 'decimal52', - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $entity_type, )); $instance->save(); @@ -418,7 +418,7 @@ function testFieldUpdateIndexesWithData() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $entity_type, )); $instance->save(); diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php b/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php index 928b12f..82766a6 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Access/FormModeAccessCheck.php @@ -27,7 +27,7 @@ public function appliesTo() { * {@inheritdoc} */ public function access(Route $route, Request $request) { - if ($entity_type = $request->attributes->get('entity_type')) { + if ($entity_type = $request->attributes->get('entityType')) { $bundle = $request->attributes->get('bundle'); $form_mode = $request->attributes->get('mode'); diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php b/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php index a431da2..1d2a311 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Access/ViewModeAccessCheck.php @@ -27,7 +27,7 @@ public function appliesTo() { * {@inheritdoc} */ public function access(Route $route, Request $request) { - if ($entity_type = $request->attributes->get('entity_type')) { + if ($entity_type = $request->attributes->get('entityType')) { $bundle = $request->attributes->get('bundle'); $view_mode = $request->attributes->get('mode'); diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php index 5e83093..915cf4c 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverviewBase.php @@ -97,7 +97,7 @@ public function buildForm(array $form, array &$form_state, $entity_type = NULL, ); $form += array( - '#entity_type' => $this->entity_type, + '#entityType' => $this->entity_type, '#bundle' => $this->bundle, '#mode' => $this->mode, '#fields' => array_keys($instances), diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php index c900c04..9aadea8 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php @@ -95,7 +95,7 @@ public function buildForm(array $form, array &$form_state, $entity_type = NULL, $field_prefix = \Drupal::config('field_ui.settings')->get('field_prefix'); $form += array( - '#entity_type' => $this->entity_type, + '#entityType' => $this->entity_type, '#bundle' => $this->bundle, '#fields' => array_keys($instances), ); @@ -388,7 +388,7 @@ public function submitForm(array &$form, array &$form_state) { ); $instance = array( 'field_name' => $field['field_name'], - 'entity_type' => $this->entity_type, + 'entityType' => $this->entity_type, 'bundle' => $this->bundle, 'label' => $values['label'], ); @@ -436,7 +436,7 @@ public function submitForm(array &$form, array &$form_state) { else { $instance = array( 'field_name' => $field['field_name'], - 'entity_type' => $this->entity_type, + 'entityType' => $this->entity_type, 'bundle' => $this->bundle, 'label' => $values['label'], ); diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php index 7e1b3bc..a95af16 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php @@ -159,7 +159,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceInterfac ); // Create an arbitrary entity object, so that we can have an instantiated // FieldItem. - $ids = (object) array('entity_type' => $this->instance['entity_type'], 'bundle' => $this->instance['bundle'], 'entity_id' => NULL); + $ids = (object) array('entityType' => $this->instance['entityType'], 'bundle' => $this->instance['bundle'], 'entity_id' => NULL); $entity = _field_create_entity_from_ids($ids); $form['field']['settings'] += $this->getFieldItem($entity, $field['field_name'])->settingsForm($form, $form_state, $field->hasData()); diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php index 4aff6da..c373a07 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php @@ -67,7 +67,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceInterfac $this->instance = $form_state['instance'] = $field_instance; $bundle = $this->instance['bundle']; - $entity_type = $this->instance['entity_type']; + $entity_type = $this->instance['entityType']; $field = $this->instance->getField(); $bundles = entity_get_bundles(); @@ -78,7 +78,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceInterfac $form['#field'] = $field; // Create an arbitrary entity object (used by the 'default value' widget). - $ids = (object) array('entity_type' => $this->instance['entity_type'], 'bundle' => $this->instance['bundle'], 'entity_id' => NULL); + $ids = (object) array('entityType' => $this->instance['entityType'], 'bundle' => $this->instance['bundle'], 'entity_id' => NULL); $form['#entity'] = _field_create_entity_from_ids($ids); $items = $this->getFieldItems($form['#entity'], $this->instance['field_name']); @@ -99,7 +99,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceInterfac '#type' => 'value', '#value' => $this->instance['field_name'], ); - $form['instance']['entity_type'] = array( + $form['instance']['entityType'] = array( '#type' => 'value', '#value' => $entity_type, ); diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php b/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php index e994202..190b0f4 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Routing/RouteSubscriber.php @@ -75,7 +75,7 @@ public function routes(RouteBuildEvent $event) { $collection->add("field_ui.delete.$entity_type", $route); // If the entity type has no bundles, use the entity type. - $defaults['entity_type'] = $entity_type; + $defaults['entityType'] = $entity_type; if (empty($entity_info['entity_keys']['bundle'])) { $defaults['bundle'] = $entity_type; } diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php index 8f29e45..5af9627 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php @@ -49,7 +49,7 @@ function setUp() { $instance = array( 'field_name' => 'field_' . $vocabulary->id(), - 'entity_type' => 'node', + 'entityType' => 'node', 'label' => 'Tags', 'bundle' => 'article', ); @@ -281,7 +281,7 @@ function testDefaultValue() { ))->save(); $instance = entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => $this->type, )); $instance->save(); @@ -323,7 +323,7 @@ function testDefaultValue() { $this->assertEqual($instance['default_value'], NULL, 'The default value was correctly saved.'); // Check that the default widget is used when the field is hidden. - entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default') + entity_get_form_display($instance['entityType'], $instance['bundle'], 'default') ->removeComponent($field_name)->save(); $this->drupalGet($admin_path); $this->assertFieldById($element_id, '', 'The default value widget was displayed when field is hidden.'); @@ -390,7 +390,7 @@ function testLockedField() { $field->save(); entity_create('field_instance', array( 'field_uuid' => $field->uuid, - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => $this->type, ))->save(); entity_get_form_display('node', $this->type, 'default') @@ -425,7 +425,7 @@ function testHiddenFields() { $instance = array( 'field_name' => $field_name, 'bundle' => $this->type, - 'entity_type' => 'node', + 'entityType' => 'node', 'label' => t('Hidden field'), ); entity_create('field_instance', $instance)->save(); @@ -512,7 +512,7 @@ function testHelpDescriptions() { entity_create('field_instance', array( 'field_name' => 'field_image', - 'entity_type' => 'node', + 'entityType' => 'node', 'label' => 'Image', 'bundle' => 'article', ))->save(); diff --git a/core/modules/file/config/views.view.files.yml b/core/modules/file/config/views.view.files.yml index d88bd0a..f2d03a6 100644 --- a/core/modules/file/config/views.view.files.yml +++ b/core/modules/file/config/views.view.files.yml @@ -1,5 +1,5 @@ base_field: fid -base_table: file_managed +baseTable: file_managed core: 8.x description: 'Find and manage files.' status: '1' diff --git a/core/modules/file/file.module b/core/modules/file/file.module index e59126d..2d6a46c 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -1840,7 +1840,7 @@ function file_icon_map(File $file) { * returned. * * @return - * A multidimensional array. The keys are field_name, entity_type, + * A multidimensional array. The keys are field_name, entityType, * entity_id and the value is an entity referencing this file. */ function file_get_file_references(File $file, $field = NULL, $age = FIELD_LOAD_REVISION, $field_type = 'file') { diff --git a/core/modules/file/file.views.inc b/core/modules/file/file.views.inc index db18c46..a517a37 100644 --- a/core/modules/file/file.views.inc +++ b/core/modules/file/file.views.inc @@ -499,12 +499,12 @@ function file_field_views_data_views_data_alter(&$data, $field) { 'field_name' => $field['field_name'], 'field table' => _field_sql_storage_tablename($field), 'field field' => $field['field_name'] . '_target_id', - 'base' => $entity_info['base_table'], + 'base' => $entity_info['baseTable'], 'base field' => $entity_info['entity_keys']['id'], 'label' => t('!field_name', array('!field_name' => $field['field_name'])), 'join_extra' => array( 0 => array( - 'field' => 'entity_type', + 'field' => 'entityType', 'value' => $entity_type, ), 1 => array( diff --git a/core/modules/file/lib/Drupal/file/Entity/File.php b/core/modules/file/lib/Drupal/file/Entity/File.php index 833f2db..4c7e15e 100644 --- a/core/modules/file/lib/Drupal/file/Entity/File.php +++ b/core/modules/file/lib/Drupal/file/Entity/File.php @@ -26,7 +26,7 @@ * "storage" = "Drupal\file\FileStorageController", * "render" = "Drupal\Core\Entity\EntityRenderController" * }, - * base_table = "file_managed", + * baseTable = "file_managed", * entity_keys = { * "id" = "fid", * "label" = "filename", diff --git a/core/modules/file/lib/Drupal/file/FileStorageController.php b/core/modules/file/lib/Drupal/file/FileStorageController.php index 2f27551..12dc5cb 100644 --- a/core/modules/file/lib/Drupal/file/FileStorageController.php +++ b/core/modules/file/lib/Drupal/file/FileStorageController.php @@ -18,7 +18,7 @@ class FileStorageController extends DatabaseStorageControllerNG implements FileS * {@inheritdoc} */ public function spaceUsed($uid = NULL, $status = FILE_STATUS_PERMANENT) { - $query = $this->database->select($this->entityInfo['base_table'], 'f') + $query = $this->database->select($this->entityInfo['baseTable'], 'f') ->condition('f.status', $status); $query->addExpression('SUM(f.filesize)', 'filesize'); if (isset($uid)) { @@ -33,7 +33,7 @@ public function spaceUsed($uid = NULL, $status = FILE_STATUS_PERMANENT) { public function retrieveTemporaryFiles() { // Use separate placeholders for the status to avoid a bug in some versions // of PHP. See http://drupal.org/node/352956. - return $this->database->query('SELECT fid FROM {' . $this->entityInfo['base_table'] . '} WHERE status <> :permanent AND timestamp < :timestamp', array( + return $this->database->query('SELECT fid FROM {' . $this->entityInfo['baseTable'] . '} WHERE status <> :permanent AND timestamp < :timestamp', array( ':permanent' => FILE_STATUS_PERMANENT, ':timestamp' => REQUEST_TIME - DRUPAL_MAXIMUM_TEMP_FILE_AGE )); diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php b/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php index 7d8c4cd..96fdaee 100644 --- a/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php +++ b/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php @@ -17,7 +17,7 @@ * @ViewsWizard( * id = "file_managed", * module = "file", - * base_table = "file_managed", + * baseTable = "file_managed", * title = @Translation("Files") * ) */ diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php index ba51a17..c61e0a5 100644 --- a/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php +++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldTestBase.php @@ -101,7 +101,7 @@ function attachFileField($name, $entity_type, $bundle, $instance_settings = arra $instance = array( 'field_name' => $name, 'label' => $name, - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $bundle, 'required' => !empty($instance_settings['required']), 'settings' => array(), @@ -126,7 +126,7 @@ function updateFileField($name, $type_name, $instance_settings = array(), $widge $instance->save(); - entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default') + entity_get_form_display($instance['entityType'], $instance['bundle'], 'default') ->setComponent($instance['field_name'], array( 'settings' => $widget_settings, )) diff --git a/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php b/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php index 3aacead..06e1bbb 100644 --- a/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php +++ b/core/modules/file/lib/Drupal/file/Tests/FileItemTest.php @@ -50,7 +50,7 @@ public function setUp() { 'cardinality' => FIELD_CARDINALITY_UNLIMITED, ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => 'file_test', 'bundle' => 'entity_test', ))->save(); diff --git a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml index 02cc72c..b7f15f8 100644 --- a/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml +++ b/core/modules/file/tests/modules/file_test_views/test_views/views.view.file_extension_view.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/filter/filter.routing.yml b/core/modules/filter/filter.routing.yml index 2260177..7cebf31 100644 --- a/core/modules/filter/filter.routing.yml +++ b/core/modules/filter/filter.routing.yml @@ -16,7 +16,7 @@ filter_admin_overview: pattern: '/admin/config/content/formats' defaults: _content: '\Drupal\Core\Entity\Controller\EntityListController::listing' - entity_type: 'filter_format' + entityType: 'filter_format' requirements: _permission: 'administer filters' diff --git a/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php b/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php index 71ca04d..b1eddb1 100644 --- a/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php +++ b/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php @@ -195,7 +195,7 @@ public function uri() { return array( 'path' => 'admin/config/content/formats/manage/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterSettingsTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterSettingsTest.php index a11db5d..fa9e746 100644 --- a/core/modules/filter/lib/Drupal/filter/Tests/FilterSettingsTest.php +++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterSettingsTest.php @@ -38,7 +38,7 @@ function testFilterDefaults() { // Create text format using filter default settings. $filter_defaults_format = entity_create('filter_format', array( - 'format' => 'filter_defaults', + 'format' => 'filterDefaults', 'name' => 'Filter defaults', 'filters' => $filters, )); diff --git a/core/modules/forum/forum.install b/core/modules/forum/forum.install index 60efc30..2b30fa0 100644 --- a/core/modules/forum/forum.install +++ b/core/modules/forum/forum.install @@ -78,7 +78,7 @@ function forum_enable() { // Create the instance on the bundle. entity_create('field_instance', array( 'field_name' => 'taxonomy_forums', - 'entity_type' => 'node', + 'entityType' => 'node', 'label' => $vocabulary->name, 'bundle' => 'forum', 'required' => TRUE, diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index e8c104f..ac4d877 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -848,7 +848,7 @@ function forum_get_topics($tid, $sortby, $forum_per_page) { $query ->condition('f.tid', $tid) ->addTag('node_access') - ->addMetaData('base_table', 'forum_index') + ->addMetaData('baseTable', 'forum_index') ->orderBy('f.sticky', 'DESC') ->orderByHeader($forum_topic_list_header) ->limit($forum_per_page); @@ -857,7 +857,7 @@ function forum_get_topics($tid, $sortby, $forum_per_page) { $count_query->condition('f.tid', $tid); $count_query->addExpression('COUNT(*)'); $count_query->addTag('node_access'); - $count_query->addMetaData('base_table', 'forum_index'); + $count_query->addMetaData('baseTable', 'forum_index'); $query->setCountQuery($count_query); $result = $query->execute(); diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php index 769aeb7..915d54f 100644 --- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php +++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php @@ -27,7 +27,7 @@ public function build() { $query = db_select('forum_index', 'f') ->fields('f') ->addTag('node_access') - ->addMetaData('base_table', 'forum_index') + ->addMetaData('baseTable', 'forum_index') ->orderBy('f.last_comment_timestamp', 'DESC') ->range(0, $this->configuration['block_count']); diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php index 44622a1..114ffad 100644 --- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php +++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php @@ -27,7 +27,7 @@ public function build() { $query = db_select('forum_index', 'f') ->fields('f') ->addTag('node_access') - ->addMetaData('base_table', 'forum_index') + ->addMetaData('baseTable', 'forum_index') ->orderBy('f.created', 'DESC') ->range(0, $this->configuration['block_count']); diff --git a/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml b/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml index ac6dee6..74d91e3 100644 --- a/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml +++ b/core/modules/forum/tests/modules/forum_test_views/test_views/views.view.test_forum_index.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: forum_index +baseTable: forum_index core: 8.x description: '' status: '1' diff --git a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php b/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php index 751de28..22e6626 100644 --- a/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php +++ b/core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php @@ -93,13 +93,13 @@ public function denormalize($data, $class, $format = NULL, array $context = arra $langcode = $data['langcode'][0]['value']; } elseif (module_exists('language')) { - $langcode = language_get_default_langcode($typed_data_ids['entity_type'], $typed_data_ids['bundle']); + $langcode = language_get_default_langcode($typed_data_ids['entityType'], $typed_data_ids['bundle']); } else { $langcode = Language::LANGCODE_NOT_SPECIFIED; } - $entity = entity_create($typed_data_ids['entity_type'], array('langcode' => $langcode, 'type' => $typed_data_ids['bundle'])); + $entity = entity_create($typed_data_ids['entityType'], array('langcode' => $langcode, 'type' => $typed_data_ids['bundle'])); // Special handling for PATCH: destroy all possible default values that // might have been set on entity creation. We want an "empty" entity that diff --git a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php b/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php index 13c9756..33e8998 100644 --- a/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php +++ b/core/modules/hal/lib/Drupal/hal/Tests/NormalizerTestBase.php @@ -83,7 +83,7 @@ function setUp() { 'translatable' => FALSE, ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => 'field_test_text', 'bundle' => 'entity_test', ))->save(); @@ -95,7 +95,7 @@ function setUp() { 'translatable' => TRUE, ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => 'field_test_translatable_text', 'bundle' => 'entity_test', ))->save(); @@ -110,7 +110,7 @@ function setUp() { 'type' => 'entity_reference', ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => 'field_test_entity_reference', 'bundle' => 'entity_test', ))->save(); diff --git a/core/modules/image/image.views.inc b/core/modules/image/image.views.inc index 2e70c08..f253f60 100644 --- a/core/modules/image/image.views.inc +++ b/core/modules/image/image.views.inc @@ -53,12 +53,12 @@ function image_field_views_data_views_data_alter(&$data, $field) { 'field_name' => $field['field_name'], 'field table' => _field_sql_storage_tablename($field), 'field field' => $field['field_name'] . '_target_id', - 'base' => $entity_info['base_table'], + 'base' => $entity_info['baseTable'], 'base field' => $entity_info['entity_keys']['id'], 'label' => t('!field_name', array('!field_name' => $field['field_name'])), 'join_extra' => array( 0 => array( - 'field' => 'entity_type', + 'field' => 'entityType', 'value' => $entity_type, ), 1 => array( diff --git a/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php b/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php index 4d12539..691c9d5 100644 --- a/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php +++ b/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php @@ -143,10 +143,10 @@ protected static function replaceImageStyle(ImageStyleInterface $style) { // Loop through all fields searching for image fields. foreach ($instances as $instance) { if ($instance->getField()->type == 'image') { - $view_modes = entity_get_view_modes($instance['entity_type']); + $view_modes = entity_get_view_modes($instance['entityType']); $view_modes = array('default') + array_keys($view_modes); foreach ($view_modes as $view_mode) { - $display = entity_get_display($instance['entity_type'], $instance['bundle'], $view_mode); + $display = entity_get_display($instance['entityType'], $instance['bundle'], $view_mode); $display_options = $display->getComponent($instance['field_name']); // Check if the formatter involves an image style. @@ -158,7 +158,7 @@ protected static function replaceImageStyle(ImageStyleInterface $style) { ->save(); } } - $entity_form_display = entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default'); + $entity_form_display = entity_get_form_display($instance['entityType'], $instance['bundle'], 'default'); $widget_configuration = $entity_form_display->getComponent($instance['field_name']); if ($widget_configuration['settings']['preview_image_style'] == $style->getOriginalID()) { $widget_options['settings']['preview_image_style'] = $style->id(); diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php index f926abc..c7da7ff 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDefaultImagesTest.php @@ -72,7 +72,7 @@ public function testDefaultImages() { // Add another instance with another default image to the page content type. $instance2 = entity_create('field_instance', array( 'field_name' => $field->id(), - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', 'label' => $instance->label(), 'required' => $instance->required, @@ -82,7 +82,7 @@ public function testDefaultImages() { )); $instance2->save(); - $widget_settings = entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default')->getComponent($field['field_name']); + $widget_settings = entity_get_form_display($instance['entityType'], $instance['bundle'], 'default')->getComponent($field['field_name']); entity_get_form_display('node', 'page', 'default') ->setComponent($field->id(), $widget_settings) ->save(); diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php index 7d0f054..68f3df2 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldTestBase.php @@ -76,7 +76,7 @@ function createImageField($name, $type_name, $field_settings = array(), $instanc $instance = array( 'field_name' => $field['field_name'], - 'entity_type' => 'node', + 'entityType' => 'node', 'label' => $name, 'bundle' => $type_name, 'required' => !empty($instance_settings['required']), diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php index 8a51694..224094d 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageItemTest.php @@ -54,7 +54,7 @@ public function setUp() { 'cardinality' => FIELD_CARDINALITY_UNLIMITED, ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => 'image_test', 'bundle' => 'entity_test', ))->save(); diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc index 47eea47..151c5b8 100644 --- a/core/modules/language/language.admin.inc +++ b/core/modules/language/language.admin.inc @@ -731,7 +731,7 @@ function language_content_settings_form(array $form, array $form_state, array $s $form['settings'][$entity_type] = array( '#title' => $label, '#type' => 'container', - '#entity_type' => $entity_type, + '#entityType' => $entity_type, '#theme' => 'language_content_settings_table', '#bundle_label' => isset($info['bundle_label']) ? $info['bundle_label'] : $label, '#states' => array( @@ -748,7 +748,7 @@ function language_content_settings_form(array $form, array $form_state, array $s 'language' => array( '#type' => 'language_configuration', '#entity_information' => array( - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $bundle, ), '#default_value' => $language_configuration[$entity_type][$bundle], diff --git a/core/modules/language/language.module b/core/modules/language/language.module index f092c86..1da7b68 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -305,7 +305,7 @@ function language_configuration_element_process($element, &$form_state, &$form) } $form_state['language'] += array( $element['#name'] => array( - 'entity_type' => $element['#entity_information']['entity_type'], + 'entityType' => $element['#entity_information']['entityType'], 'bundle' => $element['#entity_information']['bundle'], ), ); @@ -333,7 +333,7 @@ function language_configuration_element_submit(&$form, &$form_state) { // values. if (isset($form_state['language'])) { foreach ($form_state['language'] as $element_name => $values) { - language_save_default_configuration($values['entity_type'], $values['bundle'], $form_state['values'][$element_name]); + language_save_default_configuration($values['entityType'], $values['bundle'], $form_state['values'][$element_name]); } } } diff --git a/core/modules/language/lib/Drupal/language/Entity/Language.php b/core/modules/language/lib/Drupal/language/Entity/Language.php index 23f65db..0291d10 100644 --- a/core/modules/language/lib/Drupal/language/Entity/Language.php +++ b/core/modules/language/lib/Drupal/language/Entity/Language.php @@ -102,7 +102,7 @@ public function uri() { return array( 'path' => 'admin/config/regional/language/edit/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/language/tests/language_elements_test/language_elements_test.module b/core/modules/language/tests/language_elements_test/language_elements_test.module index 6030e4c..3db9323 100644 --- a/core/modules/language/tests/language_elements_test/language_elements_test.module +++ b/core/modules/language/tests/language_elements_test/language_elements_test.module @@ -35,7 +35,7 @@ function language_elements_configuration_element() { $form['lang_configuration'] = array( '#type' => 'language_configuration', '#entity_information' => array( - 'entity_type' => 'some_custom_type', + 'entityType' => 'some_custom_type', 'bundle' => 'some_bundle', ), '#default_value' => $conf, diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php index c3c62ef..b0e47a2 100644 --- a/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php +++ b/core/modules/link/lib/Drupal/link/Tests/LinkFieldTest.php @@ -74,7 +74,7 @@ function testURLValidation() { $this->field->save(); entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'settings' => array( 'title' => DRUPAL_DISABLED, @@ -148,7 +148,7 @@ function testLinkTitle() { $this->field->save(); $this->instance = entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'label' => 'Read more about this entity', 'settings' => array( @@ -268,7 +268,7 @@ function testLinkFormatter() { $this->field->save(); entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'label' => 'Read more about this entity', 'bundle' => 'entity_test', 'settings' => array( @@ -411,7 +411,7 @@ function testLinkSeparateFormatter() { $this->field->save(); entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'settings' => array( 'title' => DRUPAL_OPTIONAL, diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php b/core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php index 2cd88bc..2cf80cd 100644 --- a/core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php +++ b/core/modules/link/lib/Drupal/link/Tests/LinkItemTest.php @@ -40,7 +40,7 @@ public function setUp() { 'type' => 'link', ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => 'field_test', 'bundle' => 'entity_test', ))->save(); diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php index 83d6098..ddf948d 100644 --- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php +++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php @@ -120,7 +120,7 @@ public function form(array $form, array &$form_state) { $form['default_menu_links_language']['default_language'] = array( '#type' => 'language_configuration', '#entity_information' => array( - 'entity_type' => 'menu_link', + 'entityType' => 'menu_link', 'bundle' => $menu->id(), ), '#default_value' => language_get_default_configuration('menu_link', $menu->id()), diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php index d6493f5..70a9db5 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php @@ -35,7 +35,7 @@ * } * }, * static_cache = FALSE, - * base_table = "menu_links", + * baseTable = "menu_links", * uri_callback = "menu_link_uri", * translatable = TRUE, * entity_keys = { diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php index 31d14f6..1363910 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php @@ -159,7 +159,7 @@ public function save(EntityInterface $entity) { } if ($entity->isNew()) { - $entity->mlid = $this->database->insert($this->entityInfo['base_table'])->fields(array('menu_name' => 'tools'))->execute(); + $entity->mlid = $this->database->insert($this->entityInfo['baseTable'])->fields(array('menu_name' => 'tools'))->execute(); $entity->enforceIsNew(); } @@ -176,7 +176,7 @@ public function save(EntityInterface $entity) { // $entity may have additional keys left over from building a router entry. // The intersect removes the extra keys, allowing a meaningful comparison. if ($entity->isNew() || (array_intersect_key(get_object_vars($entity), get_object_vars($entity->original)) != get_object_vars($entity->original))) { - $return = drupal_write_record($this->entityInfo['base_table'], $entity, $this->idKey); + $return = drupal_write_record($this->entityInfo['baseTable'], $entity, $this->idKey); if ($return) { if (!$entity->isNew()) { @@ -320,7 +320,7 @@ public function findChildrenRelativeDepth(EntityInterface $entity) { * {@inheritdoc} */ public function moveChildren(EntityInterface $entity) { - $query = $this->database->update($this->entityInfo['base_table']); + $query = $this->database->update($this->entityInfo['baseTable']); $query->fields(array('menu_name' => $entity->menu_name)); diff --git a/core/modules/node/config/views.view.content.yml b/core/modules/node/config/views.view.content.yml index 39f6d60..ffc3e5b 100644 --- a/core/modules/node/config/views.view.content.yml +++ b/core/modules/node/config/views.view.content.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8.x description: 'Find and manage content.' status: '1' diff --git a/core/modules/node/config/views.view.frontpage.yml b/core/modules/node/config/views.view.frontpage.yml index 806893a..b5a3b5c 100644 --- a/core/modules/node/config/views.view.frontpage.yml +++ b/core/modules/node/config/views.view.frontpage.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8.x description: 'A list of nodes marked for display on the front page.' status: '1' diff --git a/core/modules/node/lib/Drupal/node/Entity/Node.php b/core/modules/node/lib/Drupal/node/Entity/Node.php index e44fa17..380057f 100644 --- a/core/modules/node/lib/Drupal/node/Entity/Node.php +++ b/core/modules/node/lib/Drupal/node/Entity/Node.php @@ -32,7 +32,7 @@ * }, * "translation" = "Drupal\node\NodeTranslationController" * }, - * base_table = "node", + * baseTable = "node", * data_table = "node_field_data", * revision_table = "node_field_revision", * uri_callback = "node_uri", diff --git a/core/modules/node/lib/Drupal/node/Entity/NodeType.php b/core/modules/node/lib/Drupal/node/Entity/NodeType.php index cc6021c..92d8ee4 100644 --- a/core/modules/node/lib/Drupal/node/Entity/NodeType.php +++ b/core/modules/node/lib/Drupal/node/Entity/NodeType.php @@ -143,7 +143,7 @@ public function uri() { return array( 'path' => 'admin/structure/types/manage/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/node/lib/Drupal/node/NodeTypeFormController.php b/core/modules/node/lib/Drupal/node/NodeTypeFormController.php index d9d5666..52ac34a 100644 --- a/core/modules/node/lib/Drupal/node/NodeTypeFormController.php +++ b/core/modules/node/lib/Drupal/node/NodeTypeFormController.php @@ -139,7 +139,7 @@ public function form(array $form, array &$form_state) { $form['language']['language_configuration'] = array( '#type' => 'language_configuration', '#entity_information' => array( - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => $type->id(), ), '#default_value' => $language_configuration, diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php index 33edd5d..82ec8db 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php @@ -21,7 +21,7 @@ * @ViewsWizard( * id = "node", * module = "node", - * base_table = "node", + * baseTable = "node", * title = @Translation("Content") * ) */ @@ -270,7 +270,7 @@ protected function buildFilters(&$form, &$form_state) { // entities. If a particular entity type (i.e., bundle) has been // selected above, then we only search for taxonomy fields associated // with that bundle. Otherwise, we use all bundles. - $bundles = array_keys(entity_get_bundles($this->entity_type)); + $bundles = array_keys(entity_get_bundles($this->entityType)); // Double check that this is a real bundle before using it (since above // we added a dummy option 'all' to the bundle list on the form). if (isset($selected_bundle) && in_array($selected_bundle, $bundles)) { @@ -278,8 +278,8 @@ protected function buildFilters(&$form, &$form_state) { } $tag_fields = array(); foreach ($bundles as $bundle) { - foreach (field_info_instances($this->entity_type, $bundle) as $instance) { - $widget = entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default')->getComponent($instance['field_name']); + foreach (field_info_instances($this->entityType, $bundle) as $instance) { + $widget = entity_get_form_display($instance['entityType'], $instance['bundle'], 'default')->getComponent($instance['field_name']); // We define "tag-like" taxonomy fields as ones that use the // "Autocomplete term widget (tagging)" widget. if ($widget['type'] == 'taxonomy_autocomplete') { diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php index 1d73184..5fffdca 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php @@ -21,7 +21,7 @@ * @ViewsWizard( * id = "node_revision", * module = "node", - * base_table = "node_field_revision", + * baseTable = "node_field_revision", * title = @Translation("Content revisions") * ) */ diff --git a/core/modules/node/lib/Drupal/node/Tests/MultiStepNodeFormBasicOptionsTest.php b/core/modules/node/lib/Drupal/node/Tests/MultiStepNodeFormBasicOptionsTest.php index 65e3aec..e98305a 100644 --- a/core/modules/node/lib/Drupal/node/Tests/MultiStepNodeFormBasicOptionsTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/MultiStepNodeFormBasicOptionsTest.php @@ -49,7 +49,7 @@ function testMultiStepNodeFormBasicOptions() { // Attach an instance of the field to the page content type. entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', 'label' => $this->randomName() . '_label', 'settings' => array( diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessFieldTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeAccessFieldTest.php index 29a831f..c0a0060 100644 --- a/core/modules/node/lib/Drupal/node/Tests/NodeAccessFieldTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/NodeAccessFieldTest.php @@ -67,7 +67,7 @@ public function setUp() { ))->save(); entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', ))->save(); entity_get_display('node', 'page', 'default') diff --git a/core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php b/core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php index 0538e00..fa565fa 100644 --- a/core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php +++ b/core/modules/node/lib/Drupal/node/Tests/PagePreviewTest.php @@ -82,7 +82,7 @@ function setUp() { ))->save(); entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', ))->save(); diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php index 4616ab4..e63bbc9 100644 --- a/core/modules/node/node.api.php +++ b/core/modules/node/node.api.php @@ -55,7 +55,7 @@ * - hook_node_access_records() (all) * - hook_node_access_records_alter() (all) * - Loading a node (calling node_load(), node_load_multiple(), entity_load(), - * or entity_load_multiple() with $entity_type of 'node'): + * or entity_load_multiple() with $entityType of 'node'): * - Node and revision information is read from database. * - field_attach_load_revision() and field_attach_load() * - hook_entity_load() (all) diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 119f429..aba5870 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -194,7 +194,7 @@ function node_entity_bundle_info() { */ function node_entity_display_alter(EntityDisplay $display, $context) { // Hide field labels in search index. - if ($context['entity_type'] == 'node' && $context['view_mode'] == 'search_index') { + if ($context['entityType'] == 'node' && $context['view_mode'] == 'search_index') { foreach ($display->getComponents() as $name => $options) { if (isset($options['label'])) { $options['label'] = 'hidden'; @@ -408,7 +408,7 @@ function node_add_body_field(NodeTypeInterface $type, $label = 'Body') { if (empty($instance)) { $instance = entity_create('field_instance', array( 'field_name' => 'body', - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => $type->id(), 'label' => $label, 'settings' => array('display_summary' => TRUE), @@ -2212,7 +2212,7 @@ function node_access_view_all_nodes($account = NULL) { * @code * $query * ->addTag('node_access') - * ->addMetaData('base_table', 'taxonomy_index'); + * ->addMetaData('baseTable', 'taxonomy_index'); * @endcode */ function node_query_node_access_alter(AlterableInterface $query) { @@ -2240,7 +2240,7 @@ function node_query_node_access_alter(AlterableInterface $query) { } $tables = $query->getTables(); - $base_table = $query->getMetaData('base_table'); + $base_table = $query->getMetaData('baseTable'); // If the base table is not given, default to node if present. if (!$base_table) { foreach ($tables as $table_info) { @@ -2255,7 +2255,7 @@ function node_query_node_access_alter(AlterableInterface $query) { } // Bail out if the base table is missing. if (!$base_table) { - throw new Exception(t('Query tagged for node access but there is no node table, specify the base_table using meta data.')); + throw new Exception(t('Query tagged for node access but there is no node table, specify the baseTable using meta data.')); } } diff --git a/core/modules/node/node.routing.yml b/core/modules/node/node.routing.yml index dfdc0a6..c2318a1 100644 --- a/core/modules/node/node.routing.yml +++ b/core/modules/node/node.routing.yml @@ -37,7 +37,7 @@ node_overview_types: pattern: '/admin/structure/types' defaults: _content: '\Drupal\Core\Entity\Controller\EntityListController::listing' - entity_type: 'node_type' + entityType: 'node_type' requirements: _permission: 'administer content types' diff --git a/core/modules/node/node.views_execution.inc b/core/modules/node/node.views_execution.inc index e43690b..d1c476d 100644 --- a/core/modules/node/node.views_execution.inc +++ b/core/modules/node/node.views_execution.inc @@ -24,7 +24,7 @@ function node_views_query_substitutions(ViewExecutable $view) { function node_views_analyze(ViewExecutable $view) { $ret = array(); // Check for something other than the default display: - if ($view->storage->get('base_table') == 'node') { + if ($view->storage->get('baseTable') == 'node') { foreach ($view->displayHandlers as $id => $display) { if (!$display->isDefaulted('access') || !$display->isDefaulted('filters')) { // check for no access control diff --git a/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.module b/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.module index fb217f2..4fb45cb 100644 --- a/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.module +++ b/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.module @@ -63,7 +63,7 @@ function node_access_test_language_enable() { entity_create('field_instance', array( 'field_name' => $field_private->id(), - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', 'widget' => array( 'type' => 'options_buttons', diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml index e6382e4..1f747ea 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_type.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml index 2c0122b..86bd9d0 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_filter_node_uid_revision.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: 8.0-dev description: '' status: '1' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml index e0748bc..37c523e 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_bulk_form.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8.x description: '' status: '1' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml index c4e06a3..2657167 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml @@ -1,5 +1,5 @@ id: test_node_revision_nid -base_table: node_field_revision +baseTable: node_field_revision core: 8 display: default: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml index 38664e1..a13f216 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_vid.yml @@ -1,5 +1,5 @@ id: test_node_revision_vid -base_table: node_field_revision +baseTable: node_field_revision core: 8 display: default: diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml index e7bae25..84a6938 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_row_plugin.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8 description: '' status: '1' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml index 5b734dd..a8b76e2 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_view.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8.x description: '' status: '1' diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml index 1944f59..5b7fe2b 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_status_extra.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node id: test_status_extra description: '' tag: '' diff --git a/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php b/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php index 1edfd9f..402397e 100644 --- a/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php +++ b/core/modules/number/lib/Drupal/number/Tests/NumberFieldTest.php @@ -73,7 +73,7 @@ function testNumberDecimalField() { $this->field->save(); entity_create('field_instance', array( 'field_name' => $this->field->id(), - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ))->save(); diff --git a/core/modules/number/lib/Drupal/number/Tests/NumberItemTest.php b/core/modules/number/lib/Drupal/number/Tests/NumberItemTest.php index a0cc904..3c2deb6 100644 --- a/core/modules/number/lib/Drupal/number/Tests/NumberItemTest.php +++ b/core/modules/number/lib/Drupal/number/Tests/NumberItemTest.php @@ -41,7 +41,7 @@ public function setUp() { 'type' => 'number_' . $type, ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => 'field_' . $type, 'bundle' => 'entity_test', ))->save(); diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php index c270e4a..344adc6 100644 --- a/core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php +++ b/core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php @@ -42,7 +42,7 @@ function setUp() { ))->save(); $this->instance = entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'entity_test_rev', + 'entityType' => 'entity_test_rev', 'bundle' => 'entity_test_rev', 'required' => TRUE, ))->save(); diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php index 2a8c1a6..c1bf3e2 100644 --- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php +++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldTest.php @@ -87,7 +87,7 @@ function testUpdateAllowedValues() { entity_create('field_entity', $this->fieldDefinition)->save(); entity_create('field_instance', array( 'field_name' => $this->fieldName, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ))->save(); entity_get_form_display('entity_test', 'entity_test', 'default') diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php index 2b45acd..36b417d 100644 --- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php +++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php @@ -264,7 +264,7 @@ protected function createOptionsField($type) { ))->save(); entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => $this->type, ))->save(); diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php index eda24da..02021c4 100644 --- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php +++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUnitTestBase.php @@ -70,7 +70,7 @@ public function setUp() { $instance = array( 'field_name' => $this->fieldName, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ); $this->instance = entity_create('field_instance', $instance); diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php index db77e61..6b92faa 100644 --- a/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php +++ b/core/modules/options/lib/Drupal/options/Tests/OptionsWidgetsTest.php @@ -109,7 +109,7 @@ function testRadioButtons() { // Create an instance of the 'single value' field. $instance = entity_create('field_instance', array( 'field_name' => $this->card_1->id(), - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', )); $instance->save(); @@ -168,7 +168,7 @@ function testCheckBoxes() { // Create an instance of the 'multiple values' field. $instance = entity_create('field_instance', array( 'field_name' => $this->card_2->id(), - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', )); $instance->save(); @@ -260,7 +260,7 @@ function testSelectListSingle() { // Create an instance of the 'single value' field. $instance = entity_create('field_instance', array( 'field_name' => $this->card_1->id(), - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'required' => TRUE, )); @@ -362,7 +362,7 @@ function testSelectListMultiple() { // Create an instance of the 'multiple values' field. $instance = entity_create('field_instance', array( 'field_name' => $this->card_2->id(), - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', )); $instance->save(); @@ -484,7 +484,7 @@ function testOnOffCheckbox() { // Create an instance of the 'boolean' field. entity_create('field_instance', array( 'field_name' => $this->bool->id(), - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ))->save(); entity_get_form_display('entity_test', 'entity_test', 'default') @@ -539,7 +539,7 @@ function testOnOffCheckbox() { $fieldUpdate->save(); entity_create('field_instance', array( 'field_name' => $this->bool['field_name'], - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', ))->save(); diff --git a/core/modules/options/options.module b/core/modules/options/options.module index e6ebdbe..9ef8618 100644 --- a/core/modules/options/options.module +++ b/core/modules/options/options.module @@ -412,7 +412,7 @@ function options_field_validate(EntityInterface $entity = NULL, $field, $instanc // require an entity, because the result can depend on entity type, bundle, // and other entity data. if (!isset($entity)) { - $ids = (object) array('entity_type' => $instance->entity_type, 'bundle' => $instance->bundle, 'entity_id' => NULL); + $ids = (object) array('entityType' => $instance->entity_type, 'bundle' => $instance->bundle, 'entity_id' => NULL); $entity = _field_create_entity_from_ids($ids); } diff --git a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php index fb266fa..a56afde 100644 --- a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php +++ b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php @@ -170,7 +170,7 @@ public function uri() { return array( 'path' => 'admin/config/media/picturemapping/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php b/core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php index af2aeb9..158bdc8 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php @@ -78,7 +78,7 @@ protected function createTestField() { 'type' => $this->fieldType, ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => $this->fieldName, 'bundle' => 'entity_test', ))->save(); diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php index 5d298d9..624993e 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/TaxonomyTermFieldAttributesTest.php @@ -168,7 +168,7 @@ protected function createTaxonomyTermReferenceField($field_name, $vocabulary) { ))->save(); entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'article', ))->save(); entity_get_form_display('node', 'article', 'default') diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module index 428f16b..81ff25f 100644 --- a/core/modules/rdf/rdf.module +++ b/core/modules/rdf/rdf.module @@ -322,7 +322,7 @@ function rdf_preprocess_node(&$variables) { */ function rdf_preprocess_field(&$variables) { $element = $variables['element']; - $entity_type = $element['#entity_type']; + $entity_type = $element['#entityType']; $bundle = $element['#bundle']; $field_name = $element['#field_name']; $field_mapping = rdf_get_mapping($entity_type, $bundle) diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php b/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php index 0e3fd91..46752a6 100644 --- a/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php +++ b/core/modules/rest/lib/Drupal/rest/LinkManager/RelationLinkManager.php @@ -55,7 +55,7 @@ public function getRelationInternalIds($relation_uri) { * determine which URIs to use. * * @return array - * An array of typed data ids (entity_type, bundle, and field name) keyed + * An array of typed data ids (entityType, bundle, and field name) keyed * by corresponding relation URI. */ public function getRelations() { @@ -79,7 +79,7 @@ protected function writeCache() { foreach ($bundles as $bundle) { $relation_uri = $this->getRelationUri($entity_type, $bundle, $field_info['field_name']); $data[$relation_uri] = array( - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $bundle, 'field_name' => $field_info['field_name'], ); diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php b/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php index 6802282..416d2b0 100644 --- a/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php +++ b/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManager.php @@ -59,7 +59,7 @@ public function getTypeInternalIds($type_uri) { * Get the array of type links. * * @return array - * An array of typed data ids (entity_type and bundle) keyed by + * An array of typed data ids (entityType and bundle) keyed by * corresponding type URI. */ public function getTypes() { @@ -93,13 +93,13 @@ protected function writeCache() { // Get a type URI for the bundle. $bundle_uri = $this->getTypeUri($entity_type, $bundle); $data[$bundle_uri] = array( - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $bundle, ); } } // These URIs only change when entity info changes, so cache it permanently - // and only clear it when entity_info is cleared. - $this->cache->set('rest:links:types', $data, CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE)); + // and only clear it when entityInfo is cleared. + $this->cache->set('rest:links:types', $data, CacheBackendInterface::CACHE_PERMANENT, array('entityInfo' => TRUE)); } } diff --git a/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManagerInterface.php b/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManagerInterface.php index 9c2d942..387c2fd 100644 --- a/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManagerInterface.php +++ b/core/modules/rest/lib/Drupal/rest/LinkManager/TypeLinkManagerInterface.php @@ -33,7 +33,7 @@ public function getTypeUri($entity_type, $bundle); * The type URI. * * @return array | boolean - * If the URI matches a bundle, returns an array containing entity_type and + * If the URI matches a bundle, returns an array containing entityType and * bundle. Otherwise, returns false. */ public function getTypeInternalIds($type_uri); diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php b/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php index b583649..739eba7 100644 --- a/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php +++ b/core/modules/rest/lib/Drupal/rest/Plugin/Derivative/EntityDerivative.php @@ -70,7 +70,7 @@ public function getDerivativeDefinitions(array $base_plugin_definition) { foreach ($this->entityManager->getDefinitions() as $entity_type => $entity_info) { $this->derivatives[$entity_type] = array( 'id' => 'entity:' . $entity_type, - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'serialization_class' => $entity_info['class'], 'label' => $entity_info['label'], ); diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php b/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php index a58cf89..4967ffb 100644 --- a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php +++ b/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php @@ -43,7 +43,7 @@ class EntityResource extends ResourceBase { */ public function get($id) { $definition = $this->getPluginDefinition(); - $entity = entity_load($definition['entity_type'], $id); + $entity = entity_load($definition['entityType'], $id); if ($entity) { if (!$entity->access('view')) { throw new AccessDeniedHttpException(); @@ -82,7 +82,7 @@ public function post($id, EntityInterface $entity = NULL) { $definition = $this->getPluginDefinition(); // Verify that the deserialized entity is of the type that we expect to // prevent security issues. - if ($entity->entityType() != $definition['entity_type']) { + if ($entity->entityType() != $definition['entityType']) { throw new BadRequestHttpException(t('Invalid entity type')); } // POSTed entities must not have an ID set, because we always want to create @@ -133,10 +133,10 @@ public function patch($id, EntityInterface $entity = NULL) { throw new NotFoundHttpException(); } $definition = $this->getPluginDefinition(); - if ($entity->entityType() != $definition['entity_type']) { + if ($entity->entityType() != $definition['entityType']) { throw new BadRequestHttpException(t('Invalid entity type')); } - $original_entity = entity_load($definition['entity_type'], $id); + $original_entity = entity_load($definition['entityType'], $id); // We don't support creating entities with PATCH, so we throw an error if // there is no existing entity. if ($original_entity == FALSE) { @@ -190,7 +190,7 @@ public function patch($id, EntityInterface $entity = NULL) { */ public function delete($id) { $definition = $this->getPluginDefinition(); - $entity = entity_load($definition['entity_type'], $id); + $entity = entity_load($definition['entityType'], $id); if ($entity) { if (!$entity->access('delete')) { throw new AccessDeniedHttpException(); diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml index 13d90aa..f3b53c3 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_entity.yml @@ -1,4 +1,4 @@ -base_table: entity_test +baseTable: entity_test id: test_serializer_display_entity description: '' tag: '' diff --git a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml index 029c34a..e67e54a 100644 --- a/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml +++ b/core/modules/rest/tests/modules/rest_test_views/test_views/views.view.test_serializer_display_field.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data id: test_serializer_display_field description: '' tag: '' diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php index 96810a6..c8a0c42 100644 --- a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php @@ -71,7 +71,7 @@ public function query($group_by = FALSE) { $this->search_score = $this->query->addField('', "SUM($search_index.score * $search_total.count)", 'score', array('aggregate' => TRUE)); if (empty($this->query->relationships[$this->relationship])) { - $base_table = $this->view->storage->get('base_table'); + $base_table = $this->view->storage->get('baseTable'); } else { $base_table = $this->query->relationships[$this->relationship]['base']; diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php index 89b21e4..8c697de 100644 --- a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php @@ -152,7 +152,7 @@ public function query() { $this->search_score = $this->query->addField('', "SUM($search_index.score * $search_total.count)", 'score', array('aggregate' => TRUE)); if (empty($this->query->relationships[$this->relationship])) { - $base_table = $this->view->storage->get('base_table'); + $base_table = $this->view->storage->get('baseTable'); } else { $base_table = $this->query->relationships[$this->relationship]['base']; diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php b/core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php index fa20263..7ff2fd6 100644 --- a/core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php +++ b/core/modules/serialization/lib/Drupal/serialization/Tests/EntityResolverTest.php @@ -44,7 +44,7 @@ protected function setUp() { // Create the test field instance. entity_create('field_instance', array( - 'entity_type' => 'entity_test_mulrev', + 'entityType' => 'entity_test_mulrev', 'field_name' => 'field_test_entity_reference', 'bundle' => 'entity_test_mulrev', ))->save(); diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/NormalizerTestBase.php b/core/modules/serialization/lib/Drupal/serialization/Tests/NormalizerTestBase.php index b7710cf..b78f574 100644 --- a/core/modules/serialization/lib/Drupal/serialization/Tests/NormalizerTestBase.php +++ b/core/modules/serialization/lib/Drupal/serialization/Tests/NormalizerTestBase.php @@ -33,7 +33,7 @@ protected function setUp() { 'translatable' => FALSE, ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test_mulrev', + 'entityType' => 'entity_test_mulrev', 'field_name' => 'field_test_text', 'bundle' => 'entity_test_mulrev', 'label' => 'Test text-field', diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php b/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php index 392c3d8..2bda1c7 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php @@ -76,7 +76,7 @@ public function uri() { return array( 'path' => 'admin/config/user-interface/shortcut/manage/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php b/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php index a2788b1..489a707 100644 --- a/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php @@ -238,7 +238,7 @@ function testEnableModulesFixedList() { $field->save(); entity_create('field_instance', array( 'field_name' => $field->id(), - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ))->save(); } diff --git a/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml b/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml index 798357e..5eef320 100644 --- a/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml +++ b/core/modules/statistics/tests/modules/statistics_test_views/test_views/views.view.test_statistics_integration.yml @@ -1,6 +1,6 @@ api_version: '3.0' base_field: nid -base_table: node +baseTable: node core: 8.x description: '' status: '1' diff --git a/core/modules/system/lib/Drupal/system/Entity/Action.php b/core/modules/system/lib/Drupal/system/Entity/Action.php index 5e3b575..df5026d 100644 --- a/core/modules/system/lib/Drupal/system/Entity/Action.php +++ b/core/modules/system/lib/Drupal/system/Entity/Action.php @@ -144,7 +144,7 @@ public function uri() { return array( 'path' => 'admin/config/system/actions/configure/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/system/lib/Drupal/system/Entity/DateFormat.php b/core/modules/system/lib/Drupal/system/Entity/DateFormat.php index 7762b88..7b0a03f 100644 --- a/core/modules/system/lib/Drupal/system/Entity/DateFormat.php +++ b/core/modules/system/lib/Drupal/system/Entity/DateFormat.php @@ -88,7 +88,7 @@ public function uri() { return array( 'path' => 'admin/config/regional/date-time/formats/manage/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php index f15f382..89ee23e 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/MultiFormTest.php @@ -41,7 +41,7 @@ function setUp() { ))->save(); entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', ))->save(); entity_get_form_display('node', 'page', 'default') diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php index 57f9355..9d81d49 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityApiTest.php @@ -64,32 +64,32 @@ protected function assertCRUD($entity_type, UserInterface $user1) { $entity->save(); $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test'))); - $this->assertEqual($entities[0]->name->value, 'test', format_string('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type))); - $this->assertEqual($entities[1]->name->value, 'test', format_string('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type))); + $this->assertEqual($entities[0]->name->value, 'test', format_string('%entityType: Created and loaded entity', array('%entityType' => $entity_type))); + $this->assertEqual($entities[1]->name->value, 'test', format_string('%entityType: Created and loaded entity', array('%entityType' => $entity_type))); // Test loading a single entity. $loaded_entity = entity_load($entity_type, $entity->id()); - $this->assertEqual($loaded_entity->id(), $entity->id(), format_string('%entity_type: Loaded a single entity by id.', array('%entity_type' => $entity_type))); + $this->assertEqual($loaded_entity->id(), $entity->id(), format_string('%entityType: Loaded a single entity by id.', array('%entityType' => $entity_type))); // Test deleting an entity. $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test2'))); $entities[0]->delete(); $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test2'))); - $this->assertEqual($entities, array(), format_string('%entity_type: Entity deleted.', array('%entity_type' => $entity_type))); + $this->assertEqual($entities, array(), format_string('%entityType: Entity deleted.', array('%entityType' => $entity_type))); // Test updating an entity. $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test'))); $entities[0]->name->value = 'test3'; $entities[0]->save(); $entity = entity_load($entity_type, $entities[0]->id()); - $this->assertEqual($entity->name->value, 'test3', format_string('%entity_type: Entity updated.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->name->value, 'test3', format_string('%entityType: Entity updated.', array('%entityType' => $entity_type))); // Try deleting multiple test entities by deleting all. $ids = array_keys(entity_load_multiple($entity_type)); entity_delete_multiple($entity_type, $ids); $all = entity_load_multiple($entity_type); - $this->assertTrue(empty($all), format_string('%entity_type: Deleted all entities.', array('%entity_type' => $entity_type))); + $this->assertTrue(empty($all), format_string('%entityType: Deleted all entities.', array('%entityType' => $entity_type))); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php index b070026..5682411 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldDefaultValueTest.php @@ -54,8 +54,8 @@ public function testDefaultValues() { */ protected function assertDefaultValues($entity_type) { $entity = entity_create($entity_type, array()); - $this->assertEqual($entity->langcode->value, Language::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Default language', array('%entity_type' => $entity_type))); - $this->assertTrue($this->uuid->isValid($entity->uuid->value), format_string('%entity_type: Default UUID', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->langcode->value, Language::LANGCODE_NOT_SPECIFIED, format_string('%entityType: Default language', array('%entityType' => $entity_type))); + $this->assertTrue($this->uuid->isValid($entity->uuid->value), format_string('%entityType: Default UUID', array('%entityType' => $entity_type))); $this->assertEqual($entity->name->getValue(), array(0 => array('value' => NULL)), 'Field has one empty value by default.'); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php index 12de782..4a402d9 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFieldTest.php @@ -97,71 +97,71 @@ protected function assertReadWrite($entity_type) { $entity = $this->createTestEntity($entity_type); // Access the name field. - $this->assertTrue($entity->name instanceof FieldInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type))); - $this->assertTrue($entity->name[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type))); + $this->assertTrue($entity->name instanceof FieldInterface, format_string('%entityType: Field implements interface', array('%entityType' => $entity_type))); + $this->assertTrue($entity->name[0] instanceof FieldItemInterface, format_string('%entityType: Field item implements interface', array('%entityType' => $entity_type))); - $this->assertEqual($this->entity_name, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual($this->entity_name, $entity->name[0]->value, format_string('%entity_type: Name value can be read through list access.', array('%entity_type' => $entity_type))); - $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $this->entity_name)), format_string('%entity_type: Plain field value returned.', array('%entity_type' => $entity_type))); + $this->assertEqual($this->entity_name, $entity->name->value, format_string('%entityType: Name value can be read.', array('%entityType' => $entity_type))); + $this->assertEqual($this->entity_name, $entity->name[0]->value, format_string('%entityType: Name value can be read through list access.', array('%entityType' => $entity_type))); + $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $this->entity_name)), format_string('%entityType: Plain field value returned.', array('%entityType' => $entity_type))); // Change the name. $new_name = $this->randomName(); $entity->name->value = $new_name; - $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read.', array('%entity_type' => $entity_type))); - $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $new_name)), format_string('%entity_type: Plain field value reflects the update.', array('%entity_type' => $entity_type))); + $this->assertEqual($new_name, $entity->name->value, format_string('%entityType: Name can be updated and read.', array('%entityType' => $entity_type))); + $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $new_name)), format_string('%entityType: Plain field value reflects the update.', array('%entityType' => $entity_type))); $new_name = $this->randomName(); $entity->name[0]->value = $new_name; - $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read through list access.', array('%entity_type' => $entity_type))); + $this->assertEqual($new_name, $entity->name->value, format_string('%entityType: Name can be updated and read through list access.', array('%entityType' => $entity_type))); // Access the user field. - $this->assertTrue($entity->user_id instanceof FieldInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type))); - $this->assertTrue($entity->user_id[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type))); + $this->assertTrue($entity->user_id instanceof FieldInterface, format_string('%entityType: Field implements interface', array('%entityType' => $entity_type))); + $this->assertTrue($entity->user_id[0] instanceof FieldItemInterface, format_string('%entityType: Field item implements interface', array('%entityType' => $entity_type))); - $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type))); + $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entityType: User id can be read.', array('%entityType' => $entity_type))); + $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entityType: User name can be read.', array('%entityType' => $entity_type))); // Change the assigned user by entity. $new_user = $this->createUser(); $entity->user_id->entity = $new_user; - $this->assertEqual($new_user->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual($new_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type))); + $this->assertEqual($new_user->id(), $entity->user_id->target_id, format_string('%entityType: Updated user id can be read.', array('%entityType' => $entity_type))); + $this->assertEqual($new_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entityType: Updated user name value can be read.', array('%entityType' => $entity_type))); // Change the assigned user by id. $new_user = $this->createUser(); $entity->user_id->target_id = $new_user->id(); - $this->assertEqual($new_user->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual($new_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type))); + $this->assertEqual($new_user->id(), $entity->user_id->target_id, format_string('%entityType: Updated user id can be read.', array('%entityType' => $entity_type))); + $this->assertEqual($new_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entityType: Updated user name value can be read.', array('%entityType' => $entity_type))); // Try unsetting a field. $entity->name->value = NULL; $entity->user_id->target_id = NULL; - $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', array('%entity_type' => $entity_type))); - $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type))); - $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type))); + $this->assertNull($entity->name->value, format_string('%entityType: Name field is not set.', array('%entityType' => $entity_type))); + $this->assertNull($entity->user_id->target_id, format_string('%entityType: User ID field is not set.', array('%entityType' => $entity_type))); + $this->assertNull($entity->user_id->entity, format_string('%entityType: User entity field is not set.', array('%entityType' => $entity_type))); // Test using isset(), empty() and unset(). $entity->name->value = 'test unset'; unset($entity->name->value); - $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type))); - $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type))); - $this->assertTrue(empty($entity->name->value), format_string('%entity_type: Name is empty.', array('%entity_type' => $entity_type))); - $this->assertTrue(empty($entity->name[0]->value), format_string('%entity_type: Name is empty.', array('%entity_type' => $entity_type))); + $this->assertFalse(isset($entity->name->value), format_string('%entityType: Name is not set.', array('%entityType' => $entity_type))); + $this->assertFalse(isset($entity->name[0]->value), format_string('%entityType: Name is not set.', array('%entityType' => $entity_type))); + $this->assertTrue(empty($entity->name->value), format_string('%entityType: Name is empty.', array('%entityType' => $entity_type))); + $this->assertTrue(empty($entity->name[0]->value), format_string('%entityType: Name is empty.', array('%entityType' => $entity_type))); $entity->name->value = 'a value'; - $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type))); - $this->assertTrue(isset($entity->name[0]->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type))); - $this->assertFalse(empty($entity->name->value), format_string('%entity_type: Name is not empty.', array('%entity_type' => $entity_type))); - $this->assertFalse(empty($entity->name[0]->value), format_string('%entity_type: Name is not empty.', array('%entity_type' => $entity_type))); - $this->assertTrue(isset($entity->name[0]), format_string('%entity_type: Name string item is set.', array('%entity_type' => $entity_type))); - $this->assertFalse(isset($entity->name[1]), format_string('%entity_type: Second name string item is not set as it does not exist', array('%entity_type' => $entity_type))); - $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type))); - $this->assertFalse(isset($entity->nameInvalid), format_string('%entity_type: Not existing field is not set.', array('%entity_type' => $entity_type))); + $this->assertTrue(isset($entity->name->value), format_string('%entityType: Name is set.', array('%entityType' => $entity_type))); + $this->assertTrue(isset($entity->name[0]->value), format_string('%entityType: Name is set.', array('%entityType' => $entity_type))); + $this->assertFalse(empty($entity->name->value), format_string('%entityType: Name is not empty.', array('%entityType' => $entity_type))); + $this->assertFalse(empty($entity->name[0]->value), format_string('%entityType: Name is not empty.', array('%entityType' => $entity_type))); + $this->assertTrue(isset($entity->name[0]), format_string('%entityType: Name string item is set.', array('%entityType' => $entity_type))); + $this->assertFalse(isset($entity->name[1]), format_string('%entityType: Second name string item is not set as it does not exist', array('%entityType' => $entity_type))); + $this->assertTrue(isset($entity->name), format_string('%entityType: Name field is set.', array('%entityType' => $entity_type))); + $this->assertFalse(isset($entity->nameInvalid), format_string('%entityType: Not existing field is not set.', array('%entityType' => $entity_type))); unset($entity->name[0]); - $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type))); - $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type))); - $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type))); + $this->assertFalse(isset($entity->name[0]), format_string('%entityType: Name field item is not set.', array('%entityType' => $entity_type))); + $this->assertFalse(isset($entity->name[0]->value), format_string('%entityType: Name is not set.', array('%entityType' => $entity_type))); + $this->assertFalse(isset($entity->name->value), format_string('%entityType: Name is not set.', array('%entityType' => $entity_type))); $entity->name = array(); $this->assertTrue(isset($entity->name), 'Name field is set.'); @@ -176,33 +176,33 @@ protected function assertReadWrite($entity_type) { $this->assertFalse(isset($entity->name->value), 'Name value is not set.'); $entity->name->value = 'a value'; - $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type))); + $this->assertTrue(isset($entity->name->value), format_string('%entityType: Name is set.', array('%entityType' => $entity_type))); unset($entity->name); - $this->assertFalse(isset($entity->name), format_string('%entity_type: Name field is not set.', array('%entity_type' => $entity_type))); - $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type))); - $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type))); - $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type))); + $this->assertFalse(isset($entity->name), format_string('%entityType: Name field is not set.', array('%entityType' => $entity_type))); + $this->assertFalse(isset($entity->name[0]), format_string('%entityType: Name field item is not set.', array('%entityType' => $entity_type))); + $this->assertFalse(isset($entity->name[0]->value), format_string('%entityType: Name is not set.', array('%entityType' => $entity_type))); + $this->assertFalse(isset($entity->name->value), format_string('%entityType: Name is not set.', array('%entityType' => $entity_type))); // Access the language field. - $this->assertEqual(Language::LANGCODE_NOT_SPECIFIED, $entity->langcode->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual(language_load(Language::LANGCODE_NOT_SPECIFIED), $entity->langcode->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type))); + $this->assertEqual(Language::LANGCODE_NOT_SPECIFIED, $entity->langcode->value, format_string('%entityType: Language code can be read.', array('%entityType' => $entity_type))); + $this->assertEqual(language_load(Language::LANGCODE_NOT_SPECIFIED), $entity->langcode->language, format_string('%entityType: Language object can be read.', array('%entityType' => $entity_type))); // Change the language by code. $entity->langcode->value = language_default()->id; - $this->assertEqual(language_default()->id, $entity->langcode->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual(language_default(), $entity->langcode->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type))); + $this->assertEqual(language_default()->id, $entity->langcode->value, format_string('%entityType: Language code can be read.', array('%entityType' => $entity_type))); + $this->assertEqual(language_default(), $entity->langcode->language, format_string('%entityType: Language object can be read.', array('%entityType' => $entity_type))); // Revert language by code then try setting it by language object. $entity->langcode->value = Language::LANGCODE_NOT_SPECIFIED; $entity->langcode->language = language_default(); - $this->assertEqual(language_default()->id, $entity->langcode->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual(language_default(), $entity->langcode->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type))); + $this->assertEqual(language_default()->id, $entity->langcode->value, format_string('%entityType: Language code can be read.', array('%entityType' => $entity_type))); + $this->assertEqual(language_default(), $entity->langcode->language, format_string('%entityType: Language object can be read.', array('%entityType' => $entity_type))); // Access the text field and test updating. - $this->assertEqual($entity->field_test_text->value, $this->entity_field_text, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->field_test_text->value, $this->entity_field_text, format_string('%entityType: Text field can be read.', array('%entityType' => $entity_type))); $new_text = $this->randomName(); $entity->field_test_text->value = $new_text; - $this->assertEqual($entity->field_test_text->value, $new_text, format_string('%entity_type: Updated text field can be read.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->field_test_text->value, $new_text, format_string('%entityType: Updated text field can be read.', array('%entityType' => $entity_type))); // Test creating the entity by passing in plain values. $this->entity_name = $this->randomName(); @@ -217,10 +217,10 @@ protected function assertReadWrite($entity_type) { 'user_id' => $user_item, 'field_test_text' => $text_item, )); - $this->assertEqual($this->entity_name, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual($this->entity_field_text, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type))); + $this->assertEqual($this->entity_name, $entity->name->value, format_string('%entityType: Name value can be read.', array('%entityType' => $entity_type))); + $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entityType: User id can be read.', array('%entityType' => $entity_type))); + $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entityType: User name can be read.', array('%entityType' => $entity_type))); + $this->assertEqual($this->entity_field_text, $entity->field_test_text->value, format_string('%entityType: Text field can be read.', array('%entityType' => $entity_type))); // Test copying field values. $entity2 = $this->createTestEntity($entity_type); @@ -228,57 +228,57 @@ protected function assertReadWrite($entity_type) { $entity2->user_id = $entity->user_id; $entity2->field_test_text = $entity->field_test_text; - $this->assertTrue($entity->name !== $entity2->name, format_string('%entity_type: Copying properties results in a different field object.', array('%entity_type' => $entity_type))); - $this->assertEqual($entity->name->value, $entity2->name->value, format_string('%entity_type: Name field copied.', array('%entity_type' => $entity_type))); - $this->assertEqual($entity->user_id->target_id, $entity2->user_id->target_id, format_string('%entity_type: User id field copied.', array('%entity_type' => $entity_type))); - $this->assertEqual($entity->field_test_text->value, $entity2->field_test_text->value, format_string('%entity_type: Text field copied.', array('%entity_type' => $entity_type))); + $this->assertTrue($entity->name !== $entity2->name, format_string('%entityType: Copying properties results in a different field object.', array('%entityType' => $entity_type))); + $this->assertEqual($entity->name->value, $entity2->name->value, format_string('%entityType: Name field copied.', array('%entityType' => $entity_type))); + $this->assertEqual($entity->user_id->target_id, $entity2->user_id->target_id, format_string('%entityType: User id field copied.', array('%entityType' => $entity_type))); + $this->assertEqual($entity->field_test_text->value, $entity2->field_test_text->value, format_string('%entityType: Text field copied.', array('%entityType' => $entity_type))); // Tests adding a value to a field item list. $entity->name[] = 'Another name'; - $this->assertEqual($entity->name[1]->value == 'Another name', format_string('%entity_type: List item added via [].', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->name[1]->value == 'Another name', format_string('%entityType: List item added via [].', array('%entityType' => $entity_type))); $entity->name[2]->value = 'Third name'; - $this->assertEqual($entity->name[2]->value == 'Third name', format_string('%entity_type: List item added by a accessing not yet created item.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->name[2]->value == 'Third name', format_string('%entityType: List item added by a accessing not yet created item.', array('%entityType' => $entity_type))); // Test removing and empty-ing list items. - $this->assertEqual(count($entity->name), 3, format_string('%entity_type: List has 3 items.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entity->name), 3, format_string('%entityType: List has 3 items.', array('%entityType' => $entity_type))); unset($entity->name[1]); - $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Second list item has been removed.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entity->name), 2, format_string('%entityType: Second list item has been removed.', array('%entityType' => $entity_type))); $entity->name[2] = NULL; - $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Assigning NULL does not reduce array count.', array('%entity_type' => $entity_type))); - $this->assertTrue($entity->name[2]->isEmpty(), format_string('%entity_type: Assigning NULL empties the item.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entity->name), 2, format_string('%entityType: Assigning NULL does not reduce array count.', array('%entityType' => $entity_type))); + $this->assertTrue($entity->name[2]->isEmpty(), format_string('%entityType: Assigning NULL empties the item.', array('%entityType' => $entity_type))); // Test using isEmpty(). unset($entity->name[2]); - $this->assertFalse($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is not empty.', array('%entity_type' => $entity_type))); + $this->assertFalse($entity->name[0]->isEmpty(), format_string('%entityType: Name item is not empty.', array('%entityType' => $entity_type))); $entity->name->value = NULL; - $this->assertTrue($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is empty.', array('%entity_type' => $entity_type))); - $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is empty.', array('%entity_type' => $entity_type))); - $this->assertEqual(count($entity->name), 1, format_string('%entity_type: Empty item is considered when counting.', array('%entity_type' => $entity_type))); - $this->assertEqual(count(iterator_to_array($entity->name->getIterator())), count($entity->name), format_string('%entity_type: Count matches iterator count.', array('%entity_type' => $entity_type))); - $this->assertTrue($entity->name->getValue() === array(0 => array('value' => NULL)), format_string('%entity_type: Name field value contains a NULL value.', array('%entity_type' => $entity_type))); + $this->assertTrue($entity->name[0]->isEmpty(), format_string('%entityType: Name item is empty.', array('%entityType' => $entity_type))); + $this->assertTrue($entity->name->isEmpty(), format_string('%entityType: Name field is empty.', array('%entityType' => $entity_type))); + $this->assertEqual(count($entity->name), 1, format_string('%entityType: Empty item is considered when counting.', array('%entityType' => $entity_type))); + $this->assertEqual(count(iterator_to_array($entity->name->getIterator())), count($entity->name), format_string('%entityType: Count matches iterator count.', array('%entityType' => $entity_type))); + $this->assertTrue($entity->name->getValue() === array(0 => array('value' => NULL)), format_string('%entityType: Name field value contains a NULL value.', array('%entityType' => $entity_type))); // Test removing all list items by assigning an empty array. $entity->name = array(); - $this->assertIdentical(count($entity->name), 0, format_string('%entity_type: Name field contains no items.', array('%entity_type' => $entity_type))); - $this->assertIdentical($entity->name->getValue(), array(), format_string('%entity_type: Name field value is an empty array.', array('%entity_type' => $entity_type))); + $this->assertIdentical(count($entity->name), 0, format_string('%entityType: Name field contains no items.', array('%entityType' => $entity_type))); + $this->assertIdentical($entity->name->getValue(), array(), format_string('%entityType: Name field value is an empty array.', array('%entityType' => $entity_type))); $entity->name->value = 'foo'; - $this->assertEqual($entity->name->value, 'foo', format_string('%entity_type: Name field set.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->name->value, 'foo', format_string('%entityType: Name field set.', array('%entityType' => $entity_type))); // Test removing all list items by setting it to NULL. $entity->name = NULL; - $this->assertIdentical(count($entity->name), 0, format_string('%entity_type: Name field contains no items.', array('%entity_type' => $entity_type))); - $this->assertNull($entity->name->getValue(), format_string('%entity_type: Name field value is an empty array.', array('%entity_type' => $entity_type))); + $this->assertIdentical(count($entity->name), 0, format_string('%entityType: Name field contains no items.', array('%entityType' => $entity_type))); + $this->assertNull($entity->name->getValue(), format_string('%entityType: Name field value is an empty array.', array('%entityType' => $entity_type))); // Test get and set field values. $entity->name = 'foo'; - $this->assertEqual($entity->name[0]->getPropertyValues(), array('value' => 'foo'), format_string('%entity_type: Field value has been retrieved via getPropertyValue()', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->name[0]->getPropertyValues(), array('value' => 'foo'), format_string('%entityType: Field value has been retrieved via getPropertyValue()', array('%entityType' => $entity_type))); $entity->name[0]->setPropertyValues(array('value' => 'bar')); - $this->assertEqual($entity->name->value, 'bar', format_string('%entity_type: Field value has been set via setPropertyValue()', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->name->value, 'bar', format_string('%entityType: Field value has been set via setPropertyValue()', array('%entityType' => $entity_type))); $values = $entity->getPropertyValues(); - $this->assertEqual($values['name'], array(0 => array('value' => 'bar')), format_string('%entity_type: Field value has been retrieved via getPropertyValue() from an entity.', array('%entity_type' => $entity_type))); + $this->assertEqual($values['name'], array(0 => array('value' => 'bar')), format_string('%entityType: Field value has been retrieved via getPropertyValue() from an entity.', array('%entityType' => $entity_type))); $entity->setPropertyValues(array('name' => 'foo')); - $this->assertEqual($entity->name->value, 'foo', format_string('%entity_type: Field value has been set via setPropertyValue() on an entity.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->name->value, 'foo', format_string('%entityType: Field value has been set via setPropertyValue() on an entity.', array('%entityType' => $entity_type))); // Make sure the user id can be set to zero. $user_item[0]['target_id'] = 0; @@ -287,8 +287,8 @@ protected function assertReadWrite($entity_type) { 'user_id' => $user_item, 'field_test_text' => $text_item, )); - $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', array('%entity_type' => $entity_type))); - $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type))); + $this->assertNotNull($entity->user_id->target_id, format_string('%entityType: User id is not NULL', array('%entityType' => $entity_type))); + $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entityType: User id has been set to 0', array('%entityType' => $entity_type))); // Test setting the ID with the value only. $entity = entity_create($entity_type, array( @@ -296,8 +296,8 @@ protected function assertReadWrite($entity_type) { 'user_id' => 0, 'field_test_text' => $text_item, )); - $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', array('%entity_type' => $entity_type))); - $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type))); + $this->assertNotNull($entity->user_id->target_id, format_string('%entityType: User id is not NULL', array('%entityType' => $entity_type))); + $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entityType: User id has been set to 0', array('%entityType' => $entity_type))); } /** @@ -319,19 +319,19 @@ public function testSave() { protected function assertSave($entity_type) { $entity = $this->createTestEntity($entity_type); $entity->save(); - $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity has received an id.', array('%entity_type' => $entity_type))); + $this->assertTrue((bool) $entity->id(), format_string('%entityType: Entity has received an id.', array('%entityType' => $entity_type))); $entity = entity_load($entity_type, $entity->id()); - $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity loaded.', array('%entity_type' => $entity_type))); + $this->assertTrue((bool) $entity->id(), format_string('%entityType: Entity loaded.', array('%entityType' => $entity_type))); // Access the name field. - $this->assertEqual(1, $entity->id->value, format_string('%entity_type: ID value can be read.', array('%entity_type' => $entity_type))); - $this->assertTrue(is_string($entity->uuid->value), format_string('%entity_type: UUID value can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual(Language::LANGCODE_NOT_SPECIFIED, $entity->langcode->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual(language_load(Language::LANGCODE_NOT_SPECIFIED), $entity->langcode->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type))); - $this->assertEqual($this->entity_field_text, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type))); + $this->assertEqual(1, $entity->id->value, format_string('%entityType: ID value can be read.', array('%entityType' => $entity_type))); + $this->assertTrue(is_string($entity->uuid->value), format_string('%entityType: UUID value can be read.', array('%entityType' => $entity_type))); + $this->assertEqual(Language::LANGCODE_NOT_SPECIFIED, $entity->langcode->value, format_string('%entityType: Language code can be read.', array('%entityType' => $entity_type))); + $this->assertEqual(language_load(Language::LANGCODE_NOT_SPECIFIED), $entity->langcode->language, format_string('%entityType: Language object can be read.', array('%entityType' => $entity_type))); + $this->assertEqual($this->entity_user->id(), $entity->user_id->target_id, format_string('%entityType: User id can be read.', array('%entityType' => $entity_type))); + $this->assertEqual($this->entity_user->getUsername(), $entity->user_id->entity->name->value, format_string('%entityType: User name can be read.', array('%entityType' => $entity_type))); + $this->assertEqual($this->entity_field_text, $entity->field_test_text->value, format_string('%entityType: Text field can be read.', array('%entityType' => $entity_type))); } /** @@ -443,8 +443,8 @@ protected function assertIterator($entity_type) { } $properties = $entity->getProperties(); - $this->assertEqual(array_keys($properties), array_keys($entity->getPropertyDefinitions()), format_string('%entity_type: All properties returned.', array('%entity_type' => $entity_type))); - $this->assertEqual($properties, iterator_to_array($entity->getIterator()), format_string('%entity_type: Entity iterator iterates over all properties.', array('%entity_type' => $entity_type))); + $this->assertEqual(array_keys($properties), array_keys($entity->getPropertyDefinitions()), format_string('%entityType: All properties returned.', array('%entityType' => $entity_type))); + $this->assertEqual($properties, iterator_to_array($entity->getIterator()), format_string('%entityType: Entity iterator iterates over all properties.', array('%entityType' => $entity_type))); } /** @@ -484,7 +484,7 @@ protected function assertDataStructureInterfaces($entity_type) { // Field format. NULL, ); - $this->assertEqual($strings, $target_strings, format_string('%entity_type: All contained strings found.', array('%entity_type' => $entity_type))); + $this->assertEqual($strings, $target_strings, format_string('%entityType: All contained strings found.', array('%entityType' => $entity_type))); } /** @@ -610,11 +610,11 @@ protected function assertComputedProperties($entity_type) { $entity->field_test_text->format = filter_default_format(); $target = "

The <strong>text</strong> text to filter.

\n"; - $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entityType: Text is processed with the default filter.', array('%entityType' => $entity_type))); // Save and load entity and make sure it still works. $entity->save(); $entity = entity_load($entity_type, $entity->id()); - $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entityType: Text is processed with the default filter.', array('%entityType' => $entity_type))); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php index d3334ab..36c4151 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityFormTest.php @@ -76,19 +76,19 @@ protected function assertFormCRUD($entity_type) { $this->drupalPost($entity_type . '/add', $edit, t('Save')); $entity = $this->loadEntityByName($entity_type, $name1); - $this->assertTrue($entity, format_string('%entity_type: Entity found in the database.', array('%entity_type' => $entity_type))); + $this->assertTrue($entity, format_string('%entityType: Entity found in the database.', array('%entityType' => $entity_type))); $edit['name'] = $name2; $this->drupalPost($entity_type . '/manage/' . $entity->id() . '/edit', $edit, t('Save')); $entity = $this->loadEntityByName($entity_type, $name1); - $this->assertFalse($entity, format_string('%entity_type: The entity has been modified.', array('%entity_type' => $entity_type))); + $this->assertFalse($entity, format_string('%entityType: The entity has been modified.', array('%entityType' => $entity_type))); $entity = $this->loadEntityByName($entity_type, $name2); - $this->assertTrue($entity, format_string('%entity_type: Modified entity found in the database.', array('%entity_type' => $entity_type))); - $this->assertNotEqual($entity->name->value, $name1, format_string('%entity_type: The entity name has been modified.', array('%entity_type' => $entity_type))); + $this->assertTrue($entity, format_string('%entityType: Modified entity found in the database.', array('%entityType' => $entity_type))); + $this->assertNotEqual($entity->name->value, $name1, format_string('%entityType: The entity name has been modified.', array('%entityType' => $entity_type))); $this->drupalPost($entity_type . '/manage/' . $entity->id() . '/edit', array(), t('Delete')); $entity = $this->loadEntityByName($entity_type, $name2); - $this->assertFalse($entity, format_string('%entity_type: Entity not found in the database.', array('%entity_type' => $entity_type))); + $this->assertFalse($entity, format_string('%entityType: Entity not found in the database.', array('%entityType' => $entity_type))); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php index 9db6310..f8027d6 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryAggregateTest.php @@ -68,7 +68,7 @@ public function setUp() { ))->save(); entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ))->save(); } diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php index 114ba79..d5bdab5 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php @@ -89,7 +89,7 @@ public function setUp() { entity_test_create_bundle('test_bundle'); // Third, create the instance. entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => $this->fieldName, 'bundle' => 'test_bundle', ))->save(); diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php index 284526f..e6415e9 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php @@ -82,7 +82,7 @@ function setUp() { foreach ($fields as $field) { entity_create('field_instance', array( 'field_name' => $field->id(), - 'entity_type' => 'entity_test_mulrev', + 'entityType' => 'entity_test_mulrev', 'bundle' => $bundle, ))->save(); } @@ -413,7 +413,7 @@ protected function testCount() { $bundle = $this->randomName(); entity_create('field_instance', array( 'field_name' => $field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => $bundle, ))->save(); diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php index e2d31ab..dfd7b2d 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityRevisionsTest.php @@ -89,9 +89,9 @@ protected function assertRevisions($entity_type) { $revision_ids[] = $entity->revision_id->value; // Check that the fields and properties contain new content. - $this->assertTrue($entity->revision_id->value > $legacy_revision_id, format_string('%entity_type: Revision ID changed.', array('%entity_type' => $entity_type))); - $this->assertNotEqual($entity->name->value, $legacy_name, format_string('%entity_type: Name changed.', array('%entity_type' => $entity_type))); - $this->assertNotEqual($entity->field_test_text->value, $legacy_text, format_string('%entity_type: Text changed.', array('%entity_type' => $entity_type))); + $this->assertTrue($entity->revision_id->value > $legacy_revision_id, format_string('%entityType: Revision ID changed.', array('%entityType' => $entity_type))); + $this->assertNotEqual($entity->name->value, $legacy_name, format_string('%entityType: Name changed.', array('%entityType' => $entity_type))); + $this->assertNotEqual($entity->field_test_text->value, $legacy_text, format_string('%entityType: Text changed.', array('%entityType' => $entity_type))); } for ($i = 0; $i < $revision_count; $i++) { @@ -99,15 +99,15 @@ protected function assertRevisions($entity_type) { $entity_revision = entity_revision_load($entity_type, $revision_ids[$i]); // Check if properties and fields contain the revision specific content. - $this->assertEqual($entity_revision->revision_id->value, $revision_ids[$i], format_string('%entity_type: Revision ID matches.', array('%entity_type' => $entity_type))); - $this->assertEqual($entity_revision->name->value, $names[$i], format_string('%entity_type: Name matches.', array('%entity_type' => $entity_type))); - $this->assertEqual($entity_revision->field_test_text->value, $texts[$i], format_string('%entity_type: Text matches.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity_revision->revision_id->value, $revision_ids[$i], format_string('%entityType: Revision ID matches.', array('%entityType' => $entity_type))); + $this->assertEqual($entity_revision->name->value, $names[$i], format_string('%entityType: Name matches.', array('%entityType' => $entity_type))); + $this->assertEqual($entity_revision->field_test_text->value, $texts[$i], format_string('%entityType: Text matches.', array('%entityType' => $entity_type))); } // Confirm the correct revision text appears in the edit form. $entity = entity_load($entity_type, $entity->id->value); $this->drupalGet($entity_type . '/manage/' . $entity->id->value); - $this->assertFieldById('edit-name', $entity->name->value, format_string('%entity_type: Name matches in UI.', array('%entity_type' => $entity_type))); - $this->assertFieldById('edit-field-test-text-und-0-value', $entity->field_test_text->value, format_string('%entity_type: Text matches in UI.', array('%entity_type' => $entity_type))); + $this->assertFieldById('edit-name', $entity->name->value, format_string('%entityType: Name matches in UI.', array('%entityType' => $entity_type))); + $this->assertFieldById('edit-field-test-text-und-0-value', $entity->field_test_text->value, format_string('%entityType: Text matches in UI.', array('%entityType' => $entity_type))); } } diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php index 40a7e44..e0049c6 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityTranslationTest.php @@ -63,7 +63,7 @@ function setUp() { foreach (entity_test_entity_types() as $entity_type) { entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'bundle' => $entity_type, ))->save(); $this->instance[$entity_type] = field_read_instance($entity_type, $this->field_name, $entity_type); @@ -109,40 +109,40 @@ protected function assertEntityLanguageMethods($entity_type) { 'name' => 'test', 'user_id' => $GLOBALS['user']->id(), )); - $this->assertEqual($entity->language()->id, Language::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity language not specified.', array('%entity_type' => $entity_type))); - $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->language()->id, Language::LANGCODE_NOT_SPECIFIED, format_string('%entityType: Entity language not specified.', array('%entityType' => $entity_type))); + $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entityType: No translations are available', array('%entityType' => $entity_type))); // Set the value in default language. $entity->set($this->field_name, array(0 => array('value' => 'default value'))); // Get the value. - $this->assertEqual($entity->getTranslation(Language::LANGCODE_DEFAULT)->get($this->field_name)->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->getTranslation(Language::LANGCODE_DEFAULT)->get($this->field_name)->value, 'default value', format_string('%entityType: Untranslated value retrieved.', array('%entityType' => $entity_type))); // Set the value in a certain language. As the entity is not // language-specific it should use the default language and so ignore the // specified language. $entity->getTranslation($this->langcodes[1])->set($this->field_name, array(0 => array('value' => 'default value2'))); - $this->assertEqual($entity->get($this->field_name)->value, 'default value2', format_string('%entity_type: Untranslated value updated.', array('%entity_type' => $entity_type))); - $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->get($this->field_name)->value, 'default value2', format_string('%entityType: Untranslated value updated.', array('%entityType' => $entity_type))); + $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entityType: No translations are available', array('%entityType' => $entity_type))); // Test getting a field value using a specific language for a not // language-specific entity. - $this->assertEqual($entity->getTranslation($this->langcodes[1])->get($this->field_name)->value, 'default value2', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->getTranslation($this->langcodes[1])->get($this->field_name)->value, 'default value2', format_string('%entityType: Untranslated value retrieved.', array('%entityType' => $entity_type))); // Now, make the entity language-specific by assigning a language and test // translating it. $entity->langcode->value = $this->langcodes[0]; $entity->{$this->field_name} = array(); - $this->assertEqual($entity->language(), language_load($this->langcodes[0]), format_string('%entity_type: Entity language retrieved.', array('%entity_type' => $entity_type))); - $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->language(), language_load($this->langcodes[0]), format_string('%entityType: Entity language retrieved.', array('%entityType' => $entity_type))); + $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entityType: No translations are available', array('%entityType' => $entity_type))); // Set the value in default language. $entity->set($this->field_name, array(0 => array('value' => 'default value'))); // Get the value. - $this->assertEqual($entity->get($this->field_name)->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->get($this->field_name)->value, 'default value', format_string('%entityType: Untranslated value retrieved.', array('%entityType' => $entity_type))); // Set a translation. $entity->getTranslation($this->langcodes[1])->set($this->field_name, array(0 => array('value' => 'translation 1'))); - $this->assertEqual($entity->getTranslation($this->langcodes[1])->{$this->field_name}->value, 'translation 1', format_string('%entity_type: Translated value set.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->getTranslation($this->langcodes[1])->{$this->field_name}->value, 'translation 1', format_string('%entityType: Translated value set.', array('%entityType' => $entity_type))); // Make sure the untranslated value stays. $this->assertEqual($entity->get($this->field_name)->value, 'default value', 'Untranslated value stays.'); @@ -151,7 +151,7 @@ protected function assertEntityLanguageMethods($entity_type) { $this->assertEqual($entity->getTranslationLanguages(FALSE), $translations, 'Translations retrieved.'); // Try to get a not available translation. - $this->assertNull($entity->getTranslation($this->langcodes[2])->get($this->field_name)->value, format_string('%entity_type: A translation that is not available is NULL.', array('%entity_type' => $entity_type))); + $this->assertNull($entity->getTranslation($this->langcodes[2])->get($this->field_name)->value, format_string('%entityType: A translation that is not available is NULL.', array('%entityType' => $entity_type))); // Try to get a value using an invalid language code. try { @@ -165,17 +165,17 @@ protected function assertEntityLanguageMethods($entity_type) { // Try to set a value using an invalid language code. try { $entity->getTranslation('invalid')->set($this->field_name, NULL); - $this->fail(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type))); + $this->fail(format_string('%entityType: Setting a translation for an invalid language throws an exception.', array('%entityType' => $entity_type))); } catch (InvalidArgumentException $e) { - $this->pass(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type))); + $this->pass(format_string('%entityType: Setting a translation for an invalid language throws an exception.', array('%entityType' => $entity_type))); } // Set the value in default language. $field_name = 'field_test_text'; $entity->getTranslation($this->langcodes[1])->set($field_name, array(0 => array('value' => 'default value2'))); // Get the value. - $this->assertEqual($entity->get($field_name)->value, 'default value2', format_string('%entity_type: Untranslated value set into a translation in non-strict mode.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->get($field_name)->value, 'default value2', format_string('%entityType: Untranslated value set into a translation in non-strict mode.', array('%entityType' => $entity_type))); } /** @@ -204,30 +204,30 @@ protected function assertMultilingualProperties($entity_type) { $entity = entity_create($entity_type, array('name' => $name, 'user_id' => $uid)); $entity->save(); $entity = entity_load($entity_type, $entity->id()); - $this->assertEqual($entity->language()->id, Language::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity created as language neutral.', array('%entity_type' => $entity_type))); - $this->assertEqual($name, $entity->getTranslation(Language::LANGCODE_DEFAULT)->get('name')->value, format_string('%entity_type: The entity name has been correctly stored as language neutral.', array('%entity_type' => $entity_type))); - $this->assertEqual($uid, $entity->getTranslation(Language::LANGCODE_DEFAULT)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as language neutral.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->language()->id, Language::LANGCODE_NOT_SPECIFIED, format_string('%entityType: Entity created as language neutral.', array('%entityType' => $entity_type))); + $this->assertEqual($name, $entity->getTranslation(Language::LANGCODE_DEFAULT)->get('name')->value, format_string('%entityType: The entity name has been correctly stored as language neutral.', array('%entityType' => $entity_type))); + $this->assertEqual($uid, $entity->getTranslation(Language::LANGCODE_DEFAULT)->get('user_id')->target_id, format_string('%entityType: The entity author has been correctly stored as language neutral.', array('%entityType' => $entity_type))); // As fields, translatable properties should ignore the given langcode and // use neutral language if the entity is not translatable. - $this->assertEqual($name, $entity->getTranslation($langcode)->get('name')->value, format_string('%entity_type: The entity name defaults to neutral language.', array('%entity_type' => $entity_type))); - $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author defaults to neutral language.', array('%entity_type' => $entity_type))); - $this->assertEqual($name, $entity->get('name')->value, format_string('%entity_type: The entity name can be retrieved without specifying a language.', array('%entity_type' => $entity_type))); - $this->assertEqual($uid, $entity->get('user_id')->target_id, format_string('%entity_type: The entity author can be retrieved without specifying a language.', array('%entity_type' => $entity_type))); + $this->assertEqual($name, $entity->getTranslation($langcode)->get('name')->value, format_string('%entityType: The entity name defaults to neutral language.', array('%entityType' => $entity_type))); + $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entityType: The entity author defaults to neutral language.', array('%entityType' => $entity_type))); + $this->assertEqual($name, $entity->get('name')->value, format_string('%entityType: The entity name can be retrieved without specifying a language.', array('%entityType' => $entity_type))); + $this->assertEqual($uid, $entity->get('user_id')->target_id, format_string('%entityType: The entity author can be retrieved without specifying a language.', array('%entityType' => $entity_type))); // Create a language-aware entity and check that properties are stored // as language-aware. $entity = entity_create($entity_type, array('name' => $name, 'user_id' => $uid, 'langcode' => $langcode)); $entity->save(); $entity = entity_load($entity_type, $entity->id()); - $this->assertEqual($entity->language()->id, $langcode, format_string('%entity_type: Entity created as language specific.', array('%entity_type' => $entity_type))); - $this->assertEqual($name, $entity->getTranslation($langcode)->get('name')->value, format_string('%entity_type: The entity name has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type))); - $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type))); + $this->assertEqual($entity->language()->id, $langcode, format_string('%entityType: Entity created as language specific.', array('%entityType' => $entity_type))); + $this->assertEqual($name, $entity->getTranslation($langcode)->get('name')->value, format_string('%entityType: The entity name has been correctly stored as a language-aware property.', array('%entityType' => $entity_type))); + $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entityType: The entity author has been correctly stored as a language-aware property.', array('%entityType' => $entity_type))); // Translatable properties on a translatable entity should use default // language if Language::LANGCODE_NOT_SPECIFIED is passed. - $this->assertEqual($name, $entity->getTranslation(Language::LANGCODE_NOT_SPECIFIED)->get('name')->value, format_string('%entity_type: The entity name defaults to the default language.', array('%entity_type' => $entity_type))); - $this->assertEqual($uid, $entity->getTranslation(Language::LANGCODE_NOT_SPECIFIED)->get('user_id')->target_id, format_string('%entity_type: The entity author defaults to the default language.', array('%entity_type' => $entity_type))); - $this->assertEqual($name, $entity->get('name')->value, format_string('%entity_type: The entity name can be retrieved without specifying a language.', array('%entity_type' => $entity_type))); - $this->assertEqual($uid, $entity->get('user_id')->target_id, format_string('%entity_type: The entity author can be retrieved without specifying a language.', array('%entity_type' => $entity_type))); + $this->assertEqual($name, $entity->getTranslation(Language::LANGCODE_NOT_SPECIFIED)->get('name')->value, format_string('%entityType: The entity name defaults to the default language.', array('%entityType' => $entity_type))); + $this->assertEqual($uid, $entity->getTranslation(Language::LANGCODE_NOT_SPECIFIED)->get('user_id')->target_id, format_string('%entityType: The entity author defaults to the default language.', array('%entityType' => $entity_type))); + $this->assertEqual($name, $entity->get('name')->value, format_string('%entityType: The entity name can be retrieved without specifying a language.', array('%entityType' => $entity_type))); + $this->assertEqual($uid, $entity->get('user_id')->target_id, format_string('%entityType: The entity author can be retrieved without specifying a language.', array('%entityType' => $entity_type))); // Create property translations. $properties = array(); @@ -253,11 +253,11 @@ protected function assertMultilingualProperties($entity_type) { $entity = entity_load($entity_type, $entity->id()); foreach ($this->langcodes as $langcode) { $args = array( - '%entity_type' => $entity_type, + '%entityType' => $entity_type, '%langcode' => $langcode, ); - $this->assertEqual($properties[$langcode]['name'][0], $entity->getTranslation($langcode)->get('name')->value, format_string('%entity_type: The entity name has been correctly stored for language %langcode.', $args)); - $this->assertEqual($properties[$langcode]['user_id'][0], $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored for language %langcode.', $args)); + $this->assertEqual($properties[$langcode]['name'][0], $entity->getTranslation($langcode)->get('name')->value, format_string('%entityType: The entity name has been correctly stored for language %langcode.', $args)); + $this->assertEqual($properties[$langcode]['user_id'][0], $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entityType: The entity author has been correctly stored for language %langcode.', $args)); } // Test query conditions (cache is reset at each call). @@ -271,24 +271,24 @@ protected function assertMultilingualProperties($entity_type) { ))->save(); $entities = entity_load_multiple($entity_type); - $this->assertEqual(count($entities), 3, format_string('%entity_type: Three entities were created.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entities), 3, format_string('%entityType: Three entities were created.', array('%entityType' => $entity_type))); $entities = entity_load_multiple($entity_type, array($translated_id)); - $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by id.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entities), 1, format_string('%entityType: One entity correctly loaded by id.', array('%entityType' => $entity_type))); $entities = entity_load_multiple_by_properties($entity_type, array('name' => $name)); - $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities correctly loaded by name.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entities), 2, format_string('%entityType: Two entities correctly loaded by name.', array('%entityType' => $entity_type))); // @todo The default language condition should go away in favor of an // explicit parameter. $entities = entity_load_multiple_by_properties($entity_type, array('name' => $properties[$langcode]['name'][0], 'default_langcode' => 0)); - $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name translation.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entities), 1, format_string('%entityType: One entity correctly loaded by name translation.', array('%entityType' => $entity_type))); $entities = entity_load_multiple_by_properties($entity_type, array('langcode' => $default_langcode, 'name' => $name)); - $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name and language.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entities), 1, format_string('%entityType: One entity correctly loaded by name and language.', array('%entityType' => $entity_type))); $entities = entity_load_multiple_by_properties($entity_type, array('langcode' => $langcode, 'name' => $properties[$langcode]['name'][0])); - $this->assertEqual(count($entities), 0, format_string('%entity_type: No entity loaded by name translation specifying the translation language.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entities), 0, format_string('%entityType: No entity loaded by name translation specifying the translation language.', array('%entityType' => $entity_type))); $entities = entity_load_multiple_by_properties($entity_type, array('langcode' => $langcode, 'name' => $properties[$langcode]['name'][0], 'default_langcode' => 0)); - $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity loaded by name translation and language specifying to look for translations.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entities), 1, format_string('%entityType: One entity loaded by name translation and language specifying to look for translations.', array('%entityType' => $entity_type))); $entities = entity_load_multiple_by_properties($entity_type, array('user_id' => $properties[$langcode]['user_id'][0], 'default_langcode' => NULL)); - $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities loaded by uid without caring about property translatability.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($entities), 2, format_string('%entityType: Two entities loaded by uid without caring about property translatability.', array('%entityType' => $entity_type))); // Test property conditions and orders with multiple languages in the same // query. @@ -300,7 +300,7 @@ protected function assertMultilingualProperties($entity_type) { ->condition($group) ->condition('name', $properties[$langcode]['name'], '=', $langcode) ->execute(); - $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name and uid using different language meta conditions.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($result), 1, format_string('%entityType: One entity loaded by name and uid using different language meta conditions.', array('%entityType' => $entity_type))); // Test mixed property and field conditions. $entity = entity_load($entity_type, reset($result), TRUE); @@ -319,7 +319,7 @@ protected function assertMultilingualProperties($entity_type) { ->condition($default_langcode_group) ->condition($langcode_group) ->execute(); - $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name, uid and field value using different language meta conditions.', array('%entity_type' => $entity_type))); + $this->assertEqual(count($result), 1, format_string('%entityType: One entity loaded by name, uid and field value using different language meta conditions.', array('%entityType' => $entity_type))); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/ArbitraryRebuildTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/ArbitraryRebuildTest.php index cc6546a..771b88a 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Form/ArbitraryRebuildTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Form/ArbitraryRebuildTest.php @@ -40,7 +40,7 @@ function setUp() { 'translatable' => FALSE, ))->save(); entity_create('field_instance', array( - 'entity_type' => 'user', + 'entityType' => 'user', 'field_name' => 'test_multiple', 'bundle' => 'user', 'label' => 'Test a multiple valued field', diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php index c580e88..2147a8c 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Form/RebuildTest.php @@ -79,7 +79,7 @@ function testPreserveFormActionAfterAJAX() { entity_create('field_entity', $field)->save(); $instance = array( 'field_name' => $field_name, - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', ); entity_create('field_instance', $instance)->save(); diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php index 95844f6..34dbf10 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleTestBase.php @@ -45,9 +45,9 @@ function assertTableCount($base_table, $count = TRUE) { $tables = db_find_tables(Database::getConnection()->prefixTables('{' . $base_table . '}') . '%'); if ($count) { - return $this->assertTrue($tables, format_string('Tables matching "@base_table" found.', array('@base_table' => $base_table))); + return $this->assertTrue($tables, format_string('Tables matching "@baseTable" found.', array('@baseTable' => $base_table))); } - return $this->assertFalse($tables, format_string('Tables matching "@base_table" not found.', array('@base_table' => $base_table))); + return $this->assertFalse($tables, format_string('Tables matching "@baseTable" not found.', array('@baseTable' => $base_table))); } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php index 0f660e3..1c44ec6 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php @@ -161,7 +161,7 @@ function testFieldUpgradeToConfig() { 'id' => "node.$node_type.body", 'field_uuid' => $field_uuid, 'field_type' => 'text_with_summary', - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => $node_type, 'label' => 'Body', 'description' => '', diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php index 49e87a0..d0d5923 100644 --- a/core/modules/system/system.api.php +++ b/core/modules/system/system.api.php @@ -3672,7 +3672,7 @@ function hook_link_alter(&$variables) { * * id = "comment", * * label = @Translation("Comment"), * * ... - * * base_table = "comment" + * * baseTable = "comment" * * ) * @endcode * diff --git a/core/modules/system/tests/modules/entity_test/entity_test.install b/core/modules/system/tests/modules/entity_test/entity_test.install index d6f1b34..c3f7474 100644 --- a/core/modules/system/tests/modules/entity_test/entity_test.install +++ b/core/modules/system/tests/modules/entity_test/entity_test.install @@ -25,7 +25,7 @@ function entity_test_install() { ); foreach ($entity_types as $entity_type) { entity_create('field_instance', array( - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'field_name' => 'field_test_text', 'bundle' => $entity_type, 'label' => 'Test text-field', diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module index b401470..837203a 100644 --- a/core/modules/system/tests/modules/entity_test/entity_test.module +++ b/core/modules/system/tests/modules/entity_test/entity_test.module @@ -397,7 +397,7 @@ function entity_test_entity_field_access_alter(array &$grants, array $context) { */ function entity_test_entity_form_display_alter(EntityFormDisplay $form_display, $context) { // Make the field_test_text field 42 characters for entity_test_mul. - if ($context['entity_type'] == 'entity_test') { + if ($context['entityType'] == 'entity_test') { if ($component_options = $form_display->getComponent('field_test_text')) { $component_options['settings']['size'] = 42; $form_display->setComponent('field_test_text', $component_options); diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php index 95d74ce..86e67c6 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php @@ -28,7 +28,7 @@ * }, * "translation" = "Drupal\content_translation\ContentTranslationControllerNG" * }, - * base_table = "entity_test", + * baseTable = "entity_test", * fieldable = TRUE, * field_cache = FALSE, * entity_keys = { diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php index b4a064f..226fea5 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php @@ -26,7 +26,7 @@ * }, * "translation" = "Drupal\content_translation\ContentTranslationControllerNG" * }, - * base_table = "entity_test", + * baseTable = "entity_test", * fieldable = TRUE, * field_cache = TRUE, * entity_keys = { diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php index 4893c83..5873733 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php @@ -20,7 +20,7 @@ * controllers = { * "storage" = "Drupal\entity_test\EntityTestStorageController" * }, - * base_table = "entity_test", + * baseTable = "entity_test", * entity_keys = { * "id" = "id", * "bundle" = "type" diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php index 224da5a..728f079 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php @@ -20,7 +20,7 @@ * controllers = { * "storage" = "Drupal\entity_test\EntityTestStorageController" * }, - * base_table = "entity_test", + * baseTable = "entity_test", * entity_keys = { * "id" = "id", * "label" = "name", diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php index 1784aa2..1ec34b0 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php @@ -21,7 +21,7 @@ * "storage" = "Drupal\entity_test\EntityTestStorageController" * }, * field_cache = FALSE, - * base_table = "entity_test", + * baseTable = "entity_test", * revision_table = "entity_test_revision", * label_callback = "entity_test_label_callback", * fieldable = TRUE, diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php index 3f7e833..8a54597 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php @@ -26,7 +26,7 @@ * }, * "translation" = "Drupal\content_translation\ContentTranslationControllerNG" * }, - * base_table = "entity_test_mul", + * baseTable = "entity_test_mul", * data_table = "entity_test_mul_property_data", * fieldable = TRUE, * translatable = TRUE, diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php index 4a578e2..9ec09d6 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php @@ -26,7 +26,7 @@ * }, * "translation" = "Drupal\content_translation\ContentTranslationControllerNG" * }, - * base_table = "entity_test_mulrev", + * baseTable = "entity_test_mulrev", * data_table = "entity_test_mulrev_property_data", * revision_table = "entity_test_mulrev_property_revision", * fieldable = TRUE, diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php index f56a5e0..d5be67c 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php @@ -21,7 +21,7 @@ * "storage" = "Drupal\entity_test\EntityTestStorageController" * }, * field_cache = FALSE, - * base_table = "entity_test", + * baseTable = "entity_test", * entity_keys = { * "id" = "id", * "bundle" = "type" diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php index 3c0869d..11bacd5 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRender.php @@ -21,7 +21,7 @@ * "storage" = "Drupal\entity_test\EntityTestStorageController", * "render" = "Drupal\entity_test\EntityTestRenderController" * }, - * base_table = "entity_test", + * baseTable = "entity_test", * fieldable = TRUE, * entity_keys = { * "id" = "id", diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php index 0fabcca..08be5a6 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php @@ -26,7 +26,7 @@ * }, * "translation" = "Drupal\content_translation\ContentTranslationControllerNG" * }, - * base_table = "entity_test_rev", + * baseTable = "entity_test_rev", * revision_table = "entity_test_rev_revision", * fieldable = TRUE, * entity_keys = { diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestFormController.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestFormController.php index 1dbb859..3bc7f2a 100644 --- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestFormController.php +++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/EntityTestFormController.php @@ -85,10 +85,10 @@ public function save(array $form, array &$form_state) { $entity->save(); if ($is_new) { - $message = t('%entity_type @id has been created.', array('@id' => $entity->id(), '%entity_type' => $entity->entityType())); + $message = t('%entityType @id has been created.', array('@id' => $entity->id(), '%entityType' => $entity->entityType())); } else { - $message = t('%entity_type @id has been updated.', array('@id' => $entity->id(), '%entity_type' => $entity->entityType())); + $message = t('%entityType @id has been updated.', array('@id' => $entity->id(), '%entityType' => $entity->entityType())); } drupal_set_message($message); @@ -108,7 +108,7 @@ public function save(array $form, array &$form_state) { public function delete(array $form, array &$form_state) { $entity = $this->entity; $entity->delete(); - drupal_set_message(t('%entity_type @id has been deleted.', array('@id' => $entity->id(), '%entity_type' => $entity->entityType()))); + drupal_set_message(t('%entityType @id has been deleted.', array('@id' => $entity->id(), '%entityType' => $entity->entityType()))); $form_state['redirect'] = ''; } } diff --git a/core/modules/system/tests/upgrade/drupal-7.field.database.php b/core/modules/system/tests/upgrade/drupal-7.field.database.php index 74f69fb..a5327de 100644 --- a/core/modules/system/tests/upgrade/drupal-7.field.database.php +++ b/core/modules/system/tests/upgrade/drupal-7.field.database.php @@ -90,7 +90,7 @@ ->execute(); $field_data_row = array( - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'article', 'deleted' => '0', 'entity_id' => '1', @@ -149,7 +149,7 @@ ->fields(array( 'field_id' => $field_id, 'field_name' => 'test_deleted_field', - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'article', 'data' => serialize(array( 'label' => 'Long text', @@ -185,7 +185,7 @@ // Add data tables for the deleted field. db_create_table("field_deleted_data_{$field_id}", array( 'fields' => array( - 'entity_type' => array( + 'entityType' => array( 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, @@ -236,15 +236,15 @@ ), ), 'primary key' => array( - 'entity_type', + 'entityType', 'entity_id', 'deleted', 'delta', 'language', ), 'indexes' => array( - 'entity_type' => array( - 'entity_type', + 'entityType' => array( + 'entityType', ), 'bundle' => array( 'bundle', @@ -278,7 +278,7 @@ )); db_create_table("field_deleted_revision_{$field_id}", array( 'fields' => array( - 'entity_type' => array( + 'entityType' => array( 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, @@ -329,7 +329,7 @@ ), ), 'primary key' => array( - 'entity_type', + 'entityType', 'entity_id', 'revision_id', 'deleted', @@ -337,8 +337,8 @@ 'language', ), 'indexes' => array( - 'entity_type' => array( - 'entity_type', + 'entityType' => array( + 'entityType', ), 'bundle' => array( 'bundle', @@ -373,7 +373,7 @@ // Add some deleted field data. $field_data_row = array( - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'article', 'deleted' => '0', 'entity_id' => '2', diff --git a/core/modules/system/tests/upgrade/drupal-7.language.database.php b/core/modules/system/tests/upgrade/drupal-7.language.database.php index ab8a816..508f13e 100644 --- a/core/modules/system/tests/upgrade/drupal-7.language.database.php +++ b/core/modules/system/tests/upgrade/drupal-7.language.database.php @@ -592,7 +592,7 @@ // Add the body field value. db_insert('field_data_body')->fields(array( - 'entity_type', + 'entityType', 'bundle', 'deleted', 'entity_id', @@ -604,7 +604,7 @@ 'body_format', )) ->values(array( - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'article', 'deleted' => '0', 'entity_id' => '50', @@ -619,7 +619,7 @@ // Add revision information for the body field value. db_insert('field_revision_body')->fields(array( - 'entity_type', + 'entityType', 'bundle', 'deleted', 'entity_id', @@ -631,7 +631,7 @@ 'body_format', )) ->values(array( - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'article', 'deleted' => '0', 'entity_id' => '50', @@ -697,7 +697,7 @@ // Add both comment bodies. db_insert('field_data_comment_body')->fields(array( - 'entity_type', + 'entityType', 'bundle', 'deleted', 'entity_id', @@ -708,7 +708,7 @@ 'comment_body_format', )) ->values(array( - 'entity_type' => 'comment', + 'entityType' => 'comment', 'bundle' => 'comment_node_article', 'deleted' => '0', 'entity_id' => '1', @@ -719,7 +719,7 @@ 'comment_body_format' => 'filtered_html', )) ->values(array( - 'entity_type' => 'comment', + 'entityType' => 'comment', 'bundle' => 'comment_node_article', 'deleted' => '0', 'entity_id' => '2', @@ -733,7 +733,7 @@ // Add revisions for comment bodies. db_insert('field_revision_comment_body')->fields(array( - 'entity_type', + 'entityType', 'bundle', 'deleted', 'entity_id', @@ -744,7 +744,7 @@ 'comment_body_format', )) ->values(array( - 'entity_type' => 'comment', + 'entityType' => 'comment', 'bundle' => 'comment_node_article', 'deleted' => '0', 'entity_id' => '1', @@ -755,7 +755,7 @@ 'comment_body_format' => 'filtered_html', )) ->values(array( - 'entity_type' => 'comment', + 'entityType' => 'comment', 'bundle' => 'comment_node_article', 'deleted' => '0', 'entity_id' => '2', diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php index daeb3ac..69740fc 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php @@ -32,7 +32,7 @@ * }, * "translation" = "Drupal\taxonomy\TermTranslationController" * }, - * base_table = "taxonomy_term_data", + * baseTable = "taxonomy_term_data", * uri_callback = "taxonomy_term_uri", * fieldable = TRUE, * translatable = TRUE, diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php index 8c20176..d1949cb 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php @@ -103,7 +103,7 @@ public function uri() { return array( 'path' => 'admin/structure/taxonomy/manage/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php index 8cbb9fb..0790bea 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php @@ -27,8 +27,8 @@ class TaxonomyIndexTid extends PrerenderList { public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) { parent::init($view, $display, $options); - // @todo: Wouldn't it be possible to use $this->base_table and no if here? - if ($view->storage->get('base_table') == 'node_field_revision') { + // @todo: Wouldn't it be possible to use $this->baseTable and no if here? + if ($view->storage->get('baseTable') == 'node_field_revision') { $this->additional_fields['nid'] = array('table' => 'node_field_revision', 'field' => 'nid'); } else { diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php index 3bae73d..172bde1 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php @@ -70,8 +70,8 @@ public function query() { $this->tableAlias = $this->relationship; } // If no relationship, then use the alias of the base table. - elseif (isset($this->query->table_queue[$this->view->storage->get('base_table')]['alias'])) { - $this->tableAlias = $this->query->table_queue[$this->view->storage->get('base_table')]['alias']; + elseif (isset($this->query->table_queue[$this->view->storage->get('baseTable')]['alias'])) { + $this->tableAlias = $this->query->table_queue[$this->view->storage->get('baseTable')]['alias']; } // This should never happen, but if it does, we fail quietly. else { diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php index d9409ae..1aaf44a 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php @@ -17,7 +17,7 @@ * @ViewsWizard( * id = "taxonomy_term", * module = "taxonomy", - * base_table = "taxonomy_term_data", + * baseTable = "taxonomy_term_data", * title = @Translation("Taxonomy terms") * ) */ diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php index bc219ee..de29121 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php @@ -42,7 +42,7 @@ function testTaxonomyEfq() { $this->assertEqual(array_keys($terms), $result, 'Taxonomy terms were retrieved by entity query.'); $tid = reset($result); $ids = (object) array( - 'entity_type' => 'taxonomy_term', + 'entityType' => 'taxonomy_term', 'entity_id' => $tid, 'bundle' => $this->vocabulary->id(), ); @@ -64,7 +64,7 @@ function testTaxonomyEfq() { $this->assertEqual(array_keys($terms2), $result, format_string('Taxonomy terms from the %name vocabulary were retrieved by entity query.', array('%name' => $vocabulary2->name))); $tid = reset($result); $ids = (object) array( - 'entity_type' => 'taxonomy_term', + 'entityType' => 'taxonomy_term', 'entity_id' => $tid, 'bundle' => $vocabulary2->id(), ); diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php index c9b8078..1efa9d6 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php @@ -54,7 +54,7 @@ function setUp() { entity_create('field_instance', array( 'field_name' => $this->field_name, 'bundle' => 'article', - 'entity_type' => 'node', + 'entityType' => 'node', ))->save(); entity_get_form_display('node', 'article', 'default') ->setComponent($this->field_name, array( diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermReferenceItemTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermReferenceItemTest.php index 2308f63..8090f7a 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermReferenceItemTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermReferenceItemTest.php @@ -58,7 +58,7 @@ public function setUp() { ), ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => 'field_test_taxonomy', 'bundle' => 'entity_test', ))->save(); diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldMultipleVocabularyTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldMultipleVocabularyTest.php index c19ce9d..c964ad5 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldMultipleVocabularyTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldMultipleVocabularyTest.php @@ -61,7 +61,7 @@ function setUp() { ))->save(); entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ))->save(); entity_get_form_display('entity_test', 'entity_test', 'default') diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldTest.php index e893001..7d2692c 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermFieldTest.php @@ -60,7 +60,7 @@ function setUp() { $this->field->save(); entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ))->save(); entity_get_form_display('entity_test', 'entity_test', 'default') diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermIndexTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermIndexTest.php index 239e927..7251775 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermIndexTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermIndexTest.php @@ -49,7 +49,7 @@ function setUp() { entity_create('field_instance', array( 'field_name' => $this->field_name_1, 'bundle' => 'article', - 'entity_type' => 'node', + 'entityType' => 'node', ))->save(); entity_get_form_display('node', 'article', 'default') ->setComponent($this->field_name_1, array( @@ -79,7 +79,7 @@ function setUp() { entity_create('field_instance', array( 'field_name' => $this->field_name_2, 'bundle' => 'article', - 'entity_type' => 'node', + 'entityType' => 'node', ))->save(); entity_get_form_display('node', 'article', 'default') ->setComponent($this->field_name_2, array( diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php index 2195b55..bd940c6 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php @@ -46,7 +46,7 @@ function setUp() { $this->instance = entity_create('field_instance', array( 'field_name' => 'taxonomy_' . $this->vocabulary->id(), 'bundle' => 'article', - 'entity_type' => 'node', + 'entityType' => 'node', )); $this->instance->save(); entity_get_form_display('node', 'article', 'default') @@ -146,7 +146,7 @@ function testTaxonomyNode() { function testNodeTermCreationAndDeletion() { // Enable tags in the vocabulary. $instance = $this->instance; - entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default') + entity_get_form_display($instance['entityType'], $instance['bundle'], 'default') ->setComponent($instance['field_name'], array( 'type' => 'taxonomy_autocomplete', 'settings' => array( @@ -511,7 +511,7 @@ function testTaxonomyGetTermByName() { function testReSavingTags() { // Enable tags in the vocabulary. $instance = $this->instance; - entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default') + entity_get_form_display($instance['entityType'], $instance['bundle'], 'default') ->setComponent($instance['field_name'], array( 'type' => 'taxonomy_autocomplete', )) diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php index 35f4555..ecc27b3 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TokenReplaceTest.php @@ -46,7 +46,7 @@ function setUp() { entity_create('field_instance', array( 'field_name' => $this->field_name, 'bundle' => 'article', - 'entity_type' => 'node', + 'entityType' => 'node', ))->save(); entity_get_form_display('node', 'article', 'default') ->setComponent($this->field_name, array( diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php index e7c7031..894dff1 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php @@ -93,7 +93,7 @@ protected function mockStandardInstall() { ))->save(); $instance = entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'node', + 'entityType' => 'node', 'label' => 'Tags', 'bundle' => 'article', ))->save(); diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php index 8901db1..7509b57 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyUnitTest.php @@ -160,7 +160,7 @@ function testTaxonomyVocabularyChangeMachineName() { ))->save(); entity_create('field_instance', array( 'field_name' => 'field_test', - 'entity_type' => 'taxonomy_term', + 'entityType' => 'taxonomy_term', 'bundle' => $this->vocabulary->id(), ))->save(); @@ -194,7 +194,7 @@ function testUninstallReinstall() { entity_create('field_entity', $this->field_definition)->save(); $this->instance_definition = array( 'field_name' => $this->field_name, - 'entity_type' => 'taxonomy_term', + 'entityType' => 'taxonomy_term', 'bundle' => $this->vocabulary->id(), 'label' => $this->randomName() . '_label', ); diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php index 0a1537b..adef23b 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php @@ -61,7 +61,7 @@ public function form(array $form, array &$form_state) { $form['default_terms_language']['default_language'] = array( '#type' => 'language_configuration', '#entity_information' => array( - 'entity_type' => 'taxonomy_term', + 'entityType' => 'taxonomy_term', 'bundle' => $vocabulary->id(), ), '#default_value' => language_get_default_configuration('taxonomy_term', $vocabulary->id()), diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index 306d6d0..726a3e9 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -186,7 +186,7 @@ function taxonomy_select_nodes($tid, $pager = TRUE, $limit = FALSE, $order = arr } $query = db_select('taxonomy_index', 't'); $query->addTag('node_access'); - $query->addMetaData('base_table', 'taxonomy_index'); + $query->addMetaData('baseTable', 'taxonomy_index'); $query->condition('tid', $tid); if ($pager) { $count_query = clone $query; diff --git a/core/modules/taxonomy/taxonomy.views.inc b/core/modules/taxonomy/taxonomy.views.inc index 5646268..edc7636 100644 --- a/core/modules/taxonomy/taxonomy.views.inc +++ b/core/modules/taxonomy/taxonomy.views.inc @@ -381,12 +381,12 @@ function taxonomy_field_views_data_views_data_alter(&$data, $field) { 'field_name' => $field['field_name'], 'field table' => _field_sql_storage_tablename($field), 'field field' => $field['field_name'] . '_target_id', - 'base' => $entity_info['base_table'], + 'base' => $entity_info['baseTable'], 'base field' => $entity_info['entity_keys']['id'], 'label' => t('!field_name', array('!field_name' => $field['field_name'])), 'join_extra' => array( 0 => array( - 'field' => 'entity_type', + 'field' => 'entityType', 'value' => $entity_type, ), 1 => array( diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml index d14ecff..d15700c 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8.x description: '' status: '1' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml index 957f2b2..b313f96 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_groupwise_term.yml @@ -1,5 +1,5 @@ base_field: tid -base_table: taxonomy_term_data +baseTable: taxonomy_term_data core: 8.0-dev description: '' status: '1' diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml index 2aebe47..20af43a 100644 --- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml +++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_taxonomy_node_term_data.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php b/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php index 6158f07..97ddb99 100644 --- a/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php +++ b/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneFieldTest.php @@ -60,7 +60,7 @@ function testTelephoneField() { entity_create('field_instance', array( 'field_name' => 'field_telephone', 'label' => 'Telephone Number', - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'article', ))->save(); diff --git a/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneItemTest.php b/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneItemTest.php index bd3633b..e0770f9 100644 --- a/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneItemTest.php +++ b/core/modules/telephone/lib/Drupal/telephone/Tests/TelephoneItemTest.php @@ -40,7 +40,7 @@ public function setUp() { 'type' => 'telephone', ))->save(); entity_create('field_instance', array( - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'field_name' => 'field_test', 'bundle' => 'entity_test', ))->save(); diff --git a/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php b/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php index 2971cb1..d303bb4 100644 --- a/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php +++ b/core/modules/text/lib/Drupal/text/Tests/Formatter/TextPlainUnitTest.php @@ -75,7 +75,7 @@ function setUp() { $this->field->save(); $this->instance = entity_create('field_instance', array( - 'entity_type' => $this->entity_type, + 'entityType' => $this->entity_type, 'bundle' => $this->bundle, 'field_name' => $this->field_name, 'label' => $this->randomName(), @@ -95,7 +95,7 @@ function setUp() { } /** - * Creates an entity of type $this->entity_type and bundle $this->bundle. + * Creates an entity of type $this->entityType and bundle $this->bundle. * * @param array $values * (optional) Additional values to pass to entity_create(). diff --git a/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php b/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php index e529bb3..bf3bcec 100644 --- a/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php +++ b/core/modules/text/lib/Drupal/text/Tests/TextFieldTest.php @@ -59,7 +59,7 @@ function testTextFieldValidation() { $this->field->save(); entity_create('field_instance', array( 'field_name' => $this->field->id(), - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', ))->save(); @@ -99,7 +99,7 @@ function _testTextfieldWidgets($field_type, $widget_type) { $this->field->save(); entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'label' => $this->randomName() . '_label', 'settings' => array( @@ -167,7 +167,7 @@ function _testTextfieldWidgetsFormatted($field_type, $widget_type) { $this->field->save(); entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'entity_test', + 'entityType' => 'entity_test', 'bundle' => 'entity_test', 'label' => $this->randomName() . '_label', 'settings' => array( diff --git a/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml b/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml index a5b5184..41f81e7 100644 --- a/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml +++ b/core/modules/tracker/tests/modules/tracker_test_views/test_views/views.view.test_tracker_user_uid.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8.x description: '' status: '1' diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc index 8e187ef..90174d2 100644 --- a/core/modules/tracker/tracker.pages.inc +++ b/core/modules/tracker/tracker.pages.inc @@ -21,7 +21,7 @@ function tracker_page($account = NULL, $set_title = FALSE) { if ($account) { $query = db_select('tracker_user', 't') ->extend('Drupal\Core\Database\Query\PagerSelectExtender') - ->addMetaData('base_table', 'tracker_user') + ->addMetaData('baseTable', 'tracker_user') ->condition('t.uid', $account->id()); if ($set_title) { @@ -34,7 +34,7 @@ function tracker_page($account = NULL, $set_title = FALSE) { else { $query = db_select('tracker_node', 't', array('target' => 'slave')) ->extend('Drupal\Core\Database\Query\PagerSelectExtender') - ->addMetaData('base_table', 'tracker_node'); + ->addMetaData('baseTable', 'tracker_node'); } // This array acts as a placeholder for the data selected later diff --git a/core/modules/user/config/views.view.user_admin_people.yml b/core/modules/user/config/views.view.user_admin_people.yml index 89fd1c9..b8a8b3d 100644 --- a/core/modules/user/config/views.view.user_admin_people.yml +++ b/core/modules/user/config/views.view.user_admin_people.yml @@ -1,5 +1,5 @@ base_field: uid -base_table: users +baseTable: users core: 8.x description: 'Find and manage people interacting with your site.' status: '1' diff --git a/core/modules/user/lib/Drupal/user/Entity/Role.php b/core/modules/user/lib/Drupal/user/Entity/Role.php index 8529e87..0163925 100644 --- a/core/modules/user/lib/Drupal/user/Entity/Role.php +++ b/core/modules/user/lib/Drupal/user/Entity/Role.php @@ -82,7 +82,7 @@ public function uri() { return array( 'path' => 'admin/people/roles/manage/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); diff --git a/core/modules/user/lib/Drupal/user/Entity/User.php b/core/modules/user/lib/Drupal/user/Entity/User.php index 3f1a54f..91cd7e9 100644 --- a/core/modules/user/lib/Drupal/user/Entity/User.php +++ b/core/modules/user/lib/Drupal/user/Entity/User.php @@ -31,7 +31,7 @@ * }, * "translation" = "Drupal\user\ProfileTranslationController" * }, - * base_table = "users", + * baseTable = "users", * uri_callback = "user_uri", * route_base_path = "admin/config/people/accounts", * label_callback = "user_label", diff --git a/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php b/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php index 92a8dd5..0fadac4 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php +++ b/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php @@ -139,7 +139,7 @@ public function entityQueryAlter(SelectInterface $query) { $filter_settings = $this->instance['settings']['handler_settings']['filter']; if ($filter_settings['type'] == 'role') { $tables = $query->getTables(); - $base_table = $tables['base_table']['alias']; + $base_table = $tables['baseTable']['alias']; $query->join('users_roles', 'ur', $base_table . '.uid = ur.uid'); $query->condition('ur.rid', $filter_settings['role']); } diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php b/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php index f0121c9..6017f50 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php @@ -21,7 +21,7 @@ * @ViewsWizard( * id = "users", * module = "user", - * base_table = "users", + * baseTable = "users", * title = @Translation("Users") * ) */ diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php index eaaf350..d1da0ce 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserCreateTest.php @@ -55,7 +55,7 @@ protected function testUserAdd() { $instance = array( 'field_name' => $field_name, - 'entity_type' => 'user', + 'entityType' => 'user', 'label' => 'Picture', 'bundle' => 'user', 'description' => t('Your virtual face or picture.'), diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php index ec86be2..73d0754 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php @@ -203,7 +203,7 @@ function testRegistrationWithUserFields() { $field->save(); $instance = entity_create('field_instance', array( 'field_name' => 'test_user_field', - 'entity_type' => 'user', + 'entityType' => 'user', 'label' => 'Some user field', 'bundle' => 'user', 'required' => TRUE, diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml index bd1ed72..f33a7d8 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_perm.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml index 870b4bb..9230851 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_access_role.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml index 94f587d..43050f3 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_field_permission.yml @@ -1,5 +1,5 @@ base_field: uid -base_table: users +baseTable: users core: 8.x description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml index ef1fd1c..dbb3fbd 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_filter_permission.yml @@ -1,5 +1,5 @@ base_field: uid -base_table: users +baseTable: users core: 8.x description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml index b0a6665..13b1634 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_groupwise_user.yml @@ -1,5 +1,5 @@ base_field: uid -base_table: users +baseTable: users core: 8.0-dev description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml index dede313..58f7a8f 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_plugin_argument_default_current_user.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml index d6c7538..1ba72c4 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_bulk_form.yml @@ -1,5 +1,5 @@ base_field: uid -base_table: users +baseTable: users core: 8.x description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml index 725724d..f6fdd80 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_data.yml @@ -1,5 +1,5 @@ base_field: uid -base_table: users +baseTable: users core: 8.x description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml index 0d2985c..0c676d5 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_name.yml @@ -1,4 +1,4 @@ -base_table: users +baseTable: users core: '8' description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml index ff0c37b..93c00b8 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_relationship.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml index 66f162e..3dba290 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_user_uid_argument.yml @@ -1,4 +1,4 @@ -base_table: users +baseTable: users core: '8' description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml index eb11808..c325955 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_view_argument_validate_user.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml index 3e333a9..4d32310 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_role.yml @@ -1,5 +1,5 @@ base_field: uid -base_table: users +baseTable: users core: 8.x description: '' status: '1' diff --git a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml index c68cde3..ee95090 100644 --- a/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml +++ b/core/modules/user/tests/modules/user_test_views/test_views/views.view.test_views_handler_field_user_name.yml @@ -1,4 +1,4 @@ -base_table: users +baseTable: users core: '8' description: '' status: '1' diff --git a/core/modules/user/user.install b/core/modules/user/user.install index 4a48efb..929cbf9 100644 --- a/core/modules/user/user.install +++ b/core/modules/user/user.install @@ -283,7 +283,7 @@ function user_install_picture_field() { $instance = array( 'field_name' => 'user_picture', - 'entity_type' => 'user', + 'entityType' => 'user', 'label' => 'Picture', 'bundle' => 'user', 'description' => t('Your virtual face or picture.'), @@ -711,7 +711,7 @@ function user_update_8011() { $instance = array( 'id' => 'user.user.user_picture', - 'entity_type' => 'user', + 'entityType' => 'user', 'label' => 'Picture', 'bundle' => 'user', 'description' => update_variable_get('user_picture_guidelines', ''), @@ -818,7 +818,7 @@ function user_update_8012(&$sandbox) { // Add a row to the field data and revision tables. db_insert('field_data_user_picture') ->fields(array( - 'entity_type' => 'user', + 'entityType' => 'user', 'bundle' => 'user', 'entity_id' => $uid, 'revision_id' => $uid, @@ -829,7 +829,7 @@ function user_update_8012(&$sandbox) { ->execute(); db_insert('field_revision_user_picture') ->fields(array( - 'entity_type' => 'user', + 'entityType' => 'user', 'bundle' => 'user', 'entity_id' => $uid, 'revision_id' => $uid, @@ -842,7 +842,7 @@ function user_update_8012(&$sandbox) { // Update file usage from user to file module. // @see file_field_insert() // Old: file_usage_add($picture, 'user', 'user', $entity->id(); - // New: file_usage_add(file_load($item['fid']), 'file', $entity_type, $id); + // New: file_usage_add(file_load($item['fid']), 'file', $entityType, $id); db_update('file_usage') ->condition('fid', $fid) ->condition('module', 'user') diff --git a/core/modules/views/config/schema/views.schema.yml b/core/modules/views/config/schema/views.schema.yml index fe09a65..b5d4e0a 100644 --- a/core/modules/views/config/schema/views.schema.yml +++ b/core/modules/views/config/schema/views.schema.yml @@ -16,7 +16,7 @@ views.view.*: label: 'Administrative description' tag: label: 'Tag' - base_table: + baseTable: label: 'Base table' base_field: label: 'Base field' diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/views/config/views.view.archive.yml index fa9b7a3..18878c5 100644 --- a/core/modules/views/config/views.view.archive.yml +++ b/core/modules/views/config/views.view.archive.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: '8' description: 'A list of months that link to content for that month.' status: '0' diff --git a/core/modules/views/config/views.view.backlinks.yml b/core/modules/views/config/views.view.backlinks.yml index ec0bb3d..f5201b7 100644 --- a/core/modules/views/config/views.view.backlinks.yml +++ b/core/modules/views/config/views.view.backlinks.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: '8' description: 'A list of other content items which have a link to the content item.' status: '0' diff --git a/core/modules/views/config/views.view.comments_recent.yml b/core/modules/views/config/views.view.comments_recent.yml index 378170d..f9ae0f6 100644 --- a/core/modules/views/config/views.view.comments_recent.yml +++ b/core/modules/views/config/views.view.comments_recent.yml @@ -1,5 +1,5 @@ base_field: cid -base_table: comment +baseTable: comment core: '8' description: 'A block and a page with recent comments.' status: '0' diff --git a/core/modules/views/config/views.view.glossary.yml b/core/modules/views/config/views.view.glossary.yml index e5d3118..6445539 100644 --- a/core/modules/views/config/views.view.glossary.yml +++ b/core/modules/views/config/views.view.glossary.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: '8' description: 'A list of all content, by letter.' status: '0' diff --git a/core/modules/views/config/views.view.taxonomy_term.yml b/core/modules/views/config/views.view.taxonomy_term.yml index e09771c..f65c3fe 100644 --- a/core/modules/views/config/views.view.taxonomy_term.yml +++ b/core/modules/views/config/views.view.taxonomy_term.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: '8' description: 'Customize the default taxonomy/term display.' status: '0' diff --git a/core/modules/views/config/views.view.tracker.yml b/core/modules/views/config/views.view.tracker.yml index 178421f..2f6948d 100644 --- a/core/modules/views/config/views.view.tracker.yml +++ b/core/modules/views/config/views.view.tracker.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: '8' description: 'Shows all new activity on the system.' status: '0' diff --git a/core/modules/views/lib/Drupal/views/Entity/View.php b/core/modules/views/lib/Drupal/views/Entity/View.php index e98ae01..1ca7411 100644 --- a/core/modules/views/lib/Drupal/views/Entity/View.php +++ b/core/modules/views/lib/Drupal/views/Entity/View.php @@ -141,7 +141,7 @@ public function uri() { return array( 'path' => 'admin/structure/views/view/' . $this->id(), 'options' => array( - 'entity_type' => $this->entityType, + 'entityType' => $this->entityType, 'entity' => $this, ), ); @@ -299,7 +299,7 @@ public function &getDisplay($display_id) { public function getExportProperties() { $names = array( 'base_field', - 'base_table', + 'baseTable', 'core', 'description', 'status', diff --git a/core/modules/views/lib/Drupal/views/ManyToOneHelper.php b/core/modules/views/lib/Drupal/views/ManyToOneHelper.php index 08c8cd9..4c250f6 100644 --- a/core/modules/views/lib/Drupal/views/ManyToOneHelper.php +++ b/core/modules/views/lib/Drupal/views/ManyToOneHelper.php @@ -79,7 +79,7 @@ public function addTable($join = NULL, $alias = NULL) { // Determine the primary table to seek if (empty($this->handler->query->relationships[$relationship])) { - $base_table = $this->handler->view->storage->get('base_table'); + $base_table = $this->handler->view->storage->get('baseTable'); } else { $base_table = $this->handler->query->relationships[$relationship]['base']; diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php index a46bbd8..8bdab4b 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php @@ -28,7 +28,7 @@ public function getDerivativeDefinitions(array $base_plugin_definition) { if (empty($views_info['table']['wizard_id'])) { $this->derivatives[$table] = array( 'id' => 'standard', - 'base_table' => $table, + 'baseTable' => $table, 'title' => $views_info['table']['base']['title'], 'class' => 'Drupal\views\Plugin\views\wizard\Standard' ); diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php index f38cf35..3f6cdcf 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php +++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php @@ -93,14 +93,14 @@ public function getDerivativeDefinition($derivative_id, array $base_plugin_defin public function getDerivativeDefinitions(array $base_plugin_definition) { foreach ($this->entityManager->getDefinitions() as $entity_type => $entity_info) { // Just add support for entity types which have a views integration. - if (isset($entity_info['base_table']) && $this->viewsData->get($entity_info['base_table']) && $this->entityManager->hasController($entity_type, 'render')) { + if (isset($entity_info['baseTable']) && $this->viewsData->get($entity_info['baseTable']) && $this->entityManager->hasController($entity_type, 'render')) { $this->derivatives[$entity_type] = array( 'id' => 'entity:' . $entity_type, 'module' => 'views', 'title' => $entity_info['label'], 'help' => t('Display the @label', array('@label' => $entity_info['label'])), - 'base' => array($entity_info['base_table']), - 'entity_type' => $entity_type, + 'base' => array($entity_info['baseTable']), + 'entityType' => $entity_type, 'display_types' => array('normal'), 'class' => $base_plugin_definition['class'], ); diff --git a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php b/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php index 5a7dba5..f20b9ef 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php +++ b/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php @@ -68,7 +68,7 @@ public static function settingsForm(FieldDefinitionInterface $field_definition) $options = array(); foreach ($displays as $data) { list($view, $display_id) = $data; - if ($view->storage->get('base_table') == $entity_info['base_table']) { + if ($view->storage->get('baseTable') == $entity_info['baseTable']) { $name = $view->storage->get('id'); $display = $view->storage->get('display'); $options[$name . ':' . $display_id] = $name . ' - ' . $display[$display_id]['display_title']; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php index 51d3a99..f05c3e3 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php @@ -591,7 +591,7 @@ public function getJoin() { // get the join from this table that links back to the base table. // Determine the primary table to seek if (empty($this->query->relationships[$this->relationship])) { - $base_table = $this->view->storage->get('base_table'); + $base_table = $this->view->storage->get('baseTable'); } else { $base_table = $this->query->relationships[$this->relationship]['base']; @@ -704,7 +704,7 @@ public function getEntityType() { $views_data = Views::viewsData()->get($this->view->relationship->table); } else { - $views_data = Views::viewsData()->get($this->view->storage->get('base_table')); + $views_data = Views::viewsData()->get($this->view->storage->get('baseTable')); } if (isset($views_data['table']['entity type'])) { diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php b/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php index 2684476..45f5cbe 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/area/Entity.php @@ -32,7 +32,7 @@ class Entity extends TokenizeAreaPluginBase { */ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) { parent::init($view, $display, $options); - $this->entityType = $this->definition['entity_type']; + $this->entityType = $this->definition['entityType']; } /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php index 862a847..f63dd08 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php @@ -855,7 +855,7 @@ public function summaryBasics($count_field = TRUE) { // Add the number of nodes counter $distinct = ($this->view->display_handler->getOption('distinct') && empty($this->query->no_distinct)); - $count_alias = $this->query->addField($this->view->storage->get('base_table'), $this->view->storage->get('base_field'), 'num_records', array('count' => TRUE, 'distinct' => $distinct)); + $count_alias = $this->query->addField($this->view->storage->get('baseTable'), $this->view->storage->get('base_field'), 'num_records', array('count' => TRUE, 'distinct' => $distinct)); $this->query->addGroupBy($this->name_alias); if ($count_field) { diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php index 388d599..1b86317 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php @@ -834,7 +834,7 @@ public function getPlugin($type) { // Query plugins allow specifying a specific query class per base table. if ($type == 'query') { - $views_data = Views::viewsData()->get($this->view->storage->get('base_table')); + $views_data = Views::viewsData()->get($this->view->storage->get('baseTable')); $name = isset($views_data['table']['base']['query_id']) ? $views_data['table']['base']['query_id'] : 'views_query'; } else { @@ -1501,7 +1501,7 @@ public function buildOptionsForm(&$form, &$form_state) { $access = $this->getOption('access'); $form['access']['type'] = array( '#type' => 'radios', - '#options' => views_fetch_plugin_names('access', $this->getType(), array($this->view->storage->get('base_table'))), + '#options' => views_fetch_plugin_names('access', $this->getType(), array($this->view->storage->get('baseTable'))), '#default_value' => $access['type'], ); @@ -1536,7 +1536,7 @@ public function buildOptionsForm(&$form, &$form_state) { $cache = $this->getOption('cache'); $form['cache']['type'] = array( '#type' => 'radios', - '#options' => views_fetch_plugin_names('cache', $this->getType(), array($this->view->storage->get('base_table'))), + '#options' => views_fetch_plugin_names('cache', $this->getType(), array($this->view->storage->get('baseTable'))), '#default_value' => $cache['type'], ); @@ -1587,7 +1587,7 @@ public function buildOptionsForm(&$form, &$form_state) { $entity_tables = array(); $has_translation_handlers = FALSE; foreach ($entities as $type => $entity_info) { - $entity_tables[] = $entity_info['base_table']; + $entity_tables[] = $entity_info['baseTable']; if (!empty($entity_info['translation'])) { $has_translation_handlers = TRUE; @@ -1597,7 +1597,7 @@ public function buildOptionsForm(&$form, &$form_state) { // Doesn't make sense to show a field setting here if we aren't querying // an entity base table. Also, we make sure that there's at least one // entity type with a translation handler attached. - if (in_array($this->view->storage->get('base_table'), $entity_tables) && $has_translation_handlers) { + if (in_array($this->view->storage->get('baseTable'), $entity_tables) && $has_translation_handlers) { $languages = array( '***CURRENT_LANGUAGE***' => t("Current user's language"), '***DEFAULT_LANGUAGE***' => t("Default site language"), @@ -1627,7 +1627,7 @@ public function buildOptionsForm(&$form, &$form_state) { $style_plugin = $this->getPlugin('style'); $form['style'] = array( '#type' => 'radios', - '#options' => views_fetch_plugin_names('style', $this->getType(), array($this->view->storage->get('base_table'))), + '#options' => views_fetch_plugin_names('style', $this->getType(), array($this->view->storage->get('baseTable'))), '#default_value' => $style_plugin->definition['id'], '#description' => t('If the style you choose has settings, be sure to click the settings button that will appear next to it in the View summary.'), ); @@ -1669,7 +1669,7 @@ public function buildOptionsForm(&$form, &$form_state) { $row_plugin_instance = $this->getPlugin('row'); $form['row'] = array( '#type' => 'radios', - '#options' => views_fetch_plugin_names('row', $this->getType(), array($this->view->storage->get('base_table'))), + '#options' => views_fetch_plugin_names('row', $this->getType(), array($this->view->storage->get('baseTable'))), '#default_value' => $row_plugin_instance->definition['id'], ); @@ -1988,7 +1988,7 @@ public function buildOptionsForm(&$form, &$form_state) { $exposed_form = $this->getOption('exposed_form'); $form['exposed_form']['type'] = array( '#type' => 'radios', - '#options' => views_fetch_plugin_names('exposed_form', $this->getType(), array($this->view->storage->get('base_table'))), + '#options' => views_fetch_plugin_names('exposed_form', $this->getType(), array($this->view->storage->get('baseTable'))), '#default_value' => $exposed_form['type'], ); @@ -2022,7 +2022,7 @@ public function buildOptionsForm(&$form, &$form_state) { $pager = $this->getOption('pager'); $form['pager']['type'] = array( '#type' => 'radios', - '#options' => views_fetch_plugin_names('pager', !$this->usesPager() ? 'basic' : NULL, array($this->view->storage->get('base_table'))), + '#options' => views_fetch_plugin_names('pager', !$this->usesPager() ? 'basic' : NULL, array($this->view->storage->get('baseTable'))), '#default_value' => $pager['type'], ); diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php index 8d61458..8ecd16e 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php @@ -51,7 +51,7 @@ public function initDisplay(ViewExecutable $view, array &$display, array &$optio // Set the default row style. Ideally this would be part of the option // definition, but in this case it's dependent on the view's base table, // which we don't know until init(). - $row_plugins = views_fetch_plugin_names('row', $this->getType(), array($view->storage->get('base_table'))); + $row_plugins = views_fetch_plugin_names('row', $this->getType(), array($view->storage->get('baseTable'))); $default_row_plugin = key($row_plugins); if (empty($this->options['row']['type'])) { $this->options['row']['type'] = $default_row_plugin; diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php index f5d7002..473f9c3 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php @@ -1444,8 +1444,8 @@ protected function renderAsLink($alter, $text, $tokens) { if (isset($alter['entity'])) { $options['entity'] = $alter['entity']; } - if (isset($alter['entity_type'])) { - $options['entity_type'] = $alter['entity_type']; + if (isset($alter['entityType'])) { + $options['entityType'] = $alter['entityType']; } $value .= l($text, $path, $options); diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php index c70c466..2f6008b 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php @@ -114,7 +114,7 @@ class Sql extends QueryPluginBase { public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) { parent::init($view, $display, $options); - $base_table = $this->view->storage->get('base_table'); + $base_table = $this->view->storage->get('baseTable'); $base_field = $this->view->storage->get('base_field'); $this->relationships[$base_table] = array( 'link' => NULL, @@ -277,7 +277,7 @@ public function submitOptionsForm(&$form, &$form_state) { */ public function addRelationship($alias, JoinPluginBase $join, $base, $link_point = NULL) { if (empty($link_point)) { - $link_point = $this->view->storage->get('base_table'); + $link_point = $this->view->storage->get('baseTable'); } elseif (!array_key_exists($link_point, $this->relationships)) { return FALSE; @@ -311,7 +311,7 @@ public function addRelationship($alias, JoinPluginBase $join, $base, $link_point 'base' => $base, ); - $this->tables[$this->view->storage->get('base_table')][$alias] = array( + $this->tables[$this->view->storage->get('baseTable')][$alias] = array( 'count' => 1, 'alias' => $alias, ); @@ -395,7 +395,7 @@ public function queueTable($table, $relationship = NULL, JoinPluginBase $join = } if (empty($relationship)) { - $relationship = $this->view->storage->get('base_table'); + $relationship = $this->view->storage->get('baseTable'); } if (!array_key_exists($relationship, $this->relationships)) { @@ -403,7 +403,7 @@ public function queueTable($table, $relationship = NULL, JoinPluginBase $join = } if (!$alias && $join && $relationship && !empty($join->adjusted) && $table != $join->table) { - if ($relationship == $this->view->storage->get('base_table')) { + if ($relationship == $this->view->storage->get('baseTable')) { $alias = $table; } else { @@ -427,7 +427,7 @@ public function queueTable($table, $relationship = NULL, JoinPluginBase $join = // If this is a relationship based table, add a marker with // the relationship as a primary table for the alias. if ($table != $alias) { - $this->markTable($alias, $this->view->storage->get('base_table'), $alias); + $this->markTable($alias, $this->view->storage->get('baseTable'), $alias); } // If no join is specified, pull it from the table data. @@ -456,7 +456,7 @@ protected function markTable($table, $relationship, $alias) { if (empty($this->tables[$relationship][$table])) { if (!isset($alias)) { $alias = ''; - if ($relationship != $this->view->storage->get('base_table')) { + if ($relationship != $this->view->storage->get('baseTable')) { // double underscore will help prevent accidental name // space collisions. $alias = $relationship . '__'; @@ -496,14 +496,14 @@ protected function markTable($table, $relationship, $alias) { public function ensureTable($table, $relationship = NULL, JoinPluginBase $join = NULL) { // ensure a relationship if (empty($relationship)) { - $relationship = $this->view->storage->get('base_table'); + $relationship = $this->view->storage->get('baseTable'); } // If the relationship is the primary table, this actually be a relationship // link back from an alias. We store all aliases along with the primary table // to detect this state, because eventually it'll hit a table we already // have and that's when we want to stop. - if ($relationship == $this->view->storage->get('base_table') && !empty($this->tables[$relationship][$table])) { + if ($relationship == $this->view->storage->get('baseTable') && !empty($this->tables[$relationship][$table])) { return $this->tables[$relationship][$table]['alias']; } @@ -574,7 +574,7 @@ public function ensureTable($table, $relationship = NULL, JoinPluginBase $join = */ protected function ensurePath($table, $relationship = NULL, $join = NULL, $traced = array(), $add = array()) { if (!isset($relationship)) { - $relationship = $this->view->storage->get('base_table'); + $relationship = $this->view->storage->get('baseTable'); } if (!array_key_exists($relationship, $this->relationships)) { @@ -634,7 +634,7 @@ protected function adjustJoin($join, $relationship) { } // Adjusts the left table for our relationship. - if ($relationship != $this->view->storage->get('base_table')) { + if ($relationship != $this->view->storage->get('baseTable')) { // If we're linking to the primary table, the relationship to use will // be the prior relationship. Unless it's a direct link. @@ -698,8 +698,8 @@ public function getTableInfo($table) { } // In rare cases we might *only* have aliased versions of the table. - if (!empty($this->tables[$this->view->storage->get('base_table')][$table])) { - $alias = $this->tables[$this->view->storage->get('base_table')][$table]['alias']; + if (!empty($this->tables[$this->view->storage->get('baseTable')][$table])) { + $alias = $this->tables[$this->view->storage->get('baseTable')][$table]['alias']; if (!empty($this->table_queue[$alias])) { return $this->table_queue[$alias]; } @@ -730,7 +730,7 @@ public function getTableInfo($table) { */ public function addField($table, $field, $alias = '', $params = array()) { // We check for this specifically because it gets a special alias. - if ($table == $this->view->storage->get('base_table') && $field == $this->view->storage->get('base_field') && empty($alias)) { + if ($table == $this->view->storage->get('baseTable') && $field == $this->view->storage->get('base_field') && empty($alias)) { $alias = $this->view->storage->get('base_field'); } @@ -1151,10 +1151,10 @@ protected function compileFields($query) { $query->addExpression($string, $fieldname, $placeholders); } elseif ($this->distinct && !in_array($fieldname, $this->groupby)) { - $query->addField(!empty($field['table']) ? $field['table'] : $this->view->storage->get('base_table'), $field['field'], $fieldname); + $query->addField(!empty($field['table']) ? $field['table'] : $this->view->storage->get('baseTable'), $field['field'], $fieldname); } elseif (empty($field['aggregate'])) { - $query->addField(!empty($field['table']) ? $field['table'] : $this->view->storage->get('base_table'), $field['field'], $fieldname); + $query->addField(!empty($field['table']) ? $field['table'] : $this->view->storage->get('baseTable'), $field['field'], $fieldname); } if ($this->get_count_optimized) { @@ -1174,7 +1174,7 @@ protected function compileFields($query) { public function query($get_count = FALSE) { // Check query distinct value. if (empty($this->no_distinct) && $this->distinct && !empty($this->fields)) { - $base_field_alias = $this->addField($this->view->storage->get('base_table'), $this->view->storage->get('base_field')); + $base_field_alias = $this->addField($this->view->storage->get('baseTable'), $this->view->storage->get('base_field')); $this->addGroupBy($base_field_alias); $distinct = TRUE; } @@ -1214,7 +1214,7 @@ public function query($get_count = FALSE) { // Go ahead and build the query. // db_select doesn't support to specify the key, so use getConnection directly. $query = Database::getConnection($target, $key) - ->select($this->view->storage->get('base_table'), $this->view->storage->get('base_table'), $options) + ->select($this->view->storage->get('baseTable'), $this->view->storage->get('baseTable'), $options) ->addTag('views') ->addTag('views_' . $this->view->storage->id()); @@ -1261,7 +1261,7 @@ public function query($get_count = FALSE) { } foreach ($entity_tables as $table_alias => $table) { - $info = entity_get_info($table['entity_type']); + $info = entity_get_info($table['entityType']); $base_field = empty($table['revision']) ? $info['entity_keys']['id'] : $info['entity_keys']['revision']; $this->addField($table_alias, $base_field, '', $params); } @@ -1374,7 +1374,7 @@ function execute(ViewExecutable $view) { $count_query->addMetaData('view', $view); if (empty($this->options['disable_sql_rewrite'])) { - $base_table_data = Views::viewsData()->get($this->view->storage->get('base_table')); + $base_table_data = Views::viewsData()->get($this->view->storage->get('baseTable')); if (isset($base_table_data['table']['base']['access query tag'])) { $access_tag = $base_table_data['table']['base']['access query tag']; $query->addTag($access_tag); @@ -1459,7 +1459,7 @@ function execute(ViewExecutable $view) { * Available keys for each table: * - base: The actual base table (i.e. "user" for an author relationship). * - relationship_id: The id of the relationship, or "none". - * - entity_type: The entity type matching the base table. + * - entityType: The entity type matching the base table. * - revision: A boolean that specifies whether the table is a base table or * a revision table of the entity type. * @@ -1470,12 +1470,12 @@ public function getEntityTables() { // Start with the base table. $entity_tables = array(); $views_data = Views::viewsData(); - $base_table_data = $views_data->get($this->view->storage->get('base_table')); + $base_table_data = $views_data->get($this->view->storage->get('baseTable')); if (isset($base_table_data['table']['entity type'])) { - $entity_tables[$this->view->storage->get('base_table')] = array( - 'base' => $this->view->storage->get('base_table'), + $entity_tables[$this->view->storage->get('baseTable')] = array( + 'base' => $this->view->storage->get('baseTable'), 'relationship_id' => 'none', - 'entity_type' => $base_table_data['table']['entity type'], + 'entityType' => $base_table_data['table']['entity type'], 'revision' => FALSE, ); } @@ -1486,7 +1486,7 @@ public function getEntityTables() { $entity_tables[$relationship->alias] = array( 'base' => $relationship->definition['base'], 'relationship_id' => $relationship_id, - 'entity_type' => $table_data['table']['entity type'], + 'entityType' => $table_data['table']['entity type'], 'revision' => FALSE, ); } @@ -1494,7 +1494,7 @@ public function getEntityTables() { // Determine which of the tables are revision tables. foreach ($entity_tables as $table_alias => $table) { - $info = entity_get_info($table['entity_type']); + $info = entity_get_info($table['entityType']); if (isset($info['revision table']) && $info['revision table'] == $table['base']) { $entity_tables[$table_alias]['revision'] = TRUE; } @@ -1520,7 +1520,7 @@ function loadEntities(&$results) { // Assemble a list of entities to load. $ids_by_table = array(); foreach ($entity_tables as $table_alias => $table) { - $entity_type = $table['entity_type']; + $entity_type = $table['entityType']; $info = entity_get_info($entity_type); $id_key = empty($table['revision']) ? $info['entity_keys']['id'] : $info['entity_keys']['revision']; $id_alias = $this->getFieldAlias($table_alias, $id_key); @@ -1536,7 +1536,7 @@ function loadEntities(&$results) { // Load all entities and assign them to the correct result row. foreach ($ids_by_table as $table_alias => $ids) { $table = $entity_tables[$table_alias]; - $entity_type = $table['entity_type']; + $entity_type = $table['entityType']; $relationship_id = $table['relationship_id']; // Drupal core currently has no way to load multiple revisions. Sad. diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php index 8aca1f0..dda1eef 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php @@ -161,7 +161,7 @@ public function buildOptionsForm(&$form, &$form_state) { * We use this to obtain our subquery SQL. */ protected function getTemporaryView() { - $view = entity_create('view', array('base_table' => $this->definition['base'])); + $view = entity_create('view', array('baseTable' => $this->definition['base'])); $view->addDisplay('default'); return $view->getExecutable(); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php index 2c4eae2..dccd553 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php @@ -76,9 +76,9 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) { parent::init($view, $display, $options); - $this->entityType = $this->definition['entity_type']; + $this->entityType = $this->definition['entityType']; $this->entityInfo = $this->entityManager->getDefinition($this->entityType); - $this->base_table = $this->entityInfo['base_table']; + $this->base_table = $this->entityInfo['baseTable']; $this->base_field = $this->entityInfo['entity_keys']['id']; } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php index c3ccf92..5b57d34 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php @@ -28,7 +28,7 @@ * * @var string */ - protected $base_table; + protected $baseTable; /** * The entity type connected with the wizard. @@ -38,21 +38,21 @@ * * @var string */ - protected $entity_type; + protected $entityType; /** - * Contains the information from entity_get_info of the $entity_type. + * Contains the information from entity_get_info of the $entityType. * * @var array */ - protected $entity_info = array(); + protected $entityInfo = array(); /** * An array of validated view objects, keyed by a hash. * * @var array */ - protected $validated_views = array(); + protected $validatedViews = array(); /** * The table column used for sorting by create date of this wizard. @@ -104,7 +104,7 @@ * * @var array() */ - protected $filter_defaults = array( + protected $filterDefaults = array( 'id' => NULL, 'expose' => array('operator' => FALSE), 'group' => 1, @@ -116,13 +116,13 @@ public function __construct(array $configuration, $plugin_id, array $plugin_definition) { parent::__construct($configuration, $plugin_id, $plugin_definition); - $this->base_table = $this->definition['base_table']; + $this->baseTable = $this->definition['baseTable']; $entities = entity_get_info(); foreach ($entities as $entity_type => $entity_info) { - if (isset($entity_info['base_table']) && $this->base_table == $entity_info['base_table']) { - $this->entity_info = $entity_info; - $this->entity_type = $entity_type; + if (isset($entity_info['baseTable']) && $this->baseTable == $entity_info['baseTable']) { + $this->entityInfo = $entity_info; + $this->entityType = $entity_type; } } } @@ -169,7 +169,7 @@ public function getPathFieldsSupplemental() { public function getFilters() { $filters = array(); - $default = $this->filter_defaults; + $default = $this->filterDefaults; foreach ($this->filters as $name => $info) { $default['id'] = $name; @@ -201,8 +201,8 @@ public function getSorts() { * {@inheritdoc} Drupal\views\Plugin\views\wizard\WizardInterface::buildForm(). */ public function buildForm(array $form, array &$form_state) { - $style_options = views_fetch_plugin_names('style', 'normal', array($this->base_table)); - $feed_row_options = views_fetch_plugin_names('row', 'feed', array($this->base_table)); + $style_options = views_fetch_plugin_names('style', 'normal', array($this->baseTable)); + $feed_row_options = views_fetch_plugin_names('row', 'feed', array($this->baseTable)); $path_prefix = url(NULL, array('absolute' => TRUE)); // Add filters and sorts which apply to the view as a whole. @@ -544,7 +544,7 @@ protected function buildFormStyle(array &$form, array &$form_state, $type) { */ protected function rowStyleOptions() { // Get all available row plugins by default. - $options = views_fetch_plugin_names('row', 'normal', array($this->base_table)); + $options = views_fetch_plugin_names('row', 'normal', array($this->baseTable)); return $options; } @@ -557,9 +557,9 @@ protected function rowStyleOptions() { protected function buildFilters(&$form, &$form_state) { module_load_include('inc', 'views_ui', 'admin'); - $bundles = entity_get_bundles($this->entity_type); + $bundles = entity_get_bundles($this->entityType); // If the current base table support bundles and has more than one (like user). - if (isset($this->entity_info['bundle_keys']) && !empty($bundles)) { + if (isset($this->entityInfo['bundle_keys']) && !empty($bundles)) { // Get all bundles and their human readable names. $options = array('all' => t('All')); foreach ($bundles as $type => $bundle) { @@ -623,7 +623,7 @@ protected function instantiateView($form, &$form_state) { 'id' => $form_state['values']['id'], 'label' => $form_state['values']['label'], 'description' => $form_state['values']['description'], - 'base_table' => $this->base_table, + 'baseTable' => $this->baseTable, 'langcode' => language_default()->id, ); @@ -761,7 +761,7 @@ protected function defaultDisplayOptions() { // Add a least one field so the view validates and the user has a preview. // The base field can provide a default in its base settings; otherwise, // choose the first field with a field handler. - $data = Views::viewsData()->get($this->base_table); + $data = Views::viewsData()->get($this->baseTable); if (isset($data['table']['base']['defaults']['field'])) { $default_field = $data['table']['base']['defaults']['field']; } @@ -773,7 +773,7 @@ protected function defaultDisplayOptions() { } } $display_options['fields'][$default_field] = array( - 'table' => $this->base_table, + 'table' => $this->baseTable, 'field' => $default_field, 'id' => $default_field, ); @@ -833,14 +833,14 @@ protected function defaultDisplayFiltersUser(array $form, array &$form_state) { $filters = array(); if (!empty($form_state['values']['show']['type']) && $form_state['values']['show']['type'] != 'all') { - $bundle_key = $this->entity_info['bundle_keys']['bundle']; + $bundle_key = $this->entityInfo['bundle_keys']['bundle']; // Figure out the table where $bundle_key lives. It may not be the same as // the base table for the view; the taxonomy vocabulary machine_name, for // example, is stored in taxonomy_vocabulary, not taxonomy_term_data. module_load_include('inc', 'views_ui', 'admin'); - $fields = Views::viewsDataHelper()->fetchFields($this->base_table, 'filter'); - if (isset($fields[$this->base_table . '.' . $bundle_key])) { - $table = $this->base_table; + $fields = Views::viewsDataHelper()->fetchFields($this->baseTable, 'filter'); + if (isset($fields[$this->baseTable . '.' . $bundle_key])) { + $table = $this->baseTable; } else { foreach ($fields as $field_name => $value) { @@ -928,7 +928,7 @@ protected function defaultDisplaySortsUser($form, $form_state) { $column = $column[1]; } else { - $table = $this->base_table; + $table = $this->baseTable; $column = $column[0]; } @@ -1129,9 +1129,9 @@ protected function retrieveValidatedView(array $form, array &$form_state, $unset // @todo Figure out why all this hashing is done. Wouldn't it be easier to // store a single entry and that's it? $key = hash('sha256', serialize($form_state['values'])); - $view = (isset($this->validated_views[$key]) ? $this->validated_views[$key] : NULL); + $view = (isset($this->validatedViews[$key]) ? $this->validatedViews[$key] : NULL); if ($unset) { - unset($this->validated_views[$key]); + unset($this->validatedViews[$key]); } return $view; } @@ -1148,7 +1148,7 @@ protected function retrieveValidatedView(array $form, array &$form_state, $unset */ protected function setValidatedView(array $form, array &$form_state, ViewUI $view) { $key = hash('sha256', serialize($form_state['values'])); - $this->validated_views[$key] = $view; + $this->validatedViews[$key] = $view; } /** diff --git a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php index 3306755..3cb84e9 100644 --- a/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php @@ -75,7 +75,7 @@ protected function setUp() { ))->save(); entity_create('field_instance', array( 'field_name' => $this->field_name, - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => 'page', ))->save(); diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php index b2669a1..2041f57 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaEntityTest.php @@ -59,8 +59,8 @@ public function testEntityAreaData() { // Test that all expected entity types have data. foreach (array_keys($expected_entities) as $entity) { $this->assertTrue(!empty($data['entity_' . $entity]), format_string('Views entity area data found for @entity', array('@entity' => $entity))); - // Test that entity_type is set correctly in the area data. - $this->assertEqual($entity, $data['entity_' . $entity]['area']['entity_type'], format_string('Correct entity_type set for @entity', array('@entity' => $entity))); + // Test that entityType is set correctly in the area data. + $this->assertEqual($entity, $data['entity_' . $entity]['area']['entityType'], format_string('Correct entityType set for @entity', array('@entity' => $entity))); } $expected_entities = array_filter($entity_info, function($info) { diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php index 7ad88da..6b03fea 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php @@ -60,7 +60,7 @@ public function testHandlers() { continue; } - $view = entity_create('view', array('base_table' => $base_table)); + $view = entity_create('view', array('baseTable' => $base_table)); $view = $view->getExecutable(); // @todo The groupwise relationship is currently broken. diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php index a712218..907a504 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewExecutableTest.php @@ -46,7 +46,7 @@ class ViewExecutableTest extends ViewUnitTestBase { 'name', 'description', 'tag', - 'base_table', + 'baseTable', 'label', 'core', 'display', diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php index 7c065f4..7a3fa17 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php @@ -32,7 +32,7 @@ class ViewStorageTest extends ViewUnitTestBase { 'id', 'description', 'tag', - 'base_table', + 'baseTable', 'label', 'core', 'display', @@ -270,7 +270,7 @@ protected function displayMethodTests() { $this->assertTrue($executable->displayHandlers->get('feed_1')->default_display instanceof DefaultDisplay); // Tests item related methods(). - $view = $this->controller->create(array('base_table' => 'views_test_data')); + $view = $this->controller->create(array('baseTable' => 'views_test_data')); $view->addDisplay('default'); $view = $view->getExecutable(); @@ -349,7 +349,7 @@ public function testCreateDuplicate() { 'disabled', 'description', 'tag', - 'base_table', + 'baseTable', 'label', 'core', ); diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php index 2f870d8..3b63b9c 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/TaggedWithTest.php @@ -74,7 +74,7 @@ function setUp() { // configure it to display an autocomplete widget. $this->tag_instance = array( 'field_name' => 'field_views_testing_tags', - 'entity_type' => 'node', + 'entityType' => 'node', 'bundle' => $this->node_type_with_tags->type, ); entity_create('field_instance', $this->tag_instance)->save(); diff --git a/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php b/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php index 8d2fad6..d68666b 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Wizard/WizardPluginBaseUnitTest.php @@ -76,7 +76,7 @@ public function testCreateView() { 'id' => $random_id, 'label' => $random_label, 'description' => $random_description, - 'base_table' => 'views_test_data', + 'baseTable' => 'views_test_data', ); $this->wizard->validateView($form, $form_state); @@ -85,7 +85,7 @@ public function testCreateView() { $this->assertEqual($view->get('id'), $random_id); $this->assertEqual($view->get('label'), $random_label); $this->assertEqual($view->get('description'), $random_description); - $this->assertEqual($view->get('base_table'), 'views_test_data'); + $this->assertEqual($view->get('baseTable'), 'views_test_data'); $this->assertEqual($view->get('langcode'), 'it'); } } diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php index f6ee156..ebb6c87 100644 --- a/core/modules/views/lib/Drupal/views/ViewExecutable.php +++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php @@ -802,7 +802,7 @@ public function renderPager($exposed_input) { */ public function getBaseTables() { $base_tables = array( - $this->storage->get('base_table') => TRUE, + $this->storage->get('baseTable') => TRUE, '#global' => TRUE, ); @@ -999,7 +999,7 @@ public function initQuery() { } // Create and initialize the query object. - $views_data = Views::viewsData()->get($this->storage->get('base_table')); + $views_data = Views::viewsData()->get($this->storage->get('baseTable')); $this->storage->set('base_field', !empty($views_data['table']['base']['field']) ? $views_data['table']['base']['field'] : ''); if (!empty($views_data['table']['base']['database'])) { $this->base_database = $views_data['table']['base']['database']; diff --git a/core/modules/views/lib/Drupal/views/ViewsDataHelper.php b/core/modules/views/lib/Drupal/views/ViewsDataHelper.php index b986746..223360c 100644 --- a/core/modules/views/lib/Drupal/views/ViewsDataHelper.php +++ b/core/modules/views/lib/Drupal/views/ViewsDataHelper.php @@ -23,7 +23,7 @@ class ViewsDataHelper { protected $data; /** - * A prepared list of all fields, keyed by base_table and handler type. + * A prepared list of all fields, keyed by baseTable and handler type. * * @param array */ @@ -43,7 +43,7 @@ public function __construct(ViewsData $views_data) { * Fetches a list of all fields available for a given base type. * * @param (array|string) $base - * A list or a single base_table, for example node. + * A list or a single baseTable, for example node. * @param string $type * The handler type, for example field or filter. * @param bool $grouping @@ -53,7 +53,7 @@ public function __construct(ViewsData $views_data) { * header only, instead of header, footer, and empty regions. * * @return array - * A keyed array of in the form of 'base_table' => 'Description'. + * A keyed array of in the form of 'baseTable' => 'Description'. */ public function fetchFields($base, $type, $grouping = FALSE, $sub_type = NULL) { if (!$this->fields) { diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml index 8cfa8c2..748f98c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_access_none.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml index 5f7c897..4cf8f9a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_aggregate_count.yml @@ -1,4 +1,4 @@ -base_table: entity_test +baseTable: entity_test core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml index 4baf989..b913230 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_alias.yml @@ -1,4 +1,4 @@ -base_table: users +baseTable: users core: 8.0-dev description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml index 6da4540..dc6659d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_title.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml index 726961e..cf31c31 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_date.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml index 96b1974..c1475fc 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_current_user.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml index d71ac66..bb9fef9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_argument_default_fixed.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml index 11ddd6c..5d6d4f3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_attachment_ui.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml index 7d10bc4..d5fdb36 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_cache.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml index 2dfc632..26622e0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_click_sort.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml index a8fec7a..0226756 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_destroy.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml index a223987..9a03713 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '0' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml index 7026ac1..9c9321c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_attachment.yml @@ -1,5 +1,5 @@ base_field: id -base_table: views_test_data +baseTable: views_test_data core: 8.x description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml index 11b33fa..989b02c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml @@ -1,5 +1,5 @@ base_field: id -base_table: views_test_data +baseTable: views_test_data core: 8.x description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml index db6ed33..0636177 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml index 82d616d..c2ef9aa 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_more.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml index 98d0d72..3a542f9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8.x description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml index bb30663..b14ca6c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_area.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml index dc66a1f..a287261 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_row.yml @@ -1,4 +1,4 @@ -base_table: taxonomy_term_data +baseTable: taxonomy_term_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml index 9babc1c..8881e87 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml index 2b94cc1..1737acc 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_example_area.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml index 9694314..afb36ab 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_executable_displays.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml index 910d770..628064b 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_admin_ui.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml index 0528a1d..ab46134 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_block.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form.yml index 066da94..b583e8e 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml index 1c82fa3..6dce404 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_feed_display.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: 8.0-dev description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml index 4f0a5e2..c306bbc 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_classes.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml index 50c033c..a93a662 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_get_entity.yml @@ -1,4 +1,4 @@ -base_table: comment +baseTable: comment core: 8.0-dev description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml index 74f7e59..773a0f6 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_output.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml index 5bb6c56..fa45f5f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_tokens.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_type.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_type.yml index 6113c52..d245eb1 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_type.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_type.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml index cfd3c6f..4d12fff 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: 8 status: true display: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml index 384dd7e..23d4de5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_date_between.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml index 99356cd..6f02936 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_group_override.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml index 0975e42..e0f944a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_groups.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml index f10f25c..b5bf570 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_filter_in_operator_ui.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml index 94c777c..79bb978 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_get_attach_displays.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node id: test_get_attach_displays description: '' tag: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml index 41875e8..7de85af 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_glossary.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml index a8d9579..af62bcc 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_grid.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml index 4bf96e3..31a2678 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_count.yml @@ -1,4 +1,4 @@ -base_table: entity_test +baseTable: entity_test core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml index 46cdd57..6c05512 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_by_in_filters.yml @@ -1,4 +1,4 @@ -base_table: entity_test +baseTable: entity_test core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml index 71d1e17..19c47bc 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_relationships.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml index 2a1a649..215f3f5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_handler_test_access.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: 8 display: default: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml index f2791fc..fdf12d9 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_history.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8.x description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml index 56ccb7c..9f57583 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_http_status_code.yml @@ -1,5 +1,5 @@ base_field: nid -base_table: node +baseTable: node core: 8.x description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml index 484055c..e4e29f3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_mini_pager.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node id: test_mini_pager description: '' tag: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml index d090123..23ffec7 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml index 16402ec..57575b3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_arguments.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data base_field: id core: '8' description: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml index 687e1c2..6150de5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_menu.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data base_field: id core: '8' description: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml index a827e87..cff4142 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display_route.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data base_field: id core: '8' description: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml index 39608d6..e095acb 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_view.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml index b93e53d..c30274a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_full.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml index 999f40d..17444f3 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_none.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml index 2ec3439..a52f400 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_pager_some.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml index 920ed7d..0f43c41 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_preview.yml @@ -1,5 +1,5 @@ base_field: id -base_table: views_test_data +baseTable: views_test_data core: 8.x description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml index 12e38fa..e605cc0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_redirect_view.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node id: test_redirect_view description: '' tag: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_reset_button.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_reset_button.yml index 76c6618..9931f68 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_reset_button.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_reset_button.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml index 1d4f884..7bc994d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_simple_argument.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml index a0ea018..612a30f 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_store_pager_settings.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml index 9cac36f..f6fd373 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_mapping.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml index 8957262..bbe840a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_table.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml index 2867aa9..24d64ff 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tokens.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data id: test_tokens description: 'Test view to token replacement tests.' tag: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml index 1f47740..26c2abb 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml index 2cb8d4f..706290c 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_numeric.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_php.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_php.yml index de1e187..d1453ee 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_php.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_argument_validate_php.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml index 70c6027..85d98f0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_delete.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml index f005f00..8349fe0 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_display_template.yml @@ -1,5 +1,5 @@ base_field: id -base_table: views_test_data +baseTable: views_test_data core: 8.x description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml index 9504a9f..3d27134 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_empty.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml index e7b0d0a..db00259 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_handler_weight.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml index f563ed8..5b8cc77 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_pager_full_zero_items_per_page.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml index 320d835..3f9af3d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_render.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml index 88ede15..b2e27d4 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_status.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data id: test_view_status description: '' tag: '' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml index 7a431c8..2f98d9b 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_view_storage.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' module: views description: 'Storage Test View for testing.' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml index e17bdf4..aba8112 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml @@ -1,4 +1,4 @@ -base_table: views_test_data +baseTable: views_test_data core: '8' description: '' status: '1' diff --git a/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml b/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml index dc21c9c..c5a28b1 100644 --- a/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml +++ b/core/modules/views/tests/modules/views_test_data/test_views/views.view.test_access_static.yml @@ -1,4 +1,4 @@ -base_table: node +baseTable: node core: '8' description: '' status: '1' diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 26a9dbb..faebbfa 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -869,7 +869,7 @@ function views_library_info() { * An array of possible base tables. * * @return - * A keyed array of in the form of 'base_table' => 'Description'. + * A keyed array of in the form of 'baseTable' => 'Description'. */ function views_fetch_plugin_names($type, $key = NULL, $base = array()) { $definitions = Views::pluginManager($type)->getDefinitions(); diff --git a/core/modules/views/views.tokens.inc b/core/modules/views/views.tokens.inc index ae307fd..c93163f 100644 --- a/core/modules/views/views.tokens.inc +++ b/core/modules/views/views.tokens.inc @@ -106,7 +106,7 @@ function views_tokens($type, $tokens, array $data = array(), array $options = ar } break; case 'base-table': - $replacements[$original] = $view->storage->get('base_table'); + $replacements[$original] = $view->storage->get('baseTable'); break; case 'base-field': $replacements[$original] = $view->storage->get('base_field'); diff --git a/core/modules/views/views.views.inc b/core/modules/views/views.views.inc index 9b49b92..ce54d6a 100644 --- a/core/modules/views/views.views.inc +++ b/core/modules/views/views.views.inc @@ -123,7 +123,7 @@ function views_views_data() { 'title' => t('Rendered entity - @label', array('@label' => $label)), 'help' => t('Displays a rendered @label entity in an area.', array('@label' => $label)), 'area' => array( - 'entity_type' => $entity_type, + 'entityType' => $entity_type, 'id' => 'entity', ), ); diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php index 987148a..acdba30 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Controller/ViewsUIController.php @@ -245,7 +245,7 @@ public function autocompleteTag(Request $request) { */ public function edit(ViewUI $view, $display_id = NULL) { $name = $view->label(); - $data = $this->viewsData->get($view->get('base_table')); + $data = $this->viewsData->get($view->get('baseTable')); if (isset($data['table']['base']['title'])) { $name .= ' (' . $data['table']['base']['title'] . ')'; diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php index 2be9fbc..42fa949 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php @@ -113,7 +113,7 @@ public function buildForm(array $form, array &$form_state) { if (!empty($relationship_options)) { // Make sure the existing relationship is even valid. If not, force // it to none. - $base_fields = Views::viewsDataHelper()->fetchFields($view->get('base_table'), $form_state['type'], $executable->display_handler->useGroupBy()); + $base_fields = Views::viewsDataHelper()->fetchFields($view->get('baseTable'), $form_state['type'], $executable->display_handler->useGroupBy()); if (isset($base_fields[$item['table'] . '.' . $item['field']])) { $relationship_options = array_merge(array('none' => $this->t('Do not use a relationship')), $relationship_options); } diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php index 3c011f3..134c9e4 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php @@ -87,8 +87,8 @@ public function submitForm(array &$form, array &$form_state) { $bases = Views::viewsData()->fetchBaseTables(); $form_state['#page_title'] = $view->label(); - if (isset($bases[$view->get('base_table')])) { - $form_state['#page_title'] .= ' (' . $bases[$view->get('base_table')]['title'] . ')'; + if (isset($bases[$view->get('baseTable')])) { + $form_state['#page_title'] .= ' (' . $bases[$view->get('baseTable')]['title'] . ')'; } $view->cacheSet(); diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php index f926d8d..b26aa85 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php @@ -425,7 +425,7 @@ public function getDisplayDetails($view, $display) { "#suffix" => '', ); - foreach (views_fetch_plugin_names('display', NULL, array($view->get('storage')->get('base_table'))) as $type => $label) { + foreach (views_fetch_plugin_names('display', NULL, array($view->get('storage')->get('baseTable'))) as $type => $label) { if ($type == $display['display_plugin']) { continue; } @@ -712,7 +712,7 @@ public function renderDisplayTop(ViewUI $view) { } // Buttons for adding a new display. - foreach (views_fetch_plugin_names('display', NULL, array($view->get('base_table'))) as $type => $label) { + foreach (views_fetch_plugin_names('display', NULL, array($view->get('baseTable'))) as $type => $label) { $element['add_display'][$type] = array( '#type' => 'submit', '#value' => $this->t('Add !display', array('!display' => $label)), diff --git a/core/profiles/standard/config/field.instance.node.article.field_image.yml b/core/profiles/standard/config/field.instance.node.article.field_image.yml index 146b2f7..5a8b01f 100644 --- a/core/profiles/standard/config/field.instance.node.article.field_image.yml +++ b/core/profiles/standard/config/field.instance.node.article.field_image.yml @@ -1,6 +1,6 @@ id: node.article.field_image field_name: field_image -entity_type: node +entityType: node bundle: article label: Image description: 'Upload an image to go with this article.' diff --git a/core/profiles/standard/config/field.instance.node.article.field_tags.yml b/core/profiles/standard/config/field.instance.node.article.field_tags.yml index 82d5b73..781b645 100644 --- a/core/profiles/standard/config/field.instance.node.article.field_tags.yml +++ b/core/profiles/standard/config/field.instance.node.article.field_tags.yml @@ -1,6 +1,6 @@ id: node.article.field_tags field_name: field_tags -entity_type: node +entityType: node bundle: article label: Tags description: 'Enter a comma-separated list of words to describe your content.' diff --git a/core/scripts/generate-d7-content.sh b/core/scripts/generate-d7-content.sh index 87ec22a..eaee511 100644 --- a/core/scripts/generate-d7-content.sh +++ b/core/scripts/generate-d7-content.sh @@ -100,7 +100,7 @@ 'label' => $vocabulary->name, 'field_name' => $field['field_name'], 'bundle' => $bundle, - 'entity_type' => 'node', + 'entityType' => 'node', 'settings' => array(), 'description' => $vocabulary->help, 'required' => $vocabulary->required, @@ -301,14 +301,14 @@ 'bundle' => $node_type, )) ->condition('entity_id', $node->nid) - ->condition('entity_type', 'node') + ->condition('entityType', 'node') ->execute(); db_update('field_revision_body') ->fields(array( 'bundle' => $node_type, )) ->condition('entity_id', $node->nid) - ->condition('entity_type', 'node') + ->condition('entityType', 'node') ->execute(); db_update('field_config_instance') ->fields(array( diff --git a/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php b/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php index 17f454e..e79e1d2 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Enhancer/EntityRouteEnhancerTest.php @@ -61,7 +61,7 @@ public function testEnhancer() { $defaults = $route_enhancer->enhance($defaults, $request); $this->assertEquals('controller.page:content', $defaults['_controller']); $this->assertEquals('\Drupal\Core\Entity\Controller\EntityListController::listing', $defaults['_content'], 'The entity list controller was not set.'); - $this->assertEquals('entity_test.default', $defaults['entity_type']); + $this->assertEquals('entity_test.default', $defaults['entityType']); $this->assertFalse(isset($defaults['_entity_list'])); // Set _entity_view and ensure that the entity view controller is set. -- 1.8.4.rc2