Skip to content

Commit e624ef6

Browse files
dbudbu
committed
Merge pull request #42 from ddeboer/cleanups
cleanup service configuration files and move unit tests into Unit namespace
2 parents 340bc1c + 3b86ffa commit e624ef6

15 files changed

+69
-39
lines changed

‎DependencyInjection/Compiler/LoggerPass.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function process(ContainerBuilder $container)
1919
return;
2020
}
2121

22-
$subscriber = $container->getDefinition('fos_http_cache.proxy.log_subscriber')
22+
$subscriber = $container->getDefinition('fos_http_cache.event_listener.log')
2323
->setAbstract(false);
2424

2525
$container->getDefinition('fos_http_cache.cache_manager')

‎DependencyInjection/FOSHttpCacheExtension.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function load(array $configs, ContainerBuilder $container)
2929
$container->setParameter($this->getAlias().'.invalidators', $config['invalidators']);
3030

3131
if (!empty($config['rules'])) {
32-
$loader->load('rule_response_listener.xml');
32+
$loader->load('cache_control_listener.xml');
3333
foreach ($config['rules'] as $cache) {
3434
$cache['ips'] = (empty($cache['ips'])) ? null : $cache['ips'];
3535

@@ -50,8 +50,10 @@ public function load(array $configs, ContainerBuilder $container)
5050
$cache['attributes']
5151
);
5252

53-
$container->getDefinition($this->getAlias().'.response_listener')
54-
->addMethodCall('add', array($matcher, $cache));
53+
$container
54+
->getDefinition($this->getAlias().'.event_listener.cache_control')
55+
->addMethodCall('add', array($matcher, $cache))
56+
;
5557
}
5658
}
5759

@@ -76,7 +78,7 @@ public function load(array $configs, ContainerBuilder $container)
7678
if (!empty($config['flash_message_listener']) && $config['flash_message_listener']['enabled']) {
7779
$loader->load('flash_message_listener.xml');
7880

79-
$container->setParameter($this->getAlias().'.flash_message_listener.options', $config['flash_message_listener']);
81+
$container->setParameter($this->getAlias().'.event_listener.flash_message.options', $config['flash_message_listener']);
8082
}
8183
}
8284

‎Resources/config/authorization_request_listener.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

7-
<services>
7+
<parameters>
8+
<parameter key="fos_http_cache.event_listener.cache_authorization.class">FOS\HttpCacheBundle\EventListener\CacheAuthorizationListener</parameter>
9+
</parameters>
810

9-
<service id="fos_http_cache.cache_authorization_listener" class="FOS\HttpCacheBundle\EventListener\CacheAuthorizationListener">
11+
<services>
12+
<service id="fos_http_cache.event_listener.cache_authorization"
13+
class="%fos_http_cache.event_listener.cache_authorization.class%">
1014
<tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="-129" />
1115
</service>
12-
1316
</services>
1417
</container>

‎Resources/config/cache_control_listener.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
6+
7+
<parameters>
8+
<parameter key="fos_http_cache.event_listener.cache_control.class">FOS\HttpCacheBundle\EventListener\CacheControlListener</parameter>
9+
<parameter key="fos_http_cache.request_matcher.class">Symfony\Component\HttpFoundation\RequestMatcher</parameter>
10+
</parameters>
11+
12+
<services>
13+
<service id="fos_http_cache.event_listener.cache_control"
14+
class="%fos_http_cache.event_listener.cache_control.class%">
15+
<argument type="service" id="security.context" on-invalid="ignore"/>
16+
<argument>%fos_http_cache.debug%</argument>
17+
<tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
18+
</service>
19+
20+
<service id="fos_http_cache.request_matcher"
21+
class="%fos_http_cache.request_matcher.class%"
22+
public="false"
23+
/>
24+
</services>
25+
</container>

‎Resources/config/cache_manager.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

