Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit b14c33c845b0 · 2019-04-09T11:08:46.000+02:00
* 3.4:
  streamline the constraints reference
diff --git a/reference/constraints/All.rst b/reference/constraints/All.rst
@@ -36,7 +36,7 @@ entry in that array:
              *     @Assert\Length(min=5)
              * })
              */
-             protected $favoriteColors = [];
+            protected $favoriteColors = [];
         }
 
     .. code-block:: yaml
diff --git a/reference/constraints/Bic.rst b/reference/constraints/Bic.rst
@@ -74,8 +74,6 @@ will contain a Business Identifier Code (BIC).
 
         class Transaction
         {
-            protected $businessIdentifierCode;
-
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('businessIdentifierCode', new Assert\Bic());
diff --git a/reference/constraints/Callback.rst b/reference/constraints/Callback.rst
@@ -84,6 +84,11 @@ Configuration
             {
                 $metadata->addConstraint(new Assert\Callback('validate'));
             }
+
+            public function validate(ExecutionContextInterface $context, $payload)
+            {
+                // ...
+            }
         }
 
 The Callback Method
diff --git a/reference/constraints/CardScheme.rst b/reference/constraints/CardScheme.rst
@@ -81,8 +81,6 @@ on an object that will contain a credit card number.
 
         class Transaction
         {
-            protected $cardNumber;
-
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('cardNumber', new Assert\CardScheme([
diff --git a/reference/constraints/Choice.rst b/reference/constraints/Choice.rst
@@ -108,8 +108,6 @@ If your valid choice list is simple, you can pass them in directly via the
 
         class Author
         {
-            protected $genre;
-
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint(
diff --git a/reference/constraints/Collection.rst b/reference/constraints/Collection.rst
@@ -138,8 +138,6 @@ following:
 
         class Author
         {
-            private $options = [];
-
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('profileData', new Assert\Collection([
@@ -205,7 +203,7 @@ you can do the following:
              *     }
              * )
              */
-             protected $profileData = ['personal_email'];
+            protected $profileData = ['personal_email'];
         }
 
     .. code-block:: yaml
@@ -269,9 +267,10 @@ you can do the following:
             {
                 $metadata->addPropertyConstraint('profileData', new Assert\Collection([
                     'fields' => [
-                        'personal_email'  => new Assert\Required(
-                            [new Assert\NotBlank(), new Assert\Email()]
-                        ),
+                        'personal_email'  => new Assert\Required([
+                            new Assert\NotBlank(),
+                            new Assert\Email(),
+                        ]),
                         'alternate_email' => new Assert\Optional(new Assert\Email()),
                     ],
                 ]));
diff --git a/reference/constraints/Count.rst b/reference/constraints/Count.rst
@@ -42,7 +42,7 @@ you might add the following:
              *      maxMessage = "You cannot specify more than {{ limit }} emails"
              * )
              */
-             protected $emails = [];
+            protected $emails = [];
         }
 
     .. code-block:: yaml
@@ -90,8 +90,8 @@ you might add the following:
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('emails', new Assert\Count([
-                    'min'        => 1,
-                    'max'        => 5,
+                    'min' => 1,
+                    'max' => 5,
                     'minMessage' => 'You must specify at least one email',
                     'maxMessage' => 'You cannot specify more than {{ limit }} emails',
                 ]));
diff --git a/reference/constraints/Country.rst b/reference/constraints/Country.rst
@@ -29,7 +29,7 @@ Basic Usage
             /**
              * @Assert\Country
              */
-             protected $country;
+            protected $country;
         }
 
     .. code-block:: yaml
diff --git a/reference/constraints/Date.rst b/reference/constraints/Date.rst
@@ -31,7 +31,7 @@ Basic Usage
              * @Assert\Date
              * @var string A "Y-m-d" formatted value
              */
-             protected $birthday;
+            protected $birthday;
         }
 
     .. code-block:: yaml
diff --git a/reference/constraints/DateTime.rst b/reference/constraints/DateTime.rst
@@ -32,7 +32,7 @@ Basic Usage
              * @Assert\DateTime
              * @var string A "Y-m-d H:i:s" formatted value
              */
-             protected $createdAt;
+            protected $createdAt;
         }
 
     .. code-block:: yaml
diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst
@@ -36,7 +36,7 @@ Basic Usage
              *     checkMX = true
              * )
              */
-             protected $email;
+            protected $email;
         }
 
     .. code-block:: yaml
diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst
@@ -212,13 +212,11 @@ following code:
 
         class Author
         {
-            // ...
-
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('headshot', new Assert\Image([
-                    'allowLandscape'    => false,
-                    'allowPortrait'     => false,
+                    'allowLandscape' => false,
+                    'allowPortrait' => false,
                 ]));
             }
         }
diff --git a/reference/constraints/Ip.rst b/reference/constraints/Ip.rst
@@ -32,7 +32,7 @@ Basic Usage
             /**
              * @Assert\Ip
              */
-             protected $ipAddress;
+            protected $ipAddress;
         }
 
     .. code-block:: yaml
