Skip to content

Commit b00a9ba

Browse files
committed
merge branch '2.1' into 2.2
* 2.1: fixed doc references (closes #7515) small changes [SecurityBundle] Fixed configuration exemple idAsIndex should be true with a smallint or bigint id field. Fixed long multibyte parameter logging in DbalLogger:startQuery Keep the file extension in the temporary copy and test that it exists (closes #7482) [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation Conflicts: src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
2 parents 281be82 + 35abbb1 commit b00a9ba

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ https://github.com/fabpot/Silex/blob/master/src/Silex/Provider/FormServiceProvid
1414

1515
Documentation:
1616

17-
http://symfony.com/doc/2.0/book/forms.html
17+
http://symfony.com/doc/2.1/book/forms.html
1818

1919
Resources
2020
---------

Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,6 @@ public function testReverseTransformWithNonExistingDate()
117117
{
118118
$transformer = new DateTimeToRfc3339Transformer('UTC', 'UTC');
119119

120-
var_dump($transformer->reverseTransform('2010-04-31T04:05Z'));
120+
$transformer->reverseTransform('2010-04-31T04:05Z');
121121
}
122122
}

0 commit comments

Comments
 (0)