Index: branches/5.3.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r16226 -r16519
--- branches/5.3.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 16226)
+++ branches/5.3.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 16226 2015-09-01 08:21:44Z alex $
+* @version	$Id: install_toolkit.php 16519 2017-01-20 20:21:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -114,8 +114,8 @@
 				return Array ();
 			}
 
+			/** @var InPortalPrerequisites $prerequisite_object */
 			$prerequisite_object =& $this->getPrerequisiteObject($module_path);
-			/* @var $prerequisite_object InPortalPrerequisites */
 
 			// some errors possible
 			return is_object($prerequisite_object) ? $prerequisite_object->CheckPrerequisites($versions, $mode) : Array ();
@@ -130,8 +130,8 @@
 		 */
 		function CallPrerequisitesMethod($module_path, $method)
 		{
+			/** @var InPortalPrerequisites $prerequisite_object */
 			$prerequisite_object =& $this->getPrerequisiteObject($module_path);
-			/* @var $prerequisite_object InPortalPrerequisites */
 
 			return is_object($prerequisite_object) ? $prerequisite_object->$method() : false;
 		}
@@ -161,8 +161,8 @@
 				$prerequisite_classes[$module_path] = $prerequisite_class;
 			}
 
+			/** @var InPortalPrerequisites $prerequisite_object */
 			$prerequisite_object = new $prerequisite_classes[$module_path]();
-			/* @var $prerequisite_object InPortalPrerequisites */
 
 			if ( method_exists($prerequisite_object, 'setToolkit') ) {
 				$prerequisite_object->setToolkit($this);
@@ -178,8 +178,8 @@
 		 */
 		function processLicense($file_data)
 		{
+			/** @var kModulesHelper $modules_helper */
 			$modules_helper = $this->Application->recallObject('kModulesHelper');
-			/* @var $modules_helper kModulesHelper */
 
 			$file_data = explode('Code==:', $file_data);
 			$file_data[0] = str_replace('In-Portal License File - do not edit!' . "\n", '', $file_data[0]);
@@ -411,8 +411,8 @@
 				return ;
 			}
 
+			/** @var LanguageImportHelper $language_import_helper */
 			$language_import_helper = $this->Application->recallObject('LanguageImportHelper');
-			/* @var $language_import_helper LanguageImportHelper */
 
 			if ( !$upgrade ) {
 				$language_import_helper->setOption(LanguageImportHelper::OVERWRITE_EXISTING);
@@ -532,6 +532,7 @@
 			}
 
 			$ret = Array ();
+			/** @var SimpleXMLElement[] $module_info */
 			$module_info = simplexml_load_file($info_file);
 
 			if ( $module_info === false ) {
@@ -540,7 +541,6 @@
 			}
 
 			foreach ($module_info as $node) {
-				/* @var $node SimpleXMLElement */
 				$ret[strtolower($node->getName())] = trim($node);
 			}
 
@@ -605,15 +605,15 @@
 			static $fields = null;
 
 			if ( !isset($fields) ) {
+				/** @var kMultiLanguage $ml_formatter */
 				$ml_formatter = $this->Application->recallObject('kMultiLanguage');
-				/* @var $ml_formatter kMultiLanguage */
 
 				$fields['name'] = $ml_formatter->LangFieldName('Name');
 				$fields['description'] = $ml_formatter->LangFieldName('Description');
 			}
 
+			/** @var kDBItem $category */
 			$category = $this->Application->recallObject('c', null, Array ('skip_autoload' => true));
-			/* @var $category kDBItem */
 
 			$category_fields = Array (
 				$fields['name'] => $name, 'Filename' => $name, 'AutomaticFilename' => 1,
@@ -640,8 +640,8 @@
 
 			$category->Create();
 
+			/** @var kPriorityHelper $priority_helper */
 			$priority_helper = $this->Application->recallObject('PriorityHelper');
-			/* @var $priority_helper kPriorityHelper */
 
 			$event = new kEvent('c:OnListBuild');
 
@@ -711,8 +711,8 @@
 			$this->Application->UnitConfigReader->scanModules(MODULES_PATH . DIRECTORY_SEPARATOR . $module_folder);
 
 			// create correct columns in CustomData table
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->createFields($prefix . '-cdata', true);
 		}
@@ -737,8 +737,8 @@
 
 				if ( $rebuild_mode == CategoryPermissionRebuild::SILENT ) {
 					// refresh permission without progress bar
+					/** @var kPermCacheUpdater $updater */
 					$updater = $this->Application->makeClass('kPermCacheUpdater');
-					/* @var $updater kPermCacheUpdater */
 
 					$updater->OneStepRun();
 				}
@@ -782,8 +782,8 @@
 				return ;
 			}
 
+			/** @var kThemesHelper $themes_helper */
 			$themes_helper = $this->Application->recallObject('ThemesHelper');
-			/* @var $themes_helper kThemesHelper */
 
 			// use direct query, since module isn't yet in kApplication::ModuleInfo array
 			$sql = 'SELECT Name
@@ -793,8 +793,8 @@
 
 			$themes_helper->synchronizeModule($module_name);
 
+			/** @var kMultiLanguageHelper $ml_helper */
 			$ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
-			/* @var $ml_helper kMultiLanguageHelper */
 
 			$ml_helper->massCreateFields();
 
@@ -873,8 +873,8 @@
 				return true;
 			}
 
+			/** @var kDBItem $primary_skin */
 			$primary_skin = $this->Application->recallObject('skin.primary', null, Array ('skip_autoload' => true));
-			/* @var $primary_skin kDBItem */
 
 			$primary_skin->Load(1, 'IsPrimary');
 
@@ -883,8 +883,8 @@
 				return false;
 			}
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject('skin_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
 
 			// clone current skin
 			$cloned_ids = $temp_handler->CloneItems('skin', '', Array ($primary_skin->GetID()));
@@ -894,8 +894,8 @@
 				return false;
 			}
 
+			/** @var kDBItem $skin */
 			$skin = $this->Application->recallObject('skin.tmp', null, Array ('skip_autoload' => true));
-			/* @var $skin kDBItem */
 
 			$skin->Load($cloned_ids[0]);
 
@@ -983,8 +983,8 @@
 					unset($cache_handlers[$class_prefix]);
 				}
 				else {
+					/** @var FakeCacheHandler $handler */
 					$handler = new $handler_class($cache_handler, 'localhost:11211');
-					/* @var $handler FakeCacheHandler */
 
 					if ( !$handler->isWorking() ) {
 						if ( $current == $class_prefix ) {