Upgrade to phpunit8

.gitignore

@@ -17,6 +17,7 @@ nbproject/*
 .svn
 errors.err
 tags
+/.phpunit.result.cache
 /nbproject/
 /composer.lock
 /vendor

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
+  - 7.3
 
 dist: trusty
 

composer.json

@@ -31,7 +31,7 @@
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "dev-next",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "psr-4": {

src/Controller/MailPreviewController.php

@@ -122,7 +122,7 @@ public function email($name, $method)
         $email = $this->findPreview($name, $method, $plugin);
         $partType = $this->request->getQuery('part');
 
-        $this->viewBuilder()->setLayout(false);
+        $this->viewBuilder()->disableAutoLayout();
 
         if ($partType) {
             return $this->respondWithPart($email, $partType);

tests/TestCase/Cache/Engine/DebugEngineTest.php

@@ -14,6 +14,7 @@
  */
 namespace DebugKit\Test\TestCase\Cache\Engine;
 
+use BadMethodCallException;
 use Cake\TestSuite\TestCase;
 use DebugKit\Cache\Engine\DebugEngine;
 use DebugKit\DebugTimer;
@@ -38,7 +39,7 @@ class DebugEngineTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $mock = $this->getMockBuilder('Cake\Cache\CacheEngine')->getMock();
@@ -66,11 +67,11 @@ public function testInitEngineBasedOnConfig()
     /**
      * Test that the normal errors bubble up still.
      *
-     * @expectedException BadMethodCallException
      * @return void
      */
     public function testInitErrorOnInvalidConfig()
     {
+        $this->expectException(BadMethodCallException::class);
         $engine = new DebugEngine([
             'className' => 'Derpy',
             'path' => TMP,

tests/TestCase/Controller/MailPreviewControllerTest.php

@@ -40,7 +40,7 @@ class MailPreviewControllerTest extends IntegrationTestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/TestCase/Controller/PanelsControllerTest.php

@@ -38,7 +38,7 @@ class PanelsControllerTest extends IntegrationTestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         Router::plugin('DebugKit', function (RouteBuilder $routes) {

tests/TestCase/Controller/RequestsControllerTest.php

@@ -38,7 +38,7 @@ class RequestsControllerTest extends IntegrationTestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         Router::plugin('DebugKit', function (RouteBuilder $routes) {

tests/TestCase/Controller/ToolbarControllerTest.php

@@ -39,7 +39,7 @@ class ToolbarControllerTest extends IntegrationTestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         Router::plugin('DebugKit', function (RouteBuilder $routes) {

tests/TestCase/Database/Log/DebugLogTest.php

@@ -32,7 +32,7 @@ class DebugLogTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->logger = new DebugLog(null, 'test');

tests/TestCase/DebugIncludeTest.php

@@ -26,7 +26,7 @@ public function testIncludePaths()
     {
         $include = new DebugInclude();
         $result = $include->includePaths();
-        $this->assertInternalType('array', $result);
+        $this->assertIsArray($result);
         $this->assertFileExists($result[0]);
     }
 

tests/TestCase/DebugMemoryTest.php

@@ -47,7 +47,7 @@ public function testRecordNoKey()
         DebugMemory::record();
         $result = DebugMemory::getAll(true);
         $this->assertCount(1, $result);
-        $this->assertContains('DebugMemoryTest.php line ' . (__LINE__ - 3), array_keys($result)[0]);
+        $this->assertStringContainsString('DebugMemoryTest.php line ' . (__LINE__ - 3), array_keys($result)[0]);
     }
 
     /**

tests/TestCase/DebugPanelTest.php

@@ -27,7 +27,7 @@ class DebugPanelTest extends TestCase
      */
     protected $panel;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->panel = new SimplePanel();

tests/TestCase/DebugSqlTest.php

@@ -34,7 +34,7 @@ class DebugSqlTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->connection = ConnectionManager::get('test');

tests/TestCase/DebugTimerTest.php

@@ -28,7 +28,7 @@ class DebugTimerTest extends TestCase
      *
      * @return void
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         DebugTimer::clear();
     }

tests/TestCase/Mailer/Transport/DebugKitTransportTest.php

@@ -20,7 +20,7 @@
 
 class DebugKitTransportTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->log = new \ArrayObject();
         $this->wrapped = $this->getMockBuilder(AbstractTransport::class)

tests/TestCase/Middleware/DebugKitMiddlewareTest.php

@@ -44,7 +44,7 @@ class DebugKitMiddlewareTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -58,7 +58,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
 
@@ -150,8 +150,8 @@ public function testInvokeNoModifyBinaryResponse()
 
         $this->assertEquals(1, $total, 'Should track response');
         $body = $result->getBody();
-        $this->assertNotContains('__debug_kit', '' . $body);
-        $this->assertNotContains('<script', '' . $body);
+        $this->assertStringNotContainsString('__debug_kit', '' . $body);
+        $this->assertStringNotContainsString('<script', '' . $body);
     }
 
     /**
@@ -216,7 +216,7 @@ public function testInvokeNoModifyRequestAction()
 
         $this->assertEquals(0, $total, 'Should not track sub-requests');
         $body = $result->getBody();
-        $this->assertNotContains('<script', '' . $body);
+        $this->assertStringNotContainsString('<script', '' . $body);
     }
 
     /**

tests/TestCase/Model/Behavior/TimedBehaviorTest.php

@@ -40,7 +40,7 @@ class TimedBehaviorTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->Article = TableRegistry::get('Articles');
@@ -52,7 +52,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         unset($this->Article);

tests/TestCase/Model/Table/RequestTableTest.php

@@ -31,7 +31,7 @@ class RequestTableTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $connection = ConnectionManager::get('test');

tests/TestCase/Panel/CachePanelTest.php

@@ -32,7 +32,7 @@ class CachePanelTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->panel = new CachePanel();
@@ -44,7 +44,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         Cache::drop('debug_kit_test');

tests/TestCase/Panel/DeprecationsPanelTest.php

@@ -33,7 +33,7 @@ class DeprecationsPanelTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         DeprecationsPanel::clearDeprecatedErrors();
@@ -64,12 +64,12 @@ public function testShutdown()
         $this->assertCount(3, $data['plugins']['DebugKit']);
 
         $error = $data['plugins']['DebugKit'][0];
-        $this->assertContains('Something going away', $error['message']);
+        $this->assertStringContainsString('Something going away', $error['message']);
         $this->assertEquals('DebugKit/tests/TestCase/Panel/DeprecationsPanelTest.php', $error['niceFile']);
         $this->assertEquals(46, $error['line']);
 
         $error = $data['plugins']['DebugKit'][2];
-        $this->assertContains('Raw error', $error['message']);
+        $this->assertStringContainsString('Raw error', $error['message']);
         $this->assertEquals('DebugKit/tests/TestCase/Panel/DeprecationsPanelTest.php', $error['niceFile']);
         $this->assertEquals(48, $error['line']);
     }

tests/TestCase/Panel/EnvironmentPanelTest.php

@@ -33,7 +33,7 @@ class EnvironmentPanelTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->panel = new EnvironmentPanel();
@@ -44,7 +44,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         unset($this->panel);
@@ -63,7 +63,7 @@ public function testShutdown()
 
         $this->panel->shutdown($event);
         $output = $this->panel->data();
-        $this->assertInternalType('array', $output);
+        $this->assertIsArray($output);
         $this->assertSame(['php', 'ini', 'cake', 'app'], array_keys($output));
         $this->assertEquals('mysql://user:password@localhost/my_db', $output['php']['TEST_URL_1']);
     }

tests/TestCase/Panel/IncludePanelTest.php

@@ -33,7 +33,7 @@ class IncludePanelTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->panel = new IncludePanel();

tests/TestCase/Panel/LogPanelTest.php

@@ -33,7 +33,7 @@ class LogPanelTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->panel = new LogPanel();
@@ -44,7 +44,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         Log::drop('debug_kit_log_panel');
@@ -77,7 +77,7 @@ public function testData()
         $result = $this->panel->data();
 
         $this->assertArrayHasKey('logger', $result);
-        /* @var DebugKitLog $logger */
+        /** @var DebugKitLog $logger */
         $logger = $result['logger'];
 
         $this->assertInstanceOf('DebugKit\Log\Engine\DebugKitLog', $logger);

tests/TestCase/Panel/PackagesPanelTest.php

@@ -33,7 +33,7 @@ class PackagesPanelTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->panel = new PackagesPanel();

tests/TestCase/Panel/RoutesPanelTest.php

@@ -34,7 +34,7 @@ class RoutesPanelTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();