Merge branch 'master' into psr-http-message-bridge

# Conflicts: # composer.json
getsentry · Oct 30, 2023 · 34ef34b · 34ef34b
2 parents 2350d6e + 39c3d97
commit 34ef34b
Show file tree

Hide file tree

Showing 44 changed files with 1,222 additions and 561 deletions.
diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml
@@ -10,12 +10,16 @@ on:
  description: Force a release even when there are release-blockers (optional)
  required: false
 
+permissions:
+ contents: read
+
 jobs:
  release:
  runs-on: ubuntu-latest
  name: Release version
  steps:
- - uses: actions/checkout@v2
+ - name: Checkout
+ uses: actions/checkout@v4
  with:
  token: ${{ secrets.GH_RELEASE_PAT }}
  fetch-depth: 0

diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
@@ -8,18 +8,21 @@ on:
  - develop
  - release/**
 
+permissions:
+ contents: read
+
 jobs:
  php-cs-fixer:
  name: PHP-CS-Fixer
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
- php-version: '8.1'
+ php-version: '8.2'
 
  - name: Install dependencies
  run: composer update --no-progress --no-interaction --prefer-dist
@@ -32,12 +35,12 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
- php-version: '8.2'
+ php-version: '8.3'
 
  - name: Install dependencies
  run: composer update --no-progress --no-interaction --prefer-dist
@@ -50,12 +53,12 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
- php-version: '8.2'
+ php-version: '8.3'
 
  - name: Install dependencies
  run: composer update --no-progress --no-interaction --prefer-dist

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -8,6 +8,9 @@ on:
  - develop
  - release/**
 
+permissions:
+ contents: read
+
 jobs:
  tests:
  name: Tests
@@ -24,6 +27,7 @@ jobs:
  - '8.0'
  - '8.1'
  - '8.2'
+ - '8.3'
  symfony-version:
  - 4.4.*
  - 5.*
@@ -50,7 +54,7 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
  with:
  fetch-depth: 2
 
@@ -69,7 +73,7 @@ jobs:
  if: matrix.php == '8.0' && matrix.dependencies == 'lowest'
 
  - name: Install dependencies
- uses: ramsey/composer-install@v1
+ uses: ramsey/composer-install@v2
  with:
  dependency-versions: ${{ matrix.dependencies }}
  composer-options: --prefer-dist
@@ -78,7 +82,7 @@ jobs:
  run: vendor/bin/phpunit --coverage-clover=build/coverage-report.xml
 
  - name: Upload code coverage
- uses: codecov/codecov-action@v1
+ uses: codecov/codecov-action@v3
  with:
  file: build/coverage-report.xml
 
@@ -99,14 +103,12 @@ jobs:
  - php: '8.0'
  dependencies: lowest
  symfony-version: 4.4.*
- - php: '8.1'
- dependencies: highest
- - php: '8.2'
+ - php: '8.3'
  dependencies: highest
 
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
@@ -122,7 +124,7 @@ jobs:
  run: composer remove doctrine/dbal doctrine/doctrine-bundle symfony/messenger symfony/twig-bundle symfony/cache symfony/http-client --dev --no-update
 
  - name: Install dependencies
- uses: ramsey/composer-install@v1
+ uses: ramsey/composer-install@v2
  with:
  dependency-versions: ${{ matrix.dependencies }}
  composer-options: --prefer-dist
@@ -131,6 +133,6 @@ jobs:
  run: vendor/bin/phpunit --coverage-clover=build/coverage-report.xml
 
  - name: Upload code coverage
- uses: codecov/codecov-action@v1
+ uses: codecov/codecov-action@v3
  with:
  file: build/coverage-report.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,43 @@
 # Changelog
 
+## 4.12.0
+
+### Features
+
+- Report individual exceptions from `DelayedMessageHandlingException` [(#760)](https://github.com/getsentry/sentry-symfony/pull/760)
+
+## 4.11.0
+
+The Sentry SDK team is happy to announce the immediate availability of Sentry Symfony SDK v4.11.0.
+
+### Bug Fixes
+
+- Silence `TokenInterface::isAuthenticated` deprecation in `LoginListener` [(#755)](https://github.com/getsentry/sentry-symfony/pull/755)
+
+### Misc
+
+- Prefer the `SENTRY_RELEASE` environment variable over the package root version [(#753)](https://github.com/getsentry/sentry-symfony/pull/753)
+
+## 4.10.0
+
+The Sentry SDK team is happy to announce the immediate availability of Sentry Symfony SDK v4.10.0.
+
+### Features
+
+- Tracing without Performance [(#742)](https://github.com/getsentry/sentry-symfony/pull/742)
+
+ The SDK will now continue a trace from incoming HTTP requests, even if performance is not enabled.
+ To continue a trace outward, you may attach the Sentry tracing headers to any HTTP client request.
+ You can fetch the required header values by calling \Sentry\getBaggage() and \Sentry\getTraceparent().
+
+- Add `ignore_exceptions` and `ignore_transactions` options [(#724)](https://github.com/getsentry/sentry-symfony/pull/724)
+
+### Misc
+
+- Improve setting logged-in users on the scope [(#720)](https://github.com/getsentry/sentry-symfony/pull/720)
+- Move DB span tags to span data [(#743)](https://github.com/getsentry/sentry-symfony/pull/743)
+- Set the span status when tracing an HTTP client request [(#748)](https://github.com/getsentry/sentry-symfony/pull/748)
+
 ## 4.9.2
 
 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.
  ```
 
 - Use the `_route` attribute as the transaction name [(#692)](https://github.com/getsentry/sentry-symfony/pull/692)
- 
+
  If you're using named routes, the SDK will default to use this attribute as the transaction name.
  With this change, you should be able to see a full list of your transactions on the performance page,
  instead of `<< unparameterized >>`.

diff --git a/composer.json b/composer.json
@@ -43,10 +43,7 @@
  "doctrine/dbal": "^2.13||^3.0",
  "doctrine/doctrine-bundle": "^1.12||^2.5",
  "friendsofphp/php-cs-fixer": "^2.19||<=3.16.0",
- "jangregor/phpstan-prophecy": "^1.0",
  "monolog/monolog": "^1.3||^2.0",
- "phpspec/prophecy": "!=1.11.0",
- "phpspec/prophecy-phpunit": "^1.1||^2.0",
  "phpstan/extension-installer": "^1.0",
  "phpstan/phpstan": "^1.3",
  "phpstan/phpstan-phpunit": "^1.0",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -12,22 +12,22 @@ parameters:
 
  -
  message: "#^Cannot access offset 'before_breadcrumb' on mixed\\.$#"
- count: 3
+ count: 1
  path: src/DependencyInjection/SentryExtension.php
 
  -
  message: "#^Cannot access offset 'before_send' on mixed\\.$#"
- count: 3
+ count: 1
  path: src/DependencyInjection/SentryExtension.php
 
  -
  message: "#^Cannot access offset 'before_send…' on mixed\\.$#"
- count: 3
+ count: 1
  path: src/DependencyInjection/SentryExtension.php
 
  -
  message: "#^Cannot access offset 'class_serializers' on mixed\\.$#"
- count: 3
+ count: 1
  path: src/DependencyInjection/SentryExtension.php
 
  -
@@ -62,7 +62,7 @@ parameters:
 
  -
  message: "#^Cannot access offset 'traces_sampler' on mixed\\.$#"
- count: 3
+ count: 1
  path: src/DependencyInjection/SentryExtension.php
 
  -
@@ -160,6 +160,11 @@ parameters:
  count: 1
  path: src/EventListener/ConsoleCommandListener.php
 
+ -
+ message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpKernel\\\\Event\\\\KernelEvent\\:\\:isMasterRequest\\(\\)\\.$#"
+ count: 1
+ path: src/EventListener/LoginListener.php
+
  -
  message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpKernel\\\\Event\\\\KernelEvent\\:\\:isMasterRequest\\(\\)\\.$#"
  count: 1
@@ -285,6 +290,16 @@ parameters:
  count: 1
  path: tests/DependencyInjection/ConfigurationTest.php
 
+ -
+ message: "#^Function Symfony\\\\Component\\\\DependencyInjection\\\\Loader\\\\Configurator\\\\ref not found\\.$#"
+ count: 1
+ path: tests/DependencyInjection/Fixtures/php/release_option_fallback_to_env_var.php
+
+ -
+ message: "#^Used function Symfony\\\\Component\\\\DependencyInjection\\\\Loader\\\\Configurator\\\\ref not found\\.$#"
+ count: 1
+ path: tests/DependencyInjection/Fixtures/php/release_option_fallback_to_env_var.php
+
  -
  message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
  count: 1
@@ -300,6 +315,11 @@ parameters:
  count: 1
  path: tests/DependencyInjection/SentryExtensionTest.php
 
+ -
+ message: "#^Cannot access offset 'release' on mixed\\.$#"
+ count: 1
+ path: tests/DependencyInjection/SentryExtensionTest.php
+
  -
  message: "#^Class Symfony\\\\Component\\\\Debug\\\\Exception\\\\FatalErrorException not found\\.$#"
  count: 1
@@ -313,27 +333,32 @@ parameters:
  -
  message: "#^Call to function method_exists\\(\\) with \\$this\\(Sentry\\\\SentryBundle\\\\Tests\\\\EventListener\\\\AuthenticatedTokenStub\\) and 'setAuthenticated' will always evaluate to false\\.$#"
  count: 1
- path: tests/EventListener/RequestListenerTest.php
+ path: tests/EventListener/LoginListenerTest.php
 
  -
  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\\.$#"
  count: 1
- path: tests/EventListener/RequestListenerTest.php
+ path: tests/EventListener/LoginListenerTest.php
+
+ -
+ message: "#^Parameter \\#2 \\$firewallName of class Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\SwitchUserToken constructor expects string, null given\\.$#"
+ count: 1
+ path: tests/EventListener/LoginListenerTest.php
 
  -
  message: "#^Parameter \\#3 \\$roles of class Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\SwitchUserToken constructor expects array\\<string\\>, string given\\.$#"
  count: 1
- path: tests/EventListener/RequestListenerTest.php
+ path: tests/EventListener/LoginListenerTest.php
 
  -
  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\\.$#"
  count: 1
- path: tests/EventListener/RequestListenerTest.php
+ path: tests/EventListener/LoginListenerTest.php
 
  -
  message: "#^Parameter \\#5 \\$originatedFromUri of class Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\SwitchUserToken constructor expects string\\|null, Sentry\\\\SentryBundle\\\\Tests\\\\EventListener\\\\AuthenticatedTokenStub given\\.$#"
  count: 1
- path: tests/EventListener/RequestListenerTest.php
+ path: tests/EventListener/LoginListenerTest.php
 
  -
  message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpKernel\\\\Event\\\\KernelEvent\\:\\:isMasterRequest\\(\\)\\.$#"