Permalink
Browse files

Sync with latest Symfony 2.1 changes

  • Loading branch information...
1 parent cf73cbf commit 3679bd91b3f3eccbe28cdbd04a0718ce08748913 @stloyd stloyd committed Dec 27, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −1 KnpOAuthBundle.php
  2. +1 −1 Resources/config/oauth.xml
  3. +1 −1 Security/Core/UserProvider/EntityFactory.php
View
@@ -33,6 +33,6 @@ public function build(ContainerBuilder $container)
$extension = $container->getExtension('security');
$extension->addSecurityListenerFactory(new OAuthFactory());
- $extension->addUserProviderFactory(new EntityFactory());
+ $extension->addUserProviderFactory(new EntityFactory('entity', 'doctrine.orm.security.user.provider'));
}
}
@@ -29,7 +29,7 @@
<service id="knp_oauth.authentication.entry_point.oauth" class="%knp_oauth.authentication.entry_point.oauth.class%" />
<service id="knp_oauth.user.provider" class="%knp_oauth.user.provider.class%" />
<service id="knp_oauth.user.provider.entity" class="%knp_oauth.user.provider.entity.class%">
- <argument type="service" id="doctrine.orm.entity_manager" />
+ <argument type="service" id="doctrine" />
</service>
<!-- builtin providers -->
@@ -14,7 +14,7 @@
use Symfony\Component\DependencyInjection\ContainerBuilder,
Symfony\Component\DependencyInjection\DefinitionDecorator,
Symfony\Component\Config\Definition\Builder\NodeDefinition,
- Symfony\Bundle\DoctrineBundle\DependencyInjection\Security\UserProvider\EntityFactory as BaseEntityFactory;
+ Symfony\Bridge\Doctrine\DependencyInjection\Security\UserProvider\EntityFactory as BaseEntityFactory;
/**
* EntityFactory

0 comments on commit 3679bd9

Please sign in to comment.