Merge branch '2.0'

weaverryan · weaverryan · commit 949c69e3cec2 · 2012-04-10T22:20:08.000-05:00
diff --git a/cookbook/validation/custom_constraint.rst b/cookbook/validation/custom_constraint.rst
@@ -61,7 +61,7 @@ Furthering our example, take a look at the ``ProtocolValidator`` as an example:
     {
         public function isValid($value, Constraint $constraint)
         {
-            if (in_array($value, $constraint->protocols));
+            if (in_array($value, $constraint->protocols)) {
                 $this->setMessage($constraint->message, array('%protocols%' => $constraint->protocols));
 
                 return true;

Original file line number	Diff line number	Diff line change
@@ -61,7 +61,7 @@ Furthering our example, take a look at the ``ProtocolValidator`` as an example:
`61`	`61`	`{`
`62`	`62`	`public function isValid($value, Constraint $constraint)`
`63`	`63`	`{`
`64`		`- if (in_array($value, $constraint->protocols));`
	`64`	`+ if (in_array($value, $constraint->protocols)) {`
`65`	`65`	`$this->setMessage($constraint->message, array('%protocols%' => $constraint->protocols));`
`66`	`66`
`67`	`67`	`return true;`