After review fix

wkania · wkania · commit 8c8e1a9682e2 · 2020-12-08T20:00:50.000+01:00
diff --git a/reference/constraints/CardScheme.rst b/reference/constraints/CardScheme.rst
@@ -51,9 +51,9 @@ on an object that will contain a credit card number.
         class Transaction
         {
             #[Assert\CardScheme(
-                schemes: ["VISA"],
-                message: "Your credit card number is invalid."
-             )]
+                schemes: [Assert\CardScheme::VISA],
+                message: 'Your credit card number is invalid.',
+            )]
             protected $cardNumber;
         }
 
diff --git a/reference/constraints/Choice.rst b/reference/constraints/Choice.rst
@@ -69,13 +69,10 @@ If your valid choice list is simple, you can pass them in directly via the
         {
             const GENRES = ['fiction', 'non-fiction'];
 
-            #[Assert\Choice(["New York", "Berlin", "Tokyo"])]
+            #[Assert\Choice(['New York', 'Berlin', 'Tokyo'])]
             protected $city;
 
-            /**
-             * You can also directly provide an array constant to the "choices" option in the annotation
-             */
-            #[Assert\Choice(choices: Conference::GENRES, message: "Choose a valid genre.")]
+            #[Assert\Choice(choices: Author::GENRES, message: 'Choose a valid genre.')]
             protected $genre;
         }
 
@@ -190,7 +187,7 @@ constraint.
 
         class Author
         {
-            #[Assert\Choice(callback: "getGenres")]
+            #[Assert\Choice(callback: 'getGenres')]
             protected $genre;
         }
 
@@ -264,11 +261,12 @@ you can pass the class name and the method as an array.
         // src/Entity/Author.php
         namespace App\Entity;
 
+        use App\Entity\Genre
         use Symfony\Component\Validator\Constraints as Assert;
 
         class Author
         {
-            #[Assert\Choice(callback: ["App\Entity\Genre", "getGenres"])]
+            #[Assert\Choice(callback: [Genre::class, 'getGenres'])]
             protected $genre;
         }
 
diff --git a/reference/constraints/Count.rst b/reference/constraints/Count.rst
@@ -59,8 +59,8 @@ you might add the following:
             #[Assert\Count(
                 min: 1,
                 max: 5,
-                minMessage: "You must specify at least one email",
-                maxMessage: "You cannot specify more than {{ limit }} emails"
+                minMessage: 'You must specify at least one email',
+                maxMessage: 'You cannot specify more than {{ limit }} emails',
             )]
             protected $emails = [];
         }
diff --git a/reference/constraints/DivisibleBy.rst b/reference/constraints/DivisibleBy.rst
@@ -66,7 +66,7 @@ The following constraints ensure that:
             protected $weight;
 
             #[Assert\DivisibleBy(
-                value: 5
+                value: 5,
             )]
             protected $quantity;
         }
diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst
@@ -47,7 +47,7 @@ Basic Usage
         class Author
         {
             #[Assert\Email(
-                message: "The email '{{ value }}' is not a valid email."
+                message: 'The email {{ value }} is not a valid email.',
             )]
             protected $email;
         }
diff --git a/reference/constraints/EqualTo.rst b/reference/constraints/EqualTo.rst
@@ -65,7 +65,7 @@ and that the ``age`` is ``20``, you could do the following:
             protected $firstName;
 
             #[Assert\EqualTo(
-                value: 20
+                value: 20,
             )]
             protected $age;
         }
diff --git a/reference/constraints/Expression.rst b/reference/constraints/Expression.rst
@@ -87,7 +87,7 @@ One way to accomplish this is with the Expression constraint:
 
         #[Assert\Expression(
             "this.getCategory() in ['php', 'symfony'] or !this.isTechnicalPost()",
-            message: "If this is a tech post, the category should be either php or symfony!"
+            message: 'If this is a tech post, the category should be either php or symfony!',
         )]
         class BlogPost
         {
@@ -192,7 +192,7 @@ more about the expression language syntax, see
 
                 #[Assert\Expression(
                     "this.getCategory() in ['php', 'symfony'] or value == false",
-                    message: "If this is a tech post, the category should be either php or symfony!"
+                    message: 'If this is a tech post, the category should be either php or symfony!',
                 )]
                 private $isTechnicalPost;
 
