Consistently use var $container to reference the container builder+configurator

Author: nicolas-grekas

Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php

@@ -77,64 +77,64 @@ public function testParameterNotFoundExceptionsIsThrown()
         $this->expectException(ParameterNotFoundException::class);
         $this->expectExceptionMessage('The service "baz_service_id" has a dependency on a non-existent parameter "non_existent_param".');
 
-        $containerBuilder = new ContainerBuilder();
-        $definition = $containerBuilder->register('baz_service_id');
+        $container = new ContainerBuilder();
+        $definition = $container->register('baz_service_id');
         $definition->setArgument(0, '%non_existent_param%');
 
         $pass = new ResolveParameterPlaceHoldersPass();
-        $pass->process($containerBuilder);
+        $pass->process($container);
     }
 
     public function testParameterNotFoundExceptionsIsNotThrown()
     {
-        $containerBuilder = new ContainerBuilder();
-        $definition = $containerBuilder->register('baz_service_id');
+        $container = new ContainerBuilder();
+        $definition = $container->register('baz_service_id');
         $definition->setArgument(0, '%non_existent_param%');
 
         $pass = new ResolveParameterPlaceHoldersPass(true, false);
-        $pass->process($containerBuilder);
+        $pass->process($container);
 
         $this->assertCount(1, $definition->getErrors());
     }
 
     public function testOnlyProxyTagIsResolved()
     {
-        $containerBuilder = new ContainerBuilder();
-        $containerBuilder->setParameter('a_param', 'here_you_go');
-        $definition = $containerBuilder->register('def');
+        $container = new ContainerBuilder();
+        $container->setParameter('a_param', 'here_you_go');
+        $definition = $container->register('def');
         $definition->addTag('foo', ['bar' => '%a_param%']);
         $definition->addTag('proxy', ['interface' => '%a_param%']);
 
         $pass = new ResolveParameterPlaceHoldersPass(true, false);
-        $pass->process($containerBuilder);
+        $pass->process($container);
 
         $this->assertSame(['foo' => [['bar' => '%a_param%']], 'proxy' => [['interface' => 'here_you_go']]], $definition->getTags());
     }
 
     private function createContainerBuilder(): ContainerBuilder
     {
-        $containerBuilder = new ContainerBuilder();
-
-        $containerBuilder->setParameter('foo.class', 'Foo');
-        $containerBuilder->setParameter('foo.factory.class', 'FooFactory');
-        $containerBuilder->setParameter('foo.arg1', 'bar');
-        $containerBuilder->setParameter('foo.arg2', ['%foo.arg1%' => 'baz']);
-        $containerBuilder->setParameter('foo.method', 'foobar');
-        $containerBuilder->setParameter('foo.property.name', 'bar');
-        $containerBuilder->setParameter('foo.property.value', 'baz');
-        $containerBuilder->setParameter('foo.file', 'foo.php');
-        $containerBuilder->setParameter('alias.id', 'bar');
-
-        $fooDefinition = $containerBuilder->register('foo', '%foo.class%');
+        $container = new ContainerBuilder();
+
+        $container->setParameter('foo.class', 'Foo');
+        $container->setParameter('foo.factory.class', 'FooFactory');
+        $container->setParameter('foo.arg1', 'bar');
+        $container->setParameter('foo.arg2', ['%foo.arg1%' => 'baz']);
+        $container->setParameter('foo.method', 'foobar');
+        $container->setParameter('foo.property.name', 'bar');
+        $container->setParameter('foo.property.value', 'baz');
+        $container->setParameter('foo.file', 'foo.php');
+        $container->setParameter('alias.id', 'bar');
+
+        $fooDefinition = $container->register('foo', '%foo.class%');
         $fooDefinition->setFactory(['%foo.factory.class%', 'getFoo']);
         $fooDefinition->setArguments(['%foo.arg1%', ['%foo.arg1%' => 'baz']]);
         $fooDefinition->addMethodCall('%foo.method%', ['%foo.arg1%', '%foo.arg2%']);
         $fooDefinition->setProperty('%foo.property.name%', '%foo.property.value%');
         $fooDefinition->setFile('%foo.file%');
         $fooDefinition->setBindings(['$baz' => '%env(BAZ)%']);
 
-        $containerBuilder->setAlias('%alias.id%', 'foo');
+        $container->setAlias('%alias.id%', 'foo');
 
-        return $containerBuilder;
+        return $container;
     }
 }

Tests/Fixtures/config/services_with_enumeration.php

@@ -6,12 +6,12 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooClassWithEnumAttribute;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum;
 
-return function (ContainerConfigurator $containerConfigurator) {
-    $containerConfigurator->parameters()
+return function (ContainerConfigurator $container) {
+    $container->parameters()
         ->set('unit_enum', FooUnitEnum::BAR)
         ->set('enum_array', [FooUnitEnum::BAR, FooUnitEnum::FOO]);
 
-    $services = $containerConfigurator->services();
+    $services = $container->services();
 
     $services->defaults()->public();
 

Tests/Loader/XmlFileLoaderTest.php

@@ -112,11 +112,11 @@ public function testParseFile()
 
     public function testLoadWithExternalEntitiesDisabled()
     {
-        $containerBuilder = new ContainerBuilder();
-        $loader = new XmlFileLoader($containerBuilder, new FileLocator(self::$fixturesPath.'/xml'));
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('services2.xml');
 
-        $this->assertGreaterThan(0, $containerBuilder->getParameterBag()->all(), 'Parameters can be read from the config file.');
+        $this->assertGreaterThan(0, $container->getParameterBag()->all(), 'Parameters can be read from the config file.');
     }
 
     public function testLoadParameters()