[Form] fix Context\ExecutionContextInterface mock

nicolas-grekas · nicolas-grekas · commit b1657d26a398 · 2015-01-05T18:29:33.000+01:00
diff --git a/Test/DeprecationErrorHandler.php b/Test/DeprecationErrorHandler.php
@@ -20,7 +20,7 @@ class DeprecationErrorHandler
 {
     public static function handle($errorNumber, $message, $file, $line, $context)
     {
-        if ($errorNumber & E_USER_DEPRECATED) {
+        if ($errorNumber & ~E_USER_DEPRECATED) {
             return true;
         }
 
@@ -29,7 +29,7 @@ public static function handle($errorNumber, $message, $file, $line, $context)
 
     public static function handleBC($errorNumber, $message, $file, $line, $context)
     {
-        if ($errorNumber & E_USER_DEPRECATED) {
+        if ($errorNumber & ~E_USER_DEPRECATED) {
             return true;
         }
 
diff --git a/Tests/Extension/Core/ChoiceList/AbstractChoiceListTest.php b/Tests/Extension/Core/ChoiceList/AbstractChoiceListTest.php
@@ -163,46 +163,46 @@ public function testGetValues()
 
     public function testLegacyGetIndicesForChoices()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $choices = array($this->choice1, $this->choice2);
         $this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForChoices($choices));
     }
 
     public function testLegacyGetIndicesForChoicesPreservesKeys()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $choices = array(5 => $this->choice1, 8 => $this->choice2);
         $this->assertSame(array(5 => $this->index1, 8 => $this->index2), $this->list->getIndicesForChoices($choices));
     }
 
     public function testLegacyGetIndicesForChoicesPreservesOrder()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $choices = array($this->choice2, $this->choice1);
         $this->assertSame(array($this->index2, $this->index1), $this->list->getIndicesForChoices($choices));
     }
 
     public function testLegacyGetIndicesForChoicesIgnoresNonExistingChoices()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $choices = array($this->choice1, $this->choice2, 'foobar');
         $this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForChoices($choices));
     }
 
     public function testLegacyGetIndicesForChoicesEmpty()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $this->assertSame(array(), $this->list->getIndicesForChoices(array()));
     }
 
     public function testLegacyGetIndicesForValues()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         // values and indices are always the same
         $values = array($this->value1, $this->value2);
@@ -211,7 +211,7 @@ public function testLegacyGetIndicesForValues()
 
     public function testLegacyGetIndicesForValuesPreservesKeys()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         // values and indices are always the same
         $values = array(5 => $this->value1, 8 => $this->value2);
@@ -220,23 +220,23 @@ public function testLegacyGetIndicesForValuesPreservesKeys()
 
     public function testLegacyGetIndicesForValuesPreservesOrder()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $values = array($this->value2, $this->value1);
         $this->assertSame(array($this->index2, $this->index1), $this->list->getIndicesForValues($values));
     }
 
     public function testLegacyGetIndicesForValuesIgnoresNonExistingValues()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $values = array($this->value1, $this->value2, 'foobar');
         $this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForValues($values));
     }
 
     public function testLegacyGetIndicesForValuesEmpty()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $this->assertSame(array(), $this->list->getIndicesForValues(array()));
     }
diff --git a/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php b/Tests/Extension/Core/ChoiceList/LazyChoiceListTest.php
@@ -59,15 +59,15 @@ public function testGetRemainingViews()
 
     public function testLegacyGetIndicesForChoices()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $choices = array('b', 'c');
         $this->assertSame(array(1, 2), $this->list->getIndicesForChoices($choices));
     }
 
     public function testLegacyGetIndicesForValues()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $values = array('b', 'c');
         $this->assertSame(array(1, 2), $this->list->getIndicesForValues($values));