@@ -345,8 +345,8 @@ type (numeric, boolean, strings, null, etc.)
         class Analysis
         {
             #[Assert\Expression(
-                "value + error_margin < threshold",
-                values: ["error_margin" => 0.25, "threshold" => 1.5]
+                'value + error_margin < threshold',
+                values: ['error_margin' => 0.25, 'threshold' => 1.5],
             )]
             private $metric;
 
diff --git a/reference/constraints/ExpressionLanguageSyntax.rst b/reference/constraints/ExpressionLanguageSyntax.rst
@@ -65,7 +65,7 @@ The following constraints ensure that:
             protected $promotion;
 
             #[Assert\ExpressionLanguageSyntax(
-                allowedVariables: ["user", "shipping_centers"]
+                allowedVariables: ['user', 'shipping_centers'],
             )]
             protected $shippingOptions;
         }
diff --git a/reference/constraints/File.rst b/reference/constraints/File.rst
@@ -103,9 +103,9 @@ below a certain file size and a valid PDF, add the following:
         class Author
         {
             #[Assert\File(
-                maxSize: "1024k",
-                mimeTypes: ["application/pdf", "application/x-pdf"],
-                mimeTypesMessage: "Please upload a valid PDF"
+                maxSize: '1024k',
+                mimeTypes: ['application/pdf', 'application/x-pdf'],
+                mimeTypesMessage: 'Please upload a valid PDF',
             )]
             protected $bioFile;
         }
diff --git a/reference/constraints/GreaterThan.rst b/reference/constraints/GreaterThan.rst
@@ -62,7 +62,7 @@ The following constraints ensure that:
             protected $siblings;
 
             #[Assert\GreaterThan(
-                value: 18
+                value: 18,
             )]
             protected $age;
         }
@@ -153,7 +153,7 @@ that a date must at least be the next day:
 
         class Order
         {
-            #[Assert\GreaterThan("today")]
+            #[Assert\GreaterThan('today')]
             protected $deliveryDate;
         }
 
@@ -225,7 +225,7 @@ dates. If you want to fix the timezone, append it to the date string:
 
         class Order
         {
-            #[Assert\GreaterThan("today UTC")]
+            #[Assert\GreaterThan('today UTC')]
             protected $deliveryDate;
         }
 
@@ -298,7 +298,7 @@ current time:
 
         class Order
         {
-            #[Assert\GreaterThan("+5 hours")]
+            #[Assert\GreaterThan('+5 hours')]
             protected $deliveryDate;
         }
 
diff --git a/reference/constraints/GreaterThanOrEqual.rst b/reference/constraints/GreaterThanOrEqual.rst
@@ -61,7 +61,7 @@ The following constraints ensure that:
             protected $siblings;
 
             #[Assert\GreaterThanOrEqual(
-                value: 18
+                value: 18,
             )]
             protected $age;
         }
@@ -152,7 +152,7 @@ that a date must at least be the current day:
 
         class Order
         {
-            #[Assert\GreaterThanOrEqual("today")]
+            #[Assert\GreaterThanOrEqual('today')]
             protected $deliveryDate;
         }
 
@@ -224,7 +224,7 @@ dates. If you want to fix the timezone, append it to the date string:
 
         class Order
         {
-            #[Assert\GreaterThanOrEqual("today UTC")]
+            #[Assert\GreaterThanOrEqual('today UTC')]
             protected $deliveryDate;
         }
 
@@ -297,7 +297,7 @@ current time:
 
         class Order
         {
-            #[Assert\GreaterThanOrEqual("+5 hours")]
+            #[Assert\GreaterThanOrEqual('+5 hours')]
             protected $deliveryDate;
         }
 
diff --git a/reference/constraints/Hostname.rst b/reference/constraints/Hostname.rst
@@ -51,7 +51,7 @@ will contain a host name.
 
         class ServerSettings
         {
-            #[Assert\Hostname(message: "The server name must be a valid hostname.")]
+            #[Assert\Hostname(message: 'The server name must be a valid hostname.')]
             protected $name;
         }
 
