Update to Kirby 4.7.0
This commit is contained in:
parent
02a9ab387c
commit
ba25a9a198
509 changed files with 26604 additions and 14872 deletions
|
@ -23,15 +23,13 @@ class Fieldsets extends Items
|
|||
|
||||
/**
|
||||
* All registered fieldsets methods
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
public static $methods = [];
|
||||
public static array $methods = [];
|
||||
|
||||
protected static function createFieldsets($params)
|
||||
protected static function createFieldsets(array $params): array
|
||||
{
|
||||
$fieldsets = [];
|
||||
$groups = [];
|
||||
$groups = [];
|
||||
|
||||
foreach ($params as $type => $fieldset) {
|
||||
if (is_int($type) === true && is_string($fieldset)) {
|
||||
|
@ -75,8 +73,10 @@ class Fieldsets extends Items
|
|||
];
|
||||
}
|
||||
|
||||
public static function factory(array $items = null, array $params = [])
|
||||
{
|
||||
public static function factory(
|
||||
array|null $items = null,
|
||||
array $params = []
|
||||
): static {
|
||||
$items ??= App::instance()->option('blocks.fieldsets', [
|
||||
'code' => 'blocks/code',
|
||||
'gallery' => 'blocks/gallery',
|
||||
|
@ -92,7 +92,10 @@ class Fieldsets extends Items
|
|||
|
||||
$result = static::createFieldsets($items);
|
||||
|
||||
return parent::factory($result['fieldsets'], ['groups' => $result['groups']] + $params);
|
||||
return parent::factory(
|
||||
$result['fieldsets'],
|
||||
['groups' => $result['groups']] + $params
|
||||
);
|
||||
}
|
||||
|
||||
public function groups(): array
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue