8000 Merge branch '5.4' into 6.0 · symfony/symfony@e3d8890 · GitHub
[go: up one dir, main page]
Skip to content

Commit e3d8890

Browse files
xabbuhxabbuh
committed
Merge branch '5.4' into 6.0
* 5.4: sync message serializer code for forward-compatibility skip a test if the mime type detection feature will not work minor #47751 Norgweiang translations (ibonkonesa) fix overflow issue in WebPprofiler Forms panel
2 parents f2aac2a + ac0b415 commit e3d8890

File tree

7 files changed

+41
-10
lines changed

7 files changed

+41
-10
lines changed

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
cursor: pointer;
9191
padding: 5px 7px 5px 22px;
9292
position: relative;
93-
93+
overflow: hidden;
94+
text-overflow: ellipsis;
9495
}
9596
.tree .toggle-button {
9697
/* provide a bigger clickable area than just 10x10px */
@@ -449,7 +450,7 @@
449450
{% import _self as tree %}
450451
{% set has_error = data.errors is defined and data.errors|length > 0 %}
451452
<li>
452-
<div class="tree-inner" data-tab-target-id="{{ data.id }}-details">
453+
<div class="tree-inner" data-tab-target-id="{{ data.id }}-details" title="{{ name|default('(no name)') }}">
453454
{% if has_error %}
454455
<div class="badge-error">{{ data.errors|length }}</div>
455456
{% endif %}

‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\HttpFoundation\Tests;
1313

1414
use Symfony\Component\HttpFoundation\BinaryFileResponse;
15+
use Symfony\Component\HttpFoundation\File\File;
1516
use Symfony\Component\HttpFoundation\File\Stream;
1617
use Symfony\Component\HttpFoundation\Request;
1718
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
@@ -390,7 +391,15 @@ public function testPrepareNotAddingContentTypeHeaderIfNoContentResponse()
390391

391392
public function testContentTypeIsCorrectlyDetected()
392393
{
393-
$response = new BinaryFileResponse(__DIR__.'/File/Fixtures/test.gif');
394+
$file = new File(__DIR__.'/File/Fixtures/test.gif');
395+
396+
try {
397+
$file->getMimeType();
398+
} catch (\LogicException $e) {
399+
$this->markTestSkipped('Guessing the mime type is not possible');
400+
}
401+
402+
$response = new BinaryFileResponse($file);
394403

395404
$request = Request::create('/');
396405
$response->prepare($request);

‎src/Symfony/Component/Mime/Tests/MessageTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ public function testSymfonySerialize()
202202
"disposition": null,
203203
"name": null,
204204
"encoding": "quoted-printable",
205-
"seekable": null,
206205
"headers": [],
207206
"class": "Symfony\\\\Component\\\\Mime\\\\Part\\\TextPart"
208207
},
@@ -213,7 +212,6 @@ public function testSymfonySerialize()
213212
"disposition": null,
214213
"name": null,
215214
"encoding": "quoted-printable",
216-
"seekable": null,
217215
"headers": [],
218216
"class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\TextPart"
219217
}
@@ -224,15 +222,12 @@ public function testSymfonySerialize()
224222
{
225223
"filename": "text.txt",
226224
"mediaType": "application",
227-
"cid": null,
228-
"handle": null,
229225
"body": "text data",
230226
"charset": null,
231227
"subtype": "octet-stream",
232228
"disposition": "attachment",
233229
"name": "text.txt",
234230
"encoding": "base64",
235-
"seekable": null,
236231
"headers": [],
237232
"class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\DataPart"
238233
}

‎src/Symfony/Component/Mime/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
"symfony/dependency-injection": "^5.4|^6.0",
2727
"symfony/property-access": "^5.4|^6.0",
2828
"symfony/property-info": "^5.4|^6.0",
29-
"symfony/serializer": "^5.4|^6.0"
29+
"symfony/serializer": "^5.4.14|~6.0.14|^6.1.6"
3030
},
3131
"conflict": {
3232
"egulias/email-validator": "~3.0.0",
3333
"phpdocumentor/reflection-docblock": "<3.2.2",
3434
"phpdocumentor/type-resolver": "<1.4.0",
35-
"symfony/mailer": "<5.4"
35+
"symfony/mailer": "<5.4",
36+
"symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6"
3637
},
3738
"autoload": {
3839
"psr-4": { "Symfony\\Component\\Mime\\": "" },

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@
7070
<source>Invalid or expired login link.</source>
7171
<target>Innloggingslenka er ugyldig eller utgjengen.</target>
7272
</trans-unit>
73+
<trans-unit id="19">
74+
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
75+
<target>For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutt.</target>
76+
</trans-unit>
77+
<trans-unit id="20">
78+
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
79+
<target>For mange mislykkede påloggingsforsøk, prøv igjen om %minutes% minutter.</target>
80+
</trans-unit>
7381
</body>
7482
</file>
7583
</xliff>

‎src/Symfony/Component/Serializer/Normalizer/MimeMessageNormalizer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public function normalize(mixed $object, string $format = null, array $context =
6666
if ($object instanceof AbstractPart) {
6767
$ret = $this->normalizer->normalize($object, $format, $context);
6868
$ret['class'] = \get_class($object);
69+
unset($ret['seekable'], $ret['cid'], $ret['handle']);
6970

7071
return $ret;
7172
}

‎src/Symfony/Component/Validator/Resources/translations/validators.nn.xlf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,22 @@
386386
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387387
<target>Verdien er ikkje eit gyldig International Securities Identification Number (ISIN).</target>
388388
</trans-unit>
389+
<trans-unit id="100">
390+
<source>This value should be a valid expression.</source>
391+
<target>Denne verdien skal være et gyldig uttrykk.</target>
392+
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>Denne verdien er ikke en gyldig CSS-farge.</target>
396+
</trans-unit>
397+
<trans-unit id="102">
398+
<source>This value is not a valid CIDR notation.</source>
399+
<target>Denne verdien er ikke en gyldig CIDR-notasjon.</target>
400+
</trans-unit>
401+
<trans-unit id="103">
402+
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
403+
<target>Verdien av nettmasken skal vær 469C e mellom {{ min }} og {{ max }}.</target>
404+
</trans-unit>
389405
</body>
390406
</file>
391407
</xliff>

0 commit comments

Comments
 (0)
0