Merged branch '4.6'

ibexa · Apr 10, 2024 · 7b10a4b · 7b10a4b
2 parents 3aefbf7 + c55750b
commit 7b10a4b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/bundle/DependencyInjection/Configuration/Parser/NotificationsConfigParser.php b/src/bundle/DependencyInjection/Configuration/Parser/NotificationsConfigParser.php
@@ -18,8 +18,14 @@ final class NotificationsConfigParser extends AbstractParser
 
     public function addSemanticConfig(NodeBuilder $nodeBuilder): void
     {
+        /*
+         * Node name has been changed from "notifications" to "notifier" due to
+         * collision with Admin UI notifications parser.
+         *
+         * TODO: Change the name back to "notifications" in the next major version.
+         */
         $nodeBuilder
-            ->arrayNode('notifications')
+            ->arrayNode('notifier')
                 ->children()
                     ->arrayNode('subscriptions')
                         ->info('Mandatory system notifications. Users cannot opt-out from below subscriptions.')
@@ -42,11 +48,11 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder): void
      */
     public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerInterface $contextualizer): void
     {
-        if (empty($scopeSettings['notifications'])) {
+        if (empty($scopeSettings['notifier'])) {
             return;
         }
 
-        $settings = $scopeSettings['notifications'];
+        $settings = $scopeSettings['notifier'];
 
         foreach (self::MAPPED_SETTINGS as $key) {
             if (!isset($settings[$key])) {

diff --git a/src/bundle/Resources/config/prepend.yaml b/src/bundle/Resources/config/prepend.yaml
@@ -3,5 +3,5 @@
 ibexa:
     system:
         default:
-            notifications:
+            notifier:
                 subscriptions: []