From 5fca5feeddac32b856c00e250e0ae4744343b0ee Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 26 Jan 2020 09:52:52 +0000
Subject: [PATCH] Issue #3108851 by JeroenT, Berdir, Wim Leers: Remove
 deprecated node.module action plugins and leftovers

---
 .../node/config/schema/node.schema.yml        | 24 -------------
 .../node/src/NodeAccessControlHandler.php     |  8 -----
 .../src/NodeAccessControlHandlerInterface.php | 21 ------------
 .../node/src/Plugin/Action/DeleteNode.php     | 34 -------------------
 .../node/src/Plugin/Action/PublishNode.php    | 33 ------------------
 .../node/src/Plugin/Action/SaveNode.php       | 34 -------------------
 .../node/src/Plugin/Action/UnpublishNode.php  | 33 ------------------
 7 files changed, 187 deletions(-)
 delete mode 100644 core/modules/node/src/Plugin/Action/DeleteNode.php
 delete mode 100644 core/modules/node/src/Plugin/Action/PublishNode.php
 delete mode 100644 core/modules/node/src/Plugin/Action/SaveNode.php
 delete mode 100644 core/modules/node/src/Plugin/Action/UnpublishNode.php

diff --git a/core/modules/node/config/schema/node.schema.yml b/core/modules/node/config/schema/node.schema.yml
index 2a831d7678d..862a39651a2 100644
--- a/core/modules/node/config/schema/node.schema.yml
+++ b/core/modules/node/config/schema/node.schema.yml
@@ -63,30 +63,6 @@ action.configuration.node_promote_action:
   type: action_configuration_default
   label: 'Promote selected content from front page configuration'
 
-# @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
-# @see https://www.drupal.org/node/2919303
-action.configuration.node_publish_action:
-  type: action_configuration_default
-  label: 'Publish selected content configuration'
-
-# @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
-# @see https://www.drupal.org/node/2919303
-action.configuration.node_unpublish_action:
-  type: action_configuration_default
-  label: 'Unpublish selected content configuration'
-
-# @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.0.
-# @see https://www.drupal.org/node/2919303
-action.configuration.node_save_action:
-  type: action_configuration_default
-  label: 'Save content configuration'
-
-# @deprecated in Drupal 8.6.x, to be removed before Drupal 9.0.0.
-# @see https://www.drupal.org/node/2934349
-action.configuration.node_delete_action:
-  type: action_configuration_default
-  label: 'Delete content configuration'
-
 action.configuration.node_make_sticky_action:
   type: action_configuration_default
   label: 'Make selected content sticky configuration'
