Merge branch 'master' into fix/issue-840

getsentry · Jun 4, 2024 · 244535b · 244535b
2 parents 828457d + 03cf752
commit 244535b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 16 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,3 +4,13 @@ updates:
  directory: "/"
  schedule:
  interval: weekly
+ - package-ecosystem: "composer"
+ directory: "/"
+ allow:
+ - dependency-name: "*phpstan*"
+ schedule:
+ interval: weekly
+ groups:
+ composer:
+ patterns:
+ - "*phpstan*"
diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml
@@ -19,7 +19,7 @@ jobs:
  name: Release version
  steps:
  - name: Checkout
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
  with:
  token: ${{ secrets.GH_RELEASE_PAT }}
  fetch-depth: 0

diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
@@ -17,10 +17,10 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
  - name: Setup PHP
- uses: shivammathur/setup-php@efffd0e4f2504f936fcfe3b69293d31ce0e2fd7a # v2.30.3
+ uses: shivammathur/setup-php@fc14643b0a99ee9db10a3c025a33d76544fa3761 # v2.30.5
  with:
  php-version: '8.2'
 
@@ -37,10 +37,10 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
  - name: Setup PHP
- uses: shivammathur/setup-php@efffd0e4f2504f936fcfe3b69293d31ce0e2fd7a # v2.30.3
+ uses: shivammathur/setup-php@fc14643b0a99ee9db10a3c025a33d76544fa3761 # v2.30.5
  with:
  php-version: '8.3'
 
@@ -57,10 +57,10 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
  - name: Setup PHP
- uses: shivammathur/setup-php@efffd0e4f2504f936fcfe3b69293d31ce0e2fd7a # v2.30.3
+ uses: shivammathur/setup-php@fc14643b0a99ee9db10a3c025a33d76544fa3761 # v2.30.5
  with:
  php-version: '8.3'
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -68,12 +68,12 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
  with:
  fetch-depth: 2
 
  - name: Setup PHP
- uses: shivammathur/setup-php@efffd0e4f2504f936fcfe3b69293d31ce0e2fd7a # v2.30.3
+ uses: shivammathur/setup-php@fc14643b0a99ee9db10a3c025a33d76544fa3761 # v2.30.5
  with:
  php-version: ${{ matrix.php }}
  coverage: pcov
@@ -96,7 +96,7 @@ jobs:
  run: vendor/bin/phpunit --coverage-clover=build/coverage-report.xml
 
  - name: Upload code coverage
- uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
+ uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
  with:
  file: build/coverage-report.xml
  token: ${{ secrets.CODECOV_TOKEN }}
@@ -123,10 +123,10 @@ jobs:
 
  steps:
  - name: Checkout
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
  - name: Setup PHP
- uses: shivammathur/setup-php@efffd0e4f2504f936fcfe3b69293d31ce0e2fd7a # v2.30.3
+ uses: shivammathur/setup-php@fc14643b0a99ee9db10a3c025a33d76544fa3761 # v2.30.5
  with:
  php-version: ${{ matrix.php }}
  coverage: pcov
@@ -148,7 +148,7 @@ jobs:
  run: vendor/bin/phpunit --coverage-clover=build/coverage-report.xml
 
  - name: Upload code coverage
- uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
+ uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
  with:
  file: build/coverage-report.xml
  token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/composer.json b/composer.json
@@ -33,9 +33,9 @@
  "friendsofphp/php-cs-fixer": "^2.19||^3.40",
  "masterminds/html5": "^2.8",
  "phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "^1.3",
- "phpstan/phpstan-phpunit": "^1.0",
- "phpstan/phpstan-symfony": "^1.0",
+ "phpstan/phpstan": "1.11.3",
+ "phpstan/phpstan-phpunit": "1.4.0",
+ "phpstan/phpstan-symfony": "1.4.3",
  "phpunit/phpunit": "^8.5.14||^9.3.9",
  "symfony/browser-kit": "^4.4.20||^5.0.11||^6.0||^7.0",
  "symfony/cache": "^4.4.20||^5.0.11||^6.0||^7.0",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -155,6 +155,11 @@ parameters:
  count: 2
  path: src/DependencyInjection/SentryExtension.php
 
+ -
+ message: "#^Parameter \\#2 \\$callback of function preg_replace_callback expects callable\\(array\\<int\\|string, string\\>\\)\\: string, Closure\\(array\\)\\: mixed given\\.$#"
+ count: 1
+ path: src/ErrorTypesParser.php
+
  -
  message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpKernel\\\\Event\\\\KernelEvent\\:\\:isMasterRequest\\(\\)\\.$#"
  count: 1