Skip to content

Commit ef6f8cc

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.0
* 4.4: (28 commits) bug #34554 [HttpClient] Fix early cleanup of pushed HTTP/2 responses (lyrixx) Fix tests [Console] Fix commands description with numeric namespaces [HttpFoundation] Fixed typo [DI] Skip unknown method calls for factories in check types pass [EventDispatcher] Better error reporting when arguments to dispatch() are swapped improve upgrade instructions for twig.exception_controller configuration [HttpFoundation] Update CHANGELOG for PdoSessionHandler BC BREAK in 4.4 [Serializer] CsvEncoder::NO_HEADERS_KEY ignored when used in constructor [Form] Keep preferred_choices order for choice groups [Debug] work around failing chdir() on Darwin [PhpUnitBridge] Read configuration CLI directive [DI] Missing test on YamlFileLoader Revert "minor #34608 [Process] add tests for php executable finder if file does not exist (ahmedash95)" Simpler example for Apache basic auth workaround [Console] Fix trying to access array offset on value of type int [Config] Remove extra sprintf arg [HttpKernel] fix typo [HttpKernel] Support typehint to deprecated FlattenException in controller Add preview mode support for Html and Serializer error renderers ...
2 parents 2e09e8f + 69ac426 commit ef6f8cc

File tree

5 files changed

+34
-15
lines changed

5 files changed

+34
-15
lines changed

‎DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1510,7 +1510,7 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
15101510
$storeDefinitions = [];
15111511
foreach ($resourceStores as $storeDsn) {
15121512
$storeDsn = $container->resolveEnvPlaceholders($storeDsn, null, $usedEnvs);
1513-
$storeDefinition = new Definition(PersistingStoreInterface::class);
1513+
$storeDefinition = new Definition(interface_exists(StoreInterface::class) ? StoreInterface::class : PersistingStoreInterface::class);
15141514
$storeDefinition->setFactory([StoreFactory::class, 'createStore']);
15151515
$storeDefinition->setArguments([$storeDsn]);
15161516

‎Resources/config/error_renderer.xml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,26 @@
66

77
<services>
88
<service id="error_handler.error_renderer.html" class="Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer">
9-
<argument>%kernel.debug%</argument>
9+
<argument type="service">
10+
<service>
11+
<factory class="Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer" method="isDebug" />
12+
<argument type="service" id="request_stack" />
13+
<argument>%kernel.debug%</argument>
14+
</service>
15+
</argument>
1016
<argument>%kernel.charset%</argument>
1117
<argument type="service" id="debug.file_link_formatter" on-invalid="null" />
1218
<argument>%kernel.project_dir%</argument>
13-
<argument type="service" id="request_stack" />
14-
<argument type="service" id="logger" on-invalid="null" />
15-
</service>
16-
17-
<service id="error_handler.error_renderer.serializer" class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer">
18-
<argument type="service" id="serializer" />
1919
<argument type="service">
2020
<service>
21-
<factory class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer" method="getPreferredFormat" />
21+
<factory class="Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer" method="getAndCleanOutputBuffer" />
2222
<argument type="service" id="request_stack" />
2323
</service>
2424
</argument>
25-
<argument type="service" id="error_renderer.html" />
25+
<argument type="service" id="logger" on-invalid="null" />
2626
</service>
2727

2828
<service id="error_renderer.html" alias="error_handler.error_renderer.html" />
29-
<service id="error_renderer.serializer" alias="error_handler.error_renderer.serializer" />
3029
<service id="error_renderer" alias="error_renderer.html" />
3130
</services>
3231
</container>

‎Resources/config/serializer.xml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<services>
1313
<defaults public="false" />
1414

15-
<service id="error_renderer" alias="error_renderer.serializer" />
16-
1715
<service id="serializer" class="Symfony\Component\Serializer\Serializer" public="true">
1816
<argument type="collection" />
1917
<argument type="collection" />
@@ -152,5 +150,26 @@
152150

153151
<tag name="property_info.list_extractor" priority="-999" />
154152
</service>
153+
154+
<!-- ErrorRenderer integration -->
155+
<service id="error_renderer" alias="error_renderer.serializer" />
156+
<service id="error_renderer.serializer" alias="error_handler.error_renderer.serializer" />
157+
<service id="error_handler.error_renderer.serializer" class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer">
158+
<argument type="service" id="serializer" />
159+
<argument type="service">
160+
<service>
161+
<factory class="Symfony\Component\ErrorHandler\ErrorRenderer\SerializerErrorRenderer" method="getPreferredFormat" />
162+
<argument type="service" id="request_stack" />
163+
</service>
164+
</argument>
165+
<argument type="service" id="error_renderer.html" />
166+
<argument type="service">
167+
<service>
168+
<factory class="Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer" method="isDebug" />
169+
<argument type="service" id="request_stack" />
170+
<argument>%kernel.debug%</argument>
171+
</service>
172+
</argument>
173+
</service>
155174
</services>
156175
</container>

‎Tests/Functional/Bundle/TestBundle/TestBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ public function build(ContainerBuilder $container)
3737
$extension->setCustomConfig(new CustomConfig());
3838

3939
$container->addCompilerPass(new AnnotationReaderPass(), PassConfig::TYPE_AFTER_REMOVING);
40-
$container->addCompilerPass(new CheckTypeDeclarationsPass(true, ['http_client', '.debug.http_client']), PassConfig::TYPE_AFTER_REMOVING, -100);
40+
$container->addCompilerPass(new CheckTypeDeclarationsPass(true), PassConfig::TYPE_AFTER_REMOVING, -100);
4141
}
4242
}

‎composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"ext-xml": "*",
2121
"symfony/cache": "^4.4|^5.0",
2222
"symfony/config": "^5.0",
23-
"symfony/dependency-injection": "^5.0",
23+
"symfony/dependency-injection": "^5.0.1",
24+
"symfony/error-handler": "^4.4.1|^5.0.1",
2425
"symfony/http-foundation": "^4.4|^5.0",
2526
"symfony/http-kernel": "^5.0",
2627
"symfony/polyfill-mbstring": "~1.0",

0 commit comments

Comments
 (0)