Skip to content

Commit e29f17a

Browse files
bertterheidebertterheide
authored
Merge branch '6.2' into debug-container-service-usage
2 parents e32a62e + a2f27ad commit e29f17a

File tree

9,469 files changed

+543892
-437120
lines changed

Some content is hidden

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

9,469 files changed

+543892
-437120
lines changed

‎.appveyor.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
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%
@@ -16,16 +13,20 @@ init:
1613

1714
install:
1815
- mkdir c:\php && cd c:\php
19-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.2.5-Win32-VC15-x86.zip
20-
- 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
2118
- cd ext
22-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.17-7.2-ts-vc15-x86.zip
23-
- 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.7rc1-8.1-ts-vs16-x86.zip
22+
- 7z x php_redis-5.3.7rc1-8.1-ts-vs16-x86.zip -y >nul
2423
- cd ..
2524
- copy /Y php.ini-development php.ini-min
2625
- echo memory_limit=-1 >> php.ini-min
2726
- echo serialize_precision=-1 >> php.ini-min
2827
- 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
2930
- echo date.timezone="America/Los_Angeles" >> php.ini-min
3031
- echo extension_dir=ext >> php.ini-min
3132
- echo extension=php_xsl.dll >> php.ini-min
@@ -34,36 +35,36 @@ install:
3435
- echo opcache.enable_cli=1 >> php.ini-max
3536
- echo extension=php_openssl.dll >> php.ini-max
3637
- echo extension=php_apcu.dll >> php.ini-max
38+
- echo extension=php_redis.dll >> php.ini-max
3739
- echo apc.enable_cli=1 >> php.ini-max
3840
- echo extension=php_intl.dll >> php.ini-max
3941
- echo extension=php_mbstring.dll >> php.ini-max
4042
- echo extension=php_fileinfo.dll >> php.ini-max
4143
- echo extension=php_pdo_sqlite.dll >> php.ini-max
4244
- echo extension=php_curl.dll >> php.ini-max
45+
- echo extension=php_sodium.dll >> php.ini-max
4346
- copy /Y php.ini-max php.ini
4447
- cd c:\projects\symfony
45-
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/2.0.0/composer.phar)
46-
- php composer.phar self-update --2
47-
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
48-
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
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
4950
- git config --global user.email ""
5051
- git config --global user.name "Symfony"
51-
- FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep branch-version composer.json | grep -o '[0-9.]*'"`) DO (SET SYMFONY_VERSION=%%F)
52-
- php .github/build-packages.php "HEAD^" %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
53-
- SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
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
5454
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
5555
- php composer.phar update --no-progress --ansi
5656
- php phpunit install
57+
- choco install memurai-developer
5758

5859
test_script:
5960
- SET X=0
6061
- SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
6162
- copy /Y c:\php\php.ini-min c:\php\php.ini
6263
- IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit)
6364
- mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml
64-
- 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!
6566
- php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
6667
- copy /Y c:\php\php.ini-max c:\php\php.ini
67-
- 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!
6869
- php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
6970
- 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: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424
/src/Symfony/Component/Form/ @xabbuh @yceruto
2525
# HttpKernel
2626
/src/Symfony/Component/HttpKernel/Log/Logger.php @dunglas
27-
# LDAP
28-
/src/Symfony/Component/Ldap/ @csarrazi
2927
# Lock
3028
/src/Symfony/Component/Lock/ @jderusse
31-
# Messenger
32-
/src/Symfony/Bridge/Doctrine/Messenger/ @sroze
33-
/src/Symfony/Component/Messenger/ @sroze
29+
# Notifer
30+
/src/Symfony/Component/Notifier/ @OskarStark
3431
# OptionsResolver
3532
/src/Symfony/Component/OptionsResolver/ @yceruto
33+
# PasswordHasher
34+
/src/Symfony/Component/PasswordHasher/ @chalasr
3635
# PropertyInfo
3736
/src/Symfony/Component/PropertyInfo/ @dunglas
3837
/src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas

‎.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.

0 commit comments

Comments
 (0)