Support custom keys for groups

FriendsOfSymfony · Jul 23, 2017 · 56c6df1 · 56c6df1
1 parent 32d7374
commit 56c6df1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/EventListener/ViewResponseListener.php b/EventListener/ViewResponseListener.php
@@ -81,7 +81,11 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
 
             $context = $view->getContext();
             if ($configuration->getSerializerGroups()) {
-                $context->addGroups($configuration->getSerializerGroups());
+                if (null === $context->getGroups()) {
+                    $context->setGroups($configuration->getSerializerGroups());
+                } else {
+                    $context->setGroups(array_merge($context->getGroups(), $configuration->getSerializerGroups()));
+                }
             }
             if ($configuration->getSerializerEnableMaxDepthChecks()) {
                 $context->setMaxDepth(0, false);

diff --git a/View/ViewHandler.php b/View/ViewHandler.php
@@ -253,7 +253,7 @@ protected function getSerializationContext(View $view)
 
         $groups = $context->getGroups();
         if (empty($groups) && $this->exclusionStrategyGroups) {
-            $context->addGroups($this->exclusionStrategyGroups);
+            $context->setGroups($this->exclusionStrategyGroups);
         }
 
         if (null === $context->getVersion() && $this->exclusionStrategyVersion) {