--- 1875974-213.patch 2022-08-03 13:54:10.000000000 +0530 +++ 1875974-222.patch 2022-08-03 13:56:15.000000000 +0530 @@ -1,8 +1,8 @@ diff --git a/core/core.services.yml b/core/core.services.yml -index 05067ab598..6c0483a230 100644 +index 7f37adc892..782aef3d82 100644 --- a/core/core.services.yml +++ b/core/core.services.yml -@@ -1771,6 +1771,9 @@ services: +@@ -1770,6 +1770,9 @@ services: class: Drupal\Core\EventSubscriber\RssResponseRelativeUrlFilter tags: - { name: event_subscriber } @@ -831,7 +831,7 @@ * @} End of "addtogroup hooks". */ diff --git a/core/lib/Drupal/Core/Field/FormatterPluginManager.php b/core/lib/Drupal/Core/Field/FormatterPluginManager.php -index c4df0f5f2f..0f5f287949 100644 +index 46305a5f2b..0411b15e5d 100644 --- a/core/lib/Drupal/Core/Field/FormatterPluginManager.php +++ b/core/lib/Drupal/Core/Field/FormatterPluginManager.php @@ -56,6 +56,12 @@ public function createInstance($plugin_id, array $configuration = []) { @@ -853,7 +853,7 @@ 'view_mode' => $options['view_mode'], + 'label' => $field_definition->getLabel(), ]; - return $this->createInstance($plugin_id, $configuration); + return $this->createInstance($plugin_id, $configuration) ?? FALSE; } diff --git a/core/modules/field/tests/src/Unit/Plugin/DisplayComponent/FieldDisplayComponentHandlerTest.php b/core/modules/field/tests/src/Unit/Plugin/DisplayComponent/FieldDisplayComponentHandlerTest.php new file mode 100644 @@ -1338,7 +1338,7 @@ } // Let the display build the render array for the entities. diff --git a/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php b/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php -index 154a1b0c61..bebf13b445 100644 +index 56a4b27af4..a9fe2ff559 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php @@ -7,6 +7,7 @@