diff --git a/reference/constraints/IsFalse.rst b/reference/constraints/IsFalse.rst
@@ -52,10 +52,10 @@ method returns **false**:
              *     message = "You've entered an invalid state."
              * )
              */
-             public function isStateInvalid()
-             {
+            public function isStateInvalid()
+            {
                 // ...
-             }
+            }
         }
 
     .. code-block:: yaml
@@ -96,10 +96,17 @@ method returns **false**:
         {
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
-                $metadata->addGetterConstraint('stateInvalid', new Assert\IsFalse());
+                $metadata->addGetterConstraint('stateInvalid', new Assert\IsFalse([
+                    'message' => 'You've entered an invalid state.',
+                ]));
             }
         }
 
+        public function isStateInvalid()
+        {
+            // ...
+        }
+
 Options
 -------
 
diff --git a/reference/constraints/IsTrue.rst b/reference/constraints/IsTrue.rst
@@ -53,7 +53,7 @@ Then you can constrain this method with ``IsTrue``.
             protected $token;
 
             /**
-             * @Assert\IsTrue(message="The token is invalid")
+             * @Assert\IsTrue(message="The token is invalid.")
              */
             public function isTokenValid()
             {
@@ -97,8 +97,6 @@ Then you can constrain this method with ``IsTrue``.
 
         class Author
         {
-            protected $token;
-
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addGetterConstraint('tokenValid', new IsTrue([
diff --git a/reference/constraints/Isbn.rst b/reference/constraints/Isbn.rst
@@ -81,12 +81,10 @@ on an object that will contain an ISBN.
 
         class Book
         {
-            protected $isbn;
-
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('isbn', new Assert\Isbn([
-                    'type'    => 'isbn10',
+                    'type' => 'isbn10',
                     'message' => 'This value is not valid.',
                 ]));
             }
diff --git a/reference/constraints/Issn.rst b/reference/constraints/Issn.rst
@@ -32,7 +32,7 @@ Basic Usage
             /**
              * @Assert\Issn
              */
-             protected $issn;
+            protected $issn;
         }
 
     .. code-block:: yaml
@@ -92,7 +92,7 @@ When switching this to ``true``, the validator requires an upper case 'X'.
 message
 ~~~~~~~
 
-**type**: ``String`` default: ``This value is not a valid ISSN.``
+**type**: ``string`` default: ``This value is not a valid ISSN.``
 
 The message shown if the given value is not a valid ISSN.
 
diff --git a/reference/constraints/Language.rst b/reference/constraints/Language.rst
@@ -30,7 +30,7 @@ Basic Usage
             /**
              * @Assert\Language
              */
-             protected $preferredLanguage;
+            protected $preferredLanguage;
         }
 
     .. code-block:: yaml
diff --git a/reference/constraints/Length.rst b/reference/constraints/Length.rst
@@ -49,7 +49,7 @@ and "50", you might add the following:
              *      maxMessage = "Your first name cannot be longer than {{ limit }} characters"
              * )
              */
-             protected $firstName;
+            protected $firstName;
         }
 
     .. code-block:: yaml
@@ -101,8 +101,8 @@ and "50", you might add the following:
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('firstName', new Assert\Length([
-                    'min'        => 2,
-                    'max'        => 50,
+                    'min' => 2,
+                    'max' => 50,
                     'minMessage' => 'Your first name must be at least {{ limit }} characters long',
                     'maxMessage' => 'Your first name cannot be longer than {{ limit }} characters',
                 ]));
diff --git a/reference/constraints/Locale.rst b/reference/constraints/Locale.rst
@@ -37,7 +37,7 @@ Basic Usage
              *     canonicalize = true
              * )
              */
-             protected $locale;
+            protected $locale;
         }
 
     .. code-block:: yaml
diff --git a/reference/constraints/Range.rst b/reference/constraints/Range.rst
@@ -89,8 +89,8 @@ you might add the following:
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('height', new Assert\Range([
-                    'min'        => 120,
-                    'max'        => 180,
+                    'min' => 120,
+                    'max' => 180,
                     'minMessage' => 'You must be at least {{ limit }}cm tall to enter',
                     'maxMessage' => 'You cannot be taller than {{ limit }}cm to enter',
                 ]));
diff --git a/reference/constraints/Regex.rst b/reference/constraints/Regex.rst
@@ -153,7 +153,7 @@ it a custom message:
             {
                 $metadata->addPropertyConstraint('firstName', new Assert\Regex([
                     'pattern' => '/\d/',
-                    'match'   => false,
+                    'match' => false,
                     'message' => 'Your name cannot contain a number',
                 ]));
             }
@@ -243,7 +243,7 @@ need to specify the HTML5 compatible pattern in the ``htmlPattern`` option:
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('name', new Assert\Regex([
-                    'pattern'     => '/^[a-z]+$/i',
+                    'pattern' => '/^[a-z]+$/i',
                     'htmlPattern' => '^[a-zA-Z]+$',
                 ]));
             }
