symfony
diff --git a/‎src/Symfony/Component/Config/Builder/ClassBuilder.php
Lines changed: 9 additions & 13 deletions b/‎src/Symfony/Component/Config/Builder/ClassBuilder.php
Lines changed: 9 additions & 13 deletions
diff --git a/‎src/Symfony/Component/Config/Builder/Generator.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Config/Builder/Generator.php
Lines changed: 1 addition & 1 deletion
@@ -43,7 +43,7 @@ public function __construct(string $namespace, string $name)
 
     public function getFilePath(): string
     {
-        return str_replace('\\', \DIRECTORY_SEPARATOR, $this->getNamespace());
+        return str_replace('\\', \DIRECTORY_SEPARATOR, $this->namespace);
     }
 
     public function getFilename(): string
@@ -98,7 +98,7 @@ class CLASS
 {
 BODY
 }
-', ['NAMESPACE' => $this->getNamespace(), 'REQUIRE' => $require, 'CLASS' => $this->getName(), 'BODY' => $body]);
+', ['NAMESPACE' => $this->namespace, 'REQUIRE' => $require, 'CLASS' => $this->getName(), 'BODY' => $body]);
 
         return $content;
     }
@@ -108,7 +108,7 @@ private function buildToArray()
         /*
          * Add toArray()
          */
-        $toArrayBody = '$output = [];';
+
10000
        $body = '$output = [];';
         foreach ($this->properties as $p) {
             $code = '$this->PROPERTY;';
             if (null !== $p->getType()) {
@@ -119,7 +119,7 @@ private function buildToArray()
                 }
             }
 
