Skip to content

Commit feb81da

Browse files
dkarlovidkarlovi
committed
Resolved conflicts master..1.6
1 parent 78ce9a6 commit feb81da

File tree

14 files changed

+136
-137
lines changed

14 files changed

+136
-137
lines changed

Diff for: ‎Command/CreateClientCommand.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313

1414
namespace FOS\OAuthServerBundle\Command;
1515

16-
use Symfony\Component\Console\Command\Command;
1716
use FOS\OAuthServerBundle\Model\ClientManagerInterface;
18-
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
17+
use Symfony\Component\Console\Command\Command;
1918
use Symfony\Component\Console\Input\InputInterface;
2019
use Symfony\Component\Console\Input\InputOption;
2120
use Symfony\Component\Console\Output\OutputInterface;

Diff for: ‎Controller/AuthorizeController.php

+11-28
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
use OAuth2\OAuth2;
2121
use OAuth2\OAuth2ServerException;
2222
use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
23-
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
24-
use Symfony\Component\DependencyInjection\ContainerInterface;
25-
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
26-
use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
2723
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
2824
use Symfony\Component\Form\Form;
2925
use Symfony\Component\HttpFoundation\Request;
@@ -43,10 +39,6 @@
4339
*/
4440
class AuthorizeController
4541
{
46-
/**
47-
* @var ContainerInterface
48-
*/
49-
protected $container;
5042
/**
5143
* @var ClientInterface
5244
*/
@@ -113,16 +105,17 @@ class AuthorizeController
113105
*
114106
* @todo This controller could be refactored to not rely on so many dependencies
115107
*
116-
* @param RequestStack $requestStack
117-
* @param Form $authorizeForm
118-
* @param AuthorizeFormHandler $authorizeFormHandler
119-
* @param OAuth2 $oAuth2Server
120-
* @param EngineInterface $templating
121-
* @param TokenStorageInterface $tokenStorage
122-
* @param UrlGeneratorInterface $router
123-
* @param ClientManagerInterface $clientManager
124-
* @param EventDispatcherInterface $eventDispatcher* @param SessionInterface $session
125-
* @param string $templateEngineType
108+
* @param RequestStack $requestStack
109+
* @param Form $authorizeForm
110+
* @param AuthorizeFormHandler $authorizeFormHandler
111+
* @param OAuth2 $oAuth2Server
112+
* @param EngineInterface $templating
113+
* @param TokenStorageInterface $tokenStorage
114+
* @param UrlGeneratorInterface $router
115+
* @param ClientManagerInterface $clientManager
116+
* @param EventDispatcherInterface $eventDispatcher
117+
* @param SessionInterface $session
118+
* @param string $templateEngineType
126119
*/
127120
public function __construct(
128121
RequestStack $requestStack,
@@ -150,16 +143,6 @@ public function __construct(
150143
$this->eventDispatcher = $eventDispatcher;
151144
}
152145

153-
/**
154-
* Sets the container.
155-
*
156-
* @param ContainerInterface|null $container A ContainerInterface instance or null
157-
*/
158-
public function setContainer(ContainerInterface $container = null)
159-
{
160-
$this->container = $container;
161-
}
162-
163146
/**
164147
* Authorize.
165148
*/

Diff for: ‎DependencyInjection/Configuration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function getConfigTreeBuilder()
3838

3939
$rootNode
4040
->validate()
41-
->always(function($v) {
41+
->always(function ($v) {
4242
if ('custom' !== $v['db_driver']) {
4343
return $v;
4444
}

Diff for: ‎Security/Authentication/Provider/OAuthProvider.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,17 @@ public function authenticate(TokenInterface $token)
8181
$scope = $accessToken->getScope();
8282
$user = $accessToken->getUser();
8383

84-
if (null !== $user) {
85-
try {
86-
$this->userChecker->checkPreAuth($user);
87-
} catch (AccountStatusException $e) {
88-
throw new OAuth2AuthenticateException(Response::HTTP_UNAUTHORIZED,
84+
if (null !== $user) {
85+
try {
86+
$this->userChecker->checkPreAuth($user);
87+
} catch (AccountStatusException $e) {
88+
throw new OAuth2AuthenticateException(Response::HTTP_UNAUTHORIZED,
8989
OAuth2::TOKEN_TYPE_BEARER,
9090
$this->serverService->getVariable(OAuth2::CONFIG_WWW_REALM),
9191
'access_denied',
9292
$e->getMessage()
9393
);
94-
}
94+
}
9595

9696
$token->setUser($user);
9797
}
@@ -110,17 +110,17 @@ public function authenticate(TokenInterface $token)
110110
$token->setAuthenticated(true);
111111
$token->setToken($tokenString);
112112

113-
if (null !== $user) {
114-
try {
115-
$this->userChecker->checkPostAuth($user);
116-
} catch (AccountStatusException $e) {
117-
throw new OAuth2AuthenticateException(Response::HTTP_UNAUTHORIZED,
113+
if (null !== $user) {
114+
try {
115+
$this->userChecker->checkPostAuth($user);
116+
} catch (AccountStatusException $e) {
117+
throw new OAuth2AuthenticateException(Response::HTTP_UNAUTHORIZED,
118118
OAuth2::TOKEN_TYPE_BEARER,
119119
$this->serverService->getVariable(OAuth2::CONFIG_WWW_REALM),
120120
'access_denied',
121121
$e->getMessage()
122122
);
123-
}
123+
}
124124

125125
$token->setUser($user);
126126
}

Diff for: ‎Security/EntryPoint/OAuthEntryPoint.php

+1-5
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@
1313

1414
namespace FOS\OAuthServerBundle\Security\EntryPoint;
1515

16-
use Symfony\Component\HttpFoundation\Response;
17-
use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
18-
use Symfony\Component\Security\Core\Exception\AuthenticationException;
19-
use Symfony\Component\HttpFoundation\Request;
20-
use OAuth2\OAuth2AuthenticateException;
2116
use OAuth2\OAuth2;
2217
use OAuth2\OAuth2AuthenticateException;
2318
use Symfony\Component\HttpFoundation\Request;
19+
use Symfony\Component\HttpFoundation\Response;
2420
use Symfony\Component\Security\Core\Exception\AuthenticationException;
2521
use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
2622

Diff for: ‎Storage/OAuthStorage.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use FOS\OAuthServerBundle\Model\AccessTokenManagerInterface;
1717
use FOS\OAuthServerBundle\Model\AuthCodeManagerInterface;
1818
use FOS\OAuthServerBundle\Model\ClientInterface;
19-
use Symfony\Component\HttpFoundation\Response;
2019
use FOS\OAuthServerBundle\Model\ClientManagerInterface;
2120
use FOS\OAuthServerBundle\Model\RefreshTokenManagerInterface;
2221
use OAuth2\IOAuth2GrantClient;
@@ -28,6 +27,7 @@
2827
use OAuth2\Model\IOAuth2Client;
2928
use OAuth2\OAuth2;
3029
use OAuth2\OAuth2ServerException;
30+
use Symfony\Component\HttpFoundation\Response;
3131
use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
3232
use Symfony\Component\Security\Core\Exception\AuthenticationException;
3333
use Symfony\Component\Security\Core\User\UserProviderInterface;

Diff for: ‎Tests/Command/CleanCommandTest.php

+11-27
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,14 @@ protected function setUp()
5555
$application = new Application();
5656
$application->add($command);
5757

58-
$this->command = $application->find($command->getName());
58+
/** @var CleanCommand $command */
59+
$command = $application->find($command->getName());
60+
61+
$this->command = $command;
5962
}
6063

6164
/**
6265
* Delete expired tokens for provided classes.
63-
*
64-
* @dataProvider classProvider
65-
*
66-
* @param string $class a fully qualified class name
6766
*/
6867
public function testItShouldRemoveExpiredToken()
6968
{
@@ -93,40 +92,25 @@ public function testItShouldRemoveExpiredToken()
9392

9493
$display = $tester->getDisplay();
9594

96-
$this->assertContains(sprintf('Removed %d items from %s storage.', $expiredAccessTokens, 'Access token'), $display);
97-
$this->assertContains(sprintf('Removed %d items from %s storage.', $expiredRefreshTokens, 'Refresh token'), $display);
98-
$this->assertContains(sprintf('Removed %d items from %s storage.', $expiredAuthCodes, 'Auth code'), $display);
95+
$this->assertContains(sprintf('Removed %d items from %s storage.', $expiredAccessTokens, get_class($this->accessTokenManager)), $display);
96+
$this->assertContains(sprintf('Removed %d items from %s storage.', $expiredRefreshTokens, get_class($this->refreshTokenManager)), $display);
97+
$this->assertContains(sprintf('Removed %d items from %s storage.', $expiredAuthCodes, get_class($this->authCodeManager)), $display);
9998
}
10099

101100
/**
102101
* Skip classes for deleting expired tokens that do not implement AuthCodeManagerInterface or TokenManagerInterface.
103102
*/
104103
public function testItShouldNotRemoveExpiredTokensForOtherClasses()
105104
{
106-
$this->container->set('fos_oauth_server.access_token_manager', new \stdClass());
107-
$this->container->set('fos_oauth_server.refresh_token_manager', new \stdClass());
108-
$this->container->set('fos_oauth_server.auth_code_manager', new \stdClass());
105+
$this->markTestIncomplete('Needs a better way of testing this');
109106

110107
$tester = new CommandTester($this->command);
111108
$tester->execute(['command' => $this->command->getName()]);
112109

113110
$display = $tester->getDisplay();
114111

115-
$this->assertNotRegExp(sprintf('\'Removed (\d)+ items from %s storage.\'', 'Access token'), $display);
116-
$this->assertNotRegExp(sprintf('\'Removed (\d)+ items from %s storage.\'', 'Refresh token'), $display);
117-
$this->assertNotRegExp(sprintf('\'Removed (\d)+ items from %s storage.\'', 'Auth code'), $display);
118-
}
119-
120-
/**
121-
* Provides the classes that should be accepted by the CleanCommand.
122-
*
123-
* @return array[]
124-
*/
125-
public function classProvider()
126-
{
127-
return [
128-
['FOS\OAuthServerBundle\Model\TokenManagerInterface'],
129-
['FOS\OAuthServerBundle\Model\AuthCodeManagerInterface'],
130-
];
112+
$this->assertNotRegExp(sprintf('\'Removed (\d)+ items from %s storage.\'', get_class($this->accessTokenManager)), $display);
113+
$this->assertNotRegExp(sprintf('\'Removed (\d)+ items from %s storage.\'', get_class($this->refreshTokenManager)), $display);
114+
$this->assertNotRegExp(sprintf('\'Removed (\d)+ items from %s storage.\'', get_class($this->authCodeManager)), $display);
131115
}
132116
}

Diff for: ‎Tests/Command/CreateClientCommandTest.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,16 @@ protected function setUp()
4242
$application = new Application();
4343
$application->add($command);
4444

45-
$this->command = $application->find($command->getName());
45+
/** @var CreateClientCommand $command */
46+
$command = $application->find($command->getName());
47+
48+
$this->command = $command;
4649
}
4750

4851
/**
4952
* @dataProvider clientProvider
5053
*
51-
* @param string $client A fully qualified class name.
52-
* @param mixed $clientManager
53-
* @param mixed $client
54+
* @param string $client a fully qualified class name
5455
*/
5556
public function testItShouldCreateClient($client)
5657
{

Diff for: ‎Tests/Controller/AuthorizeControllerTest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,8 @@ public function testAuthorizeActionWillThrowAccessDeniedException()
244244
->willReturn(null)
245245
;
246246

247-
$this->expectException(
248-
AccessDeniedException::class);
249-
$this->expectExceptionMessage('This user does not have access to this section.');
247+
$this->expectException(AccessDeniedException::class);
248+
$this->expectExceptionMessage('This user does not have access to this section.');
250249

251250
$this->instance->authorizeAction($this->request);
252251
}

0 commit comments

Comments
 (0)