Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1c11464

Browse filesBrowse files
johnkrovitchjohnkrovitch
committed
Merge branch 'symfony:5.4' into feature/auto-logout
2 parents 6c8a7ce + 27b1654 commit 1c11464
Copy full SHA for 1c11464

File tree

Expand file treeCollapse file tree

417 files changed

+4820
-1759
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

417 files changed

+4820
-1759
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 5.x for features / 4.4 or 5.2 for bug fixes <!-- see below -->
3+
| Branch? | 5.4 for features / 4.4, 5.2 or 5.3 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/psalm.yml

Copy file name to clipboardExpand all lines: .github/workflows/psalm.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
run: |
4040
echo "::group::modify composer.json"
4141
composer remove --no-update --no-interaction symfony/phpunit-bridge
42-
composer require --no-update psalm/phar phpunit/phpunit php-http/discovery psr/event-dispatcher
42+
composer require --no-update psalm/phar phpunit/phpunit:^9.5 php-http/discovery psr/event-dispatcher
4343
echo "::endgroup::"
4444
echo "::group::composer update"
4545
composer update --no-progress --ansi

‎.github/workflows/tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/tests.yml
+55Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,3 +191,58 @@ jobs:
191191
docker run --rm -e COMPOSER_ROOT_VERSION -v $(pwd):/app -v $(which composer):/usr/local/bin/composer -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.4-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push
192192
sudo rm -rf .phpunit
193193
[ -d .phpunit.bak ] && mv .phpunit.bak .phpunit
194+
195+
nightly:
196+
name: PHPUnit on PHP nightly
197+
runs-on: Ubuntu-20.04
198+
199+
steps:
200+
- name: Checkout
201+
uses: actions/checkout@v2
202+
203+
- name: Setup PHP
204+
uses: shivammathur/setup-php@v2
205+
with:
206+
coverage: "none"
207+
ini-values: "memory_limit=-1"
208+
php-version: "8.1"
209+
210+
- name: Configure composer
211+
run: |
212+
COMPOSER_HOME="$(composer config home)"
213+
composer self-update
214+
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
215+
echo "COMPOSER_ROOT_VERSION=$(grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*').x-dev" >> $GITHUB_ENV
216+
217+
- name: Install dependencies
218+
run: |
219+
echo "::group::fake PHP version"
220+
composer config platform.php 8.0.99
221+
echo "::group::composer update"
222+
composer update --no-progress --ansi
223+
echo "::endgroup::"
224+
echo "::group::install phpunit"
225+
./phpunit install
226+
echo "::endgroup::"
227+
228+
- name: Run tests
229+
run: |
230+
_run_tests() {
231+
ok=0
232+
echo "::group::$1"
233+
234+
# Run the tests
235+
./phpunit --colors=always --exclude-group tty,benchmark,intl-data ./$1 2>&1 || ok=1
236+
echo ::endgroup::
237+
238+
if [ $ok -ne 0 ]; then
239+
echo "::error::$1 failed"
240+
fi
241+
242+
# Make the tests always pass because we don't want the build to fail (yet).
243+
return 0
244+
#return $ok
245+
}
246+
export -f _run_tests
247+
248+
find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -print0 | xargs -0 -n1 dirname | sort | parallel _run_tests

‎.gitignore

Copy file name to clipboardExpand all lines: .gitignore
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
vendor/
22
composer.lock
33
phpunit.xml
4-
.php_cs.cache
4+
.php-cs-fixer.cache
5+
.php-cs-fixer.php
56
.phpunit.result.cache
67
composer.phar
78
package.tar

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

Copy file name to clipboardExpand all lines: .php-cs-fixer.dist.php
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
exit(0);
55
}
66

7-
return PhpCsFixer\Config::create()
7+
return (new PhpCsFixer\Config())
88
->setRules([
99
'@PHP71Migration' => true,
1010
'@PHPUnit75Migration:risky' => true,
@@ -14,7 +14,7 @@
1414
])
1515
->setRiskyAllowed(true)
1616
->setFinder(
17-
PhpCsFixer\Finder::create()
17+
(new PhpCsFixer\Finder())
1818
->in(__DIR__.'/src')
1919
->append([__FILE__])
2020
->notPath('#/Fixtures/#')
@@ -40,4 +40,5 @@
4040
// explicit trigger_error tests
4141
->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')
4242
)
43+
->setCacheFile('.php-cs-fixer.cache')
4344
;

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+11-13Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ addons:
1414

