Skip to content

Commit 8b1f632

Browse files
committed
minor symfony#57729 Use createMock (OskarStark)
This PR was squashed before being merged into the 7.2 branch. Discussion ---------- Use `createMock` | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- 266f7b6 Use `createMock`
2 parents 32aab6e + 266f7b6 commit 8b1f632

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class EntityValueResolverTest extends TestCase
3030
{
3131
public function testResolveWithoutClass()
3232
{
33-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
33+
$manager = $this->createMock(ObjectManager::class);
3434
$registry = $this->createRegistry($manager);
3535
$resolver = new EntityValueResolver($registry);
3636

@@ -42,7 +42,7 @@ public function testResolveWithoutClass()
4242

4343
public function testResolveWithoutAttribute()
4444
{
45-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
45+
$manager = $this->createMock(ObjectManager::class);
4646
$registry = $this->createRegistry($manager);
4747
$resolver = new EntityValueResolver($registry, null, new MapEntity(disabled: true));
4848

@@ -68,7 +68,7 @@ public function testResolveWithoutManager()
6868
*/
6969
public function testResolveWithNoIdAndDataOptional()
7070
{
71-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
71+
$manager = $this->createMock(ObjectManager::class);
7272
$registry = $this->createRegistry($manager);
7373
$resolver = new EntityValueResolver($registry);
7474

@@ -80,7 +80,7 @@ public function testResolveWithNoIdAndDataOptional()
8080

8181
public function testResolveWithStripNulls()
8282
{
83-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
83+
$manager = $this->createMock(ObjectManager::class);
8484
$registry = $this->createRegistry($manager);
8585
$resolver = new EntityValueResolver($registry);
8686

@@ -102,7 +102,7 @@ public function testResolveWithStripNulls()
102102
*/
103103
public function testResolveWithId(string|int $id)
104104
{
105-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
105+
$manager = $this->createMock(ObjectManager::class);
106106
$registry = $this->createRegistry($manager);
107107
$resolver = new EntityValueResolver($registry);
108108

@@ -111,7 +111,7 @@ public function testResolveWithId(string|int $id)
111111

112112
$argument = $this->createArgument('stdClass', new MapEntity(id: 'id'));
113113

114-
$repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
114+
$repository = $this->createMock(ObjectRepository::class);
115115
$repository->expects($this->once())
116116
->method('find')
117117
->with($id)
@@ -127,7 +127,7 @@ public function testResolveWithId(string|int $id)
127127

128128
public function testResolveWithNullId()
129129
{
130-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
130+
$manager = $this->createMock(ObjectManager::class);
131131
$registry = $this->createRegistry($manager);
132132
$resolver = new EntityValueResolver($registry);
133133

@@ -141,7 +141,7 @@ public function testResolveWithNullId()
141141

142142
public function testResolveWithConversionFailedException()
143143
{
144-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
144+
$manager = $this->createMock(ObjectManager::class);
145145
$registry = $this->createRegistry($manager);
146146
$resolver = new EntityValueResolver($registry);
147147

@@ -150,7 +150,7 @@ public function testResolveWithConversionFailedException()
150150

151151
$argument = $this->createArgument('stdClass', new MapEntity(id: 'id', message: 'Test'));
152152

153-
$repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
153+
$repository = $this->createMock(ObjectRepository::class);
154154
$repository->expects($this->once())
155155
->method('find')
156156
->with('test')
@@ -169,7 +169,7 @@ public function testResolveWithConversionFailedException()
169169

170170
public function testUsedProperIdentifier()
171171
{
172-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
172+
$manager = $this->createMock(ObjectManager::class);
173173
$registry = $this->createRegistry($manager);
174174
$resolver = new EntityValueResolver($registry);
175175

@@ -195,7 +195,7 @@ public static function idsProvider(): iterable
195195
*/
196196
public function testResolveGuessOptional()
197197
{
198-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
198+
$manager = $this->createMock(ObjectManager::class);
199199
$registry = $this->createRegistry($manager);
200200
$resolver = new EntityValueResolver($registry);
201201

@@ -204,7 +204,7 @@ public function testResolveGuessOptional()
204204

205205
$argument = $this->createArgument('stdClass', new MapEntity(), 'arg', true);
206206

207-
$metadata = $this->getMockBuilder(ClassMetadata::class)->getMock();
207+
$metadata = $this->createMock(ClassMetadata::class);
208208
$manager->expects($this->once())
209209
->method('getClassMetadata')
210210
->with('stdClass')
@@ -217,7 +217,7 @@ public function testResolveGuessOptional()
217217

218218
public function testResolveWithMappingAndExclude()
219219
{
220-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
220+
$manager = $this->createMock(ObjectManager::class);
221221
$registry = $this->createRegistry($manager);
222222
$resolver = new EntityValueResolver($registry);
223223

@@ -233,7 +233,7 @@ public function testResolveWithMappingAndExclude()
233233
$manager->expects($this->never())
234234
->method('getClassMetadata');
235235

236-
$repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
236+
$repository = $this->createMock(ObjectRepository::class);
237237
$repository->expects($this->once())
238238
->method('findOneBy')
239239
->with(['Foo' => 1])
@@ -249,7 +249,7 @@ public function testResolveWithMappingAndExclude()
249249

250250
public function testResolveWithRouteMapping()
251251
{
252-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
252+
$manager = $this->createMock(ObjectManager::class);
253253
$registry = $this->createRegistry($manager);
254254
$resolver = new EntityValueResolver($registry);
255255

@@ -267,7 +267,7 @@ public function testResolveWithRouteMapping()
267267
$conference = new \stdClass();
268268
$article = new \stdClass();
269269

270-
$repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
270+
$repository = $this->createMock(ObjectRepository::class);
271271
$repository->expects($this->any())
272272
->method('findOneBy')
273273
->willReturnCallback(static fn ($v) => match ($v) {
@@ -285,7 +285,7 @@ public function testResolveWithRouteMapping()
285285

286286
public function testExceptionWithExpressionIfNoLanguageAvailable()
287287
{
288-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
288+
$manager = $this->createMock(ObjectManager::class);
289289
$registry = $this->createRegistry($manager);
290290
$resolver = new EntityValueResolver($registry);
291291

@@ -303,9 +303,9 @@ public function testExceptionWithExpressionIfNoLanguageAvailable()
303303

304304
public function testExpressionFailureReturns404()
305305
{
306-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
306+
$manager = $this->createMock(ObjectManager::class);
307307
$registry = $this->createRegistry($manager);
308-
$language = $this->getMockBuilder(ExpressionLanguage::class)->getMock();
308+
$language = $this->createMock(ExpressionLanguage::class);
309309
$resolver = new EntityValueResolver($registry, $language);
310310

311311
$this->expectException(NotFoundHttpException::class);
@@ -317,7 +317,7 @@ public function testExpressionFailureReturns404()
317317
'arg1'
318318
);
319319

320-
$repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
320+
$repository = $this->createMock(ObjectRepository::class);
321321
// find should not be attempted on this repository as a fallback
322322
$repository->expects($this->never())
323323
->method('find');
@@ -336,9 +336,9 @@ public function testExpressionFailureReturns404()
336336

337337
public function testExpressionMapsToArgument()
338338
{
339-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
339+
$manager = $this->createMock(ObjectManager::class);
340340
$registry = $this->createRegistry($manager);
341-
$language = $this->getMockBuilder(ExpressionLanguage::class)->getMock();
341+
$language = $this->createMock(ExpressionLanguage::class);
342342
$resolver = new EntityValueResolver($registry, $language);
343343

344344
$request = new Request();
@@ -349,7 +349,7 @@ public function testExpressionMapsToArgument()
349349
'arg1'
350350
);
351351

352-
$repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
352+
$repository = $this->createMock(ObjectRepository::class);
353353
// find should not be attempted on this repository as a fallback
354354
$repository->expects($this->never())
355355
->method('find');
@@ -415,9 +415,9 @@ class: \stdClass::class,
415415

416416
public function testExpressionSyntaxErrorThrowsException()
417417
{
418-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
418+
$manager = $this->createMock(ObjectManager::class);
419419
$registry = $this->createRegistry($manager);
420-
$language = $this->getMockBuilder(ExpressionLanguage::class)->getMock();
420+
$language = $this->createMock(ExpressionLanguage::class);
421421
$resolver = new EntityValueResolver($registry, $language);
422422

423423
$request = new Request();
@@ -427,7 +427,7 @@ public function testExpressionSyntaxErrorThrowsException()
427427
'arg1'
428428
);
429429

430-
$repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
430+
$repository = $this->createMock(ObjectRepository::class);
431431
// find should not be attempted on this repository as a fallback
432432
$repository->expects($this->never())
433433
->method('find');
@@ -448,7 +448,7 @@ public function testExpressionSyntaxErrorThrowsException()
448448

449449
public function testAlreadyResolved()
450450
{
451-
$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
451+
$manager = $this->createMock(ObjectManager::class);
452452
$registry = $this->createRegistry($manager);
453453
$resolver = new EntityValueResolver($registry);
454454

@@ -467,7 +467,7 @@ private function createArgument(?string $class = null, ?MapEntity $entity = null
467467

468468
private function createRegistry(?ObjectManager $manager = null): ManagerRegistry&MockObject
469469
{
470-
$registry = $this->getMockBuilder(ManagerRegistry::class)->getMock();
470+
$registry = $this->createMock(ManagerRegistry::class);
471471

472472
$registry->expects($this->any())
473473
->method('getManagerForClass')

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ public function testRenderViewWithForm()
431431
{
432432
$formView = new FormView();
433433

434-
$form = $this->getMockBuilder(FormInterface::class)->getMock();
434+
$form = $this->createMock(FormInterface::class);
435435
$form->expects($this->once())->method('createView')->willReturn($formView);
436436

437437
$twig = $this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock();
@@ -452,7 +452,7 @@ public function testRenderWithFormSubmittedAndInvalid()
452452
{
453453
$formView = new FormView();
454454

455-
$form = $this->getMockBuilder(FormInterface::class)->getMock();
455+
$form = $this->createMock(FormInterface::class);
456456
$form->expects($this->once())->method('createView')->willReturn($formView);
457457
$form->expects($this->once())->method('isSubmitted')->willReturn(true);
458458
$form->expects($this->once())->method('isValid')->willReturn(false);

src/Symfony/Component/HttpKernel/Tests/EventListener/CacheAttributeListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ private function createEventMock(Request $request, Response $response): Response
330330

331331
private function getKernel(): MockObject&HttpKernelInterface
332332
{
333-
return $this->getMockBuilder(HttpKernelInterface::class)->getMock();
333+
return $this->createMock(HttpKernelInterface::class);
334334
}
335335
}
336336

src/Symfony/Component/Messenger/Tests/WorkerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public function testWorkerLimitQueues()
384384
->method('get')
385385
;
386386

387-
$bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
387+
$bus = $this->createMock(MessageBusInterface::class);
388388

389389
$dispatcher = new EventDispatcher();
390390
$dispatcher->addSubscriber(new StopWorkerOnMessageLimitListener(1));
@@ -398,7 +398,7 @@ public function testWorkerLimitQueuesUnsupported()
398398
$receiver1 = $this->createMock(QueueReceiverInterface::class);
399399
$receiver2 = $this->createMock(ReceiverInterface::class);
400400

401-
$bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
401+
$bus = $this->createMock(MessageBusInterface::class);
402402

403403
$worker = new Worker(['transport1' => $receiver1, 'transport2' => $receiver2], $bus, clock: new MockClock());
404404
$this->expectException(RuntimeException::class);

0 commit comments

Comments
 (0)