Adding nice keys

Nyholm · Nyholm · commit d3a8e3b49497 · 2021-03-27T23:03:12.000+01:00
diff --git a/src/Symfony/Component/Config/Builder/Generator.php b/src/Symfony/Component/Config/Builder/Generator.php
@@ -138,7 +138,7 @@ private function handlePrototypedArrayNode(PrototypedArrayNode $node, ClassBuild
         $parameterType = $this->getParameterType($prototype);
         if (null !== $parameterType || $prototype instanceof ScalarNode) {
             $property = $class->addProperty($node->getName());
-            if (null === $node->getKeyAttribute()) {
+            if (null === $key = $node->getKeyAttribute()) {
                 $body = '
 public function NAME(TYPE $value): self
 {
@@ -149,13 +149,14 @@ public function NAME(TYPE $value): self
                 $class->addMethod($methodName, $body, ['PROPERTY' => $property->getName(), 'TYPE' => $parameterType]);
             } else {
                 $body = '
-public function NAME(string $key, TYPE $value): self
+public function NAME(string $VAR, TYPE $VALUE): self
 {
-    $this->PROPERTY[$key] = $value;
+    $this->PROPERTY[$VAR] = $VALUE;
 
     return $this;
 }';
-                $class->addMethod($methodName, $body, ['PROPERTY' => $property->getName(), 'TYPE' => $parameterType]);
+
+                $class->addMethod($methodName, $body, ['PROPERTY' => $property->getName(), 'TYPE' => $parameterType, 'VAR'=>$key, 'VALUE'=>' value' === $key ? 'data' : 'value']);
             }
 
             return;
@@ -166,7 +167,7 @@ public function NAME(string $key, TYPE $value): self
         $this->classes[] = $childClass;
         $property = $class->addProperty($node->getName(), $childClass->getName().'[]');
 
-        if (null === $node->getKeyAttribute()) {
+        if (null === $key = $node->getKeyAttribute()) {
             $body = '
 public function NAME(array $value = []): CLASS
 {
@@ -175,11 +176,11 @@ public function NAME(array $value = []): CLASS
             $class->addMethod($methodName, $body, ['PROPERTY' => $property->getName(), 'CLASS' => $childClass->getFqcn()]);
         } else {
             $body = '
-public function NAME(string $key, array $value = []): CLASS
+public function NAME(string $VAR, array $VALUE = []): CLASS
 {
-    return $this->PROPERTY[$key] = new CLASS($value);
+    return $this->PROPERTY[$VAR] = new CLASS($VALUE);
 }';
-            $class->addMethod($methodName, $body, ['PROPERTY' => $property->getName(), 'CLASS' => $childClass->getFqcn()]);
+            $class->addMethod($methodName, $body, ['PROPERTY' => $property->getName(), 'CLASS' => $childClass->getFqcn(), 'VAR'=>$key, 'VALUE'=>' value' === $key ? 'data' : 'value']);
         }
 
         $this->buildNode($prototype, $childClass, $namespace.'\\'.$childClass->getName());
