Skip to content

Commit d362bb1

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fail when detecting risky tests
2 parents 0bc5eea + cff1842 commit d362bb1

File tree

47 files changed

+92
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+92
-2
lines changed

phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
backupGlobals="false"
66
colors="true"
77
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
810
>
911
<php>
1012
<ini name="error_reporting" value="-1" />

src/Symfony/Bridge/Doctrine/phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
backupGlobals="false"
66
colors="true"
77
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
810
>
911
<php>
1012
<ini name="error_reporting" value="-1" />

src/Symfony/Bridge/Monolog/phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
backupGlobals="false"
66
colors="true"
77
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
810
>
911
<php>
1012
<ini name="error_reporting" value="-1" />

src/Symfony/Bridge/PhpUnit/phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
backupGlobals="false"
66
colors="true"
77
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
810
>
911
<php>
1012
<ini name="error_reporting" value="-1" />

src/Symfony/Bridge/ProxyManager/phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
backupGlobals="false"
66
colors="true"
77
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
810
>
911
<php>
1012
<ini name="error_reporting" value="-1" />

src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"require-dev": {
2323
"symfony/asset": "~2.7|~3.0.0",
2424
"symfony/finder": "~2.3|~3.0.0",
25-
"symfony/form": "^2.8.18",
25+
"symfony/form": "^2.8.19",
2626
"symfony/http-kernel": "~2.8|~3.0.0",
2727
"symfony/polyfill-intl-icu": "~1.0",
2828
"symfony/routing": "~2.2|~3.0.0",

src/Symfony/Bridge/Twig/phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
backupGlobals="false"
66
colors="true"
77
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
810
>
911
<php>
1012
<ini name="error_reporting" value="-1" />

src/Symfony/Bundle/DebugBundle/phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
backupGlobals="false"
66
colors="true"
77
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
810
>
911
<php>
1012
<ini name="error_reporting" value="-1" />

src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"symfony/dom-crawler": "^2.0.5|~3.0.0",
4444
"symfony/polyfill-intl-icu": "~1.0",
4545
"symfony/security": "~2.6|~3.0.0",
46-
"symfony/form": "^2.8.18",
46+
"symfony/form": "^2.8.19",
4747
"symfony/expression-language": "~2.6|~3.0.0",
4848
"symfony/process": "^2.0.5|~3.0.0",
4949
"symfony/validator": "~2.5|~3.0.0",

src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
backupGlobals="false"
66
colors="true"
77
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
810
>
911
<php>
1012
<ini name="error_reporting" value="-1" />

0 commit comments

Comments
 (0)