Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / field_layout / field_layout.module

diff --git a/web/core/modules/field_layout/field_layout.module b/web/core/modules/field_layout/field_layout.module
index 5a5fa11a49bd1209d929037e292cd2891951c3e1..713e7e4aac9bbbf4c87231a23a06bb67a7f8d6f3 100644 (file)
--- a/web/core/modules/field_layout/field_layout.module
+++ b/web/core/modules/field_layout/field_layout.module
@@ -50,8 +50,7 @@ function field_layout_entity_type_alter(array &$entity_types) {
  */
 function field_layout_entity_view_alter(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display) {
   if ($display instanceof EntityDisplayWithLayoutInterface) {
-    \Drupal::classResolver()->getInstanceFromDefinition(FieldLayoutBuilder::class)
-      ->buildView($build, $display);
+    \Drupal::classResolver(FieldLayoutBuilder::class)->buildView($build, $display);
   }
 }
 
@@ -62,8 +61,7 @@ function field_layout_form_alter(&$form, FormStateInterface $form_state, $form_i
   $form_object = $form_state->getFormObject();
   if ($form_object instanceof ContentEntityFormInterface && $display = $form_object->getFormDisplay($form_state)) {
     if ($display instanceof EntityDisplayWithLayoutInterface) {
-      \Drupal::classResolver()->getInstanceFromDefinition(FieldLayoutBuilder::class)
-        ->buildForm($form, $display);
+      \Drupal::classResolver(FieldLayoutBuilder::class)->buildForm($form, $display);
     }
   }
 }