docs: Fix param, return types

app/Halcyon/Access/Asset.php

@@ -54,7 +54,7 @@ class Asset extends Nested
 	/**
 	 * Generates automatic rules field value
 	 *
-	 * @param   object|string  $rules
+	 * @param   Rules|string  $rules
 	 * @return  void
 	 */
 	public function setRulesAttribute($rules): void

app/Halcyon/Access/Gate.php

@@ -217,7 +217,7 @@ protected static function deny($message = 'This action is unauthorized.')
 	 * @param   int    $roleId  The path to the role for which to check authorisation.
 	 * @param   string $action  The name of the action to authorise.
 	 * @param   mixed  $asset   Asset ID or the name of the asset as a string. Defaults to the global asset node.
-	 * @return  bool   True if authorised.
+	 * @return  bool|null   True if authorised.
 	 */
 	public static function checkRole($roleId, $action, $asset = null)
 	{

app/Halcyon/Access/Map.php

@@ -64,9 +64,9 @@ public function role(): BelongsTo
 	/**
 	 * Delete the specified record
 	 *
-	 * @return bool
+	 * @return bool|null
 	 */
-	public function delete(): bool
+	public function delete()
 	{
 		return self::query()
 			->where('role_id', '=', $this->role_id)
@@ -78,9 +78,9 @@ public function delete(): bool
 	 * Delete objects of this type by Role ID
 	 *
 	 * @param   mixed  $role_id  Integer or array of integers
-	 * @return  bool
+	 * @return  bool|null
 	 */
-	public static function destroyByRole($role_id): bool
+	public static function destroyByRole($role_id)
 	{
 		$role_id = (is_array($role_id) ? $role_id : array($role_id));
 
@@ -93,9 +93,9 @@ public static function destroyByRole($role_id): bool
 	 * Delete objects of this type by User ID
 	 *
 	 * @param   mixed  $user_id  Integer or array of integers
-	 * @return  bool
+	 * @return  bool|null
 	 */
-	public static function destroyByUser($user_id): bool
+	public static function destroyByUser($user_id)
 	{
 		$user_id = (is_array($user_id) ? $user_id : array($user_id));
 
@@ -160,9 +160,9 @@ public static function addUserToRole($user_id, $role_id): bool
 	 *
 	 * @param   mixed  $user_id  Integer
 	 * @param   mixed  $role_id  Integer or array of integers
-	 * @return  bool
+	 * @return  bool|null
 	 */
-	public static function removeUserFromRole($user_id, $role_id): bool
+	public static function removeUserFromRole($user_id, $role_id)
 	{
 		$role_id = (is_array($role_id) ? $role_id : array($role_id));
 

app/Halcyon/Access/Middleware/Authorize.php

@@ -19,7 +19,10 @@ class Authorize
 	 */
 	public function handle(Request $request, Closure $next, $ability)
 	{
-		Gate::authorize(auth()->id(), $ability);
+		$id = auth()->id();
+		$id = $id ?: 0;
+
+		Gate::authorize($id, $ability);
 
 		return $next($request);
 	}

app/Halcyon/Access/Viewlevel.php

@@ -78,7 +78,7 @@ public function incrementOrdering(): int
 	/**
 	 * Saves the current model to the database
 	 *
-	 * @param  array  $options
+	 * @param  array<string,mixed>  $options
 	 * @return  bool
 	 */
 	public function save(array $options = []): bool

app/Halcyon/Cas/CasManager.php

@@ -348,7 +348,7 @@ public function logoutWithUrl($url)
 	 * Get the attributes for for the currently connected user. This method
 	 * can only be called after authenticate() or an error wil be thrown.
 	 *
-	 * @return mixed
+	 * @return array
 	 */
 	public function getAttributes()
 	{

app/Halcyon/Cas/CasServiceProvider.php

@@ -34,9 +34,10 @@ public function register()
 	{
 		$this->app->singleton('cas', function ()
 		{
-			$config = config('cas');
+			$config = config('cas', []);
 
-			if (!strstr($config['cas_redirect_path'], 'authenticator='))
+			if (isset($config['cas_redirect_path'])
+			 && !strstr($config['cas_redirect_path'], 'authenticator='))
 			{
 				$config['cas_redirect_path'] .= strstr($config['cas_redirect_path'], '?') ? '&' : '?';
 				$config['cas_redirect_path'] .= 'authenticator=cas';

app/Halcyon/Cas/Middleware/RedirectCASAuthenticated.php

@@ -38,7 +38,9 @@ public function handle($request, Closure $next)
 	{
 		if ($this->cas->checkAuthentication())
 		{
-			$route = (string)config('cas.cas_redirect_path');
+			$config = config('cas.cas_redirect_path', []);
+
+			$route = isset($config['cas_redirect_path']) ? (string)$config['cas_redirect_path'] : '';
 			$route = $route ?: route('callback');
 
 			return redirect($route);

app/Halcyon/Form/Field.php

@@ -197,14 +197,7 @@ public function __construct($form = null)
 				//$parts = Str::splitCamel(get_class($this));
 				$parts = preg_split('/(?<=[^A-Z_])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][^A-Z_])/x', get_class($this));
 
-				if ($parts[0] == 'J')
-				{
-					$this->type = ucfirst($parts[count($parts) - 1], '_');
-				}
-				else
-				{
-					$this->type = ucfirst($parts[0], '_') . ucfirst($parts[count($parts) - 1], '_');
-				}
+				$this->type = ucfirst($parts[0]) . ucfirst($parts[count($parts) - 1]);
 			}
 		}
 	}
@@ -255,6 +248,7 @@ public function __get($name)
 
 				return $this->label;
 				break;
+
 			case 'title':
 				return $this->getTitle();
 				break;
@@ -584,7 +578,7 @@ public function getAttribute($name, $default = null)
 			$attributes = $this->element->attributes();
 
 			// Ensure that the attribute exists
-			if (property_exists($attributes, $name))
+			if ($attributes && property_exists($attributes, $name))
 			{
 				$value = $attributes->$name;
 

app/Halcyon/Form/Fields/Calendar.php

@@ -71,9 +71,9 @@ protected function getInput()
 		}
 
 		// Handle the special case for "now".
-		if (strtoupper($this->value) == 'NOW')
+		if (is_string($this->value) && strtoupper($this->value) == 'NOW')
 		{
-			$this->value = strftime($format);
+			$this->value = date($format);
 		}
 
 		if ($this->value)

app/Halcyon/Form/Fields/Color.php

@@ -24,14 +24,14 @@ class Color extends Field
 	 */
 	protected function getInput()
 	{
-		if (empty($this->value))
+		$this->value = is_string($this->value) ? '#' . ltrim((string)$this->value, '#') : '';
+
+		if (!$this->value)
 		{
 			// A color field can't be empty, we default to black. This is the same as the HTML5 spec.
 			$this->value = '#000000';
 		}
 
-		$this->value = '#' . ltrim((string)$this->value, '#');
-
 		// Initialize some field attributes.
 		$attributes = array(
 			'type'         => 'text',

app/Halcyon/Form/Fields/Combo.php

@@ -26,6 +26,7 @@ protected function getInput()
 		// Initialize variables.
 		$html = array();
 		$attr = '';
+		$value = is_string($this->value) ? $this->value : '';
 
 		// Initialize some field attributes.
 		$attr .= $this->element['class'] ? ' class="form-control combobox ' . (string) $this->element['class'] . '"' : ' class="form-control combobox"';
@@ -41,7 +42,7 @@ protected function getInput()
 		$options = $this->getOptions();
 
 		// Build the input for the combo box.
-		$html[] = '<input type="text" name="' . $this->name . '" id="' . $this->id . '" list="' . $this->id . 'list" value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"' . $attr . '/>';
+		$html[] = '<input type="text" name="' . $this->name . '" id="' . $this->id . '" list="' . $this->id . 'list" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"' . $attr . '/>';
 
 		// Build the list for the combo box.
 		$html[] = '<datalist id="' . $this->id . 'list">';

app/Halcyon/Form/Fields/Country.php

@@ -272,9 +272,7 @@ class Country extends Select
 	);
 
 	/**
-	 * Method to get the field options.
-	 *
-	 * @return  array<int,stdClass>  The field option objects.
+	 * @inheritdoc
 	 */
 	protected function getOptions()
 	{

app/Halcyon/Form/Fields/Editor.php

@@ -3,7 +3,7 @@
 namespace App\Halcyon\Form\Fields;
 
 //use App\Halcyon\Form\Field;
-//use App\Halcyon\Html\Editor as Wysiwyg;
+use App\Halcyon\Models\Extension;
 use App\Modules\Core\Events\EditorIsRendering;
 
 /**
@@ -21,7 +21,7 @@ class Editor extends Textarea
 	/**
 	 * The Editor object.
 	 *
-	 * @var  object
+	 * @var  Extension|null
 	 */
 	protected $editor;
 
@@ -80,7 +80,7 @@ protected function getInput()
 	/**
 	 * Method to get a Editor object based on the form field.
 	 *
-	 * @return  object  The Editor object.
+	 * @return  Extension|null  The Editor object.
 	 */
 	protected function getEditor()
 	{
@@ -105,7 +105,7 @@ protected function getEditor()
 				foreach ($types as $element)
 				{
 					// Build the query.
-					$editor = $db->table('extensions')
+					$editor = Extension::query()
 						->select('element')
 						->where('element', '=', $element)
 						->where('folder', '=', 'editors')
@@ -122,7 +122,7 @@ protected function getEditor()
 			}
 
 			// Create the Editor instance based on the given editor.
-			$this->editor = $editor; //Wysiwyg::getInstance($editor);
+			$this->editor = $editor;
 		}
 
 		return $this->editor;
@@ -131,10 +131,12 @@ protected function getEditor()
 	/**
 	 * Method to get the Editor output for an onSave event.
 	 *
-	 * @return  string  The Editor object output.
+	 * @return  bool
 	 */
 	public function save()
 	{
-		return $this->getEditor()->save($this->id);
+		$editor = $this->getEditor();
+
+		return $editor ? $editor->save($this->id) : false;
 	}
 }

app/Halcyon/Form/Fields/File.php

@@ -41,6 +41,10 @@ protected function getInput()
 		$attr = array();
 		foreach ($attributes as $key => $value)
 		{
+			if (!$value)
+			{
+				continue;
+			}
 			$attr[] = $key . '="' . e($value) . '"';
 		}
 		$attr = implode(' ', $attr);

app/Halcyon/Form/Fields/Number.php

@@ -23,10 +23,12 @@ class Number extends Field
 	 */
 	protected function getInput()
 	{
+		$value = is_numeric($this->value) ? (int)$this->value : 0;
+
 		// Initialize some field attributes.
 		$attributes = array(
 			'type'         => 'number',
-			'value'        => htmlspecialchars((string)$this->value, ENT_COMPAT, 'UTF-8'),
+			'value'        => $value,
 			'name'         => $this->name,
 			'id'           => $this->id,
 			'min'          => (!is_null($this->element['min']) ? (int) $this->element['min'] : null),

app/Halcyon/Form/Fields/Password.php

@@ -35,8 +35,14 @@ protected function getInput()
 		$required  = ((string) $this->element['required'] == 'true'    ? ' required="required"' : '');
 		$threshold = $this->element['threshold'] ? (int) $this->element['threshold'] : 66;
 
+		$value = '';
+		if ($this->value && is_string($this->value))
+		{
+			$value = $this->value;
+		}
+
 		return '<input type="password" name="' . $this->name . '" id="' . $this->id . '"' .
-			' value="' . htmlspecialchars((string)$this->value, ENT_COMPAT, 'UTF-8') . '"' .
+			' value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"' .
 			$auto . $class . $readonly . $disabled . $size . $maxLength . $meter . $required . ' autocomplete="off" />';
 	}
 }

app/Halcyon/Form/Fields/Radio.php

@@ -74,7 +74,7 @@ protected function getInput()
 			$html[] = '</li>';
 		}
 
-		$i = is_null($i) ? 0 : $i;
+		$i = empty($i) ? 0 : $i;
 
 		if ($this->element['option_other'])
 		{

app/Halcyon/Form/Fields/Select.php

@@ -103,7 +103,7 @@ protected function getInput()
 	/**
 	 * Method to get the field options.
 	 *
-	 * @return  array<int,\stdClass>  The field option objects.
+	 * @return  array<int,\stdClass|\Illuminate\Support\Fluent>  The field option objects.
 	 */
 	protected function getOptions()
 	{

app/Halcyon/Form/Fields/Text.php

@@ -23,10 +23,17 @@ class Text extends Field
 	 */
 	protected function getInput()
 	{
+		$value = $this->value;
+		$value = is_null($value) ? '' : $value;
+		if (is_string($value))
+		{
+			$value = htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8');
+		}
+
 		// Initialize some field attributes.
 		$attributes = array(
 			'type'         => 'text',
-			'value'        => htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8'),
+			'value'        => $value,
 			'name'         => $this->name,
 			'id'           => $this->id,
 			'size'         => ($this->element['size']      ? (int) $this->element['size']      : ''),

app/Halcyon/Form/Form.php

@@ -25,14 +25,14 @@ class Form
 	/**
 	 * The Repository data store for form fields during display.
 	 *
-	 * @var  object
+	 * @var  Repository
 	 */
 	protected $data;
 
 	/**
 	 * The form object errors array.
 	 *
-	 * @var  array
+	 * @var  array<string,Exception>
 	 */
 	protected $errors = array();
 
@@ -46,7 +46,7 @@ class Form
 	/**
 	 * The form object options for use in rendering and validation.
 	 *
-	 * @var  array
+	 * @var  array<string,mixed>
 	 */
 	protected $options = array();
 
@@ -60,7 +60,7 @@ class Form
 	/**
 	 * Form instances.
 	 *
-	 * @var  array
+	 * @var  array<string,Form>
 	 */
 	protected static $forms = array();
 
@@ -254,7 +254,7 @@ public function filter($data, $group = null)
 	/**
 	 * Return all errors, if any.
 	 *
-	 * @return  array  Array of error messages or Exception objects.
+	 * @return  array<string,Exception>  Array of error messages or Exception objects.
 	 */
 	public function getErrors()
 	{