Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit fcbf7cb

Browse filesBrowse files
javiereguiluzjaviereguiluz
committed
Merge branch '6.2' into 6.3
* 6.2: Standardize the name of the container configurator variable 6.1
2 parents bc7c9bd + 3d403e7 commit fcbf7cb
Copy full SHA for fcbf7cb

File tree

Expand file treeCollapse file tree

7 files changed

+18
-18
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+18
-18
lines changed

‎bundles/configuration.rst

Copy file name to clipboardExpand all lines: bundles/configuration.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,11 +352,11 @@ add this logic to the bundle class directly::
352352
;
353353
}
354354

355-
public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
355+
public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
356356
{
357357
// Contrary to the Extension class, the "$config" variable is already merged
358358
// and processed. You can use it directly to configure the service container.
359-
$container->services()
359+
$containerConfigurator->services()
360360
->get('acme.social.twitter_client')
361361
->arg(0, $config['twitter']['client_id'])
362362
->arg(1, $config['twitter']['client_secret'])

‎bundles/extension.rst

Copy file name to clipboardExpand all lines: bundles/extension.rst
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,18 @@ method::
131131

132132
class AcmeHelloBundle extends AbstractBundle
133133
{
134-
public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
134+
public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
135135
{
136136
// load an XML, PHP or Yaml file
137-
$container->import('../config/services.xml');
137+
$containerConfigurator->import('../config/services.xml');
138138

139139
// you can also add or replace parameters and services
140-
$container->parameters()
140+
$containerConfigurator->parameters()
141141
->set('acme_hello.phrase', $config['phrase'])
142142
;
143143

144144
if ($config['scream']) {
145-
$container->services()
145+
$containerConfigurator->services()
146146
->get('acme_hello.printer')
147147
->class(ScreamingPrinter::class)
148148
;

‎bundles/prepend_extension.rst

Copy file name to clipboardExpand all lines: bundles/prepend_extension.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,20 +173,20 @@ method::
173173

174174
class FooBundle extends AbstractBundle
175175
{
176-
public function prependExtension(ContainerConfigurator $container, ContainerBuilder $builder): void
176+
public function prependExtension(ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
177177
{
178178
// prepend
179179
$builder->prependExtensionConfig('framework', [
180180
'cache' => ['prefix_seed' => 'foo/bar'],
181181
]);
182182

183183
// append
184-
$container->extension('framework', [
184+
$containerConfigurator->extension('framework', [
185185
'cache' => ['prefix_seed' => 'foo/bar'],
186186
]);
187187

188188
// append from file
189-
$container->import('../config/packages/cache.php');
189+
$containerConfigurator->import('../config/packages/cache.php');
190190
}
191191
}
192192

‎configuration/micro_kernel_trait.rst

Copy file name to clipboardExpand all lines: configuration/micro_kernel_trait.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ Next, create an ``index.php`` file that defines the kernel class and runs it:
9393
];
9494
}
9595
96-
protected function configureContainer(ContainerConfigurator $c): void
96+
protected function configureContainer(ContainerConfigurator $containerConfigurator): void
9797
{
9898
// PHP equivalent of config/packages/framework.yaml
99-
$c->extension('framework', [
99+
$containerConfigurator->extension('framework', [
100100
'secret' => 'S0ME_SECRET'
101101
]);
102102
}
@@ -325,7 +325,7 @@ add a service conditionally based on the ``foo`` value::
325325
->end();
326326
}
327327

328-
public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
328+
public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
329329
{
330330
if ($config['foo']) {
331331
$builder->register('foo_service', \stdClass::class);

‎notifier.rst

Copy file name to clipboardExpand all lines: notifier.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -770,8 +770,8 @@ typical alert levels, which you can implement immediately using:
770770
771771
use Symfony\Component\Notifier\FlashMessage\BootstrapFlashMessageImportanceMapper;
772772
773-
return function(ContainerConfigurator $configurator) {
774-
$configurator->services()
773+
return function(ContainerConfigurator $containerConfigurator) {
774+
$containerConfigurator->services()
775775
->set('notifier.flash_message_importance_mapper', BootstrapFlashMessageImportanceMapper::class)
776776
;
777777
};

‎service_container/factories.rst

Copy file name to clipboardExpand all lines: service_container/factories.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ e.g. change the service based on a parameter:
298298
use App\Email\NewsletterManagerInterface;
299299
use App\Email\NewsletterManagerFactory;
300300
301-
return function(ContainerConfigurator $configurator) {
302-
$services = $configurator->services();
301+
return function(ContainerConfigurator $containerConfigurator) {
302+
$services = $containerConfigurator->services();
303303
304304
$services->set(NewsletterManagerInterface::class)
305305
// use the "tracable_newsletter" service when debug is enabled, "newsletter" otherwise.

‎service_container/tags.rst

Copy file name to clipboardExpand all lines: service_container/tags.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,8 +672,8 @@ iterator, add the ``exclude`` option:
672672
// config/services.php
673673
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
674674
675-
return function(ContainerConfigurator $configurator) {
676-
$services = $configurator->services();
675+
return function(ContainerConfigurator $containerConfigurator) {
676+
$services = $containerConfigurator->services();
677677
678678
// ...
679679

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.