8000 [DI] Defaults to public=false in all service config files · symfony/symfony@259a606 · GitHub
[go: up one dir, main page]
Skip to content

Commit 259a606

Browse files
nicolas-grekasnicolas-grekas
committed
[DI] Defaults to public=false in all service config files
1 parent 85e2d2f commit 259a606

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+627
-471
lines changed

‎src/Symfony/Bundle/DebugBundle/Resources/config/services.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<services>
8-
<service id="twig.extension.dump" class="Symfony\Bridge\Twig\Extension\DumpExtension" public="false">
8+
<defaults public="false" />
9+
10+
<service id="twig.extension.dump" class="Symfony\Bridge\Twig\Extension\DumpExtension">
911
<tag name="twig.extension" />
1012
<argument type="service" id="var_dumper.cloner" />
1113
<argument type="service" id="var_dumper.html_dumper" />
1214
</service>
1315

14-
<service id="data_collector.dump" class="Symfony\Component\HttpKernel\DataCollector\DumpDataCollector">
16+
<service id="data_collector.dump" class="Symfony\Component\HttpKernel\DataCollector\DumpDataCollector" public="true">
1517
<tag name="data_collector" id="dump" template="@Debug/Profiler/dump.html.twig" priority="240" />
1618
<argument type="service" id="debug.stopwatch" on-invalid="ignore" />
1719
<argument type="service" id="debug.file_link_formatter" on-invalid="ignore"></argument>
@@ -20,19 +22,19 @@
2022
<argument>null</argument><!-- var_dumper.cli_dumper when debug.dump_destination is set -->
2123
</service>
2224

23-
<service id="debug.dump_listener" class="Symfony\Component\HttpKernel\EventListener\DumpListener">
25+
<service id="debug.dump_listener" class="Symfony\Component\HttpKernel\EventListener\DumpListener" public="true">
2426
<tag name="kernel.event_subscriber" />
2527
<argument type="service" id="var_dumper.cloner" />
2628
<argument type="service" id="var_dumper.cli_dumper" />
2729
</service>
2830

29-
<service id="var_dumper.cloner" class="Symfony\Component\VarDumper\Cloner\VarCloner" />
30-
<service id="var_dumper.cli_dumper" class="Symfony\Component\VarDumper\Dumper\CliDumper">
31+
<service id="var_dumper.cloner" class="Symfony\Component\VarDumper\Cloner\VarCloner" public="true" />
32+
<service id="var_dumper.cli_dumper" class="Symfony\Component\VarDumper\Dumper\CliDumper" public="true">
3133
<argument>null</argument><!-- debug.dump_destination -->
3234
<argument>%kernel.charset%</argument>
3335
<argument>0</argument> <!-- flags -->
3436
</service>
35-
<service id="var_dumper.html_dumper" class="Symfony\Component\VarDumper\Dumper\HtmlDumper" public="false">
37+
<service id="var_dumper.html_dumper" class="Symfony\Component\VarDumper\Dumper\HtmlDumper">
3638
<argument>null</argument>
3739
<argument>%kernel.charset%</argument>
3840
<argument>0</argument> <!-- flags -->
@@ -43,5 +45,4 @@
4345
</call>
4446
</service>
4547
</services>
46-
4748
</container>

