Skip to content

Commit 86c4a2d

Browse files
fabpotfabpot
committed
Merge branch '6.1' into 6.2
* 6.1: Fix CS
2 parents 533c800 + c7b1d04 commit 86c4a2d

21 files changed

+35
-34
lines changed

‎Encoder/CsvEncoder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function encode(mixed $data, string $format, array $context = []): string
127127
*
128128
* @param array $context
129129
*/
130-
public function supportsEncoding(string $format /*, array $context = [] */): bool
130+
public function supportsEncoding(string $format /* , array $context = [] */): bool
131131
{
132132
return self::FORMAT === $format;
133133
}
@@ -215,7 +215,7 @@ public function decode(string $data, string $format, array $context = []): mixed
215215
*
216216
* @param array $context
217217
*/
218-
public function supportsDecoding(string $format /*, array $context = [] */): bool
218+
public function supportsDecoding(string $format /* , array $context = [] */): bool
219219
{
220220
return self::FORMAT === $format;
221221
}

‎Encoder/DecoderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ public function decode(string $data, string $format, array $context = []);
4444
*
4545
* @return bool
4646
*/
47-
public function supportsDecoding(string $format /*, array $context = [] */);
47+
public function supportsDecoding(string $format /* , array $context = [] */);
4848
}

‎Encoder/EncoderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ public function encode(mixed $data, string $format, array $context = []): string
3535
* @param string $format Format name
3636
* @param array $context Options that normalizers/encoders have access to
3737
*/
38-
public function supportsEncoding(string $format /*, array $context = [] */): bool;
38+
public function supportsEncoding(string $format /* , array $context = [] */): bool;
3939
}

‎Encoder/JsonDecode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function decode(string $data, string $format, array $context = []): mixed
9898
*
9999
* @param array $context
100100
*/
101-
public function supportsDecoding(string $format /*, array $context = [] */): bool
101+
public function supportsDecoding(string $format /* , array $context = [] */): bool
102102
{
103103
return JsonEncoder::FORMAT === $format;
104104
}

‎Encoder/JsonEncode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function encode(mixed $data, string $format, array $context = []): string
6060
*
6161
* @param array $context
6262
*/
63-
public function supportsEncoding(string $format /*, array $context = [] */): bool
63+
public function supportsEncoding(string $format /* , array $context = [] */): bool
6464
{
6565
return JsonEncoder::FORMAT === $format;
6666
}

‎Encoder/JsonEncoder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function decode(string $data, string $format, array $context = []): mixed
5050
*
5151
* @param array $context
5252
*/
53-
public function supportsEncoding(string $format /*, array $context = [] */): bool
53+
public function supportsEncoding(string $format /* , array $context = [] */): bool
5454
{
5555
return self::FORMAT === $format;
5656
}
@@ -60,7 +60,7 @@ public function supportsEncoding(string $format /*, array $context = [] */): boo
6060
*
6161
* @param array $context
6262
*/
63-
public function supportsDecoding(string $format /*, array $context = [] */): bool
63+
public function supportsDecoding(string $format /* , array $context = [] */): bool
6464
{
6565
return self::FORMAT === $format;
6666
}

‎Encoder/XmlEncoder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function decode(string $data, string $format, array $context = []): mixed
169169
*
170170
* @param array $context
171171
*/
172-
public function supportsEncoding(string $format /*, array $context = [] */): bool
172+
public function supportsEncoding(string $format /* , array $context = [] */): bool
173173
{
174174
return self::FORMAT === $format;
175175
}
@@ -179,7 +179,7 @@ public function supportsEncoding(string $format /*, array $context = [] */): boo
179179
*
180180
* @param array $context
181181
*/
182-
public function supportsDecoding(string $format /*, array $context = [] */): bool
182+
public function supportsDecoding(string $format /* , array $context = [] */): bool
183183
{
184184
return self::FORMAT === $format;
185185
}

‎Encoder/YamlEncoder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function encode(mixed $data, string $format, array $context = []): string
7070
*
7171
* @param array $context
7272
*/
73-
public function supportsEncoding(string $format /*, array $context = [] */): bool
73+
public function supportsEncoding(string $format /* , array $context = [] */): bool
7474
{
7575
return self::FORMAT === $format || self::ALTERNATIVE_FORMAT === $format;
7676
}
@@ -90,7 +90,7 @@ public function decode(string $data, string $format, array $context = []): mixed
9090
*
9191
* @param array $context
9292
*/
93-
public function supportsDecoding(string $format /*, array $context = [] */): bool
93+
public function supportsDecoding(string $format /* , array $context = [] */): bool
9494
{
9595
return self::FORMAT === $format || self::ALTERNATIVE_FORMAT === $format;
9696
}

‎Normalizer/AbstractObjectNormalizer.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
138138
*
139139
* @param array $context
140140
*/
141-
public function supportsNormalization(mixed $data, string $format = null /*, array $context = [] */)
141+
public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */)
142142
{
143143
return \is_object($data) && !$data instanceof \Traversable;
144144
}
@@ -305,7 +305,7 @@ abstract protected function getAttributeValue(object $object, string $attribute,
305305
*
306306
* @param array $context
307307
*/
308-
public function supportsDenormalization(mixed $data, string $type, string $format = null /*, array $context = [] */)
308+
public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */)
309309
{
310310
return class_exists($type) || (interface_exists($type, false) && $this->classDiscriminatorResolver && null !== $this->classDiscriminatorResolver->getMappingForClass($type));
311311
}
@@ -474,6 +474,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
474474
if (is_numeric($data)) {
475475
return (float) $data;
476476
}
477+
477478
return match ($data) {
478479
'NaN' => \NAN,
479480
'INF' => \INF,

‎Normalizer/ConstraintViolationListNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function normalize(mixed $object, string $format = null, array $context =
109109
*
110110
* @param array $context
111111
*/
112-
public function supportsNormalization(mixed $data, string $format = null /*, array $context = [] */): bool
112+
public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */): bool
113113
{
114114
return $data instanceof ConstraintViolationListInterface;
115115
}

0 commit comments

Comments
 (0)