-            $toArrayBody .= strtr('
+            $body .= strtr('
     if (null !== $this->PROPERTY) {
         $output["ORG_NAME"] = '.$code.'
     }', ['PROPERTY' => $p->getName(), 'ORG_NAME' => $p->getOriginalName()]);
@@ -128,7 +128,7 @@ private function buildToArray()
         $this->addMethod('toArray', '
 public function NAME(): array
 {
-    '.$toArrayBody.'
+    '.$body.'
 
     return $output;
 }
@@ -137,7 +137,7 @@ public function NAME(): array
 
     private function buildConstructor()
     {
-        $constructorBody = '';
+        $body = '';
         foreach ($this->properties as $p) {
             $code = '$value["PROPERTY"]';
             if (null !== $p->getType()) {
@@ -148,23 +148,23 @@ private function buildConstructor()
                 }
             }
 
-            $constructorBody .= strtr('
+            $body .= strtr('
     if (isset($value["PROPERTY"])) {
         $this->PROPERTY = '.$code.';
         unset($value["PROPERTY"]);
     }
 ', ['PROPERTY' => $p->getName()]);
         }
 
-        $constructorBody .= '
+        $body .= '
     if ($value !== []) {
         throw new \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException(sprintf(\'The following keys are not supported by "%s": \', __CLASS__) . implode(\', \', array_keys($value)));
     }';
 
         $this->addMethod('__construct', '
 public function __construct(array $value = [])
 {
-'.$constructorBody.'
+'.$body.'
 }
 ');
     }
@@ -198,10 +198,6 @@ private function camelCase(string $input): string
         return preg_replace('#\W#', '', $output);
     }
 
-    public function getNamespace(): string
-    {
-        return $this->namespace;
-    }
 
     public function getName(): string
     {
 
@@ -49,7 +49,7 @@ public function build(ConfigurationInterface $configuration, string $outputDir):
             $str = $outputDir.\DIRECTORY_SEPARATOR.$rootClass->getFilePath().\DIRECTORY_SEPARATOR.$rootClass->getFilename();
             require_once $str;
 
-            $className = '\\'.$rootClass->getNamespace().'\\'.$rootClass->getName();
+            $className = $rootClass->getFqcn();
 
             return new $className();
         });
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(string $namespace, string $name)`
`43`	`43`
`44`	`44`	`public function getFilePath(): string`
`45`	`45`	`{`
`46`		`- return str_replace('\\', \DIRECTORY_SEPARATOR, $this->getNamespace());`
	`46`	`+ return str_replace('\\', \DIRECTORY_SEPARATOR, $this->namespace);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public function getFilename(): string`
`@@ -98,7 +98,7 @@ class CLASS`
`98`	`98`	`{`
`99`	`99`	`BODY`
`100`	`100`	`}`
`101`		`-', ['NAMESPACE' => $this->getNamespace(), 'REQUIRE' => $require, 'CLASS' => $this->getName(), 'BODY' => $body]);`
	`101`	`+', ['NAMESPACE' => $this->namespace, 'REQUIRE' => $require, 'CLASS' => $this->getName(), 'BODY' => $body]);`
`102`	`102`
`103`	`103`	`return $content;`
`104`	`104`	`}`
`@@ -108,7 +108,7 @@ private function buildToArray()`
`108`	`108`	`/*`
`109`	`109`	`* Add toArray()`
`110`	`110`	`*/`
`111`		`- $toArrayBody = '$output = [];';`
	`111`	`+ 10000 $body = '$output = [];';`
`112`	`112`	`foreach ($this->properties as $p) {`
`113`	`113`	`$code = '$this->PROPERTY;';`
`114`	`114`	`if (null !== $p->getType()) {`
`@@ -119,7 +119,7 @@ private function buildToArray()`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`- $toArrayBody .= strtr('`
	`122`	`+ $body .= strtr('`
`123`	`123`	`if (null !== $this->PROPERTY) {`
`124`	`124`	`$output["ORG_NAME"] = '.$code.'`
`125`	`125`	`}', ['PROPERTY' => $p->getName(), 'ORG_NAME' => $p->getOriginalName()]);`
`@@ -128,7 +128,7 @@ private function buildToArray()`
`128`	`128`	`$this->addMethod('toArray', '`
`129`	`129`	`public function NAME(): array`
`130`	`130`	`{`
`131`		`- '.$toArrayBody.'`
	`131`	`+ '.$body.'`
`132`	`132`
`133`	`133`	`return $output;`
`134`	`134`	`}`
`@@ -137,7 +137,7 @@ public function NAME(): array`
`137`	`137`
`138`	`138`	`private function buildConstructor()`
`139`	`139`	`{`
`140`		`- $constructorBody = '';`
	`140`	`+ $body = '';`
`141`	`141`	`foreach ($this->properties as $p) {`
`142`	`142`	`$code = '$value["PROPERTY"]';`
`143`	`143`	`if (null !== $p->getType()) {`
`@@ -148,23 +148,23 @@ private function buildConstructor()`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
`151`		`- $constructorBody .= strtr('`
	`151`	`+ $body .= strtr('`
`152`	`152`	`if (isset($value["PROPERTY"])) {`
`153`	`153`	`$this->PROPERTY = '.$code.';`
`154`	`154`	`unset($value["PROPERTY"]);`
`155`	`155`	`}`
`156`	`156`	`', ['PROPERTY' => $p->getName()]);`
`157`	`157`	`}`
`158`	`158`
`159`		`- $constructorBody .= '`
	`159`	`+ $body .= '`
`160`	`160`	`if ($value !== []) {`
`161`	`161`	`throw new \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException(sprintf(\'The following keys are not supported by "%s": \', __CLASS__) . implode(\', \', array_keys($value)));`
`162`	`162`	`}';`
`163`	`163`
`164`	`164`	`$this->addMethod('__construct', '`
`165`	`165`	`public function __construct(array $value = [])`
`166`	`166`	`{`
`167`		`-'.$constructorBody.'`
	`167`	`+'.$body.'`
`168`	`168`	`}`
`169`	`169`	`');`
`170`	`170`	`}`
`@@ -198,10 +198,6 @@ private function camelCase(string $input): string`
`198`	`198`	`return preg_replace('#\W#', '', $output);`
`199`	`199`	`}`
`200`	`200`
`201`		`- public function getNamespace(): string`
`202`		`- {`
`203`		`- return $this->namespace;`
`204`		`- }`
`205`	`201`
`206`	`202`	`public function getName(): string`
`207`	`203`	`{`