Permalink
Browse files

Merge branch '2.0'

* 2.0:
  Changed the default value for the entity manager name
  • Loading branch information...
2 parents 1f66175 + 638f545 commit 704f22f91b6ec022234e57fe441162f1a39cd34c @fabpot fabpot committed Jan 11, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 Request/ParamConverter/DoctrineParamConverter.php
View
2 Request/ParamConverter/DoctrineParamConverter.php
@@ -102,7 +102,7 @@ public function supports(ConfigurationInterface $configuration)
protected function getOptions(ConfigurationInterface $configuration)
{
return array_replace(array(
- 'entity_manager' => 'default',
+ 'entity_manager' => null,
), $configuration->getOptions());
}
}

0 comments on commit 704f22f

Please sign in to comment.