From c059d7316c6124921072cc4fca1df7120582272c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Fri, 2 May 2014 15:35:52 +0200
Subject: [PATCH] type hints resolved warnings

---
 application/core/Commands/HelpManager.php        |  6 +++++-
 .../core/Configurators/ManiaControlSettings.php  |  1 +
 application/core/Database/Database.php           | 16 ++++++++++++----
 application/core/ManiaControl.php                |  1 +
 application/core/Plugins/PluginManager.php       |  3 ++-
 application/core/Update/PluginUpdateManager.php  |  2 ++
 6 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/application/core/Commands/HelpManager.php b/application/core/Commands/HelpManager.php
index bc49d2d9..513541de 100644
--- a/application/core/Commands/HelpManager.php
+++ b/application/core/Commands/HelpManager.php
@@ -3,6 +3,7 @@
 namespace ManiaControl\Commands;
 
 use FML\Controls\Frame;
+use FML\Controls\Label;
 use FML\Controls\Quads\Quad_BgsPlayerCard;
 use FML\ManiaLink;
 use FML\Script\Features\Paging;
@@ -228,7 +229,10 @@ class HelpManager implements CommandListener, CallbackListener {
 
 			$array = array($command['Name'] => $x + 5, $command['Description'] => $x + 50);
 			$labels = $this->maniaControl->manialinkManager->labelLine($playerFrame, $array);
-			$labels[0]->setWidth(40);
+
+			/** @var Label $label */
+			$label = $labels[0];
+			$label->setWidth(40);
 
 			$y -= 4;
 			$i++;
diff --git a/application/core/Configurators/ManiaControlSettings.php b/application/core/Configurators/ManiaControlSettings.php
index 1476229f..bb7a6fd4 100644
--- a/application/core/Configurators/ManiaControlSettings.php
+++ b/application/core/Configurators/ManiaControlSettings.php
@@ -234,6 +234,7 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
 		
 		$pageFrame = null;
 		$index = 0;
+		$y = 0;
 		foreach ($settings as $setting) {
 			if (!$pageFrame) {
 				$pageFrame = new Frame();
diff --git a/application/core/Database/Database.php b/application/core/Database/Database.php
index c804d387..c1d90b34 100644
--- a/application/core/Database/Database.php
+++ b/application/core/Database/Database.php
@@ -36,10 +36,18 @@ class Database implements TimerListener {
 		$user = $this->maniaControl->config->database->xpath('user');
 		$pass = $this->maniaControl->config->database->xpath('pass');
 		
-		if (!$host) trigger_error("Invalid database configuration (host).", E_USER_ERROR);
-		if (!$port) trigger_error("Invalid database configuration (port).", E_USER_ERROR);
-		if (!$user) trigger_error("Invalid database configuration (user).", E_USER_ERROR);
-		if (!$pass) trigger_error("Invalid database configuration (pass).", E_USER_ERROR);
+		if (!$host) {
+			trigger_error("Invalid database configuration (host).", E_USER_ERROR);
+		}
+		if (!$port) {
+			trigger_error("Invalid database configuration (port).", E_USER_ERROR);
+		}
+		if (!$user) {
+			trigger_error("Invalid database configuration (user).", E_USER_ERROR);
+		}
+		if (!$pass) {
+			trigger_error("Invalid database configuration (pass).", E_USER_ERROR);
+		}
 		
 		$host = (string) $host[0];
 		$port = (int) $port[0];
diff --git a/application/core/ManiaControl.php b/application/core/ManiaControl.php
index e8587cb4..5c3db1d7 100644
--- a/application/core/ManiaControl.php
+++ b/application/core/ManiaControl.php
@@ -79,6 +79,7 @@ class ManiaControl implements CommandListener, TimerListener {
 	public $server = null;
 	public $settingManager = null;
 	public $statisticManager = null;
+	/** @var UpdateManager $updateManager */
 	public $updateManager = null;
 	public $errorHandler = null;
 	public $timerManager = null;
diff --git a/application/core/Plugins/PluginManager.php b/application/core/Plugins/PluginManager.php
index 3930ba0a..c4c2ac7d 100644
--- a/application/core/Plugins/PluginManager.php
+++ b/application/core/Plugins/PluginManager.php
@@ -220,7 +220,8 @@ class PluginManager {
 				continue;
 			}
 			array_push($newPluginClasses, $className);
-			
+
+			/** @var Plugin $className */
 			$className::prepare($this->maniaControl);
 			
 			if ($this->getSavedPluginStatus($className)) {
diff --git a/application/core/Update/PluginUpdateManager.php b/application/core/Update/PluginUpdateManager.php
index 07e7aacd..2e028235 100644
--- a/application/core/Update/PluginUpdateManager.php
+++ b/application/core/Update/PluginUpdateManager.php
@@ -166,6 +166,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
 				if (!isset($pluginsData[$pluginId])) {
 					continue;
 				}
+				/** @var PluginUpdateData $pluginData */
 				$pluginData = $pluginsData[$pluginId];
 				$pluginVersion = $pluginClass::getVersion();
 				if ($pluginData->isNewerThan($pluginVersion)) {
@@ -301,6 +302,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
 			 */
 			$pluginId = $pluginClass::getId();
 			if (isset($pluginsUpdates[$pluginId])) {
+				/** @var PluginUpdateData $pluginUpdateData */
 				$pluginUpdateData = $pluginsUpdates[$pluginId];
 				$pluginVersion = $pluginClass::getVersion();
 				if ($pluginUpdateData->isNewerThan($pluginVersion)) {