diff -u b/core/modules/field/field.crud.inc b/core/modules/field/field.crud.inc --- b/core/modules/field/field.crud.inc +++ b/core/modules/field/field.crud.inc @@ -161,7 +161,7 @@ // Merge deleted fields (stored in state) if needed. if ($include_deleted) { - $deleted_fields = \Drupal::state()->get('field.field.deleted') ?: array(); + $deleted_fields = Drupal::state()->get('field.field.deleted') ?: array(); foreach ($deleted_fields as $id => $config) { $fields[$id] = entity_create('field_entity', $config); } @@ -360,7 +360,7 @@ // Merge deleted instances (stored in state) if needed. if ($include_deleted) { - $state = \Drupal::state(); + $state = Drupal::state(); $deleted_fields = $state->get('field.field.deleted'); $deleted_instances = $state->get('field.instance.deleted') ?: array(); foreach ($deleted_instances as $id => $config) { @@ -581,7 +581,7 @@ } // Retrieve all deleted fields. Any that have no instances can be purged. - $deleted_fields = \Drupal::state()->get('field.field.deleted') ?: array(); + $deleted_fields = Drupal::state()->get('field.field.deleted') ?: array(); foreach ($deleted_fields as $field) { $field = new Field($field); $instances = field_read_instances(array('field_id' => $field['uuid']), array('include_deleted' => 1)); @@ -635,7 +635,7 @@ $field = field_info_field_by_id($instance['field_id']); module_invoke($field['storage']['module'], 'field_storage_purge_instance', $instance); - $state = \Drupal::state(); + $state = Drupal::state(); $deleted_instances = $state->get('field.instance.deleted'); unset($deleted_instances[$instance['uuid']]); $state->set('field.instance.deleted', $deleted_instances); @@ -662,7 +662,7 @@ throw new FieldException(t('Attempt to purge a field @field_name that still has instances.', array('@field_name' => $field['field_name']))); } - $state = \Drupal::state(); + $state = Drupal::state(); $deleted_fields = $state->get('field.field.deleted'); unset($deleted_fields[$field['uuid']]); $state->set('field.field.deleted', $deleted_fields); diff -u b/core/modules/field/field.install b/core/modules/field/field.install --- b/core/modules/field/field.install +++ b/core/modules/field/field.install @@ -356,7 +356,7 @@ $uuid = new Uuid(); $manifest_ids = array('fields' => array(), 'instances' => array()); - $state = \Drupal::state(); + $state = Drupal::state(); $deleted_fields = $state->get('field.field.deleted') ?: array(); $deleted_instances = $state->get('field.instance.deleted') ?: array(); @@ -396,7 +396,7 @@ // Save in either config or state. if (!$record['deleted']) { - \Drupal::config('field.field.' . $config['id']) + Drupal::config('field.field.' . $config['id']) ->setData($config) ->save(); $manifest_ids['fields'][] = $config['id']; @@ -449,7 +449,7 @@ // Save in either config or state. if (!$record['deleted']) { - \Drupal::config('field.instance.' . $config['id']) + Drupal::config('field.instance.' . $config['id']) ->setData($config) ->save(); $manifest_ids['instances'][] = $config['id']; diff -u b/core/modules/field/field.module b/core/modules/field/field.module --- b/core/modules/field/field.module +++ b/core/modules/field/field.module @@ -530,13 +530,13 @@ * Refreshes the 'active' and 'storage[active]' values for fields. */ function field_sync_field_status() { - $module_handler = \Drupal::moduleHandler(); - $state = \Drupal::state(); + $module_handler = Drupal::moduleHandler(); + $state = Drupal::state(); // Get both deleted and non-deleted field definitions. $fields = array(); foreach (config_get_storage_names_with_prefix('field.field') as $name) { - $field = \Drupal::config($name)->get(); + $field = Drupal::config($name)->get(); $fields[$field['uuid']] = $field; } $deleted_fields = $state->get('field.field.deleted') ?: array(); @@ -591,7 +591,7 @@ $deleted_fields[$uuid] = $field; } else { - \Drupal::config('field.field.' . $field['id']) + Drupal::config('field.field.' . $field['id']) ->set('module', $field['module']) ->set('active', $field['active']) ->set('storage.module', $field['storage']['module']) diff -u b/core/modules/field_sql_storage/field_sql_storage.install b/core/modules/field_sql_storage/field_sql_storage.install --- b/core/modules/field_sql_storage/field_sql_storage.install +++ b/core/modules/field_sql_storage/field_sql_storage.install @@ -20,7 +20,7 @@ foreach (config_get_storage_names_with_prefix('field.field') as $name) { $fields[] = config($name)->get(); } - $deleted_fields = \Drupal::state()->get('field.field.deleted') ?: array(); + $deleted_fields = Drupal::state()->get('field.field.deleted') ?: array(); $fields = array_merge($fields, $deleted_fields); foreach ($fields as $field) { @@ -105,7 +105,7 @@ function field_sql_storage_update_8000(&$sandbox) { // Get field definitions from config, and deleted fields from state(). $config_names = config_get_storage_names_with_prefix('field.field'); - $deleted_fields = \Drupal::state()->get('field.field.deleted') ?: array(); + $deleted_fields = Drupal::state()->get('field.field.deleted') ?: array(); // Ditch UUID keys, we will iterate through deleted fields using a numeric // index. $deleted_fields = array_values($deleted_fields);