Skip to content
This repository has been archived by the owner on Jul 28, 2022. It is now read-only.

Commit

Permalink
Apply XML lint (#109)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SonataCI
SonataCI committed Jun 8, 2016
1 parent 9e58b53 commit e30a9b2
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 125 deletions.
110 changes: 47 additions & 63 deletions Resources/config/cache.xml
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,68 @@
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<?xml version="1.0" encoding="UTF-8"?>
<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>

<service id="sonata.cache.manager" class="Sonata\Cache\CacheManager" >
<argument />
<argument />
<service id="sonata.cache.manager" class="Sonata\Cache\CacheManager">
<argument/>
<argument/>
</service>


<service id="sonata.cache.recorder" class="Sonata\Cache\Invalidation\Recorder" >
<service id="sonata.cache.recorder" class="Sonata\Cache\Invalidation\Recorder">
<argument type="service" id="sonata.cache.model_identifier"/>
</service>

<service id="sonata.cache.model_identifier" class="Sonata\Cache\Invalidation\ModelCollectionIdentifiers" >
<argument type="collection" />
<service id="sonata.cache.model_identifier" class="Sonata\Cache\Invalidation\ModelCollectionIdentifiers">
<argument type="collection"/>
</service>

<service id="sonata.cache.noop" class="Sonata\Cache\Adapter\Cache\NoopCache">
<tag name="sonata.cache" />
<tag name="sonata.cache"/>
</service>

<service id="sonata.cache.mongo" class="Sonata\Cache\Adapter\Cache\MongoCache" >
<tag name="sonata.cache" />
<argument type="collection" />
<argument />
<argument />
<service id="sonata.cache.mongo" class="Sonata\Cache\Adapter\Cache\MongoCache">
<tag name="sonata.cache"/>
<argument type="collection"/>
<argument/>
<argument/>
</service>

<service id="sonata.cache.memcached" class="Sonata\Cache\Adapter\Cache\MemcachedCache" >
<tag name="sonata.cache" />
<argument />
<argument type="collection" />
<service id="sonata.cache.memcached" class="Sonata\Cache\Adapter\Cache\MemcachedCache">
<tag name="sonata.cache"/>
<argument/>
<argument type="collection"/>
</service>

<service id="sonata.cache.predis" class="Sonata\Cache\Adapter\Cache\PRedisCache" >
<tag name="sonata.cache" />
<argument type="collection" />
<service id="sonata.cache.predis" class="Sonata\Cache\Adapter\Cache\PRedisCache">
<tag name="sonata.cache"/>
<argument type="collection"/>
</service>

<service id="sonata.cache.apc" class="Sonata\CacheBundle\Adapter\ApcCache" >
<tag name="sonata.cache" />
<argument type="service" id="router" />
<argument />
<argument />
<argument type="collection" />
<argument type="collection" />
<service id="sonata.cache.apc" class="Sonata\CacheBundle\Adapter\ApcCache">
<tag name="sonata.cache"/>
<argument type="service" id="router"/>
<argument/>
<argument/>
<argument type="collection"/>
<argument type="collection"/>
</service>

<service id="sonata.cache.esi" class="Sonata\CacheBundle\Adapter\VarnishCache">
<tag name="sonata.cache" />
<argument />
<argument type="collection" />
<argument type="service" id="router" />
<argument />
<argument type="service" id="controller_resolver" />
<tag name="sonata.cache"/>
<argument/>
<argument type="collection"/>
<argument type="service" id="router"/>
<argument/>
<argument type="service" id="controller_resolver"/>
</service>

<service id="sonata.cache.ssi" class="Sonata\CacheBundle\Adapter\SsiCache">
<tag name="sonata.cache" />
<argument />
<argument type="service" id="router" />
<argument type="service" id="controller_resolver" />
<tag name="sonata.cache"/>
<argument/>
<argument type="service" id="router"/>
<argument type="service" id="controller_resolver"/>
</service>

<service id="sonata.cache.symfony" class="Sonata\CacheBundle\Adapter\SymfonyCache" >
<tag name="sonata.cache" />
<argument type="service" id="router" />
<argument type="service" id="filesystem" />
<service id="sonata.cache.symfony" class="Sonata\CacheBundle\Adapter\SymfonyCache">
<tag name="sonata.cache"/>
<argument type="service" id="router"/>
<argument type="service" id="filesystem"/>
<argument type="string">%kernel.cache_dir%</argument>
<argument />
<argument />
<argument />
<argument type="collection" />
<argument/>
<argument/>
<argument/>
<argument type="collection"/>
</service>

<service id="sonata.cache.invalidation.simple" class="Sonata\CacheBundle\Invalidation\SimpleCacheInvalidation">
<argument type="service" id="logger" />
<argument type="service" id="logger"/>
</service>
</services>
</container>
41 changes: 17 additions & 24 deletions Resources/config/counter.xml
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<?xml version="1.0" encoding="UTF-8"?>
<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
<service id="sonata.cache.counter.mongo" class="Sonata\Cache\Adapter\Counter\MongoCounter" >
<tag name="sonata.cache.counter" />
<argument type="collection" />
<argument />
<argument />
<service id="sonata.cache.counter.mongo" class="Sonata\Cache\Adapter\Counter\MongoCounter">
<tag name="sonata.cache.counter"/>
<argument type="collection"/>
<argument/>
<argument/>
</service>

<service id="sonata.cache.counter.memcached" class="Sonata\Cache\Adapter\Counter\MemcachedCounter" >
<tag name="sonata.cache.counter" />
<argument />
<argument type="collection" />
<service id="sonata.cache.counter.memcached" class="Sonata\Cache\Adapter\Counter\MemcachedCounter">
<tag name="sonata.cache.counter"/>
<argument/>
<argument type="collection"/>
</service>

<service id="sonata.cache.counter.predis" class="Sonata\Cache\Adapter\Counter\PRedisCounter" >
<tag name="sonata.cache.counter" />
<argument type="collection" />
<service id="sonata.cache.counter.predis" class="Sonata\Cache\Adapter\Counter\PRedisCounter">
<tag name="sonata.cache.counter"/>
<argument type="collection"/>
</service>

<service id="sonata.cache.counter.apc" class="Sonata\Cache\Adapter\Counter\ApcCounter" >
<tag name="sonata.cache.counter" />
<argument />
<service id="sonata.cache.counter.apc" class="Sonata\Cache\Adapter\Counter\ApcCounter">
<tag name="sonata.cache.counter"/>
<argument/>
</service>

</services>
</container>
19 changes: 6 additions & 13 deletions Resources/config/orm.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>

<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<?xml version="1.0" encoding="UTF-8"?>
<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>

<service id="sonata.cache.orm.event_subscriber.default" class="Sonata\CacheBundle\Invalidation\DoctrineORMListener" >
<argument type="service" id="sonata.cache.model_identifier" />
<argument />
<service id="sonata.cache.orm.event_subscriber.default" class="Sonata\CacheBundle\Invalidation\DoctrineORMListener">
<argument type="service" id="sonata.cache.model_identifier"/>
<argument/>
</service>

<service id="sonata.cache.orm.event_subscriber" class="Sonata\CacheBundle\Invalidation\DoctrineORMListenerContainerAware">
<argument type="service" id="service_container" />
<argument type="service" id="service_container"/>
<argument>sonata.cache.orm.event_subscriber.default</argument>
</service>
</services>

</container>
21 changes: 7 additions & 14 deletions Resources/config/phpcr_odm.xml
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>

<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<?xml version="1.0" encoding="UTF-8"?>
<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>

<service id="sonata.cache.phpcr_odm.event_subscriber.default" class="Sonata\CacheBundle\Invalidation\DoctrinePHPCRODMListener" >
<argument type="service" id="sonata.cache.model_identifier" />
<argument />
<service id="sonata.cache.phpcr_odm.event_subscriber.default" class="Sonata\CacheBundle\Invalidation\DoctrinePHPCRODMListener">
<argument type="service" id="sonata.cache.model_identifier"/>
<argument/>
</service>

<service id="sonata.cache.phpcr_odm.event_subscriber" class="Sonata\CacheBundle\Invalidation\DoctrinePHPCRODMListenerContainerAware">
<tag name="doctrine_phpcr.event_subscriber" session="default" />
<argument type="service" id="service_container" />
<tag name="doctrine_phpcr.event_subscriber" session="default"/>
<argument type="service" id="service_container"/>
<argument>sonata.cache.phpcr_odm.event_subscriber.default</argument>
</service>
</services>

</container>
13 changes: 2 additions & 11 deletions Resources/config/routing/cache.xml
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>

<routes xmlns="http://symfony.com/schema/routing"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">

<?xml version="1.0" encoding="UTF-8"?>
<routes xmlns="http://symfony.com/schema/routing" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
<route id="sonata_cache_esi" path="/sonata/cache/esi/{token}">
<default key="_controller">sonata.cache.esi:cacheAction</default>
</route>

<route id="sonata_cache_ssi" path="/sonata/cache/ssi/{token}">
<default key="_controller">sonata.cache.ssi:cacheAction</default>
</route>

<route id="sonata_cache_js_async" path="/sonata/cache/js-async">
<default key="_controller">sonata.cache.js_async:cacheAction</default>
</route>

<route id="sonata_cache_js_sync" path="/sonata/cache/js-sync">
<default key="_controller">sonata.cache.js_sync:cacheAction</default>
</route>

<route id="sonata_cache_apc" path="/sonata/cache/apc/{token}">
<default key="_controller">sonata.cache.apc:cacheAction</default>
</route>

<route id="sonata_cache_symfony" path="/sonata/cache/symfony/{token}/{type}">
<default key="_controller">sonata.cache.symfony:cacheAction</default>
</route>
Expand Down

0 comments on commit e30a9b2

Please sign in to comment.