Fix tests

Author: Jean85

test/EventListener/ConsoleListenerTest.php

@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Sentry\Event;
 use Sentry\SentryBundle\EventListener\ConsoleListener;
 use Sentry\State\Hub;
 use Sentry\State\HubInterface;
@@ -47,7 +48,7 @@ public function testOnConsoleCommandAddsCommandName(): void
 
         $listener->onConsoleCommand($event->reveal());
 
-        $this->assertSame(['command' => 'sf:command:name'], $this->currentScope->getTags());
+        $this->assertSame(['command' => 'sf:command:name'], $this->getTagsContext($this->currentScope));
     }
 
     public function testOnConsoleCommandAddsPlaceholderCommandName(): void
@@ -60,6 +61,14 @@ public function testOnConsoleCommandAddsPlaceholderCommandName(): void
 
         $listener->onConsoleCommand($event->reveal());
 
-        $this->assertSame(['command' => 'N/A'], $this->currentScope->getTags());
+        $this->assertSame(['command' => 'N/A'], $this->getTagsContext($this->currentScope));
+    }
+
+    private function getTagsContext(Scope $scope): array
+    {
+        $event = new Event();
+        $scope->applyToEvent($event, []);
+
+        return $event->getTagsContext()->toArray();
     }
 }

test/EventListener/RequestListenerTest.php

@@ -5,6 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Sentry\ClientInterface;
+use Sentry\Event;
 use Sentry\Options;
 use Sentry\SentryBundle\EventListener\RequestListener;
 use Sentry\State\Hub;
@@ -94,7 +95,7 @@ public function testOnKernelRequestUserDataIsSetToScope($user): void
             'ip_address' => '1.2.3.4',
             'username' => 'john-doe',
         ];
-        $this->assertEquals($expectedUserData, $this->currentScope->getUser());
+        $this->assertEquals($expectedUserData, $this->getUserContext($this->currentScope));
     }
 
     public function userDataProvider(): \Generator
@@ -131,7 +132,7 @@ public function testOnKernelRequestUserDataIsNotSetIfSendPiiIsDisabled(): void
 
         $listener->onKernelRequest($event->reveal());
 
-        $this->assertEquals([], $this->currentScope->getUser());
+        $this->assertEquals([], $this->getUserContext($this->currentScope));
     }
 
     public function testOnKernelRequestUserDataIsNotSetIfNoClientIsPresent(): void
@@ -156,7 +157,7 @@ public function testOnKernelRequestUserDataIsNotSetIfNoClientIsPresent(): void
 
         $listener->onKernelRequest($event->reveal());
 
-        $this->assertEquals([], $this->currentScope->getUser());
+        $this->assertEquals([], $this->getUserContext($this->currentScope));
     }
 
     public function testOnKernelRequestUsernameIsNotSetIfTokenStorageIsAbsent(): void
@@ -187,7 +188,7 @@ public function testOnKernelRequestUsernameIsNotSetIfTokenStorageIsAbsent(): voi
         $expectedUserData = [
             'ip_address' => '1.2.3.4',
         ];
-        $this->assertEquals($expectedUserData, $this->currentScope->getUser());
+        $this->assertEquals($expectedUserData, $this->getUserContext($this->currentScope));
     }
 
     public function testOnKernelRequestUsernameIsNotSetIfAuthorizationCheckerIsAbsent(): void
@@ -218,7 +219,7 @@ public function testOnKernelRequestUsernameIsNotSetIfAuthorizationCheckerIsAbsen
         $expectedUserData = [
             'ip_address' => '1.2.3.4',
         ];
-        $this->assertEquals($expectedUserData, $this->currentScope->getUser());
+        $this->assertEquals($expectedUserData, $this->getUserContext($this->currentScope));
     }
 
     public function testOnKernelRequestUsernameIsNotSetIfTokenIsAbsent(): void
@@ -253,7 +254,7 @@ public function testOnKernelRequestUsernameIsNotSetIfTokenIsAbsent(): void
         $expectedUserData = [
             'ip_address' => '1.2.3.4',
         ];
-        $this->assertEquals($expectedUserData, $this->currentScope->getUser());
+        $this->assertEquals($expectedUserData, $this->getUserContext($this->currentScope));
     }
 
     /**
@@ -295,7 +296,7 @@ public function testOnKernelRequestUsernameIsNotSetIfTokenIsNotAuthenticated():
         $expectedUserData = [
             'ip_address' => '1.2.3.4',
         ];
-        $this->assertEquals($expectedUserData, $this->currentScope->getUser());
+        $this->assertEquals($expectedUserData, $this->getUserContext($this->currentScope));
     }
 
     public function testOnKernelRequestUsernameIsNotSetIfUserIsNotRemembered(): void
@@ -330,7 +331,7 @@ public function testOnKernelRequestUsernameIsNotSetIfUserIsNotRemembered(): void
         $expectedUserData = [
             'ip_address' => '1.2.3.4',
         ];
-        $this->assertEquals($expectedUserData, $this->currentScope->getUser());
+        $this->assertEquals($expectedUserData, $this->getUserContext($this->currentScope));
     }
 
     public function testOnKernelControllerAddsRouteTag(): void
@@ -403,9 +404,17 @@ public function testOnKernelRequestUserDataAndTagsAreNotSetInSubRequest(): void
 
         $listener->onKernelRequest($event->reveal());
 
-        $this->assertEmpty($this->currentScope->getUser());
+        $this->assertEmpty($this->getUserContext($this->currentScope));
         $this->assertEmpty($this->currentScope->getTags());
     }
+
+    private function getUserContext(Scope $scope): array
+    {
+        $event = new Event();
+        $scope->applyToEvent($event, []);
+
+        return $event->getUserContext()->toArray();
+    }
 }
 
 class ToStringUser