Upgrade to 3.4.4

This commit is contained in:
Bastian Allgeier
2020-10-06 10:23:02 +02:00
parent c091f04115
commit 0b80361a79
53 changed files with 976 additions and 83 deletions

View File

@@ -27,28 +27,69 @@ class OptionsQuery
{
use Properties;
/**
* @var array
*/
protected $aliases = [];
/**
* @var
*/
protected $data;
/**
* @var
*/
protected $options;
/**
* @var
*/
protected $query;
/**
* @var
*/
protected $text;
/**
* @var
*/
protected $value;
/**
* OptionsQuery constructor
*
* @param array $props
*/
public function __construct(array $props)
{
$this->setProperties($props);
}
/**
* @return array
*/
public function aliases(): array
{
return $this->aliases;
}
/**
* @return array
*/
public function data(): array
{
return $this->data;
}
/**
* @param string $object
* @param string $field
* @param array $data
* @return string
* @throws \Kirby\Exception\NotFoundException
*/
protected function template(string $object, string $field, array $data)
{
$value = $this->$field();
@@ -64,6 +105,9 @@ class OptionsQuery
return Str::template($value, $data);
}
/**
* @return array
*/
public function options(): array
{
if (is_array($this->options) === true) {
@@ -89,11 +133,18 @@ class OptionsQuery
return $this->options = $options;
}
/**
* @return string
*/
public function query(): string
{
return $this->query;
}
/**
* @param $object
* @return mixed|string|null
*/
public function resolve($object)
{
// fast access
@@ -111,6 +162,10 @@ class OptionsQuery
return 'item';
}
/**
* @param $result
* @throws \Kirby\Exception\InvalidArgumentException
*/
protected function resultToCollection($result)
{
if (is_array($result)) {
@@ -133,36 +188,69 @@ class OptionsQuery
return $result;
}
/**
* @param array|null $aliases
* @return self
*/
protected function setAliases(array $aliases = null)
{
$this->aliases = $aliases;
return $this;
}
/**
* @param array $data
* @return self
*/
protected function setData(array $data)
{
$this->data = $data;
return $this;
}
/**
* @param $options
* @return self
*/
protected function setOptions($options = null)
{
$this->options = $options;
return $this;
}
/**
* @param string $query
* @return self
*/
protected function setQuery(string $query)
{
$this->query = $query;
return $this;
}
/**
* @param $text
* @return self
*/
protected function setText($text)
{
$this->text = $text;
return $this;
}
/**
* @param $value
* @return self
*/
protected function setValue($value)
{
$this->value = $value;
return $this;
}
/**
* @return mixed
*/
public function text()
{
return $this->text;
@@ -173,6 +261,9 @@ class OptionsQuery
return $this->options();
}
/**
* @return mixed
*/
public function value()
{
return $this->value;