Skip to content
This repository was archived by the owner on Jan 1, 2023. It is now read-only.

Commit fd9bac2

Browse files
stofstof
committed
minor #424 Remove usage of deprecated PHUnit mocking APIs (stof)
This PR was merged into the 2.8-dev branch. Discussion ---------- Remove usage of deprecated PHUnit mocking APIs Commits ------- 1ddc07b Remove usage of deprecated PHUnit mocking APIs
2 parents 1de96db + 1ddc07b commit fd9bac2

File tree

7 files changed

+31
-31
lines changed

7 files changed

+31
-31
lines changed

‎Tests/Command/DumpCommandTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ protected function setUp()
4949
$this->definition = $this->getMockBuilder('Symfony\\Component\\Console\\Input\\InputDefinition')
5050
->disableOriginalConstructor()
5151
->getMock();
52-
$this->kernel = $this->getMock('Symfony\\Component\\HttpKernel\\KernelInterface');
53-
$this->helperSet = $this->getMock('Symfony\\Component\\Console\\Helper\\HelperSet');
54-
$this->container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
52+
$this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
53+
$this->helperSet = $this->getMockBuilder('Symfony\\Component\\Console\\Helper\\HelperSet')->getMock();
54+
$this->container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
5555
$this->am = $this->getMockBuilder('Assetic\\Factory\\LazyAssetManager')
5656
->disableOriginalConstructor()
5757
->getMock();
@@ -120,7 +120,7 @@ public function testEmptyAssetManager()
120120

