Add support for PHPUnit 10 (#794)

Author: cleptric

composer.json

@@ -33,7 +33,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.4 | ^9.3",
+        "phpunit/phpunit": "^8.4 | ^9.3 | ^10.4",
         "laravel/framework": "^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0",
         "orchestra/testbench": "^4.7 | ^5.1 | ^6.0 | ^7.0 | ^8.0",
         "friendsofphp/php-cs-fixer": "^3.11",

test/Sentry/Integration/ExceptionContextIntegrationTest.php

@@ -37,7 +37,7 @@ public function testInvoke(Exception $exception, ?array $expectedContext): void
         });
     }
 
-    public function invokeDataProvider(): iterable
+    public static function invokeDataProvider(): iterable
     {
         yield 'Exception without context method -> no exception context' => [
             new Exception('Exception without context.'),
@@ -47,17 +47,17 @@ public function invokeDataProvider(): iterable
         $context = ['some' => 'context'];
 
         yield 'Exception with context method returning array of context' => [
-            $this->generateExceptionWithContext($context),
+            self::generateExceptionWithContext($context),
             $context,
         ];
 
         yield 'Exception with context method returning string of context' => [
-            $this->generateExceptionWithContext('Invalid context, expects array'),
+            self::generateExceptionWithContext('Invalid context, expects array'),
             null,
         ];
     }
 
-    private function generateExceptionWithContext($context): Exception
+    private static function generateExceptionWithContext($context): Exception
     {
         return new class($context) extends Exception {
             private $context;

test/Sentry/LogChannelTest.php

@@ -57,14 +57,14 @@ public function testHandlerWritingExpectedEventsAndContext(array $context, calla
         $asserter($lastEvent);
     }
 
-    public function handlerDataProvider(): iterable
+    public static function handlerDataProvider(): iterable
     {
         $context = ['foo' => 'bar'];
 
         yield [
             $context,
             function (Event $event) use ($context) {
-                $this->assertEquals($context, $event->getExtra()['log_context']);
+                self::assertEquals($context, $event->getExtra()['log_context']);
             },
         ];
 
@@ -73,8 +73,8 @@ function (Event $event) use ($context) {
         yield [
             $context,
             function (Event $event) use ($context) {
-                $this->assertEquals($context['fingerprint'], $event->getFingerprint());
-                $this->assertEmpty($event->getExtra());
+                self::assertEquals($context['fingerprint'], $event->getFingerprint());
+                self::assertEmpty($event->getExtra());
             },
         ];
 
@@ -83,8 +83,8 @@ function (Event $event) use ($context) {
         yield [
             $context,
             function (Event $event) use ($context) {
-                $this->assertNull($event->getUser());
-                $this->assertEquals($context, $event->getExtra()['log_context']);
+                self::assertNull($event->getUser());
+                self::assertEquals($context, $event->getExtra()['log_context']);
             },
         ];
 
@@ -93,9 +93,9 @@ function (Event $event) use ($context) {
         yield [
             $context,
             function (Event $event) {
-                $this->assertNotNull($event->getUser());
-                $this->assertEquals(123, $event->getUser()->getId());
-                $this->assertEmpty($event->getExtra());
+                self::assertNotNull($event->getUser());
+                self::assertEquals(123, $event->getUser()->getId());
+                self::assertEmpty($event->getExtra());
             },
         ];
 
@@ -107,11 +107,11 @@ function (Event $event) {
         yield [
             $context,
             function (Event $event) {
-                $this->assertSame([
+                self::assertSame([
                     'foo' => 'bar',
                     'bar' => '123',
                 ], $event->getTags());
-                $this->assertEmpty($event->getExtra());
+                self::assertEmpty($event->getExtra());
             },
         ];
     }