Skip to content

Commit decc480

Browse files
alexandre-dauboisalexandre-daubois
committed
[Tests] Replace setMethods() by onlyMethods() and addMethods() 
1 parent d0ec59b commit decc480

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 Doctrine\ORM\Version;
1820
use PHPUnit\Framework\TestCase;
1921
use Symfony\Bridge\Doctrine\Form\ChoiceList\ORMQueryBuilderLoader;
@@ -46,8 +48,8 @@ protected function checkIdentifierType($classname, $expectedType)
4648
{
4749
$em = DoctrineTestHelper::createTestEntityManager();
4850

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

5355
$query
@@ -61,7 +63,7 @@ protected function checkIdentifierType($classname, $expectedType)
6163

6264
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
6365
->setConstructorArgs([$em])
64-
->setMethods(['getQuery'])
66+
->onlyMethods(['getQuery'])
6567
->getMock();
6668

6769
$qb->expects($this->once())
@@ -79,8 +81,8 @@ public function testFilterNonIntegerValues()
7981
{
8082
$em = DoctrineTestHelper::createTestEntityManager();
8183

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

8688
$query
@@ -94,7 +96,7 @@ public function testFilterNonIntegerValues()
9496

9597
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
9698
->setConstructorArgs([$em])
97-
->setMethods(['getQuery'])
99+
->onlyMethods(['getQuery'])
98100
->getMock();
99101

100102
$qb->expects($this->once())
@@ -115,8 +117,8 @@ public function testFilterEmptyUuids($entityClass)
115117
{
116118
$em = DoctrineTestHelper::createTestEntityManager();
117119

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

122124
$query
@@ -130,7 +132,7 @@ public function testFilterEmptyUuids($entityClass)
130132

131133
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
132134
->setConstructorArgs([$em])
133-
->setMethods(['getQuery'])
135+
->onlyMethods(['getQuery'])
134136
->getMock();
135137

136138
$qb->expects($this->once())
@@ -160,8 +162,8 @@ public function testFilterUid($entityClass)
160162

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

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

167169
$query
@@ -175,7 +177,7 @@ public function testFilterUid($entityClass)
175177

176178
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
177179
->setConstructorArgs([$em])
178-
->setMethods(['getQuery'])
180+
->onlyMethods(['getQuery'])
179181
->getMock();
180182

181183
$qb->expects($this->once())
@@ -207,7 +209,7 @@ public function testUidThrowProperException($entityClass)
207209

208210
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
209211
->setConstructorArgs([$em])
210-
->setMethods(['getQuery'])
212+
->onlyMethods(['getQuery'])
211213
->getMock();
212214

213215
$qb->expects($this->never())
@@ -234,8 +236,8 @@ public function testEmbeddedIdentifierName()
234236

235237
$em = DoctrineTestHelper::createTestEntityManager();
236238

237-
$query = $this->getMockBuilder(\QueryMock::class)
238-
->setMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
239+
$query = $this->getMockBuilder(QueryMock::class)
240+
->onlyMethods(['setParameter', 'getResult', 'getSql', '_doExecute'])
239241
->getMock();
240242

241243
$query
@@ -249,7 +251,7 @@ public function testEmbeddedIdentifierName()
249251

250252
$qb = $this->getMockBuilder(\Doctrine\ORM\QueryBuilder::class)
251253
->setConstructorArgs([$em])
252-
->setMethods(['getQuery'])
254+
->onlyMethods(['getQuery'])
253255
->getMock();
254256
$qb->expects($this->once())
255257
->method('getQuery')
@@ -278,3 +280,24 @@ public static function provideUidEntityClasses()
278280
];
279281
}
280282
}
283+
284+
class QueryMock extends AbstractQuery
285+
{
286+
public function __construct()
287+
{
288+
}
289+
290+
/**
291+
* @return array|string
292+
*/
293+
public function getSQL()
294+
{
295+
}
296+
297+
/**
298+
* @return Result|int
299+
*/
300+
protected function _doExecute()
301+
{
302+
}
303+
}

‎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)