7+
<parameters>
8+
<parameter key="fos_http_cache.cache_manager.class">FOS\HttpCacheBundle\CacheManager</parameter>
9+
<parameter key="fos_http_cache.event_listener.log.class">FOS\HttpCache\EventListener\LogSubscriber</parameter>
10+
<parameter key="fos_http_cache.event_listener.invalidation.class">FOS\HttpCacheBundle\EventListener\InvalidationListener</parameter>
11+
</parameters>
12+
713
<services>
814
<service id="fos_http_cache.invalidator.collection"
915
class="FOS\HttpCacheBundle\Invalidator\InvalidatorCollection"
@@ -13,22 +19,22 @@
1319
</service>
1420

1521
<service id="fos_http_cache.cache_manager"
16-
class="FOS\HttpCacheBundle\CacheManager">
22+
class="%fos_http_cache.cache_manager.class%">
1723
<argument type="service" id="fos_http_cache.http_cache" />
1824
<argument type="service" id="router" />
1925
<call method="setEventDispatcher">
2026
<argument id="event_dispatcher" type="service" on-invalid="ignore" />
2127
</call>
2228
</service>
2329

24-
<service id="fos_http_cache.proxy.log_subscriber"
25-
class="FOS\HttpCache\EventListener\LogSubscriber"
30+
<service id="fos_http_cache.event_listener.log"
31+
class="%fos_http_cache.event_listener.log.class%"
2632
abstract="true">
2733
<argument type="service" id="logger" />
2834
</service>
2935

3036
<service id="fos_http_cache.event_listener.invalidation"
31-
class="FOS\HttpCacheBundle\EventListener\InvalidationListener">
37+
class="%fos_http_cache.event_listener.invalidation.class%">
3238
<argument type="service" id="fos_http_cache.cache_manager" />
3339
<argument type="service" id="fos_http_cache.invalidator.collection" />
3440
<argument type="service" id="router" />

‎Resources/config/flash_message_listener.xml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

7-
<services>
7+
<parameters>
8+
<parameter key="fos_http_cache.event_listener.flash_message.class">FOS\HttpCacheBundle\EventListener\FlashMessageListener</parameter>
9+
</parameters>
810

9-
<service id="fos_rest.flash_message_listener" class="FOS\HttpCacheBundle\EventListener\FlashMessageListener">
10-
<tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
11+
<services>
12+
<service id="fos_http_cache.event_listener.flash_message"
13+
class="%fos_http_cache.event_listener.flash_message.class%">
1114
<argument type="service" id="session"/>
12-
<argument>%fos_http_cache.flash_message_listener.options%</argument>
15+
<argument>%fos_http_cache.event_listener.flash_message.options%</argument>
16+
<tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
1317
</service>
14-
1518
</services>
1619
</container>

‎Resources/config/rule_response_listener.xml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎Resources/config/tag_listener.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

7+
<parameters>
8+
<parameter key="fos_http_cache.event_listener.tag.class">FOS\HttpCacheBundle\EventListener\TagListener</parameter>
9+
</parameters>
10+
711
<services>
8-
<service id="fos_http_cache.tag_listener"
9-
class="FOS\HttpCacheBundle\EventListener\TagListener">
12+
<service id="fos_http_cache.event_listener.tag"
13+
class="%fos_http_cache.event_listener.tag.class%">
1014
<argument type="service" id="fos_http_cache.cache_manager" />
1115
<tag name="kernel.event_subscriber" event="kernel.response" />
1216
</service>

‎Resources/config/varnish.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,20 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

7+
<parameters>
8+
<parameter key="fos_http_cache.varnish.class">FOS\HttpCache\Invalidation\Varnish</parameter>
9+
</parameters>
10+
711
<services>
812
<service id="fos_http_cache.varnish"
9-
class="FOS\HttpCache\Invalidation\Varnish">
13+
class="%fos_http_cache.varnish.class%">
1014
<argument>%fos_http_cache.varnish.ips%</argument>
1115
<argument>%fos_http_cache.varnish.host%</argument>
1216
</service>
1317

1418
<service id="fos_http_cache.http_cache"
15-
alias="fos_http_cache.varnish" />
19+
alias="fos_http_cache.varnish"
20+
/>
1621
</services>
1722

1823
</container>

‎Tests/CacheManagerTest.php‎ renamed to ‎Tests/Unit/CacheManagerTest.php‎

File renamed without changes.

0 commit comments

Comments
 (0)