Skip to content

Commit 0dbd3d7

Browse files
dinamicdkarlovi
dinamic
authored and
dkarlovi
committed
~ fixing various compatibility issues
Fatal error: Call to undefined method FOS\OAuthServerBundle\Tests\DependencyInjection\Compiler\GrantExtensionsCompilerPassTest::expectExceptionMessage() in /Users/nikola/Projects/Personal/FOSOAuthServerBundle/Tests/DependencyInjection/Compiler/GrantExtensionsCompilerPassTest.php on line 165 Fatal error: Call to undefined method FOS\OAuthServerBundle\Tests\Controller\AuthorizeControllerTest::createMock() in /Users/nikola/Projects/Personal/FOSOAuthServerBundle/Tests/Controller/AuthorizeControllerTest.php on line 171
1 parent fd8dc00 commit 0dbd3d7

15 files changed

+346
-92
lines changed

‎Tests/Controller/AuthorizeControllerTest.php

Lines changed: 93 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,46 @@ class AuthorizeControllerTest extends \PHPUnit_Framework_TestCase
112112

113113
public function setUp()
114114
{
115-
$this->requestStack = $this->createMock(RequestStack::class);
116-
$this->session = $this->createMock(SessionInterface::class);
117-
$this->form = $this->createMock(Form::class);
118-
$this->authorizeFormHandler = $this->createMock(AuthorizeFormHandler::class);
119-
$this->oAuth2Server = $this->createMock(OAuth2::class);
120-
$this->templateEngine = $this->createMock(EngineInterface::class);
121-
$this->tokenStorage = $this->createMock(TokenStorageInterface::class);
122-
$this->router = $this->createMock(UrlGeneratorInterface::class);
123-
$this->clientManager = $this->createMock(ClientManagerInterface::class);
124-
$this->eventDispatcher = $this->createMock(EventDispatcher::class);
115+
$this->requestStack = $this->getMockBuilder(RequestStack::class)
116+
->disableOriginalConstructor()
117+
->getMock()
118+
;
119+
$this->session = $this->getMockBuilder(SessionInterface::class)
120+
->disableOriginalConstructor()
121+
->getMock()
122+
;
123+
$this->form = $this->getMockBuilder(Form::class)
124+
->disableOriginalConstructor()
125+
->getMock()
126+
;
127+
$this->authorizeFormHandler = $this->getMockBuilder(AuthorizeFormHandler::class)
128+
->disableOriginalConstructor()
129+
->getMock()
130+
;
131+
$this->oAuth2Server = $this->getMockBuilder(OAuth2::class)
132+
->disableOriginalConstructor()
133+
->getMock()
134+
;
135+
$this->templateEngine = $this->getMockBuilder(EngineInterface::class)
136+
->disableOriginalConstructor()
137+
->getMock()
138+
;
139+
$this->tokenStorage = $this->getMockBuilder(TokenStorageInterface::class)
140+
->disableOriginalConstructor()
141+
->getMock()
142+
;
143+
$this->router = $this->getMockBuilder(UrlGeneratorInterface::class)
144+
->disableOriginalConstructor()
145+
->getMock()
146+
;
147+
$this->clientManager = $this->getMockBuilder(ClientManagerInterface::class)
148+
->disableOriginalConstructor()
149+
->getMock()
150+
;
151+
$this->eventDispatcher = $this->getMockBuilder(EventDispatcher::class)
152+
->disableOriginalConstructor()
153+
->getMock()
154+
;
125155
$this->templateEngineType = 'twig';
126156

127157
$this->instance = new AuthorizeController(
@@ -138,20 +168,44 @@ public function setUp()
138168
$this->templateEngineType
139169
);
140170

141-
$this->request = $this->createMock(Request::class);
142-
$this->request->query = $this->createMock(ParameterBag::class);
143-
$this->request->request = $this->createMock(ParameterBag::class);
144-
$this->user = $this->createMock(UserInterface::class);
145-
$this->client = $this->createMock(ClientInterface::class);
146-
$this->event = $this->createMock(OAuthEvent::class);
147-
$this->formView = $this->createMock(FormView::class);
171+
$this->request = $this->getMockBuilder(Request::class)
172+
->disableOriginalConstructor()
173+
->getMock()
174+
;
175+
$this->request->query = $this->getMockBuilder(ParameterBag::class)
176+
->disableOriginalConstructor()
177+
->getMock()
178+
;
179+
$this->request->request = $this->getMockBuilder(ParameterBag::class)
180+
->disableOriginalConstructor()
181+
->getMock()
182+
;
183+
$this->user = $this->getMockBuilder(UserInterface::class)
184+
->disableOriginalConstructor()
185+
->getMock()
186+
;
187+
$this->client = $this->getMockBuilder(ClientInterface::class)
188+
->disableOriginalConstructor()
189+
->getMock()
190+
;
191+
$this->event = $this->getMockBuilder(OAuthEvent::class)
192+
->disableOriginalConstructor()
193+
->getMock()
194+
;
195+
$this->formView = $this->getMockBuilder(FormView::class)
196+
->disableOriginalConstructor()
197+
->getMock()
198+
;
148199

149-
parent::setUp(); // TODO: Change the autogenerated stub
200+
parent::setUp();
150201
}
151202

