Merge branch 'master' into fix-baggage-sample-rate

Litarnus · Litarnus · commit c6075278aa20 · 2026-02-02T14:41:26.000+05:30
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,15 +27,15 @@ jobs:
           - ubuntu-latest
           - windows-latest
         php:
-          - { version: '7.2', phpunit: '^8.5.40' }
-          - { version: '7.3', phpunit: '^9.6.21' }
-          - { version: '7.4', phpunit: '^9.6.21' }
-          - { version: '8.0', phpunit: '^9.6.21' }
-          - { version: '8.1', phpunit: '^9.6.21' }
-          - { version: '8.2', phpunit: '^9.6.21' }
-          - { version: '8.3', phpunit: '^9.6.21' }
-          - { version: '8.4', phpunit: '^9.6.21' }
-          - { version: '8.5', phpunit: '^9.6.25' }
+          - { version: '7.2', phpunit: '^8.5.52' }
+          - { version: '7.3', phpunit: '^9.6.34' }
+          - { version: '7.4', phpunit: '^9.6.34' }
+          - { version: '8.0', phpunit: '^9.6.34' }
+          - { version: '8.1', phpunit: '^9.6.34' }
+          - { version: '8.2', phpunit: '^9.6.34' }
+          - { version: '8.3', phpunit: '^9.6.34' }
+          - { version: '8.4', phpunit: '^9.6.34' }
+          - { version: '8.5', phpunit: '^9.6.34' }
         dependencies:
           - lowest
           - highest
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -38,6 +38,7 @@
         ],
         'no_whitespace_before_comma_in_array' => false, // Should be dropped when we drop support for PHP 7.x
         'stringable_for_to_string' => false,
+        'modern_serialization_methods' => false, // Could be re-enabled when we drop support for PHP 7.3 and lower
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "monolog/monolog": "^1.6|^2.0|^3.0",
         "phpbench/phpbench": "^1.0",
         "phpstan/phpstan": "^1.3",
-        "phpunit/phpunit": "^8.5|^9.6",
+        "phpunit/phpunit": "^8.5.52|^9.6.34",
         "vimeo/psalm": "^4.17"
     },
     "suggest": {
diff --git a/src/HttpClient/HttpClient.php b/src/HttpClient/HttpClient.php
@@ -57,7 +57,7 @@ public function sendRequest(Request $request, Options $options): Response
         }
 
         $responseHeaders = [];
