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 417b23e

Browse filesBrowse files
JeroenyJeroeny
committed
Merge remote-tracking branch 'upstream/5.0' into rocketchat
2 parents 8039f9b + f35935f commit 417b23e
Copy full SHA for 417b23e

File tree

1,227 files changed

+18848
-7356
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

1,227 files changed

+18848
-7356
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+5-3Lines changed: 5 additions & 3 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
@@ -47,6 +47,8 @@ install:
4747
- php composer.phar self-update
4848
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
4949
- 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"
5052
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
5153
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
5254
- php composer.phar update --no-progress --no-suggest --ansi

‎.github/CODEOWNERS

Copy file name to clipboardExpand all lines: .github/CODEOWNERS
+13-13Lines 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/PULL_REQUEST_TEMPLATE.md

Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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 -->
66
| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
@@ -16,6 +16,5 @@ Additionally (see https://symfony.com/roadmap):
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 4.4.
20-
- Legacy code removals go to the master branch.
19+
- Features and deprecations must be submitted against branch master.
2120
-->

‎.github/build-packages.php

Copy file name to clipboardExpand all lines: .github/build-packages.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
if (isset($preferredInstall[$package->name]) && 'source' === $preferredInstall[$package->name]) {
4848
passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
4949
} else {
50-
passthru("cd $dir && git init && git add . && git commit --author \"Symfony <>\" -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
50+
passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
5151
}
5252

5353
if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {

‎.github/patch-types.php

Copy file name to clipboardExpand all lines: .github/patch-types.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
case false !== strpos(realpath($file), '/vendor/'):
1717
case false !== strpos($file, '/src/Symfony/Bridge/PhpUnit/'):
1818
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'):
1920
case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php'):
2021
case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php'):
2122
case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ParentNotExists.php'):

‎.php_cs.dist

Copy file name to clipboardExpand all lines: .php_cs.dist
-8Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,9 @@ 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'],
2416
'combine_nested_dirname' => true,
2517
])
2618
->setRiskyAllowed(true)

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+23-6Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ addons:
1717

1818
env:
1919
global:
20-
- MIN_PHP=7.2.9
20+
- MIN_PHP=7.2.5
2121
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
2222
- MESSENGER_AMQP_DSN=amqp://localhost/%2f/messages
23-
- MESSENGER_REDIS_DSN=redis://127.0.0.1:7001/messages
23+
- MESSENGER_REDIS_DSN=redis://127.0.0.1:7006/messages
2424
- SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
2525

2626
matrix:
2727
include:
2828
- php: 7.2
29-
env: php_extra="7.4snapshot"
29+
env: php_extra="7.4"
3030
- php: 7.3
3131
env: deps=high
32-
- php: 7.4snapshot
32+
- php: 7.4
3333
env: deps=low
3434
fast_finish: true
3535

@@ -59,7 +59,7 @@ before_install:
5959
- |
6060
# Start Redis cluster
6161
docker pull grokzen/redis-cluster:5.0.4
62-
docker run -d -p 7000:7000 -p 7001:7001 -p 7002:7002 -p 7003:7003 -p 7004:7004 -p 7005:7005 --name redis-cluster grokzen/redis-cluster:5.0.4
62+
docker run -d -p 7000:7000 -p 7001:7001 -p 7002:7002 -p 7003:7003 -p 7004:7004 -p 7005:7005 -p 7006:7006 -p 7007:7007 -e "STANDALONE=true" --name redis-cluster grokzen/redis-cluster:5.0.4
6363
export REDIS_CLUSTER_HOSTS='localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
6464
6565
- |
@@ -141,6 +141,12 @@ before_install:
141141
(cd php-$MIN_PHP && ./configure --enable-sigchild --enable-pcntl && make -j2)
142142
fi
143143
144+
- |
145+
# Install vulcain
146+
wget https://github.com/symfony/binary-utils/releases/download/v0.1/vulcain_0.1.3_Linux_x86_64.tar.gz -O - | tar xz
147+
sudo mv vulcain /usr/local/bin
148+
docker pull php:7.3-alpine
149+
144150
- |
145151
# php.ini configuration
146152
for PHP in $TRAVIS_PHP_VERSION $php_extra; do
@@ -202,6 +208,9 @@ install:
202208
203209
- |
204210
# Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
211+
git config --global user.email ""
212+
git config --global user.name "Symfony"
213+
205214
if [[ ! $deps ]]; then
206215
php .github/build-packages.php HEAD^ src/Symfony/Bridge/PhpUnit src/Symfony/Contracts
207216
else
@@ -257,6 +266,11 @@ install:
257266
run_tests () {
258267
set -e
259268
export PHP=$1
269+
270+
if [[ !$deps && $PHP = 7.2 ]]; then
271+
tfold src/Symfony/Component/HttpClient.h2push "$COMPOSER_UP symfony/contracts && docker run -it --rm -v $(pwd):/app -v $(phpenv which composer):/usr/local/bin/composer -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.3-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push"
272+
fi
273+
260274
if [[ $PHP != 7.4* && $PHP != $TRAVIS_PHP_VERSION && $TRAVIS_PULL_REQUEST != false ]]; then
261275
echo -e "\\n\\e[33;1mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
262276
return
@@ -304,7 +318,10 @@ install:
304318
fi
305319
306320
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
307-
tfold src/Symfony/Component/Console.tty $PHPUNIT --group tty
321+
322+
tfold src/Symfony/Component/Console.tty $PHPUNIT src/Symfony/Component/Console --group tty
323+
tfold src/Symfony/Bridge/Twig.tty $PHPUNIT src/Symfony/Bridge/Twig --group tty
324+
308325
if [[ $PHP = ${MIN_PHP%.*} ]]; then
309326
export PHP=$MIN_PHP
310327
tfold src/Symfony/Component/Process.sigchild SYMFONY_DEPRECATIONS_HELPER=weak php-$MIN_PHP/sapi/cli/php ./phpunit --colors=always src/Symfony/Component/Process/

0 commit comments

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