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

@@ -254,6 +254,8 @@ class File extends ModelWithContent
} else {
if ($this->type() === 'image') {
return '(image: ' . $url . ')';
} elseif ($this->type() === 'video') {
return '(video: ' . $url . ')';
} else {
return '(file: ' . $url . ')';
}
@@ -265,7 +267,7 @@ class File extends ModelWithContent
*
* @internal
* @param mixed $props
* @return self
* @return static
*/
public static function factory($props)
{
@@ -661,7 +663,7 @@ class File extends ModelWithContent
* Sets the Blueprint object
*
* @param array|null $blueprint
* @return self
* @return $this
*/
protected function setBlueprint(array $blueprint = null)
{
@@ -677,7 +679,7 @@ class File extends ModelWithContent
* Sets the filename
*
* @param string $filename
* @return self
* @return $this
*/
protected function setFilename(string $filename)
{
@@ -689,7 +691,7 @@ class File extends ModelWithContent
* Sets the parent model object
*
* @param \Kirby\Cms\Model|null $parent
* @return self
* @return $this
*/
protected function setParent(Model $parent = null)
{
@@ -702,7 +704,7 @@ class File extends ModelWithContent
* auto root detection
*
* @param string|null $root
* @return self
* @return $this
*/
protected function setRoot(string $root = null)
{
@@ -712,7 +714,7 @@ class File extends ModelWithContent
/**
* @param string|null $template
* @return self
* @return $this
*/
protected function setTemplate(string $template = null)
{
@@ -724,7 +726,7 @@ class File extends ModelWithContent
* Sets the url
*
* @param string|null $url
* @return self
* @return $this
*/
protected function setUrl(string $url = null)
{