Merge branch '2.7'

nicolas-grekas · nicolas-grekas · commit 5b0fc46b1143 · 2015-01-05T19:25:47.000+01:00
* 2.7:
  [2.6] fix deprecation silencing...
  [Form] fix Context\ExecutionContextInterface mock
  add german translation for checkDNS option
  [Validator] marks TraversalStrategy::STOP_RECURSION constant internal as it has been introduced for the BC layer and will be removed in 3.0.
diff --git a/Tests/LegacyOptionsTest.php b/Tests/LegacyOptionsTest.php
@@ -23,7 +23,7 @@ class LegacyOptionsTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $this->options = new OptionsResolver();
     }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class LegacyOptionsTest extends \PHPUnit_Framework_TestCase`
`23`	`23`
`24`	`24`	`protected function setUp()`
`25`	`25`	`{`
`26`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`26`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`27`	`27`
`28`	`28`	`$this->options = new OptionsResolver();`
`29`	`29`	`}`