Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit b4d7bfb

Browse files
nicolas-grekasnicolas-grekas
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.json
2 parents ef7b49e + 5d5a4e2 commit b4d7bfb

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

‎Acl/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"symfony/security-core": "~2.4"
2121
},
2222
"require-dev": {
23+
"symfony/phpunit-bridge": "~2.7",
2324
"doctrine/common": "~2.2",
2425
"doctrine/dbal": "~2.2",
2526
"psr/log": "~1.0"

‎Acl/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
bootstrap="vendor/autoload.php"
1313
>
1414
<php>
15-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
16-
<ini name="error_reporting" value="-16385"/>
15+
<ini name="error_reporting" value="-1" />
1716
</php>
1817
<testsuites>
1918
<testsuite name="Symfony Security Component ACL Test Suite">

‎Core/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/event-dispatcher": "~2.1",
2324
"symfony/expression-language": "~2.6",
2425
"symfony/http-foundation": "~2.4",

‎Core/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
bootstrap="vendor/autoload.php"
1313
>
1414
<php>
15-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
16-
<ini name="error_reporting" value="-16385"/>
15+
<ini name="error_reporting" value="-1" />
1716
</php>
1817
<testsuites>
1918
<testsuite name="Symfony Security Component Core Test Suite">

‎Csrf/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"symfony/security-core": "~2.4"
2121
},
2222
"require-dev": {
23+
"symfony/phpunit-bridge": "~2.7",
2324
"symfony/http-foundation": "~2.1"
2425
},
2526
"suggest": {

‎Csrf/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
bootstrap="vendor/autoload.php"
1313
>
1414
<php>
15-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
16-
<ini name="error_reporting" value="-16385"/>
15+
<ini name="error_reporting" value="-1" />
1716
</php>
1817
<testsuites>
1918
<testsuite name="Symfony Security Component CSRF Test Suite">

‎Http/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"symfony/http-kernel": "~2.4"
2424
},
2525
"require-dev": {
26+
"symfony/phpunit-bridge": "~2.7",
2627
"symfony/routing": "~2.2",
2728
"symfony/security-csrf": "~2.4",
2829
"psr/log": "~1.0"

‎Http/phpunit.xml.dist

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
bootstrap="vendor/autoload.php"
1313
>
1414
<php>
15-
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
16-
<ini name="error_reporting" value="-16385"/>
15+
<ini name="error_reporting" value="-1" />
1716
</php>
1817
<testsuites>
1918
<testsuite name="Symfony Security Component HTTP Test Suite">

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"symfony/security-http": "self.version"
2929
},
3030
"require-dev": {
31+
"symfony/phpunit-bridge": "~2.7",
3132
"symfony/intl": "~2.3",
3233
"symfony/routing": "~2.2",
3334
"symfony/translation": "~2.0,>=2.0.5",

‎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 Security Component Test Suite">

0 commit comments

Comments
 (0)