Add function param/return types, fix a lot more phpstorm complaints

1 files changed, 15 insertions, 15 deletions

diff --git a/inc/taskmanagercallback.inc.php b/inc/taskmanagercallback.inc.php
index 7c1e965e..321475ac 100644
--- a/inc/taskmanagercallback.inc.php
+++ b/inc/taskmanagercallback.inc.php
@@ -13,7 +13,7 @@ class TaskmanagerCallback
 	 * @param string|array $task Task or Task ID to define callback for
 	 * @param string $callback name of callback function, must be a static method in this class
 	 */
-	public static function addCallback($task, $callback, $args = NULL)
+	public static function addCallback($task, string $callback, $args = NULL): void
 	{
 		if (!call_user_func_array('method_exists', array('TaskmanagerCallback', $callback))) {
 			EventLog::warning("addCallback: Invalid callback function: $callback");
@@ -50,7 +50,7 @@ class TaskmanagerCallback
 	 *
 	 * @return array list of array(taskid => list of callbacks)
 	 */
-	public static function getPendingCallbacks()
+	public static function getPendingCallbacks(): array
 	{
 		$res = Database::simpleQuery("SELECT taskid, cbfunction, args FROM callback", array(), true);
 		if ($res === false)
@@ -67,9 +67,9 @@ class TaskmanagerCallback
 	 * table if appropriate.
 	 * 
 	 * @param array $callback entry from the callback table (cbfunction + taskid + args)
-	 * @param array $status status of the task as returned by the taskmanager. If NULL it will be queried.
+	 * @param ?array $status status of the task as returned by the taskmanager. If NULL it will be queried.
 	 */
-	public static function handleCallback($callback, $status = NULL)
+	public static function handleCallback(array $callback, array $status = NULL): void
 	{
 		if (is_null($status))
 			$status = Taskmanager::status($callback['taskid']);
@@ -99,7 +99,7 @@ class TaskmanagerCallback
 	/**
 	 * Result of trying to (re)launch ldadp.
 	 */
-	public static function ldadpStartup($task)
+	public static function ldadpStartup(array $task)
 	{
 		if (Taskmanager::isFailed($task)) {
 			if (!isset($task['data']['messages'])) {
@@ -112,14 +112,14 @@ class TaskmanagerCallback
 	/**
 	 * Result of restoring the server configuration
 	 */
-	public static function dbRestored($task)
+	public static function dbRestored(array $task)
 	{
 		if (!Taskmanager::isFailed($task)) {
 			EventLog::info('Configuration backup restored.');
 		}
 	}
 	
-	public static function adConfigCreate($task)
+	public static function adConfigCreate(array $task)
 	{
 		if (Taskmanager::isFailed($task))
 			EventLog::warning("Could not generate Active Directory configuration", $task['data']['error']);
@@ -131,7 +131,7 @@ class TaskmanagerCallback
 	 * @param array $task task obj
 	 * @param array $args has keys 'moduleid' and optionally 'deleteOnError' and 'tmpTgz'
 	 */
-	public static function cbConfModCreated($task, $args)
+	public static function cbConfModCreated(array $task, array $args)
 	{
 		$mod = Module::get('sysconfig');
 		if ($mod === false)
@@ -150,7 +150,7 @@ class TaskmanagerCallback
 	 * @param array $task task obj
 	 * @param array $args has keys 'configid' and optionally 'deleteOnError'
 	 */
-	public static function cbConfTgzCreated($task, $args)
+	public static function cbConfTgzCreated(array $task, array $args)
 	{
 		$mod = Module::get('sysconfig');
 		if ($mod === false)
@@ -163,7 +163,7 @@ class TaskmanagerCallback
 		}
 	}
 	
-	public static function manualMount($task, $args)
+	public static function manualMount(array $task, $args)
 	{
 		if (!isset($task['data']['exitCode']))
 			return;
@@ -183,7 +183,7 @@ class TaskmanagerCallback
 		}
 	}
 
-	public static function mlGotList($task, $args)
+	public static function mlGotList(array $task, $args)
 	{
 		$mod = Module::get('minilinux');
 		if ($mod === false)
@@ -192,7 +192,7 @@ class TaskmanagerCallback
 		MiniLinux::listDownloadCallback($task, $args);
 	}
 
-	public static function mlGotLinux($task, $args)
+	public static function mlGotLinux(array $task, $args)
 	{
 		$mod = Module::get('minilinux');
 		if ($mod === false)
@@ -201,7 +201,7 @@ class TaskmanagerCallback
 		MiniLinux::linuxDownloadCallback($task, $args);
 	}
 
-	public static function rbcConnCheck($task, $args)
+	public static function rbcConnCheck(array $task, $args)
 	{
 		$mod = Module::get('rebootcontrol');
 		if ($mod === false)
@@ -210,7 +210,7 @@ class TaskmanagerCallback
 		RebootControl::connectionCheckCallback($task, $args);
 	}
 
-	public static function ipxeVersionSet($task)
+	public static function ipxeVersionSet(array $task)
 	{
 		$mod = Module::get('serversetup');
 		if ($mod === false)
@@ -219,7 +219,7 @@ class TaskmanagerCallback
 		IPxeBuilder::setIPxeVersionCallback($task);
 	}
 
-	public static function ipxeCompileDone($task)
+	public static function ipxeCompileDone(array $task)
 	{
 		$mod = Module::get('serversetup');
 		if ($mod === false)