Upgrade to 3.5.1

This commit is contained in:
Bastian Allgeier
2021-01-19 12:20:38 +01:00
parent 8f55019e01
commit 99c36fa137
119 changed files with 2973 additions and 3707 deletions

View File

@@ -66,9 +66,9 @@ class Fieldsets extends Items
];
}
public static function factory(array $fieldsets = null, array $options = [])
public static function factory(array $items = null, array $params = [])
{
$fieldsets = $fieldsets ?? option('blocks.fieldsets', [
$items = $items ?? option('blocks.fieldsets', [
'code' => 'blocks/code',
'gallery' => 'blocks/gallery',
'heading' => 'blocks/heading',
@@ -80,9 +80,9 @@ class Fieldsets extends Items
'video' => 'blocks/video',
]);
$result = static::createFieldsets($fieldsets);
$result = static::createFieldsets($items);
return parent::factory($result['fieldsets'], ['groups' => $result['groups']] + $options);
return parent::factory($result['fieldsets'], ['groups' => $result['groups']] + $params);
}
public function groups(): array