Index: branches/5.2.x/units/gateways/gw_classes/paypal.php
===================================================================
diff -u -N -r16021 -r16516
--- branches/5.2.x/units/gateways/gw_classes/paypal.php	(.../paypal.php)	(revision 16021)
+++ branches/5.2.x/units/gateways/gw_classes/paypal.php	(.../paypal.php)	(revision 16516)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: paypal.php 16021 2014-03-25 12:21:54Z alex $
+* @version	$Id: paypal.php 16516 2017-01-20 14:12:22Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -81,8 +81,8 @@
 			$ret['state'] = $item_data['BillingState'];
 			$ret['zip'] = $item_data['BillingZip'];
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
 			$ret['notify_url'] = $this->getNotificationUrl() . '?sid=' . $this->Application->GetSID() . '&admin=1&order_id=' . $item_data['OrderId'];
@@ -146,8 +146,8 @@
 			$ret['state'] = $item_data['BillingState'];
 			$ret['zip'] = $item_data['BillingZip'];
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] );
 			$ret['notify_url'] = $this->getNotificationUrl() . '?sid='.$this->Application->GetSID().'&admin=1&order_id='.$item_data['OrderId'].'&payment_type_id='.$tag_params['payment_type_id'];
@@ -172,8 +172,8 @@
 			// status, of that PayPal server really has sent such notification to us
 			$status_map = Array('INVALID' => 0, 'VERIFIED' => 1);
 
+			/** @var kCurlHelper $curl_helper */
 			$curl_helper = $this->Application->recallObject('CurlHelper');
-			/* @var $curl_helper kCurlHelper */
 
 			$curl_helper->SetPostData($_POST);
 			$n_status = $curl_helper->Send($gw_params['submit_url']); // INVALID, VERIFIED
@@ -198,8 +198,8 @@
 					$this->Application->HandleEvent(new kEvent('p:OnSubscriptionApprove', array('field_values' => $field_values)));
 					$success = 0; //this will eliminate OnCompleteOrder in gw_notify!
 
+					/** @var kDBItem $org_order */
 					$org_order = $this->Application->recallObject('ord.-original', 'ord', Array('skip_autoload' => true));
-					/* @var $org_order kDBItem */
 
 					$org_order->Load($field_values['OrderId']);