Skip to content

Commit 6002ced

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: [ExpressionLanguage] Fixed collisions of character operators with object properties [Validator] Remove specific check for Valid targets [PhpUnitBridge] Use trait instead of extending deprecated class fix remember me Use strict assertion in asset tests [DoctrineBridge][DoctrineExtractor] Fix indexBy with custom and some core types Do not rely on the current locale when dumping a Graphviz object fix typo [Ldap] force default network timeout [Config] don't throw on missing excluded paths Docs: Typo, grammar [Validator] Add the missing translations for the Polish ("pl") locale [Console] Inline exact-match handling with 4.4 Set previous exception when rethrown from controller resolver [VarDumper] fixed DateCaster not displaying additional fields [HttpKernel] fix registering DebugHandlersListener regardless of the PHP_SAPI
2 parents f74794e + 6e26d61 commit 6002ced

File tree

2 files changed

+36
-5
lines changed

2 files changed

+36
-5
lines changed

Mapping/ClassMetadata.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\Constraints\GroupSequence;
1616
use Symfony\Component\Validator\Constraints\Traverse;
17-
use Symfony\Component\Validator\Constraints\Valid;
1817
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
1918
use Symfony\Component\Validator\Exception\GroupDefinitionException;
2019

@@ -178,10 +177,6 @@ public function addConstraint(Constraint $constraint)
178177
throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on classes.', \get_class($constraint)));
179178
}
180179

181-
if ($constraint instanceof Valid) {
182-
throw new ConstraintDefinitionException(sprintf('The constraint "%s" cannot be put on classes.', \get_class($constraint)));
183-
}
184-
185180
if ($constraint instanceof Traverse) {
186181
if ($constraint->traverse) {
187182
// If traverse is true, traversal should be explicitly enabled

Resources/translations/validators.pl.xlf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,46 @@
330330
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
331331
<target>Ten kod BIC (Business Identifier Code) nie jest powiązany z międzynarodowym numerem rachunku bankowego (IBAN) {{ iban }}.</target>
332332
</trans-unit>
333+
<trans-unit id="86">
334+
<source>This value should be valid JSON.</source>
335+
<target>Ta wartość powinna być prawidłowym formatem JSON.</target>
336+
</trans-unit>
337+
<trans-unit id="87">
338+
<source>This collection should contain only unique elements.</source>
339+
<target>Ten zbiór powinien zawierać tylko unikalne elementy.</target>
340+
</trans-unit>
341+
<trans-unit id="88">
342+
<source>This value should be positive.</source>
343+
<target>Ta wartość powinna być dodatnia.</target>
344+
</trans-unit>
345+
<trans-unit id="89">
346+
<source>This value should be either positive or zero.</source>
347+
<target>Ta wartość powinna być dodatnia lub równa zero.</target>
348+
</trans-unit>
349+
<trans-unit id="90">
350+
<source>This value should be negative.</source>
351+
<target>Ta wartość powinna być ujemna.</target>
352+
</trans-unit>
353+
<trans-unit id="91">
354+
<source>This value should be either negative or zero.</source>
355+
<target>Ta wartość powinna być ujemna lub równa zero.</target>
356+
</trans-unit>
357+
<trans-unit id="92">
358+
<source>This value is not a valid timezone.</source>
359+
<target>Ta wartość nie jest prawidłową strefą czasową.</target>
360+
</trans-unit>
361+
<trans-unit id="93">
362+
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
363+
<target>To hasło wyciekło w wyniku naruszenia danych i nie może być użyte. Proszę użyć innego hasła.</target>
364+
</trans-unit>
333365
<trans-unit id="94">
334366
<source>This value should be between {{ min }} and {{ max }}.</source>
335367
<target>Ta wartość powinna być pomiędzy {{ min }} a {{ max }}.</target>
336368
</trans-unit>
369+
<trans-unit id="95">
370+
<source>This value is not a valid hostname.</source>
371+
<target>Ta wartość nie jest prawidłową nazwą hosta.</target>
372+
</trans-unit>
337373
</body>
338374
</file>
339375
</xliff>

0 commit comments

Comments
 (0)