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

6 files changed, 34 insertions, 37 deletions

diff --git a/modules-available/sysconfig/inc/configmodule/branding.inc.php b/modules-available/sysconfig/inc/configmodule/branding.inc.php
index 76968ff4..84f79b44 100644
--- a/modules-available/sysconfig/inc/configmodule/branding.inc.php
+++ b/modules-available/sysconfig/inc/configmodule/branding.inc.php
@@ -17,10 +17,10 @@ class ConfigModule_Branding extends ConfigModule
 	
 	private $tmpFile = false;
 
-	protected function generateInternal($tgz, $parent)
+	protected function generateInternal(string $tgz, ?string $parent)
 	{
 		if (!$this->validateConfig()) {
-			return $this->archive() !== false && file_exists($this->archive()); // No new temp file given, old archive still exists, pretend it worked...
+			return !empty($this->archive()) && file_exists($this->archive()); // No new temp file given, old archive still exists, pretend it worked...
 		}
 		return Taskmanager::submit('MoveFile', array(
 			'source' => $this->tmpFile,
@@ -30,17 +30,17 @@ class ConfigModule_Branding extends ConfigModule
 		));
 	}
 
-	protected function moduleVersion()
+	protected function moduleVersion(): int
 	{
 		return self::VERSION;
 	}
 
-	protected function validateConfig()
+	protected function validateConfig(): bool
 	{
 		return $this->tmpFile !== false && file_exists($this->tmpFile);
 	}
 
-	public function setData($key, $value)
+	public function setData(string $key, $value): bool
 	{
 		if ($key !== 'tmpFile' || !is_string($value) || !file_exists($value))
 			return false;
@@ -48,12 +48,12 @@ class ConfigModule_Branding extends ConfigModule
 		return true;
 	}
 
-	public function getData($key)
+	public function getData(?string $key): bool
 	{
 		return false;
 	}
 
-	public function allowDownload()
+	public function allowDownload(): bool
 	{
 		return true;
 	}
diff --git a/modules-available/sysconfig/inc/configmodule/customodule.inc.php b/modules-available/sysconfig/inc/configmodule/customodule.inc.php
index 56aa9277..b5c10104 100644
--- a/modules-available/sysconfig/inc/configmodule/customodule.inc.php
+++ b/modules-available/sysconfig/inc/configmodule/customodule.inc.php
@@ -16,12 +16,12 @@ class ConfigModule_CustomModule extends ConfigModule
 	
 	private $tmpFile = false;
 
-	protected function generateInternal($tgz, $parent)
+	protected function generateInternal(string $tgz, ?string $parent)
 	{
 		if (!$this->validateConfig()) {
 			// No temp file given from wizard
 			// Old archive still exists? pretend it worked...
-			if ($this->archive() === false || !file_exists($this->archive()))
+			if ($this->archive() === '' || !file_exists($this->archive()))
 				return false;
 			if ($this->currentVersion() == 1) {
 				// Need an upgrade
@@ -42,17 +42,17 @@ class ConfigModule_CustomModule extends ConfigModule
 		));
 	}
 
-	protected function moduleVersion()
+	protected function moduleVersion(): int
 	{
 		return self::VERSION;
 	}
 
-	protected function validateConfig()
+	protected function validateConfig(): bool
 	{
 		return $this->tmpFile !== false && file_exists($this->tmpFile);
 	}
 
-	public function setData($key, $value)
+	public function setData(string $key, $value): bool
 	{
 		// Sets the temp file from the wizard, where it stored the processed archive
 		if ($key !== 'tmpFile' || !file_exists($value))
@@ -61,12 +61,12 @@ class ConfigModule_CustomModule extends ConfigModule
 		return true;
 	}
 
-	public function getData($key)
+	public function getData(?string $key): bool
 	{
 		return false;
 	}
 
-	public function allowDownload()
+	public function allowDownload(): bool
 	{
 		return true;
 	}
diff --git a/modules-available/sysconfig/inc/configmodule/ldapauth.inc.php b/modules-available/sysconfig/inc/configmodule/ldapauth.inc.php
index 7af4671e..64af4c0e 100644
--- a/modules-available/sysconfig/inc/configmodule/ldapauth.inc.php
+++ b/modules-available/sysconfig/inc/configmodule/ldapauth.inc.php
@@ -5,7 +5,7 @@ class ConfigModule_LdapAuth extends ConfigModuleBaseLdap
 
 	const MODID = 'LdapAuth';
 
-	protected function preTaskmanagerHook(&$config)
+	protected function preTaskmanagerHook(array &$config)
 	{
 		// Just set the flag so the taskmanager job knows we're dealing with a normal ldap server,
 		// not AD scheme
diff --git a/modules-available/sysconfig/inc/configmodule/screensaver.inc.php b/modules-available/sysconfig/inc/configmodule/screensaver.inc.php
index 08a2c9a1..1797331c 100644
--- a/modules-available/sysconfig/inc/configmodule/screensaver.inc.php
+++ b/modules-available/sysconfig/inc/configmodule/screensaver.inc.php
@@ -14,7 +14,7 @@ class ConfigModule_Screensaver extends ConfigModule
 	const MODID = 'Screensaver';
 	const VERSION = 1;
 
-	protected function generateInternal($tgz, $parent)
+	protected function generateInternal(string $tgz, ?string $parent)
 	{
 		/* Validate if all data are available */
 		if (!$this->validateConfig())
@@ -30,21 +30,20 @@ class ConfigModule_Screensaver extends ConfigModule
 		), false);
 	}
 
