Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1936491

Browse files
nicolas-grekasnicolas-grekas
committed
Make as many services private as possible
1 parent ade060e commit 1936491

File tree

72 files changed

+758
-185
lines changed

Some content is hidden

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

72 files changed

+758
-185
lines changed

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
333333
$memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && $cacheDriver['port'] === 0) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
334334
$cacheDef = new Definition($memcacheClass);
335335
$memcacheInstance = new Definition($memcacheInstanceClass);
336+
$memcacheInstance->setPrivate(true);
336337
$memcacheInstance->addMethodCall('connect', array(
337338
$memcacheHost, $memcachePort,
338339
));
@@ -346,6 +347,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
346347
$memcachedPort = !empty($cacheDriver['port']) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcached_port').'%';
347348
$cacheDef = new Definition($memcachedClass);
348349
$memcachedInstance = new Definition($memcachedInstanceClass);
350+
$memcachedInstance->setPrivate(true);
349351
$memcachedInstance->addMethodCall('addServer', array(
350352
$memcachedHost, $memcachedPort,
351353
));
@@ -359,6 +361,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
359361
$redisPort = !empty($cacheDriver['port']) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.redis_port').'%';
360362
$cacheDef = new Definition($redisClass);
361363
$redisInstance = new Definition($redisInstanceClass);
364+
$redisInstance->setPrivate(true);
362365
$redisInstance->addMethodCall('connect', array(
363366
$redisHost, $redisPort,
364367
));

‎src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ public function load(array $configs, ContainerBuilder $container)
3535
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
3636
$loader->load('services.xml');
3737

38+
$container->getDefinition('debug.dump_listener')->setPrivate(true);
39+
$container->getDefinition('var_dumper.cli_dumper')->setPrivate(true);
40+
3841
$container->getDefinition('var_dumper.cloner')
3942
->addMethodCall('setMaxItems', array($config['max_items']))
4043
->addMethodCall('setMinDepth', array($config['min_depth']))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<argument>null</argument><!-- var_dumper.cli_dumper when debug.dump_destination is set -->
2323
</service>
2424

25-
<service id="debug.dump_listener" class="Symfony\Component\HttpKernel\EventListener\DumpListener" public="true">
25+
<service id="debug.dump_listener" class="Symfony\Component\HttpKernel\EventListener\DumpListener">
2626
<tag name="kernel.event_subscriber" />
2727
<argument type="service" id="var_dumper.cloner" />
2828
<argument type="service" id="var_dumper.cli_dumper" />
2929
</service>
3030

