8000 Revert "[FrameworkBundle] Fallback to default cache system in product… · symfony/symfony@96e418a · GitHub
[go: up one dir, main page]
Skip to content

Commit 96e418a

Browse files
GuilhemNGuilhemN
committed
Revert "[FrameworkBundle] Fallback to default cache system in production for serializer"
This reverts commit 4f0b8be.
1 parent b44abe3 commit 96e418a

File tree

5 files changed

+2
-11
lines changed

5 files changed

+2
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode)
513513
->canBeEnabled()
514514
->children()
515515
->booleanNode('enable_annotations')->defaultFalse()->end()
516-
->scalarNode('cache')->defaultValue('serializer.mapping.cache.symfony')->end()
516+
->scalarNode('cache')->end()
517517
->scalarNode('name_converter')->end()
518518
->end()
519519
->end()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
982982

983983
$chainLoader->replaceArgument(0, $serializerLoaders);
984984

985-
if (!$container->getParameter('kernel.debug')) {
985+
if (isset($config['cache']) && $config['cache']) {
986986
$container->setParameter(
987987
'serializer.mapping.cache.prefix',
988988
'serializer_'.$this->getKernelRootHash($container)

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

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

28-
<service id="cache.pool.serializer" parent="cache.adapter.local" public="false">
29-
<tag name="cache.pool" clearer="cache.default_pools_clearer" />
30-
</service>
31-
3228
<service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true">
3329
<argument /> <!-- namespace -->
3430
<argument /> <!-- default lifetime -->

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
</service>
3939

4040
<!-- Cache -->
41-
<service id="serializer.mapping.cache.symfony" class="Symfony\Component\Cache\DoctrineProvider" public="false">
42-
<argument type="service" id="cache.pool.serializer" />
43-
</service>
44-
4541
<service id="serializer.mapping.cache.doctrine.apc" class="Doctrine\Common\Cache\ApcCache" public="false">
4642
<call method="setNamespace">
4743
<argument>%serializer.mapping.cache.prefix%</argument>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ protected static function getBundleDefaultConfig()
221221
'serializer' => array(
222222
'enabled' => false,
223223
'enable_annotations' => false,
224-
'cache' => 'serializer.mapping.cache.symfony',
225224
),
226225
'property_access' => array(
227226
'magic_call' => false,

0 commit comments

Comments
 (0)
0