8000 Merge remote-tracking branch 'upstream/master' into unwrap_denormalizer · symfony/symfony@f536749 · GitHub
[go: up one dir, main page]
Skip to content

Commit f536749

Browse files
nonanerznonanerz
committed
Merge remote-tracking branch 'upstream/master' into unwrap_denormalizer
# Conflicts: # src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
2 parents 5b9c3d8 + 37a8863 commit f536749

File tree

3,268 files changed

+55907
-20289
lines changed

Some content is hidden

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

3,268 files changed

+55907
-20289
lines changed

‎.appveyor.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ cache:
99
init:
1010
- SET PATH=c:\php;%PATH%
1111
- SET COMPOSER_NO_INTERACTION=1
12-
- SET SYMFONY_DEPRECATIONS_HELPER=strict
12+
- SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=7
1313
- SET "SYMFONY_REQUIRE=>=4.4"
1414
- SET ANSICON=121x90 (121x90)
1515
- SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
1616
- REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
1717

1818
install:
1919
- mkdir c:\php && cd c:\php
20-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.2.9-Win32-VC15-x86.zip
21-
- 7z x php-7.2.9-Win32-VC15-x86.zip -y >nul
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
2222
- cd ext
2323
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.17-7.2-ts-vc15-x86.zip
2424
- 7z x php_apcu-5.1.17-7.2-ts-vc15-x86.zip -y >nul
@@ -29,6 +29,7 @@ install:
2929
- echo max_execution_time=1200 >> php.ini-min
3030
- echo date.timezone="America/Los_Angeles" >> php.ini-min
3131
- echo extension_dir=ext >> php.ini-min
32+
- echo extension=php_xsl.dll >> php.ini-min
3233
- copy /Y php.ini-min php.ini-max
3334
- echo zend_extension=php_opcache.dll >> php.ini-max
3435
- echo opcache.enable_cli=1 >> php.ini-max
@@ -44,8 +45,10 @@ install:
4445
- cd c:\projects\symfony
4546
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
4647
- php composer.phar self-update
47-
- copy /Y .composer\* %APPDATA%\Composer\
48+
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
4849
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
50+
- git config --global user.email ""
51+
- git config --global user.name "Symfony"
4952
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
5053
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
5154
- php composer.phar update --no-progress --no-suggest --ansi
@@ -56,7 +59,7 @@ test_script:
5659
- SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
5760
- copy /Y c:\php\php.ini-min c:\php\php.ini
5861
- IF %APPVEYOR_REPO_BRANCH% neq master (rm -Rf src\Symfony\Bridge\PhpUnit)
59-
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
62+
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
6063
- copy /Y c:\php\php.ini-max c:\php\php.ini
61-
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
64+
- php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
6265
- exit %X%

‎.composer/config.json

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

