Skip to content

Commit 2bf09a7

Browse files
author
Oleg Namaka
committed
Merge remote-tracking branch 'origin/master' into 37233-support-multiple-bindings
# Conflicts: # src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
2 parents b5e2f0e + f4a9a5d commit 2bf09a7

File tree

10,424 files changed

+1060823
-453313
lines changed

Some content is hidden

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

10,424 files changed

+1060823
-453313
lines changed

‎.appveyor.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
build: false
22
clone_depth: 2
33
clone_folder: c:\projects\symfony
4-
5-
cache:
6-
- composer.phar
7-
- .phpunit -> phpunit
4+
image: Visual Studio 2019
85

96
init:
107
- SET PATH=c:\php;%PATH%
118
- SET COMPOSER_NO_INTERACTION=1
12-
- SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=7
13-
- SET "SYMFONY_REQUIRE=>=4.4"
9+
- SET SYMFONY_DEPRECATIONS_HELPER=strict
1410
- SET ANSICON=121x90 (121x90)
1511
- SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
1612
- REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
1713

1814
install:
1915
- mkdir c:\php && cd c:\php
20-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.2.5-Win32-VC15-x86.zip
21-
- 7z x php-7.2.5-Win32-VC15-x86.zip -y >nul
16+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.1.0-Win32-vs16-x86.zip
17+
- 7z x php-8.1.0-Win32-vs16-x86.zip -y >nul
2218
- cd ext
23-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.17-7.2-ts-vc15-x86.zip
24-
- 7z x php_apcu-5.1.17-7.2-ts-vc15-x86.zip -y >nul
19+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.21-8.1-ts-vs16-x86.zip
20+
- 7z x php_apcu-5.1.21-8.1-ts-vs16-x86.zip -y >nul
21+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-5.3.7-8.1-ts-vs16-x86.zip
22+
- 7z x php_redis-5.3.7-8.1-ts-vs16-x86.zip -y >nul
2523
- cd ..
2624
- copy /Y php.ini-development php.ini-min
2725
- echo memory_limit=-1 >> php.ini-min
2826
- echo serialize_precision=-1 >> php.ini-min
2927
- echo max_execution_time=1200 >> php.ini-min
28+
- echo post_max_size=4G >> php.ini-min
29+
- echo upload_max_filesize=4G >> php.ini-min
3030
- echo date.timezone="America/Los_Angeles" >> php.ini-min
3131
- echo extension_dir=ext >> php.ini-min
3232
- echo extension=php_xsl.dll >> php.ini-min
@@ -35,33 +35,36 @@ install:
3535
- echo opcache.enable_cli=1 >> php.ini-max
3636
- echo extension=php_openssl.dll >> php.ini-max
3737
- echo extension=php_apcu.dll >> php.ini-max
38+
- echo extension=php_redis.dll >> php.ini-max
3839
- echo apc.enable_cli=1 >> php.ini-max
3940
- echo extension=php_intl.dll >> php.ini-max
4041
- echo extension=php_mbstring.dll >> php.ini-max
4142
- echo extension=php_fileinfo.dll >> php.ini-max
4243
- echo extension=php_pdo_sqlite.dll >> php.ini-max
4344
- echo extension=php_curl.dll >> php.ini-max
45+
- echo extension=php_sodium.dll >> php.ini-max
4446
- copy /Y php.ini-max php.ini
4547
- cd c:\projects\symfony
46-
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
47-
- php composer.phar self-update
48-
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
49-
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
48+
- appveyor DownloadFile https://getcomposer.org/download/latest-stable/composer.phar
49+
- mkdir %APPDATA%\Composer && copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
5050
- git config --global user.email ""
5151
- git config --global user.name "Symfony"
52-
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
53-
- php composer.phar update --no-progress --no-suggest --ansi
52+
- FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F)
53+
- php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
54+
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
55+
- php composer.phar update --no-progress --ansi
5456
- php phpunit install
57+
- choco install memurai-developer
5558

5659
test_script:
5760
- SET X=0
5861
- SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
5962
- copy /Y c:\php\php.ini-min c:\php\php.ini
6063
- IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit)
6164
- mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml
62-
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
65+
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || SET X=!errorlevel!
6366
- php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
6467
- copy /Y c:\php\php.ini-max c:\php\php.ini
65-
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
68+
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || SET X=!errorlevel!
6669
- php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
6770
- exit %X%

‎.gitattributes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/src/Symfony/Contracts export-ignore
2+
/src/Symfony/Bridge/PhpUnit export-ignore
3+
/src/Symfony/Component/Mailer/Bridge export-ignore
4+
/src/Symfony/Component/Messenger/Bridge export-ignore
5+
/src/Symfony/Component/Notifier/Bridge export-ignore
6+
/src/Symfony/Component/Runtime export-ignore

