Commit 7efe03e
committed
Merge branch '2.3' into 2.6
* 2.3:
Minor hot fix
[PROCESS] make sure /dev/tty is readable
[2.3] require-dev PHPUnit bridge
[FrameworkBundle] Fixed Shell logo
[2.3] Update CONTRIBUTING.md
[2.3][Process] Fixed PhpProcess::getCommandLine() result
[Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
Enforce UTF-8 charset for core controllers
Conflicts:
CONTRIBUTING.md
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
src/Symfony/Component/Console/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Templating/composer.json2 files changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | | - | |
| 10 | + | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
| |||
0 commit comments