Merge branch '2.5' into 2.6

* 2.5:
  [Form] fix Context\ExecutionContextInterface mock
  [Validator] marks TraversalStrategy::STOP_RECURSION constant internal as it has been introduced for the BC layer and will be removed in 3.0.

Author: fabpot

Tests/Form/ChoiceList/GenericEntityChoiceListTest.php

@@ -269,7 +269,7 @@ public function testInitShorthandEntityName()
 
     public function testLegacyInitShorthandEntityName()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $item1 = new SingleIntIdEntity(1, 'Foo');
         $item2 = new SingleIntIdEntity(2, 'Bar');