Index: branches/5.3.x/core/kernel/db/db_tag_processor.php =================================================================== diff -u -N -r16503 -r16519 --- branches/5.3.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 16503) +++ branches/5.3.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 16519) @@ -1,6 +1,6 @@ Prefix . '.' . $special, '.'); $params['skip_counting'] = true; + /** @var kDBList $list */ $list = $this->Application->recallObject($prefix_special, $this->Prefix . '_List', $params); - /* @var $list kDBList */ if ( !array_key_exists('skip_quering', $params) || !$params['skip_quering'] ) { if ( $requery ) { @@ -549,8 +549,8 @@ if ( $this->Special && $this->Application->hasObject($this->Prefix) ) { // object, produced by "kDBList::linkToParent" method, that otherwise would keep it's id + /** @var kDBBase $item */ $item = $this->Application->recallObject($this->Prefix); - /* @var $item kDBBase */ if ( $item instanceof kDBItem ) { $this->Application->removeObject($this->Prefix); @@ -606,11 +606,11 @@ */ protected function PreviousResource($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ + /** @var ListHelper $list_helper */ $list_helper = $this->Application->recallObject('ListHelper'); - /* @var $list_helper ListHelper */ $select_clause = $object->getUnitConfig()->getNavigationSelectClause(null); @@ -627,11 +627,11 @@ */ protected function NextResource($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ + /** @var ListHelper $list_helper */ $list_helper = $this->Application->recallObject('ListHelper'); - /* @var $list_helper ListHelper */ $select_clause = $object->getUnitConfig()->getNavigationSelectClause(null); @@ -690,8 +690,8 @@ { static $default_per_page = Array (); + /** @var kDBList $object */ $object =& $this->GetList($params); - /* @var $object kDBList */ // process sorting if ($object->isMainList()) { @@ -732,8 +732,8 @@ list ($prefix, ) = explode('.', $prefix_special); if (!array_key_exists($prefix, $default_per_page)) { + /** @var ListHelper $list_helper */ $list_helper = $this->Application->recallObject('ListHelper'); - /* @var $list_helper ListHelper */ $default_per_page[$prefix] = $list_helper->getDefaultPerPage($prefix); } @@ -822,16 +822,16 @@ */ function ConvertCurrency($value, $target_iso, $source_iso = 'PRIMARY') { + /** @var CurrencyRates $converter */ $converter = $this->Application->recallObject('CurrencyRates'); - /* @var $converter CurrencyRates */ return $converter->Convert($value, $source_iso, $target_iso); } function AddCurrencySymbol($value, $iso, $decimal_tag = '') { + /** @var CurrencyRates $converter */ $converter = $this->Application->recallObject('CurrencyRates'); - /* @var $converter CurrencyRates */ return $converter->AddCurrencySymbol($value, $iso, $decimal_tag); } @@ -852,8 +852,8 @@ $params['no_special'] = 'no_special'; } + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ if (array_key_exists('db', $params) && $params['db']) { $value = $object->GetDBField($field); @@ -958,8 +958,8 @@ $field = $this->SelectParam($params, 'name,field'); if ($field) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $timestamp = $object->GetDBField($field); } @@ -993,8 +993,8 @@ $format = array_key_exists('format', $params) ? $params['format'] : false; if (preg_match('/_regional_(.*)/', $format, $regs)) { + /** @var kDBItem $language */ $language = $this->Application->recallObject('lang.current'); - /* @var $language kDBItem */ $format = $language->GetDBField($regs[1]); } @@ -1027,14 +1027,14 @@ { // + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $dst_field = $this->SelectParam($params, 'name,field'); list($prefix_special, $src_field) = explode(':', $params['src']); + /** @var kDBItem $src_object */ $src_object = $this->Application->recallObject($prefix_special); - /* @var $src_object kDBItem */ $object->SetDBField($dst_field, $src_object->GetDBField($src_field)); } @@ -1055,8 +1055,8 @@ function Error($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $field = $this->SelectParam($params, 'name,field'); @@ -1066,8 +1066,8 @@ function HasError($params) { if ($params['field'] == 'any') { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $skip_fields = array_key_exists('except', $params) ? $params['except'] : false; $skip_fields = $skip_fields ? explode(',', $skip_fields) : Array(); @@ -1112,15 +1112,15 @@ function IsRequired($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $field = $params['field']; $formatter_class = $object->GetFieldOption($field, 'formatter'); if ( $formatter_class == 'kMultiLanguage' ) { + /** @var kMultiLanguage $formatter */ $formatter = $this->Application->recallObject($formatter_class); - /* @var $formatter kMultiLanguage */ $field = $formatter->LangFieldName($field); } @@ -1146,8 +1146,8 @@ */ protected function PredefinedOptions($params) { + /** @var kDBList $object */ $object = $this->getObject($params); - /* @var $object kDBList */ $field = $params['field']; $value = array_key_exists('value', $params) ? $params['value'] : $object->GetDBField($field); @@ -1293,8 +1293,8 @@ function PredefinedSearchOptions($params) { + /** @var kDBList $object */ $object =& $this->GetList($params); - /* @var $object kDBList */ $params['value'] = $this->SearchField($params); @@ -1306,17 +1306,17 @@ $field = $this->SelectParam($params, 'name,field'); if ( !isset($object) ) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ } $options = $object->GetFieldOptions($field); $format = $options[$this->SelectParam($params, 'input_format') ? 'input_format' : 'format']; $formatter_class = array_key_exists('formatter', $options) ? $options['formatter'] : false; if ( $formatter_class ) { + /** @var kFormatter $formatter */ $formatter = $this->Application->recallObject($formatter_class); - /* @var $formatter kFormatter */ $human_format = array_key_exists('human', $params) ? $params['human'] : false; $edit_size = array_key_exists('edit_size', $params) ? $params['edit_size'] : false; @@ -1344,8 +1344,8 @@ */ function PageInfo($params) { + /** @var kDBList $object */ $object =& $this->GetList($params); - /* @var $object kDBList */ $type = $params['type']; unset($params['type']); // remove parameters used only by current tag @@ -1568,15 +1568,15 @@ */ function prepareInputName($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $field = $this->SelectParam($params, 'name,field'); $formatter_class = $object->GetFieldOption($field, 'formatter'); if ($formatter_class == 'kMultiLanguage') { + /** @var kMultiLanguage $formatter */ $formatter = $this->Application->recallObject($formatter_class); - /* @var $formatter kMultiLanguage */ $force_primary = $object->GetFieldOption($field, 'force_primary'); $field = $formatter->LangFieldName($field, $force_primary); @@ -1699,8 +1699,8 @@ { $list =& $this->GetList($params); + /** @var ListHelper $list_helper */ $list_helper = $this->Application->recallObject('ListHelper'); - /* @var $list_helper ListHelper */ return $list_helper->hasUserSorting($list); } @@ -1842,8 +1842,8 @@ */ function FieldEquals($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ return $object->GetDBField( $this->SelectParam($params, 'name,field') ) == $params['value']; } @@ -1915,8 +1915,8 @@ return $icons['default']; } + /** @var kDBList $object */ $object = $this->getObject($params); - /* @var $object kDBList */ $icon = ''; @@ -1967,7 +1967,7 @@ $prefixes = array_key_exists('prefixes', $title_info) ? $title_info['prefixes'] : false; $all_tag_params = array_key_exists('tag_params', $title_info) ? $title_info['tag_params'] : false; - /* @var $prefixes Array */ + /** @var Array $prefixes */ if ( $prefixes ) { // extract tag_params passed directly to SectionTitle tag for specific prefix @@ -2019,8 +2019,8 @@ $section = array_key_exists('section', $params) ? $params['section'] : false; if ( $section ) { + /** @var kSectionsHelper $sections_helper */ $sections_helper = $this->Application->recallObject('SectionsHelper'); - /* @var $sections_helper kSectionsHelper */ $section_data =& $sections_helper->getSectionData($section); $title = str_replace('#section_label#', '!' . $section_data['label'] . '!', $title); @@ -2096,8 +2096,8 @@ function GridInfo($params) { + /** @var kDBList $object */ $object =& $this->GetList($params); - /* @var $object kDBList */ switch ( $params['type'] ) { case 'filtered': @@ -2137,13 +2137,13 @@ */ function ConfigFormElement($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $field = $params['field']; + /** @var InpCustomFieldsHelper $helper */ $helper = $this->Application->recallObject('InpCustomFieldsHelper'); - /* @var $helper InpCustomFieldsHelper */ $element_type = $object->GetDBField($params['element_type_field']); @@ -2361,8 +2361,8 @@ $formatter_class = $object->GetFieldOption($field, 'formatter'); if ( $formatter_class ) { + /** @var kFormatter $formatter */ $formatter = $this->Application->recallObject($formatter_class); - /* @var $formatter kFormatter */ $ret = $formatter->Format($ret, $field, $object); } @@ -2422,8 +2422,8 @@ $this->Application->RemoveVar($error_var_name); } + /** @var kDBItem $object */ $object = $this->Application->recallObject($this->Prefix . '.' . $this->Special . '-item', null, Array ('skip_autoload' => true)); - /* @var $object kDBItem */ $object->SetError($field, $pseudo); return $object->GetErrorMsg($field, false); @@ -2438,8 +2438,8 @@ */ function getObject($params = Array()) { + /** @var kDBItem $object */ $object = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params); - /* @var $object kDBItem */ if ( isset($params['requery']) && $params['requery'] ) { $this->Application->HandleEvent(new kEvent($this->getPrefixSpecial() . ':LoadItem', $params)); @@ -2495,8 +2495,8 @@ */ function ExportStatus($params) { + /** @var kCatDBItemExportHelper $export_object */ $export_object = $this->Application->recallObject('CatItemExportHelper'); - /* @var $export_object kCatDBItemExportHelper */ $event = new kEvent($this->getPrefixSpecial().':OnDummy'); @@ -2575,8 +2575,8 @@ { $editor_name = array_key_exists('name', $params) ? $params['name'] : $this->InputName($params); + /** @var fckFCKHelper $fck_helper */ $fck_helper = $this->Application->recallObject('FCKHelper'); - /* @var $fck_helper fckFCKHelper */ if ( isset($params['mode']) && $params['mode'] == 'inline' ) { return $fck_helper->CKEditorInlineTag($editor_name, $params); @@ -2615,8 +2615,8 @@ */ protected function ItemLink($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ if ( !isset($params['pass']) ) { $params['pass'] = 'm'; @@ -2641,8 +2641,8 @@ return ''; } + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $item_prefix = isset($params['item_prefix']) ? $params['item_prefix'] : $this->Prefix; @@ -2731,8 +2731,8 @@ function PrintSerializedFields($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $field = $this->SelectParam($params, 'field'); $data = unserialize($object->GetDBField($field)); @@ -2925,8 +2925,8 @@ */ function RangeFiltersUsed($params) { + /** @var kSearchHelper $search_helper */ $search_helper = $this->Application->recallObject('SearchHelper'); - /* @var $search_helper kSearchHelper */ return $search_helper->rangeFiltersUsed($this->getPrefixSpecial(), $params['grid']); } @@ -3055,8 +3055,8 @@ */ protected function OptionValue($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $value = $params['value']; $field = $this->SelectParam($params, 'name,field'); @@ -3087,8 +3087,8 @@ $prefix = $this->getPrefixSpecial(); if ( $this->Application->hasObject( $this->getPrefixSpecial() ) ) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ if ( $object->getFormName() != $form_name ) { trigger_error('Setting form to "' . $form_name . '" failed, since object "' . $this->getPrefixSpecial() . '" is created before FormName tag (e.g. in event or another tag).', E_USER_WARNING); @@ -3103,8 +3103,8 @@ return ''; } + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ return $object->getFormName(); } @@ -3120,8 +3120,8 @@ { $params['requery'] = 1; + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ return ''; }