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

10 files changed, 10 insertions, 10 deletions

diff --git a/Acl/composer.json b/Acl/composer.json
index fb25b5d..6925f15 100644
--- a/Acl/composer.json
+++ b/Acl/composer.json
@@ -20,6 +20,7 @@
         "symfony/security-core": "~2.4"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7",
         "doctrine/common": "~2.2",
         "doctrine/dbal": "~2.2",
         "psr/log": "~1.0"
diff --git a/Acl/phpunit.xml.dist b/Acl/phpunit.xml.dist
index 50d0448..ee662c8 100644
--- a/Acl/phpunit.xml.dist
+++ b/Acl/phpunit.xml.dist
@@ -12,8 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
     <testsuites>
         <testsuite name="Symfony Security Component ACL Test Suite">
diff --git a/Core/composer.json b/Core/composer.json
index c6923bf..f8e289b 100644
--- a/Core/composer.json
+++ b/Core/composer.json
@@ -19,6 +19,7 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7",
         "symfony/event-dispatcher": "~2.1",
         "symfony/expression-language": "~2.6",
         "symfony/http-foundation": "~2.4",
diff --git a/Core/phpunit.xml.dist b/Core/phpunit.xml.dist
index 7bdf5cb..6b2ccb0 100644
--- a/Core/phpunit.xml.dist
+++ b/Core/phpunit.xml.dist
@@ -12,8 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
     <testsuites>
         <testsuite name="Symfony Security Component Core Test Suite">
diff --git a/Csrf/composer.json b/Csrf/composer.json
index 4daba5c..5c869e0 100644
--- a/Csrf/composer.json
+++ b/Csrf/composer.json
@@ -20,6 +20,7 @@
         "symfony/security-core": "~2.4"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7",
         "symfony/http-foundation": "~2.1"
     },
     "suggest": {
diff --git a/Csrf/phpunit.xml.dist b/Csrf/phpunit.xml.dist
index 0606071..f72d115 100644
--- a/Csrf/phpunit.xml.dist
+++ b/Csrf/phpunit.xml.dist
@@ -12,8 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
     <testsuites>
         <testsuite name="Symfony Security Component CSRF Test Suite">
diff --git a/Http/composer.json b/Http/composer.json
index ad04f44..6c6dfe3 100644
--- a/Http/composer.json
+++ b/Http/composer.json
@@ -23,6 +23,7 @@
         "symfony/http-kernel": "~2.4"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7",
         "symfony/routing": "~2.2",
         "symfony/security-csrf": "~2.4",
         "psr/log": "~1.0"
diff --git a/Http/phpunit.xml.dist b/Http/phpunit.xml.dist
index a152839..7393814 100644
--- a/Http/phpunit.xml.dist
+++ b/Http/phpunit.xml.dist
@@ -12,8 +12,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
     <testsuites>
         <testsuite name="Symfony Security Component HTTP Test Suite">
diff --git a/composer.json b/composer.json
index c956411..81e8582 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,7 @@
         "symfony/security-http": "self.version"
     },
     "require-dev": {
+        "symfony/phpunit-bridge": "~2.7",
         "symfony/intl": "~2.3",
         "symfony/routing": "~2.2",
         "symfony/translation": "~2.0,>=2.0.5",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f11fabe..e80320d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,8 +7,7 @@
          bootstrap="vendor/autoload.php"
 >
     <php>
-        <!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
-        <ini name="error_reporting" value="-16385"/>
+        <ini name="error_reporting" value="-1" />
     </php>
     <testsuites>
         <testsuite name="Symfony Security Component Test Suite">