Allow PHPUnit 8

Author: Jean85

composer.json

@@ -36,7 +36,7 @@
         "php-http/mock-client": "^1.0",
         "phpstan/phpstan-shim": "^0.11",
         "phpstan/phpstan-phpunit": "^0.11",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^7.5||^8.5",
         "symfony/browser-kit": "^3.4||^4.0||^5.0",
         "symfony/expression-language": "^3.4||^4.0||^5.0",
         "symfony/framework-bundle": "^3.4||^4.0||^5.0",

phpunit.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit 
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.5/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
         colors="true"
         backupGlobals="false"
         bootstrap="vendor/autoload.php"
+        cacheResult="false"
         processIsolation="true"
 >
 

test/ErrorTypesParserTest.php

@@ -9,8 +9,9 @@ class ErrorTypesParserTest extends TestCase
 {
     /**
      * @dataProvider parsableValueProvider
+     * @param int|string $value
      */
-    public function testParse(string $value, int $expected): void
+    public function testParse($value, int $expected): void
     {
         $ex = new ErrorTypesParser($value);
         $this->assertEquals($expected, $ex->parse());

test/EventListener/ConsoleListenerTest.php

@@ -8,20 +8,21 @@
 use Sentry\SentryBundle\Test\BaseTestCase;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ConsoleListenerTest extends BaseTestCase
 {
+    use SetUpTearDownTrait;
+
     private $currentHub;
     private $currentScope;
 
-    protected function setUp()
+    protected function doSetUp(): void
     {
-        parent::setUp();
-
         $this->currentScope = $scope = new Scope();
         $this->currentHub = $this->prophesize(HubInterface::class);
         $this->currentHub->configureScope(Argument::type('callable'))

test/EventListener/RequestListenerTest.php

@@ -10,6 +10,7 @@
 use Sentry\SentryBundle\Test\BaseTestCase;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
@@ -20,14 +21,14 @@
 
 class RequestListenerTest extends BaseTestCase
 {
+    use SetUpTearDownTrait;
+
     private $currentScope;
     private $currentHub;
     private $options;
 
-    protected function setUp()
+    protected function doSetUp(): void
     {
-        parent::setUp();
-
         $this->currentScope = $scope = new Scope();
         $this->currentHub = $this->prophesize(HubInterface::class);
 

test/EventListener/SubRequestListenerTest.php

@@ -6,18 +6,19 @@
 use Sentry\SentryBundle\Test\BaseTestCase;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 class SubRequestListenerTest extends BaseTestCase
 {
+    use SetUpTearDownTrait;
+
     private $currentHub;
 
-    protected function setUp()
+    protected function doSetUp(): void
     {
-        parent::setUp();
-
         $this->currentHub = $this->prophesize(HubInterface::class);
 
         $this->setCurrentHub($this->currentHub->reveal());