symfony
diff --git a/‎src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
Lines changed: 14 additions & 5 deletions b/‎src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
Lines changed: 14 additions & 5 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
Lines changed: 0 additions & 3 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
Lines changed: 0 additions & 3 deletions
@@ -133,7 +133,8 @@ private function handleVariableNode(VariableNode $node, ClassBuilder $class)
 
         $body = '
 /**
-COMMENT */
+COMMENT * @return $this
+ */
 public function NAME($valueDEFAULT): self
 {
     $this->PROPERTY = $value;
@@ -154,6 +155,9 @@ private function handlePrototypedArrayNode(PrototypedArrayNode $node, ClassBuild
             $property = $class->addProperty($node->getName());
             if (null === $key = $node->getKeyAttribute()) {
                 $body = '
+/**
+ * @return $this
+ */
 public function NAME(TYPE$value): self
 {
     $this->PROPERTY = $value;
@@ -163,6 +167,9 @@ public function NAME(TYPE$value): self
                 $class->addMethod($methodName, $body, ['PROPERTY' => $property->getName(), 'TYPE' => '' === $parameterType ? '' : $parameterType.' ']);
             } else {
                 $body = '
+/**
+ * @return $this
+ */
 public function NAME(string $VAR, TYPE$VALUE): self
 {
     $this->PROPERTY[$VAR] = $VALUE;
@@ -194,11 +201,12 @@ public function NAME(string $VAR, array $VALUE = []): CLASS
 {
     if (!isset($this->PROPERTY[$VAR])) {
         return $this->PROPERTY[$VAR] = new CLASS($value);
-    } elseif ([] === $value) {
+    }
+    if ([] === $value) {
         return $this->PROPERTY[$VAR];
-    } else {
-        throw new \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException(sprintf(\'The node created by "NAME()" has already been initialized. You cannot pass values the second time you call NAME().\'));
     }
+
+    throw new \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException(sprintf(\'The node created by "NAME()" has already been initialized. You cannot pass values the second time you call NAME().\'));
 }';
             $class->addMethod($methodName, $body, ['PROPERTY' => $property->getName(), 'CLASS' => $childClass->getFqcn(), 'VAR' => '' === $key ? 'key' : $key, 'VALUE' => 'value' === $key ? 'data' : 'value']);
         }
@@ -213,7 +221,8 @@ private function handleScalarNode(ScalarNode $node, ClassBuilder $class)
 
         $body = '
 /**
-COMMENT */
+COMMENT * @return $this
+ */
 public function NAME(TYPE$value): self
 {
     $this->PROPERTY = $value;
 
@@ -108,9 +108,6 @@ private function executeCallback(callable $callback, ContainerConfigurator $cont
                     $arguments[] = $containerConfigurator;
                     break;
                 case ContainerBuilder::class:
-                case Container::class:
-                case ContainerInterface::class:
-                case \Psr\Container\ContainerInterface::class:
                     $arguments[] = $this->container;
                     break;
                 case FileLoader::class: