diff core/modules/field/src/ConfigImporterFieldPurger.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

--- a/core/modules/field/src/ConfigImporterFieldPurger.php	Mon Apr 23 09:33:26 2018 +0100
+++ b/core/modules/field/src/ConfigImporterFieldPurger.php	Mon Apr 23 09:46:53 2018 +0100
@@ -39,7 +39,7 @@
         $field_storage->delete();
       }
     }
-    field_purge_batch($context['sandbox']['field']['purge_batch_size'], $field_storage->uuid());
+    field_purge_batch($context['sandbox']['field']['purge_batch_size'], $field_storage->getUniqueStorageIdentifier());
     $context['sandbox']['field']['current_progress']++;
     $fields_to_delete_count = count(static::getFieldStoragesToPurge($context['sandbox']['field']['extensions'], $config_importer->getUnprocessedConfiguration('delete')));
     if ($fields_to_delete_count == 0) {
@@ -133,11 +133,11 @@
     }
 
     // Gather deleted fields from modules that are being uninstalled.
-    /** @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;
       }
     }
     return $storages_to_delete;