diff --git a/Tests/Extension/Core/ChoiceList/ObjectChoiceListTest.php b/Tests/Extension/Core/ChoiceList/ObjectChoiceListTest.php
@@ -187,7 +187,7 @@ public function testInitArrayThrowsExceptionIfToStringNotFound()
 
     public function testLegacyGetIndicesForChoicesWithValuePath()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $this->list = new ObjectChoiceList(
             array($this->obj1, $this->obj2, $this->obj3, $this->obj4),
@@ -204,7 +204,7 @@ public function testLegacyGetIndicesForChoicesWithValuePath()
 
     public function testLegacyGetIndicesForChoicesWithValuePathPreservesKeys()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $this->list = new ObjectChoiceList(
             array($this->obj1, $this->obj2, $this->obj3, $this->obj4),
@@ -220,7 +220,7 @@ public function testLegacyGetIndicesForChoicesWithValuePathPreservesKeys()
 
     public function testLegacyGetIndicesForChoicesWithValuePathPreservesOrder()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $this->list = new ObjectChoiceList(
             array($this->obj1, $this->obj2, $this->obj3, $this->obj4),
@@ -236,7 +236,7 @@ public function testLegacyGetIndicesForChoicesWithValuePathPreservesOrder()
 
     public function testLegacyGetIndicesForChoicesWithValuePathIgnoresNonExistingChoices()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         $this->list = new ObjectChoiceList(
             array($this->obj1, $this->obj2, $this->obj3, $this->obj4),
diff --git a/Tests/Extension/Core/ChoiceList/SimpleNumericChoiceListTest.php b/Tests/Extension/Core/ChoiceList/SimpleNumericChoiceListTest.php
@@ -17,7 +17,7 @@ class SimpleNumericChoiceListTest extends AbstractChoiceListTest
 {
     public function testLegacyGetIndicesForChoicesDealsWithNumericChoices()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         // Pass choices as strings although they are integers
         $choices = array('0', '1');
@@ -26,7 +26,7 @@ public function testLegacyGetIndicesForChoicesDealsWithNumericChoices()
 
     public function testLegacyGetIndicesForValuesDealsWithNumericValues()
     {
-        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
 
         // Pass values as strings although they are integers
         $values = array('0', '1');
diff --git a/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -566,7 +566,20 @@ public function getValidationGroups(FormInterface $form)
 
     private function getMockExecutionContext()
     {
-        return $this->getMock('Symfony\Component\Validator\Context\ExecutionContextInterface');
+        $context = $this->getMock('Symfony\Component\Validator\Context\ExecutionContextInterface');
+        $validator = $this->getMock('Symfony\Component\Validator\Validator\ValidatorInterface');
+        $contextualValidator = $this->getMock('Symfony\Component\Validator\Validator\ContextualValidatorInterface');
+
+        $validator->expects($this->any())
+            ->method('inContext')
+            ->with($context)
+            ->will($this->returnValue($contextualValidator));
+
+        $context->expects($this->any())
+            ->method('getValidator')
+            ->will($this->returnValue($validator));
+
+        return $context;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class DeprecationErrorHandler`
`20`	`20`	`{`
`21`	`21`	`public static function handle($errorNumber, $message, $file, $line, $context)`
`22`	`22`	`{`
`23`		`- if ($errorNumber & E_USER_DEPRECATED) {`
	`23`	`+ if ($errorNumber & ~E_USER_DEPRECATED) {`
`24`	`24`	`return true;`
`25`	`25`	`}`
`26`	`26`
`@@ -29,7 +29,7 @@ public static function handle($errorNumber, $message, $file, $line, $context)`
`29`	`29`
`30`	`30`	`public static function handleBC($errorNumber, $message, $file, $line, $context)`
`31`	`31`	`{`
`32`		`- if ($errorNumber & E_USER_DEPRECATED) {`
	`32`	`+ if ($errorNumber & ~E_USER_DEPRECATED) {`
`33`	`33`	`return true;`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -163,46 +163,46 @@ public function testGetValues()`
`163`	`163`
`164`	`164`	`public function testLegacyGetIndicesForChoices()`
`165`	`165`	`{`
`166`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`166`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`167`	`167`
`168`	`168`	`$choices = array($this->choice1, $this->choice2);`
`169`	`169`	`$this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForChoices($choices));`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`public function testLegacyGetIndicesForChoicesPreservesKeys()`
`173`	`173`	`{`
`174`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`174`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`175`	`175`
`176`	`176`	`$choices = array(5 => $this->choice1, 8 => $this->choice2);`
`177`	`177`	`$this->assertSame(array(5 => $this->index1, 8 => $this->index2), $this->list->getIndicesForChoices($choices));`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`public function testLegacyGetIndicesForChoicesPreservesOrder()`
`181`	`181`	`{`
`182`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`182`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`183`	`183`
`184`	`184`	`$choices = array($this->choice2, $this->choice1);`
`185`	`185`	`$this->assertSame(array($this->index2, $this->index1), $this->list->getIndicesForChoices($choices));`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`public function testLegacyGetIndicesForChoicesIgnoresNonExistingChoices()`
`189`	`189`	`{`
`190`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`190`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`191`	`191`
`192`	`192`	`$choices = array($this->choice1, $this->choice2, 'foobar');`
`193`	`193`	`$this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForChoices($choices));`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`public function testLegacyGetIndicesForChoicesEmpty()`
`197`	`197`	`{`
`198`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`198`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`199`	`199`
`200`	`200`	`$this->assertSame(array(), $this->list->getIndicesForChoices(array()));`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`public function testLegacyGetIndicesForValues()`
`204`	`204`	`{`
`205`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`205`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`206`	`206`
`207`	`207`	`// values and indices are always the same`
`208`	`208`	`$values = array($this->value1, $this->value2);`
`@@ -211,7 +211,7 @@ public function testLegacyGetIndicesForValues()`
`211`	`211`
`212`	`212`	`public function testLegacyGetIndicesForValuesPreservesKeys()`
`213`	`213`	`{`
`214`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`214`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`215`	`215`
`216`	`216`	`// values and indices are always the same`
`217`	`217`	`$values = array(5 => $this->value1, 8 => $this->value2);`
`@@ -220,23 +220,23 @@ public function testLegacyGetIndicesForValuesPreservesKeys()`
`220`	`220`
`221`	`221`	`public function testLegacyGetIndicesForValuesPreservesOrder()`
`222`	`222`	`{`
`223`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`223`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`224`	`224`
`225`	`225`	`$values = array($this->value2, $this->value1);`
`226`	`226`	`$this->assertSame(array($this->index2, $this->index1), $this->list->getIndicesForValues($values));`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`public function testLegacyGetIndicesForValuesIgnoresNonExistingValues()`
`230`	`230`	`{`
`231`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`231`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`232`	`232`
`233`	`233`	`$values = array($this->value1, $this->value2, 'foobar');`
`234`	`234`	`$this->assertSame(array($this->index1, $this->index2), $this->list->getIndicesForValues($values));`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`public function testLegacyGetIndicesForValuesEmpty()`
`238`	`238`	`{`
`239`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`239`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`240`	`240`
`241`	`241`	`$this->assertSame(array(), $this->list->getIndicesForValues(array()));`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,15 @@ public function testGetRemainingViews()`
`59`	`59`
`60`	`60`	`public function testLegacyGetIndicesForChoices()`
`61`	`61`	`{`
`62`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`62`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`63`	`63`
`64`	`64`	`$choices = array('b', 'c');`
`65`	`65`	`$this->assertSame(array(1, 2), $this->list->getIndicesForChoices($choices));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public function testLegacyGetIndicesForValues()`
`69`	`69`	`{`
`70`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`70`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`71`	`71`
`72`	`72`	`$values = array('b', 'c');`
`73`	`73`	`$this->assertSame(array(1, 2), $this->list->getIndicesForValues($values));`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class SimpleNumericChoiceListTest extends AbstractChoiceListTest`
`17`	`17`	`{`
`18`	`18`	`public function testLegacyGetIndicesForChoicesDealsWithNumericChoices()`
`19`	`19`	`{`
`20`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`20`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`21`	`21`
`22`	`22`	`// Pass choices as strings although they are integers`
`23`	`23`	`$choices = array('0', '1');`
`@@ -26,7 +26,7 @@ public function testLegacyGetIndicesForChoicesDealsWithNumericChoices()`
`26`	`26`
`27`	`27`	`public function testLegacyGetIndicesForValuesDealsWithNumericValues()`
`28`	`28`	`{`
`29`		`- $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);`
	`29`	`+ $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
`30`	`30`
`31`	`31`	`// Pass values as strings although they are integers`
`32`	`32`	`$values = array('0', '1');`