8000 [Validator] fixed Boolean handling in XML constraint mappings by fabpot · Pull Request #8831 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Validator] fixed Boolean handling in XML constraint mappings #8831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2013
Merged

[Validator] fixed Boolean handling in XML constraint mappings #8831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Validator] fixed Boolean handling in XML constraint mappings (closes #… 
…5603)
  • Loading branch information
@fabpot
fabpot committed Aug 23, 2013
commit 33b0a177b53aeac9bb46f309cdc63243cd0bfc13
5 changes: 4 additions & 1 deletion src/Symfony/Component/Validator/Mapping/Loader/XmlFileLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ protected function parseOptions(\SimpleXMLElement $nodes)
$value = array();
}
} else {
$value = trim($node);
$value = XmlUtils::phpize($node);
if (is_string($value)) {
$value = trim($value);
}
}

$options[(string) $node['name']] = $value;
Expand Down
17 changes: 17 additions & 0 deletions src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Symfony\Component\Validator\Constraints\NotNull;
use Symfony\Component\Validator\Constraints\Range;
use Symfony\Component\Validator\Constraints\Choice;
use Symfony\Component\Validator\Constraints\Regex;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\Loader\XmlFileLoader;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
Expand Down Expand Up @@ -68,6 +69,22 @@ public function testLoadClassMetadata()
$this->assertEquals($expected, $metadata);
}

public function testLoadClassMetadataWithNonStrings()
{
$loader = new XmlFileLoader(__DIR__.'/constraint-mapping-non-strings.xml');
$metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');

$loader->loadClassMetadata($metadata);

$expected = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
$expected->addPropertyConstraint('firstName', new Regex(array('pattern' => '/^1/', 'match' => false)));

$properties = $metadata->getPropertyMetadata('firstName');
$constraints = $properties[0]->getConstraints();

$this->assertFalse($constraints[0]->match);
}

public function testLoadGroupSequenceProvider()
{
$loader = new XmlFileLoader(__DIR__.'/constraint-mapping.xml');
Expand Down
19 changes: 19 additions & 0 deletions src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping-non-strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" ?>

<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">

<namespace prefix="custom">Symfony\Component\Validator\Tests\Fixtures\</namespace>

<class name="Symfony\Component\Validator\Tests\Fixtures\Entity">
<property name="firstName">
<!-- Constraint with a Boolean -->
<constraint name="Regex">
<option name="pattern">/^1/</option>
<option name="match">false</option>
</constraint>
</property>
</class>

</constraint-mapping>
2 changes: 1 addition & 1 deletion src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<!-- Constraint with options -->
<constraint name="Choice">
<!-- Option with single value -->
<option name="message">Must be one of %choices%</option>
<option name="message"> Must be one of %choices% </option>
<!-- Option with multiple values -->
<option name="choices">
<value>A</value>
Expand Down
0