‎.github/CODEOWNERS

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# Console
2+
/src/Symfony/Component/Console/ @chalasr
23
/src/Symfony/Component/Console/Logger/ConsoleLogger.php @dunglas
34
# DependencyInjection
45
/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php @dunglas
5-
# ErrorRenderer
6-
/src/Symfony/Component/ErrorRenderer/* @yceruto
6+
# ErrorHandler
7+
/src/Symfony/Component/ErrorHandler/ @yceruto
78
# Form
89
/src/Symfony/Bridge/Twig/Extension/FormExtension.php @xabbuh
910
/src/Symfony/Bridge/Twig/Form/ @xabbuh
@@ -20,23 +21,29 @@
2021
/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php @xabbuh
2122
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php @xabbuh
2223
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @xabbuh
23-
/src/Symfony/Component/Form/ @xabbuh
24+
/src/Symfony/Component/Form/ @xabbuh @yceruto
2425
# HttpKernel
2526
/src/Symfony/Component/HttpKernel/Log/Logger.php @dunglas
26-
# LDAP
27-
/src/Symfony/Component/Ldap/ @csarrazi
2827
# Lock
2928
/src/Symfony/Component/Lock/ @jderusse
30-
# Messenger
31-
/src/Symfony/Bridge/Doctrine/Messenger/ @sroze
32-
/src/Symfony/Component/Messenger/ @sroze
29+
# Notifer
30+
/src/Symfony/Component/Notifier/ @OskarStark
31+
# OptionsResolver
32+
/src/Symfony/Component/OptionsResolver/ @yceruto
33+
# PasswordHasher
34+
/src/Symfony/Component/PasswordHasher/ @chalasr
3335
# PropertyInfo
3436
/src/Symfony/Component/PropertyInfo/ @dunglas
3537
/src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas
3638
# Serializer
3739
/src/Symfony/Component/Serializer/ @dunglas
40+
# Security
41+
/src/Symfony/Bridge/Doctrine/Security/ @wouterj @chalasr
42+
/src/Symfony/Bundle/SecurityBundle/ @wouterj @chalasr
43+
/src/Symfony/Component/Security/ @wouterj @chalasr
44+
/src/Symfony/Component/Ldap/Security/ @wouterj @chalasr
3845
# TwigBundle
39-
/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
46+
/src/Symfony/Bundle/TwigBundle/ @yceruto
4047
# WebLink
4148
/src/Symfony/Component/WebLink/ @dunglas
4249
# Workflow

‎.github/CODE_OF_CONDUCT.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/1_Bug_report.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/1_Bug_report.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: 🐛 Bug Report
2+
description: ⚠️ NEVER report security issues, read https://symfony.com/security instead
3+
labels: Bug
4+
5+
body:
6+
- type: input
7+
id: affected-versions
8+
attributes:
9+
label: Symfony version(s) affected
10+
placeholder: x.y.z
11+
validations:
12+
required: true
13+
- type: textarea
14+
id: description
15+
attributes:
16+
label: Description
17+
description: A clear and concise description of the problem
18+
validations:
19+
required: true
20+
- type: textarea
21+
id: how-to-reproduce
22+
attributes:
23+
label: How to reproduce
24+
description: |
25+
⚠️ This is the most important part of the report ⚠️
26+
Without a way to easily reproduce your issue, there is little chance we will be able to help you and work on a fix.
27+
Please, take the time to show us some code and/or config that is needed for others to reproduce the problem easily.
28+
Most of the time, creating a "bug reproducer" as explained in the URL below is the best way to help us
29+
and increases the chances someone will have a look at it:
30+
https://symfony.com/doc/current/contributing/code/reproducer.html
31+
validations:
32+
required: true
33+
- type: textarea
34+
id: possible-solution
35+
attributes:
36+
label: Possible Solution
37+
description: |
38+
Optional: only if you have suggestions on a fix/reason for the bug
39+
Don't hesitate to create a pull request with your solution, it helps get faster feedback.
40+
- type: textarea
41+
id: additional-context
42+
attributes:
43+
label: Additional Context
44+
description: "Optional: any other context about the problem: log messages, screenshots, etc."

‎.github/ISSUE_TEMPLATE/2_Feature_request.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/2_Feature_request.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: 🚀 Feature Request
2+
description: RFC and ideas for new features and improvements
3+
body:
4+
- type: textarea
5+
id: description
6+
attributes:
7+
label: Description
8+
description: A clear and concise description of the new feature
9+
validations:
10+
required: true
11+
- type: textarea
12+
id: example
13+
attributes:
14+
label: Example
15+
description: |
16+
A simple example of the new feature in action (include PHP code, YAML config, etc.)
17+
If the new feature changes an existing feature, include a simple before/after comparison.

‎.github/ISSUE_TEMPLATE/3_Support_question.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/4_Documentation_issue.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Support Question
4+
url: https://symfony.com/support
5+
about: We use GitHub issues only to discuss about Symfony bugs and new features. For this kind of questions about using Symfony or third-party bundles, please use any of the support alternatives shown in https://symfony.com/support
6+
- name: Documentation Issue
7+
url: https://github.com/symfony/symfony-docs/issues
8+
about: Symfony Documentation has its own dedicated repository.

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 5.x for features / 3.4, 4.4 or 5.1 for bug fixes <!-- see below -->
3+
| Branch? | 6.3 for features / 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 -->
7-
| Tickets | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
7+
| Tickets | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead -->
88
| License | MIT
99
| Doc PR | symfony/symfony-docs#... <!-- required for new features -->
1010
<!--
11-
Replace this notice by a short README for your feature/bugfix. This will help people
12-
understand your PR and can be used as a start for the documentation.
11+
Replace this notice by a short README for your feature/bugfix.
12+
This will help reviewers and should be a good start for the documentation.
1313
1414
Additionally (see https://symfony.com/releases):
1515
- Always add tests and ensure they pass.
16-
- Never break backward compatibility (see https://symfony.com/bc).
1716
- Bug fixes must be submitted against the lowest maintained branch where they apply
18-
(lowest branches are regularly merged to upper ones so they get the fixes too.)
19-
- Features and deprecations must be submitted against branch 5.x.
17+
(lowest branches are regularly merged to upper ones so they get the fixes too).
18+
- Features and deprecations must be submitted against the latest branch.
19+
- For new features, provide some code snippets to help understand usage.
20+
- Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry
21+
- Never break backward compatibility (see https://symfony.com/bc).
2022
-->

‎.github/SECURITY.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)