Merge branch 'master' into develop

Author: ste93cry

.github/workflows/stale.yml

@@ -1,7 +1,7 @@
 name: 'close stale issues/PRs'
 on:
   schedule:
-    - cron: '* */3 * * *'
+    - cron: '0 0 * * *'
   workflow_dispatch:
 jobs:
   stale:
@@ -18,7 +18,7 @@ jobs:
           debug-only: false
           ascending: false
 
-          exempt-issue-labels: "Status: Backlog,Status: In Progress, Status: Confirmed, Status: Blocked"
+          exempt-issue-labels: "Status: Backlog,Status: In Progress"
           stale-issue-label: "Status: Stale"
           stale-issue-message: |-
             This issue has gone three weeks without activity. In another week, I will close it.

.github/workflows/static-analysis.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
 
       - name: Install dependencies
         run: composer update --no-progress --no-interaction --prefer-dist
@@ -36,6 +36,8 @@ jobs:
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
 
       - name: Install dependencies
         run: composer update --no-progress --no-interaction --prefer-dist
@@ -53,7 +55,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
 
       - name: Install dependencies
         run: composer update --no-progress --no-interaction --prefer-dist

.github/workflows/tests.yaml

@@ -71,9 +71,6 @@ jobs:
       - name: Setup Problem Matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-      - name: Remove PHP-CS-Fixer
-        run: composer remove --dev friendsofphp/php-cs-fixer --no-update
-
       - name: Remove Symfony Messenger
         run: composer remove --dev symfony/messenger --no-update
         if: matrix.symfony-version == '3.4.*'

.gitignore

@@ -2,7 +2,7 @@
 package.xml
 /vendor
 .idea
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 docs/_build
 var

.php_cs.dist .php-cs-fixer.dist.php.php_cs.dist renamed to .php-cs-fixer.dist.php

@@ -1,6 +1,9 @@
 <?php
 
-return PhpCsFixer\Config::create()
+declare(strict_types=1);
+
+return (new PhpCsFixer\Config())
+    ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
         '@Symfony' => true,
@@ -11,8 +14,6 @@
             'imports_order' => ['class', 'function', 'const'],
         ],
         'declare_strict_types' => true,
-        'psr0' => true,
-        'psr4' => true,
         'random_api_migration' => true,
         'yoda_style' => true,
         'self_accessor' => false,
@@ -27,7 +28,6 @@
             'property' => 'multi',
         ],
     ])
-    ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in(__DIR__)

CHANGELOG.md

@@ -4,6 +4,22 @@
 
 - Add `TracingDriverConnectionInterface::getNativeConnection()` method to get the original driver connection (#597)
 
+## 4.2.10 (2022-05-17)
+
+- Fix compatibility issue with Twig >= 3.4.0 (#628)
+
+## 4.2.9 (2022-05-03)
+
+- Fix deprecation notice thrown when instrumenting the `PDOStatement::bindParam()` method and passing `$length = null` on DBAL `2.x` (#613)
+
+## 4.2.8 (2022-03-31)
+
+- Fix compatibility issue with Doctrine Bundle `>= 2.6.0` (#608)
+
+## 4.2.7 (2022-02-18)
+
+- Fix deprecation notice thrown when instrumenting the `PDOStatement::bindParam()` method and passing `$length = null` (#586)
+
 ## 4.2.6 (2022-01-10)
 
 - Add support for `symfony/cache-contracts` package version `3.x` (#588)

README.md

@@ -1,3 +1,9 @@
+<p align="center">
+  <a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
+    <img src="https://sentry-brand.storage.googleapis.com/sentry-wordmark-dark-280x84.png" alt="Sentry" width="280" height="84">
+  </a>
+</p>
+
 # sentry-symfony
 
 Symfony integration for [Sentry](https://getsentry.com/).

composer.json

@@ -40,14 +40,15 @@
     "require-dev": {
         "doctrine/dbal": "^2.13||^3.0",
         "doctrine/doctrine-bundle": "^1.12||^2.5",
-        "friendsofphp/php-cs-fixer": "^2.18",
-        "jangregor/phpstan-prophecy": "^0.8",
+        "friendsofphp/php-cs-fixer": "^2.19||^3.6",
+        "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": "^0.12",
-        "phpstan/phpstan-phpunit": "^0.12",
+        "phpstan/phpstan": "^1.3",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^8.5.14||^9.3.9",
         "symfony/browser-kit": "^3.4.44||^4.4.20||^5.0.11||^6.0",
         "symfony/cache": "^3.4.44||^4.4.20||^5.0.11||^6.0",