[Config] Remove double semicolons from autogenerated config classes

This commit is contained in:
HypeMC 2021-04-26 15:13:28 +02:00 committed by Alexander M. Turek
parent 896f4a6eb6
commit c7163b32c2

View File

@ -339,18 +339,18 @@ public function NAME(TYPE$value): self
{ {
$body = '$output = [];'; $body = '$output = [];';
foreach ($class->getProperties() as $p) { foreach ($class->getProperties() as $p) {
$code = '$this->PROPERTY;'; $code = '$this->PROPERTY';
if (null !== $p->getType()) { if (null !== $p->getType()) {
if ($p->isArray()) { if ($p->isArray()) {
$code = 'array_map(function($v) { return $v->toArray(); }, $this->PROPERTY);'; $code = 'array_map(function($v) { return $v->toArray(); }, $this->PROPERTY)';
} else { } else {
$code = '$this->PROPERTY->toArray();'; $code = '$this->PROPERTY->toArray()';
} }
} }
$body .= strtr(' $body .= strtr('
if (null !== $this->PROPERTY) { if (null !== $this->PROPERTY) {
$output["ORG_NAME"] = '.$code.' $output[\'ORG_NAME\'] = '.$code.';
}', ['PROPERTY' => $p->getName(), 'ORG_NAME' => $p->getOriginalName()]); }', ['PROPERTY' => $p->getName(), 'ORG_NAME' => $p->getOriginalName()]);
} }
@ -368,19 +368,19 @@ public function NAME(): array
{ {
$body = ''; $body = '';
foreach ($class->getProperties() as $p) { foreach ($class->getProperties() as $p) {
$code = '$value["ORG_NAME"]'; $code = '$value[\'ORG_NAME\']';
if (null !== $p->getType()) { if (null !== $p->getType()) {
if ($p->isArray()) { if ($p->isArray()) {
$code = 'array_map(function($v) { return new '.$p->getType().'($v); }, $value["ORG_NAME"]);'; $code = 'array_map(function($v) { return new '.$p->getType().'($v); }, $value[\'ORG_NAME\'])';
} else { } else {
$code = 'new '.$p->getType().'($value["ORG_NAME"])'; $code = 'new '.$p->getType().'($value[\'ORG_NAME\'])';
} }
} }
$body .= strtr(' $body .= strtr('
if (isset($value["ORG_NAME"])) { if (isset($value[\'ORG_NAME\'])) {
$this->PROPERTY = '.$code.'; $this->PROPERTY = '.$code.';
unset($value["ORG_NAME"]); unset($value[\'ORG_NAME\']);
} }
', ['PROPERTY' => $p->getName(), 'ORG_NAME' => $p->getOriginalName()]); ', ['PROPERTY' => $p->getName(), 'ORG_NAME' => $p->getOriginalName()]);
} }