Upgrade 1-11.38

vendor/symfony/validator/Tests/Constraints/ChoiceValidatorTest.php

@@ -45,7 +45,6 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
         $constraint = new Choice(array(
             'choices' => array('foo', 'bar'),
             'multiple' => true,
-            'strict' => true,
         ));
 
         $this->validator->validate('asdf', $constraint);
@@ -58,7 +57,6 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
             new Choice(
                 array(
                     'choices' => array('foo', 'bar'),
-                    'strict' => true,
                 )
             )
         );
@@ -71,7 +69,7 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
      */
     public function testChoicesOrCallbackExpected()
     {
-        $this->validator->validate('foobar', new Choice(array('strict' => true)));
+        $this->validator->validate('foobar', new Choice());
     }
 
     /**
@@ -79,12 +77,12 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
      */
     public function testValidCallbackExpected()
     {
-        $this->validator->validate('foobar', new Choice(array('callback' => 'abcd', 'strict' => true)));
+        $this->validator->validate('foobar', new Choice(array('callback' => 'abcd')));
     }
 
     public function testValidChoiceArray()
     {
-        $constraint = new Choice(array('choices' => array('foo', 'bar'), 'strict' => true));
+        $constraint = new Choice(array('choices' => array('foo', 'bar')));
 
         $this->validator->validate('bar', $constraint);
 
@@ -93,7 +91,7 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
 
     public function testValidChoiceCallbackFunction()
     {
-        $constraint = new Choice(array('callback' => __NAMESPACE__.'\choice_callback', 'strict' => true));
+        $constraint = new Choice(array('callback' => __NAMESPACE__.'\choice_callback'));
 
         $this->validator->validate('bar', $constraint);
 
@@ -104,7 +102,6 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
     {
         $constraint = new Choice(
             array(
-                'strict' => true,
                 'callback' => function () {
                     return array('foo', 'bar');
                 },
@@ -118,7 +115,7 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
 
     public function testValidChoiceCallbackStaticMethod()
     {
-        $constraint = new Choice(array('callback' => array(__CLASS__, 'staticCallback'), 'strict' => true));
+        $constraint = new Choice(array('callback' => array(__CLASS__, 'staticCallback')));
 
         $this->validator->validate('bar', $constraint);
 
@@ -130,7 +127,7 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
         // search $this for "staticCallback"
         $this->setObject($this);
 
-        $constraint = new Choice(array('callback' => 'staticCallback', 'strict' => true));
+        $constraint = new Choice(array('callback' => 'staticCallback'));
 
         $this->validator->validate('bar', $constraint);
 
@@ -142,7 +139,7 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
         // search $this for "objectMethodCallback"
         $this->setObject($this);
 
-        $constraint = new Choice(array('callback' => 'objectMethodCallback', 'strict' => true));
+        $constraint = new Choice(array('callback' => 'objectMethodCallback'));
 
         $this->validator->validate('bar', $constraint);
 
@@ -154,7 +151,6 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
         $constraint = new Choice(array(
             'choices' => array('foo', 'bar', 'baz'),
             'multiple' => true,
-            'strict' => true,
         ));
 
         $this->validator->validate(array('baz', 'bar'), $constraint);
@@ -167,7 +163,6 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
         $constraint = new Choice(array(
             'choices' => array('foo', 'bar'),
             'message' => 'myMessage',
-            'strict' => true,
         ));
 
         $this->validator->validate('baz', $constraint);
@@ -185,7 +180,6 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
             // the DB or the model
             'choices' => array(),
             'message' => 'myMessage',
-            'strict' => true,
         ));
 
         $this->validator->validate('baz', $constraint);
@@ -202,7 +196,6 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
             'choices' => array('foo', 'bar'),
             'multipleMessage' => 'myMessage',
             'multiple' => true,
-            'strict' => true,
         ));
 
         $this->validator->validate(array('foo', 'baz'), $constraint);
@@ -221,7 +214,6 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
             'multiple' => true,
             'min' => 2,
             'minMessage' => 'myMessage',
-            'strict' => true,
         ));
 
         $value = array('foo');
@@ -245,7 +237,6 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
             'multiple' => true,
             'max' => 2,
             'maxMessage' => 'myMessage',
-            'strict' => true,
         ));
 
         $value = array('foo', 'bar', 'moo');
@@ -262,27 +253,10 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
             ->assertRaised();
     }
 
-    /**
-     * @group legacy
-     */
-    public function testNonStrict()
-    {
-        $constraint = new Choice(array(
-            'choices' => array(1, 2),
-            'strict' => false,
-        ));
-
-        $this->validator->validate('2', $constraint);
-        $this->validator->validate(2, $constraint);
-
-        $this->assertNoViolation();
-    }
-
     public function testStrictAllowsExactValue()
     {
         $constraint = new Choice(array(
             'choices' => array(1, 2),
-            'strict' => true,
         ));
 
         $this->validator->validate(2, $constraint);
@@ -294,7 +268,6 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
     {
         $constraint = new Choice(array(
             'choices' => array(1, 2),
-            'strict' => true,
             'message' => 'myMessage',
         ));
 
@@ -306,28 +279,11 @@ class ChoiceValidatorTest extends ConstraintValidatorTestCase
             ->assertRaised();
     }
 
-    /**
-     * @group legacy
-     */
-    public function testNonStrictWithMultipleChoices()
-    {
-        $constraint = new Choice(array(
-            'choices' => array(1, 2, 3),
-            'multiple' => true,
-            'strict' => false,
-        ));
-
-        $this->validator->validate(array('2', 3), $constraint);
-
-        $this->assertNoViolation();
-    }
-
     public function testStrictWithMultipleChoices()
     {
         $constraint = new Choice(array(
             'choices' => array(1, 2, 3),
             'multiple' => true,
-            'strict' => true,
             'multipleMessage' => 'myMessage',
         ));