Upgrade to 3.5.5

kirby/src/Form/FieldClass.php

@@ -92,7 +92,7 @@ abstract class FieldClass
     }
 
     /**
-     * DEPRECATED!
+     * @deprecated
      *
      * Returns the field data
      * in a format to be stored
@@ -379,7 +379,7 @@ abstract class FieldClass
     }
 
     /**
-     * DEPRECATED
+     * @deprecated
      *
      * @return bool
      */

kirby/src/Form/Fields.php

@@ -23,7 +23,7 @@ class Fields extends Collection
      *
      * @param string $name
      * @param object|array $field
-     * @return self
+     * @return $this
      */
     public function __set(string $name, $field)
     {

kirby/src/Form/Options.php

@@ -40,7 +40,7 @@ class Options
      * Brings options through api
      *
      * @param $api
-     * @param $model
+     * @param \Kirby\Cms\Model|null $model
      * @return array
      */
     public static function api($api, $model = null): array
@@ -71,7 +71,7 @@ class Options
     }
 
     /**
-     * @param $model
+     * @param \Kirby\Cms\Model $model
      * @return array
      */
     protected static function data($model): array
@@ -100,14 +100,14 @@ class Options
      *
      * @param $options
      * @param array $props
-     * @param null $model
+     * @param \Kirby\Cms\Model|null $model
      * @return array
      */
     public static function factory($options, array $props = [], $model = null): array
     {
         switch ($options) {
             case 'api':
-                $options = static::api($props['api']);
+                $options = static::api($props['api'], $model);
                 break;
             case 'query':
                 $options = static::query($props['query'], $model);
@@ -160,7 +160,7 @@ class Options
      * Brings options with query
      *
      * @param $query
-     * @param null $model
+     * @param \Kirby\Cms\Model|null $model
      * @return array
      */
     public static function query($query, $model = null): array

kirby/src/Form/OptionsApi.php

@@ -149,7 +149,7 @@ class OptionsApi
 
     /**
      * @param array $data
-     * @return self
+     * @return $this
      */
     protected function setData(array $data)
     {
@@ -159,7 +159,7 @@ class OptionsApi
 
     /**
      * @param string|null $fetch
-     * @return self
+     * @return $this
      */
     protected function setFetch(string $fetch = null)
     {
@@ -169,7 +169,7 @@ class OptionsApi
 
     /**
      * @param $options
-     * @return self
+     * @return $this
      */
     protected function setOptions($options = null)
     {
@@ -179,7 +179,7 @@ class OptionsApi
 
     /**
      * @param $text
-     * @return self
+     * @return $this
      */
     protected function setText($text = null)
     {
@@ -189,7 +189,7 @@ class OptionsApi
 
     /**
      * @param $url
-     * @return self
+     * @return $this
      */
     protected function setUrl($url)
     {
@@ -199,7 +199,7 @@ class OptionsApi
 
     /**
      * @param null $value
-     * @return self
+     * @return $this
      */
     protected function setValue($value = null)
     {

kirby/src/Form/OptionsQuery.php

@@ -33,27 +33,27 @@ class OptionsQuery
     protected $aliases = [];
 
     /**
-     * @var
+     * @var array
      */
     protected $data;
 
     /**
-     * @var
+     * @var array|string|null
      */
     protected $options;
 
     /**
-     * @var
+     * @var string
      */
     protected $query;
 
     /**
-     * @var
+     * @var mixed
      */
     protected $text;
 
     /**
-     * @var
+     * @var mixed
      */
     protected $value;
 
@@ -190,9 +190,9 @@ class OptionsQuery
 
     /**
      * @param array|null $aliases
-     * @return self
+     * @return $this
      */
-    protected function setAliases(array $aliases = null)
+    protected function setAliases(?array $aliases = null)
     {
         $this->aliases = $aliases;
         return $this;
@@ -200,7 +200,7 @@ class OptionsQuery
 
     /**
      * @param array $data
-     * @return self
+     * @return $this
      */
     protected function setData(array $data)
     {
@@ -209,8 +209,8 @@ class OptionsQuery
     }
 
     /**
-     * @param $options
-     * @return self
+     * @param array|string|null $options
+     * @return $this
      */
     protected function setOptions($options = null)
     {
@@ -220,7 +220,7 @@ class OptionsQuery
 
     /**
      * @param string $query
-     * @return self
+     * @return $this
      */
     protected function setQuery(string $query)
     {
@@ -229,8 +229,8 @@ class OptionsQuery
     }
 
     /**
-     * @param $text
-     * @return self
+     * @param mixed $text
+     * @return $this
      */
     protected function setText($text)
     {
@@ -239,8 +239,8 @@ class OptionsQuery
     }
 
     /**
-     * @param $value
-     * @return self
+     * @param mixed $value
+     * @return $this
      */
     protected function setValue($value)
     {