Merge pull request Sylius#3731 from pjedrzejewski/remove-configuratio…

…n-form-validation-groups Remove configuration form validation groups
pamil · Dec 18, 2015 · ed65878 · ed65878
2 parents 61ead6d + 4c418b6
commit ed65878
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/DependencyInjection/Driver/AbstractDriver.php b/DependencyInjection/Driver/AbstractDriver.php
@@ -74,7 +74,7 @@ protected function setClassesParameters(ContainerBuilder $container, MetadataInt
 
         foreach ($validationGroups as $formName => $groups) {
             $suffix = 'default' === $formName ? '' : sprintf('_%s', $formName);
-            $container->setParameter(sprintf('%s.validation_groups.%s%s', $metadata->getApplicationName(), $metadata->getName(), $suffix), $groups);
+            $container->setParameter(sprintf('%s.validation_groups.%s%s', $metadata->getApplicationName(), $metadata->getName(), $suffix), array_merge(array('Default'), $groups));
         }
     }
 
@@ -154,16 +154,15 @@ protected function addForms(ContainerBuilder $container, MetadataInterface $meta
 
                 default:
                     $validationGroupsParameterName = sprintf('%s.validation_groups.%s%s', $metadata->getApplicationName(), $metadata->getName(), $suffix);
+                    $validationGroups = new Parameter($validationGroupsParameterName);
 
-                    if ($container->hasParameter($validationGroupsParameterName)) {
-                        $validationGroups = new Parameter($validationGroupsParameterName);
-                    } else {
+                    if (!$container->hasParameter($validationGroupsParameterName)) {
                         $validationGroups = array('Default');
                     }
 
                     $definition->setArguments(array(
                         $metadata->getClass('model'),
-                        $validationGroups,
+                        $validationGroups
                     ));
                 break;
             }