Merge pull request schmittjoh#84 from helmer/arraynode

[Configuration] Sync with upstream symfony2.1
chregu · Feb 20, 2012 · 4758cc0 · 4758cc0
2 parents 393197a + d34f7c3
commit 4758cc0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/DependencyInjection/Factory/ArrayCollectionFactory.php b/DependencyInjection/Factory/ArrayCollectionFactory.php
@@ -22,12 +22,11 @@ public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder
             ->addDefaultsIfNotSet()
-            ->defaultValue(array())
         ;
     }
 
     public function getHandlerId(ContainerBuilder $container, array $config)
     {
         return 'jms_serializer.array_collection_handler';
     }
-}
+}
diff --git a/DependencyInjection/Factory/ConstraintViolationFactory.php b/DependencyInjection/Factory/ConstraintViolationFactory.php
@@ -22,12 +22,11 @@ public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder
             ->addDefaultsIfNotSet()
-            ->defaultValue(array())
         ;
     }
 
     public function getHandlerId(ContainerBuilder $container, array $config)
     {
         return 'jms_serializer.constraint_violation_handler';
     }
-}
+}
diff --git a/DependencyInjection/Factory/DoctrineProxyFactory.php b/DependencyInjection/Factory/DoctrineProxyFactory.php
@@ -22,7 +22,6 @@ public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder
             ->addDefaultsIfNotSet()
-            ->defaultValue(array())
         ;
     }
 

diff --git a/DependencyInjection/Factory/FormErrorFactory.php b/DependencyInjection/Factory/FormErrorFactory.php
@@ -22,12 +22,11 @@ public function addConfiguration(ArrayNodeDefinition $builder)
     {
         $builder
             ->addDefaultsIfNotSet()
-            ->defaultValue(array())
         ;
     }
 
     public function getHandlerId(ContainerBuilder $container, array $config)
     {
         return 'jms_serializer.form_error_handler';
     }
-}
+}