Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit205f808

Browse files
committed
[FrameworkBundle] Deprecate framework.serializer.cache
1 parent37b5e24 commit205f808

File tree

6 files changed

+77
-0
lines changed

6 files changed

+77
-0
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
useSymfony\Component\Finder\Finder;
2525
useSymfony\Component\HttpKernel\DependencyInjection\Extension;
2626
useSymfony\Component\Config\FileLocator;
27+
useSymfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
2728
useSymfony\Component\Serializer\Normalizer\DataUriNormalizer;
2829
useSymfony\Component\Serializer\Normalizer\DateTimeNormalizer;
2930
useSymfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
@@ -983,6 +984,8 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
983984
$chainLoader->replaceArgument(0,$serializerLoaders);
984985

985986
if (isset($config['cache']) &&$config['cache']) {
987+
@trigger_error('The "framework.serializer.cache" option is deprecated since Symfony 3.1 and will be removed in 4.0. You can configure a cache pool called "serializer" under "framework.cache.pools" instead.',E_USER_DEPRECATED);
988+
986989
$container->setParameter(
987990
'serializer.mapping.cache.prefix',
988991
'serializer_'.$this->getKernelRootHash($container)
@@ -991,6 +994,18 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
991994
$container->getDefinition('serializer.mapping.class_metadata_factory')->replaceArgument(
992995
1,newReference($config['cache'])
993996
);
997+
}elseif (!$container->getParameter('kernel.debug')) {
998+
$cacheMetadataFactory =newDefinition(
999+
CacheClassMetadataFactory::class,
1000+
array(
1001+
newReference('serializer.mapping.class_metadata_factory.inner'),
1002+
newReference('cache.pool.serializer'),
1003+
)
1004+
);
1005+
$cacheMetadataFactory->setPublic(false);
1006+
$cacheMetadataFactory->setDecoratedService('serializer.mapping.class_metadata_factory');
1007+
1008+
$container->setDefinition('serializer.mapping.cache_class_metadata_factory',$cacheMetadataFactory);
9941009
}
9951010

9961011
if (isset($config['name_converter']) &&$config['name_converter']) {

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/cache_pools.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<tagname="cache.pool"clearer="cache.default_pools_clearer" />
2626
</service>
2727

28+
<serviceid="cache.pool.serializer"parent="cache.adapter.local"public="false">
29+
<tagname="cache.pool"clearer="cache.default_pools_clearer" />
30+
</service>
31+
2832
<serviceid="cache.adapter.apcu"class="Symfony\Component\Cache\Adapter\ApcuAdapter"abstract="true">
2933
<argument /><!-- namespace-->
3034
<argument /><!-- default lifetime-->
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework',array(
4+
'serializer' =>array(
5+
'enabled' =>true,
6+
'cache' =>'foo',
7+
),
8+
));
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<containerxmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config>
9+
<framework:serializerenabled="true"cache="foo"/>
10+
</framework:config>
11+
</container>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
framework:
2+
serializer:
3+
enabled:true
4+
cache:foo

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,41 @@ public function testObjectNormalizerRegistered()
521521
$this->assertEquals(-1000,$tag[0]['priority']);
522522
}
523523

524+
publicfunctiontestSerializerCacheActivated()
525+
{
526+
$container =$this->createContainerFromFile('serializer_enabled');
527+
$this->assertTrue($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
528+
}
529+
530+
publicfunctiontestSerializerCacheDisabled()
531+
{
532+
$container =$this->createContainerFromFile('serializer_enabled',array('kernel.debug' =>true,'kernel.container_class' =>__CLASS__));
533+
$this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
534+
}
535+
536+
publicfunctiontestDeprecatedSerializerCacheOption()
537+
{
538+
$deprecations =array();
539+
set_error_handler(function ($type,$msg)use (&$deprecations) {
540+
if (E_USER_DEPRECATED !==$type) {
541+
restore_error_handler();
542+
543+
returncall_user_func_array('PHPUnit_Util_ErrorHandler::handleError',func_get_args());
544+
}
545+
546+
$deprecations[] =$msg;
547+
});
548+
549+
$container =$this->createContainerFromFile('serializer_cache',array('kernel.debug' =>true,'kernel.container_class' =>__CLASS__));
550+
551+
restore_error_handler();
552+
553+
$this->assertCount(1,$deprecations);
554+
$this->assertContains('The "framework.serializer.cache" option is deprecated',$deprecations[0]);
555+
$this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
556+
$this->assertEquals(newReference('foo'),$container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1));
557+
}
558+
524559
publicfunctiontestAssetHelperWhenAssetsAreEnabled()
525560
{
526561
$container =$this->createContainerFromFile('full');

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp