- /** @var \Drupal\field\FieldStorageConfigInterface[] $field_storages */
- $field_storages = entity_load_multiple_by_properties('field_storage_config', ['deleted' => TRUE, 'include_deleted' => TRUE]);
- foreach ($field_storages as $field_storage) {
- if (!in_array($field_storage->getTypeProvider(), $providers)) {
- $storages_to_delete[$field_storage->id()] = $field_storage;
+ /** @var \Drupal\field\FieldStorageConfigInterface[] $deleted_storage_definitions */
+ $deleted_storage_definitions = \Drupal::service('entity_field.deleted_fields_repository')->getFieldStorageDefinitions();
+ foreach ($deleted_storage_definitions as $field_storage_definition) {
+ if ($field_storage_definition instanceof FieldStorageConfigInterface && !in_array($field_storage_definition->getTypeProvider(), $providers)) {
+ $storages_to_delete[$field_storage_definition->id()] = $field_storage_definition;