Index: branches/5.3.x/units/addresses/addresses_event_handler.php
===================================================================
diff -u -N -r15909 -r16522
--- branches/5.3.x/units/addresses/addresses_event_handler.php	(.../addresses_event_handler.php)	(revision 15909)
+++ branches/5.3.x/units/addresses/addresses_event_handler.php	(.../addresses_event_handler.php)	(revision 16522)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: addresses_event_handler.php 15909 2013-07-23 13:48:24Z alex $
+* @version	$Id: addresses_event_handler.php 16522 2017-01-20 20:28:16Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -64,8 +64,8 @@
 				return;
 			}
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$user_id = $this->Application->RecallVar('user_id');
 			$object->addFilter('myitems_user', '%1$s.PortalUserId = ' . $user_id);
@@ -99,17 +99,17 @@
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->isLoaded() || !$this->checkItemStatus($event) ) {
 				// not trivially loaded object OR not current user address
 				$event->status = kEvent::erPERM_FAIL;
 				return ;
 			}
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$cs_helper->CheckStateField($event, 'State', 'Country');
 			$cs_helper->PopulateStates($event, 'State', 'Country');
@@ -178,8 +178,8 @@
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$cs_helper->PopulateStates($event, 'State', 'Country');
 		}
@@ -193,8 +193,8 @@
 		 */
 		protected function OnUpdateProfileAddress(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			if ( !$this->Application->isAdmin ) {
 				$address_id = $this->getOrderAddressId();
@@ -223,8 +223,8 @@
 				'Country'		=>	1,
 			);
 
+			/** @var UsersItem $user */
 			$user = $this->Application->recallObject($this->Application->isAdmin ? 'u' : 'u.current');
-			/* @var $user UsersItem */
 
 			$user->setName( $object->GetDBField('To') );
 
@@ -268,13 +268,13 @@
 		 */
 		protected function OnUpdateUserProfile(kEvent $event)
 		{
+			/** @var UsersItem $user */
 			$user = $event->MasterEvent->getObject();
-			/* @var $user UsersItem */
 
 			$load_keys = Array ('PortalUserId' => $user->GetID(), 'IsProfileAddress' => 1);
 
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$object->Load($load_keys);
 
@@ -338,8 +338,8 @@
 				return false;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->isLoaded() ) {
 				return true;
@@ -366,15 +366,15 @@
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$this->Application->isAdmin ) {
 				$object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
 			}
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$cs_helper->CheckStateField($event, 'State', 'Country');
 			$cs_helper->PopulateStates($event, 'State', 'Country');
@@ -395,8 +395,8 @@
 		{
 			parent::OnBeforeItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->isLoaded() || !$this->checkItemStatus($event) ) {
 				// not trivially loaded object OR not current user address
@@ -416,8 +416,8 @@
 		{
 			parent::OnAfterConfigRead($event);
 
+			/** @var SiteHelper $site_helper */
 			$site_helper = $this->Application->recallObject('SiteHelper');
-			/* @var $site_helper SiteHelper */
 
 			$config = $event->getUnitConfig();