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

Recognize Field instances in Fields::__construct() and handle them properly

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

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

@ -15,8 +15,15 @@ class Fields extends AssociativeCollection
public function __construct(array $fields) public function __construct(array $fields)
{ {
parent::__construct(); parent::__construct();
foreach ($fields as $name => $data) { foreach ($fields as $key => $value) {
$this->items[$name] = new Field($name, $data); if ($value instanceof Field) {
if (is_int($key)) {
$key = $value->name();
}
$this->items[$key] = $value;
} else {
$this->items[$key] = new Field($key, $value);
}
} }
} }