Upgrade to 3.2.5

This commit is contained in:
Bastian Allgeier
2019-09-24 11:00:59 +02:00
parent ff9b5b1861
commit 447a9dd266
234 changed files with 1990 additions and 1224 deletions

View File

@@ -18,7 +18,6 @@ use Kirby\Toolkit\F;
*/
class ContentLocks
{
/**
* Data from the `.lock` files
* that have been read so far
@@ -73,7 +72,7 @@ class ContentLocks
/**
* Returns the path to a model's lock file
*
* @param Kirby\Cms\ModelWithContent $model
* @param \Kirby\Cms\ModelWithContent $model
* @return string
*/
public static function file(ModelWithContent $model): string
@@ -84,7 +83,7 @@ class ContentLocks
/**
* Returns the lock/unlock data for the specified model
*
* @param Kirby\Cms\ModelWithContent $model
* @param \Kirby\Cms\ModelWithContent $model
* @return array
*/
public function get(ModelWithContent $model): array
@@ -155,7 +154,7 @@ class ContentLocks
* Returns model ID used as the key for the data array;
* prepended with a slash because the $site otherwise won't have an ID
*
* @param Kirby\Cms\ModelWithContent $model
* @param \Kirby\Cms\ModelWithContent $model
* @return string
*/
public static function id(ModelWithContent $model): string
@@ -166,7 +165,7 @@ class ContentLocks
/**
* Sets and writes the lock/unlock data for the specified model
*
* @param Kirby\Cms\ModelWithContent $model
* @param \Kirby\Cms\ModelWithContent $model
* @param array $data
* @return boolean
*/