Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history 
* 6.4: (22 commits)
  fix merge
  [AssetMapper] Check asset/vendor directory is writable
  detect wrong e-mail validation modes
  detect wrong usages of minMessage/maxMessage in options
  [Security] Remove workflow from empty folder
  read form values using the chain data accessor
  [Validator] Review Bulgarian (bg) translation
  Reviewed italian translation
  Fix french translation
  call substr() with integer offsets
  [Finder] Also consider .git inside the basedir of in() directory
  review: FR translation
  [Serializer] Add AbstractNormalizerContextBuilder::defaultConstructorArguments()
  Update spanish and catalan translations
  Update AbstractSchemaListener.php to adjust more database params
  Updated id=113 Arabic translation.
  #53771 Updated validator Lithuanian translations
  review: translation RU
  [PropertyInfo] Fix PHPStan properties type in trait
  explicitly cast boolean SSL stream options
  ...
  • Loading branch information
@xabbuh
xabbuh committed Apr 28, 2024
2 parents 34a4580 + 4761a08 commit ab4e75b
Show file tree
Hide file tree
Showing 15 changed files with 114 additions and 79 deletions.
4 changes: 4 additions & 0 deletions Constraints/Email.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ public function __construct(
throw new InvalidArgumentException('The "mode" parameter value is not valid.');
}

if (null !== $mode && !\in_array($mode, self::VALIDATION_MODES, true)) {
throw new InvalidArgumentException('The "mode" parameter value is not valid.');
}

parent::__construct($options, $groups, $payload);

$this->message = $message ?? $this->message;
Expand Down
2 changes: 1 addition & 1 deletion Constraints/Range.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function __construct(
throw new LogicException(sprintf('The "%s" constraint requires the Symfony PropertyAccess component to use the "minPropertyPath" or "maxPropertyPath" option. Try running "composer require symfony/property-access".', static::class));
}

