Merge remote-tracking branch 'RobinvdVleuten/master' into cache-adapter
Conflicts: Resources/config/gaufrette.xml
This commit is contained in:
@@ -35,6 +35,9 @@
|
||||
<service id="knp_gaufrette.adapter.factory.apc" class="Knp\Bundle\GaufretteBundle\DependencyInjection\Factory\ApcAdapterFactory">
|
||||
<tag name="gaufrette.adapter.factory" />
|
||||
</service>
|
||||
<service id="knp_gaufrette.adapter.factory.cache" class="Knp\Bundle\GaufretteBundle\DependencyInjection\Factory\CacheAdapterFactory">
|
||||
<tag name="gaufrette.adapter.factory" />
|
||||
</service>
|
||||
|
||||
</services>
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@
|
||||
<argument /><!-- prefix -->
|
||||
<argument /><!-- ttl -->
|
||||
</service>
|
||||
<service id="knp_gaufrette.adapter.cache" class="Gaufrette\Adapter\Cache" abstract="true" public="false" />
|
||||
<service id="knp_gaufrette.filesystem_map" class="%knp_gaufrette.filesystem_map.class%">
|
||||
<argument /> <!-- map of filesystems -->
|
||||
</service>
|
||||
|
||||
Reference in New Issue
Block a user