Merge branch '7.3' into 7.4

nicolas-grekas · nicolas-grekas · commit 14192e9c0974 · 2025-11-13T11:02:01.000+01:00
* 7.3:
  [FrameworkBundle] Fix wiring JsonStreamReader
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/json_streamer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/json_streamer.php
@@ -21,6 +21,7 @@
 use Symfony\Component\JsonStreamer\Mapping\Read\DateTimeTypePropertyMetadataLoader as ReadDateTimeTypePropertyMetadataLoader;
 use Symfony\Component\JsonStreamer\Mapping\Write\AttributePropertyMetadataLoader as WriteAttributePropertyMetadataLoader;
 use Symfony\Component\JsonStreamer\Mapping\Write\DateTimeTypePropertyMetadataLoader as WriteDateTimeTypePropertyMetadataLoader;
+use Symfony\Component\JsonStreamer\StreamerDumper;
 use Symfony\Component\JsonStreamer\ValueTransformer\DateTimeToStringValueTransformer;
 use Symfony\Component\JsonStreamer\ValueTransformer\StringToDateTimeValueTransformer;
 
@@ -39,8 +40,8 @@
                 tagged_locator('json_streamer.value_transformer'),
                 service('json_streamer.read.property_metadata_loader'),
                 param('.json_streamer.stream_readers_dir'),
+                class_exists(StreamerDumper::class) ? service('config_cache_factory')->ignoreOnInvalid() : param('.json_streamer.lazy_ghosts_dir'),
                 param('.json_streamer.lazy_ghosts_dir'),
-                service('config_cache_factory')->ignoreOnInvalid(),
             ])
         ->alias(JsonStreamWriter::class, 'json_streamer.stream_writer')
         ->alias(JsonStreamReader::class, 'json_streamer.stream_reader')
diff --git a/src/Symfony/Component/JsonStreamer/JsonStreamReader.php b/src/Symfony/Component/JsonStreamer/JsonStreamReader.php
@@ -44,9 +44,13 @@ public function __construct(
         private ContainerInterface $valueTransformers,
         PropertyMetadataLoaderInterface $propertyMetadataLoader,
         string $streamReadersDir,
+        ConfigCacheFactoryInterface|string|null $configCacheFactory = null,
         ?string $lazyGhostsDir = null,
-        ?ConfigCacheFactoryInterface $configCacheFactory = null,
     ) {
+        if (\is_string($configCacheFactory)) {
+            $lazyGhostsDir = $configCacheFactory;
+            $configCacheFactory = null;
+        }
         $this->streamReaderGenerator = new StreamReaderGenerator($propertyMetadataLoader, $streamReadersDir, $configCacheFactory);
         $this->instantiator = new Instantiator();
         $this->lazyInstantiator = new LazyInstantiator($lazyGhostsDir);
