Merge pull request #909 from UN-OCHA/berliner/HPC-9386

HPC-9386: Fix issue with how controller is called, suit to changes in Drupal 10.2

Author: berliner

html/modules/custom/ghi_subpages/src/LayoutBuilder/LogframeRebuildForm.php

@@ -196,9 +196,8 @@ protected function successfulAjaxSubmit(array $form, FormStateInterface $form_st
       $response->addCommand(new RedirectCommand($entity_url->toString()));
     }
     else {
-      /** @var \Drupal\layout_builder_ipe\Controller\EntityEditController $entity_edit_controller */
-      $entity_edit_controller = $this->controllerResolver->getControllerFromDefinition(EntityEditController::class);
-      $response = $entity_edit_controller->edit($form_state->get('section_storage'));
+      $callable = $this->controllerResolver->getControllerFromDefinition(EntityEditController::class . '::edit');
+      $response = $callable($form_state->get('section_storage'));
       $response->addCommand(new CloseDialogCommand('#layout-builder-modal'));
     }
     return $response;

html/modules/custom/ghi_templates/src/LayoutBuilder/ImportPageConfigForm.php

@@ -314,9 +314,8 @@ protected function successfulAjaxSubmit(array $form, FormStateInterface $form_st
       $response->addCommand(new RedirectCommand($entity_url->toString()));
     }
     else {
-      /** @var \Drupal\layout_builder_ipe\Controller\EntityEditController $entity_edit_controller */
-      $entity_edit_controller = $this->controllerResolver->getControllerFromDefinition(EntityEditController::class);
-      $response = $entity_edit_controller->edit($form_state->get('section_storage'));
+      $callable = $this->controllerResolver->getControllerFromDefinition(EntityEditController::class . '::edit');
+      $response = $callable($form_state->get('section_storage'));
       $response->addCommand(new CloseDialogCommand('#layout-builder-modal'));
     }
     return $response;