Upgrade master to PHPUnit 8

composer.json

@@ -54,8 +54,7 @@
         "ext-xml": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "7.1.3",
-        "sminnee/phpunit-mock-objects": "^3.4.5",
+        "phpunit/phpunit": "^8",
         "silverstripe/versioned": "^2"
     },
     "provide": {

docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md

@@ -110,7 +110,7 @@ use SilverStripe\Dev\SapphireTest;
 
 class PageTest extends SapphireTest
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

src/Dev/FunctionalTest.php

@@ -80,7 +80,7 @@ public function session() : Session
         return $this->mainSession->session();
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -112,7 +112,7 @@ protected function setUp()
         SecurityToken::disable();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         SecurityToken::enable();
         unset($this->mainSession);

src/Dev/SapphireTest.php

@@ -261,7 +261,7 @@ public function getRequireDefaultRecordsFrom()
      *
      * User code should call parent::setUp() before custom setup code
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!defined('FRAMEWORK_PATH')) {
             trigger_error(
@@ -373,7 +373,7 @@ protected function currentTestDisablesDatabase() : bool
      *
      * @throws Exception
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         // Start tests
         static::start();
@@ -402,7 +402,7 @@ public static function setUpBeforeClass()
      *
      * User code should call parent::tearDownAfterClass() after custom tear down code
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         // Call state helpers
         static::$state->tearDownOnce(static::class);
@@ -567,7 +567,7 @@ protected function getCurrentRelativePath() : string
      *
      * User code should call parent::tearDown() after custom tear down code
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         // Reset mocked datetime
         DBDatetime::clear_mock_now();

tests/php/Control/ControllerTest.php

@@ -40,7 +40,7 @@ class ControllerTest extends FunctionalTest
         UnsecuredController::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Director::config()->update('alternate_base_url', '/');

tests/php/Control/CookieTest.php

@@ -10,7 +10,7 @@
 class CookieTest extends SapphireTest
 {
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Injector::inst()->registerService(new CookieJar($_COOKIE), 'SilverStripe\\Control\\Cookie_Backend');

tests/php/Control/DirectorTest.php

@@ -29,7 +29,7 @@ class DirectorTest extends SapphireTest
 
     private $originalEnvType;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Director::config()->set('alternate_base_url', 'http://www.mysite.com:9090/');
@@ -44,10 +44,10 @@ protected function setUp()
         $this->expectedRedirect = null;
     }
 
-    protected function tearDown(...$args)
+    protected function tearDown(): void
     {
         Environment::setEnv('SS_ENVIRONMENT_TYPE', $this->originalEnvType);
-        parent::tearDown(...$args);
+        parent::tearDown();
     }
 
     protected function getExtraRoutes()

tests/php/Control/Email/SwiftPluginTest.php

@@ -9,7 +9,7 @@
 class SwiftPluginTest extends SapphireTest
 {
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/php/Control/HTTPCacheControlIntegrationTest.php

@@ -16,7 +16,7 @@ class HTTPCacheControlIntegrationTest extends FunctionalTest
         RuleController::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         HTTPCacheControlMiddleware::config()

tests/php/Control/HTTPTest.php

@@ -19,7 +19,7 @@
  */
 class HTTPTest extends FunctionalTest
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         // Set to disabled at null forcing level

tests/php/Control/Middleware/CanonicalURLMiddlewareTest.php

@@ -16,7 +16,7 @@ class CanonicalURLMiddlewareTest extends SapphireTest
      */
     protected $middleware;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/php/Control/Middleware/HTTPCacheControlMiddlewareTest.php

@@ -8,7 +8,7 @@
 
 class HTTPCacheControlMiddlewareTest extends SapphireTest
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         // Set to disabled at null forcing level

tests/php/Control/Middleware/RateLimitMiddlewareTest.php

@@ -17,7 +17,7 @@ class RateLimitMiddlewareTest extends FunctionalTest
         TestController::class,
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         DBDatetime::set_mock_now('2017-09-27 00:00:00');

tests/php/Control/RSS/RSSFeedTest.php

@@ -99,7 +99,7 @@ public function testRenderWithTemplate()
         $this->assertNotContains('<title>Test Custom Template</title>', $content);
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Config::modify()->set(Director::class, 'alternate_base_url', '/');
@@ -116,7 +116,7 @@ function () {
         );
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         $_SERVER['HTTP_HOST'] = self::$original_host;

tests/php/Control/SessionTest.php

@@ -18,10 +18,10 @@ class SessionTest extends SapphireTest
      */
     protected $session = null;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->session = new Session([]);
-        return parent::setUp();
+        parent::setUp();
     }
 
     /**

tests/php/Control/SimpleResourceURLGeneratorTest.php

@@ -11,7 +11,7 @@
 
 class SimpleResourceURLGeneratorTest extends SapphireTest
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         Director::config()->set(

tests/php/Core/Cache/CacheTest.php

@@ -13,7 +13,7 @@
 
 class CacheTest extends SapphireTest
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/php/Core/Cache/RateLimiterTest.php

@@ -11,7 +11,7 @@
 class RateLimiterTest extends SapphireTest
 {
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         DBDatetime::set_mock_now('2017-09-27 00:00:00');

tests/php/Core/ClassInfoTest.php

@@ -30,7 +30,7 @@ class ClassInfoTest extends SapphireTest
         WithRelation::class,
     );
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         ClassInfo::reset_db_cache();

tests/php/Core/ConvertTest.php

@@ -19,14 +19,14 @@ class ConvertTest extends SapphireTest
 
     private $previousLocaleSetting = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         // clear the previous locale setting
         $this->previousLocaleSetting = null;
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         // If a test sets the locale, reset it on teardown

tests/php/Core/CoreTest.php

@@ -15,7 +15,7 @@ class CoreTest extends SapphireTest
 
     protected $tempPath;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->tempPath = Director::baseFolder() . DIRECTORY_SEPARATOR . 'silverstripe-cache';
@@ -52,7 +52,7 @@ public function testGetTempPathInProject()
         }
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         $user = TempFolder::getTempFolderUsername();

tests/php/Core/Injector/InjectorTest.php

@@ -44,14 +44,14 @@ class InjectorTest extends SapphireTest
 
     protected $nestingLevel = 0;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->nestingLevel = 0;
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
 
         while ($this->nestingLevel > 0) {

tests/php/Core/Manifest/ClassLoaderTest.php

@@ -32,7 +32,7 @@ class ClassLoaderTest extends SapphireTest
      */
     protected $testManifest2;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/php/Core/Manifest/ClassManifestTest.php

@@ -27,7 +27,7 @@ class ClassManifestTest extends SapphireTest
      */
     protected $manifestTests;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/php/Core/Manifest/ConfigManifestTest.php

@@ -13,7 +13,7 @@
 
 class ConfigManifestTest extends SapphireTest
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -22,7 +22,7 @@ protected function setUp()
         ModuleLoader::inst()->pushManifest($moduleManifest);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         ModuleLoader::inst()->popManifest();
         parent::tearDown();

tests/php/Core/Manifest/ModuleManifestTest.php

@@ -17,7 +17,7 @@ class ModuleManifestTest extends SapphireTest
      */
     protected $manifest;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/php/Core/Manifest/ModuleResourceTest.php

@@ -18,7 +18,7 @@ class ModuleResourceTest extends SapphireTest
      */
     protected $manifest;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/php/Core/Manifest/NamespacedClassManifestTest.php

@@ -25,7 +25,7 @@ class NamespacedClassManifestTest extends SapphireTest
      */
     protected $manifest;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -35,7 +35,7 @@ protected function setUp()
         ClassLoader::inst()->pushManifest($this->manifest, false);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         ClassLoader::inst()->popManifest();

tests/php/Core/Manifest/PrioritySorterTest.php

@@ -12,7 +12,7 @@ class PrioritySorterTest extends SapphireTest
      */
     protected $sorter;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $modules = [

tests/php/Core/Manifest/ThemeResourceLoaderTest.php

@@ -33,7 +33,7 @@ class ThemeResourceLoaderTest extends SapphireTest
     /**
      * Set up manifest before each test
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -60,7 +60,7 @@ protected function setUp()
         ThemeResourceLoader::flush();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         ModuleLoader::inst()->popManifest();
         parent::tearDown();

tests/php/Core/Manifest/VersionProviderTest.php

@@ -13,7 +13,7 @@ class VersionProviderTest extends SapphireTest
      */
     protected $provider;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->provider = new VersionProvider;