Add @trigger_error() to deprecated EntityManager->EntityFieldManager methods

looking on replaced usage in field tests I think it makes sense to provide protected EFM property to not abuse container and \Drupal instead of now "mostly unused" $this->entityTypeManager property

1. +++ b/core/modules/content_translation/content_translation.admin.inc
   @@ -95,11 +95,13 @@ function _content_translation_form_language_content_settings_form_alter(array &$
   -  $entity_manager = Drupal::entityManager();
   +  $entity_type_manager = Drupal::entityTypeManager();
   

   needs \

2. +++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
   @@ -171,9 +171,9 @@ public function testSettingsUI() {
   -      \Drupal::entityManager()->clearCachedFieldDefinitions();
   +      \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
   ...
   -      $definitions = \Drupal::entityManager()->getFieldDefinitions('node', 'article');
   +      $definitions = \Drupal::service('entity_field.manager')->getFieldDefinitions('node', 'article');
   

   could use local var

3. +++ b/core/modules/file/file.module
   @@ -1726,7 +1726,7 @@ function file_get_file_references(FileInterface $file, FieldDefinitionInterface
        foreach ($return as $field_name => $data) {
          foreach (array_keys($data) as $entity_type_id) {
   -        $field_storage_definitions = \Drupal::entityManager()->getFieldStorageDefinitions($entity_type_id);
   +        $field_storage_definitions = \Drupal::service('entity_field.manager')->getFieldStorageDefinitions($entity_type_id);
   

   makes sense to move local var out of loop

4. +++ b/core/modules/system/tests/src/Functional/Entity/Traits/EntityDefinitionTestTrait.php
   @@ -364,7 +364,7 @@ protected function getUpdatedEntityTypeDefinition($revisionable = FALSE, $transl
   -    $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions('entity_test_update');
   +    $field_storage_definitions = \Drupal::service('entity_field.manager')->getFieldStorageDefinitions('entity_test_update');
   

   is there a way to inject it?

5. +++ b/core/modules/views/src/FieldAPIHandlerTrait.php
   @@ -23,6 +23,13 @@
   +  protected $entityFieldManager;
   
   @@ -52,7 +59,7 @@ protected function getFieldDefinition() {
      protected function getFieldStorageDefinition() {
        if (!$this->fieldStorageDefinition) {
   -      $field_storage_definitions = $this->getEntityManager()->getFieldStorageDefinitions($this->definition['entity_type']);
   +      $field_storage_definitions = $this->getEntityFieldManager()->getFieldStorageDefinitions($this->definition['entity_type']);
   
   @@ -71,4 +78,17 @@ protected function getEntityManager() {
   +  protected function getEntityFieldManager() {
   +    if (!isset($this->entityFieldManager)) {
   +      $this->entityFieldManager = \Drupal::service('entity_field.manager');
   

   probably private visibility better?

6. +++ b/core/modules/views/views.views.inc
   @@ -257,7 +257,7 @@ function views_entity_field_label($entity_type, $field_name) {
      // Count the amount of fields per label per field storage.
      foreach (array_keys(\Drupal::service('entity_type.bundle.info')->getBundleInfo($entity_type)) as $bundle) {
   -    $bundle_fields = array_filter(\Drupal::entityManager()->getFieldDefinitions($entity_type, $bundle), function ($field_definition) {
   +    $bundle_fields = array_filter(\Drupal::service('entity_field.manager')->getFieldDefinitions($entity_type, $bundle), function ($field_definition) {
   

   makes sense to use local var and move out of loop

7. +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php
   @@ -298,7 +298,7 @@ public function testModifyingTranslatableColumnSchema() {
        foreach ($fields as $field_name) {
   -      $original_definition = $this->entityManager->getBaseFieldDefinitions('entity_test')[$field_name];
   +      $original_definition = \Drupal::service('entity_field.manager')->getBaseFieldDefinitions('entity_test')[$field_name];
   
   +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
   @@ -712,11 +712,11 @@ public function testFieldDefinitions() {
        foreach ($translatable_fields as $name => $translatable) {
          $this->state->set('entity_test.field_definitions.translatable', [$name => $translatable]);
   -      $this->entityManager->clearCachedFieldDefinitions();
   +      \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
          $message = format_string('Field %field cannot be translatable.', ['%field' => $name]);
    
          try {
   -        $this->entityManager->getBaseFieldDefinitions($entity_type);
   +        \Drupal::service('entity_field.manager')->getBaseFieldDefinitions($entity_type);
   

   looks local var makes sense here as well

Patch rerolled. Solving merge problems. File FileFieldWidgetTest.php move to new path in 8.7.x

It has collision with #2897015: EntityManager class/method @deprecation is incomplete but is more complete, as I checked few references in `@see` needs updates

Fixes

Looks polished

+++ b/core/modules/views/src/FieldAPIHandlerTrait.php
@@ -71,4 +78,17 @@ protected function getEntityManager() {
+   * Returns the entity manager.
...
+   *   The entity manager service.

nit: this isn't really true

Committed a98b587 and pushed to 8.8.x. Thanks!

Hi everyone,

Do you know why this is causing the following error on custom entity types extending EntityViewsData:

PHP Fatal error: Uncaught Error: Call to a member function getBaseFieldDefinitions() on null in /app/webroot/core/modules/views/src/EntityViewsData.php:287

Looks like the entity_field.manager service in not injected for the custom entity type.

Should be fixed by #3081176: \Drupal\views\EntityViewsData is missing constructor BC for entity field manager