8000 Merge branch '5.1' into 5.x · symfony/symfony@8bac7a0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8bac7a0

Browse files
derrabusderrabus
committed
Merge branch '5.1' into 5.x
2 parents 050f3e4 + fd4cdba commit 8bac7a0

File tree

33 files changed

+209
-73
lines changed

33 files changed

+209
-73
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class EntityTypePerformanceTest extends FormPerformanceTestCase
2626
{
27-
const ENTITY_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity';
27+
private const ENTITY_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity';
2828

2929
/**
3030
* @var \Doctrine\ORM\EntityManager

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ class EntityTypeTest extends BaseTypeTest
3939
{
4040
const TESTED_TYPE = 'Symfony\Bridge\Doctrine\Form\Type\EntityType';
4141

42-
const ITEM_GROUP_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\GroupableEntity';
43-
const SINGLE_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity';
44-
const SINGLE_IDENT_NO_TO_STRING_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity';
45-
const SINGLE_STRING_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity';
46-
const SINGLE_ASSOC_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleAssociationToIntIdEntity';
47-
const SINGLE_STRING_CASTABLE_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringCastableIdEntity';
48-
const COMPOSITE_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity';
49-
const COMPOSITE_STRING_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeStringIdEntity';
42+
private const ITEM_GROUP_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\GroupableEntity';
43+
private const SINGLE_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity';
44+
private const SINGLE_IDENT_NO_TO_STRING_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity';
45+
private const SINGLE_STRING_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity';
46+
private const SINGLE_ASSOC_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleAssociationToIntIdEntity';
47+
private const SINGLE_STRING_CASTABLE_IDENT_CL 10000 ASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringCastableIdEntity';
48+
private const COMPOSITE_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity';
49+
private const COMPOSITE_STRING_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeStringIdEntity';
5050

5151
/**
5252
* @var EntityManager

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class DoctrineFooType extends Type
2323
/**
2424
* Type name.
2525
*/
26-
const NAME = 'foo';
26+
private const NAME = 'foo';
2727

2828
/**
2929
* {@inheritdoc}

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*/
4141
class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
4242
{
43-
const EM_NAME = 'foo';
43+
private const EM_NAME = 'foo';
4444

4545
/**
4646
* @var ObjectManager

‎src/Symfony/Bundle/SecurityBundle/Tests/Security/FirewallMapTest.php

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

2424
class FirewallMapTest extends TestCase
2525
{
26-
const ATTRIBUTE_FIREWALL_CONTEXT = '_firewall_context';
26+
private const ATTRIBUTE_FIREWALL_CONTEXT = '_firewall_context';
2727

2828
public function testGetListenersWithEmptyMap()
2929
{

‎src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
class EventDispatcherTest extends TestCase
2020
{
2121
/* Some pseudo events */
22-
const preFoo = 'pre.foo';
23-
const postFoo = 'post.foo';
24-
const preBar = 'pre.bar';
25-
const postBar = 'post.bar';
22+
private const preFoo = 'pre.foo';
23+
private const postFoo = 'post.foo';
24+
private const preBar = 'pre.bar';
2625

2726
/**
2827
* @var EventDispatcher

‎src/Symfony/Component/Form/Resources/translations/validators.da.xlf

Lines changed: 121 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,127 @@
1212
</trans-unit>
1313
<trans-unit id="30">
1414
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
15-
<target>CSRF-token er ugyldig.</target>
15+
<target>CSRF-token er ugyldig. Prøv venligst at genindsende.</target>
16+
</trans-unit>
17+
<trans-unit id="99">
18+
<source>This value is not a valid HTML5 color.</source>
19+
<target>Værdien er ikke en gyldig HTML5 farve.</target>
20+
</trans-unit>
21+
<trans-unit id="100">
22+
<source>Please enter a valid birthdate.</source>
23+
<target>Indtast venligst en gyldig fødselsdato.</target>
24+
</trans-unit>
25+
<trans-unit id="101">
26+
<source>The selected choice is invalid.</source>
27+
<target>Den valgte mulighed er ugyldig .</target>
28+
</trans-unit>
29+
<trans-unit id="102">
30+
<source>The collection is invalid.</source>
31+
<target>Samlingen er ugyldig.</target>
32+
</trans-unit>
33+
<trans-unit id="103">
34+
<source>Please select a valid color.</source>
35+
<target>Vælg venligst en gyldig farve.</target>
36+
</trans-unit>
37+
<trans-unit id="104">
38+
<source>Please select a valid country.</source>
39+
<target>Vælg venligst et gyldigt land.</target>
40+
</trans-unit>
41+
<trans-unit id="105">
42+
<source>Please select a valid currency.</source>
43+
<target>Vælg venligst en gyldig valuta.</target>
44+
</trans-unit>
45+
<trans-unit id="106">
46+
<source>Please choose a valid date interval.</source>
47+
<target>Vælg venligst et gyldigt datointerval.</target>
48+
</trans-unit>
49+
<trans-unit id="107">
50+
<source>Please enter a valid date and time.</source>
51+
<target>Vælg venligst en gyldig dato og tid.</target>
52+
</trans-unit>
53+
<trans-unit id="108">
54+
<source>Please enter a valid date.</source>
55+
<target>Vælg venligst en gyldig dato.</target>
56+
</trans-unit>
57+
<trans-unit id="109">
58+
<source>Please select a valid file.</source>
59+
<target>Vælg venligst en gyldig fil.</target>
60+
</trans-unit>
61+
<trans-unit id="110">
62+
<source>The hidden field is invalid.</source>
63+
<target>Det skjulte felt er ugyldigt.</target>
64+
</trans-unit>
65+
<trans-unit id="111">
66+
<source>Please enter an integer.</source>
67+
<target>Indsæt veligst et heltal.</target>
68+
</trans-unit>
69+
<trans-unit id="112">
70+
<source>Please select a valid language.</source>
71+
<target>Vælg venligst et gyldigt sprog.</target>
72+
</trans-unit>
73+
<trans-unit id="113">
74+
<source>Please select a valid locale.</source>
75+
<target>Vælg venligst en gyldigt sprogkode.</target>
76+
</trans-unit>
77+
<trans-unit id="114">
78+
<source>Please enter a valid money amount.</source>
79+
<target>Vælg venligst et gyldigt beløb.</target>
80+
</trans-unit>
81+
<trans-unit id="115">
82+
<source>Please enter a number.</source>
83+
<target>Indtast venligst et nummer.</target>
84+
</trans-unit>
85+
<trans-unit id="116">
86+
<source>The password is invalid.</source>
87+
<target>Passwordet er ugyldigt.</target>
88+
</trans-unit>
89+
<trans-unit id="117">
90+
<source>Please enter a percentage value.</source>
91+
<target>Indtast venligst en procentværdi.</target>
92+
</trans-unit>
93+
<trans-unit id="118">
94+
<source>The values do not match.</source>
95+
<target>Værdierne er ikke ens.</target>
96+
</trans-unit>
97+
<trans-unit id="119">
98+
<source>Please enter a valid time.</source>
99+
<target>Indtast venligst en gyldig tid.</target>
100+
</trans-unit>
101+
<trans-unit id="120">
102+
<source>Please select a valid timezone.</source>
103+
<target>Vælg venligst en gyldig tidszone.</target>
104+
</trans-unit>
105+
<trans-unit id="121">
106+
<source>Please enter a valid URL.</source>
107+
<target>Indtast venligst en gyldig URL.</target>
108+
</trans-unit>
109+
<trans-unit id="122">
110+
<source>Please enter a valid search term.</source>
111+
<target>Indtast venligst et gyldigt søgeord.</target>
112+
</trans-unit>
113+
<trans-unit id="123">
114+
<source>Please provide a valid phone number.</source>
115+
<target>Giv venligst et gyldigt telefonnummer.</target>
116+
</trans-unit>
117+
<trans-unit id="124">
118+
<source>The checkbox has an invalid value.</source>
119+
<target>Checkboxen har en ugyldigt værdi.</target>
120+
</trans-unit>
121+
<trans-unit id="125">
122+
<source>Please enter a valid email address.</source>
123+
<target>Indtast venligst en gyldig emailaddresse.</target>
124+
</trans-unit>
125+
<trans-unit id="126">
126+
<source>Please select a valid option.</source>
127+
<target>Vælg venligst en gyldig mulighed.</target>
128+
</trans-unit>
129+
<trans-unit id="127">
130+
<source>Please select a valid range.</source>
131+
<target>Vælg venligst et gyldigt interval .</target>
132+
</trans-unit>
133+
<trans-unit id="128">
134+
<source>Please enter a valid week.</source>
135+
<target>Indtast venligst en gyldig uge.</target>
16136
</trans-unit>
17137
</body>
18138
</file>

‎src/Symfony/Component/Form/Resources/translations/validators.gl.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<trans-unit id="99">
1818
<source>This value is not a valid HTML5 color.</source>
1919
<target>Este valor non é unha cor HTML5 válida.</target>
20-
</trans-unit>.
20+
</trans-unit>
2121
<trans-unit id="100">
2222
<source>Please enter a valid birthdate.</source>
2323
<target>Insire unha data de aniversario válida.</target>

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php

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

1717
class BooleanToStringTransformerTest extends TestCase
1818
{
19-
const TRUE_VALUE = '1';
19+
private const TRUE_VALUE = '1';
2020

2121
/**
2222
* @var BooleanToStringTransformer

‎src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
*/
3535
class ViolationMapperTest extends TestCase
3636
{
37-
const LEVEL_0 = 0;
38-
const LEVEL_1 = 1;
39-
const LEVEL_1B = 2;
40-
const LEVEL_2 = 3;
37+
private const LEVEL_0 = 0;
38+
private const LEVEL_1 = 1;
39+
private const LEVEL_1B = 2;
40+
private const LEVEL_2 = 3;
4141

4242
/**
4343
* @var EventDispatcherInterface

‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
*/
2121
class MemcachedSessionHandlerTest extends TestCase
2222
{
23-
const PREFIX = 'prefix_';
24-
const TTL = 1000;
23+
private const PREFIX = 'prefix_';
24+
private const TTL = 1000;
2525

2626
/**
2727
* @var MemcachedSessionHandler

‎src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
class BundleEntryReaderTest extends TestCase
2323
{
24-
const RES_DIR = '/res/dir';
24+
private const RES_DIR = '/res/dir';
2525

2626
/**
2727
* @var BundleEntryReader

‎src/Symfony/Component/Intl/Tests/Util/GitRepositoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class GitRepositoryTest extends TestCase
2323
{
2424
private $targetDir;
2525

26-
const REPO_URL = 'https://github.com/symfony/intl.git';
26+
private const REPO_URL = 'https://github.com/symfony/intl.git';
2727

2828
/**
2929
* @before

‎src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
class AdapterTest extends LdapTestCase
2727
{
28-
const PAGINATION_REQUIRED_CONFIG = [
28+
private const PAGINATION_REQUIRED_CONFIG = [
2929
'options' => [
3030
'protocol_version' => 3,
3131
],

‎src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
class PropertyPathBuilderTest extends TestCase
2222
{
23-
const PREFIX = 'old1[old2].old3[old4][old5].old6';
23+
private const PREFIX = 'old1[old2].old3[old4][old5].old6';
2424

2525
/**
2626
* @var PropertyPathBuilder

‎src/Symfony/Component/Security/Core/Resources/translations/security.af.xlf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<source>Invalid CSRF token.</source>
3131
<target>Ongeldige CSRF-teken.</target>
3232
</trans-unit>
33-
<trans-unit id="8">
34-
<source>Digest nonce has expired.</source>
35-
<target>Digest nonce het verval.</target>
36-
</trans-unit>
3733
<trans-unit id="9">
3834
<source>No authentication provider found to support the authentication token.</source>
3935
<target>Geen verifikasieverskaffer is gevind wat die verifikasietoken kan ondersteun nie.</target>

‎src/Symfony/Component/Security/Core/Resources/translations/security.bs.xlf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<source>Invalid CSRF token.</source>
3131
<target>CSRF žeton (token) je neispravan.</target>
3232
</trans-unit>
33-
<trans-unit id="8">
34-
<source>Digest nonce has expired.</source>
35-
<target>Digest nonce je istekao.</target>
36-
</trans-unit>
3733
<trans-unit id="9">
3834
<source>No authentication provider found to support the authentication token.</source>
3935
<target>Nije pronađen autentifikacijski provajder koji bi podržao dati autentifikacijski žeton (token).</target>

‎src/Symfony/Component/Security/Core/Resources/translations/security.da.xlf

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</trans-unit>
99
<trans-unit id="2">
1010
<source>Authentication credentials could not be found.</source>
11-
<target>Loginoplysninger kan findes.</target>
11+
<target>Loginoplysninger kan ikke findes.</target>
1212
</trans-unit>
1313
<trans-unit id="3">
1414
<source>Authentication request could not be processed due to a system problem.</source>
@@ -62,6 +62,14 @@
6262
<source>Account is locked.</source>
6363
<target>Brugerkonto er låst.</target>
6464
</trans-unit>
65+
<trans-unit id="17">
66+
<source>Too many failed login attempts, please try again later.</source>
67+
<target>For mange fejlede login forsøg, prøv venligst senere.</target>
68+
</trans-unit>
69+
<trans-unit id="18">
70+
<source>Invalid or expired login link.</source>
71+
<target>Ugyldigt eller udløbet login link.</target>
72+
</trans-unit>
6573
</body>
6674
</file>
6775
</xliff>

‎src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424
abstract class UserPasswordValidatorTest extends ConstraintValidatorTestCase
2525
{
26-
const PASSWORD = 's3Cr3t';
27-
const SALT = '^S4lt$';
26+
private const PASSWORD = 's3Cr3t';
27+
private const SALT = '^S4lt$';
2828

2929
/**
3030
* @var TokenStorageInterface

‎src/Symfony/Component/Security/Csrf/Tests/TokenGenerator/UriSafeTokenGeneratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
class UriSafeTokenGeneratorTest extends TestCase
2121
{
22-
const ENTROPY = 1000;
22+
private const ENTROPY = 1000;
2323

2424
/**
2525
* A non alpha-numeric byte string.

‎src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
class NativeSessionTokenStorageTest extends TestCase
2424
{
25-
const SESSION_NAMESPACE = 'foobar';
25+
private const SESSION_NAMESPACE = 'foobar';
2626

2727
/**
2828
* @var NativeSessionTokenStorage

‎src/Symfony/Component/Security/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
class SessionTokenStorageTest extends TestCase
2323
{
24-
const SESSION_NAMESPACE = 'foobar';
24+
private const SESSION_NAMESPACE = 'foobar';
2525

2626
/**
2727
* @var Session

‎src/Symfony/Component/Security/Guard/Tests/Authenticator/FormLoginAuthenticatorTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ class FormLoginAuthenticatorTest extends TestCase
2929
private $requestWithSession;
3030
private $authenticator;
3131

32-
const LOGIN_URL = 'http://login';
33-
const DEFAULT_SUCCESS_URL = 'http://defaultsuccess';
34-
const CUSTOM_SUCCESS_URL = 'http://customsuccess';
32+
private const LOGIN_URL = 'http://login';
33+
private const DEFAULT_SUCCESS_URL = 'http://defaultsuccess';
3534

3635
public function testAuthenticationFailureWithoutSession()
3736
{

‎src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
class ChainDecoderTest extends TestCase
1818
{
19-
const FORMAT_1 = 'format1';
20-
const FORMAT_2 = 'format2';
21-
const FORMAT_3 = 'format3';
19+
private const FORMAT_1 = 'format1';
20+
private const FORMAT_2 = 'format2';
21+
private const FORMAT_3 = 'format3';
2222

2323
private $chainDecoder;
2424
private $decoder1;

0 commit comments

Comments
 (0)
0