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 41d4a27

Browse filesBrowse files
committed
Merge branch '6.2' into 6.3
* 6.2: Standardize the name of the container builder variable 6.1
2 parents c679e90 + 2ba5d7d commit 41d4a27
Copy full SHA for 41d4a27

File tree

Expand file treeCollapse file tree

4 files changed

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

4 files changed

+8
-8
lines changed

‎bundles/configuration.rst

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

355-
public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $builder): void
355+
public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): 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.

‎bundles/extension.rst

Copy file name to clipboardExpand all lines: bundles/extension.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ method::
131131

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

‎bundles/prepend_extension.rst

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

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

‎configuration/micro_kernel_trait.rst

Copy file name to clipboardExpand all lines: configuration/micro_kernel_trait.rst
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ Now it looks like this::
247247
return $bundles;
248248
}
249249

250-
protected function build(ContainerBuilder $container)
250+
protected function build(ContainerBuilder $containerBuilder)
251251
{
252-
$container->registerExtension(new AppExtension());
252+
$containerBuilder->registerExtension(new AppExtension());
253253
}
254254

255255
protected function configureContainer(ContainerConfigurator $containerConfigurator): void
@@ -325,10 +325,10 @@ add a service conditionally based on the ``foo`` value::
325325
->end();
326326
}
327327

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

0 commit comments

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