Index: branches/5.2.x/units/shipping/shipping_tag_processor.php
===================================================================
diff -u -N -r16310 -r16516
--- branches/5.2.x/units/shipping/shipping_tag_processor.php	(.../shipping_tag_processor.php)	(revision 16310)
+++ branches/5.2.x/units/shipping/shipping_tag_processor.php	(.../shipping_tag_processor.php)	(revision 16516)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_tag_processor.php 16310 2016-01-17 11:55:07Z alex $
+* @version	$Id: shipping_tag_processor.php 16516 2017-01-20 14:12:22Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -32,8 +32,8 @@
 		$zones_object = $this->Application->recallObject('z');
 		$brackets_object = $this->Application->recallObject('br');
 
+		/** @var kDBItem $costs_object */
 		$costs_object = $this->Application->recallObject('sc');
-		/* @var $costs_object kDBItem */
 
 		$main_processor = $this->Application->recallObject('m_TagProcessor');
 
@@ -181,8 +181,8 @@
 
 		$this->Application->recallObject('ShippingQuoteEngine'); // TODO: why call this here?
 
+		/** @var ShippingQuoteCollector $quote_engine_collector */
 		$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
-		/* @var $quote_engine_collector ShippingQuoteCollector */
 
 		$shipping_quote_params = Array (
 			'dest_country'	=>	$user_country_id,
@@ -223,8 +223,8 @@
 			$last_shippings = unserialize($last_shippings);
 		}
 
+		/** @var OrdersItem $order_object */
 		$order_object = $this->Application->recallObject('ord');
-		/* @var $order_object OrdersItem */
 
 		$original_shipping = $order_object->GetDBField('ShippingInfo');
 		$original_shipping = unserialize($original_shipping);
@@ -264,8 +264,8 @@
 			return '';
 		}
 
+		/** @var LanguagesItem $lang */
 		$lang = $this->Application->recallObject('lang.current');
-		/* @var $lang LanguagesItem */
 
 		foreach ($shipping_types as $shipping_type) {
 			if ( isset($shipping_type['InsuranceFee']) ) {
@@ -294,8 +294,8 @@
 
 	function AvailableTypes($params)
 	{
+		/** @var ShippingQuoteCollector $quote_engine_collector */
 		$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
-		/* @var $quote_engine_collector ShippingQuoteCollector */
 
 		$types = $quote_engine_collector->GetAvailableShippingTypes();
 
@@ -311,8 +311,8 @@
 
 	protected function ListGroups($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$o = '';
 		$selected = trim($object->GetDBField('PortalGroups'), ',');