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

[yaffs-website] / web / core / modules / content_moderation / src / Plugin / Action / ModerationOptOutPublish.php

diff --git a/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublish.php b/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublish.php
index 6a707e852fdcb844e50e1b650bc8a06ce15997b7..1311bdb2f3fd3fbaef4462a7cdc5ac0e9fcbbdc4 100644 (file)
--- a/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublish.php
+++ b/web/core/modules/content_moderation/src/Plugin/Action/ModerationOptOutPublish.php
@@ -6,6 +6,7 @@ use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Action\Plugin\Action\PublishAction;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\content_moderation\ModerationInformationInterface;
@@ -32,6 +33,13 @@ class ModerationOptOutPublish extends PublishAction implements ContainerFactoryP
    */
   protected $bundleInfo;
 
+  /**
+   * Messenger service.
+   *
+   * @var \Drupal\Core\Messenger\MessengerInterface
+   */
+  protected $messenger;
+
   /**
    * ModerationOptOutPublish constructor.
    *
@@ -47,11 +55,14 @@ class ModerationOptOutPublish extends PublishAction implements ContainerFactoryP
    *   The moderation information service.
    * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $bundle_info
    *   Bundle info service.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   Messenger service.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, ModerationInformationInterface $moderation_info, EntityTypeBundleInfoInterface $bundle_info) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, ModerationInformationInterface $moderation_info, EntityTypeBundleInfoInterface $bundle_info, MessengerInterface $messenger) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager);
     $this->moderationInfo = $moderation_info;
     $this->bundleInfo = $bundle_info;
+    $this->messenger = $messenger;
   }
 
   /**
@@ -62,7 +73,8 @@ class ModerationOptOutPublish extends PublishAction implements ContainerFactoryP
       $configuration, $plugin_id, $plugin_definition,
       $container->get('entity_type.manager'),
       $container->get('content_moderation.moderation_information'),
-      $container->get('entity_type.bundle.info')
+      $container->get('entity_type.bundle.info'),
+      $container->get('messenger')
     );
   }
 
@@ -74,8 +86,11 @@ class ModerationOptOutPublish extends PublishAction implements ContainerFactoryP
     if ($entity && $this->moderationInfo->isModeratedEntity($entity)) {
       $bundle_info = $this->bundleInfo->getBundleInfo($entity->getEntityTypeId());
       $bundle_label = $bundle_info[$entity->bundle()]['label'];
-      drupal_set_message($this->t("@bundle @label were skipped as they are under moderation and may not be directly published.", ['@bundle' => $bundle_label, '@label' => $entity->getEntityType()->getPluralLabel()]), 'warning');
-      $result = AccessResult::forbidden();
+      $this->messenger->addWarning($this->t("@bundle @label were skipped as they are under moderation and may not be directly published.", [
+        '@bundle' => $bundle_label,
+        '@label' => $entity->getEntityType()->getPluralLabel(),
+      ]));
+      $result = AccessResult::forbidden('Cannot directly publish moderated entities.');
       return $return_as_object ? $result : $result->isAllowed();
     }
     return parent::access($entity, $account, $return_as_object);