Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit 5d67fae2869c · 2025-08-13T16:12:15.000+02:00
* 7.4:
  Fix merge
  Fix merge
diff --git a/Tests/Fixtures/stream_reader/list.php b/Tests/Fixtures/stream_reader/list.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @return array<int,mixed>
+ * @return list<mixed>
  */
 return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
     return \Symfony\Component\JsonStreamer\Read\Decoder::decodeString((string) $string);
diff --git a/Tests/Fixtures/stream_reader/list.stream.php b/Tests/Fixtures/stream_reader/list.stream.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @return array<int,mixed>
+ * @return list<mixed>
  */
 return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
     $providers['list<mixed>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
diff --git a/Tests/Fixtures/stream_reader/nullable_object_list.php b/Tests/Fixtures/stream_reader/nullable_object_list.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @return array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null
+ * @return list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null
  */
 return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
     $providers['list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
diff --git a/Tests/Fixtures/stream_reader/nullable_object_list.stream.php b/Tests/Fixtures/stream_reader/nullable_object_list.stream.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @return array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null
+ * @return list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>|null
  */
 return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
     $providers['list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
diff --git a/Tests/Fixtures/stream_reader/object_list.php b/Tests/Fixtures/stream_reader/object_list.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @return array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
+ * @return list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
  */
 return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
     $providers['list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
diff --git a/Tests/Fixtures/stream_reader/object_list.stream.php b/Tests/Fixtures/stream_reader/object_list.stream.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @return array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
+ * @return list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>
  */
 return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
     $providers['list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\ClassicDummy>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
diff --git a/Tests/Fixtures/stream_reader/union.php b/Tests/Fixtures/stream_reader/union.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @return Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes|array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum>|int
+ * @return Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes|int|list<Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum>
  */
 return static function (string|\Stringable $string, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\Instantiator $instantiator, array $options): mixed {
     $providers['list<Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum>'] = static function ($data) use ($options, $valueTransformers, $instantiator, &$providers) {
diff --git a/Tests/Fixtures/stream_reader/union.stream.php b/Tests/Fixtures/stream_reader/union.stream.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @return Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes|array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum>|int
+ * @return Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes|int|list<Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum>
  */
 return static function (mixed $stream, \Psr\Container\ContainerInterface $valueTransformers, \Symfony\Component\JsonStreamer\Read\LazyInstantiator $instantiator, array $options): mixed {
     $providers['list<Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum>'] = static function ($stream, $offset, $length) use ($options, $valueTransformers, $instantiator, &$providers) {
diff --git a/Tests/Fixtures/stream_writer/bool_list.php b/Tests/Fixtures/stream_writer/bool_list.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @param array<int,bool> $data
+ * @param list<bool> $data
  */
 return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
     try {
diff --git a/Tests/Fixtures/stream_writer/double_nested_list.php b/Tests/Fixtures/stream_writer/double_nested_list.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @param array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNestedArray> $data
+ * @param list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNestedArray> $data
  */
 return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
     try {
diff --git a/Tests/Fixtures/stream_writer/list.php b/Tests/Fixtures/stream_writer/list.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @param array<int,mixed> $data
+ * @param list<mixed> $data
  */
 return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
     try {
diff --git a/Tests/Fixtures/stream_writer/nested_list.php b/Tests/Fixtures/stream_writer/nested_list.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @param array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithArray> $data
+ * @param list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithArray> $data
  */
 return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
     try {
diff --git a/Tests/Fixtures/stream_writer/null_list.php b/Tests/Fixtures/stream_writer/null_list.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @param array<int,null> $data
+ * @param list<null> $data
  */
 return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
     try {
diff --git a/Tests/Fixtures/stream_writer/nullable_object_list.php b/Tests/Fixtures/stream_writer/nullable_object_list.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @param array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes>|null $data
+ * @param list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes>|null $data
  */
 return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
     try {
diff --git a/Tests/Fixtures/stream_writer/object_list.php b/Tests/Fixtures/stream_writer/object_list.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @param array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes> $data
+ * @param list<Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes> $data
  */
 return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
     try {
diff --git a/Tests/Fixtures/stream_writer/union.php b/Tests/Fixtures/stream_writer/union.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @param Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes|array<int,Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum>|int $data
+ * @param Symfony\Component\JsonStreamer\Tests\Fixtures\Model\DummyWithNameAttributes|int|list<Symfony\Component\JsonStreamer\Tests\Fixtures\Enum\DummyBackedEnum> $data
  */
 return static function (mixed $data, \Psr\Container\ContainerInterface $valueTransformers, array $options): \Traversable {
     try {