1515
env:
1616
global:
17-
- SYMFONY_VERSION=5.x
17+
- SYMFONY_VERSION=5.4
1818
- MIN_PHP=7.2.5
1919
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
2020
- SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
@@ -50,11 +50,14 @@ before_install:
5050
set -e
5151
stty cols 120
5252
cp .github/composer-config.json "$(composer config home)/config.json"
53+
git config --global user.email ""
54+
git config --global user.name "Symfony"
5355
export PHPUNIT=$(readlink -f ./phpunit)
5456
export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
5557
export COMPOSER_UP='composer update --no-progress --ansi'
5658
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
57-
export SYMFONY_DEPRECATIONS_HELPER=max[indirect]=170
59+
export SYMFONY_FEATURE_BRANCH=$(curl -s https://flex.symfony.com/versions.json | jq -r '."dev-name"')
60+
export SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)
5861
5962
nanoseconds () {
6063
local cmd="date"
@@ -179,11 +182,6 @@ install:
179182
180183
- |
181184
# Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
182-
git config --global user.email ""
183-
git config --global user.name "Symfony"
184-
185-
SYMFONY_VERSIONS=$(git ls-remote -q --heads);
186-
187185
if [[ ! $deps ]]; then
188186
php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
189187
else
@@ -200,18 +198,18 @@ install:
200198
fi
201199
202200
- |
203-
# For the feature-branch, when deps=high, the version before it is checked out and tested with the locally patched components
204-
if [[ $deps = high && $TRAVIS_BRANCH = *.x ]]; then
201+
# For the highest branch, when deps=high, the version before it is checked out and tested with the locally patched components
202+
if [[ $deps = high && $SYMFONY_VERSION = $(echo "$SYMFONY_VERSIONS" | tail -n 1 | sed s/.//) ]]; then
205203
export FLIP='^'
206-
export SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -o '/[1-9]\.[0-9].*' | tail -n 1 | sed s/.//) &&
204+
export SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -FB1 /$SYMFONY_VERSION | head -n 1 | sed s/.//) &&
207205
git fetch --depth=2 origin $SYMFONY_VERSION &&
208206
git checkout -m FETCH_HEAD &&
209207
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
210208
fi
211209
212210
- |
213211
# Skip the phpunit-bridge on bugfix-branches when $deps is empty
214-
if [[ ! $deps && ! $TRAVIS_BRANCH = *.x ]]; then
212+
if [[ ! $deps && $SYMFONY_VERSION != $SYMFONY_FEATURE_BRANCH ]]; then
215213
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
216214
fi
217215
@@ -226,7 +224,7 @@ install:
226224
227225
- |
228226
# Legacy tests are skipped when deps=high and when the current branch version has not the same major version number as the next one
229-
[[ $deps = high && ${SYMFONY_VERSION%.*} != $(echo "$SYMFONY_VERSIONS" | cut -f2 | grep -FA1 /$SYMFONY_VERSION | tail -n 1 | grep -o '[0-9]*' | head -n 1) ]] && export LEGACY=,legacy
227+
[[ $deps = high && $SYMFONY_VERSION = *.4 ]] && export LEGACY=,legacy
230228
231229
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
232230
if [[ $deps ]]; then mv composer.json.phpunit composer.json; fi
@@ -263,7 +261,7 @@ install:
263261
(cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
264262
COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
265263
266-
if [[ $COMPONENTS && $LEGACY && ! $TRAVIS_BRANCH = *.x && $TRAVIS_PULL_REQUEST != false && $(echo "$SYMFONY_VERSIONS" | cut -f2 | grep -FA1 /$SYMFONY_VERSION | tail -n 1) = *.x ]]; then
264+
if [[ $COMPONENTS && $SYMFONY_VERSION = *.4 && $TRAVIS_PULL_REQUEST != false ]]; then
267265
export FLIP='^'
268266
SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
269267
echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"

‎CHANGELOG-5.2.md

Copy file name to clipboardExpand all lines: CHANGELOG-5.2.md
+46Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,52 @@ in 5.2 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/v5.2.0...v5.2.1
99

10+
* 5.2.9 (2021-05-19)
11+
12+
* security #cve-2021-21424 [Security\Core] Fix user enumeration via response body on invalid credentials (chalasr)
13+
* bug #41275 Fixes Undefined method call (faizanakram99)
14+
* bug #41269 [SecurityBundle] Remove invalid unused service (chalasr)
15+
* bug #41139 [Security] [DataCollector] Remove allows anonymous information in datacollector (ismail1432)
16+
* bug #41230 [FrameworkBundle][Validator] Fix deprecations from Doctrine Annotations+Cache (derrabus)
17+
* bug #41206 [Mailer] Fix SES API call with UTF-8 Addresses (jderusse)
18+
* bug #41240 Fixed deprecation warnings about passing null as parameter (derrabus)
19+
* bug #41241 [Finder] Fix gitignore regex build with "**" (mvorisek)
20+
* bug #41224 [HttpClient] fix adding query string to relative URLs with scoped clients (nicolas-grekas)
21+
* bug #41233 [DependencyInjection][ProxyManagerBridge] Don't call class_exists() on null (derrabus)
22+
* bug #41211 [Notifier] Add missing charset to content-type for Slack notifier (norkunas)
23+
* bug #41210 [Console] Fix Windows code page support (orkan)
24+
25+
* 5.2.8 (2021-05-12)
26+
27+
* security #cve-2021-21424 [Security][Guard] Prevent user enumeration (chalasr)
28+
* bug #41176 [DependencyInjection] fix dumping service-closure-arguments (nicolas-grekas)
29+
* bug #41174 [Console] Fix Windows code page support (orkan)
30+
* bug #41173 [Security] Make Login Rate Limiter also case insensitive for non-ascii user identifiers (Seldaek)
31+
* bug #41168 WDT: Only load "Sfjs" if it is not present already (weaverryan)
32+
* bug #41147 [Inflector][String] wrong plural form of words ending by "pectus" (makraz)
33+
* bug #41160 [HttpClient] Don't prepare the request in ScopingHttpClient (nicolas-grekas)
34+
* bug #41156 [Security] Make Login Rate Limiter case insensitive (jderusse)
35+
* bug #41137 [Security] Reset limiters on successful login (MatTheCat)
36+
* bug #40758 [Security] NullToken signature (jderusse)
37+
* bug #40763 Fix/Rewrite .gitignore regex builder (mvorisek)
38+
* bug #41113 [Console] Fix Windows code page support (orkan)
39+
* bug #40902 [Security] Allow ips parameter in access_control to accept comma-separated string (edefimov)
40+
* bug #40980 [TwigBridge] Fix HTML for translatable custom-file label in Bootstrap 4 theme (acran)
41+
* bug #40955 [Notifier] [Bridge] Fix missed messageId for SendMessage object in slack notifier (WaylandAce)
42+
* bug #40943 [PropertyInfo] PhpDocExtractor: Handle "true" and "false" property types (Maciej Zgadzaj)
43+
* bug #40759 [Form] Add missing TranslatableMessage support to choice_label option of ChoiceType (alexandre-daubois)
44+
* bug #40917 [Config][DependencyInjection] Uniformize trailing slash handling (dunglas)
45+
* bug #40699 [PropertyInfo] Make ReflectionExtractor correctly extract nullability (shiftby)
46+
* bug #40874 [PropertyInfo] fix attribute namespace with recursive traits (soullivaneuh)
47+
* bug #40957 [PhpUnitBridge] Fix tests with ``@doesNotPerformAssertions`` annotations (alexpott)
48+
* bug #41099 [Cache] Check if phpredis version is compatible with stream parameter (nicolassing)
49+
* bug #40982 [Notifier] Fix return SentMessage then Messenger not used (WaylandAce)
50+
* bug #41072 [VarExporter] Add support of PHP enumerations (alexandre-daubois)
51+
* bug #41104 Fix return type in isAllowedProperty method on ReflectionExtractor class (Tomanhez)
52+
* bug #41078 [Notifier] Make FailoverTransport always pick the first transport (jschaedl)
53+
* bug #41105 [Inflector][String] Fixed singularize `edges` > `edge` (ruudk)
54+
* bug #41075 [ErrorHandler] Skip "same vendor" ``@method`` deprecations for `Symfony\*` classes unless symfony/symfony is being tested (nicolas-grekas)
55+
1056
* 5.2.7 (2021-05-01)
1157

1258
* bug #41008 [Security] Do not try to rehash null-passwords (tjveldhuizen)

‎CHANGELOG-5.3.md

Copy file name to clipboardExpand all lines: CHANGELOG-5.3.md
+44Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,50 @@ in 5.3 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/v5.3.0...v5.3.1
99

10+
* 5.3.0-RC1 (2021-05-19)
11+
12+
* security #cve-2021-21424 [Security\Core] Fix user enumeration via response body on invalid credentials (chalasr)
13+
* bug #41275 Fixes Undefined method call (faizanakram99)
14+
* feature #41175 [Security] [RememberMe] Add support for parallel requests doing remember-me re-authentication (Seldaek)
15+
* bug #41269 [SecurityBundle] Remove invalid unused service (chalasr)
16+
* feature #41247 [Security] Deprecate the old authentication mechanisms (chalasr)
17+
* bug #41139 [Security] [DataCollector] Remove allows anonymous information in datacollector (ismail1432)
18+
* bug #41254 [Security\Http] Fix handling `secure: auto` using the new RememberMeAuthenticator (chalasr)
19+
* bug #41230 [FrameworkBundle][Validator] Fix deprecations from Doctrine Annotations+Cache (derrabus)
20+
* bug #41206 [Mailer] Fix SES API call with UTF-8 Addresses (jderusse)
21+
* bug #41240 Fixed deprecation warnings about passing null as parameter (derrabus)
22+
* bug #41241 [Finder] Fix gitignore regex build with "**" (mvorisek)
23+
* bug #41224 [HttpClient] fix adding query string to relative URLs with scoped clients (nicolas-grekas)
24+
* bug #41233 [DependencyInjection][ProxyManagerBridge] Don't call class_exists() on null (derrabus)
25+
* bug #41214 [Console] fix registering command aliases when using the new "cmd|alias" syntax for names (nicolas-grekas)
26+
* bug #41211 [Notifier] Add missing charset to content-type for Slack notifier (norkunas)
27+
* bug #41210 [Console] Fix Windows code page support (orkan)
28+
29+
* 5.3.0-BETA4 (2021-05-12)
30+
31+
* security #cve-2021-21424 [Security][Guard] Prevent user enumeration (chalasr)
32+
* feature #41178 [FrameworkBundle] Introduce `AbstractController::renderForm()` instead of `handleForm()` (lyrixx)
33+
* feature #41182 [DependencyInjection] allow PHP-DSL files to be env-conditional (nicolas-grekas)
34+
* bug #41177 [DependencyInjection] fix empty instanceof-conditionals created by AttributeAutoconfigurationPass (nicolas-grekas)
35+
* bug #41176 [DependencyInjection] fix dumping service-closure-arguments (nicolas-grekas)
36+
* bug #41174 [Console] Fix Windows code page support (orkan)
37+
* bug #41173 [Security] Make Login Rate Limiter also case insensitive for non-ascii user identifiers (Seldaek)
38+
* bug #41170 [DependencyInjection] Don't try to load YamlFileLoader if it's not actually needed (nicolas-grekas)
39+
* bug #41168 WDT: Only load "Sfjs" if it is not present already (weaverryan)
40+
* feature #36864 [Messenger] Ability to distinguish retry and delay actions (theravel)
41+
* bug #41164 [FrameworkBundle] fix debug:event-dispatcher and debug:firewall (nicolas-grekas)
42+
* feature #41161 [HttpClient] Add `DecoratorTrait` to ease writing simple decorators (nicolas-grekas)
43+
* bug #41147 [Inflector][String] wrong plural form of words ending by "pectus" (makraz)
44+
* bug #41160 [HttpClient] Don't prepare the request in ScopingHttpClient (nicolas-grekas)
45+
* bug #41156 [Security] Make Login Rate Limiter case insensitive (jderusse)
46+
* bug #41155 [Translation] Improved Translation Providers (welcoMattic)
47+
* feature #40927 [Translation] Added Lokalise Provider (welcoMattic)
48+
* feature #40926 [Translation] Added PoEditor Provider (welcoMattic)
49+
* bug #41137 [Security] Reset limiters on successful login (MatTheCat)
50+
* bug #41148 [Runtime] fix defining $_SERVER[APP_ENV] (nicolas-grekas)
51+
* bug #40758 [Security] NullToken signature (jderusse)
52+
* bug #40763 Fix/Rewrite .gitignore regex builder (mvorisek)
53+
1054
* 5.3.0-BETA3 (2021-05-09)
1155

1256
* feature #40947 [Translation] Added Crowdin Translation Provider (andrii-bodnar)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.