diff --git a/reference/constraints/Iban.rst b/reference/constraints/Iban.rst
@@ -50,7 +50,7 @@ will contain an International Bank Account Number.
         class Transaction
         {
             #[Assert\Iban(
-                message: "This is not a valid International Bank Account Number (IBAN)."
+                message: 'This is not a valid International Bank Account Number (IBAN).',
             )]
             protected $bankAccountNumber;
         }
diff --git a/reference/constraints/IdenticalTo.rst b/reference/constraints/IdenticalTo.rst
@@ -67,7 +67,7 @@ The following constraints ensure that:
             protected $firstName;
 
             #[Assert\IdenticalTo(
-                value: 20
+                value: 20,
             )]
             protected $age;
         }
diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst
@@ -113,7 +113,7 @@ that it is between a certain size, add the following:
                 minWidth: 200,
                 maxWidth: 400,
                 minHeight: 200,
-                maxHeight: 400
+                maxHeight: 400,
             )]
             protected $headshot;
         }
@@ -209,7 +209,7 @@ following code:
         {
             #[Assert\Image(
                 allowLandscape: false,
-                allowPortrait: false
+                allowPortrait: false,
             )]
             protected $headshot;
         }
diff --git a/reference/constraints/IsTrue.rst b/reference/constraints/IsTrue.rst
@@ -71,7 +71,7 @@ Then you can validate this method with ``IsTrue`` as follows:
         {
             protected $token;
 
-            #[Assert\IsTrue(message: "The token is invalid.")]
+            #[Assert\IsTrue(message: 'The token is invalid.')]
             public function isTokenValid()
             {
                 return $this->token == $this->generateToken();
diff --git a/reference/constraints/Isbn.rst b/reference/constraints/Isbn.rst
@@ -53,8 +53,8 @@ on an object that will contain an ISBN.
         class Book
         {
             #[Assert\Isbn(
-                type: "isbn10",
-                message : "This value is not valid."
+                type: Assert\Isbn::ISBN_10,
+                message : 'This value is not valid.',
             )]
             protected $isbn;
         }
diff --git a/reference/constraints/Length.rst b/reference/constraints/Length.rst
@@ -60,8 +60,8 @@ and "50", you might add the following:
             #[Assert\Length(
                 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"
+                minMessage: 'Your first name must be at least {{ limit }} characters long',
+                maxMessage: 'Your first name cannot be longer than {{ limit }} characters',
             )]
             protected $firstName;
         }
diff --git a/reference/constraints/LessThan.rst b/reference/constraints/LessThan.rst
@@ -62,7 +62,7 @@ The following constraints ensure that:
             protected $siblings;
 
             #[Assert\LessThan(
-                value: 80
+                value: 80,
             )]
             protected $age;
         }
@@ -153,7 +153,7 @@ that a date must be in the past like this:
 
         class Person
         {
-            #[Assert\LessThan("today")]
+            #[Assert\LessThan('today')]
             protected $dateOfBirth;
         }
 
@@ -225,7 +225,7 @@ dates. If you want to fix the timezone, append it to the date string:
 
         class Person
         {
-            #[Assert\LessThan("today UTC")]
+            #[Assert\LessThan('today UTC')]
             protected $dateOfBirth;
         }
 
@@ -297,7 +297,7 @@ can check that a person must be at least 18 years old like this:
 
         class Person
         {
-            #[Assert\LessThan("-18 years")]
+            #[Assert\LessThan('-18 years')]
             protected $dateOfBirth;
         }
 
diff --git a/reference/constraints/LessThanOrEqual.rst b/reference/constraints/LessThanOrEqual.rst
@@ -60,8 +60,8 @@ The following constraints ensure that:
             #[Assert\LessThanOrEqual(5)]
             protected $siblings;
 
-            #[Assert\IsTrue(
-                value: 80
+            #[Assert\LessThanOrEqual(
+                value: 80,
             )]
             protected $age;
         }
@@ -152,7 +152,7 @@ that a date must be today or in the past like this:
 
         class Person
         {
-            #[Assert\LessThanOrEqual("today")]
+            #[Assert\LessThanOrEqual('today')]
             protected $dateOfBirth;
         }
 
