host/xiaowang
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Kirby and Composer dependencies

Browse source
This commit is contained in:
Paul Nicoué 2022-03-22 15:39:39 +01:00
parent f5d3ea5e84
commit ec74d78ba9
382 changed files with 25077 additions and 4955 deletions
Download patch file Download diff file Expand all files Collapse all files

19
kirby/src/Cms/Blueprint.php
View file

@ -20,7 +20,7 @@ use Throwable;
* @package Kirby Cms
* @author Bastian Allgeier <bastian@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @copyright Bastian Allgeier
* @license https://getkirby.com/license
*/
class Blueprint
@ -74,7 +74,7 @@ class Blueprint
$props = $this->preset($props);
// normalize the name
$props['name'] = $props['name'] ?? 'default';
$props['name'] ??= 'default';
// normalize and translate the title
$props['title'] = $this->i18n($props['title'] ?? ucfirst($props['name']));
@ -337,7 +337,7 @@ class Blueprint
$normalize = function ($props) use ($name) {
// inject the filename as name if no name is set
$props['name'] = $props['name'] ?? $name;
$props['name'] ??= $name;
// normalize the title
$title = $props['title'] ?? ucfirst($props['name']);
@ -567,9 +567,7 @@ class Blueprint
// set all options to false
if ($options === false) {
return array_map(function () {
return false;
}, $defaults);
return array_map(fn () => false, $defaults);
}
// extend options if possible
@ -579,7 +577,7 @@ class Blueprint
$alias = $aliases[$key] ?? null;
if ($alias !== null) {
$options[$alias] = $options[$alias] ?? $value;
$options[$alias] ??= $value;
unset($options[$key]);
}
}
@ -765,9 +763,10 @@ class Blueprint
*/
public function sections(): array
{
return array_map(function ($section) {
return $this->section($section['name']);
}, $this->sections);
return A::map(
$this->sections,
fn ($section) => $this->section($section['name'])
);
}
/**