Skip to content

Commit 422bf52

Browse files
xabbuhxabbuh
committed
minor #17664 Standardize the name of the container configurator variable (alamirault)
This PR was merged into the 5.4 branch. Discussion ---------- Standardize the name of the container configurator variable #17381 Use always `ContainerConfigurator $containerConfigurator` instead of `$container` or `$configurator` Commits ------- a9cbf8b Standardize the name of the container configurator variable
2 parents bd9fc26 + a9cbf8b commit 422bf52

Some content is hidden

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

42 files changed

+212
-212
lines changed

‎bundles/best_practices.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@ The end user can provide values in any configuration file:
442442
// config/services.php
443443
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
444444
445-
return static function (ContainerConfigurator $container) {
446-
$container->parameters()
445+
return static function (ContainerConfigurator $containerConfigurator) {
446+
$containerConfigurator->parameters()
447447
->set('acme_blog.author.email', '[email protected]')
448448
;
449449
};

‎bundles/prepend_extension.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
145145
// config/packages/acme_something.php
146146
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
147147
148-
return static function (ContainerConfigurator $container) {
149-
$container->extension('acme_something', [
148+
return static function (ContainerConfigurator $containerConfigurator) {
149+
$containerConfigurator->extension('acme_something', [
150150
// ...
151151
'use_acme_goodbye' => false,
152152
'entity_manager_name' => 'non_default',
153153
]);
154-
$container->extension('acme_other', [
154+
$containerConfigurator->extension('acme_other', [
155155
// ...
156156
'use_acme_goodbye' => false,
157157
]);

‎cache.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@ with either :class:`Symfony\\Contracts\\Cache\\CacheInterface` or
387387
// config/services.php
388388
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
389389
390-
return function(ContainerConfigurator $configurator) {
391-
$configurator->services()
390+
return function(ContainerConfigurator $containerConfigurator) {
391+
$containerConfigurator->services()
392392
// ...
393393
394394
->set('app.cache.adapter.redis')

‎components/dependency_injection.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,13 +291,13 @@ config files:
291291
292292
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
293293
294-
return static function (ContainerConfigurator $container) {
295-
$container->parameters()
294+
return static function (ContainerConfigurator $containerConfigurator) {
295+
$containerConfigurator->parameters()
296296
// ...
297297
->set('mailer.transport', 'sendmail')
298298
;
299299
300-
$services = $container->services();
300+
$services = $containerConfigurator->services();
301301
$services->set('mailer', 'Mailer')
302302
->args(['%mailer.transport%'])
303303
;

‎components/dependency_injection/_imports-parameters-note.rst.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
// config/services.php
3232
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
3333

34-
return static function (ContainerConfigurator $container) {
35-
$container->import('%kernel.project_dir%/somefile.yaml');
34+
return static function (ContainerConfigurator $containerConfigurator) {
35+
$containerConfigurator->import('%kernel.project_dir%/somefile.yaml');
3636
};

‎components/http_foundation/session_configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ configuration:
200200
// config/packages/framework.php
201201
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
202202
203-
return static function (ContainerConfigurator $container) {
204-
$container->extension('framework', [
203+
return static function (ContainerConfigurator $containerConfigurator) {
204+
$containerConfigurator->extension('framework', [
205205
'session' => [
206206
'gc_probability' => null,
207207
],

‎components/serializer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -998,8 +998,8 @@ faster alternative to the
998998
999999
use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
10001000
1001-
return static function (ContainerConfigurator $container) {
1002-
$container->services()
1001+
return static function (ContainerConfigurator $containerConfigurator) {
1002+
$containerConfigurator->services()
10031003
// ...
10041004
->set('get_set_method_normalizer', GetSetMethodNormalizer::class)
10051005
->tag('serializer.normalizer')

‎components/uid.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ configuration in your application before using these commands:
452452
use Symfony\Component\Uid\Command\InspectUlidCommand;
453453
use Symfony\Component\Uid\Command\InspectUuidCommand;
454454
455-
return static function (ContainerConfigurator $configurator): void {
455+
return static function (ContainerConfigurator $containerConfigurator): void {
456456
// ...
457457
458458
$services

‎components/var_dumper.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ the :ref:`dump_destination option <configuration-debug-dump_destination>` of the
147147
// config/packages/debug.php
148148
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
149149
150-
return static function (ContainerConfigurator $container) {
151-
$container->extension('debug', [
150+
return static function (ContainerConfigurator $containerConfigurator) {
151+
$containerConfigurator->extension('debug', [
152152
'dump_destination' => 'tcp://%env(VAR_DUMPER_SERVER)%',
153153
]);
154154
};

‎configuration.rst

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,18 @@ shown in these three formats.
7878
{
7979
// ...
8080

81-
private function configureContainer(ContainerConfigurator $container): void
81+
private function configureContainer(ContainerConfigurator $containerConfigurator): void
8282
{
8383
$configDir = $this->getConfigDir();
8484

85-
$container->import($configDir.'/{packages}/*.{yaml,php}');
86-
$container->import($configDir.'/{packages}/'.$this->environment.'/*.{yaml,php}');
85+
$containerConfigurator->import($configDir.'/{packages}/*.{yaml,php}');
86+
$containerConfigurator->import($configDir.'/{packages}/'.$this->environment.'/*.{yaml,php}');
8787

8888
if (is_file($configDir.'/services.yaml')) {
89-
$container->import($configDir.'/services.yaml');
90-
$container->import($configDir.'/{services}_'.$this->environment.'.yaml');
89+
$containerConfigurator->import($configDir.'/services.yaml');
90+
$containerConfigurator->import($configDir.'/{services}_'.$this->environment.'.yaml');
9191
} else {
92-
$container->import($configDir.'/{services}.php');
92+
$containerConfigurator->import($configDir.'/{services}.php');
9393
}
9494
}
9595
}
@@ -163,17 +163,17 @@ configuration files, even if they use a different format:
163163
// config/services.php
164164
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
165165
166-
return static function (ContainerConfigurator $container) {
167-
$container->import('legacy_config.php');
166+
return static function (ContainerConfigurator $containerConfigurator) {
167+
$containerConfigurator->import('legacy_config.php');
168168
169169
// glob expressions are also supported to load multiple files
170-
$container->import('/etc/myapp/*.yaml');
170+
$containerConfigurator->import('/etc/myapp/*.yaml');
171171
172172
// the third optional argument of import() is 'ignore_errors'
173173
// 'ignore_errors' set to 'not_found' silently discards errors if the loaded file doesn't exist
174-
$container->import('my_config_file.yaml', null, 'not_found');
174+
$containerConfigurator->import('my_config_file.yaml', null, 'not_found');
175175
// 'ignore_errors' set to true silently discards all errors (including invalid code and not found)
176-
$container->import('my_config_file.yaml', null, true);
176+
$containerConfigurator->import('my_config_file.yaml', null, true);
177177
};
178178
179179
// ...
@@ -262,8 +262,8 @@ reusable configuration value. By convention, parameters are defined under the
262262
263263
use App\Entity\BlogPost;
264264
265-
return static function (ContainerConfigurator $container) {
266-
$container->parameters()
265+
return static function (ContainerConfigurator $containerConfigurator) {
266+
$containerConfigurator->parameters()
267267
// the parameter name is an arbitrary string (the 'app.' prefix is recommended
268268
// to better differentiate your parameters from Symfony parameters).
269269
->set('app.admin_email', '[email protected]')
@@ -334,8 +334,8 @@ configuration file using a special syntax: wrap the parameter name in two ``%``
334334
// config/packages/some_package.php
335335
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
336336
337-
return static function (ContainerConfigurator $container) {
338-
$container->extension('some_package', [
337+
return static function (ContainerConfigurator $containerConfigurator) {
338+
$containerConfigurator->extension('some_package', [
339339
// any string surrounded by two % is replaced by that parameter value
340340
'email_address' => '%app.admin_email%',
341341
@@ -371,8 +371,8 @@ configuration file using a special syntax: wrap the parameter name in two ``%``
371371
// config/services.php
372372
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
373373
374-
return static function (ContainerConfigurator $container) {
375-
$container->parameters()
374+
return static function (ContainerConfigurator $containerConfigurator) {
375+
$containerConfigurator->parameters()
376376
->set('url_pattern', 'http://symfony.com/?foo=%%s&amp;bar=%%d');
377377
};
378378
@@ -508,20 +508,20 @@ files directly in the ``config/packages/`` directory.
508508
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
509509
use Symfony\Config\WebpackEncoreConfig;
510510
511-
return static function (WebpackEncoreConfig $webpackEncore, ContainerConfigurator $container) {
511+
return static function (WebpackEncoreConfig $webpackEncore, ContainerConfigurator $containerConfigurator) {
512512
$webpackEncore
513513
->outputPath('%kernel.project_dir%/public/build')
514514
->strictMode(true)
515515
->cache(false)
516516
;
517517
518518
// cache is enabled only in the "prod" environment
519-
if ('prod' === $container->env()) {
519+
if ('prod' === $containerConfigurator->env()) {
520520
$webpackEncore->cache(true);
521521
}
522522
523523
// disable strict mode only in the "test" environment
524-
if ('test' === $container->env()) {
524+
if ('test' === $containerConfigurator->env()) {
525525
$webpackEncore->strictMode(false);
526526
}
527527
};
@@ -642,8 +642,8 @@ This example shows how you could configure the database connection using an env
642642
// config/packages/doctrine.php
643643
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
644644
645-
return static function (ContainerConfigurator $container) {
646-
$container->extension('doctrine', [
645+
return static function (ContainerConfigurator $containerConfigurator) {
646+
$containerConfigurator->extension('doctrine', [
647647
'dbal' => [
648648
// by convention the env var names are always uppercase
649649
'url' => env('DATABASE_URL')->resolve(),
@@ -991,8 +991,8 @@ doesn't work for parameters:
991991
992992
use App\Service\MessageGenerator;
993993
994-
return static function (ContainerConfigurator $container) {
995-
$container->parameters()
994+
return static function (ContainerConfigurator $containerConfigurator) {
995+
$containerConfigurator->parameters()
996996
->set('app.contents_dir', '...');
997997
998998
$container->services()
@@ -1048,8 +1048,8 @@ whenever a service/controller defines a ``$projectDir`` argument, use this:
10481048
10491049
use App\Controller\LuckyController;
10501050
1051-
return static function (ContainerConfigurator $container) {
1052-
$container->services()
1051+
return static function (ContainerConfigurator $containerConfigurator) {
1052+
$containerConfigurator->services()
10531053
->defaults()
10541054
// pass this value to any $projectDir argument for any service
10551055
// that's created in this file (including controller arguments)

0 commit comments

Comments
 (0)