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

Upgrade to 3.8.2

Browse Source
This commit is contained in:
Bastian Allgeier
2022-11-15 13:26:12 +01:00
parent fe2baa1b7a
commit f9e812cb0c
45 changed files with 760 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kirby/src/Form/Form.php
View File

@@ -109,9 +109,7 @@ class Form
$input = array_merge($values, $input);
foreach ($input as $key => $value) {
if (isset($this->values[$key]) === false) {
$this->values[$key] = $value;
}
$this->values[$key] ??= $value;
}
}
}

4
kirby/src/Form/OptionsApi.php
View File

@@ -7,8 +7,8 @@ use Kirby\Exception\Exception;
use Kirby\Exception\InvalidArgumentException;
use Kirby\Http\Remote;
use Kirby\Http\Url;
use Kirby\Query\Query;
use Kirby\Toolkit\Properties;
use Kirby\Toolkit\Query;
use Kirby\Toolkit\Str;
/**
@@ -134,7 +134,7 @@ class OptionsApi
throw new InvalidArgumentException('Invalid options format');
}
$result = (new Query($this->fetch(), Nest::create($data)))->result();
$result = (new Query($this->fetch()))->resolve(Nest::create($data));
$options = [];
foreach ($result as $item) {

6
kirby/src/Form/OptionsQuery.php
View File

@@ -5,10 +5,10 @@ namespace Kirby\Form;
use Kirby\Cms\Field;
use Kirby\Exception\InvalidArgumentException;
use Kirby\Exception\NotFoundException;
use Kirby\Query\Query;
use Kirby\Toolkit\Collection;
use Kirby\Toolkit\Obj;
use Kirby\Toolkit\Properties;
use Kirby\Toolkit\Query;
use Kirby\Toolkit\Str;
/**
@@ -117,8 +117,8 @@ class OptionsQuery
}
$data = $this->data();
$query = new Query($this->query(), $data);
$result = $query->result();
$query = new Query($this->query());
$result = $query->resolve($data);
$result = $this->resultToCollection($result);
$options = [];