‎src/Symfony/Bundle/DebugBundle/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"symfony/var-dumper": "~2.8|~3.0"
2323
},
2424
"require-dev": {
25-
"symfony/config": "~2.8|~3.0",
26-
"symfony/dependency-injection": "~2.8|~3.0",
25+
"symfony/config": "~3.3",
26+
"symfony/dependency-injection": "~3.3",
2727
"symfony/web-profiler-bundle": "~2.8|~3.0"
2828
},
2929
"suggest": {

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<services>
8-
<service id="annotations.reader" class="Doctrine\Common\Annotations\AnnotationReader" public="false">
8+
<defaults public="false" />
9+
10+
<service id="annotations.reader" class="Doctrine\Common\Annotations\AnnotationReader">
911
<call method="addGlobalIgnoredName">
1012
<argument>required</argument>
1113
<argument type="service">
@@ -18,27 +20,26 @@
1820
</argument>
1921
</call>
2022
</service>
21-
<service id="Doctrine\Common\Annotations\Reader" alias="annotations.reader" public="false" />
2223

23-
<service id="annotations.cached_reader" class="Doctrine\Common\Annotations\CachedReader" public="false">
24+
<service id="annotations.cached_reader" class="Doctrine\Common\Annotations\CachedReader">
2425
<argument type="service" id="annotations.reader" />
2526
<argument type="service">
2627
<service class="Doctrine\Common\Cache\ArrayCache" />
2728
</argument>
2829
<argument /><!-- Debug-Flag -->
2930
</service>
3031

31-
<service id="annotations.filesystem_cache" class="Doctrine\Common\Cache\FilesystemCache" public="false">
32+
<service id="annotations.filesystem_cache" class="Doctrine\Common\Cache\FilesystemCache">
3233
<argument /><!-- Cache-Directory -->
3334
</service>
3435

35-
<service id="annotations.cache_warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer" public="false">
36+
<service id="annotations.cache_warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer">
3637
<argument type="service" id="annotations.reader" />
3738
<argument>%kernel.cache_dir%/annotations.php</argument>
3839
<argument type="service" id="cache.annotations" />
3940
</service>
4041

41-
<service id="annotations.cache" class="Symfony\Component\Cache\DoctrineProvider" public="false">
42+
<service id="annotations.cache" class="Symfony\Component\Cache\DoctrineProvider">
4243
<argument type="service">
4344
<service class="Symfony\Component\Cache\Adapter\PhpArrayAdapter">
4445
<factory class="Symfony\Component\Cache\Adapter\PhpArrayAdapter" method="create" />
@@ -48,6 +49,7 @@
4849
</argument>
4950
</service>
5051

51-
<service id="annotation_reader" alias="annotations.reader" />
52+
<service id="annotation_reader" alias="annotations.reader" public="true" />
53+
<service id="Doctrine\Common\Annotations\Reader" alias="annotation_reader" />
5254
</services>
5355
</container>

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

Lines changed: 10 additions & 10 deletions
D7AE
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,43 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<services>
8+
<defaults public="false" />
89

9-
<service id="assets.packages" class="Symfony\Component\Asset\Packages">
10+
<service id="assets.packages" class="Symfony\Component\Asset\Packages" public="true">
1011
<argument type="service" id="assets.empty_package" /> <!-- default package -->
1112
<argument type="collection" /> <!-- named packages -->
1213
</service>
13-
<service id="Symfony\Component\Asset\Packages" alias="assets.packages" public="false" />
14+
<service id="Symfony\Component\Asset\Packages" alias="assets.packages" />
1415

15-
<service id="assets.empty_package" class="Symfony\Component\Asset\Package" public="false">
16+
<service id="assets.empty_package" class="Symfony\Component\Asset\Package">
1617
<argument type="service" id="assets.empty_version_strategy" />
1718
</service>
1819

19-
<service id="assets.context" class="Symfony\Component\Asset\Context\RequestStackContext">
20+
<service id="assets.context" class="Symfony\Component\Asset\Context\RequestStackContext" public="true">
2021
<argument type="service" id="request_stack" />
2122
</service>
2223

23-
<service id="assets.path_package" class="Symfony\Component\Asset\PathPackage" abstract="true">
24+
<service id="assets.path_package" class="Symfony\Component\Asset\PathPackage" abstract="true" public="true">
2425
<argument /> <!-- base path -->
2526
<argument /> <!-- version strategy -->
2627
<argument type="service" id="assets.context" />
2728
</service>
2829

29-
<service id="assets.url_package" class="Symfony\Component\Asset\UrlPackage" abstract="true">
30+
<service id="assets.url_package" class="Symfony\Component\Asset\UrlPackage" abstract="true" public="true">
3031
<argument /> <!-- base URLs -->
3132
<argument /> <!-- version strategy -->
3233
<argument type="service" id="assets.context" />
3334
</service>
3435

35-
<service id="assets.static_version_strategy" class="Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy" abstract="true">
36+
<service id="assets.static_version_strategy" class="Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy" abstract="true" public="true">
3637
<argument /> <!-- version -->
3738
<argument /> <!-- format -->
3839
</service>
3940

40-
<service id="assets.empty_version_strategy" class="Symfony\Component\Asset\VersionStrategy\EmptyVersionStrategy" public="false" />
41+
<service id="assets.empty_version_strategy" class="Symfony\Component\Asset\VersionStrategy\EmptyVersionStrategy" />
4142

42-
<service id="assets.json_manifest_version_strategy" class="Symfony\Component\Asset\VersionStrategy\JsonManifestVersionStrategy" abstract="true" public="false">
43+
<service id="assets.json_manifest_version_strategy" class="Symfony\Component\Asset\VersionStrategy\JsonManifestVersionStrategy" abstract="true">
4344
<argument /> <!-- manifest path -->
4445
</service>
45-
4646
</services>
4747
</container>

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<services>
8+
<defaults public="false" />
89

9-
<service id="cache.app" parent="cache.adapter.filesystem">
10+
<service id="cache.app" parent="cache.adapter.filesystem" public="true">
1011
<tag name="cache.pool" clearer="cache.app_clearer" />
1112
</service>
1213

13-
<service id="cache.system" parent="cache.adapter.system">
14+
<service id="cache.system" parent="cache.adapter.system" public="true">
1415
<tag name="cache.pool" />
1516
</service>
1617

@@ -26,7 +27,7 @@
2627
<tag name="cache.pool" />
2728
</service>
2829

29-
<service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true">
30+
<service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true" public="true">
3031
<factory class="Symfony\Component\Cache\Adapter\AbstractAdapter" method="createSystemCache" />
3132
<tag name="cache.pool" clearer="cache.default_clearer" />
3233
<tag name="monolog.logger" channel="cache" />
@@ -37,7 +38,7 @@
3738
<argument type="service" id="logger" on-invalid="ignore" />
3839
</service>
3940

40-
<service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true">
41+
<service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true" public="true">
4142
<tag name="cache.pool" clearer="cache.default_clearer" />
4243
<tag name="monolog.logger" channel="cache" />
4344
<argument /> <!-- namespace -->
@@ -48,7 +49,7 @@
4849
</call>
4950
</service>
5051

51-
<service id="cache.adapter.doctrine" class="Symfony\Component\Cache\Adapter\DoctrineAdapter" abstract="true">
52+
<service id="cache.adapter.doctrine" class="Symfony\Component\Cache\Adapter\DoctrineAdapter" abstract="true" public="true">
5253
<tag name="cache.pool" provider="cache.default_doctrine_provider" clearer="cache.default_clearer" />
5354
<tag name="monolog.logger" channel="cache" />
5455
<argument /> <!-- Doctrine provider service -->
@@ -59,7 +60,7 @@
5960
</call>
6061
</service>
6162

62-
<service id="cache.adapter.filesystem" class="Symfony\Component\Cache\Adapter\FilesystemAdapter" abstract="true">
63+
<service id="cache.adapter.filesystem" class="Symfony\Component\Cache\Adapter\FilesystemAdapter" abstract="true" public="true">
6364
<tag name="cache.pool" clearer="cache.default_clearer" />
6465
<tag name="monolog.logger" channel="cache" />
6566
<argument /> <!-- namespace -->
@@ -70,14 +71,14 @@
7071
</call>
7172
</service>
7273

73-
<service id="cache.adapter.psr6" class="Symfony\Component\Cache\Adapter\ProxyAdapter" abstract="true">
74+
<service id="cache.adapter.psr6" class="Symfony\Component\Cache\Adapter\ProxyAdapter" abstract="true" public="true">
7475
<tag name="cache.pool" provider="cache.default_psr6_provider" clearer="cache.default_clearer" />
7576
<argument /> <!-- PSR-6 provider service -->
7677
<argument /> <!-- namespace -->
7778
<argument>0</argument> <!-- default lifetime -->
7879
</service>
7980

80-
<service id="cache.adapter.redis" class="Symfony\Component\Cache\Adapter\RedisAdapter" abstract="true">
81+
<service id="cache.adapter.redis" class="Symfony\Component\Cache\Adapter\RedisAdapter" abstract="true" public="true">
8182
<tag name="cache.pool" provider="cache.default_redis_provider" clearer="cache.default_clearer" />
8283
<tag name="monolog.logger" channel="cache" />
8384
<argument /> <!-- Redis connection service -->
@@ -88,7 +89,7 @@
8889
</call>
8990
</service>
9091

91-
<service id="cache.adapter.memcached" class="Symfony\Component\Cache\Adapter\MemcachedAdapter" abstract="true">
92+
<service id="cache.adapter.memcached" class="Symfony\Component\Cache\Adapter\MemcachedAdapter" abstract="true" public="true">
9293
<tag name="cache.pool" provider="cache.default_memcached_provider" clearer="cache.default_clearer" />
9394
<tag name="monolog.logger" channel="cache" />
9495
<argument /> <!-- Memcached connection service -->
@@ -99,13 +100,12 @@
99100
</call>
100101
</service>
101102

102-
<service id="cache.default_clearer" class="Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer">
103+
<service id="cache.default_clearer" class="Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer" public="true">
103104
<tag name="kernel.cache_clearer" />
104105
</service>
105106

106-
<service id="cache.global_clearer" parent="cache.default_clearer" />
107-
<service id="cache.app_clearer" alias="cache.default_clearer" />
108-
<service id="Psr\Cache\CacheItemPoolInterface" alias="cache.app" public="false" />
109-
107+
<service id="cache.global_clearer" parent="cache.default_clearer" public="true" />
108+
<service id="cache.app_clearer" alias="cache.default_clearer" public="true" />
109+
<service id="Psr\Cache\CacheItemPoolInterface" alias="cache.app" />
110110
</services>
111111
</container>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<services>
8+
<defaults public="false" />
9+
810
<!-- DataCollector -->
911
<service id="data_collector.cache" class="Symfony\Component\Cache\DataCollector\CacheDataCollector">
1012
<tag name="data_collector" template="@WebProfiler/Collector/cache.html.twig" id="cache" priority="275" />

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,49 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<services>
8-
<service id="data_collector.config" class="Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector" public="false">
8+
<defaults public="false" />
9+
10+
<service id="data_collector.config" class="Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector">
911
<tag name="data_collector" template="@WebProfiler/Collector/config.html.twig" id="config" priority="-255" />
1012
<call method="setKernel"><argument type="service" id="kernel" on-invalid="ignore" /></call>
1113
</service>
1214

13-
<service id="data_collector.request" class="Symfony\Bundle\FrameworkBundle\DataCollector\RequestDataCollector">
15+
<service id="data_collector.request" class="Symfony\Bundle\FrameworkBundle\DataCollector\RequestDataCollector" public="true">
1416
<tag name="kernel.event_subscriber" />
1517
<tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="335" />
1618
</service>
1719

18-
<service id="data_collector.ajax" class="Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector" public="false">
20+
<service id="data_collector.ajax" class="Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector">
1921
<tag name="data_collector" template="@WebProfiler/Collector/ajax.html.twig" id="ajax" priority="315" />
2022
</service>
2123

22-
<service id="data_collector.exception" class="Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector" public="false">
24+
<service id="data_collector.exception" class="Symfony\Component\HttpKernel\DataCollector\ExceptionDataCollector">
2325
<tag name="data_collector" template="@WebProfiler/Collector/exception.html.twig" id="exception" priority="305" />
2426
</service>
2527

26-
<service id="data_collector.events" class="Symfony\Component\HttpKernel\DataCollector\EventDataCollector" public="false">
28+
<service id="data_collector.events" class="Symfony\Component\HttpKernel\DataCollector\EventDataCollector">
2729
<tag name="data_collector" template="@WebProfiler/Collector/events.html.twig" id="events" priority="290" />
2830
<argument type="service" id="event_dispatcher" on-invalid="ignore" />
2931
</service>
3032

31-
<service id="data_collector.logger" class="Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector" public="false">
33+
<service id="data_collector.logger" class="Symfony\Component\HttpKernel\DataCollector\LoggerDataCollector">
3234
<tag name="data_collector" template="@WebProfiler/Collector/logger.html.twig" id="logger" priority="300" />
3335
<tag name="monolog.logger" channel="profiler" />
3436
<argument type="service" id="logger" on-invalid="ignore" />
3537
<argument>%kernel.cache_dir%/%kernel.container_class%</argument>
3638
</service>
3739

38-
<service id="data_collector.time" class="Symfony\Component\HttpKernel\DataCollector\TimeDataCollector" public="false">
40+
<service id="data_collector.time" class="Symfony\Component\HttpKernel\DataCollector\TimeDataCollector">
3941
<tag name="data_collector" template="@WebProfiler/Collector/time.html.twig" id="time" priority="330" />
4042
<argument type="service" id="kernel" on-invalid="ignore" />
4143
<argument type="service" id="debug.stopwatch" on-invalid="ignore" />
4244
</service>
4345

44-
<service id="data_collector.memory" class="Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector" public="false">
46+
<service id="data_collector.memory" class="Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector">
4547
<tag name="data_collector" template="@WebProfiler/Collector/memory.html.twig" id="memory" priority="325" />
4648
</service>
4749

48-
<service id="data_collector.router" class="Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector" >
50+
<service id="data_collector.router" class="Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector" public="true">
4951
<tag name="kernel.event_listener" event="kernel.controller" method="onKernelController"/>
5052
<tag name="data_collector" template="@WebProfiler/Collector/router.html.twig" id="router" priority="285" />
5153
</service>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<services>
8+
<defaults public="false" />
89

9-
<service id="console.error_listener" class="Symfony\Component\Console\EventListener\ErrorListener" public="false">
10+
<service id="console.error_listener" class="Symfony\Component\Console\EventListener\ErrorListener">
1011
<argument type="service" id="logger" on-invalid="null" />
1112
<tag name="kernel.event_subscriber" />
1213
<tag name="monolog.logger" channel="console" />
1314
</service>
14-
1515
</services>
1616
</container>

0 commit comments

Comments
 (0)
0