Skip to content

Commit 99d0b0d

Browse files
XWBXWB
authored
Merge pull request #1346 from Tobion/phpunit-deprecations
fix phpunit deprecations and use ::class constant
2 parents 0f71cc5 + bc3aa96 commit 99d0b0d

File tree

58 files changed

+467
-565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+467
-565
lines changed

‎Tests/Command/CreateCommandTest.php‎

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@
1818
use FOS\ElasticaBundle\Index\AliasProcessor;
1919
use FOS\ElasticaBundle\Index\IndexManager;
2020
use FOS\ElasticaBundle\Index\MappingBuilder;
21+
use PHPUnit\Framework\TestCase;
22+
use Symfony\Component\Console\Input\InputInterface;
23+
use Symfony\Component\Console\Output\OutputInterface;
2124

2225
/**
2326
* @author Oleg Andreyev <[email protected]>
2427
*/
25-
class CreateCommandTest extends \PHPUnit_Framework_TestCase
28+
class CreateCommandTest extends TestCase
2629
{
2730
/**
2831
* @var IndexManager|\PHPUnit_Framework_MockObject_MockObject
@@ -50,35 +53,23 @@ class CreateCommandTest extends \PHPUnit_Framework_TestCase
5053
private $command;
5154

5255
/**
53-
* @var IndexConfig
56+
* @var IndexConfig|\PHPUnit_Framework_MockObject_MockObject
5457
*/
5558
private $indexConfig;
5659

5760
/**
58-
* @var Index
61+
* @var Index|\PHPUnit_Framework_MockObject_MockObject
5962
*/
6063
private $index;
6164

6265
protected function setUp()
6366
{
64-
$this->indexManager = $this->getMockBuilder('\FOS\ElasticaBundle\Index\IndexManager')
65-
->disableOriginalConstructor()
66-
->getMock();
67-
$this->mappingBuilder = $this->getMockBuilder('FOS\ElasticaBundle\Index\MappingBuilder')
68-
->disableOriginalConstructor()
69-
->getMock();
70-
$this->configManager = $this->getMockBuilder('FOS\ElasticaBundle\Configuration\ConfigManager')
71-
->disableOriginalConstructor()
72-
->getMock();
73-
$this->aliasProcessor = $this->getMockBuilder('FOS\ElasticaBundle\Index\AliasProcessor')
74-
->disableOriginalConstructor()
75-
->getMock();
76-
$this->indexConfig = $this->getMockBuilder('\FOS\ElasticaBundle\Configuration\IndexConfig')
77-
->disableOriginalConstructor()
78-
->getMock();
79-
$this->index = $this->getMockBuilder('\FOS\ElasticaBundle\Elastica\Index')
80-
->disableOriginalConstructor()
81-
->getMock();
67+
$this->indexManager = $this->createMock(IndexManager::class);
68+
$this->mappingBuilder = $this->createMock(MappingBuilder::class);
69+
$this->configManager = $this->createMock(ConfigManager::class);
70+
$this->aliasProcessor = $this->createMock(AliasProcessor::class);
71+
$this->indexConfig = $this->createMock(IndexConfig::class);
72+
$this->index = $this->createMock(Index::class);
8273

8374
$this->command = new CreateCommand(
8475
$this->indexManager,
@@ -88,15 +79,10 @@ protected function setUp()
8879
);
8980
}
9081

91-
/**
92-
* Test execute with index provided and with alias.
93-
*
94-
* @return void
95-
*/
9682
public function testExecuteWithIndexProvidedAndWithAlias()
9783
{
98-
$input = $this->getMockForAbstractClass('\Symfony\Component\Console\Input\InputInterface');
99-
$output = $this->getMockForAbstractClass('\Symfony\Component\Console\Output\OutputInterface');
84+
$input = $this->createMock(InputInterface::class);
85+
$output = $this->createMock(OutputInterface::class);
10086

10187
$indexName = 'foo';
10288
$mapping = ['mapping'];
@@ -113,15 +99,10 @@ public function testExecuteWithIndexProvidedAndWithAlias()
11399
$this->command->run($input, $output);
114100
}
115101

116-
/**
117-
* Test execute with index provided and without alias.
118-
*
119-
* @return void
120-
*/
121102
public function testExecuteWithIndexProvidedAndWithoutAlias()
122103
{
123-
$input = $this->getMockForAbstractClass('\Symfony\Component\Console\Input\InputInterface');
124-
$output = $this->getMockForAbstractClass('\Symfony\Component\Console\Output\OutputInterface');
104+
$input = $this->createMock(InputInterface::class);
105+
$output = $this->createMock(OutputInterface::class);
125106

126107
$indexName = 'foo';
127108
$mapping = ['mapping'];
@@ -140,8 +121,8 @@ public function testExecuteWithIndexProvidedAndWithoutAlias()
140121

141122
public function testExecuteAllIndices()
142123
{
143-
$input = $this->getMockForAbstractClass('\Symfony\Component\Console\Input\InputInterface');
144-
$output = $this->getMockForAbstractClass('\Symfony\Component\Console\Output\OutputInterface');
124+
$input = $this->createMock(InputInterface::class);
125+
$output = $this->createMock(OutputInterface::class);
145126
$indexConfig1 = clone $this->indexConfig;
146127
$indexConfig2 = clone $this->indexConfig;
147128
$index1 = clone $this->index;

‎Tests/Command/ResetCommandTest.php‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
use FOS\ElasticaBundle\Command\ResetCommand;
1515
use FOS\ElasticaBundle\Index\IndexManager;
1616
use FOS\ElasticaBundle\Index\Resetter;
17+
use PHPUnit\Framework\TestCase;
1718
use Symfony\Component\Console\Input\ArrayInput;
1819
use Symfony\Component\Console\Output\NullOutput;
1920

20-
class ResetCommandTest extends \PHPUnit_Framework_TestCase
21+
class ResetCommandTest extends TestCase
2122
{
2223
/**
2324
* @var ResetCommand
@@ -36,15 +37,8 @@ class ResetCommandTest extends \PHPUnit_Framework_TestCase
3637

3738
protected function setUp()
3839
{
39-
$this->resetter = $this->getMockBuilder(Resetter::class)
40-
->disableOriginalConstructor()
41-
->setMethods(['resetIndex', 'resetIndexType'])
42-
->getMock();
43-
44-
$this->indexManager = $this->getMockBuilder(IndexManager::class)
45-
->disableOriginalConstructor()
46-
->setMethods(['getAllIndexes'])
47-
->getMock();
40+
$this->resetter = $this->createMock(Resetter::class);
41+
$this->indexManager = $this->createMock(IndexManager::class);
4842

4943
$this->command = new ResetCommand($this->indexManager, $this->resetter);
5044
}

‎Tests/DataCollector/ElasticaDataCollectorTest.php‎

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,26 @@
1212
namespace FOS\ElasticaBundle\Tests\DataCollector;
1313

1414
use FOS\ElasticaBundle\DataCollector\ElasticaDataCollector;
15+
use FOS\ElasticaBundle\Logger\ElasticaLogger;
16+
use PHPUnit\Framework\TestCase;
17+
use Symfony\Component\HttpFoundation\Request;
18+
use Symfony\Component\HttpFoundation\Response;
1519

1620
/**
1721
* @author Richard Miller <[email protected]>
1822
*/
19-
class ElasticaDataCollectorTest extends \PHPUnit_Framework_TestCase
23+
class ElasticaDataCollectorTest extends TestCase
2024
{
2125
public function testCorrectAmountOfQueries()
2226
{
23-
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Request */
24-
$requestMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
25-
->disableOriginalConstructor()
26-
->getMock();
27+
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|Request */
28+
$requestMock = $this->createMock(Request::class);
2729

28-
/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Response */
29-
$responseMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Response')
30-
->disableOriginalConstructor()
31-
->getMock();
30+
/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|Response */
31+
$responseMock = $this->createMock(Response::class);
3232

33-
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|\FOS\ElasticaBundle\Logger\ElasticaLogger */
34-
$loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
35-
->disableOriginalConstructor()
36-
->getMock();
33+
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|ElasticaLogger */
34+
$loggerMock = $this->createMock(ElasticaLogger::class);
3735

3836
$totalQueries = rand();
3937

@@ -48,20 +46,14 @@ public function testCorrectAmountOfQueries()
4846

4947
public function testCorrectQueriesReturned()
5048
{
51-
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Request */
52-
$requestMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
53-
->disableOriginalConstructor()
54-
->getMock();
49+
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|Request */
50+
$requestMock = $this->createMock(Request::class);
5551

56-
/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Response */
57-
$responseMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Response')
58-
->disableOriginalConstructor()
59-
->getMock();
52+
/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|Response */
53+
$responseMock = $this->createMock(Response::class);
6054

61-
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|\FOS\ElasticaBundle\Logger\ElasticaLogger */
62-
$loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
63-
->disableOriginalConstructor()
64-
->getMock();
55+
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|ElasticaLogger */
56+
$loggerMock = $this->createMock(ElasticaLogger::class);
6557

6658
$queries = ['testQueries'];
6759

@@ -76,20 +68,14 @@ public function testCorrectQueriesReturned()
7668

7769
public function testCorrectQueriesTime()
7870
{
79-
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Request */
80-
$requestMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
81-
->disableOriginalConstructor()
82-
->getMock();
71+
/** @var $requestMock \PHPUnit_Framework_MockObject_MockObject|Request */
72+
$requestMock = $this->createMock(Request::class);
8373

84-
/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\HttpFoundation\Response */
85-
$responseMock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Response')
86-
->disableOriginalConstructor()
87-
->getMock();
74+
/** @var $responseMock \PHPUnit_Framework_MockObject_MockObject|Response */
75+
$responseMock = $this->createMock(Response::class);
8876

89-
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|\FOS\ElasticaBundle\Logger\ElasticaLogger */
90-
$loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
91-
->disableOriginalConstructor()
92-
->getMock();
77+
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|ElasticaLogger */
78+
$loggerMock = $this->createMock(ElasticaLogger::class);
9379

9480
$queries = [[
9581
'engineMS' => 15,
@@ -110,9 +96,8 @@ public function testCorrectQueriesTime()
11096

11197
public function testName()
11298
{
113-
$loggerMock = $this->getMockBuilder('FOS\ElasticaBundle\Logger\ElasticaLogger')
114-
->disableOriginalConstructor()
115-
->getMock();
99+
/** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|ElasticaLogger */
100+
$loggerMock = $this->createMock(ElasticaLogger::class);
116101

117102
$elasticaDataCollector = new ElasticaDataCollector($loggerMock);
118103

‎Tests/DependencyInjection/Compiler/RegisterPagerPersistersPassTest.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
use FOS\ElasticaBundle\DependencyInjection\Compiler\RegisterPagerPersistersPass;
66
use FOS\ElasticaBundle\Persister\PagerPersisterInterface;
77
use FOS\ElasticaBundle\Persister\PagerPersisterRegistry;
8+
use PHPUnit\Framework\TestCase;
89
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
910
use Symfony\Component\DependencyInjection\Definition;
1011
use Symfony\Component\DependencyInjection\ContainerBuilder;
1112

12-
class RegisterPagerPersistersPassTest extends \PHPUnit_Framework_TestCase
13+
class RegisterPagerPersistersPassTest extends TestCase
1314
{
1415
public function testShouldImplementCompilerPassInterface()
1516
{
@@ -65,7 +66,8 @@ public function testThrowsIfTagMissesPersisterNameAttribute()
6566

6667
$container->setDefinition('a_persister', $this->createPagerPersisterDefinition([]));
6768

68-
$this->setExpectedException(\InvalidArgumentException::class, 'Elastica pager persister "a_persister" must specify the "persisterName" attribute.');
69+
$this->expectException(\InvalidArgumentException::class);
70+
$this->expectExceptionMessage('Elastica pager persister "a_persister" must specify the "persisterName" attribute.');
6971

7072
$pass->process($container);
7173
}
@@ -80,7 +82,8 @@ public function testThrowsIfPersisterForSuchNameHasBeenAlreadyRegistered()
8082
$container->setDefinition('a_foo_persister', $this->createPagerPersisterDefinition(['persisterName' => 'foo']));
8183
$container->setDefinition('a_bar_persister', $this->createPagerPersisterDefinition(['persisterName' => 'foo']));
8284

83-
$this->setExpectedException(\InvalidArgumentException::class, 'Cannot register pager persister "a_bar_persister". The pager persister "a_foo_persister" has been registered for same name "foo"');
85+
$this->expectException(\InvalidArgumentException::class);
86+
$this->expectExceptionMessage('Cannot register pager persister "a_bar_persister". The pager persister "a_foo_persister" has been registered for same name "foo"');
8487

8588
$pass->process($container);
8689
}
@@ -97,7 +100,8 @@ public function testThrowsIfPagerPersisterServiceDoesNotImplementPagerPersisterI
97100

98101
$container->setDefinition('a_foo_persister', $persister);
99102

100-
$this->setExpectedException(\InvalidArgumentException::class, 'Elastica pager persister "a_foo_persister" with class "stdClass" must implement "FOS\ElasticaBundle\Persister\PagerPersisterInterface".');
103+
$this->expectException(\InvalidArgumentException::class);
104+
$this->expectExceptionMessage('Elastica pager persister "a_foo_persister" with class "stdClass" must implement "FOS\ElasticaBundle\Persister\PagerPersisterInterface".');
101105

102106
$pass->process($container);
103107
}

‎Tests/DependencyInjection/Compiler/RegisterPagerProvidersPassTest.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
use FOS\ElasticaBundle\DependencyInjection\Compiler\RegisterPagerProvidersPass;
66
use FOS\ElasticaBundle\Provider\PagerProviderInterface;
77
use FOS\ElasticaBundle\Provider\PagerProviderRegistry;
8+
use PHPUnit\Framework\TestCase;
89
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
910
use Symfony\Component\DependencyInjection\Definition;
1011
use Symfony\Component\DependencyInjection\ContainerBuilder;
1112

12-
class RegisterPagerProvidersPassTest extends \PHPUnit_Framework_TestCase
13+
class RegisterPagerProvidersPassTest extends TestCase
1314
{
1415
public function testShouldImplementCompilerPassInterface()
1516
{
@@ -73,7 +74,8 @@ public function testThrowsIfTagMissesTypeAttribute()
7374

7475
$container->setDefinition('a_provider', $this->createProviderDefinition([]));
7576

76-
$this->setExpectedException(\InvalidArgumentException::class, 'Elastica provider "a_provider" must specify the "type" attribute.');
77+
$this->expectException(\InvalidArgumentException::class);
78+
$this->expectExceptionMessage('Elastica provider "a_provider" must specify the "type" attribute.');
7779

7880
$pass->process($container);
7981
}
@@ -89,7 +91,8 @@ public function testThrowsIfProviderForSuchIndexTypeHasBeenAlreadyRegistered()
8991
$container->setDefinition('a_foo_provider', $this->createProviderDefinition(['index' => 'foo', 'type' => 'bar']));
9092
$container->setDefinition('a_bar_provider', $this->createProviderDefinition(['index' => 'foo', 'type' => 'bar']));
9193

92-
$this->setExpectedException(\InvalidArgumentException::class, 'Cannot register provider "a_bar_provider". The provider "a_foo_provider" has been registered for same index "foo" and type "bar"');
94+
$this->expectException(\InvalidArgumentException::class);
95+
$this->expectExceptionMessage('Cannot register provider "a_bar_provider". The provider "a_foo_provider" has been registered for same index "foo" and type "bar"');
9396
$pass->process($container);
9497
}
9598

@@ -106,7 +109,8 @@ public function testThrowsIfProviderServiceDoesNotImplementPagerProviderInterfac
106109

107110
$container->setDefinition('a_foo_provider', $provider);
108111

109-
$this->setExpectedException(\InvalidArgumentException::class, 'Elastica provider "a_foo_provider" with class "stdClass" must implement "FOS\ElasticaBundle\Provider\PagerProviderInterface".');
112+
$this->expectException(\InvalidArgumentException::class);
113+
$this->expectExceptionMessage('Elastica provider "a_foo_provider" with class "stdClass" must implement "FOS\ElasticaBundle\Provider\PagerProviderInterface".');
110114

111115
$pass->process($container);
112116
}

‎Tests/DependencyInjection/Compiler/RegisterPersistersPassTest.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
use FOS\ElasticaBundle\DependencyInjection\Compiler\RegisterPersistersPass;
66
use FOS\ElasticaBundle\Persister\ObjectPersisterInterface;
77
use FOS\ElasticaBundle\Persister\PersisterRegistry;
8+
use PHPUnit\Framework\TestCase;
89
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
910
use Symfony\Component\DependencyInjection\Definition;
1011
use Symfony\Component\DependencyInjection\ContainerBuilder;
1112

12-
class RegisterPersistersPassTest extends \PHPUnit_Framework_TestCase
13+
class RegisterPersistersPassTest extends TestCase
1314
{
1415
public function testShouldImplementCompilerPassInterface()
1516
{
@@ -73,7 +74,8 @@ public function testThrowsIfTagMissesTypeAttribute()
7374

7475
$container->setDefinition('a_persister', $this->createPersisterDefinition([]));
7576

76-
$this->setExpectedException(\InvalidArgumentException::class, 'Elastica persister "a_persister" must specify the "type" attribute.');
77+
$this->expectException(\InvalidArgumentException::class);
78+
$this->expectExceptionMessage('Elastica persister "a_persister" must specify the "type" attribute.');
7779

7880
$pass->process($container);
7981
}
@@ -89,7 +91,8 @@ public function testThrowsIfPersisterForSuchIndexTypeHasBeenAlreadyRegistered()
8991
$container->setDefinition('a_foo_persister', $this->createPersisterDefinition(['index' => 'foo', 'type' => 'bar']));
9092
$container->setDefinition('a_bar_persister', $this->createPersisterDefinition(['index' => 'foo', 'type' => 'bar']));
9193

92-
$this->setExpectedException(\InvalidArgumentException::class, 'Cannot register persister "a_bar_persister". The persister "a_foo_persister" has been registered for same index "foo" and type "bar"');
94+
$this->expectException(\InvalidArgumentException::class);
95+
$this->expectExceptionMessage('Cannot register persister "a_bar_persister". The persister "a_foo_persister" has been registered for same index "foo" and type "bar"');
9396

9497
$pass->process($container);
9598
}
@@ -107,7 +110,8 @@ public function testThrowsIfPersisterServiceDoesNotImplementObjectPersisterInter
107110

108111
$container->setDefinition('a_foo_persister', $persister);
109112

110-
$this->setExpectedException(\InvalidArgumentException::class, 'Elastica persister "a_foo_persister" with class "stdClass" must implement "FOS\ElasticaBundle\Persister\ObjectPersisterInterface".');
113+
$this->expectException(\InvalidArgumentException::class);
114+
$this->expectExceptionMessage('Elastica persister "a_foo_persister" with class "stdClass" must implement "FOS\ElasticaBundle\Persister\ObjectPersisterInterface".');
111115

112116
$pass->process($container);
113117
}

‎Tests/DependencyInjection/ConfigurationTest.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,17 @@
1212
namespace FOS\ElasticaBundle\Tests\Resetter\DependencyInjection;
1313

1414
use FOS\ElasticaBundle\DependencyInjection\Configuration;
15+
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Config\Definition\Processor;
1617

17-
/**
18-
* ConfigurationTest.
19-
*/
20-
class ConfigurationTest extends \PHPUnit_Framework_TestCase
18+
class ConfigurationTest extends TestCase
2119
{
2220
/**
2321
* @var Processor
2422
*/
2523
private $processor;
2624

27-
public function setUp()
25+
protected function setUp()
2826
{
2927
$this->processor = new Processor();
3028
}

0 commit comments

Comments
 (0)