diff --git a/core/modules/node/src/NodeAccessControlHandler.php b/core/modules/node/src/NodeAccessControlHandler.php
index b742f9c052c..3c2e8190bf1 100644
--- a/core/modules/node/src/NodeAccessControlHandler.php
+++ b/core/modules/node/src/NodeAccessControlHandler.php
@@ -156,14 +156,6 @@ class NodeAccessControlHandler extends EntityAccessControlHandler implements Nod
     return $grants;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function writeGrants(NodeInterface $node, $delete = TRUE) {
-    $grants = $this->acquireGrants($node);
-    $this->grantStorage->write($node, $grants, NULL, $delete);
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/node/src/NodeAccessControlHandlerInterface.php b/core/modules/node/src/NodeAccessControlHandlerInterface.php
index 4cf84d7a7a1..588391394ee 100644
--- a/core/modules/node/src/NodeAccessControlHandlerInterface.php
+++ b/core/modules/node/src/NodeAccessControlHandlerInterface.php
@@ -28,27 +28,6 @@ interface NodeAccessControlHandlerInterface {
    */
   public function acquireGrants(NodeInterface $node);
 
-  /**
-   * Writes a list of grants to the database, deleting any previously saved ones.
-   *
-   * Modules that use node access can use this function when doing mass updates
-   * due to widespread permission changes.
-   *
-   * Note: Don't call this function directly from a contributed module. Call
-   * \Drupal\node\NodeAccessControlHandlerInterface::acquireGrants() instead.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node whose grants are being written.
-   * @param $delete
-   *   (optional) If false, does not delete records. This is only for optimization
-   *   purposes, and assumes the caller has already performed a mass delete of
-   *   some form. Defaults to TRUE.
-   *
-   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
-   *   Use \Drupal\node\NodeAccessControlHandlerInterface::acquireGrants().
-   */
-  public function writeGrants(NodeInterface $node, $delete = TRUE);
-
   /**
    * Creates the default node access grant entry on the grant storage.
    */
diff --git a/core/modules/node/src/Plugin/Action/DeleteNode.php b/core/modules/node/src/Plugin/Action/DeleteNode.php
deleted file mode 100644
index 0213ccf51b3..00000000000
--- a/core/modules/node/src/Plugin/Action/DeleteNode.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\node\Plugin\Action;
-
-use Drupal\Core\Action\Plugin\Action\DeleteAction;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\TempStore\PrivateTempStoreFactory;
-
-/**
- * Redirects to a node deletion form.
- *
- * @deprecated in drupal:8.6.0 and is removed from drupal:9.0.0.
- *   Use \Drupal\Core\Action\Plugin\Action\DeleteAction instead.
- *
- * @see \Drupal\Core\Action\Plugin\Action\DeleteAction
- * @see https://www.drupal.org/node/2934349
- *
- * @Action(
- *   id = "node_delete_action",
- *   label = @Translation("Delete content")
- * )
- */
-class DeleteNode extends DeleteAction {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, PrivateTempStoreFactory $temp_store_factory, AccountInterface $current_user) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $temp_store_factory, $current_user);
-    @trigger_error(__NAMESPACE__ . '\DeleteNode is deprecated in Drupal 8.6.x, will be removed before Drupal 9.0.0. Use \Drupal\Core\Action\Plugin\Action\DeleteAction instead. See https://www.drupal.org/node/2934349.', E_USER_DEPRECATED);
-  }
-
-}
diff --git a/core/modules/node/src/Plugin/Action/PublishNode.php b/core/modules/node/src/Plugin/Action/PublishNode.php
deleted file mode 100644
index 6e522297661..00000000000
--- a/core/modules/node/src/Plugin/Action/PublishNode.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\node\Plugin\Action;
-
-use Drupal\Core\Action\Plugin\Action\PublishAction;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-
-/**
- * Publishes a node.
- *
- * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
- *   Use \Drupal\Core\Action\Plugin\Action\PublishAction instead.
- *
- * @see \Drupal\Core\Action\Plugin\Action\PublishAction
- * @see https://www.drupal.org/node/2919303
- *
- * @Action(
- *   id = "node_publish_action",
- *   label = @Translation("Publish selected content"),
- *   type = "node"
- * )
- */
-class PublishNode extends PublishAction {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct($configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager);
-    @trigger_error(__NAMESPACE__ . '\PublishNode is deprecated in Drupal 8.5.x, will be removed before Drupal 9.0.0. Use \Drupal\Core\Action\Plugin\Action\PublishAction instead. See https://www.drupal.org/node/2919303.', E_USER_DEPRECATED);
-  }
-
-}
diff --git a/core/modules/node/src/Plugin/Action/SaveNode.php b/core/modules/node/src/Plugin/Action/SaveNode.php
deleted file mode 100644
index f321c91278c..00000000000
--- a/core/modules/node/src/Plugin/Action/SaveNode.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\node\Plugin\Action;
-
-use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Core\Action\Plugin\Action\SaveAction;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-
-/**
- * Provides an action that can save any entity.
- *
- * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
- *   Use \Drupal\Core\Action\Plugin\Action\SaveAction instead.
- *
- * @see \Drupal\Core\Action\Plugin\Action\SaveAction
- * @see https://www.drupal.org/node/2919303
- *
- * @Action(
- *   id = "node_save_action",
- *   label = @Translation("Save content"),
- *   type = "node"
- * )
- */
-class SaveNode extends SaveAction {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct($configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, TimeInterface $time) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $time);
-    @trigger_error(__NAMESPACE__ . '\SaveNode is deprecated in Drupal 8.5.x, will be removed before Drupal 9.0.0. Use \Drupal\Core\Action\Plugin\Action\SaveAction instead. See https://www.drupal.org/node/2919303.', E_USER_DEPRECATED);
-  }
-
-}
diff --git a/core/modules/node/src/Plugin/Action/UnpublishNode.php b/core/modules/node/src/Plugin/Action/UnpublishNode.php
deleted file mode 100644
index 7f4cdd8d7a8..00000000000
--- a/core/modules/node/src/Plugin/Action/UnpublishNode.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\node\Plugin\Action;
-
-use Drupal\Core\Action\Plugin\Action\UnpublishAction;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-
-/**
- * Unpublishes a node.
- *
- * @deprecated in drupal:8.5.0 and is removed from drupal:9.0.0.
- *   Use \Drupal\Core\Action\Plugin\Action\UnpublishAction instead.
- *
- * @see \Drupal\Core\Action\Plugin\Action\UnpublishAction
- * @see https://www.drupal.org/node/2919303
- *
- * @Action(
- *   id = "node_unpublish_action",
- *   label = @Translation("Unpublish selected content"),
- *   type = "node"
- * )
- */
-class UnpublishNode extends UnpublishAction {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct($configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager);
-    @trigger_error(__NAMESPACE__ . '\UnpublishNode is deprecated in Drupal 8.5.x, will be removed before Drupal 9.0.0. Use \Drupal\Core\Action\Plugin\Action\UnpublishAction instead. See https://www.drupal.org/node/2919303.', E_USER_DEPRECATED);
-  }
-
-}