Index: branches/5.2.x/units/helpers/bank_lv_currency_rates.php =================================================================== diff -u -N -r15166 -r16516 --- branches/5.2.x/units/helpers/bank_lv_currency_rates.php (.../bank_lv_currency_rates.php) (revision 15166) +++ branches/5.2.x/units/helpers/bank_lv_currency_rates.php (.../bank_lv_currency_rates.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $xml = $curl_helper->Send($this->RateSource); Index: branches/5.2.x/units/helpers/currency_rates.php =================================================================== diff -u -N -r15367 -r16516 --- branches/5.2.x/units/helpers/currency_rates.php (.../currency_rates.php) (revision 15367) +++ branches/5.2.x/units/helpers/currency_rates.php (.../currency_rates.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('lang.current'); - /* @var $language LanguagesItem */ $decimal_separator = $language->GetDBField('DecimalPoint'); } @@ -126,8 +126,8 @@ function StoreRates($currencies=null) { + /** @var kDBItem $curr_object */ $curr_object = $this->Application->recallObject('curr', null, Array ('skip_autoload' => true)); - /* @var $curr_object kDBItem */ if ($currencies) { if (!is_array($currencies)) { Index: branches/5.2.x/units/brackets/brackets_event_handler.php =================================================================== diff -u -N -r15149 -r16516 --- branches/5.2.x/units/brackets/brackets_event_handler.php (.../brackets_event_handler.php) (revision 15149) +++ branches/5.2.x/units/brackets/brackets_event_handler.php (.../brackets_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('s'); - /* @var $shipping_object kDBItem */ + /** @var LanguagesItem $lang_object */ $lang_object = $this->Application->recallObject('lang.current'); - /* @var $lang_object LanguagesItem */ if ( $lang_object->GetDBField('UnitSystem') == 2 && $shipping_object->GetDBField('Type') == 1 ) { $fields = Array ('Start', 'End'); + /** @var kUnitFormatter $formatter */ $formatter = $this->Application->recallObject('kUnitFormatter'); - /* @var $formatter kUnitFormatter */ foreach ($fields as $field) { $object->SetFieldOption($field, 'formatter', 'kUnitFormatter'); @@ -74,11 +74,11 @@ function prepareBrackets($event) { + /** @var LanguagesItem $lang_object */ $lang_object = $this->Application->recallObject('lang.current'); - /* @var $lang_object LanguagesItem */ + /** @var kDBItem $shipping_object */ $shipping_object = $this->Application->recallObject('s'); - /* @var $shipping_object kDBItem */ if ( $lang_object->GetDBField('UnitSystem') != 2 || $shipping_object->GetDBField('Type') != 1 ) { return; @@ -158,8 +158,8 @@ */ protected function &getHelper($event, $event_readonly = false) { + /** @var kDBItem $shipping_object */ $shipping_object = $this->Application->recallObject('s'); - /* @var $shipping_object kDBItem */ $default_start = $shipping_object->GetDBField('Type') == 1 ? 0 : 1; @@ -168,8 +168,8 @@ $event->redirect = false; } + /** @var kBracketsHelper $brackets_helper */ $brackets_helper = $this->Application->recallObject('BracketsHelper'); - /* @var $brackets_helper kBracketsHelper */ $brackets_helper->InitHelper('Start', 'End', Array (), $default_start); @@ -187,8 +187,8 @@ { parent::OnBeforeItemUpdate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $linked_info = $object->getLinkedInfo(); $object->SetDBField($linked_info['ParentTableKey'], $linked_info['ParentId']); @@ -204,11 +204,11 @@ */ function OnPreSaveBrackets($event) { + /** @var LanguagesItem $lang_object */ $lang_object = $this->Application->recallObject('lang.current'); - /* @var $lang_object LanguagesItem */ + /** @var kDBItem $shipping_object */ $shipping_object = $this->Application->recallObject('s'); - /* @var $shipping_object kDBItem */ if ( $lang_object->GetDBField('UnitSystem') == 2 && $shipping_object->GetDBField('Type') == 1 ) { $item_info = $this->Application->GetVar($event->getPrefixSpecial()); Index: branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php =================================================================== diff -u -N -r16015 -r16516 --- branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php (.../shipping_costs_event_handler.php) (revision 16015) +++ branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php (.../shipping_costs_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $zones_object = $this->Application->recallObject('z'); @@ -172,11 +172,11 @@ */ function OnClearAll($event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ + /** @var kDBItem $zones_object */ $zones_object = $this->Application->recallObject('z'); - /* @var $zones_object kDBItem */ $sql = 'SELECT ZoneID FROM ' . $zones_object->TableName . ' @@ -202,11 +202,11 @@ protected function customProcessing(kEvent $event, $type) { if ( $type == 'before' && $this->Application->GetVar('sc') ) { + /** @var kDBItem $shipping_obj */ $shipping_obj = $this->Application->recallObject('s'); - /* @var $shipping_obj kDBItem */ + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $zero_if_empty = $shipping_obj->GetDBField('ZeroIfEmpty'); @@ -247,17 +247,17 @@ $id = $event->getEventParam('id'); + /** @var kDBItem $object */ $object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix); - /* @var $object kDBItem */ $object->SwitchToTemp(); $object->Load($id); + /** @var kDBItem $shipping_obj */ $shipping_obj = $this->Application->recallObject('s'); - /* @var $shipping_obj kDBItem */ + /** @var LanguagesItem $lang_object */ $lang_object = $this->Application->recallObject('lang.current'); - /* @var $lang_object LanguagesItem */ // by weight and US/UK system - we need to store recalculated price per Kg cause shipping calculation is done per Kg! if ( $shipping_obj->GetDBField('Type') == 1 && $lang_object->GetDBField('UnitSystem') == 2 ) { @@ -280,17 +280,17 @@ $id = $event->getEventParam('id'); + /** @var kDBItem $object */ $object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix); - /* @var $object kDBItem */ $object->SwitchToTemp(); $object->Load($id); + /** @var kDBItem $shipping_obj */ $shipping_obj = $this->Application->recallObject('s'); - /* @var $shipping_obj kDBItem */ + /** @var LanguagesItem $lang_object */ $lang_object = $this->Application->recallObject('lang.current'); - /* @var $lang_object LanguagesItem */ // by weight and US/UK system - we need to store recalculated price per Kg cause shipping calculation is done per Kg! if ( $shipping_obj->GetDBField('Type') == 1 && $lang_object->GetDBField('UnitSystem') == 2 ) { Index: branches/5.2.x/units/gift_certificates/gift_certificates_eh.php =================================================================== diff -u -N -r15605 -r16516 --- branches/5.2.x/units/gift_certificates/gift_certificates_eh.php (.../gift_certificates_eh.php) (revision 15605) +++ branches/5.2.x/units/gift_certificates/gift_certificates_eh.php (.../gift_certificates_eh.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ $exp_date = adodb_mktime(); $default_duration = $this->Application->ConfigValue('Comm_DefaultCouponDuration'); @@ -85,8 +85,8 @@ $this->itemChanged($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $object->SetDBField('Debit', $object->GetDBField('Amount')); } @@ -98,8 +98,8 @@ */ function itemChanged($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $amount = abs($object->GetDBField('Amount')); $debit = abs($object->GetDBField('Debit')); @@ -117,8 +117,8 @@ $object->setRequired('RecipientEmail', false); } + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ if ( !$cs_helper->CountryHasStates($object->GetDBField('RecipientCountry')) ) { $object->setRequired('RecipientState', false); @@ -151,8 +151,8 @@ return ; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ // get object id by unique field Code $sql = 'SELECT ' . $object->IDField . ' @@ -175,8 +175,8 @@ return ; } + /** @var kDBItem $object */ $object = $event->getObject( Array ('skip_autoload' => true) ); - /* @var $object kDBItem */ foreach ($ids as $id) { $object->Load($id); 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 @@ 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']); Index: branches/5.2.x/units/gateways/gw_classes/ideal_nl.php =================================================================== diff -u -N -r15854 -r16516 --- branches/5.2.x/units/gateways/gw_classes/ideal_nl.php (.../ideal_nl.php) (revision 15854) +++ branches/5.2.x/units/gateways/gw_classes/ideal_nl.php (.../ideal_nl.php) (revision 16516) @@ -1,6 +1,6 @@ Application->StoreVar('gw_success_template',$tag_params['return_template']); $this->Application->StoreVar('gw_cancel_template',$tag_params['cancel_template']); + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $banks = $curl_helper->Send($gw_params['request_url'].'?a=banklist'); + /** @var kXMLHelper $parser */ $parser = $this->Application->recallObject('kXMLHelper'); - /* @var $parser kXMLHelper */ $bank_data =& $parser->Parse($banks); $bank_data->FindChild('response'); @@ -84,14 +84,14 @@ $fields['returnurl'] = $this->getNotificationUrl() . '?order_id='.$item_data['OrderId']; $fields['reporturl'] = $this->getNotificationUrl() . '?mode=report&order_id='.$item_data['OrderId']; + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $curl_helper->SetRequestData($fields); $transaction_xml = $curl_helper->Send($gw_params['request_url']); + /** @var kXMLHelper $parser */ $parser = $this->Application->recallObject('kXMLHelper'); - /* @var $parser kXMLHelper */ $trans_data =& $parser->Parse($transaction_xml); $transaction_id = $trans_data->FindChildValue('transaction_id'); $url = $trans_data->FindChildValue('url'); @@ -131,14 +131,14 @@ $fields['transaction_id'] = $this->Application->GetVar('transaction_id'); $fields['bank_id'] = $this->Application->GetVar('ideal_nl_bank_id'); + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $curl_helper->SetRequestData($fields); $check_xml = $curl_helper->Send($gw_params['request_url']); + /** @var kXMLHelper $parser */ $parser = $this->Application->recallObject('kXMLHelper'); - /* @var $parser kXMLHelper */ $trans_data =& $parser->Parse($check_xml); $response = $trans_data->FindChild('order'); Index: branches/5.2.x/units/payment_type_currencies/payment_type_currencies_event_handler.php =================================================================== diff -u -N -r15149 -r16516 --- branches/5.2.x/units/payment_type_currencies/payment_type_currencies_event_handler.php (.../payment_type_currencies_event_handler.php) (revision 15149) +++ branches/5.2.x/units/payment_type_currencies/payment_type_currencies_event_handler.php (.../payment_type_currencies_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $pt_id = $this->Application->GetVar('pt_id'); Index: branches/5.2.x/units/coupons/coupons_event_handler.php =================================================================== diff -u -N -r16015 -r16516 --- branches/5.2.x/units/coupons/coupons_event_handler.php (.../coupons_event_handler.php) (revision 16015) +++ branches/5.2.x/units/coupons/coupons_event_handler.php (.../coupons_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ CallSubEvent('OnNew'); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->setCloningRequired($object); $clone_count = $this->Application->RecallVar('CoupLastCloneCount'); @@ -75,8 +75,8 @@ { parent::OnBeforeClone($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->SetNewCode($object); @@ -96,8 +96,8 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject( Array ('skip_autoload' => true) ); - /* @var $object kDBItem */ $this->setCloningRequired($object); @@ -112,8 +112,8 @@ return ; } + /** @var kTempTablesHandler $temp */ $temp = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); - /* @var $temp kTempTablesHandler */ $original_coupon_ids = $this->getSelectedIDs($event, true); $clone_count = $object->GetDBField('CouponCount'); @@ -179,8 +179,8 @@ { parent::OnPreCreate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $exp_date = adodb_mktime(); $default_duration = $this->Application->ConfigValue('Comm_DefaultCouponDuration'); @@ -227,8 +227,8 @@ */ function itemChanged($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $object->SetDBField('Amount', abs($object->GetDBField('Amount'))); } Index: branches/5.2.x/units/pricing/pricing_tag_processor.php =================================================================== diff -u -N -r15156 -r16516 --- branches/5.2.x/units/pricing/pricing_tag_processor.php (.../pricing_tag_processor.php) (revision 15156) +++ branches/5.2.x/units/pricing/pricing_tag_processor.php (.../pricing_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CurrencyRates'); - /* @var $converter CurrencyRates */ $price = $converter->Convert($price, 'PRIMARY', $iso); @@ -94,8 +94,8 @@ usort($brackets, 'pr_bracket_comp'); + /** @var kDBItem $dummy */ $dummy = $this->Application->recallObject($this->Prefix.'.-dummy', null, array('skip_autoload' => true)); - /* @var $dummy kDBItem */ foreach($brackets as $id => $values) { Index: branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php =================================================================== diff -u -N -r15149 -r16516 --- branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php (.../affiliate_plans_brackets_event_handler.php) (revision 15149) +++ branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php (.../affiliate_plans_brackets_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ $linked_info = $object->getLinkedInfo(); $object->SetDBField($linked_info['ParentTableKey'], $linked_info['ParentId']); + /** @var kBracketsHelper $brackets_helper */ $brackets_helper = $this->Application->recallObject('BracketsHelper'); - /* @var $brackets_helper kBracketsHelper */ $brackets_helper->InitHelper('FromAmount', 'ToAmount', Array ('Percent' => '')); $brackets_helper->replaceInfinity($event); @@ -114,8 +114,8 @@ */ function OnPreSaveBrackets($event) { + /** @var kBracketsHelper $brackets_helper */ $brackets_helper = $this->Application->recallObject('BracketsHelper'); - /* @var $brackets_helper kBracketsHelper */ $brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') ); $brackets_helper->OnPreSaveBrackets($event); Index: branches/5.2.x/units/taxes/taxes_event_handler.php =================================================================== diff -u -N -r15540 -r16516 --- branches/5.2.x/units/taxes/taxes_event_handler.php (.../taxes_event_handler.php) (revision 15540) +++ branches/5.2.x/units/taxes/taxes_event_handler.php (.../taxes_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $zone_object kDBItem */ if ( $type == 'after' ) { + /** @var kDBItem $dst_object */ $dst_object = $this->Application->recallObject('taxdst'); - /* @var $dst_object kDBItem */ if ( $event->Name == 'OnUpdate' ) { $sql = 'DELETE FROM ' . $dst_object->TableName . ' @@ -239,8 +239,8 @@ function OnCountryChange($event) { + /** @var kDBItem $destinations */ $destinations = $this->Application->recallObject('taxdst'); - /* @var $destinations kDBItem */ $queryDel="DELETE FROM ".$destinations->TableName." WHERE TaxZoneId=".(int)$this->Application->GetVar('tax_id'); $this->Conn->Query($queryDel); Index: branches/5.2.x/units/orders/orders_item.php =================================================================== diff -u -N -r16242 -r16516 --- branches/5.2.x/units/orders/orders_item.php (.../orders_item.php) (revision 16242) +++ branches/5.2.x/units/orders/orders_item.php (.../orders_item.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $shipping_country_id = $cs_helper->getCountryStateId($this->GetDBField('ShippingCountry'), DESTINATION_TYPE_COUNTRY); $shipping_state_id = $cs_helper->getCountryStateId($this->GetDBField('ShippingState'), DESTINATION_TYPE_STATE); @@ -292,8 +292,8 @@ return; } + /** @var kDBItem $gc */ $gc = $this->Application->recallObject('gc', null, Array('skip_autoload' => true)); - /* @var $gc kDBItem */ $gc->Load($gc_id); @@ -333,8 +333,8 @@ { $gc_id = $this->GetDBField('GiftCertificateId'); + /** @var kDBItem $gc */ $gc = $this->Application->recallObject('gc', null, Array('skip_autoload' => true)); - /* @var $gc kDBItem */ $gc->Load($gc_id); Index: branches/5.2.x/units/discount_items/discount_items_tag_processor.php =================================================================== diff -u -N -r15156 -r16516 --- branches/5.2.x/units/discount_items/discount_items_tag_processor.php (.../discount_items_tag_processor.php) (revision 15156) +++ branches/5.2.x/units/discount_items/discount_items_tag_processor.php (.../discount_items_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBList */ if ($object->GetDBField('ItemType') == 2) { $cat_object = $this->Application->recallObject('c'); Index: branches/5.2.x/units/orders/order_manager.php =================================================================== diff -u -N -r16035 -r16516 --- branches/5.2.x/units/orders/order_manager.php (.../order_manager.php) (revision 16035) +++ branches/5.2.x/units/orders/order_manager.php (.../order_manager.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('orditems.-item', null, Array('skip_autoload' => true)); - /* @var $order_item kDBItem */ foreach ($this->operations as $operation) { $item = $this->getOrderItemByOperation($operation); @@ -377,8 +377,8 @@ */ protected function getProductField($product_id, $field) { + /** @var kCatDBItem $product */ $product = $this->Application->recallObject('p', null, Array ('skip_autoload' => true)); - /* @var $product kCatDBItem */ if ( !$product->isLoaded() || ($product->GetID() != $product_id) ) { $product->Load($product_id); Index: branches/5.2.x/units/helpers/frny_currency_rates.php =================================================================== diff -u -N -r15166 -r16516 --- branches/5.2.x/units/helpers/frny_currency_rates.php (.../frny_currency_rates.php) (revision 15166) +++ branches/5.2.x/units/helpers/frny_currency_rates.php (.../frny_currency_rates.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ for($i = 0; $i < 10; $i++) { Index: branches/5.2.x/units/files/files_event_handler.php =================================================================== diff -u -N -r15149 -r16516 --- branches/5.2.x/units/files/files_event_handler.php (.../files_event_handler.php) (revision 15149) +++ branches/5.2.x/units/files/files_event_handler.php (.../files_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBList */ switch ($event->Special) { case 'downl': @@ -80,8 +80,8 @@ $this->itemChanged($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $parent_info = $object->getLinkedInfo($event->Special); @@ -105,8 +105,8 @@ */ function itemChanged($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( $object->GetDBField('IsPrimary') ) { $parent_info = $object->getLinkedInfo($event->Special); @@ -134,8 +134,8 @@ $ids = $this->StoreSelectedIDs($event); $id = array_shift($ids); + /** @var kDBItem $object */ $object = $event->getObject( Array('skip_autoload' => true) ); - /* @var $object kDBItem */ $object->Load($id); @@ -156,8 +156,8 @@ if ( $event->Name == 'OnMassDelete' && $type == 'before' ) { $ids = $event->getEventParam('ids'); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $parent_info = $object->getLinkedInfo($event->Special); Index: branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php =================================================================== diff -u -N -r15141 -r16516 --- branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php (.../google_checkout_shippings.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_shippings.php (.../google_checkout_shippings.php) (revision 16516) @@ -1,6 +1,6 @@ Conn->GetOne($sql); + /** @var OrdersItem $order */ $order = $application->recallObject('ord', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $gw_data = $order->getGatewayData($payment_type_id); $application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); + + /** @var kGWGoogleCheckout $gateway_object */ $gateway_object = $application->recallObject( $gw_data['ClassName'] ); - /* @var $gateway_object kGWGoogleCheckout */ $gateway_object->processNotification($gw_data['gw_params'], 'shippings'); Index: branches/5.2.x/units/products/products_event_handler.php =================================================================== diff -u -N -r16197 -r16516 --- branches/5.2.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 16197) +++ branches/5.2.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ $product_approve_events = Array ( 2 => 'p:OnSubscriptionApprove', @@ -107,8 +107,8 @@ */ function InventoryAction($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $field_values = $this->getSubmittedFields($event); $object->SetFieldsFromHash($field_values); @@ -327,8 +327,8 @@ { parent::OnBeforeDeleteFromLive($event); + /** @var kCatDBItem $product */ $product = $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true)); - /* @var $product kCatDBItem */ $product->SwitchToLive(); $id = $event->getEventParam('id'); @@ -338,8 +338,8 @@ return ; } + /** @var kCatDBItem $temp */ $temp = $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true)); - /* @var $temp kCatDBItem */ $temp->SwitchToTemp(); $temp->Load($id); @@ -394,8 +394,8 @@ { parent::onPreCreate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $object->SetDBField('Type', $this->Application->GetVar($event->getPrefixSpecial(true) . '_new_type')); } @@ -414,8 +414,8 @@ $event->CallSubEvent('OnPreSave'); $this->LoadItem($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $from_type = $object->GetDBField('Type'); if ( $event->status == kEvent::erSUCCESS ) { @@ -510,8 +510,8 @@ $except_types = $event->getEventParam('except'); $except_types = $except_types ? explode(',', $except_types) : Array (); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $type_clauses = parent::getTypeClauses($event); @@ -647,8 +647,8 @@ $object->removeFilter('category_filter'); $object->AddGroupByField('%1$s.ProductId'); + /** @var ProductsItem $object_product */ $object_product = $this->Application->recallObject($event->Prefix); - /* @var $object_product ProductsItem */ $content_ids_array = $object_product->GetPackageContentIds(); @@ -691,8 +691,8 @@ $event->SetRedirectParam('pass', 'all,p'); $event->redirect = $this->Application->GetVar('success_template'); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $user_id = $this->Application->RecallVar('user_id'); @@ -762,7 +762,7 @@ { // used for error reporting only -> rewrite code + theme (by Alex) $object = $this->Application->recallObject('u', null, Array('skip_autoload' => true)); // TODO: change theme too - /* @var $object kDBItem */ + /** @var kDBItem $object */ $friend_email = $this->Application->GetVar('friend_email'); $friend_name = $this->Application->GetVar('friend_name'); @@ -871,8 +871,8 @@ */ function OnDeleteListingType($event) { + /** @var kDBItem $listing_type */ $listing_type = $event->MasterEvent->getObject(); - /* @var $listing_type kDBItem */ $product_id = $listing_type->GetDBField('VirtualProductId'); @@ -957,8 +957,8 @@ $item_data = unserialize($field_values['ItemData']); $package_content_ids = $item_data['PackageContent']; + /** @var ProductsItem $object_item */ $object_item = $this->Application->recallObject('p.packageitem', null, array ('skip_autoload' => true)); - /* @var $object_item ProductsItem */ foreach ($package_content_ids as $package_item_id) { $object_field_values = array (); @@ -1037,8 +1037,8 @@ */ function _updateProductPrice($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $price = $object->GetDBField('Price'); @@ -1074,8 +1074,8 @@ */ function setPrimaryPrice($product_id, $price, $additional_fields = Array()) { + /** @var kDBItem $pr_object */ $pr_object = $this->Application->recallObject('pr.-item', null, Array('skip_autoload' => true) ); - /* @var $pr_object kDBItem */ $pr_object->Load( Array('ProductId' => $product_id, 'IsPrimary' => 1) ); @@ -1143,8 +1143,8 @@ { parent::OnAfterItemLoad($event); + /** @var ProductsItem $object */ $object = $event->getObject(); - /* @var $object ProductsItem */ $a_pricing = $object->getPrimaryPricing(); if ( !$a_pricing ) { @@ -1200,8 +1200,8 @@ // update current package content with selected products + /** @var ProductsItem $object */ $object = $event->getObject(); - /* @var $object ProductsItem */ $product_ids = $selected_ids['p'] ? explode(',', $selected_ids['p']) : Array(); @@ -1230,8 +1230,8 @@ { //$this->Application->SetVar('p_mode', 't'); + /** @var ProductsItem $object */ $object = $event->getObject(); - /* @var $object ProductsItem */ $content_ids = $object->GetPackageContentIds(); @@ -1331,8 +1331,8 @@ { parent::OnBeforeItemDelete($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $sql = 'SELECT COUNT(*) FROM ' . TABLE_PREFIX . 'Products @@ -1372,16 +1372,16 @@ { parent::setCustomExportColumns($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->setPrimaryPrice($object->GetID(), (double)$object->GetDBField('Price'), Array ('Cost' => (double)$object->GetDBField('Cost'))); } function OnPreSaveAndOpenPopup($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->RemoveRequiredFields($object); $event->CallSubEvent('OnPreSave'); @@ -1418,8 +1418,8 @@ if ( $this->Application->isAdminUser ) { // we may get product id out of OrderItem, if it exists + /** @var OrdersItem $ord_item */ $ord_item = $this->Application->recallObject('orditems', null, Array ('raise_warnings' => 0)); - /* @var $ord_item OrdersItem */ if ( $ord_item->GetDBField('ProductId') ) { $passed = $ord_item->GetDBField('ProductId'); Index: branches/5.2.x/units/gift_certificates/gift_certificates_tp.php =================================================================== diff -u -N -r15156 -r16516 --- branches/5.2.x/units/gift_certificates/gift_certificates_tp.php (.../gift_certificates_tp.php) (revision 15156) +++ branches/5.2.x/units/gift_certificates/gift_certificates_tp.php (.../gift_certificates_tp.php) (revision 16516) @@ -1,6 +1,6 @@ getPrefixSpecial().'_id'] = $this->Application->RecallVar('print_certificate_id'); $this->Application->RemoveVar('print_certificate_id'); + /** @var kMainTagProcessor $main_processor */ $main_processor = $this->Application->recallTagProcessor('m'); - /* @var $main_processor kMainTagProcessor */ return $main_processor->Link($params); } Index: branches/5.2.x/units/product_options/product_options_event_handler.php =================================================================== diff -u -N -r15244 -r16516 --- branches/5.2.x/units/product_options/product_options_event_handler.php (.../product_options_event_handler.php) (revision 15244) +++ branches/5.2.x/units/product_options/product_options_event_handler.php (.../product_options_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getEventParam('selectable_only'); if ( $selectable_only ) { + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $object->addFilter('types_filter', 'OptionType IN (1,3,6)'); } Index: branches/5.2.x/units/currencies/currencies_event_handler.php =================================================================== diff -u -N -r15149 -r16516 --- branches/5.2.x/units/currencies/currencies_event_handler.php (.../currencies_event_handler.php) (revision 15149) +++ branches/5.2.x/units/currencies/currencies_event_handler.php (.../currencies_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ $object->SetDBField('IsPrimary', 1); $object->Update(); @@ -90,8 +90,8 @@ { parent::OnBeforeItemUpdate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( $object->GetDBField('IsPrimary') && $object->Validate() ) { $sql = 'UPDATE ' . $this->Application->getUnitOption($this->Prefix, 'TableName') . ' @@ -124,8 +124,8 @@ { parent::SetCustomQuery($event); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ if ( $event->Special == 'active' ) { $object->addFilter('status_filter', '%1$s.Status = 1'); @@ -137,8 +137,8 @@ // site domain currency picker if ( $event->Special == 'selected' || $event->Special == 'available' ) { + /** @var EditPickerHelper $edit_picker_helper */ $edit_picker_helper = $this->Application->recallObject('EditPickerHelper'); - /* @var $edit_picker_helper EditPickerHelper */ $edit_picker_helper->applyFilter($event, 'Currencies'); $object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE); @@ -208,8 +208,8 @@ $rates->GetRatesData(); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $iso = $object->GetDBField('ISO'); $rates->StoreRates($iso); Index: branches/5.2.x/units/gateways/gw_classes/authorizenet.php =================================================================== diff -u -N -r15141 -r16516 --- branches/5.2.x/units/gateways/gw_classes/authorizenet.php (.../authorizenet.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_classes/authorizenet.php (.../authorizenet.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $post_fields['x_country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] ); $post_fields['x_cust_id'] = $item_data['PortalUserId']; $post_fields['x_invoice_num'] = $item_data['OrderNumber']; $post_fields['x_description'] = 'Invoice #'.$item_data['OrderNumber']; $post_fields['x_email_customer'] = 'FALSE'; + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $curl_helper->SetPostData($post_fields); $this->gw_responce = $curl_helper->Send($gw_params['submit_url']); @@ -104,8 +104,8 @@ if( $this->IsTestMode() ) $post_fields['x_test_request'] = 'True'; + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $curl_helper->SetPostData($post_fields); $this->gw_responce = $curl_helper->Send($gw_params['submit_url']); Index: branches/5.2.x/units/coupon_items/coupon_items_tag_processor.php =================================================================== diff -u -N -r15156 -r16516 --- branches/5.2.x/units/coupon_items/coupon_items_tag_processor.php (.../coupon_items_tag_processor.php) (revision 15156) +++ branches/5.2.x/units/coupon_items/coupon_items_tag_processor.php (.../coupon_items_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBList */ if ($object->GetDBField('ItemType') == 2) { $cat_object = $this->Application->recallObject('c'); Index: branches/5.2.x/units/orders/orders_tag_processor.php =================================================================== diff -u -N -r16378 -r16516 --- branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 16378) +++ branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ if ( $object->GetDBField('Status') != ORDER_STATUS_INCOMPLETE || $object->GetID() == FAKE_ORDER_ID ) { return 0; } + /** @var kDBList $object */ $object = $this->Application->recallObject('orditems', 'orditems_List'); - /* @var $object kDBList */ $object->Query(); @@ -242,8 +242,8 @@ $o = ''; $limitations_cache = Array (); + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $ord_id = $object->GetID(); $oi_table = $this->Application->getUnitOption('orditems', 'TableName'); @@ -435,8 +435,8 @@ */ function AddressValid($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $address_type = isset($params['type']) ? strtolower($params['type']) : 'shipping'; $address_type = ucfirst($address_type); @@ -856,19 +856,19 @@ } if ( isset($params['user_prefix']) ) { + /** @var kDBItem $user */ $user = $this->Application->recallObject($params['user_prefix']); - /* @var $user kDBItem */ } else { + /** @var kDBItem $user */ $user = $this->Application->recallObject('u', null, Array ('skip_autoload' => true)); - /* @var $user kDBItem */ } + /** @var OrdersItem $order */ $order = $this->Application->recallObject($this->Prefix . '.last'); - /* @var $order OrdersItem */ + /** @var OrderHelper $order_helper */ $order_helper = $this->Application->recallObject('OrderHelper'); - /* @var $order_helper OrderHelper */ $user_fields = $order_helper->getUserFields($order, $params['type'] == 'billing' ? 'Billing' : 'Shipping'); @@ -878,8 +878,8 @@ } } + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $cs_helper->PopulateStates(new kEvent('u:OnBuild'), 'State', 'Country'); } @@ -1046,11 +1046,11 @@ */ function PrintOrderInfo($params) { + /** @var OrderHelper $order_helper */ $order_helper = $this->Application->recallObject('OrderHelper'); - /* @var $order_helper OrderHelper */ + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $currency = isset($params['currency']) ? $params['currency'] : 'selected'; @@ -1107,8 +1107,8 @@ function GetFormAction($params) { + /** @var OrdersItem $object */ $object = $this->getObject($params); - /* @var $object OrdersItem */ $gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null ); @@ -1120,8 +1120,8 @@ function GetFormHiddenFields($params) { + /** @var OrdersItem $object */ $object = $this->getObject($params); - /* @var $object OrdersItem */ $gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null ); @@ -1146,8 +1146,8 @@ function NeedsPlaceButton($params) { + /** @var OrdersItem $object */ $object = $this->getObject($params); - /* @var $object OrdersItem */ $gw_data = $object->getGatewayData( isset($params['payment_type_id']) ? $params['payment_type_id'] : null ); @@ -1171,8 +1171,8 @@ function ShippingType($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $shipping_info = unserialize($object->GetDBField('ShippingInfo')); @@ -1262,8 +1262,8 @@ */ protected function PrintTotals($params) { + /** @var OrdersItem $object */ $object = $this->getObject($params); - /* @var $object OrdersItem */ if ( isset($params['element_order']) ) { // TODO: implement @@ -1487,8 +1487,8 @@ */ function TotalOrderWeight($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $sql = 'SELECT SUM( IF(oi.Weight IS NULL, 0, oi.Weight * oi.Quantity) ) FROM '.TABLE_PREFIX.'OrderItems oi @@ -1505,8 +1505,8 @@ function _formatWeight($weight) { + /** @var kDBItem $regional */ $regional = $this->Application->recallObject('lang.current'); - /* @var $regional kDBItem */ switch ( $regional->GetDBField('UnitSystem') ) { case 1: @@ -1585,8 +1585,8 @@ return ''; } + /** @var OrdersItem $object */ $object = $this->getObject($params); - /* @var $object OrdersItem */ $gw_data = $object->getGatewayData($payment_type_id); @@ -1605,8 +1605,8 @@ */ function USPSLabelFound($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $full_path = USPS_LABEL_FOLDER . $object->GetDBField( $params['field'] ) . '.pdf'; @@ -1653,8 +1653,8 @@ */ protected function ContinueShoppingLink($params) { + /** @var OrderHelper $order_helper */ $order_helper = $this->Application->recallObject('OrderHelper'); - /* @var $order_helper OrderHelper */ if ( isset($params['template']) ) { $template = $params['template']; @@ -1676,8 +1676,8 @@ */ protected function AddressesTheSame($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $address_fields = Array ('To', 'Company', 'Address1', 'Address2', 'City', 'Country', 'State', 'Zip'); Index: branches/5.2.x/units/payment_type/payment_type_event_handler.php =================================================================== diff -u -N -r15540 -r16516 --- branches/5.2.x/units/payment_type/payment_type_event_handler.php (.../payment_type_event_handler.php) (revision 15540) +++ branches/5.2.x/units/payment_type/payment_type_event_handler.php (.../payment_type_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $this->StoreSelectedIDs($event); $ids = $this->getSelectedIDs($event); @@ -117,8 +117,8 @@ { parent::OnBeforeItemUpdate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $status_field = $object->getStatusField(); @@ -154,8 +154,8 @@ protected function customProcessing(kEvent $event, $type) { if ( $event->Name == 'OnMassDelete' && $type == 'before' ) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $ids_ok = Array (); $ids = $event->getEventParam('ids'); @@ -239,8 +239,8 @@ public function getPassedID(kEvent $event) { if ( $event->Special == 'auto-ord' ) { + /** @var kDBItem $main_object */ $main_object = $this->Application->recallObject('ord'); - /* @var $main_object kDBItem */ return $main_object->GetDBField('PaymentType'); } @@ -267,8 +267,8 @@ { parent::SetCustomQuery($event); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ if ( in_array($event->Special, Array ('enabled', 'selected', 'available')) || !$this->Application->isAdminUser ) { // "enabled" special or Front-End @@ -277,8 +277,8 @@ // site domain payment type picker if ( $event->Special == 'selected' || $event->Special == 'available' ) { + /** @var EditPickerHelper $edit_picker_helper */ $edit_picker_helper = $this->Application->recallObject('EditPickerHelper'); - /* @var $edit_picker_helper EditPickerHelper */ $edit_picker_helper->applyFilter($event, 'PaymentTypes'); } Index: branches/5.2.x/units/brackets/brackets_tag_processor.php =================================================================== diff -u -N -r15540 -r16516 --- branches/5.2.x/units/brackets/brackets_tag_processor.php (.../brackets_tag_processor.php) (revision 15540) +++ branches/5.2.x/units/brackets/brackets_tag_processor.php (.../brackets_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('s'); - /* @var $shipping_object kDBItem */ $default_start = ($shipping_object->GetDBField('Type') == 1) ? 0 : 1; + /** @var kBracketsHelper $brackets_helper */ $brackets_helper = $this->Application->recallObject('BracketsHelper'); - /* @var $brackets_helper kBracketsHelper */ $brackets_helper->InitHelper('Start', 'End', Array(), $default_start ); @@ -51,8 +51,8 @@ usort($brackets, Array(&$brackets_helper, 'compareBrackets')); + /** @var kDBItem $dummy */ $dummy = $this->Application->recallObject($this->Prefix.'.-dummy', null, array('skip_autoload' => true)); - /* @var $dummy kDBItem */ // performs number formatting foreach($brackets as $id => $values) Index: branches/5.2.x/units/order_items/order_items_event_handler.php =================================================================== diff -u -N -r16015 -r16516 --- branches/5.2.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 16015) +++ branches/5.2.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('p.-item', null, array('skip_autoload' => true)); - /* @var $product_object ProductsItem */ foreach ($product_ids as $product_id) { $product_object->Load($product_id); @@ -72,8 +72,8 @@ $this->Application->EventManager->openerStackPush('in-commerce/orders/order_product_edit', $url_params); } else { + /** @var OrdersEventHandler $orders_h */ $orders_h = $this->Application->recallObject('ord_EventHandler'); - /* @var $orders_h OrdersEventHandler */ // 1 for PacakgeNum - temporary solution to overcome splitting into separate sub-orders // of orders with items added through admin when approving them @@ -101,13 +101,13 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $table_info = $object->getLinkedInfo(); + /** @var OrdersItem $main_object */ $main_object = $this->Application->recallObject($table_info['ParentPrefix']); - /* @var $main_object OrdersItem */ foreach ($items_info as $id => $field_values) { $object->Clear(); // otherwise validation errors will be passed to next object @@ -169,16 +169,16 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $changed_fields = $object->GetChangedFields(); if ( $changed_fields ) { $table_info = $object->getLinkedInfo(); + /** @var OrdersItem $main_object */ $main_object = $this->Application->recallObject($table_info['ParentPrefix']); - /* @var $main_object OrdersItem */ $oi_string = $object->GetDBField('ProductId') . ':' . $object->GetDBField('OptionsSalt') . ':' . $object->GetDBField('BackOrderFlag'); @@ -301,8 +301,8 @@ { parent::OnAfterItemLoad($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $item_info = $object->GetDBField('ItemData'); @@ -325,8 +325,8 @@ { parent::SetCustomQuery($event); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $package_num = $event->getEventParam('package_num'); if ( $package_num ) { @@ -352,15 +352,15 @@ return true; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( !$object->isLoaded() ) { return true; } + /** @var kDBItem $order */ $order = $this->Application->recallObject('ord'); - /* @var $order kDBItem */ if ( $order->isLoaded() && ($order->GetID() == $object->GetDBField('OrderId')) ) { return $order->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id'); 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 @@ 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'), ','); Index: branches/5.2.x/units/taxes/taxes_tag_processor.php =================================================================== diff -u -N -r15156 -r16516 --- branches/5.2.x/units/taxes/taxes_tag_processor.php (.../taxes_tag_processor.php) (revision 15156) +++ branches/5.2.x/units/taxes/taxes_tag_processor.php (.../taxes_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ $destination_table = $this->getDestinationsTable($params); $selected_country_id = (int)$this->Application->GetVar('CountrySelector'); @@ -68,8 +68,8 @@ break; case 'has_states': + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $has_states = $cs_helper->getCountriesWithStates(); @@ -126,8 +126,8 @@ function ShowStates($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $destination_table = $this->getDestinationsTable($params); @@ -193,8 +193,8 @@ function ShowZips($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $destination_table = $this->getDestinationsTable($params); @@ -258,8 +258,8 @@ static $table_name = ''; if (!$table_name) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $table_name = $this->Application->getUnitOption('taxdst', 'TableName'); Index: branches/5.2.x/units/gateways/gw_classes/rightconnect.php =================================================================== diff -u -N -r15568 -r16516 --- branches/5.2.x/units/gateways/gw_classes/rightconnect.php (.../rightconnect.php) (revision 15568) +++ branches/5.2.x/units/gateways/gw_classes/rightconnect.php (.../rightconnect.php) (revision 16516) @@ -1,6 +1,6 @@ Application->ConfigValue('DefaultEmailSender'); + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $curl_helper->SetPostData($post_fields); $this->gw_responce = $curl_helper->Send($gw_params['submit_url']); Index: branches/5.2.x/units/shipping/shipping_event_handler.php =================================================================== diff -u -N -r15149 -r16516 --- branches/5.2.x/units/shipping/shipping_event_handler.php (.../shipping_event_handler.php) (revision 15149) +++ branches/5.2.x/units/shipping/shipping_event_handler.php (.../shipping_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ $format = '%01.' . $object->GetDBField('PrecisionAfterSep') . 'f'; // %01.2f $zero_if_empty = $object->GetDBField('ZeroIfEmpty'); + /** @var kDBItem $sc_object */ $sc_object = $this->Application->recallObject('sc', null, Array ('raise_warnings' => 0)); - /* @var $sc_object kDBItem */ // change default shipping cost values ("Costs" tab on shipping editing) based on field from "Shipping Type" $flat_options = $sc_object->GetFieldOptions('Flat'); @@ -78,16 +78,16 @@ */ function OnApplyModifier($event) { + /** @var kDBItem $cost_object */ $cost_object = $this->Application->recallObject('sc'); - /* @var $cost_object kDBItem */ + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $operation = $this->Application->GetVar('operation'); + /** @var kFormatter $formatter */ $formatter = $this->Application->recallObject('kFormatter'); - /* @var $formatter kFormatter */ $modify_by = $formatter->TypeCast($this->Application->GetVar('modify_by'), array('type'=>'float')); $cost_type = $object->GetDBField('CostType'); @@ -233,16 +233,16 @@ { parent::OnPreSaveCreated($event); + /** @var kDBItem $object */ $object = $event->getObject( Array ('skip_autoload' => true) ); - /* @var $object kDBItem */ $object->SetDBField('PortalGroups', ',' . $this->Application->ConfigValue('User_LoggedInGroup') . ','); } function UpdateGroups($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( $event->Name == 'OnPreSaveCreated' ) { $default_group = $this->Application->ConfigValue('User_LoggedInGroup'); Index: branches/5.2.x/units/helpers/order_helper.php =================================================================== diff -u -N -r16464 -r16516 --- branches/5.2.x/units/helpers/order_helper.php (.../order_helper.php) (revision 16464) +++ branches/5.2.x/units/helpers/order_helper.php (.../order_helper.php) (revision 16516) @@ -29,8 +29,8 @@ 'errors' => $errors ? unserialize($errors) : Array (), ); + /** @var kDBList $items */ $items = $this->Application->recallObject('orditems', 'orditems_List', Array ('per_page' => -1)); - /* @var $items kDBList */ $items->Query(); $items->GoFirst(); @@ -41,8 +41,8 @@ return $ret; } + /** @var kCatDBItem $product */ $product = $this->Application->recallObject('p', null, Array ('skip_autoload' => true)); - /* @var $product kCatDBItem */ $sql = $product->GetSelectSQL() . ' WHERE ' . $product->TableName . '.' . $product->IDField . ' IN (' . implode(',', $items->GetCol('ProductId')) . ')'; @@ -71,8 +71,8 @@ $row_index = $items->GetDBField('ProductId') . ':' . $items->GetDBField('OptionsSalt') . ':' . $items->GetDBField('BackOrderFlag'); + /** @var ImageHelper $image_helper */ $image_helper = $this->Application->recallObject('ImageHelper'); - /* @var $image_helper ImageHelper */ // TODO: find a way to specify thumbnail size & default image @@ -109,8 +109,8 @@ function convertCurrency($amount, $currency) { + /** @var CurrencyRates $converter */ $converter = $this->Application->recallObject('CurrencyRates'); - /* @var $converter CurrencyRates */ // convert primary currency to selected (if they are the same, converter will just return) return (float)$converter->Convert($amount, 'PRIMARY', $this->getISO($currency)); Index: branches/5.2.x/units/manufacturers/manufacturers_event_handler.php =================================================================== diff -u -N -r15149 -r16516 --- branches/5.2.x/units/manufacturers/manufacturers_event_handler.php (.../manufacturers_event_handler.php) (revision 15149) +++ branches/5.2.x/units/manufacturers/manufacturers_event_handler.php (.../manufacturers_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ Conn->GetCol($sql); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $object->addFilter('category_manufacturer_filter', $manufacturers ? '%1$s.ManufacturerId IN (' . implode(',', $manufacturers) . ')' : 'FALSE'); } @@ -93,8 +93,8 @@ { parent::OnAfterItemLoad($event); + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $cs_helper->PopulateStates($event, 'State', 'Country'); } @@ -110,8 +110,8 @@ { parent::OnBeforeItemUpdate($event); + /** @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'); @@ -128,8 +128,8 @@ { parent::OnBeforeItemCreate($event); + /** @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'); Index: branches/5.2.x/units/gateways/gw_event_handler.php =================================================================== diff -u -N -r15141 -r16516 --- branches/5.2.x/units/gateways/gw_event_handler.php (.../gw_event_handler.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_event_handler.php (.../gw_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ Install(); } Index: branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php =================================================================== diff -u -N -r15149 -r16516 --- branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php (.../affiliate_payments_event_handler.php) (revision 15149) +++ branches/5.2.x/units/affiliate_payments/affiliate_payments_event_handler.php (.../affiliate_payments_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getLinkedInfo(); + /** @var kDBItem $parent_object */ $parent_object = $this->Application->recallObject($parent_info['ParentPrefix']); - /* @var $parent_object kDBItem */ $options = $object->GetFieldOptions('PaymentTypeId'); @@ -61,11 +61,11 @@ { parent::OnNew($event); + /** @var kDBItem $affiliate */ $affiliate = $this->Application->recallObject('affil'); - /* @var $affiliate kDBItem */ + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $object->SetDBField('Amount', $affiliate->GetDBField('AmountToPay')); $object->SetDBField('AffiliateId', $affiliate->GetID()); @@ -82,8 +82,8 @@ { parent::OnAfterItemCreate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $parent_info = $object->getLinkedInfo(); @@ -92,8 +92,8 @@ WHERE ' . $parent_info['ParentTableKey'] . ' = ' . $parent_info['ParentId']; $payment_date = $this->Conn->GetOne($sql); + /** @var kDBItem $affiliate */ $affiliate = $this->Application->recallObject('affil'); - /* @var $affiliate kDBItem */ $affiliate->SetDBField('AmountToPay', $affiliate->GetDBField('AmountToPay') - $object->GetDBField('Amount')); $affiliate->SetDBField('LastPaymentDate_date', $payment_date); @@ -113,8 +113,8 @@ { parent::SetCustomQuery($event); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ if ( $event->Special == 'log' ) { $object->removeFilter('parent_filter'); Index: branches/5.2.x/units/orders/orders_event_handler.php =================================================================== diff -u -N -r16469 -r16516 --- branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 16469) +++ branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ Application->RecallVar($event->getPrefixSpecial(true) . '_id'); + /** @var OrdersItem $order_dummy */ $order_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); - /* @var $order_dummy OrdersItem */ foreach ($items_info as $id => $field_values) { if ( $order_session_id != $id ) { @@ -176,8 +176,8 @@ function OnQuietPreSave($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $object->IgnoreValidation = true; $event->CallSubEvent('OnPreSave'); @@ -195,21 +195,21 @@ return ; } + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ $shipping_address_id = $this->Application->GetVar('shipping_address_id'); $billing_address_id = $this->Application->GetVar('billing_address_id'); if ($shipping_address_id || $billing_address_id) { + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ + /** @var AddressesItem $address */ $address = $this->Application->recallObject('addr.-item','addr', Array('skip_autoload' => true)); - /* @var $address AddressesItem */ + /** @var AddressesList $addr_list */ $addr_list = $this->Application->recallObject('addr', 'addr_List', Array('per_page'=>-1, 'skip_counting'=>true) ); - /* @var $addr_list AddressesList */ $addr_list->Query(); } @@ -301,8 +301,8 @@ */ function updateUserID($order_id, $event) { + /** @var UsersItem $user */ $user = $this->Application->recallObject('u.current'); - /* @var $user UsersItem */ $affiliate_id = $this->isAffiliate( $user->GetID() ); @@ -327,8 +327,8 @@ function isAffiliate($user_id) { + /** @var kDBItem $affiliate_user */ $affiliate_user = $this->Application->recallObject('affil.-item', null, Array('skip_autoload' => true) ); - /* @var $affiliate_user kDBItem */ $affiliate_user->Load($user_id, 'PortalUserId'); @@ -383,8 +383,8 @@ function PrepareCoupons($event, &$order) { + /** @var kDBList $order_items */ $order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) ); - /* @var $order_items kDBList */ $order_items->linkToParent($order->Special); $order_items->Query(); @@ -399,8 +399,9 @@ if (isset($item_data['AssignedCoupon']) && $item_data['AssignedCoupon']) { $coupon_id = $item_data['AssignedCoupon']; // clone coupon, get new coupon ID + /** @var kDBItem $coupon */ $coupon = $this->Application->recallObject('coup',null,array('skip_autload' => true)); - /* @var $coupon kDBItem */ + $coupon->Load($coupon_id); if (!$coupon->isLoaded()) continue; @@ -415,7 +416,7 @@ } } - /* @var $order OrdersItem */ + /** @var OrdersItem $order */ if ($assigned_coupons) { $comments = $order->GetDBField('AdminComment'); if ($comments) $comments .= "\r\n"; @@ -445,8 +446,8 @@ $this->ReserveItems($event); + /** @var OrdersItem $order */ $order = $event->getObject(); - /* @var $order OrdersItem */ $charge_result = $this->ChargeOrder($order); @@ -464,8 +465,8 @@ } // call CompleteOrder events for items in order BEFORE SplitOrder (because ApproveEvents are called there) + /** @var kDBList $order_items */ $order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) ); - /* @var $order_items kDBList */ $order_items->linkToParent($order->Special); $order_items->Query(true); @@ -539,8 +540,8 @@ */ function setBillingAddress($event) { + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ if ( $object->HasTangibleItems() ) { if ( $this->Application->GetVar('same_address') ) { @@ -585,8 +586,8 @@ function OnContinueShopping($event) { + /** @var OrderHelper $order_helper */ $order_helper = $this->Application->recallObject('OrderHelper'); - /* @var $order_helper OrderHelper */ $template = $this->Application->GetVar('continue_shopping_template'); @@ -602,8 +603,8 @@ { $this->OnUpdateCart($event); if ( !$event->getEventParam('RecalculateChangedCart') ) { + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ if ( !$object->HasTangibleItems() ) { $object->SetDBField('ShippingTo', ''); @@ -680,8 +681,8 @@ if ( $items_info ) { list($id, $field_values) = each($items_info); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $payment_type_id = $object->GetDBField('PaymentType'); @@ -708,8 +709,8 @@ */ protected function OnCancelRecurring($event) { + /** @var OrdersItem $order */ $order = $event->getObject(); - /* @var $order OrdersItem */ $order->SetDBField('IsRecurringBilling', 0); $order->Update(); @@ -730,8 +731,8 @@ { parent::OnAfterItemUpdate($event); + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ $cvv2 = $object->GetDBField('PaymentCVV2'); @@ -766,8 +767,8 @@ } else { // strange: recalculate total amount on error + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ $object->SetDBField('TotalAmount', $object->getTotalAmount()); } @@ -784,16 +785,16 @@ return ; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ + /** @var kDBList $addr_list */ $addr_list = $this->Application->recallObject('addr', 'addr_List', Array ('per_page' => -1, 'skip_counting' => true)); - /* @var $addr_list kDBList */ $addr_list->Query(); + /** @var AddressesItem $address_dummy */ $address_dummy = $this->Application->recallObject('addr.-item', null, Array ('skip_autoload' => true)); - /* @var $address_dummy AddressesItem */ $address_prefixes = Array ('Billing', 'Shipping'); $address_fields = Array ( @@ -851,8 +852,8 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ // 1. delete given order item by id $delete_id = $this->Application->GetVar('delete_id'); @@ -882,8 +883,8 @@ // 4. remove "orditems" object of kDBItem class, since getOrderInfo uses kDBList object under same prefix $this->Application->removeObject('orditems'); + /** @var OrderHelper $order_helper */ $order_helper = $this->Application->recallObject('OrderHelper'); - /* @var $order_helper OrderHelper */ $event->status = kEvent::erSTOP; $currency = $this->Application->GetVar('currency', 'selected'); @@ -938,8 +939,8 @@ $item_data = $default_item_data; + /** @var ProductsItem $product */ $product = $this->Application->recallObject('p', null, Array('skip_autoload' => true)); - /* @var $product ProductsItem */ $product->Load($item_id); @@ -969,8 +970,8 @@ { $package_content_ids = $product->GetPackageContentIds(); + /** @var ProductsItem $product_package_item */ $product_package_item = $this->Application->recallObject('p.-packageitem'); - /* @var $product_package_item ProductsItem */ $package_item_data = array(); @@ -1123,8 +1124,8 @@ if (!$options) return; + /** @var kDBItem $ord_item */ $ord_item = $this->Application->recallObject('orditems.-opt', null, Array ('skip_autoload' => true)); - /* @var $ord_item kDBItem */ $ord_item->Load($this->Application->GetVar('orditems_id')); @@ -1186,11 +1187,11 @@ return ; } + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ + /** @var kDBItem $coupon */ $coupon = $this->Application->recallObject('coup', null, Array ('skip_autoload' => true)); - /* @var $coupon kDBItem */ $coupon->Load($code, 'Code'); @@ -1231,8 +1232,9 @@ $coupon->Update(); $this->Application->setUnitOption('ord', 'AutoLoad', true); + + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord'); - /* @var $order OrdersItem */ $order->SetDBField('CouponId', $coupon->GetDBField('CouponId')); $order->SetDBField('CouponName', $coupon->GetDBField('Name')); // calculated field @@ -1251,8 +1253,8 @@ */ function OnRemoveCoupon($event) { + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ $this->RemoveCoupon($object); $object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_REMOVED); @@ -1267,8 +1269,8 @@ */ function RemoveCoupon(&$object) { + /** @var kDBItem $coupon */ $coupon = $this->Application->recallObject('coup', null, Array('skip_autoload' => true)); - /* @var $coupon kDBItem */ $coupon->Load( $object->GetDBField('CouponId') ); @@ -1411,8 +1413,8 @@ // if we already know, that there is no such order, // then don't run database query, that will confirm that + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $object->Clear($id); return; @@ -1428,17 +1430,17 @@ */ function _createNewCart($event) { + /** @var kDBItem $object */ $object = $event->getObject( Array('skip_autoload' => true) ); - /* @var $object kDBItem */ $this->setNextOrderNumber($event); $object->SetDBField('Status', ORDER_STATUS_INCOMPLETE); $object->SetDBField('VisitId', $this->Application->RecallVar('visit_id') ); // get user if ( $this->Application->LoggedIn() ) { + /** @var UsersItem $user */ $user = $this->Application->recallObject('u.current'); - /* @var $user UsersItem */ $user_id = $user->GetID(); $object->SetDBField('BillingEmail', $user->GetDBField('Email')); @@ -1522,11 +1524,11 @@ */ function SetStepRequiredFields($event) { + /** @var OrdersItem $order */ $order = $event->getObject(); - /* @var $order OrdersItem */ + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); if ($items_info) { @@ -1586,8 +1588,8 @@ return; } + /** @var OrdersItem $order */ $order = $event->getObject(); - /* @var $order OrdersItem */ $ses_user = $this->Application->RecallVar('user_id'); @@ -1616,8 +1618,8 @@ { parent::OnPreCreate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->setNextOrderNumber($event); @@ -1665,8 +1667,8 @@ function OnReserveItems($event) { + /** @var kDBList $order_items */ $order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) ); - /* @var $order_items kDBList */ $order_items->linkToParent('-inv'); // force re-query, since we are updateing through orditem ITEM, not the list, and @@ -1678,16 +1680,16 @@ // query all combinations used in this order + /** @var kCatDBItem $product_object */ $product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true)); - /* @var $product_object kCatDBItem */ $product_object->SwitchToLive(); + /** @var kDBItem $order_item */ $order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true)); - /* @var $order_item kDBItem */ + /** @var kDBItem $combination_item */ $combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true)); - /* @var $combination_item kDBItem */ $combinations = $this->queryCombinations($order_items); @@ -1758,8 +1760,8 @@ $from_tab = substr($event->Name, strlen('OnResetTo')); // load values from db + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ // update values from submit $field_values = $this->getSubmittedFields($event); @@ -1947,16 +1949,16 @@ */ function restoreOrder(&$order_items) { + /** @var kCatDBItem $product_object */ $product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true)); - /* @var $product_object kCatDBItem */ $product_object->SwitchToLive(); + /** @var kDBItem $order_item */ $order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true)); - /* @var $order_item kDBItem */ + /** @var kDBItem $combination_item */ $combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true)); - /* @var $combination_item kDBItem */ $combinations = $this->queryCombinations($order_items); @@ -1985,8 +1987,8 @@ $inv_object->SetDBField('QtyInStock', $inv_object->GetDBField('QtyInStock') + $rec['QuantityReserved']); $inv_object->Update(); + /** @var ProductsEventHandler $product_h */ $product_h = $this->Application->recallObject('p_EventHandler'); - /* @var $product_h ProductsEventHandler */ if ($product_object->GetDBField('InventoryStatus') == 2) { // inventory by options, then restore changed combination values back to common $combinations array !!! @@ -2024,8 +2026,8 @@ } // process order products + /** @var kDBItem $object */ $object = $this->Application->recallObject($event->Prefix . '.-inv', null, Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); @@ -2057,15 +2059,15 @@ 'OnOrderProcess' => ORDER_STATUS_TOSHIP, ); + /** @var kDBList $order_items */ $order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) ); - /* @var $order_items kDBList */ $order_items->linkToParent('-inv'); $order_items->Query(); $order_items->GoFirst(); + /** @var OrdersItem $object */ $object = $this->Application->recallObject($event->Prefix.'.-inv'); - /* @var $object OrdersItem */ if ($object->GetDBField('OnHold')) { // any actions have no effect while on hold @@ -2113,8 +2115,8 @@ $object->SetDBField('GWResult2', $gateway_object->getGWResponce() ); if ($charge_result) { + /** @var ProductsItem $product_object */ $product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true)); - /* @var $product_object ProductsItem */ foreach ($order_items->Records as $product_item) { if (!$product_item['ProductId']) { @@ -2192,17 +2194,17 @@ $shipping_info = $object->GetDBField('ShippingInfo'); if ($shipping_info) { + /** @var ShippingQuoteCollector $quote_engine_collector */ $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector'); - /* @var $quote_engine_collector ShippingQuoteCollector */ $shipping_info = unserialize($shipping_info); $sqe_class_name = $quote_engine_collector->GetClassByType($shipping_info, 1); } // try to create usps order if (($object->GetDBField('ShippingType') == 0) && ($sqe_class_name !== false)) { + /** @var ShippingQuoteEngine $shipping_quote_engine */ $shipping_quote_engine = $this->Application->recallObject($sqe_class_name); - /* @var $shipping_quote_engine ShippingQuoteEngine */ $ret = $shipping_quote_engine->MakeOrder($object); } @@ -2411,8 +2413,8 @@ { parent::OnAfterItemLoad($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ // get user fields $user_id = $object->GetDBField('PortalUserId'); @@ -2436,8 +2438,8 @@ $object->SetDBField('PaymentCVV2', $this->Application->RecallVar('CVV2Code')); + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry'); $cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry'); @@ -2459,8 +2461,8 @@ { parent::OnBeforeItemCreate($event); + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry'); $cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry'); @@ -2477,8 +2479,8 @@ { parent::OnBeforeItemUpdate($event); + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ $old_payment_type = $object->GetOriginalField('PaymentType'); $new_payment_type = $object->GetDBField('PaymentType'); @@ -2495,8 +2497,8 @@ } } + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry'); $cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry'); @@ -2532,8 +2534,8 @@ // guess fields from "One Step Checkout" form if ( $object->GetDBField('PaymentAccount') ) { + /** @var OrderHelper $order_helper */ $order_helper = $this->Application->recallObject('OrderHelper'); - /* @var $order_helper OrderHelper */ $object->SetDBField( 'PaymentCardType', @@ -2562,11 +2564,11 @@ */ protected function createAccountFromOrder($event) { + /** @var OrdersItem $order */ $order = $event->getObject(); - /* @var $order OrdersItem */ + /** @var OrderHelper $order_helper */ $order_helper = $this->Application->recallObject('OrderHelper'); - /* @var $order_helper OrderHelper */ $user_fields = $order_helper->getUserFields($order); $user_fields['Password'] = $order->GetDBField('UserPassword_plain'); @@ -2578,8 +2580,8 @@ $this->Application->HandleEvent(new kEvent('u.register:OnCreate')); } else { + /** @var UsersItem $user */ $user = $this->Application->recallObject('u.current'); - /* @var $user UsersItem */ $user->SetFieldsFromHash($user_fields); if ( !$user->Update() ) { @@ -2600,8 +2602,8 @@ { parent::SetCustomQuery($event); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $types = $event->getEventParam('types'); if ( $types == 'myorders' || $types == 'myrecentorders' ) { @@ -2908,8 +2910,8 @@ $skip_types = Array (PRODUCT_TYPE_TANGIBLE, PRODUCT_TYPE_DOWNLOADABLE); foreach ($sub_orders as $sub_order_data) { + /** @var OrdersItem $sub_order */ $sub_order = $this->Application->recallObject('ord.-sub'.$next_sub_number, 'ord'); - /* @var $sub_order OrdersItem */ if ( $this->UseTempTables($event) && $next_sub_number == 0 ) { $sub_order =& $order; @@ -3114,16 +3116,16 @@ } // Loading product to add + /** @var kDBItem $product */ $product = $this->Application->recallObject('p.toadd', null, Array('skip_autoload' => true)); - /* @var $product kDBItem */ $product->Load($item_id); + /** @var kDBItem $object */ $object = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true)); - /* @var $object kDBItem */ + /** @var kDBItem $order */ $order = $this->Application->recallObject('ord'); - /* @var $order kDBItem */ if (!$order->isLoaded() && !$this->Application->isAdmin) { // no order was created before -> create one now @@ -3145,8 +3147,8 @@ return; } + /** @var OrderManager $manager */ $manager = $this->Application->recallObject('OrderManager'); - /* @var $manager OrderManager */ $manager->setOrder($order); $manager->addProduct($product, $event->getEventParam('ItemData'), $qty, $package_num); @@ -3166,8 +3168,8 @@ return; } + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ $shipping_total = $insurance_fee = 0; $shipping_info = $object->GetDBField('ShippingInfo') ? unserialize($object->GetDBField('ShippingInfo')) : false; @@ -3202,8 +3204,8 @@ return ; } + /** @var OrdersItem $order */ $order = $event->getObject(); - /* @var $order OrdersItem */ if ( !$order->isLoaded() ) { $this->LoadItem($event); // try to load @@ -3218,8 +3220,8 @@ return; } + /** @var OrderManager $manager */ $manager = $this->Application->recallObject('OrderManager'); - /* @var $manager OrderManager */ $manager->setOrder($order); $result = $manager->calculate(); @@ -3328,8 +3330,8 @@ */ function UpdateShippingTypes($event) { + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ $ord_id = $object->GetID(); @@ -3347,17 +3349,17 @@ $template = $this->Application->GetVar('t'); $shipping_templates = Array ('in-commerce/checkout/shipping', 'in-commerce/orders/orders_edit_shipping'); + /** @var ShippingQuoteCollector $quote_engine_collector */ $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector'); - /* @var $quote_engine_collector ShippingQuoteCollector */ foreach ($shipping_ids as $package => $id) { // try to validate $shipping_types[$package] = $last_shippings[$package][$id]; $sqe_class_name = $quote_engine_collector->GetClassByType($shipping_types, $package); if (($object->GetDBField('ShippingType') == 0) && ($sqe_class_name !== false) && in_array($template, $shipping_templates)) { + /** @var ShippingQuoteEngine $shipping_quote_engine */ $shipping_quote_engine = $this->Application->recallObject($sqe_class_name); - /* @var $shipping_quote_engine ShippingQuoteEngine */ // USPS related part // TODO: remove USPS condition from here @@ -3410,8 +3412,8 @@ function RecalculateTax($event) { + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) { return; @@ -3436,8 +3438,8 @@ function UpdateTotals($event) { + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ $object->UpdateTotals(); } @@ -3504,8 +3506,8 @@ $prefix_special = $event->Prefix.'.'.$this->getSpecialByType($order_status); + /** @var kDBList $orders_list */ $orders_list = $this->Application->recallObject($prefix_special, $event->Prefix.'_List', Array('per_page'=>-1) ); - /* @var $orders_list kDBList */ $orders_list->Query(); @@ -3529,8 +3531,8 @@ */ function OnResetToPending($event) { + /** @var kDBItem $object */ $object = $event->getObject( Array('skip_autoload' => true) ); - /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -3665,8 +3667,8 @@ $this->Application->InitParser(); $o = $this->Application->ParseBlock(array('name'=>'in-commerce/orders/orders_pdf')); + /** @var FileHelper $file_helper */ $file_helper = $this->Application->recallObject('FileHelper'); - /* @var $file_helper FileHelper */ $file_helper->CheckFolder(EXPORT_PATH); @@ -3763,8 +3765,8 @@ $fields['Number']['format'] = str_replace('%06d', '%0'.$order_number.'d', $fields['Number']['format']); $fields['SubNumber']['format'] = str_replace('%03d', '%0'.$order_sub_number.'d', $fields['SubNumber']['format']); + /** @var SiteHelper $site_helper */ $site_helper = $this->Application->recallObject('SiteHelper'); - /* @var $site_helper SiteHelper */ $fields['BillingCountry']['default'] = $site_helper->getDefaultCountry('Billing'); $fields['ShippingCountry']['default'] = $site_helper->getDefaultCountry('Shipping'); @@ -3921,8 +3923,8 @@ return true; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( !$object->isLoaded() ) { return true; @@ -3945,11 +3947,11 @@ return; } + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ + /** @var kDBItem $gift_certificate */ $gift_certificate = $this->Application->recallObject('gc', null, Array ('skip_autoload' => true)); - /* @var $gift_certificate kDBItem */ $gift_certificate->Load($code, 'Code'); @@ -3986,8 +3988,8 @@ */ function OnRemoveGiftCertificate($event) { + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ $this->RemoveGiftCertificate($object); $object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_REMOVED); @@ -4002,8 +4004,8 @@ function RecalculateGift($event) { + /** @var OrdersItem $object */ $object = $event->getObject(); - /* @var $object OrdersItem */ if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) { return ; @@ -4034,8 +4036,8 @@ ini_set('memory_limit', '300M'); ini_set('max_execution_time', '0'); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $file = $object->GetDBField('ShippingTracking') . '.pdf'; $full_path = USPS_LABEL_FOLDER . $file; @@ -4062,8 +4064,8 @@ $create_account = $this->Application->GetVar('create_account'); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $required_fields = Array ('UserPassword', 'UserPassword_plain', 'VerifyUserPassword', 'VerifyUserPassword_plain'); $object->setRequired($required_fields, $create_account); Index: branches/5.2.x/units/destinations/dst_event_handler.php =================================================================== diff -u -N -r16015 -r16516 --- branches/5.2.x/units/destinations/dst_event_handler.php (.../dst_event_handler.php) (revision 16015) +++ branches/5.2.x/units/destinations/dst_event_handler.php (.../dst_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ // creates multiple db records from single request (OnCreate event only creates 1 record) $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -67,17 +67,17 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $events = $this->Application->GetVar('events'); if ( $events['z'] == 'OnUpdate' ) { $object->SetDBField('ShippingZoneId', $this->Application->GetVar('z_id')); } + /** @var kDBItem $zone_object */ $zone_object = $this->Application->recallObject('z'); - /* @var $zone_object kDBItem */ if ( $zone_object->GetDBField('Type') == 3 ) { $object->SetDBField('StdDestId', $this->Application->GetVar('ZIPCountry')); @@ -91,11 +91,11 @@ */ function OnZoneUpdate($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ + /** @var kDBItem $zone_object */ $zone_object = $this->Application->recallObject('z'); - /* @var $zone_object kDBItem */ $zone_id = (int)$zone_object->GetID(); $zone_type = $zone_object->GetDBField('Type'); Index: branches/5.2.x/units/order_items/order_items_tag_processor.php =================================================================== diff -u -N -r16206 -r16516 --- branches/5.2.x/units/order_items/order_items_tag_processor.php (.../order_items_tag_processor.php) (revision 16206) +++ branches/5.2.x/units/order_items/order_items_tag_processor.php (.../order_items_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('ord'); - /* @var $order kDBList */ if ( $order->GetDBField('Status') != ORDER_STATUS_INCOMPLETE ) { $params['grid'] = $params['NotEditable']; @@ -32,24 +32,24 @@ function IsTangible($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ return $object->GetDBField('Type') == PRODUCT_TYPE_TANGIBLE; } function HasQty($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ return in_array($object->GetDBField('Type'), Array (PRODUCT_TYPE_TANGIBLE, 6)); } function HasDiscount($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ return (float)$object->GetDBField('ItemDiscount') ? 1 : 0; } @@ -63,16 +63,16 @@ function PrintOptions($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $item_data = @unserialize($object->GetDBField('ItemData')); $render_as = $this->SelectParam($params, 'render_as'); $block_params['name'] = $render_as; + /** @var kProductOptionsHelper $opt_helper */ $opt_helper = $this->Application->recallObject('kProductOptionsHelper'); - /* @var $opt_helper kProductOptionsHelper */ $o = ''; $options = $item_data['Options']; @@ -99,8 +99,8 @@ $val = join(',', $val); }*/ + /** @var LanguagesItem $lang */ $lang = $this->Application->recallObject('lang.current'); - /* @var $lang LanguagesItem */ if ( $render_as ) { $block_params['option'] = $key; @@ -167,8 +167,8 @@ { $block_params['name'] = $params['render_as']; + /** @var Array $values */ $values = $this->Application->Parser->GetParam('value'); - /* @var $values Array */ $prices = $this->Application->Parser->GetParam('price'); $price_types = $this->Application->Parser->GetParam('price_type'); @@ -224,8 +224,8 @@ $block_params['name'] = $this->SelectParam($params, 'render_as,block'); $block_params['pass_params'] = 'true'; + /** @var kCatDBItem $product_object */ $product_object = $this->Application->recallObject('p', 'p', Array ('skip_autoload' => true)); - /* @var $product_object kCatDBItem */ $i = 0; $product_id = $product_object->GetID(); @@ -261,8 +261,8 @@ function DisplayOptionsPricing($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ if ( $object->GetDBField('OptionsSelectionMode') == 1 ) { return false; @@ -274,8 +274,9 @@ } $options = getArrayValue($item_data, 'Options'); + + /** @var kProductOptionsHelper $helper */ $helper = $this->Application->recallObject('kProductOptionsHelper'); - /* @var $helper kProductOptionsHelper */ $crc = $helper->OptionsSalt($options, true); @@ -288,19 +289,19 @@ function RowIndex($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ return $object->GetDBField('ProductId') . ':' . $object->GetDBField('OptionsSalt') . ':' . $object->GetDBField('BackOrderFlag'); } function FreePromoShippingAvailable($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ + /** @var OrderHelper $order_helper */ $order_helper = $this->Application->recallObject('OrderHelper'); - /* @var $order_helper OrderHelper */ return $order_helper->eligibleForFreePromoShipping($object); } Index: branches/5.2.x/units/zones/zones_event_handler.php =================================================================== diff -u -N -r15540 -r16516 --- branches/5.2.x/units/zones/zones_event_handler.php (.../zones_event_handler.php) (revision 15540) +++ branches/5.2.x/units/zones/zones_event_handler.php (.../zones_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $zone_object kDBItem */ switch ($type) { case 'before': @@ -77,8 +77,8 @@ break; case 'after': + /** @var kDBItem $dst_object */ $dst_object = $this->Application->recallObject('dst'); - /* @var $dst_object kDBItem */ if ( $event->Name == 'OnUpdate' ) { $sql = 'DELETE FROM ' . $dst_object->TableName . ' @@ -220,8 +220,8 @@ function OnCountryChange($event) { + /** @var kDBItem $destinations */ $destinations = $this->Application->recallObject('dst'); - /* @var $destinations kDBItem */ $queryDel="DELETE FROM ".$destinations->TableName." WHERE ShippingZoneId=".$this->Application->GetVar($event->Prefix.'_id'); $this->Conn->Query($queryDel); @@ -243,17 +243,17 @@ { parent::OnCancel($event); + /** @var kDBItem $dst_object */ $dst_object = $this->Application->recallObject('dst'); - /* @var $dst_object kDBItem */ $sql = 'DELETE FROM ' . $dst_object->TableName . ' WHERE ShippingZoneId = 0'; $this->Conn->Query($sql); // if cancelling after create if ( $this->Application->RecallVar('zone_mode' . $this->Application->GetVar('m_wid')) == 'create' ) { + /** @var kDBItem $zone */ $zone = $event->getObject(); - /* @var $zone kDBItem */ $zone->Delete(); } Index: branches/5.2.x/units/shipping_quote_engines/intershipper.php =================================================================== diff -u -N -r15854 -r16516 --- branches/5.2.x/units/shipping_quote_engines/intershipper.php (.../intershipper.php) (revision 15854) +++ branches/5.2.x/units/shipping_quote_engines/intershipper.php (.../intershipper.php) (revision 16516) @@ -1,6 +1,6 @@ Application->ConfigValue('Comm_Shipping_Country'); } + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ if (strlen($params['orig_country']) == 3) { // got 3symbol ISO code -> resolve to 2symbol ISO code @@ -253,8 +253,8 @@ xml_set_element_handler( $xml_parser, Array(&$this, 'startElement'), Array(&$this, 'endElement') ); xml_set_character_data_handler( $xml_parser, Array(&$this, 'characterData') ); + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $curl_helper->SetPostData($target_url['uri']); $newdata = $curl_helper->Send($target_url['url']); Index: branches/5.2.x/units/product_options/product_options_tag_processor.php =================================================================== diff -u -N -r16025 -r16516 --- branches/5.2.x/units/product_options/product_options_tag_processor.php (.../product_options_tag_processor.php) (revision 16025) +++ branches/5.2.x/units/product_options/product_options_tag_processor.php (.../product_options_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ + /** @var kProductOptionsHelper $opt_helper */ $opt_helper = $this->Application->recallObject('kProductOptionsHelper'); - /* @var $opt_helper kProductOptionsHelper */ $parsed = $opt_helper->ExplodeOptionValues($object->GetFieldValues()); if ( !$parsed ) { @@ -39,8 +39,8 @@ $combination_field = $this->SelectParam($params, 'combination_field'); if ( $mode == 'selected' ) { + /** @var kDBItem $comb */ $comb = $this->Application->recallObject($combination_prefix); - /* @var $comb kDBItem */ $options = unserialize($comb->GetDBField($combination_field)); } @@ -49,8 +49,8 @@ $block_params['selected'] = ''; $block_params['pass_params'] = 1; + /** @var LanguagesItem $lang */ $lang = $this->Application->recallObject('lang.current'); - /* @var $lang LanguagesItem */ $o = ''; $first_selected = false; @@ -149,8 +149,8 @@ $opt_data = $this->Application->GetVar('options'); $options = getArrayValue($opt_data, $this->Application->GetVar('p_id')); if (!$options && $this->Application->GetVar('orditems_id')) { + /** @var kDBItem $ord_item */ $ord_item = $this->Application->recallObject('orditems.-opt', null, Array ('skip_autoload' => true)); - /* @var $ord_item kDBItem */ $ord_item->Load($this->Application->GetVar('orditems_id')); $item_data = unserialize($ord_item->GetDBField('ItemData')); @@ -161,8 +161,8 @@ function OptionData($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $options =& $this->GetOptions(); Index: branches/5.2.x/units/downloads/download_helper.php =================================================================== diff -u -N -r15568 -r16516 --- branches/5.2.x/units/downloads/download_helper.php (.../download_helper.php) (revision 15568) +++ branches/5.2.x/units/downloads/download_helper.php (.../download_helper.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('file', null, Array('skip_autoload' => true)); - /* @var $file_object kDBItem */ $sql = $file_id ? 'SELECT FileId, FilePath, RealPath, MIMEType FROM '.$this->Application->getUnitOption('file', 'TableName').' Index: branches/5.2.x/units/reports/reports_tag_processor.php =================================================================== diff -u -N -r15141 -r16516 --- branches/5.2.x/units/reports/reports_tag_processor.php (.../reports_tag_processor.php) (revision 15141) +++ branches/5.2.x/units/reports/reports_tag_processor.php (.../reports_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('rep.params', null, Array('skip_autoload' => true)); - /* @var $object kDBItem */ $object->setID(1); $object->SetDBField('Metric', $metric); Index: branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php =================================================================== diff -u -N -r15141 -r16516 --- branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php (.../affiliate_plans_brackets_tag_processor.php) (revision 15141) +++ branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_tag_processor.php (.../affiliate_plans_brackets_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject( $this->getPrefixSpecial() ); - /* @var $br_object kDBItem */ $br_data = $this->Application->GetVar( $this->getPrefixSpecial(true) ); $linked_info = $br_object->getLinkedInfo($this->Special); Index: branches/5.2.x/units/zones/zones_tag_processor.php =================================================================== diff -u -N -r15156 -r16516 --- branches/5.2.x/units/zones/zones_tag_processor.php (.../zones_tag_processor.php) (revision 15156) +++ branches/5.2.x/units/zones/zones_tag_processor.php (.../zones_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ $destination_table = $this->getDestinationsTable($params); $selected_country_id = (int)$this->Application->GetVar('CountrySelector'); @@ -67,8 +67,8 @@ break; case 'has_states': + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $has_states = $cs_helper->getCountriesWithStates(); @@ -125,8 +125,8 @@ function ShowStates($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $destination_table = $this->getDestinationsTable($params); @@ -192,8 +192,8 @@ function ShowZips($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $destination_table = $this->getDestinationsTable($params); @@ -257,8 +257,8 @@ static $table_name = ''; if (!$table_name) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $table_name = $this->Application->getUnitOption('dst', 'TableName'); Index: branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php =================================================================== diff -u -N -r15141 -r16516 --- branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php (.../google_checkout_notify.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php (.../google_checkout_notify.php) (revision 16516) @@ -1,6 +1,6 @@ SetVar('payment_type_id', $payment_type_id); // keep, because kGWGoogleCheckout::processNewOrderNotification relies on this + /** @var OrdersItem $order */ $order = $application->recallObject('ord', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $gw_data = $order->getGatewayData($application->GetVar('payment_type_id')); $application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); Index: branches/5.2.x/units/gateways/gw_tag_processor.php =================================================================== diff -u -N -r15854 -r16516 --- branches/5.2.x/units/gateways/gw_tag_processor.php (.../gw_tag_processor.php) (revision 15854) +++ branches/5.2.x/units/gateways/gw_tag_processor.php (.../gw_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ $id = $object->GetID(); @@ -102,8 +102,8 @@ */ protected function PredefinedOptions($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $block_params = $this->prepareTagParams($params); $block_params['name'] = $this->SelectParam($params, 'render_as,block'); Index: branches/5.2.x/units/helpers/ecb_currency_rates.php =================================================================== diff -u -N -r15166 -r16516 --- branches/5.2.x/units/helpers/ecb_currency_rates.php (.../ecb_currency_rates.php) (revision 15166) +++ branches/5.2.x/units/helpers/ecb_currency_rates.php (.../ecb_currency_rates.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $xml = $curl_helper->Send($this->RateSource); Index: branches/5.2.x/units/gateways/gw_classes/paypal_direct.php =================================================================== diff -u -N -r15568 -r16516 --- branches/5.2.x/units/gateways/gw_classes/paypal_direct.php (.../paypal_direct.php) (revision 15568) +++ branches/5.2.x/units/gateways/gw_classes/paypal_direct.php (.../paypal_direct.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $post_fields['COUNTRYCODE'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] ); $post_fields['ZIP'] = $item_data['BillingZip']; @@ -129,8 +129,8 @@ // print_r($post_fields); // exit; + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $curl_helper->SetPostData($post_fields); $this->gw_responce = $curl_helper->Send($gw_params['submit_url']); Index: branches/5.2.x/units/gateways/gw_classes/paymentech.php =================================================================== diff -u -N -r15141 -r16516 --- branches/5.2.x/units/gateways/gw_classes/paymentech.php (.../paymentech.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_classes/paymentech.php (.../paymentech.php) (revision 16516) @@ -1,6 +1,6 @@ '', ); + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $data['AVScountryCode'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] ); @@ -166,8 +166,8 @@ function setGWResponce($gw_params, $headers, $xml) { + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $curl_helper->SetHeaders($headers); $curl_helper->SetPostData($xml); Index: branches/5.2.x/units/shipping_quote_engines/usps.php =================================================================== diff -u -N -r15854 -r16516 --- branches/5.2.x/units/shipping_quote_engines/usps.php (.../usps.php) (revision 15854) +++ branches/5.2.x/units/shipping_quote_engines/usps.php (.../usps.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('kXMLHelper'); - /* @var $xml_helper kXMLHelper */ + /** @var kXMLNode $root_node */ $root_node =& $xml_helper->Parse($body); - /* @var $root_node kXMLNode */ $rates = Array(); // Domestic shipping @@ -957,8 +957,9 @@ // parse response $xml_helper = $this->Application->recallObject('kXMLHelper'); + + /** @var kXMLNode $root_node */ $root_node =& $xml_helper->Parse($body); - /* @var $root_node kXMLNode */ $Postage = 0; $label_file = $TrackingNumber = $PostnetBarCode = ''; @@ -1000,8 +1001,8 @@ } if ( $label_file != '' ) { + /** @var FileHelper $file_helper */ $file_helper = $this->Application->recallObject('FileHelper'); - /* @var $file_helper FileHelper */ $file_helper->CheckFolder(USPS_LABEL_FOLDER); @@ -1014,8 +1015,8 @@ function GetUSPSCountry($country, $default = 'US') { + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $country = $cs_helper->getCountryIso($country); @@ -1100,8 +1101,9 @@ } $xml_helper = $this->Application->recallObject('kXMLHelper'); + + /** @var kXMLNode $root_node */ $root_node =& $xml_helper->Parse($body); - /* @var $root_node kXMLNode */ // Tracking Shipping $delivery_node =& $root_node->FindChild('TrackInfo'); Index: branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php =================================================================== diff -u -N -r16015 -r16516 --- branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php (.../taxes_dst_event_handler.php) (revision 16015) +++ branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php (.../taxes_dst_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); + /** @var kDBItem $tax_object */ $tax_object = $this->Application->recallObject('tax'); - /* @var $tax_object kDBItem */ $std_dest_id = $this->Application->GetVar('StatesCountry'); if ( $items_info ) { + /** @var kDBItem $taxdest */ $taxdest = $this->Application->recallObject($event->getPrefixSpecial(true), null); - /* @var $taxdest kDBItem */ $parent_info =& $object->GetLinkedInfo(); @@ -77,8 +77,8 @@ */ protected function OnCreate(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); if ( !$items_info ) { @@ -116,17 +116,17 @@ { switch ($type) { case 'before': + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $events = $this->Application->GetVar('events'); if ( $events['tax'] == 'OnUpdate' ) { $object->SetDBField('TaxZoneId', $this->Application->GetVar('tax_id')); } + /** @var kDBItem $tax_object */ $tax_object = $this->Application->recallObject('tax'); - /* @var $tax_object kDBItem */ if ( $tax_object->GetDBField('Type') == 3 ) { $tax_object->SetDBField('StdDestId', $this->Application->GetVar('StatesCountry')); @@ -142,11 +142,11 @@ */ function OnZoneUpdate($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ + /** @var kDBItem $zone_object */ $zone_object = $this->Application->recallObject('tax'); - /* @var $zone_object kDBItem */ $zone_id = (int)$this->Application->GetVar('tax_id'); $zone_type = $zone_object->GetDBField('Type'); Index: branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_event_handler.php =================================================================== diff -u -N -r15540 -r16516 --- branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_event_handler.php (.../affiliate_payment_types_event_handler.php) (revision 15540) +++ branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_event_handler.php (.../affiliate_payment_types_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ Application->isAdmin ) { + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $object->addFilter('active', '%1$s.Status = ' . STATUS_ACTIVE); } @@ -42,8 +42,8 @@ */ function OnSetPrimary($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $object->SetDBField('IsPrimary', 1); $object->Update(); @@ -85,8 +85,8 @@ */ function itemChanged($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( $object->GetDBField('IsPrimary') && $object->Validate() ) { $sql = 'UPDATE ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . ' Index: branches/5.2.x/units/gateways/gw_classes/google_checkout.php =================================================================== diff -u -N -r16423 -r16516 --- branches/5.2.x/units/gateways/gw_classes/google_checkout.php (.../google_checkout.php) (revision 16423) +++ branches/5.2.x/units/gateways/gw_classes/google_checkout.php (.../google_checkout.php) (revision 16516) @@ -1,6 +1,6 @@ Conn->Query($sql); + /** @var kMultiLanguage $ml_formatter */ $ml_formatter = $this->Application->recallObject('kMultiLanguage'); - /* @var $ml_formatter kMultiLanguage */ $cart_xml = Array (); foreach ($order_items as $order_item) { @@ -207,11 +207,11 @@ // parse xml & get order_id from there, like sella pay $this->gwParams = $gw_params; + /** @var kXMLHelper $xml_helper */ $xml_helper = $this->Application->recallObject('kXMLHelper'); - /* @var $xml_helper kXMLHelper */ + /** @var kXMLNode $root_node */ $root_node =& $xml_helper->Parse( $this->getRequestXML() ); - /* @var $root_node kXMLNode */ $this->Application->XMLHeader(); define('DBG_SKIP_REPORTING', 1); @@ -321,17 +321,18 @@ ); foreach ($search_nodes as $search_string) { + /** @var kXMLNode $found_node */ $found_node =& $root_node; - /* @var $found_node kXMLNode */ $search_string = explode(':', $search_string); foreach ($search_string as $search_node) { $found_node =& $found_node->FindChild($search_node); } $node_data = Array (); + + /** @var kXMLNode $sub_node */ $sub_node =& $found_node->firstChild; - /* @var $sub_node kXMLNode */ do { if ($found_node->Name == 'SHIPPING') { @@ -361,8 +362,8 @@ } // 2. update shipping address in order + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $order->Load($order_id); @@ -372,8 +373,8 @@ 'ShippingZip' => $address_info['POSTAL-CODE'], ); + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $shipping_address['ShippingCountry'] = $cs_helper->getCountryIso($address_info['COUNTRY-CODE'], true); @@ -434,8 +435,8 @@ $user_address = Array (); foreach ($search_nodes as $search_string) { + /** @var kXMLNode $found_node */ $found_node =& $root_node; - /* @var $found_node kXMLNode */ $search_string = explode(':', $search_string); foreach ($search_string as $search_node) { @@ -444,8 +445,8 @@ $node_data = Array (); if ($found_node->Children) { + /** @var kXMLNode $sub_node */ $sub_node =& $found_node->firstChild; - /* @var $sub_node kXMLNode */ do { $node_data[$sub_node->Name] = $sub_node->Data; @@ -481,8 +482,8 @@ } // 2. update shipping address in order + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $order->Load($order_id); @@ -527,8 +528,8 @@ 'POSTAL-CODE' => 'Zip', ); + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ foreach ($user_address as $field_prefix => $address_details) { foreach ($address_mapping as $src_field => $dst_field) { @@ -576,8 +577,8 @@ ); foreach ($search_nodes as $search_string) { + /** @var kXMLNode $found_node */ $found_node =& $root_node; - /* @var $found_node kXMLNode */ $search_string = explode(':', $search_string); foreach ($search_string as $search_node) { @@ -586,8 +587,8 @@ $node_data = Array (); if ($found_node->Children) { + /** @var kXMLNode $sub_node */ $sub_node =& $found_node->firstChild; - /* @var $sub_node kXMLNode */ do { $node_data[$sub_node->Name] = $sub_node->Data; @@ -607,8 +608,8 @@ } // 2. update shipping address in order + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $order->Load($google_order_number, 'GoogleOrderNumber'); @@ -689,8 +690,8 @@ $this->_chargeOrder($item_data); + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord.-item', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $order->Load($item_data['OrderId']); if (!$order->isLoaded()) { @@ -713,11 +714,11 @@ { $submit_url = $this->gwParams['submit_url'].'/request/Merchant/'.$this->gwParams['merchant_id']; + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ + /** @var kXMLHelper $xml_helper */ $xml_helper = $this->Application->recallObject('kXMLHelper'); - /* @var $xml_helper kXMLHelper */ $curl_helper->SetPostData($command_xml); $auth_options = Array ( @@ -727,8 +728,8 @@ $xml_responce = $curl_helper->Send($submit_url); + /** @var kXMLNode $root_node */ $root_node =& $xml_helper->Parse($xml_responce); - /* @var $root_node kXMLNode */ return $root_node; } @@ -749,8 +750,8 @@ $order_state = Array (); foreach ($search_nodes as $search_string) { + /** @var kXMLNode $found_node */ $found_node =& $root_node; - /* @var $found_node kXMLNode */ $search_string = explode(':', $search_string); foreach ($search_string as $search_node) { @@ -773,8 +774,8 @@ } // 2. update shipping address in order + /** @var OrdersItem $order */ $order = $this->Application->recallObject('ord', null, Array ('skip_autoload' => true)); - /* @var $order OrdersItem */ $order->Load($google_order_number, 'GoogleOrderNumber'); @@ -800,8 +801,8 @@ if ($order_charged) { // when using Pre-Authorize + /** @var OrdersEventHandler $order_eh */ $order_eh = $this->Application->recallObject('ord_EventHandler'); - /* @var $order_eh OrdersEventHandler */ $order_eh->SplitOrder( new kEvent('ord:OnMassOrderApprove'), $order); } @@ -846,8 +847,9 @@ $shipping_totals = $this->Conn->GetRow($query); $this->Application->recallObject('ShippingQuoteEngine'); + + /** @var ShippingQuoteCollector $quote_engine_collector */ $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector'); - /* @var $quote_engine_collector ShippingQuoteCollector */ $shipping_quote_params = Array( 'dest_country' => $order->GetDBField('ShippingCountry'), Index: branches/5.2.x/units/addresses/addresses_tag_processor.php =================================================================== diff -u -N -r15156 -r16516 --- branches/5.2.x/units/addresses/addresses_tag_processor.php (.../addresses_tag_processor.php) (revision 15156) +++ branches/5.2.x/units/addresses/addresses_tag_processor.php (.../addresses_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ $ret = ''; $fields = Array ('City', 'State', 'Zip', 'Country'); @@ -76,8 +76,8 @@ function IsProfileAddress($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ return $object->GetDBField('IsProfileAddress'); } Index: branches/5.2.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php =================================================================== diff -u -N -r16458 -r16516 --- branches/5.2.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php (.../shipping_quote_engine_event_handler.php) (revision 16458) +++ branches/5.2.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php (.../shipping_quote_engine_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ + /** @var ShippingQuoteEngine $engine */ $engine = $this->Application->recallObject($object->GetDBField('ClassName')); - /* @var $engine ShippingQuoteEngine */ $engine_fields = $engine->GetEngineFields(); $properties = $object->GetDBField('Properties'); @@ -49,8 +49,8 @@ $object->SetDBField('Properties', serialize($properties)); + /** @var kCountryStatesHelper $cs_helper */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $from_country = $this->Application->ConfigValue('Comm_Shipping_Country'); $has_states = strlen($from_country) == 3 ? $cs_helper->CountryHasStates($from_country) : false; @@ -76,8 +76,8 @@ { parent::OnAfterItemLoad($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $properties = $object->GetDBField('Properties'); Index: branches/5.2.x/units/shipping_quote_engines/shipping_quote_collector.php =================================================================== diff -u -N -r15141 -r16516 --- branches/5.2.x/units/shipping_quote_engines/shipping_quote_collector.php (.../shipping_quote_collector.php) (revision 15141) +++ branches/5.2.x/units/shipping_quote_engines/shipping_quote_collector.php (.../shipping_quote_collector.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $has_states = $cs_helper->CountryHasStates( $cs_helper->getCountryIso($params['dest_country'], true) ); @@ -43,8 +43,8 @@ $classes = $this->getEngineClasses(); foreach ($classes as $class) { + /** @var ShippingQuoteEngine $object */ $object = $this->Application->recallObject($class); - /* @var $object ShippingQuoteEngine */ $new_shipping_types = $object->GetShippingQuotes($params); @@ -115,8 +115,8 @@ $classes = $this->getEngineClasses(); foreach ($classes as $class) { + /** @var ShippingQuoteEngine $object */ $object = $this->Application->recallObject($class); - /* @var $object ShippingQuoteEngine */ $new_shipping_types = $object->GetAvailableTypes(); $shipping_types = array_merge($shipping_types, $new_shipping_types); @@ -162,8 +162,8 @@ $shipping_id = $shipping_info[$package_num]['ShippingId']; foreach ($classes as $class) { + /** @var ShippingQuoteEngine $object */ $object = $this->Application->recallObject($class); - /* @var $object ShippingQuoteEngine */ $shipping_types = $object->GetAvailableTypes(); Index: branches/5.2.x/units/gateways/gw_classes/worldpay.php =================================================================== diff -u -N -r15141 -r16516 --- branches/5.2.x/units/gateways/gw_classes/worldpay.php (.../worldpay.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_classes/worldpay.php (.../worldpay.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $ret['country'] = $cs_helper->getCountryIso( $item_data['BillingCountry'] ); $ret['tel'] = $item_data['BillingPhone']; @@ -106,8 +106,8 @@ $transaction_status = $this->Application->GetVar('transStatus') == 'Y' ? 1 : 0; + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $url = $this->Application->GetVar($transaction_status ? 'MC_return_page' : 'MC_cancel_return_page'); echo $curl_helper->Send($url); Index: branches/5.2.x/install/upgrades.php =================================================================== diff -u -N -r16447 -r16516 --- branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 16447) +++ branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 16516) @@ -1,6 +1,6 @@ Conn->Query($sql); } + /** @var kMultiLanguageHelper $ml_helper */ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); - /* @var $ml_helper kMultiLanguageHelper */ $ml_helper->createFields('pt'); Index: branches/5.2.x/units/orders/order_calculator.php =================================================================== diff -u -N -r16287 -r16516 --- branches/5.2.x/units/orders/order_calculator.php (.../order_calculator.php) (revision 16287) +++ branches/5.2.x/units/orders/order_calculator.php (.../order_calculator.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('kProductOptionsHelper'); - /* @var $opt_helper kProductOptionsHelper */ foreach ($item_data['Options'] as $opt => $val) { $sql = 'SELECT * @@ -643,8 +643,8 @@ */ public function generateOptionsSalt($options) { + /** @var kProductOptionsHelper $opt_helper */ $opt_helper = $this->Application->recallObject('kProductOptionsHelper'); - /* @var $opt_helper kProductOptionsHelper */ return $opt_helper->OptionsSalt($options, true); } Index: branches/5.2.x/units/affiliate_plans/affiliate_plans_event_handler.php =================================================================== diff -u -N -r15540 -r16516 --- branches/5.2.x/units/affiliate_plans/affiliate_plans_event_handler.php (.../affiliate_plans_event_handler.php) (revision 15540) +++ branches/5.2.x/units/affiliate_plans/affiliate_plans_event_handler.php (.../affiliate_plans_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ Special == 'active' ) { + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $object->addFilter('active', '%1$s.Enabled = 1'); } @@ -82,8 +82,8 @@ */ function itemChanged($event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $live_table = $this->Application->getUnitOption($event->Prefix, 'TableName'); $plans_count = $this->Conn->GetOne('SELECT COUNT(*) FROM ' . $live_table); Index: branches/5.2.x/units/gateways/gw_classes/gw_base.php =================================================================== diff -u -N -r15376 -r16516 --- branches/5.2.x/units/gateways/gw_classes/gw_base.php (.../gw_base.php) (revision 15376) +++ branches/5.2.x/units/gateways/gw_classes/gw_base.php (.../gw_base.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CurrencyRates'); - /* @var $converter CurrencyRates */ $value = $converter->Convert($value, 'PRIMARY', $iso); return $format_value ? sprintf('%.2f', $value) : $value; @@ -188,8 +188,8 @@ $gw_id = $this->Conn->getInsertID(); // 2. create DISABLED payment type, that uses this gateway (used for storing configuration properties of gateway) + /** @var kDBItem $payment_type */ $payment_type = $this->Application->recallObject('pt.-item', null, Array ('skip_autoload' => true)); - /* @var $payment_type kDBItem */ $payment_type->Clear(); $fields_hash = Array ( Index: branches/5.2.x/units/shipping_quote_engines/custom_shipping_quote_engine.php =================================================================== diff -u -N -r15141 -r16516 --- branches/5.2.x/units/shipping_quote_engines/custom_shipping_quote_engine.php (.../custom_shipping_quote_engine.php) (revision 15141) +++ branches/5.2.x/units/shipping_quote_engines/custom_shipping_quote_engine.php (.../custom_shipping_quote_engine.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CountryStatesHelper'); - /* @var $cs_helper kCountryStatesHelper */ $user_country_id = $cs_helper->getCountryStateId($user_country, DESTINATION_TYPE_COUNTRY); $user_state_id = $cs_helper->getCountryStateId($user_state, DESTINATION_TYPE_STATE); Index: branches/5.2.x/units/products/products_tag_processor.php =================================================================== diff -u -N -r16375 -r16516 --- branches/5.2.x/units/products/products_tag_processor.php (.../products_tag_processor.php) (revision 16375) +++ branches/5.2.x/units/products/products_tag_processor.php (.../products_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ if ( !$object->GetDBField('InventoryStatus') ) { return true; @@ -539,16 +539,16 @@ function IsSubscription($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ return ($object->GetDBField('Type') == 2); } function IsTangible($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ return ($object->GetDBField('Type') == 1); } @@ -654,8 +654,8 @@ function ListShippingTypes($params) { + /** @var ShippingQuoteCollector $quote_engine_collector */ $quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector'); - /* @var $quote_engine_collector ShippingQuoteCollector */ $types = $quote_engine_collector->GetAvailableShippingTypes(); @@ -694,8 +694,8 @@ */ function Savings($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $price = $object->GetDBField('Price'); $msrp = $object->GetDBField('MSRP'); @@ -713,8 +713,8 @@ } if (isset($params['currency'])) { + /** @var LanguagesItem $lang */ $lang = $this->Application->recallObject('lang.current'); - /* @var $lang LanguagesItem */ $iso = $this->GetISO($params['currency']); $value = $this->ConvertCurrency($value, $iso); @@ -735,8 +735,8 @@ $edit_tab_presets = $this->Application->getUnitOption($this->Prefix, 'EditTabPresets'); $edit_tab_preset = $edit_tab_presets['Default']; + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $product_type = $object->GetDBField('Type'); @@ -779,8 +779,8 @@ */ protected function InCompare($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $products = $this->Application->GetVarDirect('compare_products', 'Cookie'); $products = $products ? explode('|', $products) : Array (); Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php =================================================================== diff -u -N -r16015 -r16516 --- branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php (.../product_option_combinations_event_handler.php) (revision 16015) +++ branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php (.../product_option_combinations_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ Name) { case 'OnCreate': case 'OnUpdate': + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $options = unserialize($object->GetDBField('Combination')); ksort($options); @@ -42,8 +42,8 @@ case 'OnMassDelete': // delete only option combinations that has no associated inventory + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $ids = $event->getEventParam('ids'); @@ -92,8 +92,8 @@ } if (!$recursed) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $salt = $fields['Combination']; ksort($salt); @@ -137,8 +137,8 @@ } if (!$recursed) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $edit_id = $object->GetId(); $salt = $fields['Combination']; @@ -169,8 +169,8 @@ */ protected function OnCreate(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -202,8 +202,8 @@ */ protected function OnUpdate(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject( Array('skip_autoload' => true) ); - /* @var $object kDBItem */ $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); if($items_info) @@ -248,8 +248,8 @@ */ protected function OnItemBuild(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->dbBuild($object, $event); @@ -265,8 +265,8 @@ $this->LoadItem($event); } + /** @var Params $actions */ $actions = $this->Application->recallObject('kActions'); - /* @var $actions Params */ $actions->Set($event->getPrefixSpecial() . '_GoTab', ''); $actions->Set($event->getPrefixSpecial() . '_GoId', ''); @@ -281,8 +281,8 @@ */ protected function LoadItem(kEvent $event) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $id = $this->getPassedID($event); @@ -293,8 +293,8 @@ } if ( $object->Load($id) ) { + /** @var Params $actions */ $actions = $this->Application->recallObject('kActions'); - /* @var $actions Params */ $actions->Set($event->getPrefixSpecial() . '_id', $object->GetId()); } @@ -336,8 +336,8 @@ $event->Init($event->Prefix, '-item'); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $options_mapping = $this->Application->GetVar('poc_mapping'); if ( !$options_mapping ) { @@ -386,14 +386,14 @@ $inventory_status = $this->Conn->GetOne($sql); if ( $inventory_status == ProductInventory::BY_OPTIONS ) { + /** @var kDBItem $live_object */ $live_object = $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true)); - /* @var $live_object kDBItem */ $live_object->SwitchToLive(); $live_object->Load($id); + /** @var kDBItem $temp_object */ $temp_object = $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true)); - /* @var $temp_object kDBItem */ $temp_object->SwitchToTemp(); $temp_object->Load($id); Index: branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_tp.php =================================================================== diff -u -N -r15156 -r16516 --- branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_tp.php (.../affiliate_payment_types_tp.php) (revision 15156) +++ branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_tp.php (.../affiliate_payment_types_tp.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject( $params['prefix'] ); - /* @var $affiliate kDBItem */ $payment_type = $affiliate->GetDBField( $params['field'] ); if ( $payment_type ) { + /** @var kDBList $object */ $object = $this->getObject($params); - /* @var $object kDBList */ return $payment_type == $object->GetID(); } Index: branches/5.2.x/units/pricing/pricing_event_handler.php =================================================================== diff -u -N -r16015 -r16516 --- branches/5.2.x/units/pricing/pricing_event_handler.php (.../pricing_event_handler.php) (revision 16015) +++ branches/5.2.x/units/pricing/pricing_event_handler.php (.../pricing_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ Application->GetVar('pr_tang') ) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $product_id = $this->Application->GetVar('p_id'); $group_id = $this->Application->getVar('group_id'); @@ -255,8 +255,8 @@ */ protected function customProcessing(kEvent $event, $type) { + /** @var kDBItem $bracket */ $bracket = $event->getObject(); - /* @var $bracket kDBItem */ switch ($type) { case 'before': @@ -405,8 +405,8 @@ { parent::OnBeforeItemUpdate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( $object->GetDBField('IsPrimary') == 1 ) { // make all prices non primary, when this one is @@ -428,8 +428,8 @@ { parent::OnBeforeItemCreate($event); + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $table_info = $object->getLinkedInfo($event->Special); @@ -463,8 +463,8 @@ */ protected function SetCustomQuery(kEvent $event) { + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ if ( $this->Application->isAdminUser ) { return; Index: branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_tag_processor.php =================================================================== diff -u -N -r15156 -r16516 --- branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_tag_processor.php (.../affiliate_plans_items_tag_processor.php) (revision 15156) +++ branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_tag_processor.php (.../affiliate_plans_items_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBList */ if ($object->GetDBField('ItemType') == 2) { $cat_object = $this->Application->recallObject('c'); Index: branches/5.2.x/install.php =================================================================== diff -u -N -r16489 -r16516 --- branches/5.2.x/install.php (.../install.php) (revision 16489) +++ branches/5.2.x/install.php (.../install.php) (revision 16516) @@ -1,6 +1,6 @@ toolkit; - /* @var $toolkit kInstallToolkit */ } $application =& kApplication::Instance(); Index: branches/5.2.x/units/gateways/gw_classes/sella_guestpay.php =================================================================== diff -u -N -r15854 -r16516 --- branches/5.2.x/units/gateways/gw_classes/sella_guestpay.php (.../sella_guestpay.php) (revision 15854) +++ branches/5.2.x/units/gateways/gw_classes/sella_guestpay.php (.../sella_guestpay.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $res = $curl_helper->Send($url); @@ -92,8 +92,8 @@ $b = $_GET['b']; $url = 'https://ecomm.sella.it/CryptHTTPS/Decrypt.asp?a='.$a.'&b='.$b.'&c=2.0'; + /** @var kCurlHelper $curl_helper */ $curl_helper = $this->Application->recallObject('CurlHelper'); - /* @var $curl_helper kCurlHelper */ $ret = $curl_helper->Send($url); $result = $this->parseGWResponce($ret, $gw_params); Index: branches/5.2.x/units/addresses/addresses_event_handler.php =================================================================== diff -u -N -r16134 -r16516 --- branches/5.2.x/units/addresses/addresses_event_handler.php (.../addresses_event_handler.php) (revision 16134) +++ branches/5.2.x/units/addresses/addresses_event_handler.php (.../addresses_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ 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 */ $fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); $fields['Country']['default'] = $site_helper->getDefaultCountry('Shipping'); Index: branches/5.2.x/units/discounts/discounts_event_handler.php =================================================================== diff -u -N -r15149 -r16516 --- branches/5.2.x/units/discounts/discounts_event_handler.php (.../discounts_event_handler.php) (revision 15149) +++ branches/5.2.x/units/discounts/discounts_event_handler.php (.../discounts_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ $object->SetDBField('Amount', abs($object->GetDBField('Amount'))); } Index: branches/5.2.x/units/reports/reports_event_handler.php =================================================================== diff -u -N -r16021 -r16516 --- branches/5.2.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 16021) +++ branches/5.2.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject($event->getPrefixSpecial(),'rep_List',Array('skip_counting'=>true,'per_page'=>-1) ); - /* @var $report kDBList*/ + /** @var kDBItem $ReportItem */ $ReportItem = $this->Application->recallObject('rep.item', 'rep', Array('skip_autoload' => true)); - /* @var $ReportItem kDBItem*/ $a_grids = $this->Application->getUnitOption('rep', 'Grids'); $a_fields = $a_grids['Default']['Fields']; Index: branches/5.2.x/units/affiliates/affiliates_event_handler.php =================================================================== diff -u -N -r16458 -r16516 --- branches/5.2.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 16458) +++ branches/5.2.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 16516) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ $object->SetDBField('AffiliateCode', $this->generateAffiliateCode($event)); @@ -147,8 +147,8 @@ parent::OnBeforeItemUpdate($event); if ( !$this->Application->isAdmin ) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $object->SetDBField('PortalUserId', $object->GetOriginalField('PortalUserId')); @@ -170,8 +170,8 @@ return; } + /** @var kDBItem $object */ $object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $affiliate_storage_method = $this->Application->ConfigValue('Comm_AffiliateStorageMethod'); @@ -186,8 +186,8 @@ if ( $object->isLoaded() && ($object->GetDBField('Status') == 1) ) { // user is found with such email + /** @var UsersItem $affiliate_user */ $affiliate_user = $this->Application->recallObject('u.affiliate', null, Array ('skip_autoload' => true)); - /* @var $affiliate_user UsersItem */ $affiliate_user->Load($object->GetDBField('PortalUserId')); @@ -225,20 +225,20 @@ */ function OnOrderApprove($event) { + /** @var OrdersItem $order */ $order = $this->Application->recallObject($event->getEventParam('Order_PrefixSpecial')); - /* @var $order OrdersItem */ $affiliate_id = $order->GetDBField('AffiliateId'); if ( !$affiliate_id ) { return false; } + /** @var kDBItem $object */ $object = $event->getObject(Array ('ship_autoload' => true)); - /* @var $object kDBItem */ if ( $object->Load($affiliate_id) ) { + /** @var kDBItem $affiliate_plan */ $affiliate_plan = $this->Application->recallObject('ap', null, Array ('skip_autoload' => true)); - /* @var $affiliate_plan kDBItem */ $affiliate_plan->Load($object->GetDBField('AffiliatePlanId')); @@ -309,17 +309,17 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject( Array('form_name' => 'registration', 'skip_autoload' => true) ); - /* @var $object kDBItem */ $object->setID(0); $field_values = $this->getSubmittedFields($event); $object->SetFieldsFromHash($field_values); $event->setEventParam('form_data', $field_values); if ( !$object->Validate() ) { + /** @var kDBItem $user */ $user = $event->MasterEvent->getObject(); - /* @var $user kDBItem */ $user->Validate(); @@ -338,11 +338,11 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ + /** @var UsersItem $user */ $user = $event->MasterEvent->getObject(); - /* @var $user UsersItem */ $object->SetDBField('PortalUserId', $user->GetID()); @@ -374,8 +374,8 @@ */ function OnBecomeAffiliate($event) { + /** @var UsersItem $object */ $object = $event->getObject( Array('form_name' => 'registration', 'skip_autoload' => true) ); - /* @var $object UsersItem */ $event->CallSubEvent('OnCreate'); @@ -402,8 +402,8 @@ $event->CallSubEvent('OnUpdate'); if ( $event->status == kEvent::erSUCCESS ) { + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $this->Application->emailUser('AFFILIATE.PAYMENT.TYPE.CHANGED', $object->GetDBField('PortalUserId')); $this->Application->emailAdmin('AFFILIATE.PAYMENT.TYPE.CHANGED'); @@ -429,8 +429,8 @@ { parent::OnBeforeDeleteFromLive($event); + /** @var kDBItem $payment_object */ $payment_object = $this->Application->recallObject('apayments', 'apayments', Array ('skip_autoload' => true)); - /* @var $payment_object kDBItem */ $id = $event->getEventParam('id'); $ap_table = $this->Application->getUnitOption('apayments', 'TableName'); @@ -453,8 +453,8 @@ $this->Application->emailAdmin('AFFILIATE.PAYMENT'); } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ $passed_id = $event->getEventParam('id'); @@ -586,8 +586,8 @@ return; } + /** @var kDBItem $object */ $object = $event->getObject(Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); @@ -647,8 +647,8 @@ return true; } + /** @var kDBItem $object */ $object = $event->getObject(); - /* @var $object kDBItem */ if ( !$object->isLoaded() ) { return true; Index: branches/5.2.x/units/affiliates/affiliates_tag_processor.php =================================================================== diff -u -N -r16139 -r16516 --- branches/5.2.x/units/affiliates/affiliates_tag_processor.php (.../affiliates_tag_processor.php) (revision 16139) +++ branches/5.2.x/units/affiliates/affiliates_tag_processor.php (.../affiliates_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ Application->recallObject($this->Prefix . '.user'); - /* @var $object kDBItem */ return $object->isLoaded(); } @@ -108,8 +108,8 @@ */ protected function User_AffiliateIsActive($params) { + /** @var kDBItem $object */ $object = $this->Application->recallObject($this->Prefix . '.user'); - /* @var $object kDBItem */ return $object->isLoaded() && ($object->GetDBField('Status') == STATUS_ACTIVE); } @@ -122,8 +122,8 @@ */ function UserLink($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $user_id = $object->GetDBField('PortalUserId'); @@ -149,8 +149,8 @@ function IsAffiliateOrRegisterAsAffiliateAllowed($params) { + /** @var kDBItem $object */ $object = $this->Application->recallObject($this->Prefix . '.user'); - /* @var $object kDBItem */ return $this->Application->ConfigValue('Comm_RegisterAsAffiliate') || $object->isLoaded() ? 1 : 0; } Index: branches/5.2.x/units/currencies/currencies_tag_processor.php =================================================================== diff -u -N -r15156 -r16516 --- branches/5.2.x/units/currencies/currencies_tag_processor.php (.../currencies_tag_processor.php) (revision 15156) +++ branches/5.2.x/units/currencies/currencies_tag_processor.php (.../currencies_tag_processor.php) (revision 16516) @@ -1,6 +1,6 @@ getObject($params); - /* @var $object kDBItem */ $params['pass'] = 'm,curr'; $params['curr_event'] = 'OnChangeCurrency';