-	protected function moduleVersion()
+	protected function moduleVersion(): int
 	{
 		return self::VERSION;
 	}
 
-	protected function validateConfig()
+	protected function validateConfig(): bool
 	{
-		return isset($this->moduleData['qss']) &&
-				 isset($this->moduleData['texts']) &&
-			    isset($this->moduleData['texts']['text-idle-kill']) &&
-				 isset($this->moduleData['texts']['text-no-timeout']) &&
-				 isset($this->moduleData['texts']['text-shutdown']);
+		return isset($this->moduleData['texts']['text-no-timeout'])
+			&& isset($this->moduleData['texts']['text-idle-kill'])
+			&& isset($this->moduleData['texts']['text-shutdown'])
+			&& isset($this->moduleData['qss']);
 	}
 
-	public function setData($key, $value)
+	public function setData(string $key, $value): bool
 	{
 		switch ($key) {
 		case 'qss':
@@ -58,17 +57,15 @@ class ConfigModule_Screensaver extends ConfigModule
 		return true;
 	}
 
-	public function allowDownload()
+	public function allowDownload(): bool
 	{
 		return false;
 	}
 
 	/**
 	 * Creates a map with filepath => file content
-	 *
-	 * @return array in the form of Map<String, byte[]>
 	 */
-	private function getFileArray()
+	private function getFileArray(): array
 	{
 		$files = array(
 			'/opt/openslx/xscreensaver/style.qss' => $this->moduleData['qss'],
@@ -98,7 +95,7 @@ class ConfigModule_Screensaver extends ConfigModule
 		return $files;
 	}
 
-	private function wrapHtmlTags($text_name)
+	private function wrapHtmlTags(string $text_name): string
 	{
 		return '<html><body>' . $this->moduleData['texts'][$text_name] . '</body></html>';
 	}
diff --git a/modules-available/sysconfig/inc/configmodule/sshconfig.inc.php b/modules-available/sysconfig/inc/configmodule/sshconfig.inc.php
index b5ab20e4..a62d1035 100644
--- a/modules-available/sysconfig/inc/configmodule/sshconfig.inc.php
+++ b/modules-available/sysconfig/inc/configmodule/sshconfig.inc.php
@@ -14,7 +14,7 @@ class ConfigModule_SshConfig extends ConfigModule
 	const MODID = 'SshConfig';
 	const VERSION = 1;
 
-	protected function generateInternal($tgz, $parent)
+	protected function generateInternal(string $tgz, ?string $parent)
 	{
 		if (!$this->validateConfig())
 			return false;
@@ -26,12 +26,12 @@ class ConfigModule_SshConfig extends ConfigModule
 		return Taskmanager::submit('SshdConfigGenerator', $config);
 	}
 
-	protected function moduleVersion()
+	protected function moduleVersion(): int
 	{
 		return self::VERSION;
 	}
 
-	protected function validateConfig()
+	protected function validateConfig(): bool
 	{
 		// UPGRADE
 		if (isset($this->moduleData['allowPasswordLogin']) && !isset($this->moduleData['allowedUsersLogin'])) {
@@ -45,7 +45,7 @@ class ConfigModule_SshConfig extends ConfigModule
 			&& isset($this->moduleData['listenPort']);
 	}
 
-	public function setData($key, $value)
+	public function setData(string $key, $value): bool
 	{
 		switch ($key) {
 		case 'publicKey':
diff --git a/modules-available/sysconfig/inc/configmodule/sshkey.inc.php b/modules-available/sysconfig/inc/configmodule/sshkey.inc.php
index 2d212d25..e4a55ad7 100644
--- a/modules-available/sysconfig/inc/configmodule/sshkey.inc.php
+++ b/modules-available/sysconfig/inc/configmodule/sshkey.inc.php
@@ -14,7 +14,7 @@ class ConfigModule_SshKey extends ConfigModule
 	const MODID = 'SshKey';
 	const VERSION = 1;
 
-	protected function generateInternal($tgz, $parent)
+	protected function generateInternal(string $tgz, ?string $parent)
 	{
 		if (!$this->validateConfig())
 			return false;
@@ -30,17 +30,17 @@ class ConfigModule_SshKey extends ConfigModule
 		return Taskmanager::submit('MakeTarball', $config);
 	}
 
-	protected function moduleVersion()
+	protected function moduleVersion(): int
 	{
 		return self::VERSION;
 	}
 
-	protected function validateConfig()
+	protected function validateConfig(): bool
 	{
 		return isset($this->moduleData['publicKey']);
 	}
 
-	public function setData($key, $value)
+	public function setData(string $key, $value): bool
 	{
 		switch ($key) {
 		case 'publicKey':