Skip to content

Commit 0706e20

Browse files
nicolas-grekasnicolas-grekas
committed
Make as many services private as possible
1 parent c97c6d4 commit 0706e20

Some content is hidden

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

59 files changed

+452
-154
lines changed

‎REMAINING.PUBLIC.md‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
### Remaining public aliases
2+
3+
annotation_reader
4+
security.access.decision_manager
5+
security.acl.cache
6+
security.acl.provider
7+
security.encoder_factory
8+
security.password_encoder
9+
session.handler
10+
session.storage
11+
templating.loader
12+
translator
13+
14+
cache.app_clearer <- for the cache:pool:clear command to clear app pools
15+
$commandId <- for non-lazy commands which are get() at runtime
16+
router <- for the base controller
17+
templating <- for the base controller
18+
19+
### Remaining public services
20+
21+
file_locator
22+
filesystem
23+
kernel
24+
property_accessor
25+
property_info
26+
security.acl.dbal.schema
27+
security.authentication_utils
28+
test.client
29+
translation.extractor
30+
translation.loader
31+
translation.reader
32+
translation.writer
33+
translator
34+
validator
35+
36+
cache_clearer <- for the cache:clear command
37+
cache_warmer <- required to bootstrap the kernel
38+
cache.app <- for userland only
39+
cache.global_clearer <- for the cache:pool:clear command to clear all pools
40+
cache.system <- for userland only
41+
data_collector.dump <- required to have dump() work very early when booting the kernel
42+
event_dispatcher <- required to wire console apps
43+
form.factory <- for the base controller
44+
http_kernel <- required to bootstrap the kernel
45+
profiler <- used in tests
46+
request_stack <- for the base controller
47+
routing.loader <- used by routing
48+
security.authorization_checker <- for the base controller
49+
security.csrf.token_manager <- for the base controller
50+
security.token_storage <- for the base controller
51+
serializer <- for the base controller
52+
session <- for the base controller
53+
state_machine.abstract <- state machines created by config are public
54+
workflow.abstract <- workflows created by config are public
55+
twig <- for the base controller
56+
twig.controller.exception <- controllers referenced by routing
57+
twig.controller.preview_error <- controllers referenced by routing
58+
var_dumper.cloner <- required to have dump() work very early when booting the kernel
59+
web_profiler.controller.exception <- controllers referenced by routing
60+
web_profiler.controller.profiler <- controllers referenced by routing
61+
web_profiler.controller.router <- controllers referenced by routing

‎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"

0 commit comments

Comments
 (0)