Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit 87737b130810 · 2018-09-10T18:02:45.000+02:00
* 3.4: [Serializer] Allow to specify a single value in @groups [Validator] fix condition in if statement PhpUnitBridge: Fix typo in note
diff --git a/components/phpunit_bridge.rst b/components/phpunit_bridge.rst
@@ -152,7 +152,7 @@ There are three ways to mark a test as legacy:
 .. note::
 
     If your data provider calls code that would usually trigger a deprecation,
-    you can prefix its name with ``provideLegacy`` or ``getLegacy`` to silent
+    you can prefix its name with ``provideLegacy`` or ``getLegacy`` to silence
     these deprecations. If your data provider does not execute deprecated
     code, it is not required to choose a special naming just because the
     test being fed by the data provider is marked as legacy.
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -286,7 +286,7 @@ Then, create your groups definition:
             public $foo;
 
             /**
-             * @Groups({"group3"})
+             * @Groups("group3")
              */
             public function getBar() // is* methods are also supported
             {
diff --git a/components/validator.rst b/components/validator.rst
@@ -60,7 +60,7 @@ If you have lots of validation errors, you can filter them by error code::
     use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 
     $violations = $validator->validate(...);
-    if (count($violations->findByCodes(UniqueEntity::NOT_UNIQUE_ERROR))) {
+    if (0 !== count($violations->findByCodes(UniqueEntity::NOT_UNIQUE_ERROR))) {
         // handle this specific error (display some message, send an email, etc.)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ Then, create your groups definition:`
`286`	`286`	`public $foo;`
`287`	`287`
`288`	`288`	`/**`
`289`		`- * @Groups({"group3"})`
	`289`	`+ * @Groups("group3")`
`290`	`290`	`*/`
`291`	`291`	`public function getBar() // is* methods are also supported`
`292`	`292`	`{`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ If you have lots of validation errors, you can filter them by error code::`
`60`	`60`	`use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;`
`61`	`61`
`62`	`62`	`$violations = $validator->validate(...);`
`63`		`- if (count($violations->findByCodes(UniqueEntity::NOT_UNIQUE_ERROR))) {`
	`63`	`+ if (0 !== count($violations->findByCodes(UniqueEntity::NOT_UNIQUE_ERROR))) {`
`64`	`64`	`// handle this specific error (display some message, send an email, etc.)`
`65`	`65`	`}`
`66`	`66`