Skip to content

Commit e1b294e

Browse files
jmschejmsche
authored
Merge branch '6.1' into inherited-roles-in-wdt
2 parents 4c26c45 + 791ee7d commit e1b294e

File tree

1,687 files changed

+23140
-5937
lines changed

Some content is hidden

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

1,687 files changed

+23140
-5937
lines changed

‎.appveyor.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@ init:
1313
- SET SYMFONY_DEPRECATIONS_HELPER=strict
1414
- SET ANSICON=121x90 (121x90)
1515
- SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
16-
- SET SYMFONY_DEPRECATIONS_HELPER=max[direct]=1
1716
- REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
1817

1918
install:
2019
- mkdir c:\php && cd c:\php
21-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.0.2-Win32-vs16-x86.zip
22-
- 7z x php-8.0.2-Win32-vs16-x86.zip -y >nul
20+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.1.0-Win32-vs16-x86.zip
21+
- 7z x php-8.1.0-Win32-vs16-x86.zip -y >nul
2322
- cd ext
24-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.21-8.0-ts-vs16-x86.zip
25-
- 7z x php_apcu-5.1.21-8.0-ts-vs16-x86.zip -y >nul
23+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.21-8.1-ts-vs16-x86.zip
24+
- 7z x php_apcu-5.1.21-8.1-ts-vs16-x86.zip -y >nul
25+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-5.3.7rc1-8.1-ts-vs16-x86.zip
26+
- 7z x php_redis-5.3.7rc1-8.1-ts-vs16-x86.zip -y >nul
2627
- cd ..
2728
- copy /Y php.ini-development php.ini-min
2829
- echo memory_limit=-1 >> php.ini-min
@@ -38,12 +39,14 @@ install:
3839
- echo opcache.enable_cli=1 >> php.ini-max
3940
- echo extension=php_openssl.dll >> php.ini-max
4041
- echo extension=php_apcu.dll >> php.ini-max
42+
- echo extension=php_redis.dll >> php.ini-max
4143
- echo apc.enable_cli=1 >> php.ini-max
4244
- echo extension=php_intl.dll >> php.ini-max
4345
- echo extension=php_mbstring.dll >> php.ini-max
4446
- echo extension=php_fileinfo.dll >> php.ini-max
4547
- echo extension=php_pdo_sqlite.dll >> php.ini-max
4648
- echo extension=php_curl.dll >> php.ini-max
49+
- echo extension=php_sodium.dll >> php.ini-max
4750
- copy /Y php.ini-max php.ini
4851
- cd c:\projects\symfony
4952
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/2.0.0/composer.phar)
@@ -56,16 +59,17 @@ install:
5659
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
5760
- php composer.phar update --no-progress --ansi
5861
- php phpunit install
62+
- choco install memurai-developer
5963

6064
test_script:
6165
- SET X=0
6266
- SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
6367
- copy /Y c:\php\php.ini-min c:\php\php.ini
6468
- IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit)
6569
- mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml
66-
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
70+
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || SET X=!errorlevel!
6771
- php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
6872
- copy /Y c:\php\php.ini-max c:\php\php.ini
69-
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
73+
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || SET X=!errorlevel!
7074
- php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
7175
- exit %X%

‎.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: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 🐛 Bug Report
2-
description: ⚠️ See below for security reports
2+
description: ⚠️ NEVER report security issues, read https://symfony.com/security instead
33
labels: Bug
44

55
body:
@@ -14,23 +14,29 @@ body:
1414
id: description
1515
attributes:
1616
label: Description
17-
description: A clear and consise description of the problem
17+
description: A clear and concise description of the problem
1818
validations:
1919
required: true
2020
- type: textarea
2121
id: how-to-reproduce
2222
attributes:
2323
label: How to reproduce
2424
description: |
25-
Code and/or config needed to reproduce the problem.
26-
If it's a complex bug, create a "bug reproducer" as explained in https://symfony.com/doc/current/contributing/code/reproducer.html
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
2731
validations:
2832
required: true
2933
- type: textarea
3034
id: possible-solution
3135
attributes:
3236
label: Possible Solution
33-
description: "Optional: only if you have suggestions on a fix/reason for the bug"
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.
3440
- type: textarea
3541
id: additional-context
3642
attributes:

‎.github/ISSUE_TEMPLATE/2_Feature_request.md

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

‎.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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 5.4 for features / 4.4 or 5.3 for bug fixes <!-- see below -->
3+
| Branch? | 6.1 for features / 4.4, 5.4 or 6.0 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
1817
(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.
18+
- Features and deprecations must be submitted against the latest branch.
2019
- Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry
20+
- Never break backward compatibility (see https://symfony.com/bc).
2121
-->

‎.github/build-packages.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
'type' => 'composer',
3636
'url' => 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__)).'/',
3737
]];
38-
if (false === strpos($json, "\n \"repositories\": [\n")) {
38+
if (!str_contains($json, "\n \"repositories\": [\n")) {
3939
$json = rtrim(json_encode(['repositories' => $package->repositories], $flags), "\n}").','.substr($json, 1);
4040
file_put_contents($dir.'/composer.json', $json);
4141
}

0 commit comments

Comments
 (0)