Skip to content

Commit 8897fca

Browse files
alexpottalexpott
committed
Merge branch '6.2' into ensure-path-info-has-leading-slash
2 parents 3a5f319 + 53db097 commit 8897fca

File tree

9,366 files changed

+963707
-444904
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,366 files changed

+963707
-444904
lines changed

‎.appveyor.yml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
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
129
- SET SYMFONY_DEPRECATIONS_HELPER=strict
1310
- SET ANSICON=121x90 (121x90)
1411
- SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
15-
- SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=170
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
@@ -37,36 +35,36 @@ install:
3735
- echo opcache.enable_cli=1 >> php.ini-max
3836
- echo extension=php_openssl.dll >> php.ini-max
3937
- echo extension=php_apcu.dll >> php.ini-max
38+
- echo extension=php_redis.dll >> php.ini-max
4039
- echo apc.enable_cli=1 >> php.ini-max
4140
- echo extension=php_intl.dll >> php.ini-max
4241
- echo extension=php_mbstring.dll >> php.ini-max
4342
- echo extension=php_fileinfo.dll >> php.ini-max
4443
- echo extension=php_pdo_sqlite.dll >> php.ini-max
4544
- echo extension=php_curl.dll >> php.ini-max
45+
- echo extension=php_sodium.dll >> php.ini-max
4646
- copy /Y php.ini-max php.ini
4747
- cd c:\projects\symfony
48-
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/2.0.0/composer.phar)
49-
- php composer.phar self-update --2
50-
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
51-
- 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
5250
- git config --global user.email ""
5351
- git config --global user.name "Symfony"
54-
- FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep -m1 SYMFONY_VERSION .travis.yml | grep -o '[0-9.x]*'"`) DO (SET SYMFONY_VERSION=%%F)
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)
5553
- php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
56-
- SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
5754
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
5855
- php composer.phar update --no-progress --ansi
5956
- php phpunit install
57+
- choco install memurai-developer
6058

6159
test_script:
6260
- SET X=0
6361
- SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
6462
- copy /Y c:\php\php.ini-min c:\php\php.ini
6563
- IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit)
6664
- mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml
67-
- 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!
6866
- php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
6967
- copy /Y c:\php\php.ini-max c:\php\php.ini
70-
- 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!
7169
- php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
7270
- exit %X%

‎.github/CODEOWNERS

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,8 @@
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
3429
# Notifer
3530
/src/Symfony/Component/Notifier/ @OskarStark
3631
# OptionsResolver

‎.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: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 5.x for features / 4.4 or 5.2 for bug fixes <!-- see below -->
3+
| Branch? | 6.2 for features / 4.4, 5.4, 6.0 or 6.1 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 -->
77
| Tickets | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, 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.
2020
- 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).
2122
-->

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy