Skip to content

Commit 9cc71f2

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: [Form] Fix merging form data and files (ter) [Intl] Update the ICU data to 74.1 [Scheduler] Use MockClock [HtmlSanitizer] Consider `width` attribute as safe [DoctrineBridge] Fix exception message [Security][Validator] Missing translations for Luxembourgish
2 parents 9920830 + 45e5a24 commit 9cc71f2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Reference/W3CReference.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ final class W3CReference
394394
'vlink' => false,
395395
'vspace' => true,
396396
'webkitdirectory' => true,
397-
'width' => false,
397+
'width' => true,
398398
'wrap' => true,
399399
];
400400
}

Tests/HtmlSanitizerAllTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,8 @@ public static function provideSanitizeBody()
427427
'<hr />',
428428
],
429429
[
430-
'<img src="/img/example.jpg" alt="Image alternative text" title="Image title">',
431-
'<img src="/img/example.jpg" alt="Image alternative text" title="Image title" />',
430+
'<img src="/img/example.jpg" alt="Image alternative text" title="Image title" height="150" width="300">',
431+
'<img src="/img/example.jpg" alt="Image alternative text" title="Image title" height="150" width="300" />',
432432
],
433433
[
434434
'<img src="http://trusted.com/img/example.jpg" alt="Image alternative text" title="Image title" />',

0 commit comments

Comments
 (0)