More cleaning

Nyholm · Nyholm · commit 3bd794f797e6 · 2021-03-27T22:57:39.000+01:00
diff --git a/src/Symfony/Component/Config/Builder/Generator.php b/src/Symfony/Component/Config/Builder/Generator.php
@@ -29,7 +29,7 @@
  */
 class Generator implements GeneratorInterface
 {
-    private $classes = [];
+    private $classes;
 
     /**
      * @return \Closure that will return the root config class
@@ -39,8 +39,9 @@ public function build(ConfigurationInterface $configuration, string $outputDir):
         $this->classes = [];
 
         $rootNode = $configuration->getConfigTreeBuilder()->buildTree();
-        $rootClass = new ClassBuilder($namespace = 'Config\\'.ucfirst(preg_replace('#\W#', '', $rootNode->getPath())), $rootNode->getName());
-        $this->classes[$rootNode->getPath()] = $rootClass;
+        $namespace = 'Config\\'.ucfirst(preg_replace('#\W#', '', $rootNode->getPath()));
+        $rootClass = new ClassBuilder($namespace, $rootNode->getName());
+        $this->classes[] = $rootClass;
 
         $this->buildNode($rootNode, $rootClass, $namespace);
 
@@ -71,7 +72,7 @@ private function writeClasses(string $outputDir)
     private function buildNode(NodeInterface $node, ClassBuilder $class, string $namespace)
     {
         if (!$node instanceof ArrayNode) {
-            throw new \LogicException('The node was expected to be an array node.');
+            throw new \LogicException('The node was expected to be an ArrayNode. This Configuration includes an edge case not supported yet.');
         }
 
         foreach ($node->getChildren() as $child) {
@@ -98,15 +99,15 @@ private function handleArrayNode(ArrayNode $node, ClassBuilder $class, string $n
     {
         $childClass = new ClassBuilder($namespace, $node->getName());
         $class->addRequire($childClass);
-        $this->classes[$node->getPath()] = $childClass;
+        $this->classes[] = $childClass;
 
         $property = $class->addProperty($node->getName(), $childClass->getName());
         $body = '
-public function NAME(array $value = []): OUT
+public function NAME(array $value = []): CLASS
 {
     return $this->PROPERTY = new CLASS($value);
 }';
-        $class->addMethod('add_'.$node->getName(), $body, ['PROPERTY' => $property->getName(), 'CLASS' => $childClass->getFqcn(), 'OUT' => $childClass->getFqcn()]);
+        $class->addMethod('add_'.$node->getName(), $body, ['PROPERTY' => $property->getName(), 'CLASS' => $childClass->getFqcn()]);
 
         $this->buildNode($node, $childClass, $namespace.'\\'.$childClass->getName());
     }
@@ -130,20 +131,7 @@ public function NAME($value): self
 
     private function handlePrototypedArrayNode(PrototypedArrayNode $node, ClassBuilder $class, string $namespace)
     {
-        /*
-         * Pick a good singular name
-         */
-        $name = $node->getName();
-        if ('s' === substr($name, -1)) {
-            $mappings = $node->getParent() instanceof ArrayNode ? $node->getParent()->getXmlRemappings() : [];
-            foreach ($mappings as $map) {
-                if ($map[1] === $name) {
-                    $name = $map[0];
-                    break;
-                }
-            }
-        }
-
+        $name = $this->getSingularName($node);
         $prototype = $node->getPrototype();
         $methodName = 'add_'.$name;
 
@@ -175,7 +163,7 @@ public function NAME(string $key, TYPE $value): self
 
         $childClass = new ClassBuilder($namespace, $name);
         $class->addRequire($childClass);
-        $this->classes[$node->getPath()] = $childClass;
+        $this->classes[] = $childClass;
         $property = $class->addProperty($node->getName(), $childClass->getName().'[]');
 
         if (null === $node->getKeyAttribute()) {
@@ -269,4 +257,26 @@ private function getComment(VariableNode $node): string
 
         return $comment;
     }
+
+    /**
+     * Pick a good singular name
+     */
+    private function getSingularName(PrototypedArrayNode $node): string
+    {
+        $name = $node->getName();
+        if ('s' !== substr($name, -1)) {
+            return $name;
+        }
+
+        $parent = $node->getParent();
+        $mappings = $parent instanceof ArrayNode ? $parent->getXmlRemappings() : [];
+        foreach ($mappings as $map) {
+            if ($map[1] === $name) {
+                $name = $map[0];
+                break;
+            }
+        }
+
+        return $name;
+    }
 }
