Skip to content

Merge master#2004

Merged
Litarnus merged 11 commits into5.xfrom
merge-master
Feb 13, 2026
Merged

Merge master#2004
Litarnus merged 11 commits into5.xfrom
merge-master

Conversation

@Litarnus
Copy link
Contributor

merge master into 5.x branch

dependabot bot and others added 8 commits December 17, 2025 11:22
…#1986)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Co-authored-by: Martin Linzmayer <martin.linzmayer@sentry.io>
Co-authored-by: Alex Bouma <alex@bouma.me>
# Conflicts:
#	src/Metrics/Metrics.php
Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix is OFF. To automatically fix reported issues with Cloud Agents, enable Autofix in the Cursor dashboard.

$this->assertCount(1, $transport->getEvents());
$this->assertSame('I was dropped :(', $transport->getEvents()[0]->getLogs()[0]->getBody());
$this->assertCount(1, StubTransport::$events);
$this->assertSame('I was dropped :(', StubTransport::$events[0]->getLogs()[0]->getBody());
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Static $events not cleared causes flaky test assertions

Medium Severity

The refactoring from an anonymous class with an instance $events property to StubTransport with a static $events property introduces cross-test contamination. StubTransport::$events is never cleared in LogsHandlerTest — neither in setUp() nor in the test itself — so events from other test classes (e.g., TraceMetricsTest) that use the same static array can leak in. The assertCount(1, ...) assertion will fail if any prior test class left stale events in StubTransport::$events.

Additional Locations (1)

Fix in Cursor Fix in Web

@Litarnus Litarnus merged commit 1d0fc51 into 5.x Feb 13, 2026
43 checks passed
@Litarnus Litarnus deleted the merge-master branch February 13, 2026 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants