Skip to content

Commit 55ed2d4

Browse files
Merge branch '6.0' into 6.1
* 6.0: (22 commits) [Messenger] Use :memory: for SQLite tests [Mailer] Stream timeout not detected due to checking only string result of function fgets don not set http_version instead of setting it to null [DependencyInjection] don't move locator tag for service subscriber Fix search scope when performing fallback mapping driver detection Fix the notification email theme for asynchronously dispatched emails Update the CI setup to use the new output file Update actions in the CI to move away from the deprecated runtime Use 6.3 for new features [HttpFoundation] Check IPv6 is valid before comparing it Run tests with UTC to avoid daylight saving time messing with assertions Bump Symfony version to 6.0.16 Update VERSION for 6.0.15 Update CHANGELOG for 6.0.15 Bump Symfony version to 5.4.16 Update VERSION for 5.4.15 Update CHANGELOG for 5.4.15 Bump Symfony version to 4.4.49 Update VERSION for 4.4.48 Update CONTRIBUTORS for 4.4.48 ...
2 parents 97f927a + ea41414 commit 55ed2d4

File tree

23 files changed

+187
-52
lines changed

23 files changed

+187
-52
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 6.2 for features / 4.4, 5.4, 6.0 or 6.1 for bug fixes <!-- see below -->
3+
| Branch? | 6.3 for features / 4.4, 5.4, 6.0, 6.1, or 6.2 for bug fixes <!-- see below -->
44
| Bug fix? | yes/no
55
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
66
| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->

.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106

107107
steps:
108108
- name: Checkout
109-
uses: actions/checkout@v2
109+
uses: actions/checkout@v3
110110

111111
- name: Install system dependencies
112112
run: |
@@ -135,7 +135,7 @@ jobs:
135135
with:
136136
coverage: "none"
137137
extensions: "json,couchbase-3.2.2,memcached,mongodb-1.12.0,redis-5.3.4,rdkafka,xsl,ldap"
138-
ini-values: date.timezone=Europe/Paris,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
138+
ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
139139
php-version: "${{ matrix.php }}"
140140
tools: pecl
141141

.github/workflows/intl-data-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v3
3030

3131
- name: Install system dependencies
3232
run: |

.github/workflows/package-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Find packages
2323
id: find-packages
24-
run: echo "::set-output name=packages::$(php .github/get-modified-packages.php $(find src/Symfony -mindepth 2 -maxdepth 6 -type f -name composer.json -printf '%h\n' | jq -R -s -c 'split("\n")[:-1]') $(git diff --name-only origin/${{ github.base_ref }} HEAD | grep src/ | jq -R -s -c 'split("\n")[:-1]'))"
24+
run: echo "packages=$(php .github/get-modified-packages.php $(find src/Symfony -mindepth 2 -maxdepth 6 -type f -name composer.json -printf '%h\n' | jq -R -s -c 'split("\n")[:-1]') $(git diff --name-only origin/${{ github.base_ref }} HEAD | grep src/ | jq -R -s -c 'split("\n")[:-1]'))" >> $GITHUB_OUTPUT
2525

2626
- name: Verify meta files are correct
2727
run: |

.github/workflows/phpunit-bridge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v3
3030

3131
- name: Setup PHP
3232
uses: shivammathur/setup-php@v2

.github/workflows/psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
coverage: none
3030

3131
- name: Checkout target branch
32-
uses: actions/checkout@v2
32+
uses: actions/checkout@v3
3333
with:
3434
ref: ${{ github.base_ref }}
3535

3636
- name: Checkout PR
37-
uses: actions/checkout@v2
37+
uses: actions/checkout@v3
3838

3939
- name: Install dependencies
4040
run: |

.github/workflows/unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ jobs:
3939

4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v3
4343
with:
4444
fetch-depth: 2
4545

4646
- name: Setup PHP
4747
uses: shivammathur/setup-php@v2
4848
with:
4949
coverage: "none"
50-
ini-values: date.timezone=Europe/Paris,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
50+
ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
5151
php-version: "${{ matrix.php }}"
5252
extensions: "${{ env.extensions }}"
5353
tools: flex

CHANGELOG-6.0.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,25 @@ in 6.0 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.0.0...v6.0.1
99

10+
* 6.0.15 (2022-10-28)
11+
12+
* bug #47990 [HttpClient] Fix retrying requests when the content is used by the strategy (nicolas-grekas)
13+
* bug #48005 [ErrorHandler] s/</br>/<br> (PhilETaylor)
14+
* bug #47907 [Console] Update Application.php (aleksandr-shevchenko)
15+
* bug #47955 [Security][Serializer] Add missing args to trigger_deprecation (alamirault)
16+
* bug #47932 Throw LogicException instead of Error when trying to generate logout-… (addiks)
17+
* bug #47918 [Intl] Update the ICU data to 72.1 - 5.4 (jderusse)
18+
* bug #47857 [HttpKernel] Fix empty request stack when terminating with exception (krzyc)
19+
* bug #47879 [HttpClient] Fix buffering after calling AsyncContext::passthru() (nicolas-grekas, lubo13)
20+
* bug #47878 [HttpKernel] Remove EOL when using error_log() in HttpKernel Logger (cyve)
21+
* bug #47883 [Console] Fix error output on windows cli (Maximilian.Beckers)
22+
* bug #47884 [Cache] Reserve numeric keys when doing memory leak prevention (simoheinonen)
23+
* bug #47863 [DoctrineBridge] Allow doctrine/event-manager 2 (derrabus)
24+
* bug #47831 [Messenger] Fix amqp socket lost (GurvanVgx)
25+
* bug #47855 [Routing] TypeError in Router when using UrlGenerator (Maximilian.Beckers)
26+
* bug #47822 [Mailer] fix: use message object from event (rogamoore)
27+
* bug #47858 [DoctrineBridge] Implement `EventManager::getAllListeners()` (derrabus)
28+
1029
* 6.0.14 (2022-10-12)
1130

1231
* bug #47621 [Serializer] Allow getting discriminated type by class name (TamasSzigeti)

0 commit comments

Comments
 (0)