Commit85a6d22

committed

Merge remote-tracking branch 'origin/2.2' into 2.2

2 parents0dd8dd7 +50e14fb commit85a6d22Copy full SHA for 85a6d22

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ on an object that will contain a credit card number.`
`35`	`35`	`cardNumber:`
`36`	`36`	`-CardScheme:`
`37`	`37`	`schemes:[VISA]`
`38`		`-message:You credit card number is invalid.`
	`38`	`+message:Your credit card number is invalid.`
`39`	`39`
`40`	`40`	`..code-block::xml`
`41`	`41`
`@@ -46,7 +46,7 @@ on an object that will contain a credit card number.`
`46`	`46`	`<optionname="schemes">`
`47`	`47`	`<value>VISA</value>`
`48`	`48`	`</option>`
`49`		`- <optionname="message">You credit card number is invalid.</option>`
	`49`	`+ <optionname="message">Your credit card number is invalid.</option>`
`50`	`50`	`</constraint>`
`51`	`51`	`</property>`
`52`	`52`	`</class>`
`@@ -61,7 +61,7 @@ on an object that will contain a credit card number.`
`61`	`61`	`class Transaction`
`62`	`62`	`{`
`63`	`63`	`/**`
`64`		`- * @Assert\CardScheme(schemes = {"VISA"}, message = "You credit card number is invalid.")`
	`64`	`+ * @Assert\CardScheme(schemes = {"VISA"}, message = "Your credit card number is invalid.")`
`65`	`65`	`*/`
`66`	`66`	`protected $cardNumber;`
`67`	`67`	`}`
`@@ -84,7 +84,7 @@ on an object that will contain a credit card number.`
`84`	`84`	`'schemes' => array(`
`85`	`85`	`'VISA'`
`86`	`86`	`),`
`87`		`- 'message' => 'You credit card number is invalid.',`
	`87`	`+ 'message' => 'Your credit card number is invalid.',`
`88`	`88`	`)));`
`89`	`89`	`}`
`90`	`90`	`}`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ UserPassword`
`6`	`6`
`7`	`7`	`..note::`
`8`	`8`
`9`		- Since Symfony 2.2, the `UserPassword*` classes in the
`10`		- `Symfony\Component\Security\Core\Validator\Constraint` namespace are
	`9`	+ Since Symfony 2.2, the ``UserPassword*`` classes in the
	`10`	+ ``Symfony\\Component\\Security\\Core\\Validator\\Constraint`` namespace are
`11`	`11`	`deprecated and will be removed in Symfony 2.3. Please use the`
`12`		- `UserPassword*` classes in the
`13`		- `Symfony\Component\Security\Core\Validator\Constraints` namespace instead.
	`12`	+ ``UserPassword*`` classes in the
	`13`	+ ``Symfony\\Component\\Security\\Core\\Validator\\Constraints`` namespace instead.
`14`	`14`
`15`	`15`	`This validates that an input value is equal to the current authenticated`
`16`	`16`	`user's password. This is useful in a form where a user can change his password,`

Comments

(0)