Fixing deprecated PHPUnit APIs

This commit is contained in:
Daniel Hensby 2017-03-24 15:50:39 +13:00
parent bb7da7cffd
commit 6b4a72dee8
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
5 changed files with 11 additions and 5 deletions

View File

@ -51,7 +51,9 @@ class SwiftMailerTest extends SapphireTest
$email->setFrom('from@example.com'); $email->setFrom('from@example.com');
$email->setSubject('Subject'); $email->setSubject('Subject');
$mailer = $this->getMock(SwiftMailer::class, array('sendSwift')); $mailer = $this->getMockBuilder(SwiftMailer::class)
->setMethods(array('sendSwift'))
->getMock();
$mailer->expects($this->once())->method('sendSwift')->willReturnCallback(function ($message) { $mailer->expects($this->once())->method('sendSwift')->willReturnCallback(function ($message) {
$this->assertInstanceOf(Swift_Message::class, $message); $this->assertInstanceOf(Swift_Message::class, $message);
}); });

View File

@ -4,6 +4,7 @@ namespace SilverStripe\Core\Tests\Injector;
use InvalidArgumentException; use InvalidArgumentException;
use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Injector\Factory;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
use SilverStripe\Core\Injector\SilverStripeServiceConfigurationLocator; use SilverStripe\Core\Injector\SilverStripeServiceConfigurationLocator;
use SilverStripe\Core\Tests\Injector\AopProxyServiceTest\AnotherService; use SilverStripe\Core\Tests\Injector\AopProxyServiceTest\AnotherService;
@ -813,7 +814,7 @@ class InjectorTest extends SapphireTest
) )
); );
$factory = $this->getMock('SilverStripe\\Core\\Injector\\Factory'); $factory = $this->getMockBuilder(Factory::class)->getMock();
$factory $factory
->expects($this->once()) ->expects($this->once())
->method('create') ->method('create')

View File

@ -6,6 +6,7 @@ use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\PaginatedList; use SilverStripe\ORM\PaginatedList;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\ORM\Queries\SQLSelect;
use SilverStripe\ORM\Tests\DataObjectTest\Player; use SilverStripe\ORM\Tests\DataObjectTest\Player;
use SilverStripe\View\ArrayData; use SilverStripe\View\ArrayData;
@ -58,7 +59,7 @@ class PaginatedListTest extends SapphireTest
public function testSetPaginationFromQuery() public function testSetPaginationFromQuery()
{ {
$query = $this->getMock('SilverStripe\\ORM\\Queries\\SQLSelect'); $query = $this->getMockBuilder(SQLSelect::class)->getMock();
$query->expects($this->once()) $query->expects($this->once())
->method('getLimit') ->method('getLimit')
->will($this->returnValue(array('limit' => 15, 'start' => 30))); ->will($this->returnValue(array('limit' => 15, 'start' => 30)));

View File

@ -314,7 +314,8 @@ class ShortcodeParserTest extends SapphireTest
public function testNoParseAttemptIfNoCode() public function testNoParseAttemptIfNoCode()
{ {
$stub = $this->getMock('SilverStripe\\View\\Parsers\\ShortcodeParser', array('replaceElementTagsWithMarkers')); $stub = $this->getMockBuilder(ShortcodeParser::class)->setMethods(array('replaceElementTagsWithMarkers'))
->getMock();
$stub->register( $stub->register(
'test', 'test',
function () { function () {

View File

@ -201,7 +201,8 @@ class SSViewerTest extends SapphireTest
public function testRequirements() public function testRequirements()
{ {
$requirements = $this->getMock("SilverStripe\\View\\Requirements_Backend", array("javascript", "css")); $requirements = $this->getMockBuilder(Requirements_Backend::class)->setMethods(array("javascript", "css"))
->getMock();
$jsFile = FRAMEWORK_DIR . '/tests/forms/a.js'; $jsFile = FRAMEWORK_DIR . '/tests/forms/a.js';
$cssFile = FRAMEWORK_DIR . '/tests/forms/a.js'; $cssFile = FRAMEWORK_DIR . '/tests/forms/a.js';