10000 bug #25480 [FrameworkBundle] add missing validation options to XSD fi… · symfony/symfony@9ff3776 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9ff3776

Browse files
fabpotfabpot
committed
bug #25480 [FrameworkBundle] add missing validation options to XSD file (xabbuh)
This PR was merged into the 2.7 branch. Discussion ---------- [FrameworkBundle] add missing validation options to XSD file | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no 8000 | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- e7d8e17 add missing validation options to XSD file
2 parents ccc9367 + e7d8e17 commit 9ff3776

File tree

8 files changed

+58
-0
lines changed

8 files changed

+58
-0
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@
204204
<xsd:attribute name="cache" type="xsd:string" />
205205
<xsd:attribute name="enable-annotations" type="xsd:boolean" />
206206
<xsd:attribute name="static-method" type="xsd:boolean" />
207+
<xsd:attribute name="translation-domain" type="xsd:string" />
208+
<xsd:attribute name="strict-email" type="xsd:boolean" />
207209
<xsd:attribute name="api" type="validator_api_version" />
208210
</xsd:complexType>
209211

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_strict_email.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', array(
4+
'validation' => array(
5+
'strict_email' => true,
6+
),
7+
));

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_translation_domain.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', array(
4+
'validation' => array(
5+
'translation_domain' => 'messages',
6+
),
7+
));

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_strict_email.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config>
9+
<framework:validation strict-email="true" />
10+
</framework:config>
11+
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/validation_translation_domain.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config>
9+
<framework:validation translation-domain="messages" />
10+
</framework:config>
11+
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/validation_strict_email.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
framework:
2+
validation:
3+
strict_email: true

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/validation_translation_domain.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
framework:
2+
validation:
3+
translation_domain: messages

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,20 @@ public function testValidationNoStaticMethod()
420420
// no cache, no annotations, no static methods
421421
}
422422

423+
public function testValidationTranslationDomain()
424+
{
425+
$container = $this->createContainerFromFile('validation_translation_domain');
426+
427+
$this->assertSame('messages', $container->getParameter('validator.translation_domain'));
428+
}
429+
430+
public function testValidationStrictEmail()
431+
{
432+
$container = $this->createContainerFromFile('validation_strict_email');
433+
434+
$this->assertTrue($container->getDefinition('validator.email')->getArgument(0));
435+
}
436+
423437
public function testFormsCanBeEnabledWithoutCsrfProtection()
424438
{
425439
$container = $this->createContainerFromFile('form_no_csrf');

0 commit comments

Comments
 (0)
0