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

1 files changed, 7 insertions, 7 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;
 	}