Skip to content

Commit 97c2fbf

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.0
* 6.4: [Templating] Fix CI More short closures
2 parents f1839b0 + 6ac5379 commit 97c2fbf

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

‎Builder/ConfigBuilderGenerator.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,8 @@ private function buildToArray(ClassBuilder $class): void
478478
if (null !== $p->getType()) {
479479
if ($p->isArray()) {
480480
$code = $p->areScalarsAllowed()
481-
? 'array_map(function ($v) { return $v instanceof CLASS ? $v->toArray() : $v; }, $this->PROPERTY)'
482-
: 'array_map(function ($v) { return $v->toArray(); }, $this->PROPERTY)'
481+
? 'array_map(fn ($v) => $v instanceof CLASS ? $v->toArray() : $v, $this->PROPERTY)'
482+
: 'array_map(fn ($v) => $v->toArray(), $this->PROPERTY)'
483483
;
484484
} else {
485485
$code = $p->areScalarsAllowed()
@@ -514,8 +514,8 @@ private function buildConstructor(ClassBuilder $class): void
514514
if (null !== $p->getType()) {
515515
if ($p->isArray()) {
516516
$code = $p->areScalarsAllowed()
517-
? 'array_map(function ($v) { return \is_array($v) ? new '.$p->getType().'($v) : $v; }, $value[\'ORG_NAME\'])'
518-
: 'array_map(function ($v) { return new '.$p->getType().'($v); }, $value[\'ORG_NAME\'])'
517+
? 'array_map(fn ($v) => \is_array($v) ? new '.$p->getType().'($v) : $v, $value[\'ORG_NAME\'])'
518+
: 'array_map(fn ($v) => new '.$p->getType().'($v), $value[\'ORG_NAME\'])'
519519
;
520520
} else {
521521
$code = $p->areScalarsAllowed()

‎Tests/Builder/Fixtures/AddToList/Symfony/Config/AddToList/MessengerConfig.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ public function __construct(array $value = [])
3939
{
4040
if (array_key_exists('routing', $value)) {
4141
$this->_usedProperties['routing'] = true;
42-
$this->routing = array_map(function ($v) { return new \Symfony\Config\AddToList\Messenger\RoutingConfig($v); }, $value['routing']);
42+
$this->routing = array_map(fn ($v) => new \Symfony\Config\AddToList\Messenger\RoutingConfig($v), $value['routing']);
4343
unset($value['routing']);
4444
}
4545

4646
if (array_key_exists('receiving', $value)) {
4747
$this->_usedProperties['receiving'] = true;
48-
$this->receiving = array_map(function ($v) { return new \Symfony\Config\AddToList\Messenger\ReceivingConfig($v); }, $value['receiving']);
48+
$this->receiving = array_map(fn ($v) => new \Symfony\Config\AddToList\Messenger\ReceivingConfig($v), $value['receiving']);
4949
unset($value['receiving']);
5050
}
5151

@@ -58,10 +58,10 @@ public function toArray(): array
5858
{
5959
$output = [];
6060
if (isset($this->_usedProperties['routing'])) {
61-
$output['routing'] = array_map(function ($v) { return $v->toArray(); }, $this->routing);
61+
$output['routing'] = array_map(fn ($v) => $v->toArray(), $this->routing);
6262
}
6363
if (isset($this->_usedProperties['receiving'])) {
64-
$output['receiving'] = array_map(function ($v) { return $v->toArray(); }, $this->receiving);
64+
$output['receiving'] = array_map(fn ($v) => $v->toArray(), $this->receiving);
6565
}
6666

6767
return $output;

‎Tests/Builder/Fixtures/AddToList/Symfony/Config/AddToList/Translator/BooksConfig.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct(array $value = [])
2929
{
3030
if (array_key_exists('page', $value)) {
3131
$this->_usedProperties['page'] = true;
32-
$this->page = array_map(function ($v) { return new \Symfony\Config\AddToList\Translator\Books\PageConfig($v); }, $value['page']);
32+
$this->page = array_map(fn ($v) => new \Symfony\Config\AddToList\Translator\Books\PageConfig($v), $value['page']);
3333
unset($value['page']);
3434
}
3535

@@ -42,7 +42,7 @@ public function toArray(): array
4242
{
4343
$output = [];
4444
if (isset($this->_usedProperties['page'])) {
45-
$output['page'] = array_map(function ($v) { return $v->toArray(); }, $this->page);
45+
$output['page'] = array_map(fn ($v) => $v->toArray(), $this->page);
4646
}
4747

4848
return $output;

‎Tests/Builder/Fixtures/ArrayExtraKeys/Symfony/Config/ArrayExtraKeysConfig.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function __construct(array $value = [])
6464

6565
if (array_key_exists('bar', $value)) {
6666
$this->_usedProperties['bar'] = true;
67-
$this->bar = array_map(function ($v) { return new \Symfony\Config\ArrayExtraKeys\BarConfig($v); }, $value['bar']);
67+
$this->bar = array_map(fn ($v) => new \Symfony\Config\ArrayExtraKeys\BarConfig($v), $value['bar']);
6868
unset($value['bar']);
6969
}
7070

@@ -86,7 +86,7 @@ public function toArray(): array
8686
$output['foo'] = $this->foo->toArray();
8787
}
8888
if (isset($this->_usedProperties['bar'])) {
89-
$output['bar'] = array_map(function ($v) { return $v->toArray(); }, $this->bar);
89+
$output['bar'] = array_map(fn ($v) => $v->toArray(), $this->bar);
9090
}
9191
if (isset($this->_usedProperties['baz'])) {
9292
$output['baz'] = $this->baz->toArray();

‎Tests/Builder/Fixtures/NodeInitialValues/Symfony/Config/NodeInitialValues/MessengerConfig.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct(array $value = [])
3030
{
3131
if (array_key_exists('transports', $value)) {
3232
$this->_usedProperties['transports'] = true;
33-
$this->transports = array_map(function ($v) { return new \Symfony\Config\NodeInitialValues\Messenger\TransportsConfig($v); }, $value['transports']);
33+
$this->transports = array_map(fn ($v) => new \Symfony\Config\NodeInitialValues\Messenger\TransportsConfig($v), $value['transports']);
3434
unset($value['transports']);
3535
}
3636

@@ -43,7 +43,7 @@ public function toArray(): array
4343
{
4444
$output = [];
4545
if (isset($this->_usedProperties['transports'])) {
46-
$output['transports'] = array_map(function ($v) { return $v->toArray(); }, $this->transports);
46+
$output['transports'] = array_map(fn ($v) => $v->toArray(), $this->transports);
4747
}
4848

4949
return $output;

‎Tests/Builder/Fixtures/ScalarNormalizedTypes.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ public function getConfigTreeBuilder(): TreeBuilder
2323
$rootNode
2424
->children()
2525
->arrayNode('simple_array')
26-
->beforeNormalization()->ifString()->then(function ($v) { return [$v]; })->end()
26+
->beforeNormalization()->ifString()->then(fn ($v) => [$v])->end()
2727
->prototype('scalar')->end()
2828
->end()
2929
->arrayNode('keyed_array')
3030
->useAttributeAsKey('name')
3131
->prototype('array')
3232
->beforeNormalization()
33-
->ifString()->then(function ($v) { return [$v]; })
33+
->ifString()->then(fn ($v) => [$v])
3434
->end()
3535
->prototype('scalar')->end()
3636
->end()
3737
->end()
3838
->arrayNode('object')
3939
->addDefaultsIfNotSet()
4040
->beforeNormalization()
41-
->ifTrue(function ($v) { return !\is_array($v); })
42-
->then(function ($v) { return ['enabled' => $v]; })
41+
->ifTrue(fn ($v) => !\is_array($v))
42+
->then(fn ($v) => ['enabled' => $v])
4343
->end()
4444
->children()
4545
->booleanNode('enabled')->defaultNull()->end()
@@ -93,8 +93,8 @@ public function getConfigTreeBuilder(): TreeBuilder
9393
->useAttributeAsKey('class')
9494
->prototype('array')
9595
->beforeNormalization()
96-
->ifTrue(function ($v) { return !\is_array($v); })
97-
->then(function ($v) { return ['enabled' => $v]; })
96+
->ifTrue(fn ($v) => !\is_array($v))
97+
->then(fn ($v) => ['enabled' => $v])
9898
->end()
9999
->children()
100100
->booleanNode('enabled')->defaultTrue()->end()
@@ -109,16 +109,16 @@ public function getConfigTreeBuilder(): TreeBuilder
109109
->arrayNode('nested_object')
110110
->addDefaultsIfNotSet()
111111
->beforeNormalization()
112-
->ifTrue(function ($v) { return !\is_array($v); })
113-
->then(function ($v) { return ['enabled' => $v]; })
112+
->ifTrue(fn ($v) => !\is_array($v))
113+
->then(fn ($v) => ['enabled' => $v])
114114
->end()
115115
->children()
116116
->booleanNode('enabled')->defaultNull()->end()
117117
->end()
118118
->end()
119119
->arrayNode('nested_list_object')
120120
->beforeNormalization()
121-
->ifTrue(function ($v) { return isset($v[0]) && \is_string($v[0]); })
121+
->ifTrue(fn ($v) => isset($v[0]) && \is_string($v[0]))
122122
->then(function ($values) {
123123
return array_map(function (string $value) {
124124
return ['name' => $value];

‎Tests/Builder/Fixtures/ScalarNormalizedTypes/Symfony/Config/ScalarNormalizedTypes/NestedConfig.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function __construct(array $value = [])
7070

7171
if (array_key_exists('nested_list_object', $value)) {
7272
$this->_usedProperties['nestedListObject'] = true;
73-
$this->nestedListObject = array_map(function ($v) { return \is_array($v) ? new \Symfony\Config\ScalarNormalizedTypes\Nested\NestedListObjectConfig($v) : $v; }, $value['nested_list_object']);
73+
$this->nestedListObject = array_map(fn ($v) => \is_array($v) ? new \Symfony\Config\ScalarNormalizedTypes\Nested\NestedListObjectConfig($v) : $v, $value['nested_list_object']);
7474
unset($value['nested_list_object']);
7575
}
7676

@@ -86,7 +86,7 @@ public function toArray(): array
8686
$output['nested_object'] = $this->nestedObject instanceof \Symfony\Config\ScalarNormalizedTypes\Nested\NestedObjectConfig ? $this->nestedObject->toArray() : $this->nestedObject;
8787
}
8888
if (isset($this->_usedProperties['nestedListObject'])) {
89-
$output['nested_list_object'] = array_map(function ($v) { return $v instanceof \Symfony\Config\ScalarNormalizedTypes\Nested\NestedListObjectConfig ? $v->toArray() : $v; }, $this->nestedListObject);
89+
$output['nested_list_object'] = array_map(fn ($v) => $v instanceof \Symfony\Config\ScalarNormalizedTypes\Nested\NestedListObjectConfig ? $v->toArray() : $v, $this->nestedListObject);
9090
}
9191

9292
return $output;

‎Tests/Builder/Fixtures/ScalarNormalizedTypes/Symfony/Config/ScalarNormalizedTypesConfig.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,13 @@ public function __construct(array $value = [])
155155

156156
if (array_key_exists('list_object', $value)) {
157157
$this->_usedProperties['listObject'] = true;
158-
$this->listObject = array_map(function ($v) { return \is_array($v) ? new \Symfony\Config\ScalarNormalizedTypes\ListObjectConfig($v) : $v; }, $value['list_object']);
158+
$this->listObject = array_map(fn ($v) => \is_array($v) ? new \Symfony\Config\ScalarNormalizedTypes\ListObjectConfig($v) : $v, $value['list_object']);
159159
unset($value['list_object']);
160160
}
161161

162162
if (array_key_exists('keyed_list_object', $value)) {
163163
$this->_usedProperties['keyedListObject'] = true;
164-
$this->keyedListObject = array_map(function ($v) { return \is_array($v) ? new \Symfony\Config\ScalarNormalizedTypes\KeyedListObjectConfig($v) : $v; }, $value['keyed_list_object']);
164+
$this->keyedListObject = array_map(fn ($v) => \is_array($v) ? new \Symfony\Config\ScalarNormalizedTypes\KeyedListObjectConfig($v) : $v, $value['keyed_list_object']);
165165
unset($value['keyed_list_object']);
166166
}
167167

@@ -189,10 +189,10 @@ public function toArray(): array
189189
$output['object'] = $this->object instanceof \Symfony\Config\ScalarNormalizedTypes\ObjectConfig ? $this->object->toArray() : $this->object;
190190
}
191191
if (isset($this->_usedProperties['listObject'])) {
192-
$output['list_object'] = array_map(function ($v) { return $v instanceof \Symfony\Config\ScalarNormalizedTypes\ListObjectConfig ? $v->toArray() : $v; }, $this->listObject);
192+
$output['list_object'] = array_map(fn ($v) => $v instanceof \Symfony\Config\ScalarNormalizedTypes\ListObjectConfig ? $v->toArray() : $v, $this->listObject);
193193
}
194194
if (isset($this->_usedProperties['keyedListObject'])) {
195-
$output['keyed_list_object'] = array_map(function ($v) { return $v instanceof \Symfony\Config\ScalarNormalizedTypes\KeyedListObjectConfig ? $v->toArray() : $v; }, $this->keyedListObject);
195+
$output['keyed_list_object'] = array_map(fn ($v) => $v instanceof \Symfony\Config\ScalarNormalizedTypes\KeyedListObjectConfig ? $v->toArray() : $v, $this->keyedListObject);
196196
}
197197
if (isset($this->_usedProperties['nested'])) {
198198
$output['nested'] = $this->nested->toArray();

0 commit comments

Comments
 (0)