Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit2cfa7cb

Browse files
committed
Merge branch '5.4' ofhttps://github.com/symfony/symfony into set_status_code_in_route
� Conflicts:�src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md�src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
2 parentscc6d349 +27b1654 commit2cfa7cb

File tree

7,830 files changed

+530702
-378248
lines changed

Some content is hidden

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

7,830 files changed

+530702
-378248
lines changed

‎.appveyor.yml‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ 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.4"
12+
-SET SYMFONY_DEPRECATIONS_HELPER=strict
1413
-SET ANSICON=121x90 (121x90)
1514
-SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
15+
-SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=170
1616
-REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
1717

1818
install:
@@ -25,8 +25,10 @@ install:
2525
-cd ..
2626
-copy /Y php.ini-development php.ini-min
2727
-echo memory_limit=-1 >> php.ini-min
28-
-echo serialize_precision=14 >> php.ini-min
28+
-echo serialize_precision=-1 >> php.ini-min
2929
-echo max_execution_time=1200 >> php.ini-min
30+
-echo post_max_size=4G >> php.ini-min
31+
-echo upload_max_filesize=4G >> php.ini-min
3032
-echo date.timezone="America/Los_Angeles" >> php.ini-min
3133
-echo extension_dir=ext >> php.ini-min
3234
-echo extension=php_xsl.dll >> php.ini-min
@@ -43,23 +45,28 @@ install:
4345
-echo extension=php_curl.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+
-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
4850
-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
51+
-php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
5052
-git config --global user.email ""
5153
-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
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)
55+
-php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
56+
-SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
57+
-SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
58+
-php composer.phar update --no-progress --ansi
5559
-php phpunit install
5660

5761
test_script:
5862
-SET X=0
5963
-SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
6064
-copy /Y c:\php\php.ini-min c:\php\php.ini
61-
-IF %APPVEYOR_REPO_BRANCH% neq master (rm -Rf src\Symfony\Bridge\PhpUnit)
65+
-IF %APPVEYOR_REPO_BRANCH:~-2% neq .x (rm -Rf src\Symfony\Bridge\PhpUnit)
66+
-mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml
6267
-php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
68+
-php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
6369
-copy /Y c:\php\php.ini-max c:\php\php.ini
6470
-php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
71+
-php phpunit src\Symfony\Component\HttpClient || SET X=!errorlevel!
6572
-exit %X%

‎.gitattributes‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/src/Symfony/Contractsexport-ignore
2+
/src/Symfony/Bridge/PhpUnitexport-ignore
3+
/src/Symfony/Component/Mailer/Bridgeexport-ignore
4+
/src/Symfony/Component/Messenger/Bridgeexport-ignore
5+
/src/Symfony/Component/Notifier/Bridgeexport-ignore
6+
/src/Symfony/Component/Runtimeexport-ignore

‎.github/CODEOWNERS‎

Lines changed: 16 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,24 @@
3031
# Messenger
3132
/src/Symfony/Bridge/Doctrine/Messenger/@sroze
3233
/src/Symfony/Component/Messenger/@sroze
34+
# Notifer
35+
/src/Symfony/Component/Notifier/@OskarStark
36+
# OptionsResolver
37+
/src/Symfony/Component/OptionsResolver/@yceruto
38+
# PasswordHasher
39+
/src/Symfony/Component/PasswordHasher/@chalasr
3340
# PropertyInfo
3441
/src/Symfony/Component/PropertyInfo/@dunglas
3542
/src/Symfony/Bridge/Doctrine/PropertyInfo/@dunglas
3643
# Serializer
3744
/src/Symfony/Component/Serializer/@dunglas
45+
# Security
46+
/src/Symfony/Bridge/Doctrine/Security/@wouterj@chalasr
47+
/src/Symfony/Bundle/SecurityBundle/@wouterj@chalasr
48+
/src/Symfony/Component/Security/@wouterj@chalasr
49+
/src/Symfony/Component/Ldap/Security/@wouterj@chalasr
3850
# TwigBundle
39-
/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php@yceruto
51+
/src/Symfony/Bundle/TwigBundle/@yceruto
4052
# WebLink
4153
/src/Symfony/Component/WebLink/@dunglas
4254
# Workflow

‎.github/CODE_OF_CONDUCT.md‎

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
---
22
name:🐛 Bug Report
3-
about:Report errors and problems
3+
about:⚠️ See below for security reports
4+
labels:Bug
45

56
---
67

78
**Symfony version(s) affected**: x.y.z
89

9-
**Description**
10+
**Description**
1011
<!-- A clear and concise description of the problem.-->
1112

12-
**How to reproduce**
13+
**How to reproduce**
1314
<!-- Code and/or config needed to reproduce the problem. If it's a complex bug,
1415
create a "bug reproducer" as explained in:
1516
https://symfony.com/doc/current/contributing/code/reproducer.html-->
1617

17-
**Possible Solution**
18+
**Possible Solution**
1819
<!--- Optional: only if you have suggestions on a fix/reason for the bug-->
1920

20-
**Additional context**
21+
**Additional context**
2122
<!-- Optional: any other context about the problem: log messages, screenshots, etc.-->

‎.github/ISSUE_TEMPLATE/2_Feature_request.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ about: RFC and ideas for new features and improvements
44

55
---
66

7-
**Description**
7+
**Description**
88
<!-- A clear and concise description of the new feature.-->
99

10-
**Example**
10+
**Example**
1111
<!-- A simple example of the new feature in action (include PHP code, YAML config, etc.)
1212
If the new feature changes an existing feature, include a simple before/after comparison.-->

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 5 additions & 4 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? |5.4 for features /4.4,5.2 or 5.3 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 #", ifany-->
7+
| Tickets | Fix #...<!-- prefix each issue number with "Fix #",no need to create an issueifnone exist, explain below instead-->
88
| License | MIT
99
| Doc PR | symfony/symfony-docs#...<!-- required for new features-->
1010
<!--
1111
Replace this notice by a short README for your feature/bugfix. This will help people
1212
understand your PR and can be used as a start for the documentation.
1313
14-
Additionally (see https://symfony.com/roadmap):
14+
Additionally (see https://symfony.com/releases):
1515
- Always add tests and ensure they pass.
1616
- Never break backward compatibility (see https://symfony.com/bc).
1717
- Bug fixes must be submitted against the lowest maintained branch where they apply
1818
(lowest branches are regularly merged to upper ones so they get the fixes too.)
19-
- Features and deprecations must be submitted against branch master.
19+
- Features and deprecations must be submitted against branch 5.x.
20+
- Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry
2021
-->

‎.github/SECURITY.md‎

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

‎.github/build-packages.php‎

Lines 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: branchversiondir1 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 ($versionsas$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‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
{
22
"config": {
3+
"platform-check":false,
34
"preferred-install": {
45
"symfony/form":"source",
56
"symfony/http-kernel":"source",
7+
"symfony/messenger":"source",
8+
"symfony/notifier":"source",
9+
"symfony/translation":"source",
610
"symfony/validator":"source",
711
"*":"dist"
812
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp