Upgrade to 3.2.0

This commit is contained in:
Bastian Allgeier
2019-06-25 09:56:08 +02:00
parent 9e18cf635d
commit 9c89153d35
296 changed files with 14408 additions and 2504 deletions

View File

@@ -3,7 +3,6 @@
namespace Kirby\Cms;
use Kirby\Toolkit\Dir;
use Kirby\Toolkit\F;
/**
* Extension of the Collection class that
@@ -12,10 +11,22 @@ use Kirby\Toolkit\F;
* collection with Role objects. It also has
* a `Roles::load()` method that handles loading
* role definitions from disk.
*
* @package Kirby Cms
* @author Bastian Allgeier <bastian@getkirby.com>
* @link https://getkirby.com
* @copyright Bastian Allgeier GmbH
* @license https://getkirby.com/license
*/
class Roles extends Collection
{
public static function factory(array $roles, array $inject = []): self
/**
* @param array $roles
* @param array $inject
* @return self
*/
public static function factory(array $roles, array $inject = [])
{
$collection = new static;
@@ -34,7 +45,12 @@ class Roles extends Collection
return $collection->sortBy('name', 'asc');
}
public static function load(string $root = null, array $inject = []): self
/**
* @param string $root
* @param array $inject
* @return self
*/
public static function load(string $root = null, array $inject = [])
{
$roles = new static;