Upgrade to 3.5.5

This commit is contained in:
Bastian Allgeier
2021-05-11 11:55:32 +02:00
parent de3560f3d6
commit efeff45192
146 changed files with 2008 additions and 1075 deletions

View File

@@ -35,7 +35,7 @@ class StructureObject extends Model
protected $id;
/**
* @var Page|Site|File|User
* @var \Kirby\Cms\Site|\Kirby\Cms\Page|\Kirby\Cms\File|\Kirby\Cms\User|null
*/
protected $parent;
@@ -131,7 +131,7 @@ class StructureObject extends Model
* Sets the Content object with the given parent
*
* @param array|null $content
* @return self
* @return $this
*/
protected function setContent(array $content = null)
{
@@ -146,7 +146,7 @@ class StructureObject extends Model
* specified.
*
* @param string $id
* @return self
* @return $this
*/
protected function setId(string $id)
{
@@ -155,11 +155,10 @@ class StructureObject extends Model
}
/**
* Sets the parent Model. This can either be a
* Page, Site, File or User object
* Sets the parent Model
*
* @param \Kirby\Cms\Model|null $parent
* @return self
* @return $this
* @param \Kirby\Cms\Site|\Kirby\Cms\Page|\Kirby\Cms\File|\Kirby\Cms\User|null $parent
*/
protected function setParent(Model $parent = null)
{
@@ -171,7 +170,7 @@ class StructureObject extends Model
* Sets the parent Structure collection
*
* @param \Kirby\Cms\Structure|null $structure
* @return self
* @return $this
*/
protected function setStructure(Structure $structure = null)
{