152203
public function testAuthorizeActionWillThrowAccessDeniedException()
153204
{
154-
$token = $this->createMock(TokenInterface::class);
205+
$token = $this->getMockBuilder(TokenInterface::class)
206+
->disableOriginalConstructor()
207+
->getMock()
208+
;
155209

156210
$this->tokenStorage
157211
->expects($this->at(0))
@@ -165,15 +219,20 @@ public function testAuthorizeActionWillThrowAccessDeniedException()
165219
->willReturn(null)
166220
;
167221

168-
$this->expectException(AccessDeniedException::class);
169-
$this->expectExceptionMessage('This user does not have access to this section.');
222+
$this->setExpectedException(
223+
AccessDeniedException::class,
224+
'This user does not have access to this section.');
225+
;
170226

171227
$this->instance->authorizeAction($this->request);
172228
}
173229

174230
public function testAuthorizeActionWillRenderTemplate()
175231
{
176-
$token = $this->createMock(TokenInterface::class);
232+
$token = $this->getMockBuilder(TokenInterface::class)
233+
->disableOriginalConstructor()
234+
->getMock()
235+
;
177236

178237
$this->tokenStorage
179238
->expects($this->at(0))
@@ -245,7 +304,10 @@ public function testAuthorizeActionWillRenderTemplate()
245304

246305
public function testAuthorizeActionWillFinishClientAuthorization()
247306
{
248-
$token = $this->createMock(TokenInterface::class);
307+
$token = $this->getMockBuilder(TokenInterface::class)
308+
->disableOriginalConstructor()
309+
->getMock()
310+
;
249311

250312
$this->tokenStorage
251313
->expects($this->at(0))
@@ -312,7 +374,10 @@ public function testAuthorizeActionWillFinishClientAuthorization()
312374

313375
public function testAuthorizeActionWillEnsureLogout()
314376
{
315-
$token = $this->createMock(TokenInterface::class);
377+
$token = $this->getMockBuilder(TokenInterface::class)
378+
->disableOriginalConstructor()
379+
->getMock()
380+
;
316381

317382
$this->tokenStorage
318383
->expects($this->at(0))
@@ -398,7 +463,10 @@ public function testAuthorizeActionWillEnsureLogout()
398463

399464
public function testAuthorizeActionWillProcessAuthorizationForm()
400465
{
401-
$token = $this->createMock(TokenInterface::class);
466+
$token = $this->getMockBuilder(TokenInterface::class)
467+
->disableOriginalConstructor()
468+
->getMock()
469+
;
402470

403471
$this->tokenStorage
404472
->expects($this->once())

‎Tests/DependencyInjection/Compiler/GrantExtensionsCompilerPassTest.php

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,14 @@ public function testProcessWillNotDoAnythingIfTheStorageDoesNotImplementOurInter
4040
])
4141
->getMock()
4242
;
43-
$storageDefinition = $this->createMock(Definition::class);
44-
$parameterBag = $this->createMock(ParameterBag::class);
43+
$storageDefinition = $this->getMockBuilder(Definition::class)
44+
->disableOriginalConstructor()
45+
->getMock()
46+
;
47+
$parameterBag = $this->getMockBuilder(ParameterBag::class)
48+
->disableOriginalConstructor()
49+
->getMock()
50+
;
4551

4652
$className = 'stdClassUnresolved' . random_bytes(5);
4753
$resolvedClassName = 'stdClass';
@@ -88,10 +94,19 @@ public function testProcessWillFailIfUriIsEmpty()
8894
])
8995
->getMock()
9096
;
91-
$storageDefinition = $this->createMock(Definition::class);
92-
$parameterBag = $this->createMock(ParameterBag::class);
97+
$storageDefinition = $this->getMockBuilder(Definition::class)
98+
->disableOriginalConstructor()
99+
->getMock()
100+
;
101+
$parameterBag = $this->getMockBuilder(ParameterBag::class)
102+
->disableOriginalConstructor()
103+
->getMock()
104+
;
93105

