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

1 files changed, 15 insertions, 14 deletions

diff --git a/modules-available/sysconfig/addmodule_adauth.inc.php b/modules-available/sysconfig/addmodule_adauth.inc.php
index b7e1cca0..2a695ab0 100644
--- a/modules-available/sysconfig/addmodule_adauth.inc.php
+++ b/modules-available/sysconfig/addmodule_adauth.inc.php
@@ -15,7 +15,7 @@ class AdAuth_Start extends AddModule_Base
 	{
 		$ADAUTH_COMMON_FIELDS = array('title', 'server', 'searchbase', 'binddn', 'bindpw', 'home', 'homeattr', 'ssl', 'genuid', 'certificate', 'mapping', 'nohomewarn');
 		$data = array();
-		if ($this->edit !== false) {
+		if ($this->edit !== null) {
 			moduleToArray($this->edit, $data, $ADAUTH_COMMON_FIELDS);
 			$data['title'] = $this->edit->title();
 			$data['edit'] = $this->edit->id();
@@ -35,7 +35,7 @@ class AdAuth_Start extends AddModule_Base
 		}
 		$data['step'] = 'AdAuth_CheckConnection';
 		$data['map_empty'] = true;
-		$data['mapping'] = ConfigModuleBaseLdap::getMapping(isset($data['mapping']) ? $data['mapping'] : false, $data['map_empty']);
+		$data['mapping'] = ConfigModuleBaseLdap::getMapping($data['mapping'] ?? null, $data['map_empty']);
 		Render::addDialog(Dictionary::translateFile('config-module', 'adAuth_title'), false, 'ad-start', $data);
 	}
 
@@ -94,7 +94,7 @@ class AdAuth_CheckConnection extends AddModule_Base
 
 	protected function renderInternal()
 	{
-		$mapping = Request::post('mapping', false, 'array');
+		$mapping = Request::post('mapping', null, 'array');
 		$data = array(
 			'edit' => Request::post('edit'),
 			'title' => Request::post('title'),
@@ -194,7 +194,7 @@ class AdAuth_SelfSearch extends AddModule_Base
 
 	protected function renderInternal()
 	{
-		$mapping = Request::post('mapping', false, 'array');
+		$mapping = Request::post('mapping', null, 'array');
 		$data = array(
 			'edit' => Request::post('edit'),
 			'title' => Request::post('title'),
@@ -287,7 +287,7 @@ class AdAuth_HomeAttrCheck extends AddModule_Base
 				'certificate' => Request::post('certificate', ''),
 				'originalbinddn' => Request::post('originalbinddn'),
 				'tryHomeAttr' => true,
-				'mapping' => ConfigModuleBaseLdap::getMapping(Request::post('mapping', false, 'array')),
+				'mapping' => ConfigModuleBaseLdap::getMapping(Request::post('mapping', null, 'array')),
 				'prev' => 'AdAuth_Start',
 				'next' => 'AdAuth_CheckCredentials'
 			))
@@ -358,7 +358,7 @@ class AdAuth_CheckCredentials extends AddModule_Base
 				'fingerprint' => Request::post('fingerprint'),
 				'certificate' => Request::post('certificate', ''),
 				'originalbinddn' => Request::post('originalbinddn'),
-				'mapping' => ConfigModuleBaseLdap::getMapping(Request::post('mapping', false, 'array')),
+				'mapping' => ConfigModuleBaseLdap::getMapping(Request::post('mapping', null, 'array')),
 				'prev' => 'AdAuth_Start',
 				'next' => 'AdAuth_HomeDir'
 			))
@@ -422,11 +422,11 @@ class AdAuth_HomeDir extends AddModule_Base
 			'fingerprint' => Request::post('fingerprint'),
 			'certificate' => Request::post('certificate', ''),
 			'originalbinddn' => Request::post('originalbinddn'),
-			'mapping' => ConfigModuleBaseLdap::getMapping(Request::post('mapping', false, 'array')),
+			'mapping' => ConfigModuleBaseLdap::getMapping(Request::post('mapping', null, 'array')),
 			'prev' => 'AdAuth_Start',
 			'next' => 'AdAuth_Finish'
 		);
-		if ($this->edit !== false) {
+		if ($this->edit !== null) {
 			foreach (self::getAttributes() as $key) {
 				if ($this->edit->getData($key)) {
 					$data[$key . '_c'] = 'checked="checked"';
@@ -453,7 +453,7 @@ class AdAuth_HomeDir extends AddModule_Base
 		Render::addDialog(Dictionary::translateFile('config-module', 'adAuth_title'), false, 'ad_ldap-homedir', $data);
 	}
 
-	public static function getAttributes()
+	public static function getAttributes(): array
 	{
 		return array('shareRemapMode', 'shareRemapCreate', 'shareDocuments', 'shareDownloads', 'shareDesktop',
 			'shareMedia', 'shareOther', 'shareHomeDrive', 'shareDomain', 'credentialPassthrough');
@@ -471,10 +471,11 @@ class AdAuth_Finish extends AddModule_Base
 		$title = Request::post('title');
 		if (empty($title))
 			$title = 'AD: ' . Request::post('server');
-		if ($this->edit === false)
+		if ($this->edit === null) {
 			$module = ConfigModule::getInstance('AdAuth');
-		else
+		} else {
 			$module = $this->edit;
+		}
 		$ssl = Request::post('ssl', 'off') === 'on';
 		foreach (['searchbase', 'binddn', 'server', 'bindpw', 'home', 'nohomewarn', 'homeattr', 'certificate', 'genuid',
 					'ldapAttrMountOpts', 'shareHomeMountOpts'] as $key) {
@@ -498,7 +499,7 @@ class AdAuth_Finish extends AddModule_Base
 		} else {
 			$module->setData('fingerprint', '');
 		}
-		if ($this->edit !== false)
+		if ($this->edit !== null)
 			$ret = $module->update($title);
 		else
 			$ret = $module->insert($title);
@@ -506,7 +507,7 @@ class AdAuth_Finish extends AddModule_Base
 			Message::addError('main.value-invalid', 'any', 'any');
 			$tgz = false;
 		} else {
-			$tgz = $module->generate($this->edit === false);
+			$tgz = $module->generate($this->edit === null);
 		}
 		if ($tgz === false) {
 			AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
@@ -516,7 +517,7 @@ class AdAuth_Finish extends AddModule_Base
 			'tm-config' => $tgz,
 		);
 
-		if ($this->edit === false) {
+		if ($this->edit === null) {
 			AddModule_Base::setStep('AddModule_Assign', $module->id());
 		}