Issue #3261251 by ravi.shankar, andypost, longwave, daffie: Remove deprecated node module functions (0c65c059) · Commits · project / drupal

core/includes/bootstrap.inc

+0 −4

Original line number	Diff line number	Diff line
		@@ -476,10 +476,6 @@ function drupal_static_reset($name = NULL) {
		@trigger_error("Calling drupal_static_reset() with 'taxonomy_vocabulary_get_names' as argument is deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. There is no replacement for this usage. See https://www.drupal.org/node/3039041", E_USER_DEPRECATED);
		break;

		case 'node_mark':
		@trigger_error("Calling drupal_static_reset() with 'node_mark' as argument is deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. There is no replacement for this usage. See https://www.drupal.org/node/3037203", E_USER_DEPRECATED);
		break;

		case 'Drupal\book\BookManager::bookSubtreeData':
		case 'Drupal\book\BookManager::bookTreeAllData':
		case 'Drupal\book\BookManager::doBookTreeBuild':

core/modules/node/config/schema/node.schema.yml

+0 −9

Original line number	Diff line number	Diff line
		@@ -89,12 +89,3 @@ block.settings.node_syndicate_block:
		block_count:
		type: integer
		label: 'Block count'

		condition.plugin.node_type:
		deprecated: "The 'condition.plugin.node_type' config schema is deprecated in drupal:9.3.0 and is removed from drupal 10.0.0. Use the 'entity_bundle:node_type' key instead to define a node type condition. See https://www.drupal.org/node/2983299."
		type: condition.plugin
		mapping:
		bundles:
		type: sequence
		sequence:
		type: string

core/modules/node/node.services.yml

+0 −12

Original line number	Diff line number	Diff line
		@@ -8,18 +8,6 @@ services:
		arguments: ['@database', '@module_handler', '@language_manager']
		tags:
		- { name: backend_overridable }
		access_check.node.revision:
		class: Drupal\node\Access\NodeRevisionAccessCheck
		arguments: ['@entity_type.manager']
		tags:
		- { name: access_check, applies_to: _access_node_revision }
		deprecated: The "%service_id%" service is deprecated. You should use the 'access_check.entity' service instead. See https://www.drupal.org/node/3161210
		access_check.node.add:
		class: Drupal\node\Access\NodeAddAccessCheck
		arguments: ['@entity_type.manager']
		deprecated: The "%service_id%" service is deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. Use _entity_create_access or _entity_create_any_access access checks instead. See https://www.drupal.org/node/2836069
		tags:
		- { name: access_check, applies_to: _node_add_access }
		access_check.node.preview:
		class: Drupal\node\Access\NodePreviewAccessCheck
		arguments: ['@entity_type.manager']

core/modules/node/src/Access/NodeAddAccessCheck.php

deleted100644 → 0

+0 −72

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\node\Access;

		use Drupal\Core\Access\AccessResult;
		use Drupal\Core\Entity\EntityTypeManagerInterface;
		use Drupal\Core\Routing\Access\AccessInterface;
		use Drupal\Core\Session\AccountInterface;
		use Drupal\node\NodeTypeInterface;

		/**
		* Determines access to for node add pages.
		*
		* @ingroup node_access
		*
		* @deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. Use
		* _entity_create_access or _entity_create_any_access access checks instead.
		*
		* @see https://www.drupal.org/node/2836069
		*/
		class NodeAddAccessCheck implements AccessInterface {

		/**
		* The entity type manager.
		*
		* @var \Drupal\Core\Entity\EntityTypeManagerInterface
		*/
		protected $entityTypeManager;

		/**
		* Constructs an EntityCreateAccessCheck object.
		*
		* @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
		* The entity type manager.
		*/
		public function __construct(EntityTypeManagerInterface $entity_type_manager) {
		$this->entityTypeManager = $entity_type_manager;
		}

		/**
		* Checks access to the node add page for the node type.
		*
		* @param \Drupal\Core\Session\AccountInterface $account
		* The currently logged in account.
		* @param \Drupal\node\NodeTypeInterface $node_type
		* (optional) The node type. If not specified, access is allowed if there
		* exists at least one node type for which the user may create a node.
		*
		* @return \Drupal\Core\Access\AccessResultInterface
		* The access result.
		*/
		public function access(AccountInterface $account, NodeTypeInterface $node_type = NULL) {
		$access_control_handler = $this->entityTypeManager->getAccessControlHandler('node');
		// If checking whether a node of a particular type may be created.
		if ($account->hasPermission('administer content types')) {
		return AccessResult::allowed()->cachePerPermissions();
		}
		if ($node_type) {
		return $access_control_handler->createAccess($node_type->id(), $account, [], TRUE);
		}
		// If checking whether a node of any type may be created.
		foreach ($this->entityTypeManager->getStorage('node_type')->loadMultiple() as $node_type) {
		if (($access = $access_control_handler->createAccess($node_type->id(), $account, [], TRUE)) && $access->isAllowed()) {
		return $access;
		}
		}

		// No opinion.
		return AccessResult::neutral();
		}

		}

core/modules/node/src/Access/NodeRevisionAccessCheck.php

deleted100644 → 0

+0 −92

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\node\Access;

		use Drupal\Core\Access\AccessResult;
		use Drupal\Core\Entity\EntityTypeManagerInterface;
		use Drupal\Core\Routing\Access\AccessInterface;
		use Drupal\Core\Session\AccountInterface;
		use Drupal\node\NodeInterface;
		use Symfony\Component\Routing\Route;

		/**
		* Provides an access checker for node revisions.
		*
		* @ingroup node_access
		*/
		class NodeRevisionAccessCheck implements AccessInterface {

		/**
		* The node storage.
		*
		* @var \Drupal\node\NodeStorageInterface
		*/
		protected $nodeStorage;

		/**
		* Constructs a new NodeRevisionAccessCheck.
		*
		* @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
		* The entity type manager.
		*/
		public function __construct(EntityTypeManagerInterface $entity_type_manager) {
		@trigger_error('NodeRevisionAccessCheck is deprecated in drupal:9.3.0 and will be removed before drupal:10.0.0. Use "_entity_access" requirement with relevant operation instead. See https://www.drupal.org/node/3161210', E_USER_DEPRECATED);

		$this->nodeStorage = $entity_type_manager->getStorage('node');
		}

		/**
		* Checks routing access for the node revision.
		*
		* @param \Symfony\Component\Routing\Route $route
		* The route to check against.
		* @param \Drupal\Core\Session\AccountInterface $account
		* The currently logged in account.
		* @param int $node_revision
		* (optional) The node revision ID. If not specified, but $node is, access
		* is checked for that object's revision.
		* @param \Drupal\node\NodeInterface $node
		* (optional) A node object. Used for checking access to a node's default
		* revision when $node_revision is unspecified. Ignored when $node_revision
		* is specified. If neither $node_revision nor $node are specified, then
		* access is denied.
		*
		* @return \Drupal\Core\Access\AccessResultInterface
		* The access result.
		*/
		public function access(Route $route, AccountInterface $account, $node_revision = NULL, NodeInterface $node = NULL) {
		if ($node_revision) {
		$node = $this->nodeStorage->loadRevision($node_revision);
		}
		$operation = $route->getRequirement('_access_node_revision');
		return AccessResult::allowedIf($node && $this->checkAccess($node, $account, $operation))->cachePerPermissions()->addCacheableDependency($node);
		}

		/**
		* Checks node revision access.
		*
		* @param \Drupal\node\NodeInterface $node
		* The node to check.
		* @param \Drupal\Core\Session\AccountInterface $account
		* A user object representing the user for whom the operation is to be
		* performed.
		* @param string $op
		* (optional) The specific operation being checked. Defaults to 'view.'
		*
		* @return bool
		* TRUE if the operation may be performed, FALSE otherwise.
		*/
		public function checkAccess(NodeInterface $node, AccountInterface $account, $op = 'view') {
		// Converts legacy operations for this access check to new revision
		// operation found in access control handler.
		$entity_operation_map = [
		'view' => 'view all revisions',
		'update' => 'revert revision',
		'delete' => 'delete revision',
		];
		return isset($entity_operation_map[$op]) ?
		$node->access($entity_operation_map[$op], $account) :
		FALSE;
		}

		}