94-
$storageInstance = $this->createMock(GrantExtensionDispatcherInterface::class);
106+
$storageInstance = $this->getMockBuilder(GrantExtensionDispatcherInterface::class)
107+
->disableOriginalConstructor()
108+
->getMock()
109+
;
95110

96111
$className = 'stdClassUnresolved' . random_bytes(5);
97112
$resolvedClassName = get_class($storageInstance);
@@ -142,12 +157,13 @@ public function testProcessWillFailIfUriIsEmpty()
142157
->willReturn($data)
143158
;
144159

160+
$exceptionMessage = 'Service "%s" must define the "uri" attribute on "fos_oauth_server.grant_extension" tags.';
161+
145162
$idx = 0;
146163
foreach ($data as $id => $tags) {
147164
foreach ($tags as $tag) {
148165
if (empty($tag['uri'])) {
149-
$exceptionMessage = sprintf('Service "%s" must define the "uri" attribute on "fos_oauth_server.grant_extension" tags.', $id);
150-
$this->expectExceptionMessage($exceptionMessage);
166+
$exceptionMessage = sprintf($exceptionMessage, $id);
151167
break;
152168
}
153169

@@ -165,7 +181,7 @@ public function testProcessWillFailIfUriIsEmpty()
165181
}
166182
}
167183

168-
$this->expectException(InvalidArgumentException::class);
184+
$this->setExpectedException(InvalidArgumentException::class, $exceptionMessage);
169185

170186
$this->assertNull($this->instance->process($container));
171187
}
@@ -181,10 +197,19 @@ public function testProcess()
181197
])
182198
->getMock()
183199
;
184-
$storageDefinition = $this->createMock(Definition::class);
185-
$parameterBag = $this->createMock(ParameterBag::class);
200+
$storageDefinition = $this->getMockBuilder(Definition::class)
201+
->disableOriginalConstructor()
202+
->getMock()
203+
;
204+
$parameterBag = $this->getMockBuilder(ParameterBag::class)
205+
->disableOriginalConstructor()
206+
->getMock()
207+
;
186208

187-
$storageInstance = $this->createMock(GrantExtensionDispatcherInterface::class);
209+
$storageInstance = $this->getMockBuilder(GrantExtensionDispatcherInterface::class)
210+
->disableOriginalConstructor()
211+
->getMock()
212+
;
188213

189214
$className = 'stdClassUnresolved' . random_bytes(5);
190215
$resolvedClassName = get_class($storageInstance);

‎Tests/DependencyInjection/Compiler/RequestStackCompilerPassTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ public function testProcess()
6161
->willReturn(false)
6262
;
6363

64-
$definition = $this->createMock(Definition::class);
64+
$definition = $this->getMockBuilder(Definition::class)
65+
->disableOriginalConstructor()
66+
->getMock()
67+
;
6568

6669
$this->container
6770
->expects($this->once())

‎Tests/DependencyInjection/Compiler/TokenStorageCompilerPassTest.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ public function setUp()
4141

