Skip to content

Commit 6677e77

Browse files
committed
Merge branch 'master' into psr-http-message-bridge
# Conflicts: # composer.json
2 parents 2350d6e + 39c3d97 commit 6677e77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1224
-562
lines changed

.github/workflows/publish-release.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,16 @@ on:
1010
description: Force a release even when there are release-blockers (optional)
1111
required: false
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
release:
1518
runs-on: ubuntu-latest
1619
name: Release version
1720
steps:
18-
- uses: actions/checkout@v2
21+
- name: Checkout
22+
uses: actions/checkout@v4
1923
with:
2024
token: ${{ secrets.GH_RELEASE_PAT }}
2125
fetch-depth: 0

.github/workflows/static-analysis.yaml

+9-6
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@ on:
88
- develop
99
- release/**
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
php-cs-fixer:
1316
name: PHP-CS-Fixer
1417
runs-on: ubuntu-latest
1518
steps:
1619
- name: Checkout
17-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
1821

1922
- name: Setup PHP
2023
uses: shivammathur/setup-php@v2
2124
with:
22-
php-version: '8.1'
25+
php-version: '8.2'
2326

2427
- name: Install dependencies
2528
run: composer update --no-progress --no-interaction --prefer-dist
@@ -32,12 +35,12 @@ jobs:
3235
runs-on: ubuntu-latest
3336
steps:
3437
- name: Checkout
35-
uses: actions/checkout@v2
38+
uses: actions/checkout@v4
3639

3740
- name: Setup PHP
3841
uses: shivammathur/setup-php@v2
3942
with:
40-
php-version: '8.2'
43+
php-version: '8.3'
4144

4245
- name: Install dependencies
4346
run: composer update --no-progress --no-interaction --prefer-dist
@@ -50,12 +53,12 @@ jobs:
5053
runs-on: ubuntu-latest
5154
steps:
5255
- name: Checkout
53-
uses: actions/checkout@v2
56+
uses: actions/checkout@v4
5457

5558
- name: Setup PHP
5659
uses: shivammathur/setup-php@v2
5760
with:
58-
php-version: '8.2'
61+
php-version: '8.3'
5962

6063
- name: Install dependencies
6164
run: composer update --no-progress --no-interaction --prefer-dist

.github/workflows/tests.yaml

+11-9
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
- develop
99
- release/**
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
tests:
1316
name: Tests
@@ -24,6 +27,7 @@ jobs:
2427
- '8.0'
2528
- '8.1'
2629
- '8.2'
30+
- '8.3'
2731
symfony-version:
2832
- 4.4.*
2933
- 5.*
@@ -50,7 +54,7 @@ jobs:
5054

5155
steps:
5256
- name: Checkout
53-
uses: actions/checkout@v2
57+
uses: actions/checkout@v4
5458
with:
5559
fetch-depth: 2
5660

@@ -69,7 +73,7 @@ jobs:
6973
if: matrix.php == '8.0' && matrix.dependencies == 'lowest'
7074

7175
- name: Install dependencies
72-
uses: ramsey/composer-install@v1
76+
uses: ramsey/composer-install@v2
7377
with:
7478
dependency-versions: ${{ matrix.dependencies }}
7579
composer-options: --prefer-dist
@@ -78,7 +82,7 @@ jobs:
7882
run: vendor/bin/phpunit --coverage-clover=build/coverage-report.xml
7983

8084
- name: Upload code coverage
81-
uses: codecov/codecov-action@v1
85+
uses: codecov/codecov-action@v3
8286
with:
8387
file: build/coverage-report.xml
8488

@@ -99,14 +103,12 @@ jobs:
99103
- php: '8.0'
100104
dependencies: lowest
101105
symfony-version: 4.4.*
102-
- php: '8.1'
103-
dependencies: highest
104-
- php: '8.2'
106+
- php: '8.3'
105107
dependencies: highest
106108

107109
steps:
108110
- name: Checkout
109-
uses: actions/checkout@v2
111+
uses: actions/checkout@v4
110112

111113
- name: Setup PHP
112114
uses: shivammathur/setup-php@v2
@@ -122,7 +124,7 @@ jobs:
122124
run: composer remove doctrine/dbal doctrine/doctrine-bundle symfony/messenger symfony/twig-bundle symfony/cache symfony/http-client --dev --no-update
123125

124126
- name: Install dependencies
125-
uses: ramsey/composer-install@v1
127+
uses: ramsey/composer-install@v2
126128
with:
127129
dependency-versions: ${{ matrix.dependencies }}
128130
composer-options: --prefer-dist
@@ -131,6 +133,6 @@ jobs:
131133
run: vendor/bin/phpunit --coverage-clover=build/coverage-report.xml
132134

133135
- name: Upload code coverage
134-
uses: codecov/codecov-action@v1
136+
uses: codecov/codecov-action@v3
135137
with:
136138
file: build/coverage-report.xml

CHANGELOG.md

+39-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,43 @@
11
# Changelog
22

3+
## 4.12.0
4+
5+
### Features
6+
7+
- Report individual exceptions from `DelayedMessageHandlingException` [(#760)](https://github.com/getsentry/sentry-symfony/pull/760)
8+
9+
## 4.11.0
10+
11+
The Sentry SDK team is happy to announce the immediate availability of Sentry Symfony SDK v4.11.0.
12+
13+
### Bug Fixes
14+
15+
- Silence `TokenInterface::isAuthenticated` deprecation in `LoginListener` [(#755)](https://github.com/getsentry/sentry-symfony/pull/755)
16+
17+
### Misc
18+
19+
- Prefer the `SENTRY_RELEASE` environment variable over the package root version [(#753)](https://github.com/getsentry/sentry-symfony/pull/753)
20+
21+
## 4.10.0
22+
23+
The Sentry SDK team is happy to announce the immediate availability of Sentry Symfony SDK v4.10.0.
24+
25+
### Features
26+
27+
- Tracing without Performance [(#742)](https://github.com/getsentry/sentry-symfony/pull/742)
28+
29+
The SDK will now continue a trace from incoming HTTP requests, even if performance is not enabled.
30+
To continue a trace outward, you may attach the Sentry tracing headers to any HTTP client request.
31+
You can fetch the required header values by calling \Sentry\getBaggage() and \Sentry\getTraceparent().
32+
33+
- Add `ignore_exceptions` and `ignore_transactions` options [(#724)](https://github.com/getsentry/sentry-symfony/pull/724)
34+
35+
### Misc
36+
37+
- Improve setting logged-in users on the scope [(#720)](https://github.com/getsentry/sentry-symfony/pull/720)
38+
- Move DB span tags to span data [(#743)](https://github.com/getsentry/sentry-symfony/pull/743)
39+
- Set the span status when tracing an HTTP client request [(#748)](https://github.com/getsentry/sentry-symfony/pull/748)
40+
341
## 4.9.2
442

543
The Sentry SDK team is happy to announce the immediate availability of Sentry Symfony SDK v4.9.2.
@@ -135,7 +173,7 @@ This release contains a colorful bouquet of new features.
135173
```
136174

137175
- Use the `_route` attribute as the transaction name [(#692)](https://github.com/getsentry/sentry-symfony/pull/692)
138-
176+
139177
If you're using named routes, the SDK will default to use this attribute as the transaction name.
140178
With this change, you should be able to see a full list of your transactions on the performance page,
141179
instead of `<< unparameterized >>`.

composer.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,14 @@
3737
"symfony/http-kernel": "^4.4.20||^5.0.11||^6.0",
3838
"symfony/polyfill-php80": "^1.22",
3939
"symfony/psr-http-message-bridge": "^1.2||^2.0||^6.4",
40-
"symfony/security-core": "^4.4.20||^5.0.11||^6.0"
40+
"symfony/security-core": "^4.4.20||^5.0.11||^6.0",
41+
"symfony/security-http": "^4.4.20||^5.0.11||^6.0"
4142
},
4243
"require-dev": {
4344
"doctrine/dbal": "^2.13||^3.0",
4445
"doctrine/doctrine-bundle": "^1.12||^2.5",
4546
"friendsofphp/php-cs-fixer": "^2.19||<=3.16.0",
46-
"jangregor/phpstan-prophecy": "^1.0",
4747
"monolog/monolog": "^1.3||^2.0",
48-
"phpspec/prophecy": "!=1.11.0",
49-
"phpspec/prophecy-phpunit": "^1.1||^2.0",
5048
"phpstan/extension-installer": "^1.0",
5149
"phpstan/phpstan": "^1.3",
5250
"phpstan/phpstan-phpunit": "^1.0",

phpstan-baseline.neon

+35-10
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ parameters:
1212

1313
-
1414
message: "#^Cannot access offset 'before_breadcrumb' on mixed\\.$#"
15-
count: 3
15+
count: 1
1616
path: src/DependencyInjection/SentryExtension.php
1717

1818
-
1919
message: "#^Cannot access offset 'before_send' on mixed\\.$#"
20-
count: 3
20+
count: 1
2121
path: src/DependencyInjection/SentryExtension.php
2222

2323
-
2424
message: "#^Cannot access offset 'before_send…' on mixed\\.$#"
25-
count: 3
25+
count: 1
2626
path: src/DependencyInjection/SentryExtension.php
2727

2828
-
2929
message: "#^Cannot access offset 'class_serializers' on mixed\\.$#"
30-
count: 3
30+
count: 1
3131
path: src/DependencyInjection/SentryExtension.php
3232

3333
-
@@ -62,7 +62,7 @@ parameters:
6262

6363
-
6464
message: "#^Cannot access offset 'traces_sampler' on mixed\\.$#"
65-
count: 3
65+
count: 1
6666
path: src/DependencyInjection/SentryExtension.php
6767

6868
-
@@ -160,6 +160,11 @@ parameters:
160160
count: 1
161161
path: src/EventListener/ConsoleCommandListener.php
162162

163+
-
164+
message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpKernel\\\\Event\\\\KernelEvent\\:\\:isMasterRequest\\(\\)\\.$#"
165+
count: 1
166+
path: src/EventListener/LoginListener.php
167+
163168
-
164169
message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpKernel\\\\Event\\\\KernelEvent\\:\\:isMasterRequest\\(\\)\\.$#"
165170
count: 1
@@ -285,6 +290,16 @@ parameters:
285290
count: 1
286291
path: tests/DependencyInjection/ConfigurationTest.php
287292

293+
-
294+
message: "#^Function Symfony\\\\Component\\\\DependencyInjection\\\\Loader\\\\Configurator\\\\ref not found\\.$#"
295+
count: 1
296+
path: tests/DependencyInjection/Fixtures/php/release_option_fallback_to_env_var.php
297+
298+
-
299+
message: "#^Used function Symfony\\\\Component\\\\DependencyInjection\\\\Loader\\\\Configurator\\\\ref not found\\.$#"
300+
count: 1
301+
path: tests/DependencyInjection/Fixtures/php/release_option_fallback_to_env_var.php
302+
288303
-
289304
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
290305
count: 1
@@ -300,6 +315,11 @@ parameters:
300315
count: 1
301316
path: tests/DependencyInjection/SentryExtensionTest.php
302317

318+
-
319+
message: "#^Cannot access offset 'release' on mixed\\.$#"
320+
count: 1
321+
path: tests/DependencyInjection/SentryExtensionTest.php
322+
303323
-
304324
message: "#^Class Symfony\\\\Component\\\\Debug\\\\Exception\\\\FatalErrorException not found\\.$#"
305325
count: 1
@@ -313,27 +333,32 @@ parameters:
313333
-
314334
message: "#^Call to function method_exists\\(\\) with \\$this\\(Sentry\\\\SentryBundle\\\\Tests\\\\EventListener\\\\AuthenticatedTokenStub\\) and 'setAuthenticated' will always evaluate to false\\.$#"
315335
count: 1
316-
path: tests/EventListener/RequestListenerTest.php
336+
path: tests/EventListener/LoginListenerTest.php
317337

318338
-
319339
message: "#^Parameter \\#1 \\$user of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\AbstractToken\\:\\:setUser\\(\\) expects Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface, string\\|Stringable\\|Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface given\\.$#"
320340
count: 1
321-
path: tests/EventListener/RequestListenerTest.php
341+
path: tests/EventListener/LoginListenerTest.php
342+
343+
-
344+
message: "#^Parameter \\#2 \\$firewallName of class Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\SwitchUserToken constructor expects string, null given\\.$#"
345+
count: 1
346+
path: tests/EventListener/LoginListenerTest.php
322347

323348
-
324349
message: "#^Parameter \\#3 \\$roles of class Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\SwitchUserToken constructor expects array\\<string\\>, string given\\.$#"
325350
count: 1
326-
path: tests/EventListener/RequestListenerTest.php
351+
path: tests/EventListener/LoginListenerTest.php
327352

328353
-
329354
message: "#^Parameter \\#4 \\$originalToken of class Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\SwitchUserToken constructor expects Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\TokenInterface, array\\<int, string\\> given\\.$#"
330355
count: 1
331-
path: tests/EventListener/RequestListenerTest.php
356+
path: tests/EventListener/LoginListenerTest.php
332357

333358
-
334359
message: "#^Parameter \\#5 \\$originatedFromUri of class Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\SwitchUserToken constructor expects string\\|null, Sentry\\\\SentryBundle\\\\Tests\\\\EventListener\\\\AuthenticatedTokenStub given\\.$#"
335360
count: 1
336-
path: tests/EventListener/RequestListenerTest.php
361+
path: tests/EventListener/LoginListenerTest.php
337362

338363
-
339364
message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpKernel\\\\Event\\\\KernelEvent\\:\\:isMasterRequest\\(\\)\\.$#"

0 commit comments

Comments
 (0)