@@ -16,10 +16,10 @@ |
||
16 | 16 | use OAuth2Framework\ServerBundle\Security\Authentication\Provider\OAuth2Provider; |
17 | 17 | use OAuth2Framework\ServerBundle\Security\EntryPoint\OAuth2EntryPoint; |
18 | 18 | use OAuth2Framework\ServerBundle\Security\Firewall\OAuth2Listener; |
19 | +use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
19 | 20 | use Symfony\Component\DependencyInjection\ChildDefinition; |
20 | 21 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
21 | 22 | use Symfony\Component\DependencyInjection\Reference; |
22 | -use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface; |
|
23 | 23 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
24 | 24 | |
25 | 25 | class OAuth2SecurityFactory implements SecurityFactoryInterface |
@@ -13,9 +13,9 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Tests\TestBundle\Service; |
15 | 15 | |
16 | +use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
|
16 | 17 | use OAuth2Framework\ServerBundle\Tests\TestBundle\Entity\User; |
17 | 18 | use OAuth2Framework\ServerBundle\Tests\TestBundle\Entity\UserRepository; |
18 | -use OAuth2Framework\Component\Core\UserAccount\UserAccountRepository; |
|
19 | 19 | use Symfony\Component\Security\Core\Exception\UnsupportedUserException; |
20 | 20 | use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; |
21 | 21 | use Symfony\Component\Security\Core\User\UserInterface; |
@@ -40,6 +40,7 @@ |
||
40 | 40 | |
41 | 41 | /** |
42 | 42 | * {@inheritdoc} |
43 | + * @param string $username |
|
43 | 44 | */ |
44 | 45 | public function loadUserByUsername($username) |
45 | 46 | { |
@@ -31,11 +31,13 @@ |
||
31 | 31 | |
32 | 32 | /** |
33 | 33 | * @param ContainerBuilder $container |
34 | + * @return void |
|
34 | 35 | */ |
35 | 36 | public function build(ContainerBuilder $container); |
36 | 37 | |
37 | 38 | /** |
38 | 39 | * @param NodeDefinition $node |
40 | + * @return void |
|
39 | 41 | */ |
40 | 42 | public function getNodeDefinition(ArrayNodeDefinition $node, ArrayNodeDefinition $rootNode); |
41 | 43 |
@@ -13,12 +13,12 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Security\Firewall; |
15 | 15 | |
16 | -use OAuth2Framework\ServerBundle\Security\Authentication\Token\OAuth2Token; |
|
17 | 16 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenHandlerManager; |
18 | 17 | use OAuth2Framework\Component\Core\AccessToken\AccessTokenId; |
19 | 18 | use OAuth2Framework\Component\Core\Exception\OAuth2Exception; |
20 | 19 | use OAuth2Framework\Component\Core\Response\OAuth2ResponseFactoryManager; |
21 | 20 | use OAuth2Framework\Component\TokenType\TokenTypeManager; |
21 | +use OAuth2Framework\ServerBundle\Security\Authentication\Token\OAuth2Token; |
|
22 | 22 | use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory; |
23 | 23 | use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory; |
24 | 24 | use Symfony\Component\HttpKernel\Event\GetResponseEvent; |
@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | namespace OAuth2Framework\ServerBundle\Tests\TestBundle\Controller; |
15 | 15 | |
16 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
17 | 16 | use OAuth2Framework\ServerBundle\Annotation\OAuth2; |
17 | +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
|
18 | 18 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
19 | 19 | use Symfony\Component\HttpFoundation\JsonResponse; |
20 | 20 | use Symfony\Component\HttpFoundation\Response; |