Skip to content

Commit 70e9e36

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.2
* 5.4: [Tests] Replace `setMethods()` by `onlyMethods()` and `addMethods()`
2 parents 35cb504 + decc480 commit 70e9e36

File tree

5 files changed

+48
-24
lines changed

5 files changed

+48
-24
lines changed

‎Tests/DependencyInjection/DoctrineExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected function setUp(): void
3434

3535
$this->extension = $this
3636
->getMockBuilder(AbstractDoctrineExtension::class)
37-
->setMethods([
37+
->onlyMethods([
3838
'getMappingResourceConfigDirectory',
3939
'getObjectManagerElementName',
4040
'getMappingObjectDefaultName',

‎Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
namespace Symfony\Bridge\Doctrine\Tests\Form\ChoiceList;
1313

1414
use Doctrine\DBAL\Connection;
15+
use Doctrine\DBAL\Result;
1516
use Doctrine\DBAL\Types\GuidType;
1617
use Doctrine\DBAL\Types\Type;
18+
use Doctrine\ORM\AbstractQuery;
1719
use PHPUnit\Framework\TestCase;
1820
use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
1921
use Symfony\Bridge\Doctrine\Tests\DoctrineTestHelper;
@@ -45,8 +47,8 @@ protected function checkIdentifierType($classname, $expectedType)
4547
{
4648
$em = DoctrineTestHelper::createTestEntityManager();
4749

48-
$query = $this->getMockBuilder(\QueryMock::class)
49-
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
50+
$query = $this->getMockBuilder(QueryMock::class)
51+
->onlyMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
5052
->getMock();
5153

5254
$query
@@ -60,7 +62,7 @@ protected function checkIdentifierType($classname, $expectedType)
6062

6163
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
6264
->setConstructorArgs([$em])
63-
->setMethods(['getQuery'])
65+
->onlyMethods(['getQuery'])
6466
->getMock();
6567

6668
$qb->expects($this->once())
@@ -78,8 +80,8 @@ public function testFilterNonIntegerValues()
7880
{
7981
$em = DoctrineTestHelper::createTestEntityManager();
8082

81-
$query = $this->getMockBuilder(\QueryMock::class)
82-
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
83+
$query = $this->getMockBuilder(QueryMock::class)
84+
->onlyMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
8385
->getMock();
8486

8587
$query
@@ -93,7 +95,7 @@ public function testFilterNonIntegerValues()
9395

9496
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
9597
->setConstructorArgs([$em])
96-
->setMethods(['getQuery'])
98+
->onlyMethods(['getQuery'])
9799
->getMock();
98100

99101
$qb->expects($this->once())
@@ -114,8 +116,8 @@ public function testFilterEmptyUuids($entityClass)
114116
{
115117
$em = DoctrineTestHelper::createTestEntityManager();
116118

117-
$query = $this->getMockBuilder(\QueryMock::class)
118-
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
119+
$query = $this->getMockBuilder(QueryMock::class)
120+
->onlyMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
119121
->getMock();
120122

121123
$query
@@ -129,7 +131,7 @@ public function testFilterEmptyUuids($entityClass)
129131

130132
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
131133
->setConstructorArgs([$em])
132-
->setMethods(['getQuery'])
134+
->onlyMethods(['getQuery'])
133135
->getMock();
134136

135137
$qb->expects($this->once())
@@ -159,8 +161,8 @@ public function testFilterUid($entityClass)
159161

160162
$em = DoctrineTestHelper::createTestEntityManager();
161163

162-
$query = $this->getMockBuilder(\QueryMock::class)
163-
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
164+
$query = $this->getMockBuilder(QueryMock::class)
165+
->onlyMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
164166
->getMock();
165167

166168
$query
@@ -174,7 +176,7 @@ public function testFilterUid($entityClass)
174176

175177
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
176178
->setConstructorArgs([$em])
177-
->setMethods(['getQuery'])
179+
->onlyMethods(['getQuery'])
178180
->getMock();
179181

180182
$qb->expects($this->once())
@@ -206,7 +208,7 @@ public function testUidThrowProperException($entityClass)
206208

207209
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
208210
->setConstructorArgs([$em])
209-
->setMethods(['getQuery'])
211+
->onlyMethods(['getQuery'])
210212
->getMock();
211213

212214
$qb->expects($this->never())
@@ -227,8 +229,8 @@ public function testEmbeddedIdentifierName()
227229
{
228230
$em = DoctrineTestHelper::createTestEntityManager();
229231

230-
$query = $this->getMockBuilder(\QueryMock::class)
231-
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
232+
$query = $this->getMockBuilder(QueryMock::class)
233+
->onlyMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
232234
->getMock();
233235

234236
$query
@@ -242,7 +244,7 @@ public function testEmbeddedIdentifierName()
242244

243245
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
244246
->setConstructorArgs([$em])
245-
->setMethods(['getQuery'])
247+
->onlyMethods(['getQuery'])
246248
->getMock();
247249
$qb->expects($this->once())
248250
->method('getQuery')
@@ -271,3 +273,24 @@ public static function provideUidEntityClasses()
271273
];
272274
}
273275
}
276+
277+
class QueryMock extends AbstractQuery
278+
{
279+
public function __construct()
280+
{
281+
}
282+
283+
/**
284+
* @return array|string
285+
*/
286+
public function getSQL()
287+
{
288+
}
289+
290+
/**
291+
* @return Result|int
292+
*/
293+
protected function _doExecute()
294+
{
295+
}
296+
}

‎Tests/Logger/DbalLoggerTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testLog($sql, $params, $logParams)
3030
$dbalLogger = $this
3131
->getMockBuilder(DbalLogger::class)
3232
->setConstructorArgs([$logger, null])
33-
->setMethods(['log'])
33+
->onlyMethods(['log'])
3434
->getMock()
3535
;
3636

@@ -62,7 +62,7 @@ public function testLogNonUtf8()
6262
$dbalLogger = $this
6363
->getMockBuilder(DbalLogger::class)
6464
->setConstructorArgs([$logger, null])
65-
->setMethods(['log'])
65+
->onlyMethods(['log'])
6666
->getMock()
6767
;
6868

@@ -85,7 +85,7 @@ public function testLogNonUtf8Array()
8585
$dbalLogger = $this
8686
->getMockBuilder(DbalLogger::class)
8787
->setConstructorArgs([$logger, null])
88-
->setMethods(['log'])
88+
->onlyMethods(['log'])
8989
->getMock()
9090
;
9191

@@ -116,7 +116,7 @@ public function testLogLongString()
116116
$dbalLogger = $this
117117
->getMockBuilder(DbalLogger::class)
118118
->setConstructorArgs([$logger, null])
119-
->setMethods(['log'])
119+
->onlyMethods(['log'])
120120
->getMock()
121121
;
122122

@@ -144,7 +144,7 @@ public function testLogUTF8LongString()
144144
$dbalLogger = $this
145145
->getMockBuilder(DbalLogger::class)
146146
->setConstructorArgs([$logger, null])
147-
->setMethods(['log'])
147+
->onlyMethods(['log'])
148148
->getMock()
149149
;
150150

‎Tests/Security/User/EntityUserProviderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ private function getManager($em, $name = null)
211211
private function getObjectManager($repository)
212212
{
213213
$em = $this->getMockBuilder(ObjectManager::class)
214-
->setMethods(['getClassMetadata', 'getRepository'])
214+
->onlyMethods(['getClassMetadata', 'getRepository'])
215215
->getMockForAbstractClass();
216216
$em->expects($this->any())
217217
->method('getRepository')

‎Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ protected function createRegistryMock($em = null)
9696
protected function createRepositoryMock()
9797
{
9898
$repository = $this->getMockBuilder(ObjectRepository::class)
99-
->setMethods(['findByCustom', 'find', 'findAll', 'findOneBy', 'findBy', 'getClassName'])
99+
->onlyMethods(['find', 'findAll', 'findOneBy', 'findBy', 'getClassName'])
100+
->addMethods(['findByCustom'])
100101
->getMock()
101102
;
102103

0 commit comments

Comments
 (0)