Avoid any usage of Hub::(s|g)etCurrent

Author: Jean85

phpstan.neon

@@ -9,6 +9,7 @@ parameters:
          - '/Parameter \$.+ of method Sentry\\SentryBundle\\EventListener\\ErrorListener::onConsoleException\(\) has invalid typehint type Symfony\\Component\\Console\\Event\\ConsoleExceptionEvent./'
          - '/Call to method getException\(\) on an unknown class Symfony\\Component\\Console\\Event\\ConsoleExceptionEvent./'
          - '/Access to undefined constant Symfony\\Component\\Console\\ConsoleEvents::EXCEPTION./'
+         - '/Sentry\\SentrySdk/'
 
 includes:
 	- vendor/jangregor/phpstan-prophecy/src/extension.neon

src/Command/SentryTestCommand.php

@@ -2,7 +2,7 @@
 
 namespace Sentry\SentryBundle\Command;
 
-use Sentry\State\Hub;
+use Sentry\SentryBundle\SentryBundle;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -16,7 +16,7 @@ public function __construct()
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $currentHub = Hub::getCurrent();
+        $currentHub = SentryBundle::getCurrentHub();
         $client = $currentHub->getClient();
 
         if (! $client) {

src/EventListener/ConsoleListener.php

@@ -2,6 +2,7 @@
 
 namespace Sentry\SentryBundle\EventListener;
 
+use Sentry\SentryBundle\SentryBundle;
 use Sentry\State\Hub;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
@@ -33,7 +34,7 @@ public function onConsoleCommand(ConsoleCommandEvent $event): void
     {
         $command = $event->getCommand();
 
-        Hub::getCurrent()
+        SentryBundle::getCurrentHub()
             ->configureScope(function (Scope $scope) use ($command): void {
                 $scope->setTag('command', $command ? $command->getName() : 'N/A');
             });

src/EventListener/RequestListener.php

@@ -2,6 +2,7 @@
 
 namespace Sentry\SentryBundle\EventListener;
 
+use Sentry\SentryBundle\SentryBundle;
 use Sentry\State\Hub;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
@@ -54,7 +55,7 @@ public function onKernelRequest(GetResponseEvent $event): void
             return;
         }
 
-        $currentClient = Hub::getCurrent()->getClient();
+        $currentClient = SentryBundle::getCurrentHub()->getClient();
         if (null === $currentClient || ! $currentClient->getOptions()->shouldSendDefaultPii()) {
             return;
         }
@@ -76,7 +77,7 @@ public function onKernelRequest(GetResponseEvent $event): void
 
         $userData['ip_address'] = $event->getRequest()->getClientIp();
 
-        Hub::getCurrent()
+        SentryBundle::getCurrentHub()
             ->configureScope(function (Scope $scope) use ($userData): void {
                 $scope->setUser($userData);
             });
@@ -94,7 +95,7 @@ public function onKernelController(FilterControllerEvent $event): void
 
         $matchedRoute = (string) $event->getRequest()->attributes->get('_route');
 
-        Hub::getCurrent()
+        SentryBundle::getCurrentHub()
             ->configureScope(function (Scope $scope) use ($matchedRoute): void {
                 $scope->setTag('route', $matchedRoute);
             });

src/EventListener/SubRequestListener.php

@@ -2,7 +2,7 @@
 
 namespace Sentry\SentryBundle\EventListener;
 
-use Sentry\State\Hub;
+use Sentry\SentryBundle\SentryBundle;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
@@ -19,7 +19,7 @@ public function onKernelRequest(GetResponseEvent $event): void
             return;
         }
 
-        Hub::getCurrent()->pushScope();
+        SentryBundle::getCurrentHub()->pushScope();
     }
 
     /**
@@ -33,6 +33,6 @@ public function onKernelFinishRequest(FinishRequestEvent $event): void
             return;
         }
 
-        Hub::getCurrent()->popScope();
+        SentryBundle::getCurrentHub()->popScope();
     }
 }

src/Resources/config/services.xml

@@ -17,9 +17,6 @@
 
         <service id="Sentry\State\HubInterface" class="Sentry\State\Hub" public="false">
             <argument type="service" id="Sentry\ClientInterface" />
-            <call method="setCurrent">
-                <argument type="service" id="Sentry\State\HubInterface" />
-            </call>
         </service>
 
         <service id="Sentry\SentryBundle\EventListener\ConsoleListener" class="Sentry\SentryBundle\EventListener\ConsoleListener" public="false">

src/SentryBundle.php

@@ -3,6 +3,9 @@
 namespace Sentry\SentryBundle;
 
 use Jean85\PrettyVersions;
+use Sentry\SentrySdk;
+use Sentry\State\Hub;
+use Sentry\State\HubInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class SentryBundle extends Bundle
@@ -14,4 +17,28 @@ public static function getSdkVersion(): string
         return PrettyVersions::getVersion('sentry/sentry-symfony')
             ->getPrettyVersion();
     }
+
+    /**
+     * This method avoids deprecations with sentry/sentry:^2.2
+     */
+    public static function getCurrentHub(): HubInterface
+    {
+        if (class_exists(SentrySdk::class)) {
+            return SentrySdk::getCurrentHub();
+        }
+
+        return Hub::getCurrent();
+    }
+
+    /**
+     * This method avoids deprecations with sentry/sentry:^2.2
+     */
+    public static function setCurrentHub(HubInterface $hub): void
+    {
+        if (class_exists(SentrySdk::class)) {
+            SentrySdk::setCurrentHub($hub);
+        }
+
+        Hub::setCurrent($hub);
+    }
 }