Convert patch to MR.

Closes #2918231

core/lib/Drupal/Core/Entity/EntityCreateAccessCheck.php

@@ -53,6 +53,18 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager) {
   public function access(Route $route, RouteMatchInterface $route_match, AccountInterface $account) {
     [$entity_type, $bundle] = explode(':', $route->getRequirement($this->requirementsKey) . ':');
 
+    // For an entity type that has bundles, the $bundle must be specified.
+    $entity_type_definition = $this->entityTypeManager->getDefinition($entity_type);
+    if (empty($bundle) && $entity_type_definition && $entity_type_definition->hasKey('bundle')) {
+      @trigger_error(
+        sprintf(
+          'Defining a \'%s\' route requirement without a bundle for an entity type which has bundles (%s) is deprecated in drupal:11.2.0 and will be disallowed in drupal:12.0.0. Specify a bundle, either as a string or as a route parameter placeholder, in the route requirement. See https://www.drupal.org/node/3505093',
+          $this->requirementsKey,
+          $entity_type,
+        ), E_USER_DEPRECATED
+      );
+    }
+
     // The bundle argument can contain request argument placeholders like
     // {name}, loop over the raw variables and attempt to replace them in the
     // bundle name. If a placeholder does not exist, it won't get replaced.

[Víctor Dorado]

@thomas.fleming Why you checked for $this->entityTypeManager->getDefinition() not returning NULL? Since the optional parameter $exception_on_invalid is TRUE by default, an exception will be thrown in that case. A null pointer will never happen.

[Thomas Fleming]

Hey @vidorado probably irrelevant at this point, and apologize for not including better info on my reasoning for this. IIRC I added this check to ensure that the more helpful exception in EntityCreateAccessCheck was thrown when the replication steps were followed. Otherwise, you get the plugin not found exception, which seems out of context given the replication steps.

[Víctor Dorado]

Hi @thomas.fleming!

This is the modified code snippet:

$entity_type_definition = $this->entityTypeManager->getDefinition($entity_type);
if (empty($bundle) && $entity_type_definition && $entity_type_definition->hasKey('bundle')) {
  throw new \Exception("The _entity_create_access route access requires a bundle parameter because the $entity_type entity type uses bundles.");
}

All you added is a local var $entity_type_definition in order to be able to check it just in the if() below. But, as I see, $entity_type_definition will never be falsy at this point, since $this->entityTypeManager->getDefinition($entity_type) will throw a PluginNotFoundException exception if the $entity_type is invalid.

As I see, you guard won't prevent PluginNotFoundException to be thrown, so I believe this change is not neccessary.

Do you agree with me, and don't mind if I revert it, in that case?

Thanks in advance!