Fix usage of newer feature in test suite

Author: Jean85

test/BaseTestCase.php

@@ -4,6 +4,9 @@
 
 use PHPUnit\Framework\TestCase;
 use Sentry\Options;
+use Sentry\SentrySdk;
+use Sentry\State\Hub;
+use Sentry\State\HubInterface;
 
 abstract class BaseTestCase extends TestCase
 {
@@ -31,4 +34,13 @@ protected function getSupportedOptionsCount(): int
 
         return $count;
     }
+
+    protected function setCurrentHub(HubInterface $hub): void
+    {
+        if (class_exists(SentrySdk::class)) {
+            SentrySdk::setCurrentHub($hub);
+        } else {
+            Hub::setCurrent($hub);
+        }
+    }
 }

test/Command/SentryTestCommandTest.php

@@ -2,17 +2,16 @@
 
 namespace Sentry\SentryBundle\Test\Command;
 
-use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Sentry\ClientInterface;
 use Sentry\Options;
 use Sentry\SentryBundle\Command\SentryTestCommand;
-use Sentry\SentrySdk;
+use Sentry\SentryBundle\Test\BaseTestCase;
 use Sentry\State\HubInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 
-class SentryTestCommandTest extends TestCase
+class SentryTestCommandTest extends BaseTestCase
 {
     public function testExecuteSuccessfully(): void
     {
@@ -29,7 +28,7 @@ public function testExecuteSuccessfully(): void
             ->shouldBeCalled()
             ->willReturn($lastEventId);
 
-        SentrySdk::setCurrentHub($hub->reveal());
+        $this->setCurrentHub($hub->reveal());
 
         $commandTester = $this->executeCommand();
 
@@ -51,7 +50,7 @@ public function testExecuteFailsDueToMissingDSN(): void
         $hub->getClient()
             ->willReturn($client->reveal());
 
-        SentrySdk::setCurrentHub($hub->reveal());
+        $this->setCurrentHub($hub->reveal());
 
         $commandTester = $this->executeCommand();
 
@@ -75,7 +74,7 @@ public function testExecuteFailsDueToMessageNotSent(): void
             ->shouldBeCalled()
             ->willReturn(null);
 
-        SentrySdk::setCurrentHub($hub->reveal());
+        $this->setCurrentHub($hub->reveal());
 
         $commandTester = $this->executeCommand();
 
@@ -92,7 +91,7 @@ public function testExecuteFailsDueToMissingClient(): void
         $hub->getClient()
             ->willReturn(null);
 
-        SentrySdk::setCurrentHub($hub->reveal());
+        $this->setCurrentHub($hub->reveal());
 
         $commandTester = $this->executeCommand();
 

test/EventListener/ConsoleListenerTest.php

@@ -2,17 +2,16 @@
 
 namespace Sentry\SentryBundle\Test\EventListener;
 
-use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Sentry\Event;
 use Sentry\SentryBundle\EventListener\ConsoleListener;
-use Sentry\SentrySdk;
+use Sentry\SentryBundle\Test\BaseTestCase;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
 
-class ConsoleListenerTest extends TestCase
+class ConsoleListenerTest extends BaseTestCase
 {
     private $currentHub;
     private $currentScope;
@@ -31,7 +30,7 @@ protected function setUp()
                 $callable($scope);
             });
 
-        SentrySdk::setCurrentHub($this->currentHub->reveal());
+        $this->setCurrentHub($this->currentHub->reveal());
     }
 
     public function testOnConsoleCommandAddsCommandName(): void

test/EventListener/RequestListenerTest.php

@@ -2,13 +2,12 @@
 
 namespace Sentry\SentryBundle\Test\EventListener;
 
-use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Sentry\ClientInterface;
 use Sentry\Event;
 use Sentry\Options;
 use Sentry\SentryBundle\EventListener\RequestListener;
-use Sentry\SentrySdk;
+use Sentry\SentryBundle\Test\BaseTestCase;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
 use Symfony\Component\HttpFoundation\Request;
@@ -18,7 +17,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
-class RequestListenerTest extends TestCase
+class RequestListenerTest extends BaseTestCase
 {
     private $currentScope;
     private $currentHub;
@@ -48,7 +47,7 @@ protected function setUp()
                 $callable($scope);
             });
 
-        SentrySdk::setCurrentHub($this->currentHub->reveal());
+        $this->setCurrentHub($this->currentHub->reveal());
     }
 
     /**

test/EventListener/SubRequestListenerTest.php

@@ -2,15 +2,14 @@
 
 namespace Sentry\SentryBundle\Test\EventListener;
 
-use PHPUnit\Framework\TestCase;
 use Sentry\SentryBundle\EventListener\SubRequestListener;
-use Sentry\SentrySdk;
+use Sentry\SentryBundle\Test\BaseTestCase;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
-class SubRequestListenerTest extends TestCase
+class SubRequestListenerTest extends BaseTestCase
 {
     private $currentHub;
 
@@ -20,7 +19,7 @@ protected function setUp()
 
         $this->currentHub = $this->prophesize(HubInterface::class);
 
-        SentrySdk::setCurrentHub($this->currentHub->reveal());
+        $this->setCurrentHub($this->currentHub->reveal());
     }
 
     public function testOnKernelRequestWithMasterRequest(): void