Skip to content

Commit d097149

Browse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: fixed obsolete getMock() usage [WebProfilerBundle] Display multiple HTTP headers in WDT
2 parents 94fe2eb + 6de0cd1 commit d097149

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎Tests/Loader/DelegatingLoaderTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ public function testGetSetResolver()
3333

3434
public function testSupports()
3535
{
36-
$loader1 = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
36+
$loader1 = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
3737
$loader1->expects($this->once())->method('supports')->will($this->returnValue(true));
3838
$loader = new DelegatingLoader(new LoaderResolver(array($loader1)));
3939
$this->assertTrue($loader->supports('foo.xml'), '->supports() returns true if the resource is loadable');
4040

41-
$loader1 = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
41+
$loader1 = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
4242
$loader1->expects($this->once())->method('supports')->will($this->returnValue(false));
4343
$loader = new DelegatingLoader(new LoaderResolver(array($loader1)));
4444
$this->assertFalse($loader->supports('foo.foo'), '->supports() returns false if the resource is not loadable');
4545
}
4646

4747
public function testLoad()
4848
{
49-
$loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
49+
$loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
5050
$loader->expects($this->once())->method('supports')->will($this->returnValue(true));
5151
$loader->expects($this->once())->method('load');
5252
$resolver = new LoaderResolver(array($loader));
@@ -60,7 +60,7 @@ public function testLoad()
6060
*/
6161
public function testLoadThrowsAnExceptionIfTheResourceCannotBeLoaded()
6262
{
63-
$loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
63+
$loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
6464
$loader->expects($this->once())->method('supports')->will($this->returnValue(false));
6565
$resolver = new LoaderResolver(array($loader));
6666
$loader = new DelegatingLoader($resolver);

‎Tests/Loader/FileLoaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ class FileLoaderTest extends \PHPUnit_Framework_TestCase
1818
{
1919
public function testImportWithFileLocatorDelegation()
2020
{
21-
$locatorMock = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
21+
$locatorMock = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
2222

23-
$locatorMockForAdditionalLoader = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
23+
$locatorMockForAdditionalLoader = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
2424
$locatorMockForAdditionalLoader->expects($this->any())->method('locate')->will($this->onConsecutiveCalls(
2525
array('path/to/file1'), // Default
2626
array('path/to/file1', 'path/to/file2'), // First is imported

‎Tests/Loader/LoaderResolverTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ class LoaderResolverTest extends \PHPUnit_Framework_TestCase
1818
public function testConstructor()
1919
{
2020
$resolver = new LoaderResolver(array(
21-
$loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface'),
21+
$loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock(),
2222
));
2323

2424
$this->assertEquals(array($loader), $resolver->getLoaders(), '__construct() takes an array of loaders as its first argument');
2525
}
2626

2727
public function testResolve()
2828
{
29-
$loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
29+
$loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
3030
$resolver = new LoaderResolver(array($loader));
3131
$this->assertFalse($resolver->resolve('foo.foo'), '->resolve() returns false if no loader is able to load the resource');
3232

33-
$loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
33+
$loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
3434
$loader->expects($this->once())->method('supports')->will($this->returnValue(true));
3535
$resolver = new LoaderResolver(array($loader));
3636
$this->assertEquals($loader, $resolver->resolve(function () {}), '->resolve() returns the loader for the given resource');
@@ -39,7 +39,7 @@ public function testResolve()
3939
public function testLoaders()
4040
{
4141
$resolver = new LoaderResolver();
42-
$resolver->addLoader($loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface'));
42+
$resolver->addLoader($loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock());
4343

4444
$this->assertEquals(array($loader), $resolver->getLoaders(), 'addLoader() adds a loader');
4545
}

‎Tests/Loader/LoaderTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
1717
{
1818
public function testGetSetResolver()
1919
{
20-
$resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
20+
$resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
2121

2222
$loader = new ProjectLoader1();
2323
$loader->setResolver($resolver);
@@ -27,9 +27,9 @@ public function testGetSetResolver()
2727

2828
public function testResolve()
2929
{
30-
$resolvedLoader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
30+
$resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
3131

32-
$resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
32+
$resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
3333
$resolver->expects($this->once())
3434
->method('resolve')
3535
->with('foo.xml')
@@ -47,7 +47,7 @@ public function testResolve()
4747
*/
4848
public function testResolveWhenResolverCannotFindLoader()
4949
{
50-
$resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
50+
$resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
5151
$resolver->expects($this->once())
5252
->method('resolve')
5353
->with('FOOBAR')
@@ -61,13 +61,13 @@ public function testResolveWhenResolverCannotFindLoader()
6161

6262
public function testImport()
6363
{
64-
$resolvedLoader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
64+
$resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
6565
$resolvedLoader->expects($this->once())
6666
->method('load')
6767
->with('foo')
6868
->will($this->returnValue('yes'));
6969

70-
$resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
70+
$resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
7171
$resolver->expects($this->once())
7272
->method('resolve')
7373
->with('foo')
@@ -81,13 +81,13 @@ public function testImport()
8181

8282
public function testImportWithType()
8383
{
84-
$resolvedLoader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
84+
$resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
8585
$resolvedLoader->expects($this->once())
8686
->method('load')
8787
->with('foo', 'bar')
8888
->will($this->returnValue('yes'));
8989

90-
$resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
90+
$resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
9191
$resolver->expects($this->once())
9292
->method('resolve')
9393
->with('foo', 'bar')

‎Tests/Util/XmlUtilsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function testLoadFile()
4747
$this->assertContains('XSD file or callable', $e->getMessage());
4848
}
4949

50-
$mock = $this->getMock(__NAMESPACE__.'\Validator');
50+
$mock = $this->getMockBuilder(__NAMESPACE__.'\Validator')->getMock();
5151
$mock->expects($this->exactly(2))->method('validate')->will($this->onConsecutiveCalls(false, true));
5252

5353
try {

0 commit comments

Comments
 (0)