mirror_php/formwork
1
0
Fork 0
mirror of https://github.com/getformwork/formwork.git synced 2025-02-24 01:32:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename variables for consistency in Fields::find() and Fields::toArray()

Browse Source
This commit is contained in:
Giuseppe Criscione 2020-11-08 15:23:26 +01:00
parent efae07d411
commit 901ecfcff6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/src/Fields/Fields.php
View File

@ -34,12 +34,12 @@ class Fields extends AssociativeCollection
*/
public function find(string $field): ?Field
{
foreach ($this->items as $name => $data) {
if ($name === $field) {
return $this->items[$name];
foreach ($this->items as $key => $value) {
if ($key === $field) {
return $this->items[$key];
}
if ($data->has('fields')) {
$found = $data->get('fields')->find($field);
if ($value->has('fields')) {
$found = $value->get('fields')->find($field);
if ($found !== null) {
return $found;
}
@ -76,11 +76,11 @@ class Fields extends AssociativeCollection
return $this->items;
}
$result = [];
foreach ($this->items as $name => $data) {
if ($data->has('fields')) {
$result = array_merge($result, $data->get('fields')->toArray(true));
foreach ($this->items as $key => $value) {
if ($value->has('fields')) {
$result = array_merge($result, $value->get('fields')->toArray(true));
} else {
$result[$name] = $data;
$result[$key] = $value;
}
}
return $result;