Skip to content

Commit 7efe03e

Browse files
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.json
2 parents 254c0cc + 181a67b commit 7efe03e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"php": ">=5.3.3"
2020
},
2121
"require-dev": {
22+
"symfony/phpunit-bridge": "~2.7",
2223
"symfony/yaml": "~2.1",
2324
"symfony/config": "~2.2",
2425
"symfony/expression-language": "~2.6"

phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
bootstrap="vendor/autoload.php"
88
>
99
<php>
10-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11-
<ini name="error_reporting" value="-16385"/>
10+
<ini name="error_reporting" value="-1" />
1211
</php>
1312
<testsuites>
1413
<testsuite name="Symfony DependencyInjection Component Test Suite">

0 commit comments

Comments
 (0)