Switch from Hub::getScope to configureScope

Author: Jean85

src/EventListener/ConsoleListener.php

@@ -4,6 +4,7 @@
 
 use Sentry\State\Hub;
 use Sentry\State\HubInterface;
+use Sentry\State\Scope;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
 
 final class ConsoleListener
@@ -33,7 +34,8 @@ public function onConsoleCommand(ConsoleCommandEvent $event): void
         $command = $event->getCommand();
 
         Hub::getCurrent()
-            ->getScope()
-            ->setTag('command', $command ? $command->getName() : 'N/A');
+            ->configureScope(function (Scope $scope) use ($command): void {
+                $scope->setTag('command', $command ? $command->getName() : 'N/A');
+            });
     }
 }

src/EventListener/RequestListener.php

@@ -4,6 +4,7 @@
 
 use Sentry\State\Hub;
 use Sentry\State\HubInterface;
+use Sentry\State\Scope;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -71,8 +72,9 @@ public function onKernelRequest(GetResponseEvent $event): void
         $userData['ip_address'] = $event->getRequest()->getClientIp();
 
         Hub::getCurrent()
-            ->getScope()
-            ->setUser($userData);
+            ->configureScope(function (Scope $scope) use ($userData): void {
+                $scope->setUser($userData);
+            });
     }
 
     public function onKernelController(FilterControllerEvent $event): void
@@ -84,8 +86,9 @@ public function onKernelController(FilterControllerEvent $event): void
         $matchedRoute = $event->getRequest()->attributes->get('_route');
 
         Hub::getCurrent()
-            ->getScope()
-            ->setTag('route', $matchedRoute);
+            ->configureScope(function (Scope $scope) use ($matchedRoute): void {
+                $scope->setTag('route', $matchedRoute);
+            });
     }
 
     /**

test/EventListener/ConsoleListenerTest.php

@@ -2,6 +2,8 @@
 
 namespace Sentry\SentryBundle\Test\EventListener;
 
+use PHPUnit\Framework\Assert;
+use Prophecy\Argument;
 use Sentry\SentryBundle\EventListener\ConsoleListener;
 use Sentry\State\Hub;
 use Sentry\State\HubInterface;
@@ -18,11 +20,16 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->currentScope = new Scope();
+        $this->currentScope = $scope = new Scope();
         $this->currentHub = $this->prophesize(HubInterface::class);
-        $this->currentHub->getScope()
+        $this->currentHub->configureScope(Argument::type('callable'))
             ->shouldBeCalled()
-            ->willReturn($this->currentScope);
+            ->will(function ($arguments) use ($scope): void {
+                $callable = $arguments[0];
+                Assert::assertIsCallable($callable);
+
+                $callable($scope);
+            });
 
         Hub::setCurrent($this->currentHub->reveal());
     }

test/EventListener/RequestListenerTest.php

@@ -2,7 +2,9 @@
 
 namespace Sentry\SentryBundle\Test\EventListener;
 
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
 use Sentry\SentryBundle\EventListener\RequestListener;
 use Sentry\State\Hub;
 use Sentry\State\HubInterface;
@@ -25,11 +27,16 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->currentScope = new Scope();
+        $this->currentScope = $scope = new Scope();
         $this->currentHub = $this->prophesize(HubInterface::class);
-        $this->currentHub->getScope()
+        $this->currentHub->configureScope(Argument::type('callable'))
             ->shouldBeCalled()
-            ->willReturn($this->currentScope);
+            ->will(function ($arguments) use ($scope): void {
+                $callable = $arguments[0];
+                Assert::assertIsCallable($callable);
+
+                $callable($scope);
+            });
 
         Hub::setCurrent($this->currentHub->reveal());
     }
@@ -289,7 +296,7 @@ public function testOnKernelControllerAddsRouteTag(): void
 
     public function testOnKernelRequestUserDataAndTagsAreNotSetInSubRequest(): void
     {
-        $this->currentHub->getScope()
+        $this->currentHub->configureScope(Argument::type('callable'))
             ->shouldNotBeCalled();
 
         $tokenStorage = $this->prophesize(TokenStorageInterface::class);