Skip to content

Commit

Permalink
fixed obsolete getMock() usage
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed Dec 19, 2016
1 parent 43088d9 commit ca0be96
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions Tests/Context/RequestStackContextTest.php
Expand Up @@ -17,7 +17,7 @@ class RequestStackContextTest extends \PHPUnit_Framework_TestCase
{
public function testGetBasePathEmpty()
{
$requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
$requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$requestStackContext = new RequestStackContext($requestStack);

$this->assertEmpty($requestStackContext->getBasePath());
Expand All @@ -27,10 +27,10 @@ public function testGetBasePathSet()
{
$testBasePath = 'test-path';

$request = $this->getMock('Symfony\Component\HttpFoundation\Request');
$request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$request->method('getBasePath')
->willReturn($testBasePath);
$requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
$requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$requestStack->method('getMasterRequest')
->willReturn($request);

Expand All @@ -41,18 +41,18 @@ public function testGetBasePathSet()

public function testIsSecureFalse()
{
$requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
$requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$requestStackContext = new RequestStackContext($requestStack);

$this->assertFalse($requestStackContext->isSecure());
}

public function testIsSecureTrue()
{
$request = $this->getMock('Symfony\Component\HttpFoundation\Request');
$request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
$request->method('isSecure')
->willReturn(true);
$requestStack = $this->getMock('Symfony\Component\HttpFoundation\RequestStack');
$requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->getMock();
$requestStack->method('getMasterRequest')
->willReturn($request);

Expand Down
4 changes: 2 additions & 2 deletions Tests/PackagesTest.php
Expand Up @@ -20,8 +20,8 @@ class PackagesTest extends \PHPUnit_Framework_TestCase
public function testGetterSetters()
{
$packages = new Packages();
$packages->setDefaultPackage($default = $this->getMock('Symfony\Component\Asset\PackageInterface'));
$packages->addPackage('a', $a = $this->getMock('Symfony\Component\Asset\PackageInterface'));
$packages->setDefaultPackage($default = $this->getMockBuilder('Symfony\Component\Asset\PackageInterface')->getMock());
$packages->addPackage('a', $a = $this->getMockBuilder('Symfony\Component\Asset\PackageInterface')->getMock());

$this->assertEquals($default, $packages->getPackage());
$this->assertEquals($a, $packages->getPackage('a'));
Expand Down
2 changes: 1 addition & 1 deletion Tests/PathPackageTest.php
Expand Up @@ -76,7 +76,7 @@ public function getContextConfigs()

private function getContext($basePath)
{
$context = $this->getMock('Symfony\Component\Asset\Context\ContextInterface');
$context = $this->getMockBuilder('Symfony\Component\Asset\Context\ContextInterface')->getMock();
$context->expects($this->any())->method('getBasePath')->will($this->returnValue($basePath));

return $context;
Expand Down
2 changes: 1 addition & 1 deletion Tests/UrlPackageTest.php
Expand Up @@ -94,7 +94,7 @@ public function testWrongBaseUrl()

private function getContext($secure)
{
$context = $this->getMock('Symfony\Component\Asset\Context\ContextInterface');
$context = $this->getMockBuilder('Symfony\Component\Asset\Context\ContextInterface')->getMock();
$context->expects($this->any())->method('isSecure')->will($this->returnValue($secure));

return $context;
Expand Down

0 comments on commit ca0be96

Please sign in to comment.