Revert "[FrameworkBundle] Fallback to default cache system in production for serializer"

This reverts commit 4f0b8beea6.
This commit is contained in:
Ener-Getick 2016-04-25 18:39:01 +02:00
parent b44abe3361
commit 96e418a14f
No known key found for this signature in database
GPG Key ID: 9E5D2DB67BF054DD
5 changed files with 2 additions and 11 deletions

View File

@ -513,7 +513,7 @@ class Configuration implements ConfigurationInterface
->canBeEnabled()
->children()
->booleanNode('enable_annotations')->defaultFalse()->end()
->scalarNode('cache')->defaultValue('serializer.mapping.cache.symfony')->end()
->scalarNode('cache')->end()
->scalarNode('name_converter')->end()
->end()
->end()

View File

@ -982,7 +982,7 @@ class FrameworkExtension extends Extension
$chainLoader->replaceArgument(0, $serializerLoaders);
if (!$container->getParameter('kernel.debug')) {
if (isset($config['cache']) && $config['cache']) {
$container->setParameter(
'serializer.mapping.cache.prefix',
'serializer_'.$this->getKernelRootHash($container)

View File

@ -25,10 +25,6 @@
<tag name="cache.pool" clearer="cache.default_pools_clearer" />
</service>
<service id="cache.pool.serializer" parent="cache.adapter.local" public="false">
<tag name="cache.pool" clearer="cache.default_pools_clearer" />
</service>
<service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true">
<argument /> <!-- namespace -->
<argument /> <!-- default lifetime -->

View File

@ -38,10 +38,6 @@
</service>
<!-- Cache -->
<service id="serializer.mapping.cache.symfony" class="Symfony\Component\Cache\DoctrineProvider" public="false">
<argument type="service" id="cache.pool.serializer" />
</service>
<service id="serializer.mapping.cache.doctrine.apc" class="Doctrine\Common\Cache\ApcCache" public="false">
<call method="setNamespace">
<argument>%serializer.mapping.cache.prefix%</argument>

View File

@ -221,7 +221,6 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
'serializer' => array(
'enabled' => false,
'enable_annotations' => false,
'cache' => 'serializer.mapping.cache.symfony',
),
'property_access' => array(
'magic_call' => false,