Skip to content

Commit f8a1dfd

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '7.4' into 8.0
* 7.4: [TypeInfo] Add space after glue comma Remove obsolete code for solved Psalm issue in workflow [HttpKernel] #[MapUploadedFile] throws http exception on empty files array if argument not nullable nor has default value [Mailer] Add compatibility for Mailtrap's sandbox [Serializer] Replace Japan timezone with Asia/Tokyo [Config] Reduce the size of serialized resource checkers
2 parents 27737ba + 2f8ceba commit f8a1dfd

File tree

12 files changed

+32
-32
lines changed

12 files changed

+32
-32
lines changed

‎Tests/Fixtures/stream_reader/dict.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* @return array<string,mixed>
4+
* @return array<string, mixed>
55
*/
66
return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
77
return \Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string);

‎Tests/Fixtures/stream_reader/dict.stream.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

33
/**
4-
* @return array<string,mixed>
4+
* @return array<string, mixed>
55
*/
66
return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
7-
$providers['array<string,mixed>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
7+
$providers['array<string, mixed>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
88
$data = \Symfony\Component\JsonStreamer\Read\Splitter::splitDict($stream, $offset, $length);
99
$iterable = static function ($stream, $data) use ($options, $valueTransformers, $instantiator, &$providers) {
1010
foreach ($data as $k => $v) {
@@ -13,5 +13,5 @@
1313
};
1414
return \iterator_to_array($iterable($stream, $data));
1515
};
16-
return $providers['array<string,mixed>']($stream, 0, null);
16+
return $providers['array<string, mixed>']($stream, 0, null);
1717
};

‎Tests/Fixtures/stream_reader/nullable_object_dict.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

33
/**
4-
* @return array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null
4+
* @return array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null
55
*/
66
return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
7-
$providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
7+
$providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
88
$iterable = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
99
foreach ($data as $k => $v) {
1010
yield $k => $providers['Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy']($v);
@@ -17,14 +17,14 @@
1717
return '_symfony_missing_value' !== $v;
1818
}));
1919
};
20-
$providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
20+
$providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
2121
if (\is_array($data)) {
22-
return $providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>']($data);
22+
return $providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>']($data);
2323
}
2424
if (null === $data) {
2525
return null;
2626
}
27-
throw new \Symfony\Component\JsonStreamer\Exception\UnexpectedValueException(\sprintf('Unexpected "%s" value for "array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null".', \get_debug_type($data)));
27+
throw new \Symfony\Component\JsonStreamer\Exception\UnexpectedValueException(\sprintf('Unexpected "%s" value for "array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null".', \get_debug_type($data)));
2828
};
29-
return $providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null'](\Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string));
29+
return $providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null'](\Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string));
3030
};

‎Tests/Fixtures/stream_reader/nullable_object_dict.stream.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

33
/**
4-
* @return array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null
4+
* @return array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null
55
*/
66
return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
7-
$providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
7+
$providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
88
$data = \Symfony\Component\JsonStreamer\Read\Splitter::splitDict($stream, $offset, $length);
99
$iterable = static function ($stream, $data) use ($options, $valueTransformers, $instantiator, &$providers) {
1010
foreach ($data as $k => $v) {
@@ -25,15 +25,15 @@
2525
}
2626
});
2727
};
28-
$providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
28+
$providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
2929
$data = \Symfony\Component\JsonStreamer\Read\Decoder::decodeStream($stream, $offset, $length);
3030
if (\is_array($data)) {
31-
return $providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>']($data);
31+
return $providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>']($data);
3232
}
3333
if (null === $data) {
3434
return null;
3535
}
36-
throw new \Symfony\Component\JsonStreamer\Exception\UnexpectedValueException(\sprintf('Unexpected "%s" value for "array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null".', \get_debug_type($data)));
36+
throw new \Symfony\Component\JsonStreamer\Exception\UnexpectedValueException(\sprintf('Unexpected "%s" value for "array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null".', \get_debug_type($data)));
3737
};
38-
return $providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null']($stream, 0, null);
38+
return $providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null']($stream, 0, null);
3939
};

‎Tests/Fixtures/stream_reader/object_dict.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

33
/**
4-
* @return array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
4+
* @return array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
55
*/
66
return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
7-
$providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
7+
$providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
88
$iterable = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
99
foreach ($data as $k => $v) {
1010
yield $k => $providers['Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy']($v);
@@ -17,5 +17,5 @@
1717
return '_symfony_missing_value' !== $v;
1818
}));
1919
};
20-
return $providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'](\Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string));
20+
return $providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'](\Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string));
2121
};

‎Tests/Fixtures/stream_reader/object_dict.stream.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

33
/**
4-
* @return array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
4+
* @return array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
55
*/
66
return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
7-
$providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
7+
$providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
88
$data = \Symfony\Component\JsonStreamer\Read\Splitter::splitDict($stream, $offset, $length);
99
$iterable = static function ($stream, $data) use ($options, $valueTransformers, $instantiator, &$providers) {
1010
foreach ($data as $k => $v) {
@@ -25,5 +25,5 @@
2525
}
2626
});
2727
};
28-
return $providers['array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>']($stream, 0, null);
28+
return $providers['array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>']($stream, 0, null);
2929
};

‎Tests/Fixtures/stream_reader/object_iterable.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

33
/**
4-
* @return iterable<int|string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
4+
* @return iterable<int|string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
55
*/
66
return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
7-
$providers['iterable<int|string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
7+
$providers['iterable<int|string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
88
$iterable = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
99
foreach ($data as $k => $v) {
1010
yield $k => $providers['Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy']($v);
@@ -17,5 +17,5 @@
1717
return '_symfony_missing_value' !== $v;
1818
}));
1919
};
20-
return $providers['iterable<int|string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'](\Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string));
20+
return $providers['iterable<int|string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'](\Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string));
2121
};

‎Tests/Fixtures/stream_reader/object_iterable.stream.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

33
/**
4-
* @return iterable<int|string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
4+
* @return iterable<int|string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
55
*/
66
return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
7-
$providers['iterable<int|string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
7+
$providers['iterable<int|string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
88
$data = \Symfony\Component\JsonStreamer\Read\Splitter::splitDict($stream, $offset, $length);
99
$iterable = static function ($stream, $data) use ($options, $valueTransformers, $instantiator, &$providers) {
1010
foreach ($data as $k => $v) {
@@ -25,5 +25,5 @@
2525
}
2626
});
2727
};
28-
return $providers['iterable<int|string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>']($stream, 0, null);
28+
return $providers['iterable<int|string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>']($stream, 0, null);
2929
};

‎Tests/Fixtures/stream_writer/dict.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* @param array<string,mixed> $data
4+
* @param array<string, mixed> $data
55
*/
66
return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
77
try {

‎Tests/Fixtures/stream_writer/nullable_object_dict.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* @param array<string,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes>|null $data
4+
* @param array<string, Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes>|null $data
55
*/
66
return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
77
try {

0 commit comments

Comments
 (0)