‎.github/CODEOWNERS

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/src/Symfony/Component/ErrorRenderer/* @yceruto
77
# Form
88
/src/Symfony/Bridge/Twig/Extension/FormExtension.php @xabbuh
9-
/src/Symfony/Bridge/Twig/Form/* @xabbuh
9+
/src/Symfony/Bridge/Twig/Form/ @xabbuh
1010
/src/Symfony/Bridge/Twig/Node/FormThemeNode.php @xabbuh
1111
/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php @xabbuh
1212
/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php @xabbuh
@@ -15,36 +15,36 @@
1515
/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php @xabbuh
1616
/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php @xabbuh
1717
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php @xabbuh
18-
/src/Symfony/Bundle/FrameworkBundle/Resources/views/* @xabbuh
18+
/src/Symfony/Bundle/FrameworkBundle/Resources/views/ @xabbuh
1919
/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @xabbuh
2020
/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php @xabbuh
2121
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php @xabbuh
2222
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @xabbuh
23-
/src/Symfony/Component/Form/* @xabbuh
23+
/src/Symfony/Component/Form/ @xabbuh
2424
# HttpKernel
2525
/src/Symfony/Component/HttpKernel/Log/Logger.php @dunglas
2626
# LDAP
27-
/src/Symfony/Component/Ldap/* @csarrazi
27+
/src/Symfony/Component/Ldap/ @csarrazi
2828
# Lock
29-
/src/Symfony/Component/Lock/* @jderusse
29+
/src/Symfony/Component/Lock/ @jderusse
3030
# Messenger
31-
/src/Symfony/Bridge/Doctrine/Messenger/* @sroze
32-
/src/Symfony/Component/Messenger/* @sroze
31+
/src/Symfony/Bridge/Doctrine/Messenger/ @sroze
32+
/src/Symfony/Component/Messenger/ @sroze
3333
# PropertyInfo
34-
/src/Symfony/Component/PropertyInfo/* @dunglas
35-
/src/Symfony/Bridge/Doctrine/PropertyInfo/* @dunglas
34+
/src/Symfony/Component/PropertyInfo/ @dunglas
35+
/src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas
3636
# Serializer
37-
/src/Symfony/Component/Serializer/* @dunglas
37+
/src/Symfony/Component/Serializer/ @dunglas
3838
# TwigBundle
3939
/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
4040
# WebLink
41-
/src/Symfony/Component/WebLink/* @dunglas
41+
/src/Symfony/Component/WebLink/ @dunglas
4242
# Workflow
4343
/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php @lyrixx
4444
/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php @lyrixx
4545
/src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php @lyrixx
4646
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php @lyrixx
4747
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php @lyrixx
48-
/src/Symfony/Component/Workflow/* @lyrixx
48+
/src/Symfony/Component/Workflow/ @lyrixx
4949
# Yaml
50-
/src/Symfony/Component/Yaml/* @xabbuh
50+
/src/Symfony/Component/Yaml/ @xabbuh

‎.github/ISSUE_TEMPLATE/5_Security_issue.md

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

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 4.4 for features / 3.4 or 4.3 for bug fixes <!-- see below -->
3+
| Branch? | master for features / 3.4, 4.3, 4.4 or 5.0 for bug fixes <!-- see below -->
44
| Bug fix? | yes/no
55
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
6-
| BC breaks? | no <!-- see https://symfony.com/bc -->
76
| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
8-
| Tests pass? | yes <!-- please add some, will be required by reviewers -->
9-
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
7+
| Tickets | Fix #... <!-- prefix each issue number with "Fix #", if any -->
108
| License | MIT
119
| Doc PR | symfony/symfony-docs#... <!-- required for new features -->
12-
1310
<!--
1411
Replace this notice by a short README for your feature/bugfix. This will help people
1512
understand your PR and can be used as a start for the documentation.
1613
1714
Additionally (see https://symfony.com/roadmap):
15+
- Always add tests and ensure they pass.
16+
- Never break backward compatibility (see https://symfony.com/bc).
1817
- Bug fixes must be submitted against the lowest maintained branch where they apply
19-
(lowest branches are regularly merged to upper ones so they get the fixes too).
20-
- Features and deprecations must be submitted against branch 4.4.
21-
- Legacy code removals go to the master branch.
18+
(lowest branches are regularly merged to upper ones so they get the fixes too.)
19+
- Features and deprecations must be submitted against branch master.
2220
-->

‎.github/build-packages.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
$packages = array();
1919
$flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
20+
$preferredInstall = json_decode(file_get_contents(__DIR__.'/composer-config.json'), true)['config']['preferred-install'];
2021

2122
foreach ($dirs as $k => $dir) {
2223
if (!system("git diff --name-only $mergeBase -- $dir", $exitStatus)) {
@@ -42,7 +43,12 @@
4243
$json = rtrim(json_encode(array('repositories' => $package->repositories), $flags), "\n}").','.substr($json, 1);
4344
file_put_contents($dir.'/composer.json', $json);
4445
}
45-
passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
46+
47+
if (isset($preferredInstall[$package->name]) && 'source' === $preferredInstall[$package->name]) {
48+
passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
49+
} else {
50+
passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
51+
}
4652

4753
if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {
4854
echo "Missing \"dev-master\" branch-alias in composer.json extra.\n";

‎.github/composer-config.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"config": {
3+
"preferred-install": {
4+
"symfony/form": "source",
5+
"symfony/http-kernel": "source",
6+
"symfony/validator": "source",
7+
"*": "dist"
8+
}
9+
}
10+
}

‎.github/patch-types.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22

33
if (false === getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
4-
putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=force=1&php71-compat=0');
4+
echo "Please define the SYMFONY_PATCH_TYPE_DECLARATIONS env var when running this script.\n";
5+
exit(1);
56
}
67

78
require __DIR__.'/../.phpunit/phpunit-8.3-0/vendor/autoload.php';
@@ -15,6 +16,7 @@
1516
case false !== strpos(realpath($file), '/vendor/'):
1617
case false !== strpos($file, '/src/Symfony/Bridge/PhpUnit/'):
1718
case false !== strpos($file, '/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php'):
19+
case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadFileName.php'):
1820
case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php'):
1921
case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php'):
2022
case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ParentNotExists.php'):
@@ -32,4 +34,4 @@
3234
class_exists($class);
3335
}
3436

35-
Symfony\Component\ErrorHandler\DebugClassLoader::disable();
37+
Symfony\Component\ErrorHandler\DebugClassLoader::checkClasses();

‎.php_cs.dist

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,10 @@ return PhpCsFixer\Config::create()
1010
'@Symfony:risky' => true,
1111
'@PHPUnit75Migration:risky' => true,
1212
'php_unit_dedicate_assert' => ['target' => '5.6'],
13-
'phpdoc_no_empty_return' => false, // triggers almost always false positive
1413
'array_syntax' => ['syntax' => 'short'],
1514
'fopen_flags' => false,
16-
'ordered_imports' => true,
17-
'phpdoc_trim_consecutive_blank_line_separation' => true,
18-
'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
1915
'protected_to_private' => false,
20-
// Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
21-
'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced', 'strict' => true],
22-
// Part of future @Symfony ruleset in PHP-CS-Fixer To be removed from the config file once upgrading
23-
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
16+
'combine_nested_dirname' => true,
2417
])
2518
->setRiskyAllowed(true)
2619
->setFinder(

0 commit comments

Comments
 (0)
0