Skip to content

Commit e55c3e4

Browse files
ste93cryste93cry
committed
Merge branch 'master' into develop
2 parents 0c609cd + 2d30164 commit e55c3e4

Some content is hidden

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

46 files changed

+2409
-914
lines changed

‎.github/workflows/static-analysis.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818

1919
- name: Setup PHP
2020
uses: shivammathur/setup-php@v2
21+
with:
22+
php-version: '8.0'
2123

2224
- name: Install dependencies
2325
run: composer update --no-progress --no-interaction --prefer-dist
@@ -50,9 +52,11 @@ jobs:
5052

5153
- name: Setup PHP
5254
uses: shivammathur/setup-php@v2
55+
with:
56+
php-version: '8.0'
5357

5458
- name: Install dependencies
5559
run: composer update --no-progress --no-interaction --prefer-dist
5660

5761
- name: Run script
58-
run: composer psalm
62+
run: composer psalm -- --php-version=8.0

‎.github/workflows/tests.yaml

Lines changed: 83 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Continuous Integration
22

33
on:
44
pull_request: null
@@ -9,86 +9,104 @@ on:
99
- 3.5.x
1010

1111
jobs:
12-
Tests:
12+
tests:
13+
name: Tests
1314
runs-on: ubuntu-latest
14-
continue-on-error: ${{ matrix.experimental == true }}
1515
env:
16-
SYMFONY_REQUIRE: ${{matrix.symfony_constraint}}
16+
SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
1717
strategy:
1818
fail-fast: false
1919
matrix:
2020
php:
21-
- '8.0'
22-
- '7.4'
23-
- '7.3'
2421
- '7.2'
25-
sentry_constraint: [false]
26-
dbal_constraint: [false]
27-
symfony_constraint: ['']
28-
experimental: [false]
22+
- '7.3'
23+
- '7.4'
24+
- '8.0'
25+
- '8.1'
26+
symfony-version:
27+
- 3.4.*
28+
- 4.4.*
29+
- 5.*
30+
- 6.*
31+
dependencies:
32+
- highest
33+
exclude:
34+
- php: '7.2'
35+
symfony-version: 6.*
36+
- php: '7.3'
37+
symfony-version: 6.*
38+
- php: '7.4'
39+
symfony-version: 6.*
40+
- php: '8.0'
41+
symfony-version: 3.4.*
42+
- php: '8.1'
43+
symfony-version: 3.4.*
2944
include:
30-
# - description: 'sentry/sentry dev-develop'
31-
# php: '7.4'
32-
# sentry_constraint: 'dev-develop'
33-
# experimental: true
34-
- description: 'DBAL 2'
35-
php: '7.4'
36-
dbal_constraint: '^2.13'
37-
- description: 'Symfony 4.4'
38-
php: '7.3'
39-
symfony_constraint: 4.4.*
40-
- description: 'Symfony 3.4'
41-
php: '7.2'
42-
symfony_constraint: 3.4.*
43-
env:
44-
SYMFONY_DEPRECATIONS_HELPER: disabled
45-
- description: 'prefer lowest'
46-
php: '7.2'
47-
composer_option: '--prefer-lowest'
48-
symfony_constraint: ^3.4.44
49-
env:
50-
SYMFONY_DEPRECATIONS_HELPER: disabled
51-
52-
name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
45+
- php: '7.2'
46+
symfony-version: 3.4.*
47+
dependencies: lowest
48+
- php: '7.2'
49+
symfony-version: 4.4.*
50+
dependencies: lowest
51+
- php: '7.2'
52+
symfony-version: 5.*
53+
dependencies: lowest
54+
- php: '8.0'
55+
symfony-version: 6.*
56+
dependencies: lowest
57+
5358
steps:
54-
- uses: actions/checkout@v2
59+
- name: Checkout
60+
uses: actions/checkout@v2
5561
with:
5662
fetch-depth: 2
57-
- uses: actions/cache@v2
58-
with:
59-
path: ~/.composer/cache/files
60-
key: ${{ matrix.php }}-${{ matrix.symfony_constraint }}-${{ matrix.composer_option }}
61-
- uses: shivammathur/setup-php@v2
63+
64+
- name: Setup PHP
65+
uses: shivammathur/setup-php@v2
6266
with:
6367
php-version: ${{ matrix.php }}
64-
coverage: xdebug
65-
- name: Install Symfony Flex
66-
run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
67-
- run: composer remove --dev symfony/messenger --no-update
68-
if: matrix.symfony_constraint == '3.4.*' || matrix.composer_option == '--prefer-lowest'
69-
- run: composer require --dev doctrine/dbal ${{ matrix.dbal_constraint }} --no-update
70-
if: matrix.dbal_constraint
71-
- run: composer update --no-progress --ansi ${{ matrix.composer_option }}
72-
- run: composer require sentry/sentry dev-develop
73-
if: matrix.sentry_constraint == 'dev-develop'
74-
- run: vendor/bin/phpunit --coverage-clover=coverage.xml
75-
- uses: codecov/codecov-action@v1
68+
coverage: pcov
69+
tools: flex
70+
71+
- name: Setup Problem Matchers for PHPUnit
72+
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
73+
74+
- name: Remove PHP-CS-Fixer
75+
run: composer remove --dev friendsofphp/php-cs-fixer --no-update
76+
77+
- name: Remove Symfony Messenger
78+
run: composer remove --dev symfony/messenger --no-update
79+
if: matrix.symfony-version == '3.4.*'
80+
81+
- name: Install dependencies
82+
uses: ramsey/composer-install@v1
83+
with:
84+
dependency-versions: ${{ matrix.dependencies }}
85+
composer-options: --prefer-dist
86+
87+
- name: Run tests
88+
run: vendor/bin/phpunit --coverage-clover=build/coverage-report.xml
89+
90+
- name: Upload code coverage
91+
uses: codecov/codecov-action@v1
7692
with:
77-
file: './coverage.xml'
78-
fail_ci_if_error: true
93+
file: build/coverage-report.xml
7994

