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

Upgrade to 3.3.0

Browse Source
This commit is contained in:
Bastian Allgeier
2019-11-05 09:35:58 +01:00
parent 447a9dd266
commit a431716732
186 changed files with 3068 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,8 +35,8 @@ class Collection extends Iterator implements Countable
/**
* Magic getter function
*
* @param string $key
* @param mixed $arguments
* @param string $key
* @param mixed $arguments
* @return mixed
*/
public function __call(string $key, $arguments)
@@ -67,7 +67,7 @@ class Collection extends Iterator implements Countable
/**
* Low-level getter for elements
*
* @param mixed $key
* @param mixed $key
* @return mixed
*/
public function __get($key)
@@ -82,8 +82,8 @@ class Collection extends Iterator implements Countable
/**
* Low-level setter for elements
*
* @param string $key string or array
* @param mixed $value
* @param string $key string or array
* @param mixed $value
*/
public function __set(string $key, $value)
{
@@ -114,8 +114,8 @@ class Collection extends Iterator implements Countable
/**
* Appends an element
*
* @param mixed $key
* @param mixed $item
* @param mixed $key
* @param mixed $item
* @return \Kirby\Toolkit\Collection
*/
public function append(...$args)
@@ -133,9 +133,9 @@ class Collection extends Iterator implements Countable
* Creates chunks of the same size.
* The last chunk may be smaller
*
* @param int $size Number of elements per chunk
* @return \Kirby\Toolkit\Collection A new collection with an element for each chunk and
* a sub collection in each chunk
* @param int $size Number of elements per chunk
* @return \Kirby\Toolkit\Collection A new collection with an element for each chunk and
* a sub collection in each chunk
*/
public function chunk(int $size)
{
@@ -175,7 +175,7 @@ class Collection extends Iterator implements Countable
/**
* Getter and setter for the data
*
* @param array $data
* @param array $data
* @return array|Collection
*/
public function data(array $data = null)
@@ -422,8 +422,8 @@ class Collection extends Iterator implements Countable
/**
* Getter
*
* @param mixed $key
* @param mixed $default
* @param mixed $key
* @param mixed $default
* @return mixed
*/
public function get($key, $default = null)
@@ -439,7 +439,7 @@ class Collection extends Iterator implements Countable
*
* @param array|object $item
* @param string $attribute
* @param boolean $split
* @param bool $split
* @param mixed $related
* @return mixed
*/
@@ -542,10 +542,38 @@ class Collection extends Iterator implements Countable
});
}
/**
* Returns a Collection with the intersection of the given elements
*
* @param \Kirby\Toolkit\Collection $other
* @return \Kirby\Toolkit\Collection
*/
public function intersection($other)
{
return $other->find($this->keys());
}
/**
* Checks if there is an intersection between the given collection and this collection
*
* @param \Kirby\Toolkit\Collection $other
* @return bool
*/
public function intersects($other): bool
{
foreach ($this->keys() as $key) {
if ($other->has($key)) {
return true;
}
}
return false;
}
/**
* Checks if the number of elements is zero
*
* @return boolean
* @return bool
*/
public function isEmpty(): bool
{
@@ -555,7 +583,7 @@ class Collection extends Iterator implements Countable
/**
* Checks if the number of elements is even
*
* @return boolean
* @return bool
*/
public function isEven(): bool
{
@@ -565,7 +593,7 @@ class Collection extends Iterator implements Countable
/**
* Checks if the number of elements is more than zero
*
* @return boolean
* @return bool
*/
public function isNotEmpty(): bool
{
@@ -575,7 +603,7 @@ class Collection extends Iterator implements Countable
/**
* Checks if the number of elements is odd
*
* @return boolean
* @return bool
*/
public function isOdd(): bool
{
@@ -596,7 +624,7 @@ class Collection extends Iterator implements Countable
/**
* Returns a new object with a limited number of elements
*
* @param int $limit The number of elements to return
* @param int $limit The number of elements to return
* @return \Kirby\Toolkit\Collection
*/
public function limit(int $limit)
@@ -607,7 +635,7 @@ class Collection extends Iterator implements Countable
/**
* Map a function to each element
*
* @param callable $callback
* @param callable $callback
* @return \Kirby\Toolkit\Collection
*/
public function map(callable $callback)
@@ -619,7 +647,7 @@ class Collection extends Iterator implements Countable
/**
* Returns the nth element from the collection
*
* @param integer $n
* @param int $n
* @return mixed
*/
public function nth(int $n)
@@ -645,7 +673,7 @@ class Collection extends Iterator implements Countable
/**
* Returns a new object starting from the given offset
*
* @param int $offset The index to start from
* @param int $offset The index to start from
* @return \Kirby\Toolkit\Collection
*/
public function offset(int $offset)
@@ -710,8 +738,8 @@ class Collection extends Iterator implements Countable
/**
* Prepends an element to the data array
*
* @param mixed $key
* @param mixed $item
* @param mixed $key
* @param mixed $item
* @return self
*/
public function prepend(...$args)
@@ -790,8 +818,8 @@ class Collection extends Iterator implements Countable
/**
* Adds a new element to the collection
*
* @param mixed $key string or array
* @param mixed $value
* @param mixed $key string or array
* @param mixed $value
* @return self
*/
public function set($key, $value = null)
@@ -830,8 +858,8 @@ class Collection extends Iterator implements Countable
/**
* Returns a slice of the object
*
* @param int $offset The optional index to start the slice from
* @param int $limit The optional number of elements to return
* @param int $offset The optional index to start the slice from
* @param int $limit The optional number of elements to return
* @return \Kirby\Toolkit\Collection
*/
public function slice(int $offset = 0, int $limit = null)
@@ -868,10 +896,10 @@ class Collection extends Iterator implements Countable
/**
* Sorts the elements by any number of fields
*
* @param $field string|callable Field name or value callback to sort by
* @param $direction string asc or desc
* @param $method int The sort flag, SORT_REGULAR, SORT_NUMERIC etc.
* @return Collection
* @param string|callable $field Field name or value callback to sort by
* @param string $direction asc or desc
* @param int $method The sort flag, SORT_REGULAR, SORT_NUMERIC etc.
* @return Collection
*/
public function sortBy()
{
@@ -1027,10 +1055,34 @@ class Collection extends Iterator implements Countable
return array_values($this->data);
}
/**
* The when method only executes the given Closure when the first parameter
* is true. If the first parameter is false, the Closure will not be executed.
* You may pass another Closure as the third parameter to the when method.
* This Closure will execute if the first parameter evaluates as false
*
* @param mixed $condition
* @param Closure $callback
* @param Closure $fallback
* @return mixed
*/
public function when($condition, Closure $callback, Closure $fallback = null)
{
if ($condition) {
return $callback->call($this, $condition);
}
if ($fallback !== null) {
return $fallback->call($this, $condition);
}
return $this;
}
/**
* Alias for $this->not()
*
* @param string ...$keys any number of keys, passed as individual arguments
* @param string ...$keys any number of keys, passed as individual arguments
* @return \Kirby\Toolkit\Collection
*/
public function without(...$keys)