1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
|
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Tue, 13 Aug 2024 09:02:30 +0200
Subject: [Validator] Add `D` regex modifier in relevant validators
Origin: upstream, https://github.com/symfony/symfony/commit/7d1032bbead9a4229b32fa6ebca32681c80cb76f
Bug: https://github.com/symfony/symfony/security/advisories/GHSA-g3rh-rrhp-jhh9
Bug-Debian: https://security-tracker.debian.org/tracker/CVE-2024-50343
---
.../Validator/Constraints/CardSchemeValidator.php | 38 +++++++++++-----------
.../Validator/Constraints/CssColorValidator.php | 24 +++++++-------
.../Validator/Constraints/DateValidator.php | 2 +-
.../Validator/Constraints/EmailValidator.php | 4 +--
.../Validator/Constraints/TimeValidator.php | 2 +-
.../Validator/Constraints/UrlValidator.php | 2 +-
.../Tests/Constraints/CardSchemeValidatorTest.php | 30 +++++++++++++++++
.../Tests/Constraints/CssColorValidatorTest.php | 13 ++++++++
.../Tests/Constraints/DateValidatorTest.php | 13 ++++++++
.../Tests/Constraints/EmailValidatorTest.php | 13 ++++++++
.../Tests/Constraints/IbanValidatorTest.php | 13 ++++++++
.../Tests/Constraints/TimeValidatorTest.php | 13 ++++++++
.../Tests/Constraints/UrlValidatorTest.php | 31 ++++++++++++++++++
13 files changed, 162 insertions(+), 36 deletions(-)
diff --git a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
index faef7ec..9425e9b 100644
--- a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
@@ -29,65 +29,65 @@ class CardSchemeValidator extends ConstraintValidator
protected $schemes = [
// American Express card numbers start with 34 or 37 and have 15 digits.
CardScheme::AMEX => [
- '/^3[47][0-9]{13}$/',
+ '/^3[47][0-9]{13}$/D',
],
// China UnionPay cards start with 62 and have between 16 and 19 digits.
// Please note that these cards do not follow Luhn Algorithm as a checksum.
CardScheme::CHINA_UNIONPAY => [
- '/^62[0-9]{14,17}$/',
+ '/^62[0-9]{14,17}$/D',
],
// Diners Club card numbers begin with 300 through 305, 36 or 38. All have 14 digits.
// There are Diners Club cards that begin with 5 and have 16 digits.
// These are a joint venture between Diners Club and MasterCard, and should be processed like a MasterCard.
CardScheme::DINERS => [
- '/^3(?:0[0-5]|[68][0-9])[0-9]{11}$/',
+ '/^3(?:0[0-5]|[68][0-9])[0-9]{11}$/D',
],
// Discover card numbers begin with 6011, 622126 through 622925, 644 through 649 or 65.
// All have 16 digits.
CardScheme::DISCOVER => [
- '/^6011[0-9]{12}$/',
- '/^64[4-9][0-9]{13}$/',
- '/^65[0-9]{14}$/',
- '/^622(12[6-9]|1[3-9][0-9]|[2-8][0-9][0-9]|91[0-9]|92[0-5])[0-9]{10}$/',
+ '/^6011[0-9]{12}$/D',
+ '/^64[4-9][0-9]{13}$/D',
+ '/^65[0-9]{14}$/D',
+ '/^622(12[6-9]|1[3-9][0-9]|[2-8][0-9][0-9]|91[0-9]|92[0-5])[0-9]{10}$/D',
],
// InstaPayment cards begin with 637 through 639 and have 16 digits.
CardScheme::INSTAPAYMENT => [
- '/^63[7-9][0-9]{13}$/',
+ '/^63[7-9][0-9]{13}$/D',
],
// JCB cards beginning with 2131 or 1800 have 15 digits.
// JCB cards beginning with 35 have 16 digits.
CardScheme::JCB => [
- '/^(?:2131|1800|35[0-9]{3})[0-9]{11}$/',
+ '/^(?:2131|1800|35[0-9]{3})[0-9]{11}$/D',
],
// Laser cards begin with either 6304, 6706, 6709 or 6771 and have between 16 and 19 digits.
CardScheme::LASER => [
- '/^(6304|670[69]|6771)[0-9]{12,15}$/',
+ '/^(6304|670[69]|6771)[0-9]{12,15}$/D',
],
// Maestro international cards begin with 675900..675999 and have between 12 and 19 digits.
// Maestro UK cards begin with either 500000..509999 or 560000..699999 and have between 12 and 19 digits.
CardScheme::MAESTRO => [
- '/^(6759[0-9]{2})[0-9]{6,13}$/',
- '/^(50[0-9]{4})[0-9]{6,13}$/',
- '/^5[6-9][0-9]{10,17}$/',
- '/^6[0-9]{11,18}$/',
+ '/^(6759[0-9]{2})[0-9]{6,13}$/D',
+ '/^(50[0-9]{4})[0-9]{6,13}$/D',
+ '/^5[6-9][0-9]{10,17}$/D',
+ '/^6[0-9]{11,18}$/D',
],
// All MasterCard numbers start with the numbers 51 through 55. All have 16 digits.
// October 2016 MasterCard numbers can also start with 222100 through 272099.
CardScheme::MASTERCARD => [
- '/^5[1-5][0-9]{14}$/',
- '/^2(22[1-9][0-9]{12}|2[3-9][0-9]{13}|[3-6][0-9]{14}|7[0-1][0-9]{13}|720[0-9]{12})$/',
+ '/^5[1-5][0-9]{14}$/D',
+ '/^2(22[1-9][0-9]{12}|2[3-9][0-9]{13}|[3-6][0-9]{14}|7[0-1][0-9]{13}|720[0-9]{12})$/D',
],
// Payment system MIR numbers start with 220, then 1 digit from 0 to 4, then between 12 and 15 digits
CardScheme::MIR => [
- '/^220[0-4][0-9]{12,15}$/',
+ '/^220[0-4][0-9]{12,15}$/D',
],
// All UATP card numbers start with a 1 and have a length of 15 digits.
CardScheme::UATP => [
- '/^1[0-9]{14}$/',
+ '/^1[0-9]{14}$/D',
],
// All Visa card numbers start with a 4 and have a length of 13, 16, or 19 digits.
CardScheme::VISA => [
- '/^4([0-9]{12}|[0-9]{15}|[0-9]{18})$/',
+ '/^4([0-9]{12}|[0-9]{15}|[0-9]{18})$/D',
],
];
diff --git a/src/Symfony/Component/Validator/Constraints/CssColorValidator.php b/src/Symfony/Component/Validator/Constraints/CssColorValidator.php
index b34ef93..be377d8 100644
--- a/src/Symfony/Component/Validator/Constraints/CssColorValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/CssColorValidator.php
@@ -21,21 +21,21 @@ use Symfony\Component\Validator\Exception\UnexpectedValueException;
*/
class CssColorValidator extends ConstraintValidator
{
- private const PATTERN_HEX_LONG = '/^#[0-9a-f]{6}$/i';
- private const PATTERN_HEX_LONG_WITH_ALPHA = '/^#[0-9a-f]{8}$/i';
- private const PATTERN_HEX_SHORT = '/^#[0-9a-f]{3}$/i';
- private const PATTERN_HEX_SHORT_WITH_ALPHA = '/^#[0-9a-f]{4}$/i';
+ private const PATTERN_HEX_LONG = '/^#[0-9a-f]{6}$/iD';
+ private const PATTERN_HEX_LONG_WITH_ALPHA = '/^#[0-9a-f]{8}$/iD';
+ private const PATTERN_HEX_SHORT = '/^#[0-9a-f]{3}$/iD';
+ private const PATTERN_HEX_SHORT_WITH_ALPHA = '/^#[0-9a-f]{4}$/iD';
// List comes from https://www.w3.org/wiki/CSS/Properties/color/keywords#Basic_Colors
- private const PATTERN_BASIC_NAMED_COLORS = '/^(black|silver|gray|white|maroon|red|purple|fuchsia|green|lime|olive|yellow|navy|blue|teal|aqua)$/i';
+ private const PATTERN_BASIC_NAMED_COLORS = '/^(black|silver|gray|white|maroon|red|purple|fuchsia|green|lime|olive|yellow|navy|blue|teal|aqua)$/iD';
// List comes from https://www.w3.org/wiki/CSS/Properties/color/keywords#Extended_colors
- private const PATTERN_EXTENDED_NAMED_COLORS = '/^(aliceblue|antiquewhite|aqua|aquamarine|azure|beige|bisque|black|blanchedalmond|blue|blueviolet|brown|burlywood|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen|fuchsia|gainsboro|ghostwhite|gold|goldenrod|gray|green|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray|lightslategrey|lightsteelblue|lightyellow|lime|limegreen|linen|magenta|maroon|mediumaquamarine|mediumblue|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|navy|oldlace|olive|olivedrab|orange|orangered|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum|powderblue|purple|red|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell|sienna|silver|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|teal|thistle|tomato|turquoise|violet|wheat|white|whitesmoke|yellow|yellowgreen)$/i';
+ private const PATTERN_EXTENDED_NAMED_COLORS = '/^(aliceblue|antiquewhite|aqua|aquamarine|azure|beige|bisque|black|blanchedalmond|blue|blueviolet|brown|burlywood|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen|fuchsia|gainsboro|ghostwhite|gold|goldenrod|gray|green|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray|lightslategrey|lightsteelblue|lightyellow|lime|limegreen|linen|magenta|maroon|mediumaquamarine|mediumblue|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|navy|oldlace|olive|olivedrab|orange|orangered|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum|powderblue|purple|red|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell|sienna|silver|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|teal|thistle|tomato|turquoise|violet|wheat|white|whitesmoke|yellow|yellowgreen)$/iD';
// List comes from https://drafts.csswg.org/css-color/#css-system-colors
- private const PATTERN_SYSTEM_COLORS = '/^(Canvas|CanvasText|LinkText|VisitedText|ActiveText|ButtonFace|ButtonText|ButtonBorder|Field|FieldText|Highlight|HighlightText|SelectedItem|SelectedItemText|Mark|MarkText|GrayText)$/i';
- private const PATTERN_KEYWORDS = '/^(transparent|currentColor)$/i';
- private const PATTERN_RGB = '/^rgb\(\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d),\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d),\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d)\s*\)$/i';
- private const PATTERN_RGBA = '/^rgba\(\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d),\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d),\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d),\s*(0|0?\.\d+|1(\.0)?)\s*\)$/i';
- private const PATTERN_HSL = '/^hsl\(\s*(0|360|35\d|3[0-4]\d|[12]\d\d|0?\d?\d),\s*(0|100|\d{1,2})%,\s*(0|100|\d{1,2})%\s*\)$/i';
- private const PATTERN_HSLA = '/^hsla\(\s*(0|360|35\d|3[0-4]\d|[12]\d\d|0?\d?\d),\s*(0|100|\d{1,2})%,\s*(0|100|\d{1,2})%,\s*(0|0?\.\d+|1(\.0)?)\s*\)$/i';
+ private const PATTERN_SYSTEM_COLORS = '/^(Canvas|CanvasText|LinkText|VisitedText|ActiveText|ButtonFace|ButtonText|ButtonBorder|Field|FieldText|Highlight|HighlightText|SelectedItem|SelectedItemText|Mark|MarkText|GrayText)$/iD';
+ private const PATTERN_KEYWORDS = '/^(transparent|currentColor)$/iD';
+ private const PATTERN_RGB = '/^rgb\(\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d),\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d),\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d)\s*\)$/iD';
+ private const PATTERN_RGBA = '/^rgba\(\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d),\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d),\s*(0|255|25[0-4]|2[0-4]\d|1\d\d|0?\d?\d),\s*(0|0?\.\d+|1(\.0)?)\s*\)$/iD';
+ private const PATTERN_HSL = '/^hsl\(\s*(0|360|35\d|3[0-4]\d|[12]\d\d|0?\d?\d),\s*(0|100|\d{1,2})%,\s*(0|100|\d{1,2})%\s*\)$/iD';
+ private const PATTERN_HSLA = '/^hsla\(\s*(0|360|35\d|3[0-4]\d|[12]\d\d|0?\d?\d),\s*(0|100|\d{1,2})%,\s*(0|100|\d{1,2})%,\s*(0|0?\.\d+|1(\.0)?)\s*\)$/iD';
private const COLOR_PATTERNS = [
CssColor::HEX_LONG => self::PATTERN_HEX_LONG,
diff --git a/src/Symfony/Component/Validator/Constraints/DateValidator.php b/src/Symfony/Component/Validator/Constraints/DateValidator.php
index 5a5f22e..4a1fb7d 100644
--- a/src/Symfony/Component/Validator/Constraints/DateValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/DateValidator.php
@@ -21,7 +21,7 @@ use Symfony\Component\Validator\Exception\UnexpectedValueException;
*/
class DateValidator extends ConstraintValidator
{
- public const PATTERN = '/^(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})$/';
+ public const PATTERN = '/^(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})$/D';
/**
* Checks whether a date is valid.
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
index 11fc7be..a073ab3 100644
--- a/src/Symfony/Component/Validator/Constraints/EmailValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -25,8 +25,8 @@ use Symfony\Component\Validator\Exception\UnexpectedValueException;
*/
class EmailValidator extends ConstraintValidator
{
- private const PATTERN_HTML5 = '/^[a-zA-Z0-9.!#$%&\'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$/';
- private const PATTERN_LOOSE = '/^.+\@\S+\.\S+$/';
+ private const PATTERN_HTML5 = '/^[a-zA-Z0-9.!#$%&\'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+$/D';
+ private const PATTERN_LOOSE = '/^.+\@\S+\.\S+$/D';
private const EMAIL_PATTERNS = [
Email::VALIDATION_MODE_LOOSE => self::PATTERN_LOOSE,
diff --git a/src/Symfony/Component/Validator/Constraints/TimeValidator.php b/src/Symfony/Component/Validator/Constraints/TimeValidator.php
index 855f320..0065fc9 100644
--- a/src/Symfony/Component/Validator/Constraints/TimeValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/TimeValidator.php
@@ -21,7 +21,7 @@ use Symfony\Component\Validator\Exception\UnexpectedValueException;
*/
class TimeValidator extends ConstraintValidator
{
- public const PATTERN = '/^(\d{2}):(\d{2}):(\d{2})$/';
+ public const PATTERN = '/^(\d{2}):(\d{2}):(\d{2})$/D';
/**
* Checks whether a time is valid.
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
index dff0a99..df3ccfd 100644
--- a/src/Symfony/Component/Validator/Constraints/UrlValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -43,7 +43,7 @@ class UrlValidator extends ConstraintValidator
(?:/ (?:[\pL\pN\-._\~!$&\'()*+,;=:@]|%%[0-9A-Fa-f]{2})* )* # a path
(?:\? (?:[\pL\pN\-._\~!$&\'\[\]()*+,;=:@/?]|%%[0-9A-Fa-f]{2})* )? # a query (optional)
(?:\# (?:[\pL\pN\-._\~!$&\'()*+,;=:@/?]|%%[0-9A-Fa-f]{2})* )? # a fragment (optional)
- $~ixu';
+ $~ixuD';
/**
* {@inheritdoc}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
index dcb40c9..9a6bc55 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
@@ -46,6 +46,36 @@ class CardSchemeValidatorTest extends ConstraintValidatorTestCase
$this->assertNoViolation();
}
+ /**
+ * @requires PHP 8
+ *
+ * @dataProvider getValidNumbers
+ */
+ public function testValidNumbersWithNewLine($scheme, $number)
+ {
+ $this->validator->validate($number."\n", new CardScheme(['schemes' => $scheme, 'message' => 'myMessage']));
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ value }}', '"'.$number."\n\"")
+ ->setCode(CardScheme::INVALID_FORMAT_ERROR)
+ ->assertRaised();
+ }
+
+ /**
+ * @requires PHP < 8
+ *
+ * @dataProvider getValidNumbers
+ */
+ public function testValidNumbersWithNewLinePriorToPhp8($scheme, $number)
+ {
+ $this->validator->validate($number."\n", new CardScheme(['schemes' => $scheme, 'message' => 'myMessage']));
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ value }}', '"'.$number."\n\"")
+ ->setCode(CardScheme::NOT_NUMERIC_ERROR)
+ ->assertRaised();
+ }
+
public function testValidNumberWithOrderedArguments()
{
$this->validator->validate(
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CssColorValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CssColorValidatorTest.php
index 95b0b6f..e87f588 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CssColorValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CssColorValidatorTest.php
@@ -52,6 +52,19 @@ final class CssColorValidatorTest extends ConstraintValidatorTestCase
$this->assertNoViolation();
}
+ /**
+ * @dataProvider getValidAnyColor
+ */
+ public function testValidAnyColorWithNewLine($cssColor)
+ {
+ $this->validator->validate($cssColor."\n", new CssColor([], 'myMessage'));
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ value }}', '"'.$cssColor."\n\"")
+ ->setCode(CssColor::INVALID_FORMAT_ERROR)
+ ->assertRaised();
+ }
+
public static function getValidAnyColor(): array
{
return [
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
index b2e9fdf..23725d5 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
@@ -53,6 +53,19 @@ class DateValidatorTest extends ConstraintValidatorTestCase
$this->assertNoViolation();
}
+ /**
+ * @dataProvider getValidDates
+ */
+ public function testValidDatesWithNewLine(string $date)
+ {
+ $this->validator->validate($date."\n", new Date(['message' => 'myMessage']));
+
+ $this->buildViolation('myMessage')
+ ->setParameter('{{ value }}', '"'.$date."\n\"")
+ ->setCode(Date::INVALID_FORMAT_ERROR)
+ ->assertRaised();
+ }
+
public static function getValidDates()
{
return [
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
index 0904622..b116da6 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -70,6 +70,19 @@ class EmailValidatorTest extends ConstraintValidatorTestCase
$this->assertNoViolation();
}
+ /**
+ * @dataProvider getValidEmails
+ */
+ public function testValidEmailsWithNewLine($email)
+ {
+ $this->validator->validate($email."\n", new Email());
+
+ $this->buildViolation('This value is not a valid email address.')
+ ->setParameter('{{ value }}', '"'.$email."\n\"")
+ ->setCode(Email::INVALID_FORMAT_ERROR)
+ ->assertRaised();
+ }
+
public static function getValidEmails()
{
return [
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
index 70994f5..ce43893 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
@@ -48,6 +48,19 @@ class IbanValidatorTest extends ConstraintValidatorTestCase
$this->assertNoViolation();
}
+ /**
+ * @dataProvider getValidIbans
+ */
+ public function testValidIbansWithNewLine(string $iban)
+ {
+ $this->validator->validate($iban."\n", new Iban());
+
+ $this->buildViolation('This is not a valid International Bank Account Number (IBAN).')
+ ->setParameter('{{ value }}', '"'.$iban."\n\"")
+ ->setCode(Iban::INVALID_CHARACTERS_ERROR)
+ ->assertRaised();
+ }
+
public static function getValidIbans()
{
return [
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
index 80d21d5..56d8abc 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
@@ -53,6 +53,19 @@ class TimeValidatorTest extends ConstraintValidatorTestCase
$this->assertNoViolation();
}
+ /**
+ * @dataProvider getValidTimes
+ */
+ public function testValidTimesWithNewLine(string $time)
+ {
+ $this->validator->validate($time."\n", new Time());
+
+ $this->buildViolation('This value is not a valid time.')
+ ->setParameter('{{ value }}', '"'.$time."\n".'"')
+ ->setCode(Time::INVALID_FORMAT_ERROR)
+ ->assertRaised();
+ }
+
public static function getValidTimes()
{
return [
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
index e7bd83d..5441477 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -60,6 +60,19 @@ class UrlValidatorTest extends ConstraintValidatorTestCase
$this->assertNoViolation();
}
+ /**
+ * @dataProvider getValidUrls
+ */
+ public function testValidUrlsWithNewLine($url)
+ {
+ $this->validator->validate($url."\n", new Url());
+
+ $this->buildViolation('This value is not a valid URL.')
+ ->setParameter('{{ value }}', '"'.$url."\n".'"')
+ ->setCode(Url::INVALID_URL_ERROR)
+ ->assertRaised();
+ }
+
/**
* @dataProvider getValidUrlsWithWhitespaces
*/
@@ -85,6 +98,24 @@ class UrlValidatorTest extends ConstraintValidatorTestCase
$this->assertNoViolation();
}
+ /**
+ * @dataProvider getValidRelativeUrls
+ * @dataProvider getValidUrls
+ */
+ public function testValidRelativeUrlWithNewLine(string $url)
+ {
+ $constraint = new Url([
+ 'relativeProtocol' => true,
+ ]);
+
+ $this->validator->validate($url."\n", $constraint);
+
+ $this->buildViolation('This value is not a valid URL.')
+ ->setParameter('{{ value }}', '"'.$url."\n".'"')
+ ->setCode(Url::INVALID_URL_ERROR)
+ ->assertRaised();
+ }
+
public static function getValidRelativeUrls()
{
return [
|
