Issue #3210372 by pfrenssen, claudiu.cristea: Fatal error when passing...

Issue #3210372 by pfrenssen, claudiu.cristea: Fatal error when passing non-existing ID to entity parameter converter

core/lib/Drupal/Core/ParamConverter/EntityConverter.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\ParamConverter;
 
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\Context\Context;
@@ -142,7 +143,11 @@ public function convert($value, $definition, $name, array $defaults) {
     }
     $entity = $this->entityRepository->getCanonical($entity_type_id, $value, $contexts);
 
-    if (!empty($definition['bundle']) && !in_array($entity->bundle(), $definition['bundle'], TRUE)) {
+    if (
+      !empty($definition['bundle']) &&
+      $entity instanceof EntityInterface &&
+      !in_array($entity->bundle(), $definition['bundle'], TRUE)
+    ) {
       return NULL;
     }
 

core/tests/Drupal/KernelTests/Core/ParamConverter/EntityConverterTest.php

@@ -85,6 +85,10 @@ public function testRouteParamWithBundleDefinition(): void {
     $converted = $converter->convert($entity3->id(), $definition, 'qux', []);
     $this->assertNull($converted);
 
+    // A non-existing entity returns NULL.
+    $converted = $converter->convert('some-non-existing-entity-id', $definition, 'qux', []);
+    $this->assertNull($converted);
+
     $definition = [
       'type' => 'entity:entity_test',
     ];
@@ -96,6 +100,8 @@ public function testRouteParamWithBundleDefinition(): void {
     $this->assertSame($entity2->id(), $converted->id());
     $converted = $converter->convert($entity3->id(), $definition, 'qux', []);
     $this->assertSame($entity3->id(), $converted->id());
+    $converted = $converter->convert('some-non-existing-entity-id', $definition, 'qux', []);
+    $this->assertNull($converted);
   }
 
 }