Merge branch '2.7' into 2.8

fabpot · fabpot · commit ff6cd6405603 · 2017-04-12T07:07:15.000-07:00
* 2.7:
  fail when detecting risky tests
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "symfony/dom-crawler": "^2.0.5|~3.0.0",
         "symfony/polyfill-intl-icu": "~1.0",
         "symfony/security": "~2.6|~3.0.0",
-        "symfony/form": "^2.8.18",
+        "symfony/form": "^2.8.19",
         "symfony/expression-language": "~2.6|~3.0.0",
         "symfony/process": "^2.0.5|~3.0.0",
         "symfony/validator": "~2.5|~3.0.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,6 +5,8 @@
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
+         failOnRisky="true"
+         failOnWarning="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`backupGlobals="false"`
`6`	`6`	`colors="true"`
`7`	`7`	`bootstrap="vendor/autoload.php"`
	`8`	`+ failOnRisky="true"`
	`9`	`+ failOnWarning="true"`
`8`	`10`	`>`
`9`	`11`	`<php>`
`10`	`12`	`<ini name="error_reporting" value="-1" />`