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 13c3888

Browse filesBrowse files
maartendekeizermaartendekeizer
authored
Merge branch '4.4' into issue_43860
2 parents 0681a8a + 4d95be0 commit 13c3888
Copy full SHA for 13c3888

File tree

4,413 files changed

+76775
-32283
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

4,413 files changed

+76775
-32283
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+14-13Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ cache:
99
init:
1010
- SET PATH=c:\php;%PATH%
1111
- SET COMPOSER_NO_INTERACTION=1
12-
- SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=7
13-
- SET "SYMFONY_REQUIRE=>=4.2"
12+
- SET SYMFONY_DEPRECATIONS_HELPER=strict
1413
- SET ANSICON=121x90 (121x90)
1514
- SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
1615
- REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
@@ -20,13 +19,15 @@ install:
2019
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
2120
- 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul
2221
- cd ext
23-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.8-7.1-ts-vc14-x86.zip
24-
- 7z x php_apcu-5.1.8-7.1-ts-vc14-x86.zip -y >nul
22+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.18-7.1-ts-vc14-x86.zip
23+
- 7z x php_apcu-5.1.18-7.1-ts-vc14-x86.zip -y >nul
2524
- cd ..
2625
- copy /Y php.ini-development php.ini-min
2726
- echo memory_limit=-1 >> php.ini-min
2827
- echo serialize_precision=14 >> php.ini-min
2928
- echo max_execution_time=1200 >> php.ini-min
29+
- echo post_max_size=4G >> php.ini-min
30+
- echo upload_max_filesize=4G >> php.ini-min
3031
- echo date.timezone="America/Los_Angeles" >> php.ini-min
3132
- echo extension_dir=ext >> php.ini-min
3233
- echo extension=php_xsl.dll >> php.ini-min
@@ -43,23 +44,23 @@ install:
4344
- echo extension=php_curl.dll >> php.ini-max
4445
- copy /Y php.ini-max php.ini
4546
- 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
47+
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/2.0.0/composer.phar)
48+
- php composer.phar self-update --2
4849
- 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
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-
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
54-
- 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
5556
- php phpunit install
5657

5758
test_script:
5859
- SET X=0
5960
- SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
6061
- copy /Y c:\php\php.ini-min c:\php\php.ini
61-
- IF %APPVEYOR_REPO_BRANCH% neq master (rm -Rf src\Symfony\Bridge\PhpUnit)
62-
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
62+
- IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit)
63+
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || SET X=!errorlevel!
6364
- copy /Y c:\php\php.ini-max c:\php\php.ini
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
- exit %X%

‎.gitattributes

Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/src/Symfony/Contracts export-ignore
2+
/src/Symfony/Bridge/PhpUnit export-ignore

‎.github/CODEOWNERS

Copy file name to clipboardExpand all lines: .github/CODEOWNERS
+12-4Lines changed: 12 additions & 4 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,7 +21,7 @@
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
2627
# LDAP
@@ -30,13 +31,20 @@
3031
# Messenger
3132
/src/Symfony/Bridge/Doctrine/Messenger/ @sroze
3233
/src/Symfony/Component/Messenger/ @sroze
34+
# OptionsResolver
35+
/src/Symfony/Component/OptionsResolver/ @yceruto
3336
# PropertyInfo
3437
/src/Symfony/Component/PropertyInfo/ @dunglas
3538
/src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas
3639
# Serializer
3740
/src/Symfony/Component/Serializer/ @dunglas
41+
# Security
42+
/src/Symfony/Bridge/Doctrine/Security/ @wouterj @chalasr
43+
/src/Symfony/Bundle/SecurityBundle/ @wouterj @chalasr
44+
/src/Symfony/Component/Security/ @wouterj @chalasr
45+
/src/Symfony/Component/Ldap/Security/ @wouterj @chalasr
3846
# TwigBundle
39-
/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
47+
/src/Symfony/Bundle/TwigBundle/ @yceruto
4048
# WebLink
4149
/src/Symfony/Component/WebLink/ @dunglas
4250
# Workflow

‎.github/CODE_OF_CONDUCT.md

Copy file name to clipboardExpand all lines: .github/CODE_OF_CONDUCT.md
-8Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/1_Bug_report.md

Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/1_Bug_report.md
-21Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/1_Bug_report.yaml

Copy file name to clipboard
+44Lines 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

Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/2_Feature_request.md
-12Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/2_Feature_request.yaml

Copy file name to clipboard
+17Lines 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

Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/3_Support_question.md
-11Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/4_Documentation_issue.md

Copy file name to clipboardExpand all lines: .github/ISSUE_TEMPLATE/4_Documentation_issue.md
-10Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/config.yml

Copy file name to clipboard
+8Lines 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

