From 736507fccfc63c2cccca01b1c28ec7a1ca11a14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Tue, 27 May 2014 23:00:39 +0200
Subject: [PATCH] phpdoc + coding improvements #3

---
 application/core/Configurators/ManiaControlSettings.php  | 2 --
 application/core/Maps/MapCommands.php                    | 2 +-
 application/core/Server/Server.php                       | 2 +-
 application/core/Settings/SettingManager.php             | 6 +++---
 application/core/Update/UpdateManager.php                | 2 +-
 application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php | 7 +++----
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/application/core/Configurators/ManiaControlSettings.php b/application/core/Configurators/ManiaControlSettings.php
index 029699af..9c303159 100644
--- a/application/core/Configurators/ManiaControlSettings.php
+++ b/application/core/Configurators/ManiaControlSettings.php
@@ -128,8 +128,6 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
 		$index     = 0;
 		$y         = 0;
 		foreach ($settings as $setting) {
-			/** @var Setting $setting */
-
 			if (!$pageFrame) {
 				$pageFrame = new Frame();
 				$frame->add($pageFrame);
diff --git a/application/core/Maps/MapCommands.php b/application/core/Maps/MapCommands.php
index afe20975..229118ec 100644
--- a/application/core/Maps/MapCommands.php
+++ b/application/core/Maps/MapCommands.php
@@ -113,7 +113,7 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
 			$requester = $nextQueued[0];
 			/** @var Map $map */
 			$map = $nextQueued[1];
-			$this->maniaControl->chat->sendInformation("Next Map is $<{$map->nam}$> from $<{$map->authorNick}$> requested by $<{$requester->nickname}$>.", $player);
+			$this->maniaControl->chat->sendInformation("Next Map is $<{$map->name}$> from $<{$map->authorNick}$> requested by $<{$requester->nickname}$>.", $player);
 		} else {
 			$mapIndex = $this->maniaControl->client->getNextMapIndex();
 			$maps     = $this->maniaControl->mapManager->getMaps();
diff --git a/application/core/Server/Server.php b/application/core/Server/Server.php
index afae53ca..d2fea280 100644
--- a/application/core/Server/Server.php
+++ b/application/core/Server/Server.php
@@ -153,7 +153,7 @@ class Server implements CallbackListener {
 	/**
 	 * Gets all Servers from the Database
 	 *
-	 * @return array
+	 * @return \stdClass[]
 	 */
 	public function getAllServers() {
 		$mysqli = $this->maniaControl->database->mysqli;
diff --git a/application/core/Settings/SettingManager.php b/application/core/Settings/SettingManager.php
index 3efb5349..b4c40cb1 100644
--- a/application/core/Settings/SettingManager.php
+++ b/application/core/Settings/SettingManager.php
@@ -429,7 +429,7 @@ class SettingManager implements CallbackListener {
 	 * Get all Settings for the given Class
 	 *
 	 * @param mixed $object
-	 * @return array
+	 * @return Setting[]
 	 */
 	public function getSettingsByClass($object) {
 		$className = ClassUtil::getClass($object);
@@ -453,7 +453,7 @@ class SettingManager implements CallbackListener {
 	/**
 	 * Get all Settings
 	 *
-	 * @return array
+	 * @return Setting[]
 	 */
 	public function getSettings() {
 		$mysqli = $this->maniaControl->database->mysqli;
@@ -476,7 +476,7 @@ class SettingManager implements CallbackListener {
 	 * Get all Setting Classes
 	 *
 	 * @param bool $hidePluginClasses
-	 * @return array
+	 * @return string[]
 	 */
 	public function getSettingClasses($hidePluginClasses = false) {
 		$mysqli = $this->maniaControl->database->mysqli;
diff --git a/application/core/Update/UpdateManager.php b/application/core/Update/UpdateManager.php
index 157b9daf..b42a383a 100644
--- a/application/core/Update/UpdateManager.php
+++ b/application/core/Update/UpdateManager.php
@@ -85,7 +85,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
 	/**
 	 * Get the possible Update Channels
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	public function getUpdateChannels() {
 		// TODO: change default channel on release
diff --git a/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php b/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
index 63143715..3471a840 100644
--- a/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
+++ b/application/plugins/MCTeam/Dedimania/DedimaniaPlugin.php
@@ -1123,11 +1123,10 @@ class DedimaniaPlugin implements CallbackListener, CommandListener, TimerListene
 	 * @return array|RecordData
 	 */
 	public function getDedimaniaRecords() {
-		if (!$this->dedimaniaData->records) {
-			return null;
+		if ($this->dedimaniaData->records) {
+			return $this->dedimaniaData->records;
 		}
-		$records = $this->dedimaniaData->records;
-		return $records;
+		return null;
 	}
 
 	/**