Skip to content

Commit 49a4f17

Browse files
Merge branch '7.4' into 8.0
* 7.4: [Translation][Lokalise] fix "Project too big for sync export" [DependencyInjection] Fix lazy proxy creation for interfaces aliased to final classes [HttpKernel] Fix StreamedResponse with chunks support in HttpKernelBrowser [HttpFoundation] Fix AcceptHeader overwrites items with different parameters [JsonStreamer] Rebuild cache on class update [Routing] Fix default value not taken if usigng name:entity.attribute [Mime] Remove unused variable in Email::prepareParts [DependencyInjection] Fix merging explicit tags and #[AsTaggeditem]
2 parents 20c450f + 6972587 commit 49a4f17

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

Resources/config/json_streamer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@
3131
tagged_locator('json_streamer.value_transformer'),
3232
service('json_streamer.write.property_metadata_loader'),
3333
param('.json_streamer.stream_writers_dir'),
34+
service('config_cache_factory')->ignoreOnInvalid(),
3435
])
3536
->set('json_streamer.stream_reader', JsonStreamReader::class)
3637
->args([
3738
tagged_locator('json_streamer.value_transformer'),
3839
service('json_streamer.read.property_metadata_loader'),
3940
param('.json_streamer.stream_readers_dir'),
41+
service('config_cache_factory')->ignoreOnInvalid(),
4042
])
4143
->alias(JsonStreamWriter::class, 'json_streamer.stream_writer')
4244
->alias(JsonStreamReader::class, 'json_streamer.stream_reader')
@@ -104,6 +106,7 @@
104106
param('.json_streamer.stream_writers_dir'),
105107
param('.json_streamer.stream_readers_dir'),
106108
service('logger')->ignoreOnInvalid(),
109+
service('config_cache_factory')->ignoreOnInvalid(),
107110
])
108111
->tag('kernel.cache_warmer')
109112
;

Tests/Functional/JsonStreamerTest.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Bundle\FrameworkBundle\Tests\Functional\app\JsonStreamer\Dto\Dummy;
1515
use Symfony\Component\Filesystem\Filesystem;
16+
use Symfony\Component\JsonStreamer\StreamerDumper;
1617
use Symfony\Component\JsonStreamer\StreamReaderInterface;
1718
use Symfony\Component\JsonStreamer\StreamWriterInterface;
1819
use Symfony\Component\TypeInfo\Type;
@@ -62,6 +63,13 @@ public function testWarmupStreamableClasses()
6263
static::getContainer()->get('json_streamer.cache_warmer.streamer.alias')->warmUp(static::getContainer()->getParameter('kernel.cache_dir'));
6364

6465
$this->assertFileExists($streamWritersDir);
65-
$this->assertCount(2, glob($streamWritersDir.'/*'));
66+
67+
if (!class_exists(StreamerDumper::class)) {
68+
$this->assertCount(2, glob($streamWritersDir.'/*'));
69+
} else {
70+
$this->assertCount(2, glob($streamWritersDir.'/*.php'));
71+
$this->assertCount(2, glob($streamWritersDir.'/*.php.meta'));
72+
$this->assertCount(2, glob($streamWritersDir.'/*.php.meta.json'));
73+
}
6674
}
6775
}

0 commit comments

Comments
 (0)