diff --git a/reference/constraints/Time.rst b/reference/constraints/Time.rst
@@ -34,7 +34,7 @@ of the day when the event starts:
              * @Assert\Time
              * @var string A "H:i:s" formatted value
              */
-             protected $startsAt;
+            protected $startsAt;
         }
 
     .. code-block:: yaml
diff --git a/reference/constraints/Type.rst b/reference/constraints/Type.rst
@@ -97,7 +97,7 @@ This will check if ``firstName`` is of type ``string`` and that ``age`` is an
                 $metadata->addPropertyConstraint('firstName', new Assert\Type('string'));
 
                 $metadata->addPropertyConstraint('age', new Assert\Type([
-                    'type'    => 'integer',
+                    'type' => 'integer',
                     'message' => 'The value {{ value }} is not a valid {{ type }}.',
                 ]));
             }
diff --git a/reference/constraints/UniqueEntity.rst b/reference/constraints/UniqueEntity.rst
@@ -47,14 +47,10 @@ between all of the constraints in your user table:
         class Author
         {
             /**
-             * @var string $email
-             *
              * @ORM\Column(name="email", type="string", length=255, unique=true)
              * @Assert\Email
              */
             protected $email;
-
-            // ...
         }
 
     .. code-block:: yaml
@@ -100,7 +96,7 @@ between all of the constraints in your user table:
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addConstraint(new UniqueEntity([
-                    'fields'  => 'email',
+                    'fields' => 'email',
                 ]));
 
                 $metadata->addPropertyConstraint('email', new Assert\Email());
@@ -227,9 +223,9 @@ Consider this example:
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addConstraint(new UniqueEntity([
-                    'fields'    => ['host', 'port'],
+                    'fields' => ['host', 'port'],
                     'errorPath' => 'port',
-                    'message'   => 'This port is already in use on that host.',
+                    'message' => 'This port is already in use on that host.',
                 ]));
             }
         }
diff --git a/reference/constraints/Url.rst b/reference/constraints/Url.rst
diff --git a/reference/constraints/UserPassword.rst b/reference/constraints/UserPassword.rst
diff --git a/reference/constraints/Uuid.rst b/reference/constraints/Uuid.rst
diff --git a/reference/constraints/Valid.rst b/reference/constraints/Valid.rst

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ entry in that array:`
`36`	`36`	`* @Assert\Length(min=5)`
`37`	`37`	`* })`
`38`	`38`	`*/`
`39`		`- protected $favoriteColors = [];`
	`39`	`+ protected $favoriteColors = [];`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`.. code-block:: yaml`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,6 @@ will contain a Business Identifier Code (BIC).`
`74`	`74`
`75`	`75`	`class Transaction`
`76`	`76`	`{`
`77`		`- protected $businessIdentifierCode;`
`78`		`-`
`79`	`77`	`public static function loadValidatorMetadata(ClassMetadata $metadata)`
`80`	`78`	`{`
`81`	`79`	`$metadata->addPropertyConstraint('businessIdentifierCode', new Assert\Bic());`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,11 @@ Configuration`
`84`	`84`	`{`
`85`	`85`	`$metadata->addConstraint(new Assert\Callback('validate'));`
`86`	`86`	`}`
	`87`	`+`
	`88`	`+ public function validate(ExecutionContextInterface $context, $payload)`
	`89`	`+ {`
	`90`	`+ // ...`
	`91`	`+ }`
`87`	`92`	`}`
`88`	`93`
`89`	`94`	`The Callback Method`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,6 @@ on an object that will contain a credit card number.`
`81`	`81`
`82`	`82`	`class Transaction`
`83`	`83`	`{`
`84`		`- protected $cardNumber;`
`85`		`-`
`86`	`84`	`public static function loadValidatorMetadata(ClassMetadata $metadata)`
`87`	`85`	`{`
`88`	`86`	`$metadata->addPropertyConstraint('cardNumber', new Assert\CardScheme([`
Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,6 @@ If your valid choice list is simple, you can pass them in directly via the`
`108`	`108`
`109`	`109`	`class Author`
`110`	`110`	`{`
`111`		`- protected $genre;`
`112`		`-`
`113`	`111`	`public static function loadValidatorMetadata(ClassMetadata $metadata)`
`114`	`112`	`{`
`115`	`113`	`$metadata->addPropertyConstraint(`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ Basic Usage`
`29`	`29`	`/**`
`30`	`30`	`* @Assert\Country`
`31`	`31`	`*/`
`32`		`- protected $country;`
	`32`	`+ protected $country;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`.. code-block:: yaml`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ Basic Usage`
`31`	`31`	`* @Assert\Date`
`32`	`32`	`* @var string A "Y-m-d" formatted value`
`33`	`33`	`*/`
`34`		`- protected $birthday;`
	`34`	`+ protected $birthday;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`.. code-block:: yaml`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ Basic Usage`
`32`	`32`	`* @Assert\DateTime`
`33`	`33`	`* @var string A "Y-m-d H:i:s" formatted value`
`34`	`34`	`*/`
`35`		`- protected $createdAt;`
	`35`	`+ protected $createdAt;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`.. code-block:: yaml`