interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.5.1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
kirby/src/Toolkit/Collection.php
View File

@@ -242,7 +242,7 @@ class Collection extends Iterator implements Countable
* custom filter function or an array of filters
*
* @param string|array|\Closure $field
* @param array ...$args
* @param mixed ...$args
* @return \Kirby\Toolkit\Collection
*/
public function filter($field, ...$args)

4
kirby/src/Toolkit/Component.php
View File

@@ -178,7 +178,7 @@ class Component
protected function applyProps(array $props): void
{
foreach ($props as $propName => $propFunction) {
if (is_callable($propFunction) === true) {
if (is_a($propFunction, 'Closure') === true) {
if (isset($this->attrs[$propName]) === true) {
try {
$this->$propName = $this->props[$propName] = $propFunction->call($this, $this->attrs[$propName]);
@@ -208,7 +208,7 @@ class Component
protected function applyComputed(array $computed): void
{
foreach ($computed as $computedName => $computedFunction) {
if (is_callable($computedFunction) === true) {
if (is_a($computedFunction, 'Closure') === true) {
$this->$computedName = $this->computed[$computedName] = $computedFunction->call($this);
}
}

2
kirby/src/Toolkit/F.php
View File

@@ -588,7 +588,7 @@ class F
return $newRoot;
}
if (F::move($file, $newRoot) !== true) {
if (F::move($file, $newRoot, $overwrite) !== true) {
return false;
}

2
kirby/src/Toolkit/Html.php
View File

@@ -175,6 +175,8 @@ class Html extends Xml
* @param string|null $string
* @param bool $keepTags If true, existing tags won't be escaped
* @return string The HTML string
*
* @psalm-suppress ParamNameMismatch
*/
public static function encode(?string $string, bool $keepTags = false): string
{

61
kirby/src/Toolkit/I18n.php
View File

@@ -38,35 +38,51 @@ class I18n
public static $translations = [];
/**
* The fallback locale
* The fallback locale or a
* list of fallback locales
*
* @var string
* @var string|array
*/
public static $fallback = 'en';
public static $fallback = ['en'];
/**
* Cache of `NumberFormatter` objects by locale
*
* @var array
*/
protected static $decimalNumberFormatters = [];
protected static $decimalsFormatters = [];
/**
* Returns the fallback code
* Returns the first fallback locale
*
* @deprecated 3.5.1 Use \Kirby\Toolkit\I18n::fallbacks() instead
*
* @return string
*/
public static function fallback(): string
{
if (is_string(static::$fallback) === true) {
return static::$fallback;
return static::fallbacks()[0];
}
/**
* Returns the list of fallback locales
*
* @return array
*/
public static function fallbacks(): array
{
if (
is_array(static::$fallback) === true ||
is_string(static::$fallback) === true
) {
return A::wrap(static::$fallback);
}
if (is_callable(static::$fallback) === true) {
return static::$fallback = (static::$fallback)();
return static::$fallback = A::wrap((static::$fallback)());
}
return static::$fallback = 'en';
return static::$fallback = ['en'];
}
/**
@@ -154,8 +170,15 @@ class I18n
return $fallback;
}
if ($locale !== static::fallback()) {
return static::translation(static::fallback())[$key] ?? null;
foreach (static::fallbacks() as $fallback) {
// skip locales we have already tried
if ($locale === $fallback) {
continue;
}
if ($translation = static::translation($fallback)[$key] ?? null) {
return $translation;
}
}
return null;
@@ -166,12 +189,12 @@ class I18n
* placeholders in the text
*
* @param string $key
* @param string $fallback
* @param array $replace
* @param string $locale
* @param string|array|null $fallback
* @param array|null $replace
* @param string|null $locale
* @return string
*/
public static function template(string $key, $fallback = null, array $replace = null, string $locale = null)
public static function template(string $key, $fallback = null, ?array $replace = null, ?string $locale = null): string
{
if (is_array($fallback) === true) {
$replace = $fallback;
@@ -223,15 +246,15 @@ class I18n
*/
protected static function decimalNumberFormatter(string $locale): ?NumberFormatter
{
if (isset(static::$decimalNumberFormatters[$locale])) {
return static::$decimalNumberFormatters[$locale];
if (isset(static::$decimalsFormatters[$locale])) {
return static::$decimalsFormatters[$locale];
}
if (extension_loaded('intl') !== true || class_exists('NumberFormatter') !== true) {
return null;
return null; // @codeCoverageIgnore
}
return static::$decimalNumberFormatters[$locale] = new NumberFormatter($locale, NumberFormatter::DECIMAL);
return static::$decimalsFormatters[$locale] = new NumberFormatter($locale, NumberFormatter::DECIMAL);
}
/**

4
kirby/src/Toolkit/Query.php
View File

@@ -76,7 +76,7 @@ class Query
* @param string $query
* @return mixed
*
* @throws Kirby\Exception\BadMethodCallException If an invalid method is accessed by the query
* @throws \Kirby\Exception\BadMethodCallException If an invalid method is accessed by the query
*/
protected function resolve(string $query)
{
@@ -227,7 +227,7 @@ class Query
* @param string $label Type of the name (`method`, `property` or `method/property`)
* @return void
*
* @throws Kirby\Exception\BadMethodCallException
* @throws \Kirby\Exception\BadMethodCallException
*/
protected static function accessError($data, string $name, string $label): void
{