8095
missing-optional-packages-tests:
8196
name: Tests without optional packages
8297
runs-on: ubuntu-latest
8398
strategy:
8499
fail-fast: false
85100
matrix:
86-
php:
87-
- '7.2'
88-
- '8.0'
89-
dependencies:
90-
- lowest
91-
- highest
101+
include:
102+
- php: '7.2'
103+
dependencies: lowest
104+
- php: '7.4'
105+
dependencies: highest
106+
- php: '8.0'
107+
dependencies: lowest
108+
- php: '8.1'
109+
dependencies: highest
92110

93111
steps:
94112
- name: Checkout
@@ -103,27 +121,14 @@ jobs:
103121
- name: Setup Problem Matchers for PHPUnit
104122
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
105123

106-
- name: Determine Composer cache directory
107-
id: composer-cache
108-
run: echo "::set-output name=directory::$(composer config cache-dir)"
109-
110-
- name: Cache Composer dependencies
111-
uses: actions/cache@v2
112-
with:
113-
path: ${{ steps.composer-cache.outputs.directory }}
114-
key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
115-
restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer-${{ matrix.dependencies }}-
116-
117124
- name: Remove optional packages
118125
run: composer remove doctrine/dbal doctrine/doctrine-bundle symfony/messenger symfony/twig-bundle symfony/cache --dev --no-update
119126

120-
- name: Install highest dependencies
121-
run: composer update --no-progress --no-interaction --prefer-dist
122-
if: ${{ matrix.dependencies == 'highest' }}
123-
124-
- name: Install lowest dependencies
125-
run: composer update --no-progress --no-interaction --prefer-dist --prefer-lowest
126-
if: ${{ matrix.dependencies == 'lowest' }}
127+
- name: Install dependencies
128+
uses: ramsey/composer-install@v1
129+
with:
130+
dependency-versions: ${{ matrix.dependencies }}
131+
composer-options: --prefer-dist
127132

128133
- name: Run tests
129134
run: vendor/bin/phpunit --coverage-clover=build/coverage-report.xml

‎CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,33 @@
22

33
## Unreleased
44