3131
<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">
32+
<service id="var_dumper.cli_dumper" class="Symfony\Component\VarDumper\Dumper\CliDumper">
3333
<argument>null</argument><!-- debug.dump_destination -->
3434
<argument>%kernel.charset%</argument>
3535
<argument>0</argument> <!-- flags -->

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@
2424
},
2525
"require-dev": {
2626
"symfony/config": "~3.3|~4.0",
27-
"symfony/dependency-injection": "~3.3|~4.0",
27+
"symfony/dependency-injection": "~3.4|~4.0",
2828
"symfony/web-profiler-bundle": "~2.8|~3.0|~4.0"
2929
},
30+
"conflict": {
31+
"symfony/dependency-injection": "<3.4"
32+
},
3033
"suggest": {
3134
"symfony/config": "For service container configuration",
3235
"symfony/dependency-injection": "For using as a service from the container"

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 154 additions & 7 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</argument>
5050
</service>
5151

52-
<service id="annotation_reader" alias="annotations.reader" public="true" />
52+
<service id="annotation_reader" alias="annotations.reader" />
5353
<service id="Doctrine\Common\Annotations\Reader" alias="annotation_reader" />
5454
</services>
5555
</container>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<services>
88
<defaults public="false" />
99

10-
<service id="assets.packages" class="Symfony\Component\Asset\Packages" public="true">
10+
<service id="assets.packages" class="Symfony\Component\Asset\Packages">
1111
<argument type="service" id="assets.empty_package" /> <!-- default package -->
1212
<argument type="collection" /> <!-- named packages -->
1313
</service>
@@ -17,23 +17,23 @@
1717
<argument type="service" id="assets.empty_version_strategy" />
1818
</service>
1919

20-
<service id="assets.context" class="Symfony\Component\Asset\Context\RequestStackContext" public="true">
20+
<service id="assets.context" class="Symfony\Component\Asset\Context\RequestStackContext">
2121
<argument type="service" id="request_stack" />
2222
</service>
2323

24-
<service id="assets.path_package" class="Symfony\Component\Asset\PathPackage" abstract="true" public="true">
24+
<service id="assets.path_package" class="Symfony\Component\Asset\PathPackage" abstract="true">
2525
<argument /> <!-- base path -->
2626
<argument /> <!-- version strategy -->
2727
<argument type="service" id="assets.context" />
2828
</service>
2929

30-
<service id="assets.url_package" class="Symfony\Component\Asset\UrlPackage" abstract="true" public="true">
30+
<service id="assets.url_package" class="Symfony\Component\Asset\UrlPackage" abstract="true">
3131
<argument /> <!-- base URLs -->
3232
<argument /> <!-- version strategy -->
3333
<argument type="service" id="assets.context" />
3434
</service>
3535

36-
<service id="assets.static_version_strategy" class="Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy" abstract="true" public="true">
36+
<service id="assets.static_version_strategy" class="Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy" abstract="true">
3737
<argument /> <!-- version -->
3838
<argument /> <!-- format -->
3939
</service>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<tag name="cache.pool" />
2828
</service>
2929

30-
<service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true" public="true">
30+
<service id="cache.adapter.system" class="Symfony\Component\Cache\Adapter\AdapterInterface" abstract="true">
3131
<factory class="Symfony\Component\Cache\Adapter\AbstractAdapter" method="createSystemCache" />
3232
<tag name="cache.pool" clearer="cache.default_clearer" />
3333
<tag name="monolog.logger" channel="cache" />
@@ -38,7 +38,7 @@
3838
<argument type="service" id="logger" on-invalid="ignore" />
3939
</service>
4040

41-
<service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true" public="true">
41+
<service id="cache.adapter.apcu" class="Symfony\Component\Cache\Adapter\ApcuAdapter" abstract="true">
4242
<tag name="cache.pool" clearer="cache.default_clearer" />
4343
<tag name="monolog.logger" channel="cache" />
4444
<argument /> <!-- namespace -->
@@ -49,7 +49,7 @@
4949
</call>
5050
</service>
5151

52-
<service id="cache.adapter.doctrine" class="Symfony\Component\Cache\Adapter\DoctrineAdapter" abstract="true" public="true">
52+
<service id="cache.adapter.doctrine" class="Symfony\Component\Cache\Adapter\DoctrineAdapter" abstract="true">
5353
<tag name="cache.pool" provider="cache.default_doctrine_provider" clearer="cache.default_clearer" />
5454
<tag name="monolog.logger" channel="cache" />
5555
<argument /> <!-- Doctrine provider service -->
@@ -60,7 +60,7 @@
6060
</call>
6161
</service>
6262

63-
<service id="cache.adapter.filesystem" class="Symfony\Component\Cache\Adapter\FilesystemAdapter" abstract="true" public="true">
63+
<service id="cache.adapter.filesystem" class="Symfony\Component\Cache\Adapter\FilesystemAdapter" abstract="true">
6464
<tag name="cache.pool" clearer="cache.default_clearer" />
6565
<tag name="monolog.logger" channel="cache" />
6666
<argument /> <!-- namespace -->
@@ -71,14 +71,14 @@
7171
</call>
7272
</service>
7373

74-
<service id="cache.adapter.psr6" class="Symfony\Component\Cache\Adapter\ProxyAdapter" abstract="true" public="true">
74+
<service id="cache.adapter.psr6" class="Symfony\Component\Cache\Adapter\ProxyAdapter" abstract="true">
7575
<tag name="cache.pool" provider="cache.default_psr6_provider" clearer="cache.default_clearer" />
7676
<argument /> <!-- PSR-6 provider service -->
7777
<argument /> <!-- namespace -->
7878
<argument>0</argument> <!-- default lifetime -->
7979
</service>
8080

81-
<service id="cache.adapter.redis" class="Symfony\Component\Cache\Adapter\RedisAdapter" abstract="true" public="true">
81+
<service id="cache.adapter.redis" class="Symfony\Component\Cache\Adapter\RedisAdapter" abstract="true">
8282
<tag name="cache.pool" provider="cache.default_redis_provider" clearer="cache.default_clearer" />
8383
<tag name="monolog.logger" channel="cache" />
8484
<argument /> <!-- Redis connection service -->
@@ -89,7 +89,7 @@
8989
</call>
9090
</service>
9191

92-
<service id="cache.adapter.memcached" class="Symfony\Component\Cache\Adapter\MemcachedAdapter" abstract="true" public="true">
92+
<service id="cache.adapter.memcached" class="Symfony\Component\Cache\Adapter\MemcachedAdapter" abstract="true">
9393
<tag name="cache.pool" provider="cache.default_memcached_provider" clearer="cache.default_clearer" />
9494
<tag name="monolog.logger" channel="cache" />
9595
<argument /> <!-- Memcached connection service -->
@@ -100,7 +100,7 @@
100100
</call>
101101
</service>
102102

103-
<service id="cache.default_clearer" class="Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer" public="true">
103+
<service id="cache.default_clearer" class="Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer">
104104
<tag name="kernel.cache_clearer" />
105105
</service>
106106

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<call method="setKernel"><argument type="service" id="kernel" on-invalid="ignore" /></call>
1313
</service>
1414

15-
<service id="data_collector.request" class="Symfony\Bundle\FrameworkBundle\DataCollector\RequestDataCollector" public="true">
15+
<service id="data_collector.request" class="Symfony\Bundle\FrameworkBundle\DataCollector\RequestDataCollector">
1616
<tag name="kernel.event_subscriber" />
1717
<tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="335" />
1818
</service>
@@ -47,7 +47,7 @@
4747
<tag name="data_collector" template="@WebProfiler/Collector/memory.html.twig" id="memory" priority="325" />
4848
</service>
4949

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
<services>
88
<defaults public="false" />
99

10-
<service id="debug.event_dispatcher" class="Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher" decorates="event_dispatcher" public="true">
10+
<service id="debug.event_dispatcher" class="Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher" decorates="event_dispatcher">
1111
<tag name="monolog.logger" channel="event" />
1212
<argument type="service" id="debug.event_dispatcher.inner" />
1313
<argument type="service" id="debug.stopwatch" />
1414
<argument type="service" id="logger" on-invalid="null" />
1515
</service>
1616

17-
<service id="debug.controller_resolver" decorates="controller_resolver" class="Symfony\Component\HttpKernel\Controller\TraceableControllerResolver" public="true">
17+
<service id="debug.controller_resolver" decorates="controller_resolver" class="Symfony\Component\HttpKernel\Controller\TraceableControllerResolver">
1818
<argument type="service" id="debug.controller_resolver.inner" />
1919
<argument type="service" id="debug.stopwatch" />
2020
<argument type="service" id="argument_resolver" />
2121
</service>
2222

23-
<service id="debug.argument_resolver" decorates="argument_resolver" class="Symfony\Component\HttpKernel\Controller\TraceableArgumentResolver" public="true">
23+
<service id="debug.argument_resolver" decorates="argument_resolver" class="Symfony\Component\HttpKernel\Controller\TraceableArgumentResolver">
2424
<argument type="service" id="debug.argument_resolver.inner" />
2525
<argument type="service" id="debug.stopwatch" />
2626
</service>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<services>
1212
<defaults public="false" />
1313

14-
<service id="debug.debug_handlers_listener" class="Symfony\Component\HttpKernel\EventListener\DebugHandlersListener" public="true">
14+
<service id="debug.debug_handlers_listener" class="Symfony\Component\HttpKernel\EventListener\DebugHandlersListener">
1515
<tag name="kernel.event_subscriber" />
1616
<tag name="monolog.logger" channel="php" />
1717
<argument>null</argument><!-- Exception handler -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<services>
88
<defaults public="false" />
99

10-
<service id="esi" class="Symfony\Component\HttpKernel\HttpCache\Esi" public="true" />
10+
<service id="esi" class="Symfony\Component\HttpKernel\HttpCache\Esi" />
1111

12-
<service id="esi_listener" class="Symfony\Component\HttpKernel\EventListener\SurrogateListener" public="true">
12+
<service id="esi_listener" class="Symfony\Component\HttpKernel\EventListener\SurrogateListener">
1313
<tag name="kernel.event_subscriber" />
1414
<argument type="service" id="esi" on-invalid="ignore" />
1515
</service>

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<defaults public="false" />
99

1010
<!-- ResolvedFormTypeFactory -->
11-
<service id="form.resolved_type_factory" class="Symfony\Component\Form\ResolvedFormTypeFactory" public="true" />
11+
<service id="form.resolved_type_factory" class="Symfony\Component\Form\ResolvedFormTypeFactory" />
1212
<service id="Symfony\Component\Form\ResolvedFormTypeFactoryInterface" alias="form.resolved_type_factory" />
1313

1414
<!-- FormRegistry -->
15-
<service id="form.registry" class="Symfony\Component\Form\FormRegistry" public="true">
15+
<service id="form.registry" class="Symfony\Component\Form\FormRegistry">
1616
<argument type="collection">
1717
<!--
1818
We don't need to be able to add more extensions.
@@ -191,17 +191,8 @@
191191
<argument type="string">%validator.translation_domain%</argument>
192192
</service>
193193

194-
<service id="deprecated.form.registry" class="stdClass" public="true">
195-
<property name="registry" type="collection">
196-
<property type="service" id="form.type_guesser.validator" />
197-
<property type="service" id="form.type.choice" />
198-
<property type="service" id="form.type.form" />
199-
<property type="service" id="form.type_extension.form.http_foundation" />
200-
<property type="service" id="form.type_extension.form.validator" />
201-
<property type="service" id="form.type_extension.repeated.validator" />
202-
<property type="service" id="form.type_extension.submit.validator" />
203-
<property type="service" id="form.type_extension.upload.validator" />
204-
</property>
194+
<service id="deprecated.form.registry" class="stdClass">
195+
<property name="registry" type="collection" />
205196
<deprecated>The service "%service_id%" is internal and deprecated since Symfony 3.3 and will be removed in Symfony 4.0</deprecated>
206197
</service>
207198
</services>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
<argument type="service" id="form.server_params" />
1818
</service>
1919

20-
<service id="deprecated.form.registry.csrf" class="stdClass" public="true">
21-
<property name="registry" type="collection">
22-
<property type="service" id="form.type_extension.csrf" />
23-
</property>
20+
<service id="deprecated.form.registry.csrf" class="stdClass">
21+
<property name="registry" type="collection" />
2422
<deprecated>The service "%service_id%" is internal and deprecated since Symfony 3.3 and will be removed in Symfony 4.0</deprecated>
2523
</service>
2624
</services>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<services>
88
<defaults public="false" />
99

10-
<service id="form.resolved_type_factory" class="Symfony\Component\Form\Extension\DataCollector\Proxy\ResolvedTypeFactoryDataCollectorProxy" public="true">
10+
<service id="form.resolved_type_factory" class="Symfony\Component\Form\Extension\DataCollector\Proxy\ResolvedTypeFactoryDataCollectorProxy">
1111
<argument type="service">
1212
<service class="Symfony\Component\Form\ResolvedFormTypeFactory" />
1313
</argument>
@@ -21,9 +21,9 @@
2121
</service>
2222

2323
<!-- DataCollector -->
24-
<service id="data_collector.form.extractor" class="Symfony\Component\Form\Extension\DataCollector\FormDataExtractor" public="true" />
24+
<service id="data_collector.form.extractor" class="Symfony\Component\Form\Extension\DataCollector\FormDataExtractor" />
2525

26-
<service id="data_collector.form" class="Symfony\Component\Form\Extension\DataCollector\FormDataCollector" public="true">
26+
<service id="data_collector.form" class="Symfony\Component\Form\Extension\DataCollector\FormDataCollector">
2727
<tag name="data_collector" template="@WebProfiler/Collector/form.html.twig" id="form" priority="310" />
2828
<argument type="service" id="data_collector.form.extractor" />
2929
</service>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<services>
88
<defaults public="false" />
99

10-
<service id="fragment.listener" class="Symfony\Component\HttpKernel\EventListener\FragmentListener" public="true">
10+
<service id="fragment.listener" class="Symfony\Component\HttpKernel\EventListener\FragmentListener">
1111
<tag name="kernel.event_subscriber" />
1212
<argument type="service" id="uri_signer" />
1313
<argument>%fragment.path%</argument>

0 commit comments

Comments
 (0)