From cd55ead3e2810e209b726faca12fa749f6875d0f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 16 Dec 2017 18:33:16 +0100
Subject: Fix A LOT of type problems, logic flaws, uninitialized variables etc.

Most of them were found by phpstorm, so I put in some time and
went through the list, fixing quite a bunch of them.
---
 modules-available/sysconfig/inc/configmodule.inc.php | 2 +-
 modules-available/sysconfig/inc/configtgz.inc.php    | 9 +++++++++
 modules-available/sysconfig/inc/ppd.inc.php          | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'modules-available/sysconfig/inc')

diff --git a/modules-available/sysconfig/inc/configmodule.inc.php b/modules-available/sysconfig/inc/configmodule.inc.php
index 54d06afe..cfe79802 100644
--- a/modules-available/sysconfig/inc/configmodule.inc.php
+++ b/modules-available/sysconfig/inc/configmodule.inc.php
@@ -135,7 +135,7 @@ abstract class ConfigModule
 	 * Get module instances from module type.
 	 *
 	 * @param int $moduleType module type to get
-	 * @return \ConfigModule[] The requested modules from DB, or false on error
+	 * @return \ConfigModule[]|false The requested modules from DB, or false on error
 	 */
 	public static function getAll($moduleType = false)
 	{
diff --git a/modules-available/sysconfig/inc/configtgz.inc.php b/modules-available/sysconfig/inc/configtgz.inc.php
index dbf1bc99..09ea999c 100644
--- a/modules-available/sysconfig/inc/configtgz.inc.php
+++ b/modules-available/sysconfig/inc/configtgz.inc.php
@@ -232,6 +232,11 @@ class ConfigTgz
 		self::recompress([], SysConfig::GLOBAL_MINIMAL_CONFIG);
 	}
 
+	/**
+	 * @param string $title Title of config
+	 * @param int[] $moduleIds Modules to include in config
+	 * @return false|ConfigTgz The module instance, false on error
+	 */
 	public static function insert($title, $moduleIds)
 	{
 		if (!is_array($moduleIds))
@@ -287,6 +292,10 @@ class ConfigTgz
 		return $instance;
 	}
 
+	/**
+	 * @param int $moduleId ID of config module
+	 * @return ConfigTgz[]|false
+	 */
 	public static function getAllForModule($moduleId)
 	{
 		$res = Database::simpleQuery("SELECT configid, title, filepath FROM configtgz_x_module "
diff --git a/modules-available/sysconfig/inc/ppd.inc.php b/modules-available/sysconfig/inc/ppd.inc.php
index aa2e0e5a..5ccdbd53 100644
--- a/modules-available/sysconfig/inc/ppd.inc.php
+++ b/modules-available/sysconfig/inc/ppd.inc.php
@@ -413,6 +413,8 @@ class Ppd
 					// StringValue
 					$value = $vMatch[1];
 					$valueTranslation = isset($vMatch[2]) ? $this->unhexTranslation($no, substr($vMatch[2], 1)) : $value;
+				} else {
+					$valueTranslation = $value;
 				}
 				// Key-value-pair parsed, now the fun part
 				// Special cases for openening closing certain groups
@@ -691,6 +693,7 @@ class Ppd
 		$chars = array_reduce(array_unique($array), function ($carry, $item) {
 			return $carry . '\x' . dechex(ord($item));
 		}, '');
+		return $chars;
 	}
 
 	private function unhexTranslation($lineNo, $translation)
@@ -703,7 +706,7 @@ class Ppd
 			}
 			$string = preg_replace('/[^a-fA-F0-9]/', '', $match[0]);
 			if (strlen($string) % 2 !== 0) {
-				$this->warn('Odd number of hex digits in hex substring');
+				$this->warn($lineNo, 'Odd number of hex digits in hex substring');
 				$string = substr($string, 0, -1);
 			}
 			return pack('H*', $string);
-- 
cgit v1.2.3-55-g7522