From b01dfcd240895959567854abb10b4acee9436819 Mon Sep 17 00:00:00 2001
From: mark_fullmer <mfullmer@gmail.com>
Date: Wed, 2 Apr 2025 14:00:28 -0700
Subject: [PATCH] Replay Drupal 11 compatibility
---
.../workflow_buttons_trash/workflow_buttons_trash.info.yml | 2 +-
workflow_buttons.info.yml | 2 +-
workflow_buttons.module | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/workflow_buttons_trash/workflow_buttons_trash.info.yml b/modules/workflow_buttons_trash/workflow_buttons_trash.info.yml
index 2da6dea..d8d41fb 100755
--- a/modules/workflow_buttons_trash/workflow_buttons_trash.info.yml
+++ b/modules/workflow_buttons_trash/workflow_buttons_trash.info.yml
@@ -1,7 +1,7 @@
name: Trash workflow
type: module
description: "Provides a trash (soft-delete) workflow which works well with (but does not require) Workflow buttons."
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9 || ^10 || ^11
dependencies:
- drupal:workflows
diff --git a/workflow_buttons.info.yml b/workflow_buttons.info.yml
index c65d147..81c0801 100755
--- a/workflow_buttons.info.yml
+++ b/workflow_buttons.info.yml
@@ -1,7 +1,7 @@
name: Workflow buttons
type: module
description: 'Provide workflow buttons for content moderation instead of a select dropdown of states.'
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9 || ^10 || ^11
configure: workflow_buttons.settings
dependencies:
diff --git a/workflow_buttons.module b/workflow_buttons.module
index c94f940..a0d856c 100755
--- a/workflow_buttons.module
+++ b/workflow_buttons.module
@@ -10,9 +10,9 @@ use Drupal\content_moderation\Plugin\Field\ModerationStateFieldItemList;
use Drupal\Core\Entity\ContentEntityForm;
use Drupal\Core\Entity\ContentEntityType;
use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityFormBuilderInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Form\FormBuilder;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -114,7 +114,7 @@ function workflow_buttons_entity_view(array &$build, EntityInterface $entity, En
];
/* @var \Drupal\Core\Form\FormBuilder $form_builder */
$form_builder = \Drupal::service('entity.form_builder');
- assert($form_builder instanceof FormBuilder);
+ assert($form_builder instanceof EntityFormBuilderInterface);
try {
$form = $form_builder->getForm($entity, 'default', $form_state_additions);
}
--
GitLab