Skip to content

Commit 16a18bf

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.4
* 4.4: CS fixes Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents 3034905 + 9b0274c commit 16a18bf

26 files changed

+85
-85
lines changed

‎Constraints/BicValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function validate($value, Constraint $constraint)
6868
return;
6969
}
7070

71-
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
71+
if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
7272
throw new UnexpectedValueException($value, 'string');
7373
}
7474

‎Constraints/CountryValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function validate($value, Constraint $constraint)
3737
return;
3838
}
3939

40-
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
40+
if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
4141
throw new UnexpectedValueException($value, 'string');
4242
}
4343

‎Constraints/CurrencyValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function validate($value, Constraint $constraint)
3838
return;
3939
}
4040

41-
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
41+
if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
4242
throw new UnexpectedValueException($value, 'string');
4343
}
4444

‎Constraints/DateTimeValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function validate($value, Constraint $constraint)
3434
return;
3535
}
3636

37-
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
37+
if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
3838
throw new UnexpectedValueException($value, 'string');
3939
}
4040

‎Constraints/DateValidator.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function validate($value, Constraint $constraint)
4646
return;
4747
}
4848

49-
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
49+
if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
5050
throw new UnexpectedValueException($value, 'string');
5151
}
5252

@@ -62,9 +62,9 @@ public function validate($value, Constraint $constraint)
6262
}
6363

6464
if (!self::checkDate(
65-
$matches['year'] ?? $matches[1],
66-
$matches['month'] ?? $matches[2],
67-
$matches['day'] ?? $matches[3]
65+
$matches['year'] ?? $matches[1],
66+
$matches['month'] ?? $matches[2],
67+
$matches['day'] ?? $matches[3]
6868
)) {
6969
$this->context->buildViolation($constraint->message)
7070
->setParameter('{{ value }}', $this->formatValue($value))

‎Constraints/EmailValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function validate($value, Constraint $constraint)
5656
return;
5757
}
5858

59-
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
59+
if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
6060
throw new UnexpectedValueException($value, 'string');
6161
}
6262

‎Constraints/FileValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function validate($value, Constraint $constraint)
116116
}
117117
}
118118

119-
if (!is_scalar($value) && !$value instanceof FileObject && !(\is_object($value) && method_exists($value, '__toString'))) {
119+
if (!\is_scalar($value) && !$value instanceof FileObject && !(\is_object($value) && method_exists($value, '__toString'))) {
120120
throw new UnexpectedValueException($value, 'string');
121121
}
122122

‎Constraints/HostnameValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function validate($value, Constraint $constraint)
4141
return;
4242
}
4343

44-
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
44+
if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
4545
throw new UnexpectedValueException($value, 'string');
4646
}
4747

‎Constraints/IbanValidator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public function validate($value, Constraint $constraint)
150150
return;
151151
}
152152

153-
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
153+
if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
154154
throw new UnexpectedValueException($value, 'string');
155155
}
156156

‎Constraints/IpValidator.php‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function validate($value, Constraint $constraint)
3737
return;
3838
}
3939

40-
if (!is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
40+
if (!\is_scalar($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
4141
throw new UnexpectedValueException($value, 'string');
4242
}
4343

@@ -49,48 +49,48 @@ public function validate($value, Constraint $constraint)
4949

5050
switch ($constraint->version) {
5151
case Ip::V4:
52-
$flag = \FILTER_FLAG_IPV4;
53-
break;
52+
$flag = \FILTER_FLAG_IPV4;
53+
break;
5454

5555
case Ip::V6:
56-
$flag = \FILTER_FLAG_IPV6;
57-
break;
56+
$flag = \FILTER_FLAG_IPV6;
57+
break;
5858

5959
case Ip::V4_NO_PRIV:
60-
$flag = \FILTER_FLAG_IPV4 | \FILTER_FLAG_NO_PRIV_RANGE;
61-
break;
60+
$flag = \FILTER_FLAG_IPV4 | \FILTER_FLAG_NO_PRIV_RANGE;
61+
break;
6262

6363
case Ip::V6_NO_PRIV:
64-
$flag = \FILTER_FLAG_IPV6 | \FILTER_FLAG_NO_PRIV_RANGE;
65-
break;
64+
$flag = \FILTER_FLAG_IPV6 | \FILTER_FLAG_NO_PRIV_RANGE;
65+
break;
6666

6767
case Ip::ALL_NO_PRIV:
68-
$flag = \FILTER_FLAG_NO_PRIV_RANGE;
69-
break;
68+
$flag = \FILTER_FLAG_NO_PRIV_RANGE;
69+
break;
7070

7171
case Ip::V4_NO_RES:
72-
$flag = \FILTER_FLAG_IPV4 | \FILTER_FLAG_NO_RES_RANGE;
73-
break;
72+
$flag = \FILTER_FLAG_IPV4 | \FILTER_FLAG_NO_RES_RANGE;
73+
break;
7474

7575
case Ip::V6_NO_RES:
76-
$flag = \FILTER_FLAG_IPV6 | \FILTER_FLAG_NO_RES_RANGE;
77-
break;
76+
$flag = \FILTER_FLAG_IPV6 | \FILTER_FLAG_NO_RES_RANGE;
77+
break;
7878

7979
case Ip::ALL_NO_RES:
80-
$flag = \FILTER_FLAG_NO_RES_RANGE;
81-
break;
80+
$flag = \FILTER_FLAG_NO_RES_RANGE;
81+
break;
8282

8383
case Ip::V4_ONLY_PUBLIC:
84-
$flag = \FILTER_FLAG_IPV4 | \FILTER_FLAG_NO_PRIV_RANGE | \FILTER_FLAG_NO_RES_RANGE;
85-
break;
84+
$flag = \FILTER_FLAG_IPV4 | \FILTER_FLAG_NO_PRIV_RANGE | \FILTER_FLAG_NO_RES_RANGE;
85+
break;
8686

8787
case Ip::V6_ONLY_PUBLIC:
88-
$flag = \FILTER_FLAG_IPV6 | \FILTER_FLAG_NO_PRIV_RANGE | \FILTER_FLAG_NO_RES_RANGE;
89-
break;
88+
$flag = \FILTER_FLAG_IPV6 | \FILTER_FLAG_NO_PRIV_RANGE | \FILTER_FLAG_NO_RES_RANGE;
89+
break;
9090

9191
case Ip::ALL_ONLY_PUBLIC:
92-
$flag = \FILTER_FLAG_NO_PRIV_RANGE | \FILTER_FLAG_NO_RES_RANGE;
93-
break;
92+
$flag = \FILTER_FLAG_NO_PRIV_RANGE | \FILTER_FLAG_NO_RES_RANGE;
93+
break;
9494

9595
default:
9696
$flag = 0;

0 commit comments

Comments
 (0)