diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php index af81e25bbf2ceed9b6fd3245a13d102cad236f0a..c008feaea870e7b35300cf82771a486334a35ee9 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php @@ -376,7 +376,7 @@ public function __sleep(): array { public function calculateDependencies() { // All dependencies should be recalculated on every save apart from enforced // dependencies. This ensures stale dependencies are never saved. - $this->dependencies = array_intersect_key($this->dependencies, ['enforced' => '']); + $this->dependencies = array_intersect_key($this->dependencies ?? [], ['enforced' => '']); if ($this instanceof EntityWithPluginCollectionInterface) { // Configuration entities need to depend on the providers of any plugins // that they store the configuration for.