4242
public function testProcessWithExistingTokenStorage()
4343
{
44-
$authenticationListenerDefinition = $this->createMock(Definition::class);
44+
$authenticationListenerDefinition = $this->getMockBuilder(Definition::class)
45+
->disableOriginalConstructor()
46+
->getMock()
47+
;
4548

4649
$this->container
4750
->expects($this->once())
@@ -62,7 +65,10 @@ public function testProcessWithExistingTokenStorage()
6265

6366
public function testProcessWithoutExistingTokenStorage()
6467
{
65-
$authenticationListenerDefinition = $this->createMock(Definition::class);
68+
$authenticationListenerDefinition = $this->getMockBuilder(Definition::class)
69+
->disableOriginalConstructor()
70+
->getMock()
71+
;
6672

6773
$this->container
6874
->expects($this->once())

‎Tests/DependencyInjection/Security/Factory/OAuthFactoryTest.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ public function testCreate()
5353
$userProvider = 'mock.user.provider.service';
5454
$defaultEntryPoint = '';
5555

56-
$definition = $this->createMock(Definition::class);
56+
$definition = $this->getMockBuilder(Definition::class)
57+
->disableOriginalConstructor()
58+
->getMock()
59+
;
5760

5861
$container
5962
->expects($this->exactly(2))
@@ -90,7 +93,10 @@ public function testCreate()
9093

9194
public function testAddConfigurationDoesNothing()
9295
{
93-
$nodeDefinition = $this->createMock(NodeDefinition::class);
96+
$nodeDefinition = $this->getMockBuilder(NodeDefinition::class)
97+
->disableOriginalConstructor()
98+
->getMock()
99+
;
94100
$this->assertNull($this->instance->addConfiguration($nodeDefinition));
95101
}
96102
}

‎Tests/Document/AuthCodeManagerTest.php

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,14 @@ public function setUp()
4444
$this->markTestSkipped('Doctrine MongoDB ODM has to be installed for this test to run.');
4545
}
4646

47-
$this->documentManager = $this->createMock(DocumentManager::class);
48-
$this->repository = $this->createMock(DocumentRepository::class);
47+
$this->documentManager = $this->getMockBuilder(DocumentManager::class)
48+
->disableOriginalConstructor()
49+
->getMock()
50+
;
51+
$this->repository = $this->getMockBuilder(DocumentRepository::class)
52+
->disableOriginalConstructor()
53+
->getMock()
54+
;
4955
$this->className = 'TestClassName' . \random_bytes(5);
5056

5157
$this->documentManager
@@ -90,7 +96,10 @@ public function testFindAuthCodeBy()
9096

9197
public function testUpdateAuthCode()
9298
{
93-
$authCode = $this->createMock(AuthCodeInterface::class);
99+
$authCode = $this->getMockBuilder(AuthCodeInterface::class)
100+
->disableOriginalConstructor()
101+
->getMock()
102+
;
94103

95104
$this->documentManager
96105
->expects($this->once())
@@ -111,7 +120,10 @@ public function testUpdateAuthCode()
111120

112121
public function testDeleteAuthCode()
113122
{
114-
$authCode = $this->createMock(AuthCodeInterface::class);
123+
$authCode = $this->getMockBuilder(AuthCodeInterface::class)
124+
->disableOriginalConstructor()
125+
->getMock()
126+
;
115127

116128
$this->documentManager
117129
->expects($this->once())
@@ -132,7 +144,10 @@ public function testDeleteAuthCode()
132144

133145
public function testDeleteExpired()
134146
{
135-
$queryBuilder = $this->createMock(Builder::class);
147+
$queryBuilder = $this->getMockBuilder(Builder::class)
148+
->disableOriginalConstructor()
149+
->getMock()
150+
;
136151

137152
$this->repository
138153
->expects($this->once())
@@ -162,7 +177,10 @@ public function testDeleteExpired()
162177
->willReturn($queryBuilder)
163178
;
164179

165-
$query = $this->createMock(AbstractQuery::class);
180+
$query = $this->getMockBuilder(AbstractQuery::class)
181+
->disableOriginalConstructor()
182+
->getMock()
183+
;
166184

167185
$queryBuilder
168186
->expects($this->once())

0 commit comments

Comments
 (0)