diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt index 49bba89..f0527c3 100644 --- a/core/MAINTAINERS.txt +++ b/core/MAINTAINERS.txt @@ -323,10 +323,6 @@ Email module Editor module - Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers -Entity Reference module -- Amitai Burstein 'Amitaibu' https://www.drupal.org/u/amitaibu -- Andrei Mateescu 'amateescu' https://www.drupal.org/u/amateescu - Field UI module - Yves Chedemois 'yched' https://www.drupal.org/u/yched - Kristof De Jaeger 'swentel' https://www.drupal.org/u/swentel diff --git a/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionInterface.php b/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionInterface.php index 864e717..f582a01 100644 --- a/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionInterface.php +++ b/core/lib/Drupal/Core/Entity/EntityReferenceSelection/SelectionInterface.php @@ -65,8 +65,6 @@ public function validateReferenceableEntities(array $ids); * * @return integer|null * Value of a matching entity ID, or NULL if none. - * - * @see \Drupal\entity_reference\Plugin\Field\FieldWidget::elementValidate() */ public function validateAutocompleteInput($input, &$element, FormStateInterface $form_state, $form, $strict = TRUE); diff --git a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/SelectionBase.php b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/SelectionBase.php index c67dc68..5bb1b2c 100644 --- a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/SelectionBase.php +++ b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/SelectionBase.php @@ -12,6 +12,7 @@ use Drupal\Core\Database\Query\SelectInterface; use Drupal\Core\Entity\EntityManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; +use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; @@ -132,7 +133,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta '#required' => TRUE, '#size' => 6, '#multiple' => TRUE, - '#element_validate' => array('_entity_reference_element_validate_filter'), + '#element_validate' => [[get_class($this), 'elementValidateFilter']], ); } else { @@ -179,7 +180,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta $form['sort']['settings'] = array( '#type' => 'container', '#attributes' => array('class' => array('entity_reference-settings')), - '#process' => array('_entity_reference_form_process_merge_parent'), + '#process' => [['\Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem', 'formProcessMergeParent']], ); if ($selection_handler_settings['sort']['field'] != '_none') { @@ -215,6 +216,14 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form public function submitConfigurationForm(array &$form, FormStateInterface $form_state) { } /** + * Form element validation handler; Filters the #value property of an element. + */ + public static function elementValidateFilter(&$element, FormStateInterface $form_state) { + $element['#value'] = array_filter($element['#value']); + $form_state->setValueForElement($element, $element['#value']); + } + + /** * {@inheritdoc} */ public function getReferenceableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) { @@ -337,8 +346,7 @@ protected function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS') // Add entity-access tag. $query->addTag($target_type . '_access'); - // Add the Selection handler for - // entity_reference_query_entity_reference_alter(). + // Add the Selection handler for system_query_entity_reference_alter(). $query->addTag('entity_reference'); $query->addMetaData('entity_reference_selection_handler', $this); diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php index 5904d35..f080fcd 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php @@ -7,37 +7,44 @@ namespace Drupal\Core\Field\Plugin\Field\FieldType; +use Drupal\Component\Utility\Html; +use Drupal\Component\Utility\NestedArray; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Entity\TypedData\EntityDataDefinition; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldItemBase; use Drupal\Core\Field\FieldStorageDefinitionInterface; +use Drupal\Core\Field\PreconfiguredFieldUiOptionsInterface; +use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Form\OptGroup; +use Drupal\Core\Render\Element; +use Drupal\Core\Session\AccountInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\Core\TypedData\DataReferenceDefinition; use Drupal\Core\TypedData\DataReferenceTargetDefinition; +use Drupal\Core\TypedData\OptionsProviderInterface; +use Drupal\Core\Validation\Plugin\Validation\Constraint\AllowedValuesConstraint; /** * Defines the 'entity_reference' entity field type. * * Supported settings (below the definition's 'settings' key) are: * - target_type: The entity type to reference. Required. - * - target_bundle: (optional): If set, restricts the entity bundles which may - * may be referenced. May be set to an single bundle, or to an array of - * allowed bundles. * * @FieldType( * id = "entity_reference", * label = @Translation("Entity reference"), * description = @Translation("An entity field containing an entity reference."), * category = @Translation("Reference"), - * no_ui = TRUE, * default_formatter = "entity_reference_label", * list_class = "\Drupal\Core\Field\EntityReferenceFieldItemList", + * default_widget = "entity_reference_autocomplete", + * default_formatter = "entity_reference_label", * constraints = {"ValidReference" = {}} * ) */ -class EntityReferenceItem extends FieldItemBase { +class EntityReferenceItem extends FieldItemBase implements OptionsProviderInterface, PreconfiguredFieldUiOptionsInterface { /** * {@inheritdoc} @@ -150,6 +157,13 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) */ public function getConstraints() { $constraints = parent::getConstraints(); + // Remove the 'AllowedValuesConstraint' validation constraint because entity + // reference fields already use the 'ValidReference' constraint. + foreach ($constraints as $key => $constraint) { + if ($constraint instanceof AllowedValuesConstraint) { + unset($constraints[$key]); + } + } list($current_handler) = explode(':', $this->getSetting('handler'), 2); if ($current_handler === 'default') { $handler_settings = $this->getSetting('handler_settings'); @@ -283,6 +297,103 @@ public static function generateSampleValue(FieldDefinitionInterface $field_defin } /** + * {@inheritdoc} + */ + public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) { + $element['target_type'] = array( + '#type' => 'select', + '#title' => t('Type of item to reference'), + '#options' => \Drupal::entityManager()->getEntityTypeLabels(TRUE), + '#default_value' => $this->getSetting('target_type'), + '#required' => TRUE, + '#disabled' => $has_data, + '#size' => 1, + ); + + return $element; + } + + /** + * {@inheritdoc} + */ + public function fieldSettingsForm(array $form, FormStateInterface $form_state) { + $field = $form_state->getFormObject()->getEntity(); + + // Get all selection plugins for this entity type. + $selection_plugins = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionGroups($this->getSetting('target_type')); + $handlers_options = array(); + foreach (array_keys($selection_plugins) as $selection_group_id) { + // We only display base plugins (e.g. 'default', 'views', ...) and not + // entity type specific plugins (e.g. 'default:node', 'default:user', + // ...). + if (array_key_exists($selection_group_id, $selection_plugins[$selection_group_id])) { + $handlers_options[$selection_group_id] = Html::escape($selection_plugins[$selection_group_id][$selection_group_id]['label']); + } + elseif (array_key_exists($selection_group_id . ':' . $this->getSetting('target_type'), $selection_plugins[$selection_group_id])) { + $selection_group_plugin = $selection_group_id . ':' . $this->getSetting('target_type'); + $handlers_options[$selection_group_plugin] = Html::escape($selection_plugins[$selection_group_id][$selection_group_plugin]['base_plugin_label']); + } + } + + $form = array( + '#type' => 'container', + '#process' => array(array(get_class($this), 'fieldSettingsAjaxProcess')), + '#element_validate' => array(array(get_class($this), 'fieldSettingsFormValidate')), + + ); + $form['handler'] = array( + '#type' => 'details', + '#title' => t('Reference type'), + '#open' => TRUE, + '#tree' => TRUE, + '#process' => array(array(get_class($this), 'formProcessMergeParent')), + ); + + $form['handler']['handler'] = array( + '#type' => 'select', + '#title' => t('Reference method'), + '#options' => $handlers_options, + '#default_value' => $field->getSetting('handler'), + '#required' => TRUE, + '#ajax' => TRUE, + '#limit_validation_errors' => array(), + ); + $form['handler']['handler_submit'] = array( + '#type' => 'submit', + '#value' => t('Change handler'), + '#limit_validation_errors' => array(), + '#attributes' => array( + 'class' => array('js-hide'), + ), + '#submit' => array(array(get_class($this), 'settingsAjaxSubmit')), + ); + + $form['handler']['handler_settings'] = array( + '#type' => 'container', + '#attributes' => array('class' => array('entity_reference-settings')), + ); + + $handler = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionHandler($field); + $form['handler']['handler_settings'] += $handler->buildConfigurationForm(array(), $form_state); + + return $form; + } + + /** + * Form element validation handler; Invokes selection plugin's validation. + * + * @param array $form + * The form where the settings form is being included in. + * @param \Drupal\Core\Form\FormStateInterface $form_state + * The form state of the (entire) configuration form. + */ + public static function fieldSettingsFormValidate(array $form, FormStateInterface $form_state) { + $field = $form_state->getFormObject()->getEntity(); + $handler = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionHandler($field); + $handler->validateConfigurationForm($form, $form_state); + } + + /** * Determines whether the item holds an unsaved entity. * * This is notably used for "autocreate" widgets, and more generally to @@ -341,4 +452,143 @@ public static function onDependencyRemoval(FieldDefinitionInterface $field_defin return $changed; } + /** + * {@inheritdoc} + */ + public function getPossibleValues(AccountInterface $account = NULL) { + return $this->getSettableValues($account); + } + + /** + * {@inheritdoc} + */ + public function getPossibleOptions(AccountInterface $account = NULL) { + return $this->getSettableOptions($account); + } + + /** + * {@inheritdoc} + */ + public function getSettableValues(AccountInterface $account = NULL) { + // Flatten options first, because "settable options" may contain group + // arrays. + $flatten_options = OptGroup::flattenOptions($this->getSettableOptions($account)); + return array_keys($flatten_options); + } + + /** + * {@inheritdoc} + */ + public function getSettableOptions(AccountInterface $account = NULL) { + $field_definition = $this->getFieldDefinition(); + if (!$options = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionHandler($field_definition, $this->getEntity())->getReferenceableEntities()) { + return array(); + } + + // Rebuild the array by changing the bundle key into the bundle label. + $target_type = $field_definition->getSetting('target_type'); + $bundles = \Drupal::entityManager()->getBundleInfo($target_type); + + $return = array(); + foreach ($options as $bundle => $entity_ids) { + // The label does not need sanitizing since it is used as an optgroup + // which is only supported by select elements and auto-escaped. + $bundle_label = (string) $bundles[$bundle]['label']; + $return[$bundle_label] = $entity_ids; + } + + return count($return) == 1 ? reset($return) : $return; + } + + /** + * Render API callback: Processes the field settings form and allows access to + * the form state. + * + * @see static::fieldSettingsForm() + */ + public static function fieldSettingsAjaxProcess($form, FormStateInterface $form_state) { + static::fieldSettingsAjaxProcessElement($form, $form); + return $form; + } + + /** + * Adds entity_reference specific properties to AJAX form elements from the + * field settings form. + * + * @see static::fieldSettingsAjaxProcess() + */ + public static function fieldSettingsAjaxProcessElement(&$element, $main_form) { + if (!empty($element['#ajax'])) { + $element['#ajax'] = array( + 'callback' => array(get_called_class(), 'settingsAjax'), + 'wrapper' => $main_form['#id'], + 'element' => $main_form['#array_parents'], + ); + } + + foreach (Element::children($element) as $key) { + static::fieldSettingsAjaxProcessElement($element[$key], $main_form); + } + } + + /** + * Render API callback: Moves entity_reference specific Form API elements + * (i.e. 'handler_settings') up a level for easier processing by the validation + * and submission handlers. + * + * @see _entity_reference_field_settings_process() + */ + public static function formProcessMergeParent($element) { + $parents = $element['#parents']; + array_pop($parents); + $element['#parents'] = $parents; + return $element; + } + + /** + * Ajax callback for the handler settings form. + * + * @see static::fieldSettingsForm() + */ + public static function settingsAjax($form, FormStateInterface $form_state) { + return NestedArray::getValue($form, $form_state->getTriggeringElement()['#ajax']['element']); + } + + /** + * Submit handler for the non-JS case. + * + * @see static::fieldSettingsForm() + */ + public static function settingsAjaxSubmit($form, FormStateInterface $form_state) { + $form_state->setRebuild(); + } + + /** + * {@inheritdoc} + */ + public static function getPreconfiguredOptions() { + $options = array(); + + // Add all the commonly referenced entity types as distinct pre-configured + // options. + $entity_types = \Drupal::entityManager()->getDefinitions(); + $common_references = array_filter($entity_types, function (EntityTypeInterface $entity_type) { + return $entity_type->isCommonReferenceTarget(); + }); + + /** @var \Drupal\Core\Entity\EntityTypeInterface $entity_type */ + foreach ($common_references as $entity_type) { + $options[$entity_type->id()] = [ + 'label' => $entity_type->getLabel(), + 'field_storage_config' => [ + 'settings' => [ + 'target_type' => $entity_type->id(), + ] + ] + ]; + } + + return $options; + } + } diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php index 4f51a2e..4bcaaa9 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php @@ -18,6 +18,7 @@ * label = @Translation("Check boxes/radio buttons"), * field_types = { * "boolean", + * "entity_reference", * "list_integer", * "list_float", * "list_string", diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php index d64d5f9..5c68a8f 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php @@ -18,6 +18,7 @@ * id = "options_select", * label = @Translation("Select list"), * field_types = { + * "entity_reference", * "list_integer", * "list_float", * "list_string" diff --git a/core/modules/aggregator/aggregator.info.yml b/core/modules/aggregator/aggregator.info.yml index 5814712..af55280 100644 --- a/core/modules/aggregator/aggregator.info.yml +++ b/core/modules/aggregator/aggregator.info.yml @@ -6,6 +6,5 @@ version: VERSION core: 8.x configure: aggregator.admin_settings dependencies: - - entity_reference - file - options diff --git a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml index 39536e4..837bee0 100644 --- a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml +++ b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_item.aggregator_item.summary.yml @@ -5,7 +5,6 @@ dependencies: - core.entity_view_mode.aggregator_item.summary module: - aggregator - - entity_reference id: aggregator_item.aggregator_item.summary targetEntityType: aggregator_item bundle: aggregator_item diff --git a/core/modules/aggregator/src/Tests/AggregatorTitleTest.php b/core/modules/aggregator/src/Tests/AggregatorTitleTest.php index cfa9975..d599d9a 100644 --- a/core/modules/aggregator/src/Tests/AggregatorTitleTest.php +++ b/core/modules/aggregator/src/Tests/AggregatorTitleTest.php @@ -24,7 +24,7 @@ class AggregatorTitleTest extends KernelTestBase { * * @var array */ - public static $modules = array('file', 'field', 'options', 'aggregator', 'entity_reference'); + public static $modules = ['file', 'field', 'options', 'aggregator']; /** * The field name that is tested. diff --git a/core/modules/book/config/install/core.entity_form_display.node.book.default.yml b/core/modules/book/config/install/core.entity_form_display.node.book.default.yml index 7c2144d..1ec4eb1 100644 --- a/core/modules/book/config/install/core.entity_form_display.node.book.default.yml +++ b/core/modules/book/config/install/core.entity_form_display.node.book.default.yml @@ -5,7 +5,6 @@ dependencies: - field.field.node.book.body - node.type.book module: - - entity_reference - text id: node.book.default targetEntityType: node diff --git a/core/modules/book/src/Tests/BookUninstallTest.php b/core/modules/book/src/Tests/BookUninstallTest.php index 2d2f7da..0a18fb1 100644 --- a/core/modules/book/src/Tests/BookUninstallTest.php +++ b/core/modules/book/src/Tests/BookUninstallTest.php @@ -23,7 +23,7 @@ class BookUninstallTest extends KernelTestBase { * * @var array */ - public static $modules = array('system', 'user', 'field', 'filter', 'text', 'entity_reference', 'node', 'book'); + public static $modules = ['system', 'user', 'field', 'filter', 'text', 'node', 'book']; /** * {@inheritdoc} diff --git a/core/modules/config/src/Tests/ConfigImportRecreateTest.php b/core/modules/config/src/Tests/ConfigImportRecreateTest.php index 83ea2ee..96f8817 100644 --- a/core/modules/config/src/Tests/ConfigImportRecreateTest.php +++ b/core/modules/config/src/Tests/ConfigImportRecreateTest.php @@ -32,7 +32,7 @@ class ConfigImportRecreateTest extends KernelTestBase { * * @var array */ - public static $modules = array('system', 'field', 'text', 'user', 'node', 'entity_reference'); + public static $modules = ['system', 'field', 'text', 'user', 'node']; protected function setUp() { parent::setUp(); diff --git a/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php index e0b6a70..31334fd 100644 --- a/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php +++ b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php @@ -34,7 +34,7 @@ class ConfigImportRenameValidationTest extends KernelTestBase { * * @var array */ - public static $modules = array('system', 'user', 'node', 'field', 'text', 'config_test', 'entity_reference'); + public static $modules = ['system', 'user', 'node', 'field', 'text', 'config_test']; /** * {@inheritdoc} diff --git a/core/modules/config/src/Tests/ConfigImporterTest.php b/core/modules/config/src/Tests/ConfigImporterTest.php index 51fabae..29b06d8 100644 --- a/core/modules/config/src/Tests/ConfigImporterTest.php +++ b/core/modules/config/src/Tests/ConfigImporterTest.php @@ -589,7 +589,7 @@ public function testUnmetDependency() { $error_log = $this->configImporter->getErrors(); $expected = [ 'Unable to install the unknown_module module since it does not exist.', - 'Unable to install the Book module since it requires the Node, Text, Field, Filter, User, Entity Reference modules.', + 'Unable to install the Book module since it requires the Node, Text, Field, Filter, User modules.', 'Unable to install the unknown_theme theme since it does not exist.', 'Unable to install the Bartik theme since it requires the Classy theme.', 'Configuration config_test.dynamic.dotted.config depends on the unknown configuration that will not exist after import.', diff --git a/core/modules/entity_reference/config/schema/entity_reference.views.schema.yml b/core/modules/entity_reference/config/schema/entity_reference.views.schema.yml deleted file mode 100644 index 2660e53..0000000 --- a/core/modules/entity_reference/config/schema/entity_reference.views.schema.yml +++ /dev/null @@ -1,20 +0,0 @@ -# Schema for the views plugins of the Entity Reference module. - -views.display.entity_reference: - type: views_display - label: 'Entity Reference' - -views.row.entity_reference: - type: views.row.fields - label: 'Entity Reference inline fields' - -views.style.entity_reference: - type: views_style - label: 'Entity Reference list' - mapping: - search_fields: - type: sequence - label: 'Search fields' - sequence: - type: string - label: 'Search field' diff --git a/core/modules/entity_reference/entity_reference.info.yml b/core/modules/entity_reference/entity_reference.info.yml deleted file mode 100644 index 0ff6b02..0000000 --- a/core/modules/entity_reference/entity_reference.info.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: 'Entity Reference' -type: module -description: 'Provides a field that can reference other entities.' -package: Field types -version: VERSION -core: 8.x -dependencies: - - field diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module deleted file mode 100644 index 6ddade6..0000000 --- a/core/modules/entity_reference/entity_reference.module +++ /dev/null @@ -1,213 +0,0 @@ -' . t('About') . ''; - $output .= '

