Commit87737b1

committed

Merge branch '3.4' into 4.1

* 3.4: [Serializer] Allow to specify a single value in@groups [Validator] fix condition in if statement PhpUnitBridge: Fix typo in note

2 parentsdc44144 +d19266a commit87737b1Copy full SHA for 87737b1

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ There are three ways to mark a test as legacy:`
`152`	`152`	`..note::`
`153`	`153`
`154`	`154`	`If your data provider calls code that would usually trigger a deprecation,`
`155`		- you can prefix its name with ``provideLegacy`` or ``getLegacy`` tosilent
	`155`	+ you can prefix its name with ``provideLegacy`` or ``getLegacy`` tosilence
`156`	`156`	`these deprecations. If your data provider does not execute deprecated`
`157`	`157`	`code, it is not required to choose a special naming just because the`
`158`	`158`	`test being fed by the data provider is marked as legacy.`

Lines changed: 1 addition & 1 deletion

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`	`{`

Lines changed: 1 addition & 1 deletion

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`

Comments

(0)