From 6b4a72dee83deed73c39d9b9edc52fd1babd42fe Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Fri, 24 Mar 2017 15:50:39 +1300
Subject: [PATCH] Fixing deprecated PHPUnit APIs

---
 tests/php/Control/Email/SwiftMailerTest.php    | 4 +++-
 tests/php/Core/Injector/InjectorTest.php       | 3 ++-
 tests/php/ORM/PaginatedListTest.php            | 3 ++-
 tests/php/View/Parsers/ShortcodeParserTest.php | 3 ++-
 tests/php/View/SSViewerTest.php                | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/php/Control/Email/SwiftMailerTest.php b/tests/php/Control/Email/SwiftMailerTest.php
index 22b20537d..40a727ba5 100644
--- a/tests/php/Control/Email/SwiftMailerTest.php
+++ b/tests/php/Control/Email/SwiftMailerTest.php
@@ -51,7 +51,9 @@ class SwiftMailerTest extends SapphireTest
         $email->setFrom('from@example.com');
         $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) {
             $this->assertInstanceOf(Swift_Message::class, $message);
         });
diff --git a/tests/php/Core/Injector/InjectorTest.php b/tests/php/Core/Injector/InjectorTest.php
index 6bbaf1fcd..5f4877597 100644
--- a/tests/php/Core/Injector/InjectorTest.php
+++ b/tests/php/Core/Injector/InjectorTest.php
@@ -4,6 +4,7 @@ namespace SilverStripe\Core\Tests\Injector;
 
 use InvalidArgumentException;
 use SilverStripe\Core\Config\Config;
+use SilverStripe\Core\Injector\Factory;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Injector\SilverStripeServiceConfigurationLocator;
 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
             ->expects($this->once())
             ->method('create')
diff --git a/tests/php/ORM/PaginatedListTest.php b/tests/php/ORM/PaginatedListTest.php
index a688eb619..401335b4a 100644
--- a/tests/php/ORM/PaginatedListTest.php
+++ b/tests/php/ORM/PaginatedListTest.php
@@ -6,6 +6,7 @@ use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\PaginatedList;
 use SilverStripe\Dev\SapphireTest;
+use SilverStripe\ORM\Queries\SQLSelect;
 use SilverStripe\ORM\Tests\DataObjectTest\Player;
 use SilverStripe\View\ArrayData;
 
@@ -58,7 +59,7 @@ class PaginatedListTest extends SapphireTest
 
     public function testSetPaginationFromQuery()
     {
-        $query = $this->getMock('SilverStripe\\ORM\\Queries\\SQLSelect');
+        $query = $this->getMockBuilder(SQLSelect::class)->getMock();
         $query->expects($this->once())
             ->method('getLimit')
             ->will($this->returnValue(array('limit' => 15, 'start' => 30)));
diff --git a/tests/php/View/Parsers/ShortcodeParserTest.php b/tests/php/View/Parsers/ShortcodeParserTest.php
index f3c88d37f..ba4eb6040 100644
--- a/tests/php/View/Parsers/ShortcodeParserTest.php
+++ b/tests/php/View/Parsers/ShortcodeParserTest.php
@@ -314,7 +314,8 @@ class ShortcodeParserTest extends SapphireTest
 
     public function testNoParseAttemptIfNoCode()
     {
-        $stub = $this->getMock('SilverStripe\\View\\Parsers\\ShortcodeParser', array('replaceElementTagsWithMarkers'));
+        $stub = $this->getMockBuilder(ShortcodeParser::class)->setMethods(array('replaceElementTagsWithMarkers'))
+            ->getMock();
         $stub->register(
             'test',
             function () {
diff --git a/tests/php/View/SSViewerTest.php b/tests/php/View/SSViewerTest.php
index 5c7d32617..44264e34d 100644
--- a/tests/php/View/SSViewerTest.php
+++ b/tests/php/View/SSViewerTest.php
@@ -201,7 +201,8 @@ class SSViewerTest extends SapphireTest
 
     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';
         $cssFile = FRAMEWORK_DIR . '/tests/forms/a.js';