' . t('The Entity Reference module allows you to create fields that contain links to other entities (such as content items, taxonomy terms, etc.) within the site. This allows you, for example, to include a link to a user within a content item. For more information, see the online documentation for the Entity Reference module and the Field module help page.', array(':field_help' => \Drupal::url('help.page', array('name' => 'field')), ':er_do' => 'https://www.drupal.org/documentation/modules/entityreference')) . '

'; - $output .= '

' . t('Uses') . '

'; - $output .= '
'; - $output .= '
' . t('Managing and displaying entity reference fields') . '
'; - $output .= '
' . t('The settings and the display of the entity reference field can be configured separately. See the Field UI help for more information on how to manage fields and their display.', array(':field_ui' => (\Drupal::moduleHandler()->moduleExists('field_ui')) ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#')) . '
'; - $output .= '
' . t('Selecting reference type') . '
'; - $output .= '
' . t('In the field settings you can select which type of item you want to create a reference to.') . '
'; - $output .= '
' . t('Filtering and sorting reference fields') . '
'; - $output .= '
' . t('Depending on the chosen entity type, additional filtering and sorting options are available for the list of entities that can be referred to, in the field settings. For example, the list of users can be filtered by role and sorted by name or ID.') . '
'; - $output .= '
' . t('Displaying a reference') . '
'; - $output .= '
' . t('An entity reference can be displayed as a simple label with or without a link to the entity. Alternatively, the referenced entity can be displayed as a teaser (or any other available view mode) inside the referencing entity. Certain entity types may provide additional display options. You can configure how the entity reference is displayed on the Manage display page for the entity.') . '
'; - $output .= '
' . t('Configuring form displays') . '
'; - $output .= '
' . t('Reference fields have several widgets available on the Manage form display page:'); - $output .= ''; - $output .= '
'; - return $output; - } -} - -/** - * Implements hook_field_info_alter(). - */ -function entity_reference_field_info_alter(&$info) { - // Make the entity reference field configurable. - $info['entity_reference']['no_ui'] = FALSE; - $info['entity_reference']['class'] = '\Drupal\entity_reference\ConfigurableEntityReferenceItem'; - $info['entity_reference']['list_class'] = '\Drupal\Core\Field\EntityReferenceFieldItemList'; - $info['entity_reference']['default_widget'] = 'entity_reference_autocomplete'; - $info['entity_reference']['default_formatter'] = 'entity_reference_label'; - $info['entity_reference']['provider'] = 'entity_reference'; -} - -/** - * Implements hook_field_widget_info_alter(). - */ -function entity_reference_field_widget_info_alter(&$info) { - if (isset($info['options_select'])) { - $info['options_select']['field_types'][] = 'entity_reference'; - } - if (isset($info['options_buttons'])) { - $info['options_buttons']['field_types'][] = 'entity_reference'; - } -} - -/** - * Implements hook_ENTITY_TYPE_update() for 'field_storage_config'. - * - * Reset the instance handler settings, when the target type is changed. - */ -function entity_reference_field_storage_config_update(FieldStorageConfigInterface $field_storage) { - if ($field_storage->getType() != 'entity_reference') { - // Only act on entity reference fields. - return; - } - - if ($field_storage->isSyncing()) { - // Don't change anything during a configuration sync. - return; - } - - if ($field_storage->getSetting('target_type') == $field_storage->original->getSetting('target_type')) { - // Target type didn't change. - return; - } - - foreach ($field_storage->getBundles() as $bundle) { - $field = FieldConfig::loadByName($field_storage->getTargetEntityTypeId(), $bundle, $field_storage->getName()); - $field->setSetting('handler_settings', []); - $field->save(); - } -} - -/** - * Implements hook_ENTITY_TYPE_presave() for 'field_config'. - * - * Determine the selection handler plugin ID for an entity reference field. - */ -function entity_reference_field_config_presave(FieldConfigInterface $field) { - if ($field->getType() != 'entity_reference') { - // Only act on entity reference fields. - return; - } - - if ($field->isSyncing()) { - // Don't change anything during a configuration sync. - return; - } - - $target_type = $field->getFieldStorageDefinition()->getSetting('target_type'); - $selection_manager = \Drupal::service('plugin.manager.entity_reference_selection'); - list($current_handler) = explode(':', $field->getSetting('handler'), 2); - $field->setSetting('handler', $selection_manager->getPluginId($target_type, $current_handler)); -} - -/** - * Implements hook_form_FORM_ID_alter() for 'field_ui_field_storage_add_form'. - */ -function entity_reference_form_field_ui_field_storage_add_form_alter(array &$form) { - $optgroup = (string) t('Reference'); - // Move the "Entity reference" option to the end of the list and rename it to - // "Other". - unset($form['add']['new_storage_type']['#options'][$optgroup]['entity_reference']); - $form['add']['new_storage_type']['#options'][$optgroup]['entity_reference'] = t('Other…'); -} - -/** - * Render API callback: Processes the field settings form and allows access to - * the form state. - * - * @see entity_reference_field_field_settings_form() - */ -function _entity_reference_field_field_settings_ajax_process($form, FormStateInterface $form_state) { - _entity_reference_field_field_settings_ajax_process_element($form, $form); - return $form; -} - -/** - * Adds entity_reference specific properties to AJAX form elements from the - * field settings form. - * - * @see _entity_reference_field_field_settings_ajax_process() - */ -function _entity_reference_field_field_settings_ajax_process_element(&$element, $main_form) { - if (!empty($element['#ajax'])) { - $element['#ajax'] = array( - 'callback' => 'entity_reference_settings_ajax', - 'wrapper' => $main_form['#id'], - 'element' => $main_form['#array_parents'], - ); - } - - foreach (Element::children($element) as $key) { - _entity_reference_field_field_settings_ajax_process_element($element[$key], $main_form); - } -} - -/** - * Render API callback: Moves entity_reference specific Form API elements - * (i.e. 'handler_settings') up a level for easier processing by the validation - * and submission handlers. - * - * @see _entity_reference_field_settings_process() - */ -function _entity_reference_form_process_merge_parent($element) { - $parents = $element['#parents']; - array_pop($parents); - $element['#parents'] = $parents; - return $element; -} - -/** - * Form element validation handler; Filters the #value property of an element. - */ -function _entity_reference_element_validate_filter(&$element, FormStateInterface $form_state) { - $element['#value'] = array_filter($element['#value']); - $form_state->setValueForElement($element, $element['#value']); -} - -/** - * Ajax callback for the handler settings form. - * - * @see entity_reference_field_field_settings_form() - */ -function entity_reference_settings_ajax($form, FormStateInterface $form_state) { - return NestedArray::getValue($form, $form_state->getTriggeringElement()['#ajax']['element']); -} - -/** - * Submit handler for the non-JS case. - * - * @see entity_reference_field_field_settings_form() - */ -function entity_reference_settings_ajax_submit($form, FormStateInterface $form_state) { - $form_state->setRebuild(); -} - -/** - * Implements hook_query_TAG_alter(). - */ -function entity_reference_query_entity_reference_alter(AlterableInterface $query) { - $handler = $query->getMetadata('entity_reference_selection_handler'); - $handler->entityQueryAlter($query); -} diff --git a/core/modules/entity_reference/entity_reference.views.inc b/core/modules/entity_reference/entity_reference.views.inc deleted file mode 100644 index 191005f..0000000 --- a/core/modules/entity_reference/entity_reference.views.inc +++ /dev/null @@ -1,73 +0,0 @@ - $table_data) { - // Add a relationship to the target entity type. - $target_entity_type_id = $field_storage->getSetting('target_type'); - $target_entity_type = $entity_manager->getDefinition($target_entity_type_id); - $entity_type_id = $field_storage->getTargetEntityTypeId(); - $entity_type = $entity_manager->getDefinition($entity_type_id); - $target_base_table = $target_entity_type->getDataTable() ?: $target_entity_type->getBaseTable(); - $field_name = $field_storage->getName(); - - // Provide a relationship for the entity type with the entity reference - // field. - $args = array( - '@label' => $target_entity_type->getLabel(), - '@field_name' => $field_name, - ); - $data[$table_name][$field_name]['relationship'] = array( - 'title' => t('@label referenced from @field_name', $args), - 'label' => t('@field_name: @label', $args), - 'group' => $entity_type->getLabel(), - 'help' => t('Appears in: @bundles.', array('@bundles' => implode(', ', $field_storage->getBundles()))), - 'id' => 'standard', - 'base' => $target_base_table, - 'entity type' => $target_entity_type_id, - 'base field' => $target_entity_type->getKey('id'), - 'relationship field' => $field_name . '_target_id', - ); - - // Provide a reverse relationship for the entity type that is referenced by - // the field. - $args['@entity'] = $entity_type->getLabel(); - $args['@label'] = $target_entity_type->getLowercaseLabel(); - $pseudo_field_name = 'reverse__' . $entity_type_id . '__' . $field_name; - /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ - $table_mapping = $entity_manager->getStorage($entity_type_id)->getTableMapping(); - $data[$target_base_table][$pseudo_field_name]['relationship'] = array( - 'title' => t('@entity using @field_name', $args), - 'label' => t('@field_name', array('@field_name' => $field_name)), - 'group' => $target_entity_type->getLabel(), - 'help' => t('Relate each @entity with a @field_name set to the @label.', $args), - 'id' => 'entity_reverse', - 'base' => $entity_type->getDataTable() ?: $entity_type->getBaseTable(), - 'entity_type' => $entity_type_id, - 'base field' => $entity_type->getKey('id'), - 'field_name' => $field_name, - 'field table' => $table_mapping->getDedicatedDataTableName($field_storage), - 'field field' => $field_name . '_target_id', - 'join_extra' => array( - array( - 'field' => 'deleted', - 'value' => 0, - 'numeric' => TRUE, - ), - ), - ); - } - - return $data; -} diff --git a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php b/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php deleted file mode 100644 index 332de7b..0000000 --- a/core/modules/entity_reference/src/ConfigurableEntityReferenceItem.php +++ /dev/null @@ -1,224 +0,0 @@ -getSettableValues($account); - } - - /** - * {@inheritdoc} - */ - public function getPossibleOptions(AccountInterface $account = NULL) { - return $this->getSettableOptions($account); - } - - /** - * {@inheritdoc} - */ - public function getSettableValues(AccountInterface $account = NULL) { - // Flatten options first, because "settable options" may contain group - // arrays. - $flatten_options = OptGroup::flattenOptions($this->getSettableOptions($account)); - return array_keys($flatten_options); - } - - /** - * {@inheritdoc} - */ - public function getSettableOptions(AccountInterface $account = NULL) { - $field_definition = $this->getFieldDefinition(); - if (!$options = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionHandler($field_definition, $this->getEntity())->getReferenceableEntities()) { - return array(); - } - - // Rebuild the array by changing the bundle key into the bundle label. - $target_type = $field_definition->getSetting('target_type'); - $bundles = \Drupal::entityManager()->getBundleInfo($target_type); - - $return = array(); - foreach ($options as $bundle => $entity_ids) { - // The label does not need sanitizing since it is used as an optgroup - // which is only supported by select elements and auto-escaped. - $bundle_label = $bundles[$bundle]['label']; - $return[(string) $bundle_label] = $entity_ids; - } - - return count($return) == 1 ? reset($return) : $return; - } - - /** - * {@inheritdoc} - */ - public function getConstraints() { - $constraints = parent::getConstraints(); - - // Remove the 'AllowedValuesConstraint' validation constraint because entity - // reference fields already use the 'ValidReference' constraint. - foreach ($constraints as $key => $constraint) { - if ($constraint instanceof AllowedValuesConstraint) { - unset($constraints[$key]); - } - } - - return $constraints; - } - - /** - * {@inheritdoc} - */ - public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) { - $element['target_type'] = array( - '#type' => 'select', - '#title' => t('Type of item to reference'), - '#options' => \Drupal::entityManager()->getEntityTypeLabels(TRUE), - '#default_value' => $this->getSetting('target_type'), - '#required' => TRUE, - '#disabled' => $has_data, - '#size' => 1, - ); - - return $element; - } - - /** - * {@inheritdoc} - */ - public function fieldSettingsForm(array $form, FormStateInterface $form_state) { - $field = $form_state->getFormObject()->getEntity(); - - // Get all selection plugins for this entity type. - $selection_plugins = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionGroups($this->getSetting('target_type')); - $handlers_options = array(); - foreach (array_keys($selection_plugins) as $selection_group_id) { - // We only display base plugins (e.g., 'default', 'views', etc.) and not - // entity type specific plugins (e.g., 'default:node', 'default:user', - // etc.). - if (array_key_exists($selection_group_id, $selection_plugins[$selection_group_id])) { - $handlers_options[$selection_group_id] = Html::escape($selection_plugins[$selection_group_id][$selection_group_id]['label']); - } - elseif (array_key_exists($selection_group_id . ':' . $this->getSetting('target_type'), $selection_plugins[$selection_group_id])) { - $selection_group_plugin = $selection_group_id . ':' . $this->getSetting('target_type'); - $handlers_options[$selection_group_plugin] = Html::escape($selection_plugins[$selection_group_id][$selection_group_plugin]['base_plugin_label']); - } - } - - $form = array( - '#type' => 'container', - '#process' => array( - '_entity_reference_field_field_settings_ajax_process', - ), - '#element_validate' => array(array(get_class($this), 'fieldSettingsFormValidate')), - ); - $form['handler'] = array( - '#type' => 'details', - '#title' => t('Reference type'), - '#open' => TRUE, - '#tree' => TRUE, - '#process' => array('_entity_reference_form_process_merge_parent'), - ); - - $form['handler']['handler'] = array( - '#type' => 'select', - '#title' => t('Reference method'), - '#options' => $handlers_options, - '#default_value' => $field->getSetting('handler'), - '#required' => TRUE, - '#ajax' => TRUE, - '#limit_validation_errors' => array(), - ); - $form['handler']['handler_submit'] = array( - '#type' => 'submit', - '#value' => t('Change handler'), - '#limit_validation_errors' => array(), - '#attributes' => array( - 'class' => array('js-hide'), - ), - '#submit' => array('entity_reference_settings_ajax_submit'), - ); - - $form['handler']['handler_settings'] = array( - '#type' => 'container', - '#attributes' => array('class' => array('entity_reference-settings')), - ); - - $handler = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionHandler($field); - $form['handler']['handler_settings'] += $handler->buildConfigurationForm(array(), $form_state); - - return $form; - } - - /** - * Form element validation handler; Invokes selection plugin's validation. - * - * @param array $form - * The form where the settings form is being included in. - * @param \Drupal\Core\Form\FormStateInterface $form_state - * The form state of the (entire) configuration form. - */ - public static function fieldSettingsFormValidate(array $form, FormStateInterface $form_state) { - $field = $form_state->getFormObject()->getEntity(); - $handler = \Drupal::service('plugin.manager.entity_reference_selection')->getSelectionHandler($field); - $handler->validateConfigurationForm($form, $form_state); - } - - /** - * {@inheritdoc} - */ - public static function getPreconfiguredOptions() { - $options = array(); - - // Add all the commonly referenced entity types as distinct pre-configured - // options. - $entity_types = \Drupal::entityManager()->getDefinitions(); - $common_references = array_filter($entity_types, function (EntityTypeInterface $entity_type) { - return $entity_type->isCommonReferenceTarget(); - }); - - /** @var \Drupal\Core\Entity\EntityTypeInterface $entity_type */ - foreach ($common_references as $entity_type) { - $options[$entity_type->id()] = [ - 'label' => $entity_type->getLabel(), - 'field_storage_config' => [ - 'settings' => [ - 'target_type' => $entity_type->id(), - ] - ] - ]; - } - - return $options; - } - -} diff --git a/core/modules/field/field.install b/core/modules/field/field.install index f381b05..aaaa226 100644 --- a/core/modules/field/field.install +++ b/core/modules/field/field.install @@ -26,3 +26,48 @@ function field_update_8001() { } } } + +/** + * Uninstalls 'entity_reference' module. Fixes entity reference fields storage. + */ +function field_update_8002() { + $config_factory = \Drupal::configFactory(); + /** @var \Drupal\Core\Field\FieldTypePluginManager $field_type_manager */ + $field_type_manager = \Drupal::service('plugin.manager.field.field_type'); + $item_class = 'Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem'; + + // Iterate on all configuration entities. + foreach ($config_factory->listAll() as $id) { + $changed = FALSE; + $config = $config_factory->getEditable($id); + + // Update field storage configurations. + if (strpos($id, 'field.storage.') === 0) { + $class = $field_type_manager->getPluginClass($config->get('type')); + // Deal only with entity reference fields and descendants. + if ($class == $item_class || is_subclass_of($class, $item_class)) { + // Fix the type provider. + $config->set('module', 'core'); + $changed = TRUE; + } + } + + // Remove entity_reference module dependency from any configuration entity. + if ($dependencies = $config->get('dependencies.module')) { + if (($delta = array_search('entity_reference', $dependencies)) !== FALSE) { + unset($dependencies[$delta]); + $config->set('dependencies.module', $dependencies); + $changed = TRUE; + } + } + + if ($changed) { + $config->save(TRUE); + } + } + + // Uninstall 'entity_reference' module using the Config API. + $config_factory->getEditable('core.extension') + ->clear('module.entity_reference') + ->save(TRUE); +} diff --git a/core/modules/field/field.module b/core/modules/field/field.module index 666917c..ecbd6cb 100644 --- a/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -12,6 +12,8 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Url; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\field\FieldConfigInterface; +use Drupal\field\FieldStorageConfigInterface; /* * Load all public Field API functions. Drupal currently has no @@ -128,6 +130,25 @@ function field_help($route_name, RouteMatchInterface $route_match) { $output .= '
' . t('Provided by Drupal core') . '
'; $output .= '
' . t('As mentioned previously, some field types, widgets, and formatters are provided by Drupal core. Here are some notes on how to use some of these:'); $output .= '
'; $output .= ''; @@ -205,6 +226,56 @@ function field_entity_bundle_delete($entity_type, $bundle) { } /** + * Implements hook_ENTITY_TYPE_update() for 'field_storage_config'. + * + * Reset the instance handler settings, when the target type is changed. + */ +function field_field_storage_config_update(FieldStorageConfigInterface $field_storage) { + if ($field_storage->getType() != 'entity_reference') { + // Only act on entity reference fields. + return; + } + + if ($field_storage->isSyncing()) { + // Don't change anything during a configuration sync. + return; + } + + if ($field_storage->getSetting('target_type') == $field_storage->original->getSetting('target_type')) { + // Target type didn't change. + return; + } + + foreach ($field_storage->getBundles() as $bundle) { + $field = FieldConfig::loadByName($field_storage->getTargetEntityTypeId(), $bundle, $field_storage->getName()); + $field->setSetting('handler_settings', []); + $field->save(); + } +} + +/** + * Implements hook_ENTITY_TYPE_presave() for 'field_config'. + * + * Determine the selection handler plugin ID for an entity reference field. + */ +function field_field_config_presave(FieldConfigInterface $field) { + if ($field->getType() != 'entity_reference') { + // Only act on entity reference fields. + return; + } + + if ($field->isSyncing()) { + // Don't change anything during a configuration sync. + return; + } + + $target_type = $field->getFieldStorageDefinition()->getSetting('target_type'); + $selection_manager = \Drupal::service('plugin.manager.entity_reference_selection'); + list($current_handler) = explode(':', $field->getSetting('handler'), 2); + $field->setSetting('handler', $selection_manager->getPluginId($target_type, $current_handler)); +} + +/** * @} End of "defgroup field". */ diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php similarity index 98% rename from core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php rename to core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php index 2b341b8..eac3a43 100644 --- a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity_reference\Tests\EntityReferenceAdminTest. + * Contains \Drupal\field\Tests\EntityReference\EntityReferenceAdminTest. */ -namespace Drupal\entity_reference\Tests; +namespace Drupal\field\Tests\EntityReference; use Drupal\Core\Entity\Entity; use Drupal\field_ui\Tests\FieldUiTestTrait; @@ -31,7 +31,7 @@ class EntityReferenceAdminTest extends WebTestBase { * * @var array */ - public static $modules = array('node', 'field_ui', 'entity_reference', 'path', 'taxonomy', 'block', 'views', 'views_ui', 'entity_test'); + public static $modules = ['node', 'field_ui', 'path', 'taxonomy', 'block', 'views_ui']; /** * The name of the content type created for testing purposes. diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceAutoCreateTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceAutoCreateTest.php similarity index 95% rename from core/modules/entity_reference/src/Tests/EntityReferenceAutoCreateTest.php rename to core/modules/field/src/Tests/EntityReference/EntityReferenceAutoCreateTest.php index dc87dc8..77bede9 100644 --- a/core/modules/entity_reference/src/Tests/EntityReferenceAutoCreateTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceAutoCreateTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity_reference\Tests\EntityReferenceAutoCreateTest. + * Contains \Drupal\field\Tests\EntityReference\EntityReferenceAutoCreateTest. */ -namespace Drupal\entity_reference\Tests; +namespace Drupal\field\Tests\EntityReference; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\simpletest\WebTestBase; @@ -18,7 +18,7 @@ */ class EntityReferenceAutoCreateTest extends WebTestBase { - public static $modules = array('entity_reference', 'node'); + public static $modules = ['node']; /** * The name of a content type that will reference $referencedType. diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php similarity index 97% rename from core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php rename to core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php index c2ceed9..ae6fec7 100644 --- a/core/modules/entity_reference/src/Tests/EntityReferenceFieldDefaultValueTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity_reference\Tests\EntityReferenceFieldDefaultValueTest. + * Contains \Drupal\field\Tests\EntityReference\EntityReferenceFieldDefaultValueTest. */ -namespace Drupal\entity_reference\Tests; +namespace Drupal\field\Tests\EntityReference; use Drupal\Component\Utility\Unicode; use Drupal\config\Tests\SchemaCheckTestTrait; @@ -18,6 +18,7 @@ * @group entity_reference */ class EntityReferenceFieldDefaultValueTest extends WebTestBase { + use SchemaCheckTestTrait; /** @@ -25,7 +26,7 @@ class EntityReferenceFieldDefaultValueTest extends WebTestBase { * * @var array */ - public static $modules = array('entity_reference', 'field_ui', 'node'); + public static $modules = ['field_ui', 'node']; /** * A user with permission to administer content types, node fields, etc. diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php similarity index 98% rename from core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php rename to core/modules/field/src/Tests/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php index 1b7ae33..f9a41be 100644 --- a/core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity_reference\Tests\EntityReferenceFieldTranslatedReferenceViewTest. + * Contains \Drupal\field\Tests\EntityReference\EntityReferenceFieldTranslatedReferenceViewTest. */ -namespace Drupal\entity_reference\Tests; +namespace Drupal\field\Tests\EntityReference; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\Core\Field\FieldStorageDefinitionInterface; @@ -117,7 +117,6 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase { public static $modules = array( 'language', 'content_translation', - 'entity_reference', 'node', ); diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceFileUploadTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php similarity index 96% rename from core/modules/entity_reference/src/Tests/EntityReferenceFileUploadTest.php rename to core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php index 0368bf0..a57104f 100644 --- a/core/modules/entity_reference/src/Tests/EntityReferenceFileUploadTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity_reference\Tests\EntityReferenceFileUploadTest. + * Contains \Drupal\field\Tests\EntityReference\EntityReferenceFileUploadTest. */ -namespace Drupal\entity_reference\Tests; +namespace Drupal\field\Tests\EntityReference; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\simpletest\WebTestBase; diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php index 6bdbd26..cc41f7d 100644 --- a/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php @@ -10,7 +10,6 @@ use Drupal\Core\Cache\Cache; use Drupal\Core\Cache\CacheableMetadata; use Drupal\Core\Field\FieldStorageDefinitionInterface; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; use Drupal\field\Entity\FieldStorageConfig; use Drupal\filter\Entity\FilterFormat; use Drupal\system\Tests\Entity\EntityUnitTestBase; @@ -62,13 +61,6 @@ class EntityReferenceFormatterTest extends EntityUnitTestBase { */ protected $unsavedReferencedEntity; - /** - * Modules to install. - * - * @var array - */ - public static $modules = array('entity_reference'); - protected function setUp() { parent::setUp(); diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceIntegrationTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceIntegrationTest.php similarity index 97% rename from core/modules/entity_reference/src/Tests/EntityReferenceIntegrationTest.php rename to core/modules/field/src/Tests/EntityReference/EntityReferenceIntegrationTest.php index c059848..0d1fe9b 100644 --- a/core/modules/entity_reference/src/Tests/EntityReferenceIntegrationTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceIntegrationTest.php @@ -2,15 +2,14 @@ /** * @file - * Contains \Drupal\entity_reference\Tests\EntityReferenceIntegrationTest. + * Contains \Drupal\field\Tests\EntityReference\EntityReferenceIntegrationTest. */ -namespace Drupal\entity_reference\Tests; +namespace Drupal\field\Tests\EntityReference; use Drupal\Component\Utility\SafeMarkup; use Drupal\config\Tests\AssertConfigEntityImportTrait; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; use Drupal\field\Entity\FieldConfig; use Drupal\simpletest\WebTestBase; @@ -50,7 +49,7 @@ class EntityReferenceIntegrationTest extends WebTestBase { * * @var array */ - public static $modules = array('config_test', 'entity_test', 'entity_reference', 'field_ui'); + public static $modules = ['config_test', 'entity_test', 'field_ui']; /** * {@inheritdoc} diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceItemTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceItemTest.php index d785696..b2539c7 100644 --- a/core/modules/field/src/Tests/EntityReference/EntityReferenceItemTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceItemTest.php @@ -13,7 +13,6 @@ use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\Core\Language\LanguageInterface; use Drupal\entity_test\Entity\EntityTest; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; use Drupal\entity_test\Entity\EntityTestStringId; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; @@ -36,7 +35,7 @@ class EntityReferenceItemTest extends FieldUnitTestBase { * * @var array */ - public static $modules = array('entity_reference', 'taxonomy', 'text', 'filter', 'views'); + public static $modules = ['taxonomy', 'text', 'filter', 'views', 'field']; /** * The taxonomy vocabulary to test with. diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceTestTrait.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceTestTrait.php similarity index 95% rename from core/modules/entity_reference/src/Tests/EntityReferenceTestTrait.php rename to core/modules/field/src/Tests/EntityReference/EntityReferenceTestTrait.php index 1882079..7c9925b 100644 --- a/core/modules/entity_reference/src/Tests/EntityReferenceTestTrait.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceTestTrait.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity_reference\Tests\EntityReferenceTestTrait. + * Contains \Drupal\field\Tests\EntityReference\EntityReferenceTestTrait. */ -namespace Drupal\entity_reference\Tests; +namespace Drupal\field\Tests\EntityReference; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceXSSTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceXSSTest.php similarity index 93% rename from core/modules/entity_reference/src/Tests/EntityReferenceXSSTest.php rename to core/modules/field/src/Tests/EntityReference/EntityReferenceXSSTest.php index cea10f2..cc19a98 100644 --- a/core/modules/entity_reference/src/Tests/EntityReferenceXSSTest.php +++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceXSSTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity_reference\Tests\EntityReferenceXSSTest. + * Contains \Drupal\field\Tests\EntityReference\EntityReferenceXSSTest. */ -namespace Drupal\entity_reference\Tests; +namespace Drupal\field\Tests\EntityReference; use Drupal\Core\Entity\Entity\EntityFormDisplay; use Drupal\Core\Entity\Entity\EntityViewDisplay; @@ -25,7 +25,7 @@ class EntityReferenceXSSTest extends WebTestBase { * * @var array */ - protected static $modules = ['node', 'entity_reference']; + protected static $modules = ['node']; /** * Tests markup is escaped in the entity reference select and label formatter. diff --git a/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php b/core/modules/field/src/Tests/EntityReference/Views/EntityReferenceRelationshipTest.php similarity index 96% rename from core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php rename to core/modules/field/src/Tests/EntityReference/Views/EntityReferenceRelationshipTest.php index 4003d06..fc76278 100644 --- a/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php +++ b/core/modules/field/src/Tests/EntityReference/Views/EntityReferenceRelationshipTest.php @@ -2,12 +2,12 @@ /** * @file - * Contains \Drupal\entity_reference\Tests\Views\EntityReferenceRelationshipTest. + * Contains \Drupal\field\Tests\EntityReference\Views\EntityReferenceRelationshipTest. */ -namespace Drupal\entity_reference\Tests\Views; +namespace Drupal\field\Tests\EntityReference\Views; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait; use Drupal\entity_test\Entity\EntityTest; use Drupal\entity_test\Entity\EntityTestMul; use Drupal\views\Tests\ViewTestData; @@ -18,7 +18,8 @@ * Tests entity reference relationship data. * * @group entity_reference - * @see entity_reference_field_views_data() + * + * @see core_field_views_data() */ class EntityReferenceRelationshipTest extends ViewKernelTestBase { @@ -41,7 +42,7 @@ class EntityReferenceRelationshipTest extends ViewKernelTestBase { * * @var array */ - public static $modules = array('user', 'field', 'entity_test', 'entity_reference', 'views', 'entity_reference_test_views'); + public static $modules = ['user', 'field', 'entity_test', 'views', 'entity_reference_test_views']; /** * The entity_test entities used by the test. diff --git a/core/modules/entity_reference/src/Tests/Views/SelectionTest.php b/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php similarity index 94% rename from core/modules/entity_reference/src/Tests/Views/SelectionTest.php rename to core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php index d324b12..f560876 100644 --- a/core/modules/entity_reference/src/Tests/Views/SelectionTest.php +++ b/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\entity_reference\Tests\Views\SelectionTest. + * Contains \Drupal\field\Tests\EntityReference\Views\SelectionTest. */ -namespace Drupal\entity_reference\Tests\Views; +namespace Drupal\field\Tests\EntityReference\Views; use Drupal\simpletest\WebTestBase; use Drupal\views\Views; @@ -17,7 +17,7 @@ */ class SelectionTest extends WebTestBase { - public static $modules = array('node', 'views', 'entity_reference', 'entity_reference_test', 'entity_test'); + public static $modules = ['node', 'views', 'entity_reference_test', 'entity_test']; /** * Nodes for testing. diff --git a/core/modules/field/src/Tests/FieldUnitTestBase.php b/core/modules/field/src/Tests/FieldUnitTestBase.php index 9587a4a..ddcf3f9 100644 --- a/core/modules/field/src/Tests/FieldUnitTestBase.php +++ b/core/modules/field/src/Tests/FieldUnitTestBase.php @@ -22,7 +22,7 @@ * * @var array */ - public static $modules = array('user', 'system', 'field', 'text', 'entity_test', 'field_test', 'entity_reference'); + public static $modules = ['user', 'system', 'field', 'text', 'entity_test', 'field_test']; /** * Bag of created field storages and fields. diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldFormatterSettingsTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldFormatterSettingsTest.php index 5e382bd..246b1e5 100644 --- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldFormatterSettingsTest.php +++ b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldFormatterSettingsTest.php @@ -24,7 +24,6 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase { public static $modules = [ 'comment', 'datetime', - 'entity_reference', 'file', 'image', 'link', diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceTest.php index 24d141e..3bf5d89 100644 --- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceTest.php +++ b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceTest.php @@ -28,7 +28,6 @@ class MigrateFieldInstanceTest extends MigrateDrupal7TestBase { static $modules = array( 'comment', 'datetime', - 'entity_reference', 'file', 'image', 'link', diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php index 2d89871..f6dbd46 100644 --- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php +++ b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php @@ -26,7 +26,6 @@ class MigrateFieldInstanceWidgetSettingsTest extends MigrateDrupal7TestBase { public static $modules = array( 'comment', 'datetime', - 'entity_reference', 'field', 'file', 'image', diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php index 4cbb4d4..c846b89 100644 --- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php +++ b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php @@ -27,7 +27,6 @@ class MigrateFieldTest extends MigrateDrupal7TestBase { static $modules = array( 'comment', 'datetime', - 'entity_reference', 'file', 'image', 'link', diff --git a/core/modules/field/src/Tests/Update/EntityReferenceTargetBundleUpdateTest.php b/core/modules/field/src/Tests/Update/EntityReferenceTargetBundleUpdateTest.php deleted file mode 100644 index 07b2d74..0000000 --- a/core/modules/field/src/Tests/Update/EntityReferenceTargetBundleUpdateTest.php +++ /dev/null @@ -1,53 +0,0 @@ -databaseDumpFiles = [ - __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz', - ]; - } - - /** - * Tests field_update_8001(). - * - * @see field_update_8001() - */ - public function testFieldUpdate8001() { - $configFactory = $this->container->get('config.factory'); - - // Load the 'node.field_image' field storage config, and check that is has - // a 'target_bundle' setting. - /** @var \Drupal\Core\Config\Config */ - $config = $configFactory->get('field.storage.node.field_image'); - $settings = $config->get('settings'); - $this->assertTrue(array_key_exists('target_bundle', $settings)); - - // Run updates. - $this->runUpdates(); - - // Reload the config, and check that the 'target_bundle' setting has been - // removed. - $config = $configFactory->get('field.storage.node.field_image'); - $settings = $config->get('settings'); - $this->assertFalse(array_key_exists('target_bundle', $settings)); - } - -} diff --git a/core/modules/field/src/Tests/Update/FieldUpdateTest.php b/core/modules/field/src/Tests/Update/FieldUpdateTest.php new file mode 100644 index 0000000..2dc42a7 --- /dev/null +++ b/core/modules/field/src/Tests/Update/FieldUpdateTest.php @@ -0,0 +1,104 @@ +configFactory = $this->container->get('config.factory'); + } + + /** + * {@inheritdoc} + */ + protected function setDatabaseDumpFiles() { + $this->databaseDumpFiles = [ + __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz', + ]; + } + + /** + * Tests field_update_8001(). + * + * @see field_update_8001() + */ + public function testFieldUpdate8001() { + // Load the 'node.field_image' field storage config, and check that is has + // a 'target_bundle' setting. + $config = $this->configFactory->get('field.storage.node.field_image'); + $settings = $config->get('settings'); + $this->assertTrue(array_key_exists('target_bundle', $settings)); + + // Run updates. + $this->runUpdates(); + + // Reload the config, and check that the 'target_bundle' setting has been + // removed. + $config = $this->configFactory->get('field.storage.node.field_image'); + $settings = $config->get('settings'); + $this->assertFalse(array_key_exists('target_bundle', $settings)); + } + + /** + * Tests field_update_8002(). + * + * @see field_update_8002() + */ + public function testFieldUpdate8002() { + // Check that the type provider for the field_tags field type is + // entity_reference module. + $provider = $this->configFactory->get('field.storage.node.field_tags') + ->get('module'); + $this->assertIdentical($provider, 'entity_reference'); + + // Check that the entity_reference module is a dependency of field_tags + // config entity. + $dependencies = $this->configFactory + ->get('field.field.node.article.field_tags')->get('dependencies.module'); + $this->assertTrue(array_search('entity_reference', $dependencies) !== FALSE); + + // Run updates. + $this->runUpdates(); + + // Load the field config 'node.article.field_tags' to test updates. + $field_config = FieldConfig::loadByName('node', 'article', 'field_tags'); + + // Check that the field type provider for field_tags field is now 'core'. + $provider = $field_config->getFieldStorageDefinition()->getTypeProvider(); + $this->assertIdentical($provider, 'core'); + + // Check that the module dependency on 'entity_reference' has been removed. + $dependencies = $field_config->getDependencies(); + $modules = !empty($dependencies['module']) ? $dependencies['module'] : []; + $this->assertTrue(array_search('entity_reference', $modules) === FALSE); + + // Check that the entity_reference module has been uninstalled. + $modules = $this->configFactory->get('core.extension')->get('module'); + $this->assertFalse(array_key_exists('entity_reference', $modules)); + } + +} diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php index ed43782..3e38772 100644 --- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php +++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php @@ -99,7 +99,7 @@ public static function multipleValidate($element, FormStateInterface $form_state /** * {@inheritdoc} - * Used in \Drupal\entity_reference\Tests\EntityReferenceAdminTest::testAvailableFormatters(). + * Used in \Drupal\field\Tests\EntityReference\EntityReferenceAdminTest::testAvailableFormatters(). */ public static function isApplicable(FieldDefinitionInterface $field_definition) { // Returns FALSE if machine name of the field equals field_onewidgetfield. diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index 3008b37..269aa67 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -297,3 +297,14 @@ function field_ui_local_tasks_alter(&$local_tasks) { $local_task = FieldUiLocalTask::create($container, 'field_ui.fields'); $local_task->alterLocalTasks($local_tasks); } + +/** + * Implements hook_form_FORM_ID_alter() for 'field_ui_field_storage_add_form'. + */ +function field_ui_form_field_ui_field_storage_add_form_alter(array &$form) { + $optgroup = (string) t('Reference'); + // Move the "Entity reference" option to the end of the list and rename it to + // "Other". + unset($form['add']['new_storage_type']['#options'][$optgroup]['entity_reference']); + $form['add']['new_storage_type']['#options'][$optgroup]['entity_reference'] = t('Other…'); +} diff --git a/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php b/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php index 0f8cc6b..b002106 100644 --- a/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php +++ b/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php @@ -25,7 +25,7 @@ class EntityFormDisplayTest extends KernelTestBase { * * @var string[] */ - public static $modules = array('field_ui', 'field', 'entity_test', 'field_test', 'user', 'text', 'entity_reference'); + public static $modules = ['field_ui', 'field', 'entity_test', 'field_test', 'user', 'text']; protected function setUp() { parent::setUp(); diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php index 48ae2a2..55e8755 100644 --- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php @@ -10,7 +10,7 @@ use Drupal\Component\Utility\SafeMarkup; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Language\LanguageInterface; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait ; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; use Drupal\simpletest\WebTestBase; diff --git a/core/modules/file/src/Plugin/Field/FieldType/FileItem.php b/core/modules/file/src/Plugin/Field/FieldType/FileItem.php index 3d6bfc5..5841604 100644 --- a/core/modules/file/src/Plugin/Field/FieldType/FileItem.php +++ b/core/modules/file/src/Plugin/Field/FieldType/FileItem.php @@ -340,4 +340,11 @@ public function isDisplayed() { return TRUE; } + /** + * {@inheritdoc} + */ + public static function getPreconfiguredOptions() { + return []; + } + } diff --git a/core/modules/forum/config/install/core.entity_form_display.node.forum.default.yml b/core/modules/forum/config/install/core.entity_form_display.node.forum.default.yml index d4e7c4d..c66ba23 100644 --- a/core/modules/forum/config/install/core.entity_form_display.node.forum.default.yml +++ b/core/modules/forum/config/install/core.entity_form_display.node.forum.default.yml @@ -8,7 +8,6 @@ dependencies: - node.type.forum module: - comment - - entity_reference - text id: node.forum.default targetEntityType: node diff --git a/core/modules/forum/config/install/field.storage.node.taxonomy_forums.yml b/core/modules/forum/config/install/field.storage.node.taxonomy_forums.yml index 7ff1c58..ccdd8c4 100644 --- a/core/modules/forum/config/install/field.storage.node.taxonomy_forums.yml +++ b/core/modules/forum/config/install/field.storage.node.taxonomy_forums.yml @@ -10,7 +10,7 @@ entity_type: node type: entity_reference settings: target_type: taxonomy_term -module: entity_reference +module: core locked: false cardinality: 1 translatable: true diff --git a/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php b/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php index 735179c..008ace0 100644 --- a/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php +++ b/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php @@ -23,7 +23,6 @@ class MigrateForumSettingsTest extends MigrateDrupal7TestBase { 'comment', 'field', 'filter', - 'entity_reference', 'text', 'node', 'taxonomy', diff --git a/core/modules/hal/src/Tests/NormalizerTestBase.php b/core/modules/hal/src/Tests/NormalizerTestBase.php index aea5b25..104a5e2 100644 --- a/core/modules/hal/src/Tests/NormalizerTestBase.php +++ b/core/modules/hal/src/Tests/NormalizerTestBase.php @@ -33,7 +33,7 @@ * * @var array */ - public static $modules = array('entity_test', 'entity_reference', 'field', 'hal', 'language', 'rest', 'serialization', 'system', 'text', 'user', 'filter'); + public static $modules = ['entity_test', 'field', 'hal', 'language', 'rest', 'serialization', 'system', 'text', 'user', 'filter']; /** * The mock serializer. diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php index 106bcb4..1d8f5f4 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php @@ -20,7 +20,6 @@ */ public static $modules = [ 'datetime', - 'entity_reference', 'filter', 'image', 'link', diff --git a/core/modules/node/node.info.yml b/core/modules/node/node.info.yml index cdbef85..9b53d58 100644 --- a/core/modules/node/node.info.yml +++ b/core/modules/node/node.info.yml @@ -7,4 +7,3 @@ core: 8.x configure: entity.node_type.collection dependencies: - text - - entity_reference diff --git a/core/modules/node/src/Tests/Config/NodeImportChangeTest.php b/core/modules/node/src/Tests/Config/NodeImportChangeTest.php index 4e1fbc1..f42f16b 100644 --- a/core/modules/node/src/Tests/Config/NodeImportChangeTest.php +++ b/core/modules/node/src/Tests/Config/NodeImportChangeTest.php @@ -22,7 +22,7 @@ class NodeImportChangeTest extends KernelTestBase { * * @var array */ - public static $modules = array('node', 'field', 'text', 'system', 'node_test_config', 'user', 'entity_reference'); + public static $modules = ['node', 'field', 'text', 'system', 'node_test_config', 'user']; /** * Set the default field storage backend for fields created during tests. diff --git a/core/modules/node/src/Tests/Config/NodeImportCreateTest.php b/core/modules/node/src/Tests/Config/NodeImportCreateTest.php index 97fe51f..12c73ac 100644 --- a/core/modules/node/src/Tests/Config/NodeImportCreateTest.php +++ b/core/modules/node/src/Tests/Config/NodeImportCreateTest.php @@ -23,7 +23,7 @@ class NodeImportCreateTest extends KernelTestBase { * * @var array */ - public static $modules = array('node', 'field', 'text', 'system', 'user', 'entity_reference'); + public static $modules = array('node', 'field', 'text', 'system', 'user'); /** * Set the default field storage backend for fields created during tests. diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php index 2f795c6..b2537f5 100644 --- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php +++ b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php @@ -21,7 +21,6 @@ class MigrateNodeTest extends MigrateDrupal7TestBase { static $modules = array( 'comment', 'datetime', - 'entity_reference', 'filter', 'image', 'link', diff --git a/core/modules/node/src/Tests/NodeBodyFieldStorageTest.php b/core/modules/node/src/Tests/NodeBodyFieldStorageTest.php index 2153c7f..33aa98e 100644 --- a/core/modules/node/src/Tests/NodeBodyFieldStorageTest.php +++ b/core/modules/node/src/Tests/NodeBodyFieldStorageTest.php @@ -27,7 +27,7 @@ class NodeBodyFieldStorageTest extends KernelTestBase { * * @var array */ - public static $modules = array('user', 'system', 'field', 'node', 'text', 'filter', 'entity_reference'); + public static $modules = ['user', 'system', 'field', 'node', 'text', 'filter']; protected function setUp() { parent::setUp(); diff --git a/core/modules/node/src/Tests/PagePreviewTest.php b/core/modules/node/src/Tests/PagePreviewTest.php index 6408e4d..903636a 100644 --- a/core/modules/node/src/Tests/PagePreviewTest.php +++ b/core/modules/node/src/Tests/PagePreviewTest.php @@ -11,7 +11,7 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Component\Utility\Unicode; use Drupal\Core\Language\LanguageInterface; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; use Drupal\node\Entity\NodeType; diff --git a/core/modules/node/src/Tests/Views/NidArgumentTest.php b/core/modules/node/src/Tests/Views/NidArgumentTest.php index 4d68e0e..456dd74 100644 --- a/core/modules/node/src/Tests/Views/NidArgumentTest.php +++ b/core/modules/node/src/Tests/Views/NidArgumentTest.php @@ -23,7 +23,7 @@ class NidArgumentTest extends ViewKernelTestBase { /** * {@inheritdoc} */ - public static $modules = ['node', 'field', 'text', 'node_test_config', 'user', 'entity_reference', 'node_test_views']; + public static $modules = ['node', 'field', 'text', 'node_test_config', 'user', 'node_test_views']; /** * Views used by this test. diff --git a/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml b/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml index 6d0f3e8..19a2ef7 100644 --- a/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml +++ b/core/modules/options/tests/options_config_install_test/config/install/core.entity_form_display.node.options_install_test.default.yml @@ -5,7 +5,6 @@ dependencies: - field.field.node.options_install_test.body - node.type.options_install_test module: - - entity_reference - text id: node.options_install_test.default targetEntityType: node diff --git a/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php b/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php index 81eaa97..db95713 100644 --- a/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php +++ b/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php @@ -10,7 +10,7 @@ use Drupal\Component\Serialization\Json; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Language\LanguageInterface; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait ; use Drupal\simpletest\WebTestBase; /** diff --git a/core/modules/quickedit/src/Tests/QuickEditTestBase.php b/core/modules/quickedit/src/Tests/QuickEditTestBase.php index fbbd1a7..eb779ad 100644 --- a/core/modules/quickedit/src/Tests/QuickEditTestBase.php +++ b/core/modules/quickedit/src/Tests/QuickEditTestBase.php @@ -19,7 +19,7 @@ * * @var array */ - public static $modules = array('system', 'entity_test', 'field', 'field_test', 'filter', 'user', 'text', 'quickedit', 'entity_reference'); + public static $modules = ['system', 'entity_test', 'field', 'field_test', 'filter', 'user', 'text', 'quickedit']; /** * Bag of created fields. diff --git a/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php b/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php index 15760c7..73e6e53 100644 --- a/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php +++ b/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php @@ -6,7 +6,7 @@ namespace Drupal\rdf\Tests\Field; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait; use Drupal\user\Entity\Role; use Drupal\user\RoleInterface; @@ -48,7 +48,7 @@ class EntityReferenceRdfaTest extends FieldRdfaTestBase { /** * {@inheritdoc} */ - public static $modules = array('entity_reference', 'text', 'filter'); + public static $modules = ['text', 'filter']; protected function setUp() { parent::setUp(); diff --git a/core/modules/serialization/src/Tests/EntityResolverTest.php b/core/modules/serialization/src/Tests/EntityResolverTest.php index 7d174c3..f63d96d 100644 --- a/core/modules/serialization/src/Tests/EntityResolverTest.php +++ b/core/modules/serialization/src/Tests/EntityResolverTest.php @@ -20,7 +20,7 @@ class EntityResolverTest extends NormalizerTestBase { * * @var array */ - public static $modules = array('entity_reference', 'hal', 'rest'); + public static $modules = ['hal', 'rest']; /** * The format being tested. diff --git a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php index ee4fcd8..dd35bbd 100644 --- a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php +++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php @@ -29,7 +29,7 @@ * * @var array */ - public static $modules = array('entity_reference', 'entity_test', 'field_test'); + public static $modules = ['entity_test', 'field_test']; /** * The main entity used for testing. diff --git a/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php b/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php index 254bfdb..fc83fcd 100644 --- a/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php +++ b/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php @@ -7,7 +7,7 @@ namespace Drupal\system\Tests\Entity; use Drupal\Component\Utility\Unicode; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait ; /** * Tests the Entity Query relationship API. diff --git a/core/modules/system/src/Tests/Entity/EntityReferenceFieldTest.php b/core/modules/system/src/Tests/Entity/EntityReferenceFieldTest.php index f74410f..1f01ae7 100644 --- a/core/modules/system/src/Tests/Entity/EntityReferenceFieldTest.php +++ b/core/modules/system/src/Tests/Entity/EntityReferenceFieldTest.php @@ -12,7 +12,7 @@ use Drupal\Core\Entity\EntityStorageException; use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Field\FieldStorageDefinitionInterface; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait; use Drupal\field\Entity\FieldConfig; use Drupal\user\Entity\Role; use Drupal\user\Entity\User; diff --git a/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php index 89deb62..8940f0f 100644 --- a/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php +++ b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php @@ -20,7 +20,7 @@ * * @var array */ - public static $modules = array('user', 'system', 'field', 'text', 'filter', 'entity_test', 'entity_reference'); + public static $modules = ['user', 'system', 'field', 'text', 'filter', 'entity_test']; /** * The entity manager service. diff --git a/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php b/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php index fbc273b..a3e6cd1 100644 --- a/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php +++ b/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php @@ -8,7 +8,7 @@ namespace Drupal\system\Tests\Entity; use Drupal\Core\Language\LanguageInterface; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait; use Drupal\Core\Cache\Cache; use Drupal\user\Entity\Role; use Drupal\user\RoleInterface; @@ -23,13 +23,6 @@ class EntityViewBuilderTest extends EntityUnitTestBase { use EntityReferenceTestTrait; /** - * Modules to enable. - * - * @var array - */ - public static $modules = array('entity_reference'); - - /** * {@inheritdoc} */ protected function setUp() { diff --git a/core/modules/system/src/Tests/Entity/FieldAccessTest.php b/core/modules/system/src/Tests/Entity/FieldAccessTest.php index b44d84a..70fc629 100644 --- a/core/modules/system/src/Tests/Entity/FieldAccessTest.php +++ b/core/modules/system/src/Tests/Entity/FieldAccessTest.php @@ -22,7 +22,7 @@ class FieldAccessTest extends KernelTestBase { * * @var array */ - public static $modules = array('entity_test', 'field', 'system', 'text', 'filter', 'user', 'entity_reference'); + public static $modules = ['entity_test', 'field', 'system', 'text', 'filter', 'user']; /** * Holds the currently active global user ID that initiated the test run. diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php b/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php index 4ccc6e7..88832ae 100644 --- a/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php +++ b/core/modules/system/src/Tests/Update/UpdatePathTestBaseFilledTest.php @@ -357,7 +357,6 @@ public function testUpdatedSite() { 'datetime', 'dblog', 'editor', - 'entity_reference', 'field', 'field_ui', 'file', diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 7ec8d0f..9da34f8 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -9,6 +9,7 @@ use Drupal\Component\Utility\UrlHelper; use Drupal\Core\Asset\AttachedAssetsInterface; use Drupal\Core\Cache\Cache; +use Drupal\Core\Database\Query\AlterableInterface; use Drupal\Core\Extension\Extension; use Drupal\Core\Extension\ExtensionDiscovery; use Drupal\Core\Form\FormStateInterface; @@ -1425,3 +1426,11 @@ function system_path_insert() { function system_path_delete($path) { \Drupal::service('path.alias_manager')->cacheClear(); } + +/** + * Implements hook_query_TAG_alter() for entity reference selection handlers. + */ +function system_query_entity_reference_alter(AlterableInterface $query) { + $handler = $query->getMetadata('entity_reference_selection_handler'); + $handler->entityQueryAlter($query); +} diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml similarity index 99% rename from core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml rename to core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml index 919028b..3fde0ec 100644 --- a/core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml +++ b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml @@ -2,7 +2,6 @@ langcode: en status: true dependencies: module: - - entity_reference - entity_reference_test - node - user diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml similarity index 99% rename from core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml rename to core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml index ec3ab5b..752e528 100644 --- a/core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml +++ b/core/modules/system/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference_entity_test.yml @@ -2,7 +2,6 @@ langcode: en status: true dependencies: module: - - entity_reference - entity_reference_test - entity_test id: test_entity_reference_entity_test diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test/entity_reference_test.info.yml b/core/modules/system/tests/modules/entity_reference_test/entity_reference_test.info.yml similarity index 90% rename from core/modules/entity_reference/tests/modules/entity_reference_test/entity_reference_test.info.yml rename to core/modules/system/tests/modules/entity_reference_test/entity_reference_test.info.yml index 883c70e..62830f4 100644 --- a/core/modules/entity_reference/tests/modules/entity_reference_test/entity_reference_test.info.yml +++ b/core/modules/system/tests/modules/entity_reference_test/entity_reference_test.info.yml @@ -5,7 +5,6 @@ core: 8.x package: Testing version: VERSION dependencies: - - entity_reference - node - user - views diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test/entity_reference_test.module b/core/modules/system/tests/modules/entity_reference_test/entity_reference_test.module similarity index 100% rename from core/modules/entity_reference/tests/modules/entity_reference_test/entity_reference_test.module rename to core/modules/system/tests/modules/entity_reference_test/entity_reference_test.module diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test_views/entity_reference_test_views.info.yml b/core/modules/system/tests/modules/entity_reference_test_views/entity_reference_test_views.info.yml similarity index 90% rename from core/modules/entity_reference/tests/modules/entity_reference_test_views/entity_reference_test_views.info.yml rename to core/modules/system/tests/modules/entity_reference_test_views/entity_reference_test_views.info.yml index 04fb33b..19678f8 100644 --- a/core/modules/entity_reference/tests/modules/entity_reference_test_views/entity_reference_test_views.info.yml +++ b/core/modules/system/tests/modules/entity_reference_test_views/entity_reference_test_views.info.yml @@ -5,5 +5,4 @@ package: Testing version: VERSION core: 8.x dependencies: - - entity_reference - views diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml similarity index 100% rename from core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml rename to core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_mul_view.yml diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml similarity index 100% rename from core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml rename to core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_entity_test_view.yml diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml similarity index 100% rename from core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml rename to core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_mul_view.yml diff --git a/core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml b/core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml similarity index 100% rename from core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml rename to core/modules/system/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_reverse_entity_test_view.yml diff --git a/core/modules/system/tests/modules/entity_test/entity_test.info.yml b/core/modules/system/tests/modules/entity_test/entity_test.info.yml index 8d3200c..bd4382e 100644 --- a/core/modules/system/tests/modules/entity_test/entity_test.info.yml +++ b/core/modules/system/tests/modules/entity_test/entity_test.info.yml @@ -7,4 +7,3 @@ core: 8.x dependencies: - field - text - - entity_reference diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php index b4e0baa..a1f0c5b 100644 --- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php +++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php @@ -48,7 +48,7 @@ public function testVocabularyFieldInstance() { $settings = $field->getSettings(); $this->assertIdentical('default:taxonomy_term', $settings['handler'], 'The handler plugin ID is correct.'); - $this->assertIdentical(['tags'], $settings['handler_settings']['target_bundles'], 'The target_bundle handler setting is correct.'); + $this->assertIdentical(['tags'], $settings['handler_settings']['target_bundles'], 'The target_bundles handler setting is correct.'); $this->assertIdentical(TRUE, $settings['handler_settings']['auto_create'], 'The "auto_create" setting is correct.'); $this->assertIdentical(array('node', 'article', 'tags'), Migration::load('d6_vocabulary_field_instance')->getIdMap()->lookupDestinationID(array(4, 'article'))); diff --git a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateNodeTaxonomyTest.php b/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateNodeTaxonomyTest.php index 8005d9c..8088c25 100644 --- a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateNodeTaxonomyTest.php +++ b/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateNodeTaxonomyTest.php @@ -21,7 +21,6 @@ class MigrateNodeTaxonomyTest extends MigrateDrupal7TestBase { public static $modules = array( 'datetime', - 'entity_reference', 'field', 'filter', 'image', diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php b/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php index c26ed2f..5202429 100644 --- a/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php +++ b/core/modules/taxonomy/src/Tests/TaxonomyTestBase.php @@ -7,7 +7,7 @@ namespace Drupal\taxonomy\Tests; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait ; use Drupal\simpletest\WebTestBase; /** diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php index 93f2f83..ef87848 100644 --- a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php +++ b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Tests; use Drupal\Core\Field\FieldStorageDefinitionInterface; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait; use Drupal\field\Entity\FieldStorageConfig; use Drupal\language\Entity\ConfigurableLanguage; diff --git a/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php b/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php index fc452ff..ec28677 100644 --- a/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php +++ b/core/modules/taxonomy/src/Tests/TermEntityReferenceTest.php @@ -22,7 +22,7 @@ class TermEntityReferenceTest extends TaxonomyTestBase { * * @var array */ - public static $modules = array('entity_reference', 'entity_reference_test', 'entity_test'); + public static $modules = ['entity_reference_test', 'entity_test']; /** * Tests an entity reference field restricted to a single vocabulary. diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php index 4ea9e32..394e0f5 100644 --- a/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php +++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php @@ -8,7 +8,7 @@ namespace Drupal\taxonomy\Tests\Views; use Drupal\Core\Field\FieldStorageDefinitionInterface; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait ; use Drupal\taxonomy\Entity\Term; use Drupal\taxonomy\Entity\Vocabulary; use Drupal\views\Tests\ViewTestData; @@ -36,7 +36,7 @@ class TaxonomyIndexTidUiTest extends UITestBase { * * @var array */ - public static $modules = array('node', 'taxonomy', 'taxonomy_test_views', 'entity_reference'); + public static $modules = ['node', 'taxonomy', 'taxonomy_test_views']; /** * A nested array of \Drupal\taxonomy\TermInterface objects. diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php index ae84b09..e079557 100644 --- a/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php +++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php @@ -9,7 +9,7 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Language\LanguageInterface; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait ; use Drupal\views\Tests\ViewTestBase; use Drupal\views\Tests\ViewTestData; diff --git a/core/modules/taxonomy/taxonomy.info.yml b/core/modules/taxonomy/taxonomy.info.yml index a54f7d1..ceca3dd 100644 --- a/core/modules/taxonomy/taxonomy.info.yml +++ b/core/modules/taxonomy/taxonomy.info.yml @@ -5,7 +5,6 @@ package: Core version: VERSION core: 8.x dependencies: - - entity_reference - node - text configure: entity.taxonomy_vocabulary.collection diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index daae443..a73f6fc 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -501,9 +501,12 @@ function taxonomy_build_node_index($node) { if ($status && $node->isDefaultRevision()) { // Collect a unique list of all the term IDs from all node fields. $tid_all = array(); + $entity_reference_class = 'Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem'; foreach ($node->getFieldDefinitions() as $field) { $field_name = $field->getName(); - if (is_subclass_of($field->getItemDefinition()->getClass(), '\Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem') && $field->getSetting('target_type') == 'taxonomy_term') { + $class = $field->getItemDefinition()->getClass(); + $is_entity_reference_class = ($class === $entity_reference_class) || is_subclass_of($class, $entity_reference_class); + if ($is_entity_reference_class && $field->getSetting('target_type') == 'taxonomy_term') { foreach ($node->getTranslationLanguages() as $language) { foreach ($node->getTranslation($language->getId())->$field_name as $item) { if (!$item->isEmpty()) { diff --git a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerNodeTest.php b/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerNodeTest.php index e6d18fd..521e74d 100644 --- a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerNodeTest.php +++ b/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerNodeTest.php @@ -21,7 +21,6 @@ class MigrateTrackerNodeTest extends MigrateDrupal7TestBase { * {@inheritdoc} */ public static $modules = [ - 'entity_reference', 'node', 'text', 'tracker', diff --git a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerUserTest.php b/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerUserTest.php index 3628b4c..a9b4a39 100644 --- a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerUserTest.php +++ b/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerUserTest.php @@ -21,7 +21,6 @@ class MigrateTrackerUserTest extends MigrateDrupal7TestBase { * {@inheritdoc} */ public static $modules = [ - 'entity_reference', 'node', 'text', 'tracker', diff --git a/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php b/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php index a1679cb..9c43f7e 100644 --- a/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php +++ b/core/modules/user/src/Plugin/EntityReferenceSelection/UserSelection.php @@ -120,7 +120,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta $form['filter']['settings'] = array( '#type' => 'container', '#attributes' => array('class' => array('entity_reference-settings')), - '#process' => array('_entity_reference_form_process_merge_parent'), + '#process' => array(array('\Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem', 'formProcessMergeParent')), ); if ($selection_handler_settings['filter']['type'] == 'role') { diff --git a/core/modules/user/src/Tests/UserEntityReferenceTest.php b/core/modules/user/src/Tests/UserEntityReferenceTest.php index 6c8bca8..65b92e5 100644 --- a/core/modules/user/src/Tests/UserEntityReferenceTest.php +++ b/core/modules/user/src/Tests/UserEntityReferenceTest.php @@ -7,7 +7,7 @@ namespace Drupal\user\Tests; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait; use Drupal\field\Entity\FieldConfig; use Drupal\system\Tests\Entity\EntityUnitTestBase; @@ -35,13 +35,6 @@ class UserEntityReferenceTest extends EntityUnitTestBase { protected $role2; /** - * Modules to enable. - * - * @var array - */ - public static $modules = array('entity_reference', 'user'); - - /** * {@inheritdoc} */ protected function setUp() { diff --git a/core/modules/views/config/schema/views.display.schema.yml b/core/modules/views/config/schema/views.display.schema.yml index d31678f..16b0d1d 100644 --- a/core/modules/views/config/schema/views.display.schema.yml +++ b/core/modules/views/config/schema/views.display.schema.yml @@ -127,3 +127,7 @@ views.display.attachment: render_pager: type: boolean label: 'Render pager' + +views.display.entity_reference: + type: views_display + label: 'Entity Reference' diff --git a/core/modules/views/config/schema/views.row.schema.yml b/core/modules/views/config/schema/views.row.schema.yml index 4378f0c..3eae0c9 100644 --- a/core/modules/views/config/schema/views.row.schema.yml +++ b/core/modules/views/config/schema/views.row.schema.yml @@ -85,3 +85,7 @@ views.row.opml_fields: url_field: type: string label: 'URL attribute' + +views.row.entity_reference: + type: views.row.fields + label: 'Entity Reference inline fields' diff --git a/core/modules/views/config/schema/views.style.schema.yml b/core/modules/views/config/schema/views.style.schema.yml index f819aeb..ad0571b 100644 --- a/core/modules/views/config/schema/views.style.schema.yml +++ b/core/modules/views/config/schema/views.style.schema.yml @@ -143,3 +143,14 @@ views.style.unformatted_summary: separator: type: string label: 'Separator' + +views.style.entity_reference: + type: views_style + label: 'Entity Reference list' + mapping: + search_fields: + type: sequence + label: 'Search fields' + sequence: + type: string + label: 'Search field' diff --git a/core/modules/entity_reference/src/Plugin/views/display/EntityReference.php b/core/modules/views/src/Plugin/views/display/EntityReference.php similarity index 96% rename from core/modules/entity_reference/src/Plugin/views/display/EntityReference.php rename to core/modules/views/src/Plugin/views/display/EntityReference.php index e55481c..cf4e915 100644 --- a/core/modules/entity_reference/src/Plugin/views/display/EntityReference.php +++ b/core/modules/views/src/Plugin/views/display/EntityReference.php @@ -2,12 +2,10 @@ /** * @file - * Contains \Drupal\entity_reference\Plugin\views\display\EntityReference. + * Contains \Drupal\views\Plugin\views\display\EntityReference. */ -namespace Drupal\entity_reference\Plugin\views\display; - -use Drupal\views\Plugin\views\display\DisplayPluginBase; +namespace Drupal\views\Plugin\views\display; /** * The plugin that handles an EntityReference display. diff --git a/core/modules/entity_reference/src/Plugin/views/row/EntityReference.php b/core/modules/views/src/Plugin/views/row/EntityReference.php similarity index 90% rename from core/modules/entity_reference/src/Plugin/views/row/EntityReference.php rename to core/modules/views/src/Plugin/views/row/EntityReference.php index 3323933..abed3c2 100644 --- a/core/modules/entity_reference/src/Plugin/views/row/EntityReference.php +++ b/core/modules/views/src/Plugin/views/row/EntityReference.php @@ -2,13 +2,12 @@ /** * @file - * Contains \Drupal\entity_reference\Plugin\views\row\EntityReference. + * Contains \Drupal\views\Plugin\views\row\EntityReference. */ -namespace Drupal\entity_reference\Plugin\views\row; +namespace Drupal\views\Plugin\views\row; use Drupal\Core\Form\FormStateInterface; -use Drupal\views\Plugin\views\row\Fields; /** * EntityReference row plugin. diff --git a/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php b/core/modules/views/src/Plugin/views/style/EntityReference.php similarity index 94% rename from core/modules/entity_reference/src/Plugin/views/style/EntityReference.php rename to core/modules/views/src/Plugin/views/style/EntityReference.php index 328d96e..a66b6b5 100644 --- a/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php +++ b/core/modules/views/src/Plugin/views/style/EntityReference.php @@ -2,14 +2,13 @@ /** * @file - * Contains \Drupal\entity_reference\Plugin\views\style\EntityReference. + * Contains \Drupal\views\Plugin\views\style\EntityReference. */ -namespace Drupal\entity_reference\Plugin\views\style; +namespace Drupal\views\Plugin\views\style; use Drupal\Component\Utility\Xss; use Drupal\Core\Form\FormStateInterface; -use Drupal\views\Plugin\views\style\StylePluginBase; /** * EntityReference style plugin. diff --git a/core/modules/views/src/Tests/DefaultViewsTest.php b/core/modules/views/src/Tests/DefaultViewsTest.php index 1a268cf..d8dfe0f 100644 --- a/core/modules/views/src/Tests/DefaultViewsTest.php +++ b/core/modules/views/src/Tests/DefaultViewsTest.php @@ -13,7 +13,7 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Url; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait ; use Drupal\views\Views; /** diff --git a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php index af045bf..f69444a 100644 --- a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php +++ b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php @@ -25,7 +25,7 @@ class RowEntityRenderersTest extends ViewKernelTestBase { * * @var array */ - public static $modules = array('field', 'filter', 'text', 'node', 'user', 'language', 'entity_reference', 'views_test_language'); + public static $modules = ['field', 'filter', 'text', 'node', 'user', 'language', 'views_test_language']; /** * Views used by this test. diff --git a/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php b/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php index e8a7c1b..5054c5c 100644 --- a/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php +++ b/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php @@ -32,7 +32,7 @@ class ViewEntityDependenciesTest extends ViewKernelTestBase { * * @var array */ - public static $modules = ['node', 'comment', 'user', 'field', 'text', 'entity_reference', 'search']; + public static $modules = ['node', 'comment', 'user', 'field', 'text', 'search']; /** * {@inheritdoc} diff --git a/core/modules/views/src/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php index 4859f2a..e4f17b5 100644 --- a/core/modules/views/src/Tests/ViewExecutableTest.php +++ b/core/modules/views/src/Tests/ViewExecutableTest.php @@ -35,7 +35,7 @@ class ViewExecutableTest extends ViewKernelTestBase { use CommentTestTrait; - public static $modules = array('system', 'node', 'comment', 'user', 'filter', 'field', 'text', 'entity_reference'); + public static $modules = ['system', 'node', 'comment', 'user', 'filter', 'field', 'text']; /** * Views used by this test. diff --git a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php index b9c58f7..931cd29 100644 --- a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php +++ b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php @@ -8,7 +8,7 @@ namespace Drupal\views\Tests\Wizard; use Drupal\Core\Field\FieldStorageDefinitionInterface; -use Drupal\entity_reference\Tests\EntityReferenceTestTrait; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait ; /** * Tests the ability of the views wizard to create views filtered by taxonomy. diff --git a/core/modules/views/views.views.inc b/core/modules/views/views.views.inc index 2216835..7b2b886 100644 --- a/core/modules/views/views.views.inc +++ b/core/modules/views/views.views.inc @@ -652,3 +652,80 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora return $data; } + +/** + * Implements hook_field_views_data(). + * + * The function implements the hook in behalf of 'core' because it adds a + * relationship and a reverse relationship to entity_reference field type, which + * is provided by core. + */ +function core_field_views_data(FieldStorageConfigInterface $field_storage) { + $data = views_field_default_views_data($field_storage); + + // The code below only deals with the Entity reference field type. + if ($field_storage->getType() != 'entity_reference') { + return $data; + } + + $entity_manager = \Drupal::entityManager(); + $entity_type_id = $field_storage->getTargetEntityTypeId(); + /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */ + $table_mapping = $entity_manager->getStorage($entity_type_id)->getTableMapping(); + + foreach ($data as $table_name => $table_data) { + // Add a relationship to the target entity type. + $target_entity_type_id = $field_storage->getSetting('target_type'); + $target_entity_type = $entity_manager->getDefinition($target_entity_type_id); + $entity_type_id = $field_storage->getTargetEntityTypeId(); + $entity_type = $entity_manager->getDefinition($entity_type_id); + $target_base_table = $target_entity_type->getDataTable() ?: $target_entity_type->getBaseTable(); + $field_name = $field_storage->getName(); + + // Provide a relationship for the entity type with the entity reference + // field. + $args = array( + '@label' => $target_entity_type->getLabel(), + '@field_name' => $field_name, + ); + $data[$table_name][$field_name]['relationship'] = array( + 'title' => t('@label referenced from @field_name', $args), + 'label' => t('@field_name: @label', $args), + 'group' => $entity_type->getLabel(), + 'help' => t('Appears in: @bundles.', array('@bundles' => implode(', ', $field_storage->getBundles()))), + 'id' => 'standard', + 'base' => $target_base_table, + 'entity type' => $target_entity_type_id, + 'base field' => $target_entity_type->getKey('id'), + 'relationship field' => $field_name . '_target_id', + ); + + // Provide a reverse relationship for the entity type that is referenced by + // the field. + $args['@entity'] = $entity_type->getLabel(); + $args['@label'] = $target_entity_type->getLowercaseLabel(); + $pseudo_field_name = 'reverse__' . $entity_type_id . '__' . $field_name; + $data[$target_base_table][$pseudo_field_name]['relationship'] = array( + 'title' => t('@entity using @field_name', $args), + 'label' => t('@field_name', array('@field_name' => $field_name)), + 'group' => $target_entity_type->getLabel(), + 'help' => t('Relate each @entity with a @field_name set to the @label.', $args), + 'id' => 'entity_reverse', + 'base' => $entity_type->getDataTable() ?: $entity_type->getBaseTable(), + 'entity_type' => $entity_type_id, + 'base field' => $entity_type->getKey('id'), + 'field_name' => $field_name, + 'field table' => $table_mapping->getDedicatedDataTableName($field_storage), + 'field field' => $field_name . '_target_id', + 'join_extra' => array( + array( + 'field' => 'deleted', + 'value' => 0, + 'numeric' => TRUE, + ), + ), + ); + } + + return $data; +} diff --git a/core/profiles/standard/config/install/field.field.node.article.field_tags.yml b/core/profiles/standard/config/install/field.field.node.article.field_tags.yml index 77eb70c..c49c64f 100644 --- a/core/profiles/standard/config/install/field.field.node.article.field_tags.yml +++ b/core/profiles/standard/config/install/field.field.node.article.field_tags.yml @@ -4,8 +4,6 @@ dependencies: config: - field.storage.node.field_tags - node.type.article - module: - - entity_reference id: node.article.field_tags field_name: field_tags entity_type: node diff --git a/core/profiles/standard/config/install/field.storage.node.field_tags.yml b/core/profiles/standard/config/install/field.storage.node.field_tags.yml index ca20381..767bca4 100644 --- a/core/profiles/standard/config/install/field.storage.node.field_tags.yml +++ b/core/profiles/standard/config/install/field.storage.node.field_tags.yml @@ -10,7 +10,7 @@ entity_type: node type: entity_reference settings: target_type: taxonomy_term -module: entity_reference +module: core locked: false cardinality: -1 translatable: true diff --git a/core/profiles/standard/standard.info.yml b/core/profiles/standard/standard.info.yml index 68fcba2..9851f9b 100644 --- a/core/profiles/standard/standard.info.yml +++ b/core/profiles/standard/standard.info.yml @@ -19,7 +19,6 @@ dependencies: - block_content - quickedit - editor - - entity_reference - help - image - menu_ui