if (null !== $this->min && null !== $this->max && ($minMessage || $maxMessage)) {
if (null !== $this->min && null !== $this->max && ($minMessage || $maxMessage || isset($options['minMessage']) || isset($options['maxMessage']))) {
throw new ConstraintDefinitionException(sprintf('The "%s" constraint can not use "minMessage" and "maxMessage" when the "min" and "max" options are both set. Use "notInRangeMessage" instead.', static::class));
}
}
Expand Down
2 changes: 1 addition & 1 deletion Resources/translations/validators.ar.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@
</trans-unit>
<trans-unit id="113">
<source>This URL is missing a top-level domain.</source>
<target state="needs-review-translation">هذا الرابط يفتقر إلى نطاق أعلى مستوى.</target>
<target>هذا الرابط يفتقر إلى نطاق المستوى الأعلى.</target>
</trans-unit>
</body>
</file>
Expand Down
22 changes: 11 additions & 11 deletions Resources/translations/validators.bg.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</trans-unit>
<trans-unit id="17">
<source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
<target>Mime типа на файла е невалиден ({{ type }}). Разрешени mime типове са {{ types }}.</target>
<target>Mime типът на файла е невалиден ({{ type }}). Разрешени mime типове са {{ types }}.</target>
</trans-unit>
<trans-unit id="18">
<source>This value should be {{ limit }} or less.</source>
Expand Down Expand Up @@ -136,7 +136,7 @@
</trans-unit>
<trans-unit id="37" resname="This is not a valid IP address.">
<source>This value is not a valid IP address.</source>
<target state="needs-review-translation">Тази стойност не е валиден IP адрес.</target>
<target>Стойността не е валиден IP адрес.</target>
</trans-unit>
<trans-unit id="38">
<source>This value is not a valid language.</source>
Expand All @@ -156,7 +156,7 @@
</trans-unit>
<trans-unit id="42">
<source>The size of the image could not be detected.</source>
<target>Размера на изображението не може да бъде определен.</target>
<target>Размерът на изображението не може да бъде определен.</target>
</trans-unit>
<trans-unit id="43">
<source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
Expand Down Expand Up @@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51" resname="No temporary folder was configured in php.ini.">
<source>No temporary folder was configured in php.ini, or the configured folder does not exist.</source>
<target state="needs-review-translation">В php.ini не е конфигурирана временна директория, или конфигурираната директория не съществува.</target>
<target>В php.ini не е конфигурирана временна директория или конфигурираната директория не съществува.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
Expand Down Expand Up @@ -224,7 +224,7 @@
</trans-unit>
<trans-unit id="59" resname="This is not a valid International Bank Account Number (IBAN).">
<source>This value is not a valid International Bank Account Number (IBAN).</source>
<target state="needs-review-translation">Тази стойност не е валиден международен банков сметка номер (IBAN).</target>
<target>Стойността не е валиден Международен номер на банкова сметка (IBAN).</target>
</trans-unit>
<trans-unit id="60">
<source>This value is not a valid ISBN-10.</source>
Expand Down Expand Up @@ -312,23 +312,23 @@
</trans-unit>
<trans-unit id="81" resname="This is not a valid Business Identifier Code (BIC).">
<source>This value is not a valid Business Identifier Code (BIC).</source>
<target state="needs-review-translation">Тази стойност не е валиден код за идентификация на бизнеса (BIC).</target>
<target>Стойността не е валиден Бизнес идентификационен код (BIC).</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Грешка</target>
</trans-unit>
<trans-unit id="83" resname="This is not a valid UUID.">
<source>This value is not a valid UUID.</source>
<target state="needs-review-translation">Тази стойност не е валиден UUID.</target>
<target>Стойността не е валиден UUID.</target>
</trans-unit>
<trans-unit id="84">
<source>This value should be a multiple of {{ compared_value }}.</source>
<target>Стойността трябва да бъде кратно число на {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="85">
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
<target>Бизнес идентификационния код (BIC) не е свързан с IBAN {{ iban }}.</target>
<target>Бизнес идентификационният код (BIC) не е свързан с IBAN {{ iban }}.</target>
</trans-unit>
<trans-unit id="86">
<source>This value should be valid JSON.</source>
Expand Down Expand Up @@ -360,7 +360,7 @@
</trans-unit>
<trans-unit id="93">
<source>This password has been leaked in a data breach, it must not be used. Please use another password.</source>
<target>Тази парола е компрометирана, не трябва да бъде използвана. Моля използвайте друга парола.</target>
<target>Тази парола е компрометирана, не може да бъде използвана. Моля използвайте друга парола.</target>
</trans-unit>
<trans-unit id="94">
<source>This value should be between {{ min }} and {{ max }}.</source>
Expand Down Expand Up @@ -436,11 +436,11 @@
</trans-unit>
<trans-unit id="112">
<source>This value is not a valid MAC address.</source>
<target state="needs-review-translation">Тази стойност не е валиден MAC адрес.</target>
<target>Стойността не е валиден MAC адрес.</target>
</trans-unit>
<trans-unit id="113">
<source>This URL is missing a top-level domain.</source>
<target state="needs-review-translation">На този URL липсва домейн от най-високо ниво.</target>
<target>На този URL липсва домейн от най-високо ниво.</target>
</trans-unit>
</body>
</file>
Expand Down
46 changes: 23 additions & 23 deletions Resources/translations/validators.ca.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@
</trans-unit>
<trans-unit id="27">
<source>This value is not a valid URL.</source>
<target>Aquest valor no és una URL vàlida.</target>
<target>Aquest valor no és un URL vàlid.</target>
</trans-unit>
<trans-unit id="31">
<source>The two values should be equal.</source>
<target>Els dos valors haurien de ser iguals.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>L'arxiu és massa gran. El tamany màxim permés és {{ limit }} {{ suffix }}.</target>
<target>L'arxiu és massa gran. La mida màxima permesa és {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>
Expand All @@ -136,7 +136,7 @@
</trans-unit>
<trans-unit id="37" resname="This is not a valid IP address.">
<source>This value is not a valid IP address.</source>
<target state="needs-review-translation">Aquest valor no és una adreça IP vàlida.</target>
<target>Aquest valor no és una adreça IP vàlida.</target>
</trans-unit>
<trans-unit id="38">
<source>This value is not a valid language.</source>
Expand All @@ -160,19 +160,19 @@
</trans-unit>
<trans-unit id="43">
<source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
<target>L'amplària de la imatge és massa gran ({{ width }}px). L'amplària màxima permesa són {{ max_width }}px.</target>
<target>L'amplària de la imatge és massa gran ({{ width }}px). L'amplària màxima permesa és {{ max_width }}px.</target>
</trans-unit>
<trans-unit id="44">
<source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
<target>L'amplària de la imatge és massa petita ({{ width }}px). L'amplària mínima requerida són {{ min_width }}px.</target>
<target>L'amplària de la imatge és massa petita ({{ width }}px). L'amplària mínima requerida és {{ min_width }}px.</target>
</trans-unit>
<trans-unit id="45">
<source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
<target>L'altura de la imatge és massa gran ({{ height }}px). L'altura màxima permesa són {{ max_height }}px.</target>
<target>L'altura de la imatge és massa gran ({{ height }}px). L'altura màxima permesa és {{ max_height }}px.</target>
</trans-unit>
<trans-unit id="46">
<source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
<target>L'altura de la imatge és massa petita ({{ height }}px). L'altura mínima requerida són {{ min_height }}px.</target>
<target>L'altura de la imatge és massa petita ({{ height }}px). L'altura mínima requerida és {{ min_height }}px.</target>
</trans-unit>
<trans-unit id="47">
<source>This value should be the user's current password.</source>
Expand All @@ -192,15 +192,15 @@
</trans-unit>
<trans-unit id="51" resname="No temporary folder was configured in php.ini.">
<source>No temporary folder was configured in php.ini, or the configured folder does not exist.</source>
<target state="needs-review-translation">No s'ha configurat cap carpeta temporal en php.ini, o la carpeta configurada no existeix.</target>
<target>No s'ha configurat cap carpeta temporal en php.ini, o la carpeta configurada no existeix.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
<target>No es va poder escriure l'arxiu temporal en el disc.</target>
</trans-unit>
<trans-unit id="53">
<source>A PHP extension caused the upload to fail.</source>
<target>Una extensió de PHP va fer que la pujada fallara.</target>
<target>Una extensió de PHP va fer que la pujada fallarà.</target>
</trans-unit>
<trans-unit id="54">
<source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
Expand All @@ -224,7 +224,7 @@
</trans-unit>
<trans-unit id="59" resname="This is not a valid International Bank Account Number (IBAN).">
<source>This value is not a valid International Bank Account Number (IBAN).</source>
<target state="needs-review-translation">Aquest valor no és un Número de Compte Bancari Internacional (IBAN) vàlid.</target>
<target>Aquest valor no és un Número de Compte Bancari Internacional (IBAN) vàlid.</target>
</trans-unit>
<trans-unit id="60">
<source>This value is not a valid ISBN-10.</source>
Expand Down Expand Up @@ -276,31 +276,31 @@
</trans-unit>
<trans-unit id="72">
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Aquest valor no hauria de idèntic a {{ compared_value_type }} {{ compared_value }}.</target>
<target>Aquest valor no hauria de ser idèntic a {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
<trans-unit id="73">
<source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
<target>La proporció de l'imatge és massa gran ({{ ratio }}). La màxima proporció permesa és {{ max_ratio }}.</target>
<target>La proporció de la imatge és massa gran ({{ ratio }}). La màxima proporció permesa és {{ max_ratio }}.</target>
</trans-unit>
<trans-unit id="74">
<source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
<target>La proporció de l'imatge és massa petita ({{ ratio }}). La mínima proporció permesa és {{ max_ratio }}.</target>
<target>La proporció de la imatge és massa petita ({{ ratio }}). La mínima proporció permesa és {{ min_ratio }}.</target>
</trans-unit>
<trans-unit id="75">
<source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
<target>L'imatge és quadrada({{ width }}x{{ height }}px). Les imatges quadrades no estan permeses.</target>
<target>La imatge és quadrada({{ width }}x{{ height }}px). Les imatges quadrades no estan permeses.</target>
</trans-unit>
<trans-unit id="76">
<source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
<target>L'imatge està orientada horitzontalment ({{ width }}x{{ height }}px). Les imatges orientades horitzontalment no estan permeses.</target>
<target>La imatge està orientada horitzontalment ({{ width }}x{{ height }}px). Les imatges orientades horitzontalment no estan permeses.</target>
</trans-unit>
<trans-unit id="77">
<source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
<target>L'imatge està orientada verticalment ({{ width }}x{{ height }}px). Les imatges orientades verticalment no estan permeses.</target>
<target>La imatge està orientada verticalment ({{ width }}x{{ height }}px). Les imatges orientades verticalment no estan permeses.</target>
</trans-unit>
<trans-unit id="78">
<source>An empty file is not allowed.</source>
<target>No està permès un fixter buit.</target>
<target>No està permès un fitxer buit.</target>
</trans-unit>
<trans-unit id="79">
<source>The host could not be resolved.</source>
Expand All @@ -312,15 +312,15 @@
</trans-unit>
<trans-unit id="81" resname="This is not a valid Business Identifier Code (BIC).">
<source>This value is not a valid Business Identifier Code (BIC).</source>
<target state="needs-review-translation">Aquest valor no és un Codi d'Identificador de Negocis (BIC) vàlid.</target>
<target>Aquest valor no és un Codi d'identificació bancari (BIC) vàlid.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Error</target>
</trans-unit>
<trans-unit id="83" resname="This is not a valid UUID.">
<source>This value is not a valid UUID.</source>
<target state="needs-review-translation">Aquest valor no és un UUID vàlid.</target>
<target>Aquest valor no és un UUID vàlid.</target>
</trans-unit>
<trans-unit id="84">
<source>This value should be a multiple of {{ compared_value }}.</source>
Expand Down Expand Up @@ -428,19 +428,19 @@
</trans-unit>
<trans-unit id="110">
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
<target state="needs-review-translation">L'extensió del fitxer no és vàlida ({{ extension }}). Les extensions permeses són {{ extensions }}.</target>
<target>L'extensió del fitxer no és vàlida ({{ extension }}). Les extensions permeses són {{ extensions }}.</target>
</trans-unit>
<trans-unit id="111">
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
<target state="needs-review-translation">S'ha detectat que la codificació de caràcters no és vàlida ({{ detected }}). Les codificacions permeses són {{ encodings }}.</target>
<target>S'ha detectat que la codificació de caràcters no és vàlida ({{ detected }}). Les codificacions permeses són {{ encodings }}.</target>
</trans-unit>
<trans-unit id="112">
<source>This value is not a valid MAC address.</source>
<target state="needs-review-translation">Aquest valor no és una adreça MAC vàlida.</target>
<target>Aquest valor no és una adreça MAC vàlida.</target>
</trans-unit>
<trans-unit id="113">
<source>This URL is missing a top-level domain.</source>
<target state="needs-review-translation">Aquesta URL no conté un domini de nivell superior.</target>
<target>Aquesta URL no conté un domini de primer nivell.</target>
</trans-unit>
</body>
</file>
Expand Down
Loading

0 comments on commit ab4e75b

Please sign in to comment.