Upgrade to 4.0.0

kirby/src/Cms/Item.php

@@ -2,6 +2,7 @@
 
 namespace Kirby\Cms;
 
+use Kirby\Content\Field;
 use Kirby\Toolkit\Str;
 
 /**
@@ -28,49 +29,28 @@ class Item
 
 	protected Field|null $field;
 
-	/**
-	 * @var string
-	 */
-	protected $id;
-
-	/**
-	 * @var array
-	 */
-	protected $params;
-
-	/**
-	 * @var \Kirby\Cms\Page|\Kirby\Cms\Site|\Kirby\Cms\File|\Kirby\Cms\User
-	 */
-	protected $parent;
-
-	/**
-	 * @var \Kirby\Cms\Items
-	 */
-	protected $siblings;
+	protected string $id;
+	protected array $params;
+	protected ModelWithContent $parent;
+	protected Items $siblings;
 
 	/**
 	 * Creates a new item
-	 *
-	 * @param array $params
 	 */
 	public function __construct(array $params = [])
 	{
-		$siblingsClass = static::ITEMS_CLASS;
-
+		$class          = static::ITEMS_CLASS;
 		$this->id       = $params['id']       ?? Str::uuid();
 		$this->params   = $params;
 		$this->field    = $params['field']    ?? null;
 		$this->parent   = $params['parent']   ?? App::instance()->site();
-		$this->siblings = $params['siblings'] ?? new $siblingsClass();
+		$this->siblings = $params['siblings'] ?? new $class();
 	}
 
 	/**
 	 * Static Item factory
-	 *
-	 * @param array $params
-	 * @return \Kirby\Cms\Item
 	 */
-	public static function factory(array $params)
+	public static function factory(array $params): static
 	{
 		return new static($params);
 	}
@@ -85,8 +65,6 @@ class Item
 
 	/**
 	 * Returns the unique item id (UUID v4)
-	 *
-	 * @return string
 	 */
 	public function id(): string
 	{
@@ -95,9 +73,6 @@ class Item
 
 	/**
 	 * Compares the item to another one
-	 *
-	 * @param \Kirby\Cms\Item $item
-	 * @return bool
 	 */
 	public function is(Item $item): bool
 	{
@@ -106,20 +81,16 @@ class Item
 
 	/**
 	 * Returns the Kirby instance
-	 *
-	 * @return \Kirby\Cms\App
 	 */
-	public function kirby()
+	public function kirby(): App
 	{
 		return $this->parent()->kirby();
 	}
 
 	/**
 	 * Returns the parent model
-	 *
-	 * @return \Kirby\Cms\Page|\Kirby\Cms\Site|\Kirby\Cms\File|\Kirby\Cms\User
 	 */
-	public function parent()
+	public function parent(): ModelWithContent
 	{
 		return $this->parent;
 	}
@@ -128,18 +99,15 @@ class Item
 	 * Returns the sibling collection
 	 * This is required by the HasSiblings trait
 	 *
-	 * @return \Kirby\Cms\Items
 	 * @psalm-return self::ITEMS_CLASS
 	 */
-	protected function siblingsCollection()
+	protected function siblingsCollection(): Items
 	{
 		return $this->siblings;
 	}
 
 	/**
 	 * Converts the item to an array
-	 *
-	 * @return array
 	 */
 	public function toArray(): array
 	{