Rebase and update to latest CS

Author: nicolas-grekas

src/Symfony/Component/Validator/CHANGELOG.md

@@ -8,6 +8,7 @@ CHANGELOG
  * added UATP cards support to `CardSchemeValidator`
  * added option `allowNull` to NotBlank constraint
  * added `Json` constraint
+ * added `Unique` constraint
 
 4.2.0
 -----

src/Symfony/Component/Validator/Constraints/Unique.php

@@ -21,11 +21,11 @@
  */
 class Unique extends Constraint
 {
-    const IS_NOT_UNIQUE = '7911c98d-b845-4da0-94b7-a8dac36bc55a';
+    public const IS_NOT_UNIQUE = '7911c98d-b845-4da0-94b7-a8dac36bc55a';
 
-    protected static $errorNames = array(
+    protected static $errorNames = [
         self::IS_NOT_UNIQUE => 'IS_NOT_UNIQUE',
-    );
+    ];
 
     public $message = 'This collection should contain only unique elements';
 }

src/Symfony/Component/Validator/Constraints/UniqueValidator.php

@@ -13,7 +13,7 @@
 
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
 /**
  * @author Yevgeniy Zholkevskiy <[email protected]>
@@ -33,13 +33,13 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
-        if (!is_array($value) && !$value instanceof \IteratorAggregate) {
-            throw new UnexpectedTypeException($value, 'IteratorAggregate');
+        if (!\is_array($value) && !$value instanceof \IteratorAggregate) {
+            throw new UnexpectedValueException($value, 'array|IteratorAggregate');
         }
 
-        $collectionElements = array();
+        $collectionElements = [];
         foreach ($value as $element) {
-            if (in_array($element, $collectionElements, true)) {
+            if (\in_array($element, $collectionElements, true)) {
                 $this->context->buildViolation($constraint->message)
                     ->setParameter('{{ value }}', $this->formatValue($value))
                     ->setCode(Unique::IS_NOT_UNIQUE)

src/Symfony/Component/Validator/Tests/Constraints/UniqueValidatorTest.php

@@ -23,7 +23,7 @@ protected function createValidator()
     }
 
     /**
-     * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
+     * @expectedException \Symfony\Component\Validator\Exception\UnexpectedValueException
      */
     public function testExpectsUniqueConstraintCompatibleType()
     {
@@ -42,29 +42,29 @@ public function testValidValues($value)
 
     public function getValidValues()
     {
-        return array(
-            yield 'null' => array(array(null)),
-            yield 'empty array' => array(array()),
-            yield 'single integer' => array(array(5)),
-            yield 'single string' => array(array('a')),
-            yield 'single object' => array(array(new \stdClass())),
-            yield 'unique booleans' => array(array(true, false)),
-            yield 'unique integers' => array(array(1, 2, 3, 4, 5, 6)),
-            yield 'unique floats' => array(array(0.1, 0.2, 0.3)),
-            yield 'unique strings' => array(array('a', 'b', 'c')),
-            yield 'unique arrays' => array(array(array(1, 2), array(2, 4), array(4, 6))),
-            yield 'unique objects' => array(array(new \stdClass(), new \stdClass())),
-        );
+        return [
+            yield 'null' => [[null]],
+            yield 'empty array' => [[]],
+            yield 'single integer' => [[5]],
+            yield 'single string' => [['a']],
+            yield 'single object' => [[new \stdClass()]],
+            yield 'unique booleans' => [[true, false]],
+            yield 'unique integers' => [[1, 2, 3, 4, 5, 6]],
+            yield 'unique floats' => [[0.1, 0.2, 0.3]],
+            yield 'unique strings' => [['a', 'b', 'c']],
+            yield 'unique arrays' => [[[1, 2], [2, 4], [4, 6]]],
+            yield 'unique objects' => [[new \stdClass(), new \stdClass()]],
+        ];
     }
 
     /**
      * @dataProvider getInvalidValues
      */
     public function testInvalidValues($value)
     {
-        $constraint = new Unique(array(
+        $constraint = new Unique([
             'message' => 'myMessage',
-        ));
+        ]);
         $this->validator->validate($value, $constraint);
 
         $this->buildViolation('myMessage')
@@ -77,13 +77,13 @@ public function getInvalidValues()
     {
         $object = new \stdClass();
 
-        return array(
-            yield 'not unique booleans' => array(array(true, true)),
-            yield 'not unique integers' => array(array(1, 2, 3, 3)),
-            yield 'not unique floats' => array(array(0.1, 0.2, 0.1)),
-            yield 'not unique string' => array(array('a', 'b', 'a')),
-            yield 'not unique arrays' => array(array(array(1, 1), array(2, 3), array(1, 1))),
-            yield 'not unique objects' => array(array($object, $object)),
-        );
+        return [
+            yield 'not unique booleans' => [[true, true]],
+            yield 'not unique integers' => [[1, 2, 3, 3]],
+            yield 'not unique floats' => [[0.1, 0.2, 0.1]],
+            yield 'not unique string' => [['a', 'b', 'a']],
+            yield 'not unique arrays' => [[[1, 1], [2, 3], [1, 1]]],
+            yield 'not unique objects' => [[$object, $object]],
+        ];
     }
 }