Copy file name to clipboard
+7-6Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | master for features / 3.4, 4.4 or 5.0 for bug fixes <!-- see below -->
3+
| Branch? | 6.1 for features / 4.4, 5.3, 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 -->
7-
| Tickets | Fix #... <!-- prefix each issue number with "Fix #", if any -->
7+
| 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 master.
18+
- Features and deprecations must be submitted against branch 5.x.
19+
- 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).
2021
-->

‎.github/SECURITY.md

Copy file name to clipboardExpand all lines: .github/SECURITY.md
-10Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.github/build-packages.php

Copy file name to clipboard
+14-24Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
<?php
22

33
if (3 > $_SERVER['argc']) {
4-
echo "Usage: branch dir1 dir2 ... dirN\n";
4+
echo "Usage: branch version dir1 dir2 ... dirN\n";
55
exit(1);
66
}
77
chdir(dirname(__DIR__));
88

9-
$json = ltrim(file_get_contents('composer.json'));
10-
if ($json !== $package = preg_replace('/\n "repositories": \[\n.*?\n \],/s', '', $json)) {
11-
file_put_contents('composer.json', $package);
12-
}
13-
149
$dirs = $_SERVER['argv'];
1510
array_shift($dirs);
1611
$mergeBase = trim(shell_exec(sprintf('git merge-base "%s" HEAD', array_shift($dirs))));
12+
$version = array_shift($dirs);
1713

18-
$packages = array();
14+
$packages = [];
1915
$flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
2016
$preferredInstall = json_decode(file_get_contents(__DIR__.'/composer-config.json'), true)['config']['preferred-install'];
2117

@@ -35,12 +31,12 @@
3531
exit(1);
3632
}
3733

38-
$package->repositories = array(array(
34+
$package->repositories = [[
3935
'type' => 'composer',
4036
'url' => 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__)).'/',
41-
));
37+
]];
4238
if (false === strpos($json, "\n \"repositories\": [\n")) {
43-
$json = rtrim(json_encode(array('repositories' => $package->repositories), $flags), "\n}").','.substr($json, 1);
39+
$json = rtrim(json_encode(['repositories' => $package->repositories], $flags), "\n}").','.substr($json, 1);
4440
file_put_contents($dir.'/composer.json', $json);
4541
}
4642

@@ -50,25 +46,17 @@
5046
passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
5147
}
5248

53-
if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {
54-
echo "Missing \"dev-master\" branch-alias in composer.json extra.\n";
55-
exit(1);
56-
}
57-
$package->version = str_replace('-dev', '.x-dev', $package->extra->{'branch-alias'}->{'dev-master'});
49+
$package->version = preg_replace('/(?:\.x)?-dev$/', '', $package->extra->{'branch-alias'}->{'dev-main'} ?? $version).'.x-dev';
5850
$package->dist['type'] = 'tar';
5951
$package->dist['url'] = 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__))."/$dir/package.tar";
6052

6153
$packages[$package->name][$package->version] = $package;
6254

63-
$versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"dev-master":%s}}}', $package->name, file_get_contents($dir.'/composer.json'));
55+
$versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"%s":%s}}}', $package->name, $package->version, file_get_contents($dir.'/composer.json'));
6456
$versions = json_decode($versions)->packages->{$package->name};
6557

66-
if (isset($versions->{'dev-master'}) && $package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
67-
unset($versions->{'dev-master'});
68-
}
69-
7058
foreach ($versions as $v => $package) {
71-
$packages[$package->name] += array($v => $package);
59+
$packages[$package->name] += [$v => $package];
7260
}
7361
}
7462

@@ -81,10 +69,12 @@
8169
exit(1);
8270
}
8371

84-
$package->repositories = array(array(
72+
$package->repositories[] = [
8573
'type' => 'composer',
8674
'url' => 'file://'.str_replace(DIRECTORY_SEPARATOR, '/', dirname(__DIR__)).'/',
87-
));
88-
$json = rtrim(json_encode(array('repositories' => $package->repositories), $flags), "\n}").','.substr($json, 1);
75+
];
76+
77+
$json = preg_replace('/\n "repositories": \[\n.*?\n \],/s', '', $json);
78+
$json = rtrim(json_encode(['repositories' => $package->repositories], $flags), "\n}").','.substr($json, 1);
8979
file_put_contents('composer.json', $json);
9080
}

‎.github/composer-config.json

Copy file name to clipboardExpand all lines: .github/composer-config.json
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"config": {
3+
"platform-check": false,
34
"preferred-install": {
45
"symfony/form": "source",
56
"symfony/http-kernel": "source",
7+
"symfony/proxy-manager-bridge": "source",
68
"symfony/validator": "source",
79
"*": "dist"
810
}

0 commit comments

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