8000 Merge branch '3.4' into 4.1 · symfony/symfony-docs@7e836ea · GitHub
[go: up one dir, main page]
Skip to content

Commit 7e836ea

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '3.4' into 4.1
* 3.4: Add missing imports in Data Mappers article fix code style Complete code example for \"Adding validation\" part
2 parents e31b5b2 + 9bb5a53 commit 7e836ea

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

‎form/data_mappers.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,10 @@ method to configure the data mapper::
149149
namespace App\Form\Type;
150150

151151
use App\Form\DataMapper\ColorMapper;
152+
use Symfony\Component\Form\AbstractType;
152153
use Symfony\Component\Form\Extension\Core\Type\IntegerType;
154+
use Symfony\Component\Form\FormBuilderInterface;
155+
use Symfony\Component\OptionsResolver\OptionsResolver;
153156

154157
final class ColorType extends AbstractType
155158
{

‎form/without_class.rst‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,22 @@ but here's a short example::
8282
use Symfony\Component\Validator\Constraints\Length;
8383
use Symfony\Component\Validator\Constraints\NotBlank;
8484
use Symfony\Component\Form\Extension\Core\Type\TextType;
85+
use Symfony\Component\Form\FormBuilderInterface;
8586

86-
$builder
87-
->add('firstName', TextType::class, array(
88-
'constraints' => new Length(array('min' => 3)),
89-
))
90-
->add('lastName', TextType::class, array(
91-
'constraints' => array(
92-
new NotBlank(),
93-
new Length(array('min' => 3)),
94-
),
95-
))
96-
;
87+
public function buildForm(FormBuilderInterface $builder, array $options)
88+
{
89+
$builder
90+
->add('firstName', TextType::class, array(
91+
'constraints' => new Length(array('min' => 3)),
92+
))
93+
->add('lastName', TextType::class, array(
94+
'constraints' => array(
95+
new NotBlank(),
96+
new Length(array('min' => 3)),
97+
),
98+
))
99+
;
100+
}
97101

98102
.. tip::
99103

‎validation/custom_constraint.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The validator class is also simple, and only has one required method ``validate(
6666
public function validate($value, Constraint $constraint)
6767
{
6868
if (!$constraint instanceof ContainsAlphanumeric) {
69-
throw new UnexpectedTypeException($constraint, ContainsAlphanumeric::class);
69+
throw new UnexpectedTypeException($constraint, ContainsAlphanumeric::class);
7070
}
7171
7272
// custom constraints should ignore null and empty values to allow

0 commit comments

Comments
 (0)
0