@@ -224,7 +224,7 @@ dates. If you want to fix the timezone, append it to the date string:
 
         class Person
         {
-            #[Assert\LessThanOrEqual("today UTC")]
+            #[Assert\LessThanOrEqual('today UTC')]
             protected $dateOfBirth;
         }
 
@@ -296,7 +296,7 @@ can check that a person must be at least 18 years old like this:
 
         class Person
         {
-            #[Assert\LessThanOrEqual("-18 years")]
+            #[Assert\LessThanOrEqual('-18 years')]
             protected $dateOfBirth;
         }
 
diff --git a/reference/constraints/Locale.rst b/reference/constraints/Locale.rst
@@ -53,7 +53,7 @@ Basic Usage
         class User
         {
             #[Assert\Locale(
-                canonicalize: true
+                canonicalize: true,
             )]
             protected $locale;
         }
diff --git a/reference/constraints/Luhn.rst b/reference/constraints/Luhn.rst
@@ -46,7 +46,7 @@ will contain a credit card number.
 
         class Transaction
         {
-            #[Assert\Luhn(message: "Please check your credit card number.")]
+            #[Assert\Luhn(message: 'Please check your credit card number.')]
             protected $cardNumber;
         }
 
diff --git a/reference/constraints/NotEqualTo.rst b/reference/constraints/NotEqualTo.rst
@@ -62,11 +62,11 @@ the following:
 
         class Person
         {
-            #[Assert\NotEqualTo("Mary")]
+            #[Assert\NotEqualTo('Mary')]
             protected $firstName;
 
             #[Assert\NotEqualTo(
-                value: 15
+                value: 15,
             )]
             protected $age;
         }