5+
## 4.2.5 (2021-12-13)
6+
7+
- Add support for Symfony 6 (#566)
8+
- Fix fatal errors logged twice on Symfony `3.4` (#570)
9+
10+
## 4.2.4 (2021-10-20)
11+
12+
- Add return typehints to the methods of the `SentryExtension` class to prepare for Symfony 6 (#563)
13+
- Fix setting the IP address on the user context when it's not available (#565)
14+
- Fix wrong method existence check in `TracingDriverConnection::errorCode()` (#568)
15+
- Fix decoration of the Doctrine DBAL connection when it implemented the `ServerInfoAwareConnection` interface (#567)
16+
17+
## 4.2.3 (2021-09-21)
18+
19+
- Fix: Test if `TracingStatement` exists before attempting to create the class alias, otherwise it breaks when opcache is enabled. (#552)
20+
- Fix: Pass logger from `logger` config option to `TransportFactory` (#555)
21+
- Improve the compatibility layer with Doctrine DBAL to avoid deprecations notices (#553)
22+
23+
## 4.2.2 (2021-08-30)
24+
25+
- Fix missing instrumentation of the `Statement::execute()` method of Doctrine DBAL (#548)
26+
27+
## 4.2.1 (2021-08-24)
28+
29+
- Fix return type for `TracingDriver::getDatabase()` method (#541)
30+
- Avoid throwing exception from the `TraceableCacheAdapterTrait::prune()` and `TraceableCacheAdapterTrait::reset()` methods when the decorated adapter does not implement the respective interfaces (#543)
31+
532
## 4.2.0 (2021-08-12)
633

734
- Log the bus name, receiver name and message class name as event tags when using Symfony Messenger (#492)

‎composer.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
"jean85/pretty-package-versions": "^1.5 || ^2.0",
2424
"php-http/discovery": "^1.11",
2525
"sentry/sdk": "^3.1",
26-
"symfony/cache-contracts": "^2.4",
27-
"symfony/config": "^3.4.44||^4.4.20||^5.0.11",
28-
"symfony/console": "^3.4.44||^4.4.20||^5.0.11",
29-
"symfony/dependency-injection": "^3.4.44||^4.4.20||^5.0.11",
30-
"symfony/event-dispatcher": "^3.4.44||^4.4.20||^5.0.11",
31-
"symfony/http-kernel": "^3.4.44||^4.4.20||^5.0.11",
26+
"symfony/cache-contracts": "^1.1||^2.4",
27+
"symfony/config": "^3.4.44||^4.4.20||^5.0.11||^6.0",
28+
"symfony/console": "^3.4.44||^4.4.20||^5.0.11||^6.0",
29+
"symfony/dependency-injection": "^3.4.44||^4.4.20||^5.0.11||^6.0",
30+
"symfony/event-dispatcher": "^3.4.44||^4.4.20||^5.0.11||^6.0",
31+
"symfony/http-kernel": "^3.4.44||^4.4.20||^5.0.11||^6.0",
3232
"symfony/polyfill-php80": "^1.22",
3333
"symfony/psr-http-message-bridge": "^1.2||^2.0",
34-
"symfony/security-core": "^3.4.44||^4.4.20||^5.0.11"
34+
"symfony/security-core": "^3.4.44||^4.4.20||^5.0.11||^6.0"
3535
},
3636
"require-dev": {
3737
"doctrine/dbal": "^2.13||^3.0",
38-
"doctrine/doctrine-bundle": "^1.12||^2.0",
38+
"doctrine/doctrine-bundle": "^1.12||^2.5",
3939
"friendsofphp/php-cs-fixer": "^2.18",
4040
"jangregor/phpstan-prophecy": "^0.8",
4141
"monolog/monolog": "^1.3||^2.0",
@@ -44,16 +44,17 @@
4444
"phpstan/extension-installer": "^1.0",
4545
"phpstan/phpstan": "^0.12",
4646
"phpstan/phpstan-phpunit": "^0.12",
47-
"phpunit/phpunit": "^8.5||^9.0",
48-
"symfony/browser-kit": "^3.4.44||^4.4.20||^5.0.11",
49-
"symfony/cache": "^3.4.44||^4.4.20||^5.0.11",
50-
"symfony/dom-crawler": "^3.4.44||^4.4.20||^5.0.11",
51-
"symfony/framework-bundle": "^3.4.44||^4.4.20||^5.0.11",
52-
"symfony/messenger": "^4.4.20||^5.0.11",
47+
"phpunit/phpunit": "^8.5.14||^9.3.9",
48+
"symfony/browser-kit": "^3.4.44||^4.4.20||^5.0.11||^6.0",
49+
"symfony/cache": "^3.4.44||^4.4.20||^5.0.11||^6.0",
50+
"symfony/dom-crawler": "^3.4.44||^4.4.20||^5.0.11||^6.0",
51+
"symfony/framework-bundle": "^3.4.44||^4.4.20||^5.0.11||^6.0",
52+
"symfony/messenger": "^4.4.20||^5.0.11||^6.0",
5353
"symfony/monolog-bundle": "^3.4",
54-
"symfony/phpunit-bridge": "^5.2.6",
55-
"symfony/twig-bundle": "^3.4.44||^4.4.20||^5.0.11",
56-
"symfony/yaml": "^3.4.44||^4.4.20||^5.0.11",
54+
"symfony/phpunit-bridge": "^5.2.6||^6.0",
55+
"symfony/process": "^3.4.44||^4.4.20||^5.0.11||^6.0",
56+
"symfony/twig-bundle": "^3.4.44||^4.4.20||^5.0.11||^6.0",
57+
"symfony/yaml": "^3.4.44||^4.4.20||^5.0.11||^6.0",
5758
"vimeo/psalm": "^4.3"
5859
},
5960
"suggest": {

0 commit comments

Comments
 (0)