121121
public function testDumpOne()
122122
{
123-
$asset = $this->getMock('Assetic\\Asset\\AssetInterface');
123+
$asset = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
124124

125125
$this->am->expects($this->once())
126126
->method('getNames')
@@ -161,8 +161,8 @@ public function testDumpOne()
161161

162162
public function testDumpDebug()
163163
{
164-
$asset = $this->getMock('Assetic\\Asset\\AssetCollection');
165-
$leaf = $this->getMock('Assetic\\Asset\\AssetInterface');
164+
$asset = $this->getMockBuilder('Assetic\\Asset\\AssetCollection')->getMock();
165+
$leaf = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
166166

167167
$this->am->expects($this->once())
168168
->method('getNames')

‎Tests/Controller/AsseticControllerTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ protected function setUp()
2727
$this->markTestSkipped('Assetic is not available.');
2828
}
2929

30-
$this->request = $this->getMock('Symfony\\Component\\HttpFoundation\\Request', array('getETags', 'getMethod'));
31-
$this->headers = $this->getMock('Symfony\\Component\\HttpFoundation\\ParameterBag');
30+
$this->request = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\Request')->setMethods(array('getETags', 'getMethod'))->getMock();
31+
$this->headers = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\ParameterBag')->getMock();
3232
$this->request->headers = $this->headers;
3333
$this->am = $this->getMockBuilder('Assetic\\Factory\\LazyAssetManager')
3434
->disableOriginalConstructor()
3535
->getMock();
36-
$this->cache = $this->getMock('Assetic\\Cache\\CacheInterface');
36+
$this->cache = $this->getMockBuilder('Assetic\\Cache\\CacheInterface')->getMock();
3737

3838
$this->request->expects($this->any())
3939
->method('getMethod')
@@ -58,7 +58,7 @@ public function testRenderNotFound()
5858

5959
public function testRenderLastModifiedFresh()
6060
{
61-
$asset = $this->getMock('Assetic\\Asset\\AssetInterface');
61+
$asset = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
6262

6363
$name = 'foo';
6464
$lastModified = strtotime('2010-10-10 10:10:10');
@@ -93,7 +93,7 @@ public function testRenderLastModifiedFresh()
9393

9494
public function testRenderLastModifiedStale()
9595
{
96-
$asset = $this->getMock('Assetic\\Asset\\AssetInterface');
96+
$asset = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
9797

9898
$name = 'foo';
9999
$content = '==ASSET_CONTENT==';
@@ -135,7 +135,7 @@ public function testRenderLastModifiedStale()
135135

136136
public function testRenderETagFresh()
137137
{
138-
$asset = $this->getMock('Assetic\\Asset\\AssetInterface');
138+
$asset = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
139139

140140
$name = 'foo';
141141
$formula = array(array('js/core.js'), array(), array(''));
@@ -173,7 +173,7 @@ public function testRenderETagFresh()
173173

174174
public function testRenderETagStale()
175175
{
176-
$asset = $this->getMock('Assetic\\Asset\\AssetInterface');
176+
$asset = $this->getMockBuilder('Assetic\\Asset\\AssetInterface')->getMock();
177177

178178
$name = 'foo';
179179
$content = '==ASSET_CONTENT==';

‎Tests/DependencyInjection/AsseticExtensionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected function setUp()
5656
$this->markTestSkipped('Twig is not available.');
5757
}
5858

59-
$this->kernel = $this->getMock('Symfony\\Component\\HttpKernel\\KernelInterface');
59+
$this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
6060

6161
$this->container = new ContainerBuilder();
6262
// Symfony 2.3 BC

‎Tests/Factory/AssetFactoryTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ protected function setUp()
2626
$this->markTestSkipped('Assetic is not available.');
2727
}
2828

29-
$this->kernel = $this->getMock('Symfony\\Component\\HttpKernel\\KernelInterface');
30-
$this->container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
31-
$this->parameterBag = $this->getMock('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBagInterface');
29+
$this->kernel = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\KernelInterface')->getMock();
30+
$this->container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
31+
$this->parameterBag = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBagInterface')->getMock();
3232
$this->factory = new AssetFactory($this->kernel, $this->container, $this->parameterBag, '/path/to/web');
3333
}
3434

3535
public function testBundleNotation()
3636
{
3737
$input = '@MyBundle/Resources/css/main.css';
38-
$bundle = $this->getMock('Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface');
38+
$bundle = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface')->getMock();
3939

4040
$this->parameterBag->expects($this->once())
4141
->method('resolveValue')
@@ -64,7 +64,7 @@ public function testBundleNotation()
6464
*/
6565
public function testBundleGlobNotation($input)
6666
{
67-
$bundle = $this->getMock('Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface');
67+
$bundle = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface')->getMock();
6868

6969
$this->parameterBag->expects($this->once())
7070
->method('resolveValue')

‎Tests/Factory/Resource/CoalescingDirectoryResourceTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ class CoalescingDirectoryResourceTest extends \PHPUnit_Framework_TestCase
1717
{
1818
public function testFiltering()
1919
{
20-
$dir1 = $this->getMock('Assetic\\Factory\\Resource\\IteratorResourceInterface');
21-
$file1a = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface');
22-
$file1b = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface');
20+
$dir1 = $this->getMockBuilder('Assetic\\Factory\\Resource\\IteratorResourceInterface')->getMock();
21+
$file1a = $this->getMockBuilder('Assetic\\Factory\\Resource\\ResourceInterface')->getMock();
22+
$file1b = $this->getMockBuilder('Assetic\\Factory\\Resource\\ResourceInterface')->getMock();
2323

24-
$dir2 = $this->getMock('Assetic\\Factory\\Resource\\IteratorResourceInterface');
25-
$file2a = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface');
26-
$file2c = $this->getMock('Assetic\\Factory\\Resource\\ResourceInterface');
24+
$dir2 = $this->getMockBuilder('Assetic\\Factory\\Resource\\IteratorResourceInterface')->getMock();
25+
$file2a = $this->getMockBuilder('Assetic\\Factory\\Resource\\ResourceInterface')->getMock();
26+
$file2c = $this->getMockBuilder('Assetic\\Factory\\Resource\\ResourceInterface')->getMock();
2727

2828
$dir1->expects($this->any())
2929
->method('getIterator')

‎Tests/Factory/Resource/FileResourceTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class FileResourceTest extends \PHPUnit_Framework_TestCase
1919

2020
protected function setUp()
2121
{
22-
$this->loader = $this->getMock('Symfony\\Component\\Templating\\Loader\\LoaderInterface');
22+
$this->loader = $this->getMockBuilder('Symfony\\Component\\Templating\\Loader\\LoaderInterface')->getMock();
2323
}
2424

2525
public function testCastAsString()

‎Tests/FilterManagerTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ protected function setUp()
2424

2525
public function testGet()
2626
{
27-
$container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
28-
$filter = $this->getMock('Assetic\\Filter\\FilterInterface');
27+
$container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
28+
$filter = $this->getMockBuilder('Assetic\\Filter\\FilterInterface')->getMock();
2929

3030
$container->expects($this->exactly(2))
3131
->method('get')
@@ -40,16 +40,16 @@ public function testGet()
4040

4141
public function testHas()
4242
{
43-
$container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
43+
$container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
4444

4545
$fm = new FilterManager($container, array('foo' => 'assetic.filter.bar'));
4646
$this->assertTrue($fm->has('foo'), '->has() returns true for lazily mapped filters');
4747
}
4848

4949
public function testGetNames()
5050
{
51-
$container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
52-
$filter = $this->getMock('Assetic\\Filter\\FilterInterface');
51+
$container = $this->getMockBuilder('Symfony\\Component\\DependencyInjection\\ContainerInterface')->getMock();
52+
$filter = $this->getMockBuilder('Assetic\\Filter\\FilterInterface')->getMock();
5353

5454
$fm = new FilterManager($container, array('foo' => 'assetic.filter.bar'));
5555
$fm->set('bar', $filter);

0 commit comments

Comments
 (0)