-        $responseHeaderCallback = function ($curlHandle, $headerLine) use (&$responseHeaders): int {
+        $responseHeaderCallback = static function ($curlHandle, $headerLine) use (&$responseHeaders): int {
             return Http::parseResponseHeaders($headerLine, $responseHeaders);
         };
 
diff --git a/src/Logs/LogsAggregator.php b/src/Logs/LogsAggregator.php
@@ -83,7 +83,7 @@ public function add(
             $log->setAttribute('sentry.sdk.version', $client->getSdkVersion());
         }
 
-        $hub->configureScope(function (Scope $scope) use ($log) {
+        $hub->configureScope(static function (Scope $scope) use ($log) {
             $user = $scope->getUser();
             if ($user !== null) {
                 if ($user->getId() !== null) {
@@ -186,7 +186,7 @@ private function getTraceId(HubInterface $hub): string
 
         $traceId = '';
 
-        $hub->configureScope(function (Scope $scope) use (&$traceId) {
+        $hub->configureScope(static function (Scope $scope) use (&$traceId) {
             $traceId = (string) $scope->getPropagationContext()->getTraceId();
         });
 
diff --git a/src/Metrics/Metrics.php b/src/Metrics/Metrics.php
@@ -109,7 +109,7 @@ public function timing(
         int $stackLevel = 0
     ) {
         return trace(
-            function () use ($callback) {
+            static function () use ($callback) {
                 return $callback();
             },
             SpanContext::make()
diff --git a/src/Metrics/MetricsAggregator.php b/src/Metrics/MetricsAggregator.php
@@ -79,7 +79,7 @@ public function add(
             ];
 
             if ($options->shouldSendDefaultPii()) {
-                $hub->configureScope(function (Scope $scope) use (&$defaultAttributes) {
+                $hub->configureScope(static function (Scope $scope) use (&$defaultAttributes) {
                     $user = $scope->getUser();
                     if ($user !== null) {
                         if ($user->getId() !== null) {
@@ -111,7 +111,7 @@ public function add(
             $spanId = $span->getSpanId();
             $traceId = $span->getTraceId();
         } else {
-            $hub->configureScope(function (Scope $scope) use (&$traceId, &$spanId) {
+            $hub->configureScope(static function (Scope $scope) use (&$traceId, &$spanId) {
                 $propagationContext = $scope->getPropagationContext();
                 $traceId = $propagationContext->getTraceId();
                 $spanId = $propagationContext->getSpanId();
diff --git a/src/Tracing/Span.php b/src/Tracing/Span.php
@@ -300,7 +300,7 @@ public function setStatus(?SpanStatus $status)
      */
     public function setHttpStatus(int $statusCode)
     {
-        SentrySdk::getCurrentHub()->configureScope(function (Scope $scope) use ($statusCode) {
+        SentrySdk::getCurrentHub()->configureScope(static function (Scope $scope) use ($statusCode) {
             $scope->setContext('response', [
                 'status_code' => $statusCode,
             ]);
diff --git a/src/functions.php b/src/functions.php
@@ -252,7 +252,7 @@ function startTransaction(TransactionContext $context, array $customSamplingCont
  */
 function trace(callable $trace, SpanContext $context)
 {
-    return SentrySdk::getCurrentHub()->withScope(function (Scope $scope) use ($context, $trace) {
+    return SentrySdk::getCurrentHub()->withScope(static function (Scope $scope) use ($context, $trace) {
         $parentSpan = $scope->getSpan();
 
         // If there is a span set on the scope and it's sampled there is an active transaction.
@@ -299,7 +299,7 @@ function getTraceparent(): string
     }
 
     $traceParent = '';
-    $hub->configureScope(function (Scope $scope) use (&$traceParent) {
+    $hub->configureScope(static function (Scope $scope) use (&$traceParent) {
         $traceParent = $scope->getPropagationContext()->toTraceparent();
     });
 
@@ -342,7 +342,7 @@ function getBaggage(): string
     }
 
     $baggage = '';
-    $hub->configureScope(function (Scope $scope) use (&$baggage) {
+    $hub->configureScope(static function (Scope $scope) use (&$baggage) {
         $baggage = $scope->getPropagationContext()->toBaggage();
     });
 
@@ -358,7 +358,7 @@ function getBaggage(): string
 function continueTrace(string $sentryTrace, string $baggage): TransactionContext
 {
     $hub = SentrySdk::getCurrentHub();
-    $hub->configureScope(function (Scope $scope) use ($sentryTrace, $baggage) {
+    $hub->configureScope(static function (Scope $scope) use ($sentryTrace, $baggage) {
         $propagationContext = PropagationContext::fromHeaders($sentryTrace, $baggage);
         $scope->setPropagationContext($propagationContext);
     });
@@ -393,7 +393,7 @@ function trace_metrics(): TraceMetrics
  */
 function addFeatureFlag(string $name, bool $result): void
 {
-    SentrySdk::getCurrentHub()->configureScope(function (Scope $scope) use ($name, $result) {
+    SentrySdk::getCurrentHub()->configureScope(static function (Scope $scope) use ($name, $result) {
         $scope->addFeatureFlag($name, $result);
     });
 }
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -1033,7 +1033,7 @@ public function testAttachStacktrace(): void
         $transport = $this->createMock(TransportInterface::class);
         $transport->expects($this->once())
                   ->method('send')
-                  ->with($this->callback(function (Event $event): bool {
+                  ->with($this->callback(static function (Event $event): bool {
                       $result = $event->getStacktrace();
 
                       return $result !== null;
diff --git a/tests/FrameBuilderTest.php b/tests/FrameBuilderTest.php
@@ -290,7 +290,7 @@ public function testGetFunctionArgumentsWithVariadicParameters(): void
         $options = new Options([]);
         $frameBuilder = new FrameBuilder($options, new RepresentationSerializer($options));
 
-        $testFunction = function (string $first, int $second, ...$rest) {
+        $testFunction = static function (string $first, int $second, ...$rest) {
         };
 
         $backtraceFrame = [
@@ -325,7 +325,7 @@ public function testGetFunctionArgumentsWithOnlyVariadicParameters(): void
         $options = new Options([]);
         $frameBuilder = new FrameBuilder($options, new RepresentationSerializer($options));
 
-        $testFunction = function (...$args) {
+        $testFunction = static function (...$args) {
         };
 
         $backtraceFrame = [
@@ -352,7 +352,7 @@ public function testGetFunctionArgumentsWithEmptyVariadicParameters(): void
         $options = new Options([]);
         $frameBuilder = new FrameBuilder($options, new RepresentationSerializer($options));
 
-        $testFunction = function (string $first, ...$rest) {
+        $testFunction = static function (string $first, ...$rest) {
         };
 
         $backtraceFrame = [
@@ -381,7 +381,7 @@ public function testGetFunctionArgumentsWithNullValues(): void
         $options = new Options([]);
         $frameBuilder = new FrameBuilder($options, new RepresentationSerializer($options));
 
-        $testFunction = function (string $first, $second, ...$rest) {
+        $testFunction = static function (string $first, $second, ...$rest) {
         };
 
         $backtraceFrame = [
@@ -411,7 +411,7 @@ public function testGetFunctionArgumentsWithGapsInBacktraceArrayIndices(): void
         $options = new Options([]);
         $frameBuilder = new FrameBuilder($options, new RepresentationSerializer($options));
 
-        $testFunction = function (string $first, int $second, ...$rest) {
+        $testFunction = static function (string $first, int $second, ...$rest) {
         };
 
         $backtraceFrameArgs = [];
diff --git a/tests/FunctionsTest.php b/tests/FunctionsTest.php
@@ -224,15 +224,15 @@ public function testWithMonitor(): void
         $hub->expects($this->exactly(2))
             ->method('captureCheckIn')
             ->with(
-                $this->callback(function (string $slug): bool {
+                $this->callback(static function (string $slug): bool {
                     return $slug === 'test-crontab';
                 }),
-                $this->callback(function (CheckInStatus $checkInStatus): bool {
+                $this->callback(static function (CheckInStatus $checkInStatus): bool {
                     // just check for type CheckInStatus
                     return true;
                 }),
                 $this->anything(),
-                $this->callback(function (MonitorConfig $monitorConfig): bool {
+                $this->callback(static function (MonitorConfig $monitorConfig): bool {
                     return $monitorConfig->getSchedule()->getValue() === '*/5 * * * *'
                         && $monitorConfig->getSchedule()->getType() === MonitorSchedule::TYPE_CRONTAB
                         && $monitorConfig->getCheckinMargin() === 5
@@ -243,7 +243,7 @@ public function testWithMonitor(): void
 
         SentrySdk::setCurrentHub($hub);
 
-        withMonitor('test-crontab', function () {
+        withMonitor('test-crontab', static function () {
             // Do something...
         }, new MonitorConfig(
             new MonitorSchedule(MonitorSchedule::TYPE_CRONTAB, '*/5 * * * *'),
@@ -261,15 +261,15 @@ public function testWithMonitorCallableThrows(): void
         $hub->expects($this->exactly(2))
             ->method('captureCheckIn')
             ->with(
-                $this->callback(function (string $slug): bool {
+                $this->callback(static function (string $slug): bool {
                     return $slug === 'test-crontab';
                 }),
-                $this->callback(function (CheckInStatus $checkInStatus): bool {
+                $this->callback(static function (CheckInStatus $checkInStatus): bool {
                     // just check for type CheckInStatus
                     return true;
                 }),
                 $this->anything(),
-                $this->callback(function (MonitorConfig $monitorConfig): bool {
+                $this->callback(static function (MonitorConfig $monitorConfig): bool {
                     return $monitorConfig->getSchedule()->getValue() === '*/5 * * * *'
                         && $monitorConfig->getSchedule()->getType() === MonitorSchedule::TYPE_CRONTAB
                         && $monitorConfig->getCheckinMargin() === 5
@@ -280,7 +280,7 @@ public function testWithMonitorCallableThrows(): void
 
         SentrySdk::setCurrentHub($hub);
 
-        withMonitor('test-crontab', function () {
+        withMonitor('test-crontab', static function () {
             throw new \Exception();
         }, new MonitorConfig(
             new MonitorSchedule(MonitorSchedule::TYPE_CRONTAB, '*/5 * * * *'),
@@ -352,7 +352,7 @@ public function testTraceReturnsClosureResult(): void
     {
         $returnValue = 'foo';
 
-        $result = trace(function () use ($returnValue) {
+        $result = trace(static function () use ($returnValue) {
             return $returnValue;
         }, new SpanContext());
 
@@ -379,7 +379,7 @@ public function testTraceCorrectlyReplacesAndRestoresCurrentSpan(): void
         $this->assertSame($transaction, $hub->getSpan());
 
         try {
-            trace(function () {
+            trace(static function () {
                 throw new \RuntimeException('Throwing should still restore the previous span');
             }, new SpanContext());
         } catch (\RuntimeException $e) {
diff --git a/tests/Logs/LogsAggregatorTest.php b/tests/Logs/LogsAggregatorTest.php
@@ -170,7 +170,7 @@ public function testAttributesAreAddedToLogMessage(): void
         $hub = new Hub($client);
         SentrySdk::setCurrentHub($hub);
 
-        $hub->configureScope(function (Scope $scope) {
+        $hub->configureScope(static function (Scope $scope) {
             $userDataBag = new UserDataBag();
             $userDataBag->setId('unique_id');
             $userDataBag->setEmail('foo@example.com');
diff --git a/tests/Logs/LogsTest.php b/tests/Logs/LogsTest.php
@@ -171,7 +171,7 @@ private function assertEvent(callable $assert, array $options = []): ClientInter
         $transport = $this->createMock(TransportInterface::class);
         $transport->expects($this->once())
                   ->method('send')
-                  ->with($this->callback(function (Event $event) use ($assert): bool {
+                  ->with($this->callback(static function (Event $event) use ($assert): bool {
                       $assert($event);
 
                       return true;
diff --git a/tests/Serializer/AbstractSerializerTest.php b/tests/Serializer/AbstractSerializerTest.php
diff --git a/tests/State/HubTest.php b/tests/State/HubTest.php
diff --git a/tests/State/ScopeTest.php b/tests/State/ScopeTest.php
diff --git a/tests/Transport/HttpTransportTest.php b/tests/Transport/HttpTransportTest.php

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function sendRequest(Request $request, Options $options): Response`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`$responseHeaders = [];`
`60`		`- $responseHeaderCallback = function ($curlHandle, $headerLine) use (&$responseHeaders): int {`
	`60`	`+ $responseHeaderCallback = static function ($curlHandle, $headerLine) use (&$responseHeaders): int {`
`61`	`61`	`return Http::parseResponseHeaders($headerLine, $responseHeaders);`
`62`	`62`	`};`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ public function setStatus(?SpanStatus $status)`
`300`	`300`	`*/`
`301`	`301`	`public function setHttpStatus(int $statusCode)`
`302`	`302`	`{`
`303`		`- SentrySdk::getCurrentHub()->configureScope(function (Scope $scope) use ($statusCode) {`
	`303`	`+ SentrySdk::getCurrentHub()->configureScope(static function (Scope $scope) use ($statusCode) {`
`304`	`304`	`$scope->setContext('response', [`
`305`	`305`	`'status_code' => $statusCode,`
`306`	`306`	`]);`