Skip to content

Commit 28c3b17

Browse files
committed
bug #40950 [Config] Remove double semicolons from autogenerated config classes (HypeMC)
This PR was squashed before being merged into the 5.3-dev branch. Discussion ---------- [Config] Remove double semicolons from autogenerated config classes | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | N/A In some cases, the autogenerated config classes contain double semicolons: ![image](https://user-images.githubusercontent.com/2445045/116090262-f4b03200-a6a3-11eb-9cdd-135e9dbac084.png) Commits ------- c7163b32c2 [Config] Remove double semicolons from autogenerated config classes
2 parents ba75ba0 + bcaa4b8 commit 28c3b17

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Builder/ConfigBuilderGenerator.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -353,18 +353,18 @@ private function buildToArray(ClassBuilder $class): void
353353
{
354354
$body = '$output = [];';
355355
foreach ($class->getProperties() as $p) {
356-
$code = '$this->PROPERTY;';
356+
$code = '$this->PROPERTY';
357357
if (null !== $p->getType()) {
358358
if ($p->isArray()) {
359-
$code = 'array_map(function($v) { return $v->toArray(); }, $this->PROPERTY);';
359+
$code = 'array_map(function($v) { return $v->toArray(); }, $this->PROPERTY)';
360360
} else {
361-
$code = '$this->PROPERTY->toArray();';
361+
$code = '$this->PROPERTY->toArray()';
362362
}
363363
}
364364

365365
$body .= strtr('
366366
if (null !== $this->PROPERTY) {
367-
$output["ORG_NAME"] = '.$code.'
367+
$output[\'ORG_NAME\'] = '.$code.';
368368
}', ['PROPERTY' => $p->getName(), 'ORG_NAME' => $p->getOriginalName()]);
369369
}
370370

@@ -382,19 +382,19 @@ private function buildConstructor(ClassBuilder $class): void
382382
{
383383
$body = '';
384384
foreach ($class->getProperties() as $p) {
385-
$code = '$value["ORG_NAME"]';
385+
$code = '$value[\'ORG_NAME\']';
386386
if (null !== $p->getType()) {
387387
if ($p->isArray()) {
388-
$code = 'array_map(function($v) { return new '.$p->getType().'($v); }, $value["ORG_NAME"]);';
388+
$code = 'array_map(function($v) { return new '.$p->getType().'($v); }, $value[\'ORG_NAME\'])';
389389
} else {
390-
$code = 'new '.$p->getType().'($value["ORG_NAME"])';
390+
$code = 'new '.$p->getType().'($value[\'ORG_NAME\'])';
391391
}
392392
}
393393

394394
$body .= strtr('
395-
if (isset($value["ORG_NAME"])) {
395+
if (isset($value[\'ORG_NAME\'])) {
396396
$this->PROPERTY = '.$code.';
397-
unset($value["ORG_NAME"]);
397+
unset($value[\'ORG_NAME\']);
398398
}
399399
', ['PROPERTY' => $p->getName(), 'ORG_NAME' => $p->getOriginalName()]);
400400
}

0 commit comments

Comments
 (0)