Skip to content

Commit 66f997c

Browse files
Merge branch '2.8' into 3.3
* 2.8: (22 commits) Tests and fix for issue in array model data in EntityType field with multiple=true [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible removed useless PHPDoc [Form] Fix FormInterface::submit() annotation PdoSessionHandler: fix advisory lock for pgsql when session.sid_bits_per_character > 4 HttpCache does not consider ESI resources in HEAD requests Fix translation for "This field was not expected" [Routing] Enhance Route(Collection) docblocks Added improvement for accuracy in MoneyToLocalizedStringTransformer. Removed unused private property Use correct verb form in the pull request template Use PHP_MAXPATHLEN in Filesystem. Added null as explicit return type (?TokenInterface) [FrameworkBundle] Fix Routing\DelegatingLoader Render all line breaks according to the exception message [Form] Fix phpdoc [DI] remove confusing code [Form] Fixed GroupSequence with "constraints" option [Validator] Clarify UUID validator behavior [Filesystem] Fixed makePathRelative ...
2 parents 1d835bf + 1531ddf commit 66f997c

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Constraints/UuidValidator.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,19 @@
1616
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
1717

1818
/**
19-
* Validates whether the value is a valid UUID per RFC 4122.
19+
* Validates whether the value is a valid UUID (also known as GUID).
20+
*
21+
* Strict validation will allow a UUID as specified per RFC 4122.
22+
* Loose validation will allow any type of UUID.
23+
*
24+
* For better compatibility, both loose and strict, you should consider using a specialized UUID library like "ramsey/uuid" instead.
2025
*
2126
* @author Colin O'Dell <colinodell@gmail.com>
2227
* @author Bernhard Schussek <bschussek@gmail.com>
2328
*
2429
* @see http://tools.ietf.org/html/rfc4122
2530
* @see https://en.wikipedia.org/wiki/Universally_unique_identifier
31+
* @see https://github.com/ramsey/uuid
2632
*/
2733
class UuidValidator extends ConstraintValidator
2834
{

Mapping/GetterMetadata.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
class GetterMetadata extends MemberMetadata
3434
{
3535
/**
36-
* Constructor.
37-
*
3836
* @param string $class The class the getter is defined on
3937
* @param string $property The property which the getter returns
4038
* @param string|null $method The method that is called to retrieve the value being validated (null for auto-detection)

Mapping/MemberMetadata.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ abstract class MemberMetadata extends GenericMetadata implements PropertyMetadat
6161
private $reflMember = array();
6262

6363
/**
64-
* Constructor.
65-
*
6664
* @param string $class The name of the class this member is defined on
6765
* @param string $name The name of the member
6866
* @param string $property The property the member belongs to

Mapping/PropertyMetadata.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
class PropertyMetadata extends MemberMetadata
3030
{
3131
/**
32-
* Constructor.
33-
*
3432
* @param string $class The class this property is defined on
3533
* @param string $name The name of this property
3634
*

Resources/translations/validators.cs.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</trans-unit>
3737
<trans-unit id="9">
3838
<source>This field was not expected.</source>
39-
<target>Toto pole nebyla očekávána.</target>
39+
<target>Toto pole nebylo očekáváno.</target>
4040
</trans-unit>
4141
<trans-unit id="10">
4242
<source>This field is missing.</source>

0 commit comments

Comments
 (0)