Skip to content

Commit

Permalink
sync with upstream symfony2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
helmer committed Feb 20, 2012
1 parent 393197a commit d34f7c3
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
3 changes: 1 addition & 2 deletions DependencyInjection/Factory/ArrayCollectionFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
}
}
3 changes: 1 addition & 2 deletions DependencyInjection/Factory/ConstraintViolationFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
}
}
1 change: 0 additions & 1 deletion DependencyInjection/Factory/DoctrineProxyFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public function addConfiguration(ArrayNodeDefinition $builder)
{
$builder
->addDefaultsIfNotSet()
->defaultValue(array())
;
}

Expand Down
3 changes: 1 addition & 2 deletions DependencyInjection/Factory/FormErrorFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
}
}

0 comments on commit d34f7c3

Please sign in to comment.