Skip to content

Commit c656596

Browse files
author
Sengorius
committed
updated tests to match new PhpUnit v12 standards
1 parent 878e025 commit c656596

9 files changed

Lines changed: 53 additions & 32 deletions
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
3+
namespace SkriptManufaktur\SimpleRestBundle\Tests\Fixtures;
4+
5+
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
6+
use Doctrine\Persistence\ManagerRegistry;
7+
8+
class DummyEntityRepository extends ServiceEntityRepository
9+
{
10+
public function __construct(ManagerRegistry $registry)
11+
{
12+
parent::__construct($registry, EmbeddedDummyEntity::class);
13+
}
14+
15+
public function getOneFromId(int $id): EmbeddedDummyEntity
16+
{
17+
return new EmbeddedDummyEntity()->setId($id);
18+
}
19+
20+
public function getOneFromUuid(string $uuid): EmbeddedUuidDummyEntity
21+
{
22+
return new EmbeddedUuidDummyEntity()->setId($uuid);
23+
}
24+
}

tests/Middleware/ApiBusWrapperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ public function testCheckMessageResultWithProxyClassNotAllowed(): void
282282
private function createApiBusWrapper(object $message, array $stamps = []): ApiBusWrapper
283283
{
284284
$envelope = Envelope::wrap($message, $stamps);
285-
$messageBus = $this->createMock(MessageBusInterface::class);
285+
$messageBus = $this->createStub(MessageBusInterface::class);
286286
$messageBus->method('dispatch')
287287
->with($message, $stamps)
288288
->willReturn($envelope)

tests/Normalizer/EntityIdNormalizerTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@ protected function setUp(): void
2323
parent::setUp();
2424

2525
$this->embeddeds = [
26-
(new EmbeddedDummyEntity())
26+
new EmbeddedDummyEntity()
2727
->setId(3)
2828
->setType('t1')
2929
->setActive(true)
3030
,
31-
(new EmbeddedDummyEntity())
31+
new EmbeddedDummyEntity()
3232
->setId(4)
3333
->setType('t2')
3434
->setActive(true)
3535
,
36-
(new EmbeddedDummyEntity())
36+
new EmbeddedDummyEntity()
3737
->setId(5)
3838
->setType('t3')
3939
->setActive(true)
4040
,
41-
(new EmbeddedDummyEntity())
41+
new EmbeddedDummyEntity()
4242
->setId(6)
4343
->setType('t1')
4444
->setActive(false)
@@ -160,8 +160,8 @@ public function testWithDifferentClassMapMethod(): void
160160
'created' => '2022-08-20 14:20:54',
161161
];
162162

163-
$result = $this->createIdSerializer('getOne')->denormalize($data, DummyEntity::class, null, [
164-
EntityIdDenormalizer::CLASS_MAP => [EmbeddedDummyEntity::class => 'getOne'],
163+
$result = $this->createIdSerializer('getOneFromId')->denormalize($data, DummyEntity::class, null, [
164+
EntityIdDenormalizer::CLASS_MAP => [EmbeddedDummyEntity::class => 'getOneFromId'],
165165
]);
166166

167167
static::assertInstanceOf(DummyEntity::class, $result);

tests/Normalizer/EntityUuidNormalizerTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@ protected function setUp(): void
2323
parent::setUp();
2424

2525
$this->embeddeds = [
26-
(new EmbeddedUuidDummyEntity())
26+
new EmbeddedUuidDummyEntity()
2727
->setId('56c190d2-c864-43c5-8c2a-61092b2474c6')
2828
->setType('t1')
2929
->setActive(true)
3030
,
31-
(new EmbeddedUuidDummyEntity())
31+
new EmbeddedUuidDummyEntity()
3232
->setId('a92fb3c0-5132-4ed7-96e3-b917dbabf681')
3333
->setType('t2')
3434
->setActive(true)
3535
,
36-
(new EmbeddedUuidDummyEntity())
36+
new EmbeddedUuidDummyEntity()
3737
->setId('6e6e7d62-f2f3-4414-9da9-01e1768da6ea')
3838
->setType('t3')
3939
->setActive(true)
4040
,
41-
(new EmbeddedUuidDummyEntity())
41+
new EmbeddedUuidDummyEntity()
4242
->setId('f079b6da-3f5c-4655-850c-abd7ab22d65d')
4343
->setType('t1')
4444
->setActive(false)
@@ -164,8 +164,8 @@ public function testWithDifferentClassMapMethod(): void
164164
'created' => '2022-08-20 14:20:54',
165165
];
166166

167-
$result = $this->createUuidSerializer('getOne')->denormalize($data, DummyEntity::class, null, [
168-
EntityUuidDenormalizer::CLASS_MAP => [EmbeddedUuidDummyEntity::class => 'getOne'],
167+
$result = $this->createUuidSerializer('getOneFromUuid')->denormalize($data, DummyEntity::class, null, [
168+
EntityUuidDenormalizer::CLASS_MAP => [EmbeddedUuidDummyEntity::class => 'getOneFromUuid'],
169169
]);
170170

171171
static::assertInstanceOf(DummyEntity::class, $result);

tests/Normalizer/SerializerMockingTrait.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace SkriptManufaktur\SimpleRestBundle\Tests\Normalizer;
44

5-
use Doctrine\ORM\EntityRepository;
65
use Doctrine\Persistence\ManagerRegistry;
76
use Doctrine\Persistence\ObjectManager;
87
use SkriptManufaktur\SimpleRestBundle\Component\EntityIdDenormalizer;
98
use SkriptManufaktur\SimpleRestBundle\Component\EntityUuidDenormalizer;
9+
use SkriptManufaktur\SimpleRestBundle\Tests\Fixtures\DummyEntityRepository;
1010
use SkriptManufaktur\SimpleRestBundle\Tests\Fixtures\EmbeddedDummyEntity;
1111
use SkriptManufaktur\SimpleRestBundle\Tests\Fixtures\EmbeddedUuidDummyEntity;
1212
use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
@@ -65,28 +65,26 @@ private function createUuidSerializer(string $hydrationMethod): Serializer
6565

6666
private function createManagerRegistry(string $hydratingMethod, string $className, callable $repoCallback): ManagerRegistry
6767
{
68-
$repository = $this->getMockBuilder(EntityRepository::class)
68+
$repository = $this->getStubBuilder(DummyEntityRepository::class)
6969
->disableOriginalConstructor()
7070
->disableOriginalClone()
71-
->disableArgumentCloning()
72-
->onlyMethods(['find', 'findAll'])
73-
->addMethods(['getOne'])
74-
->getMock()
71+
->onlyMethods(['find', 'findAll', 'getOneFromId', 'getOneFromUuid'])
72+
->getStub()
7573
;
7674

7775
$repository
7876
->method($hydratingMethod)
7977
->willReturnCallback($repoCallback)
8078
;
8179

82-
$objManager = $this->createMock(ObjectManager::class);
80+
$objManager = $this->createStub(ObjectManager::class);
8381
$objManager
8482
->method('getRepository')
8583
->with($className)
8684
->willReturn($repository)
8785
;
8886

89-
$registry = $this->createMock(ManagerRegistry::class);
87+
$registry = $this->createStub(ManagerRegistry::class);
9088
$registry
9189
->method('getManagerForClass')
9290
->with($className)

tests/Unit/EntityFactoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public function testAddInvalidBoolSearch(): void
338338

339339
private function createQueryBuilder(): QueryBuilder
340340
{
341-
$emMock = self::createMock(EntityManagerInterface::class);
341+
$emMock = $this->createStub(EntityManagerInterface::class);
342342

343343
$qb = new QueryBuilder($emMock);
344344
$qb->select('t')->from('DummyUser', 't');
@@ -348,7 +348,7 @@ private function createQueryBuilder(): QueryBuilder
348348

349349
private function createFactoryWrapper(): ServiceEntityFactory
350350
{
351-
$mrMock = self::createMock(ManagerRegistry::class);
351+
$mrMock = $this->createStub(ManagerRegistry::class);
352352

353353
return new class($mrMock, DummyEntity::class) extends ServiceEntityFactory
354354
{

tests/Unit/ValidationPreparationTest.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace SkriptManufaktur\SimpleRestBundle\Tests\Unit;
44

55
use Generator;
6+
use PHPUnit\Framework\Attributes\DataProvider;
67
use PHPUnit\Framework\TestCase;
78
use SkriptManufaktur\SimpleRestBundle\Validation\ValidationPreparationTrait;
89

@@ -11,13 +12,7 @@ class ValidationPreparationTest extends TestCase
1112
use ValidationPreparationTrait;
1213

1314

14-
/**
15-
* @dataProvider validationProvider
16-
*
17-
* @param string $propertyPath
18-
* @param string $finishedPropertyPath
19-
* @param array $result
20-
*/
15+
#[DataProvider('validationProvider')]
2116
public function testCreation(string $propertyPath, string $finishedPropertyPath, array $result): void
2217
{
2318
$violations = [];

tests/Voter/DefaultVoterTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace SkriptManufaktur\SimpleRestBundle\Tests\Voter;
44

55
use Exception;
6+
use PHPUnit\Framework\Attributes\CoversClass;
67
use PHPUnit\Framework\TestCase;
78
use SkriptManufaktur\SimpleRestBundle\Tests\Fixtures\DefaultVoter;
89
use SkriptManufaktur\SimpleRestBundle\Tests\Fixtures\DummyMessage;
@@ -12,6 +13,7 @@
1213
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
1314
use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
1415

16+
#[CoversClass(GrantingStamp::class)]
1517
class DefaultVoterTest extends TestCase
1618
{
1719
private TokenInterface $token;
@@ -22,7 +24,7 @@ protected function setUp(): void
2224
{
2325
parent::setUp();
2426

25-
$this->token = $this->createMock(TokenInterface::class);
27+
$this->token = $this->createStub(TokenInterface::class);
2628
$this->manager = new AccessDecisionManager([new DefaultVoter(), new DummyVoter()]);
2729
}
2830

tests/Voter/GrantingVoterTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace SkriptManufaktur\SimpleRestBundle\Tests\Voter;
44

5+
use PHPUnit\Framework\Attributes\CoversClass;
56
use PHPUnit\Framework\TestCase;
67
use SkriptManufaktur\SimpleRestBundle\Tests\Fixtures\DefaultVoter;
78
use SkriptManufaktur\SimpleRestBundle\Tests\Fixtures\DummyMessage;
@@ -12,6 +13,7 @@
1213
use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
1314
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
1415

16+
#[CoversClass(GrantingStamp::class)]
1517
class GrantingVoterTest extends TestCase
1618
{
1719
private TokenInterface $token;
@@ -23,7 +25,7 @@ protected function setUp(): void
2325
{
2426
parent::setUp();
2527

26-
$this->token = $this->createMock(TokenInterface::class);
28+
$this->token = $this->createStub(TokenInterface::class);
2729
$this->grantingVoter = new DummyVoter();
2830
$this->manager = new AccessDecisionManager([$this->grantingVoter, new DefaultVoter()]);
2931
}

0 commit comments

Comments
 (0)