Skip to content

Commit 52d3520

Browse files
committed
Merge branch '4.4' into 5.1
2 parents 5b3901b + cd7bb61 commit 52d3520

File tree

5 files changed

+34
-16
lines changed

5 files changed

+34
-16
lines changed

Resources/translations/validators.da.xlf

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
</trans-unit>
125125
<trans-unit id="34">
126126
<source>The file could not be uploaded.</source>
127-
<target>Filen kunne ikke blive uploadet.</target>
127+
<target>Filen kunne ikke uploades.</target>
128128
</trans-unit>
129129
<trans-unit id="35">
130130
<source>This value should be a valid number.</source>
@@ -324,7 +324,7 @@
324324
</trans-unit>
325325
<trans-unit id="84">
326326
<source>This value should be a multiple of {{ compared_value }}.</source>
327-
<target>Denne værdi skal være et flertal af {{ compared_value }}.</target>
327+
<target>Denne værdi skal være et multiplikation af {{ compared_value }}.</target>
328328
</trans-unit>
329329
<trans-unit id="85">
330330
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
@@ -366,6 +366,26 @@
366366
<source>This value should be between {{ min }} and {{ max }}.</source>
367367
<target>Værdien skal være mellem {{ min }} og {{ max }}.</target>
368368
</trans-unit>
369+
<trans-unit id="95">
370+
<source>This value is not a valid hostname.</source>
371+
<target>Værdien er ikke et gyldigt værtsnavn.</target>
372+
</trans-unit>
373+
<trans-unit id="96">
374+
<source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source>
375+
<target>Antallet af elementer i denne samling skal være en multiplikation af {{ compared_value }}.</target>
376+
</trans-unit>
377+
<trans-unit id="97">
378+
<source>This value should satisfy at least one of the following constraints:</source>
379+
<target>Værdien skal overholde mindst én af følgende krav::</target>
380+
</trans-unit>
381+
<trans-unit id="98">
382+
<source>Each element of this collection should satisfy its own set of constraints.</source>
383+
<target>Hvert element i denne samling skal overholde dens egne krav.</target>
384+
</trans-unit>
385+
<trans-unit id="99">
386+
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387+
<target>Værdien er ikke et gyldig International Securities Identification Number (ISIN).</target>
388+
</trans-unit>
369389
</body>
370390
</file>
371391
</xliff>

Tests/Mapping/ClassMetadataTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424

2525
class ClassMetadataTest extends TestCase
2626
{
27-
const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
28-
const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
29-
const PROVIDERCLASS = 'Symfony\Component\Validator\Tests\Fixtures\GroupSequenceProviderEntity';
30-
const PROVIDERCHILDCLASS = 'Symfony\Component\Validator\Tests\Fixtures\GroupSequenceProviderChildEntity';
27+
private const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
28+
private const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
29+
private const PROVIDERCLASS = 'Symfony\Component\Validator\Tests\Fixtures\GroupSequenceProviderEntity';
30+
private const PROVIDERCHILDCLASS = 'Symfony\Component\Validator\Tests\Fixtures\GroupSequenceProviderChildEntity';
3131

3232
protected $metadata;
3333

Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@
2525

2626
class LazyLoadingMetadataFactoryTest extends TestCase
2727
{
28-
const CLASS_NAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
29-
const PARENT_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
30-
const INTERFACE_A_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityInterfaceA';
31-
const INTERFACE_B_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityInterfaceB';
32-
const PARENT_INTERFACE_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParentInterface';
28+
private const CLASS_NAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
29+
private const PARENT_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
30+
private const INTERFACE_A_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityInterfaceA';
3331

3432
public function testLoadClassMetadataWithInterface()
3533
{

Tests/Mapping/GetterMetadataTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class GetterMetadataTest extends TestCase
1919
{
20-
const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
20+
private const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
2121

2222
public function testInvalidPropertyName()
2323
{

Tests/Mapping/PropertyMetadataTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
class PropertyMetadataTest extends TestCase
2121
{
22-
const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
23-
const CLASSNAME_74 = 'Symfony\Component\Validator\Tests\Fixtures\Entity_74';
24-
const CLASSNAME_74_PROXY = 'Symfony\Component\Validator\Tests\Fixtures\Entity_74_Proxy';
25-
const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
22+
private const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
23+
private const CLASSNAME_74 = 'Symfony\Component\Validator\Tests\Fixtures\Entity_74';
24+
private const CLASSNAME_74_PROXY = 'Symfony\Component\Validator\Tests\Fixtures\Entity_74_Proxy';
25+
private const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
2626

2727
public function testInvalidPropertyName()
2828
{

0 commit comments

Comments
 (0)