upgrade to PHPUnit 8

qandidate-labs · Feb 11, 2020 · 2191d5e · 2191d5e
1 parent 4ba8c7b
commit 2191d5e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -35,6 +35,6 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "^8.0"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
   <testsuites>

diff --git a/test/Qandidate/Stack/RequestId/MonologProcessorTest.php b/test/Qandidate/Stack/RequestId/MonologProcessorTest.php
@@ -11,15 +11,15 @@
 
 namespace Qandidate\Stack\RequestId;
 
-use Qandidate\Stack\TestCase;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 
 class MonologProcessorTest extends TestCase
 {
     private $processor;
     private $header = 'Foo-Id';
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->processor = new MonologProcessor($this->header);
     }
@@ -69,9 +69,7 @@ public function it_leaves_the_record_untouched_if_no_request_was_handled()
 
     private function createGetResponseEvent($requestId = false)
     {
-        $getResponseEventMock = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $getResponseEventMock = $this->createMock('Symfony\Component\HttpKernel\Event\GetResponseEvent');
 
         $request = new Request();
 

diff --git a/test/Qandidate/Stack/RequestIdTest.php b/test/Qandidate/Stack/RequestIdTest.php
@@ -11,6 +11,7 @@
 
 namespace Qandidate\Stack;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -22,9 +23,9 @@ class RequestIdTest extends TestCase
     private $stackedApp;
     private $header = 'X-Request-Id';
 
-    public function setUp()
+    public function setUp(): void
     {
-        $this->requestIdGenerator = $this->getMock('Qandidate\Stack\RequestIdGenerator');
+        $this->requestIdGenerator = $this->createMock('Qandidate\Stack\RequestIdGenerator');
         $this->app                = new MockApp($this->header);
         $this->stackedApp         = new RequestId($this->app, $this->requestIdGenerator, $this->header);
     }

diff --git a/test/Qandidate/Stack/TestCase.php b/test/Qandidate/Stack/TestCase.php
diff --git a/...didate/Stack/UuidRequestGeneratorTest.php → ...date/Stack/UuidRequestIdGeneratorTest.php b/...didate/Stack/UuidRequestGeneratorTest.php → ...date/Stack/UuidRequestIdGeneratorTest.php
@@ -11,6 +11,8 @@
 
 namespace Qandidate\Stack;
 
+use PHPUnit\Framework\TestCase;
+
 class UuidRequestIdGeneratorTest extends TestCase
 {
     /**
@@ -20,6 +22,6 @@ public function it_generates_a_string()
     {
         $generator = new UuidRequestIdGenerator();
 
-        $this->assertInternalType('string', $generator->generate());
+        $this->assertIsString($generator->generate());
     }
 }