diff --git a/reference/constraints/NotIdenticalTo.rst b/reference/constraints/NotIdenticalTo.rst
diff --git a/reference/constraints/Range.rst b/reference/constraints/Range.rst
diff --git a/reference/constraints/Regex.rst b/reference/constraints/Regex.rst
diff --git a/reference/constraints/Type.rst b/reference/constraints/Type.rst
diff --git a/reference/constraints/UniqueEntity.rst b/reference/constraints/UniqueEntity.rst
diff --git a/reference/constraints/Url.rst b/reference/constraints/Url.rst

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@ on an object that will contain a credit card number.`
`51`	`51`	`class Transaction`
`52`	`52`	`{`
`53`	`53`	`#[Assert\CardScheme(`
`54`		`- schemes: ["VISA"],`
`55`		`- message: "Your credit card number is invalid."`
`56`		`- )]`
	`54`	`+ schemes: [Assert\CardScheme::VISA],`
	`55`	`+ message: 'Your credit card number is invalid.',`
	`56`	`+ )]`
`57`	`57`	`protected $cardNumber;`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -69,13 +69,10 @@ If your valid choice list is simple, you can pass them in directly via the`
`69`	`69`	`{`
`70`	`70`	`const GENRES = ['fiction', 'non-fiction'];`
`71`	`71`
`72`		`- #[Assert\Choice(["New York", "Berlin", "Tokyo"])]`
	`72`	`+ #[Assert\Choice(['New York', 'Berlin', 'Tokyo'])]`
`73`	`73`	`protected $city;`
`74`	`74`
`75`		`- /**`
`76`		`- * You can also directly provide an array constant to the "choices" option in the annotation`
`77`		`- */`
`78`		`- #[Assert\Choice(choices: Conference::GENRES, message: "Choose a valid genre.")]`
	`75`	`+ #[Assert\Choice(choices: Author::GENRES, message: 'Choose a valid genre.')]`
`79`	`76`	`protected $genre;`
`80`	`77`	`}`
`81`	`78`
`@@ -190,7 +187,7 @@ constraint.`
`190`	`187`
`191`	`188`	`class Author`
`192`	`189`	`{`
`193`		`- #[Assert\Choice(callback: "getGenres")]`
	`190`	`+ #[Assert\Choice(callback: 'getGenres')]`
`194`	`191`	`protected $genre;`
`195`	`192`	`}`
`196`	`193`
`@@ -264,11 +261,12 @@ you can pass the class name and the method as an array.`
`264`	`261`	`// src/Entity/Author.php`
`265`	`262`	`namespace App\Entity;`
`266`	`263`
	`264`	`+ use App\Entity\Genre`
`267`	`265`	`use Symfony\Component\Validator\Constraints as Assert;`
`268`	`266`
`269`	`267`	`class Author`
`270`	`268`	`{`
`271`		`- #[Assert\Choice(callback: ["App\Entity\Genre", "getGenres"])]`
	`269`	`+ #[Assert\Choice(callback: [Genre::class, 'getGenres'])]`
`272`	`270`	`protected $genre;`
`273`	`271`	`}`
`274`	`272`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ The following constraints ensure that:`
`66`	`66`	`protected $weight;`
`67`	`67`
`68`	`68`	`#[Assert\DivisibleBy(`
`69`		`- value: 5`
	`69`	`+ value: 5,`
`70`	`70`	`)]`
`71`	`71`	`protected $quantity;`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ Basic Usage`
`47`	`47`	`class Author`
`48`	`48`	`{`
`49`	`49`	`#[Assert\Email(`
`50`		`- message: "The email '{{ value }}' is not a valid email."`
	`50`	`+ message: 'The email {{ value }} is not a valid email.',`
`51`	`51`	`)]`
`52`	`52`	`protected $email;`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
@@ -65,7 +65,7 @@ and that the ``age`` is ``20``, you could do the following:
`65`	`65`	`protected $firstName;`
`66`	`66`
`67`	`67`	`#[Assert\EqualTo(`
`68`		`- value: 20`
	`68`	`+ value: 20,`
`69`	`69`	`)]`
`70`	`70`	`protected $age;`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ The following constraints ensure that:`
`65`	`65`	`protected $promotion;`
`66`	`66`
`67`	`67`	`#[Assert\ExpressionLanguageSyntax(`
`68`		`- allowedVariables: ["user", "shipping_centers"]`
	`68`	`+ allowedVariables: ['user', 'shipping_centers'],`
`69`	`69`	`)]`
`70`	`70`	`protected $shippingOptions;`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,9 @@ below a certain file size and a valid PDF, add the following:`
`103`	`103`	`class Author`
`104`	`104`	`{`
`105`	`105`	`#[Assert\File(`
`106`		`- maxSize: "1024k",`
`107`		`- mimeTypes: ["application/pdf", "application/x-pdf"],`
`108`		`- mimeTypesMessage: "Please upload a valid PDF"`
	`106`	`+ maxSize: '1024k',`
	`107`	`+ mimeTypes: ['application/pdf', 'application/x-pdf'],`
	`108`	`+ mimeTypesMessage: 'Please upload a valid PDF',`
`109`	`109`	`)]`
`110`	`110`	`protected $bioFile;`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ The following constraints ensure that:`
`62`	`62`	`protected $siblings;`
`63`	`63`
`64`	`64`	`#[Assert\GreaterThan(`
`65`		`- value: 18`
	`65`	`+ value: 18,`
`66`	`66`	`)]`
`67`	`67`	`protected $age;`
`68`	`68`	`}`
`@@ -153,7 +153,7 @@ that a date must at least be the next day:`
`153`	`153`
`154`	`154`	`class Order`
`155`	`155`	`{`
`156`		`- #[Assert\GreaterThan("today")]`
	`156`	`+ #[Assert\GreaterThan('today')]`
`157`	`157`	`protected $deliveryDate;`
`158`	`158`	`}`
`159`	`159`
`@@ -225,7 +225,7 @@ dates. If you want to fix the timezone, append it to the date string:`
`225`	`225`
`226`	`226`	`class Order`
`227`	`227`	`{`
`228`		`- #[Assert\GreaterThan("today UTC")]`
	`228`	`+ #[Assert\GreaterThan('today UTC')]`
`229`	`229`	`protected $deliveryDate;`
`230`	`230`	`}`
`231`	`231`
`@@ -298,7 +298,7 @@ current time:`
`298`	`298`
`299`	`299`	`class Order`
`300`	`300`	`{`
`301`		`- #[Assert\GreaterThan("+5 hours")]`
	`301`	`+ #[Assert\GreaterThan('+5 hours')]`
`302`	`302`	`protected $deliveryDate;`
`303`	`303`	`}`
`304`	`304`