composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-02 23:18:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source 
SVN:trunk[5973]
This commit is contained in:
Guillaume Lajarige
2018-07-25 07:23:52 +00:00
parent d0322b471d
commit e71ad536a9
15 changed files with 102 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
sources/application/search/searchform.class.inc.php
View File

@@ -271,11 +271,13 @@ class SearchForm
return $sHtml;
}
/**
* @param DBObjectSet $oSet
*
* @return array
*/
/**
* @param \DBObjectSet $oSet
*
* @return array
*
* @throws \CoreException
*/
public function GetFields($oSet)
{
$oSearch = $oSet->GetFilter();
@@ -470,17 +472,17 @@ class SearchForm
return array('values' => $aAllowedValues);
}
/**
* @param \DBObjectSearch $oSearch
* @param array $aFields
*
* @param array $aArgs
*
* @param bool $bIsRemovable
*
* @return array
* @throws \MissingQueryArgument
*/
/**
* @param \DBObjectSearch $oSearch
* @param array $aFields
* @param array $aArgs
* @param bool $bIsRemovable
*
* @return array
*
* @throws \CoreException
* @throws \MissingQueryArgument
*/
public function GetCriterion($oSearch, $aFields, $aArgs = array(), $bIsRemovable = true)
{
$aOrCriterion = array();
@@ -593,16 +595,21 @@ class SearchForm
return $aFields;
}
/**
* @param $sClass
* @param $sClassAlias
* @param $sAttCode
* @param AttributeDefinition $oAttDef
* @param $aFields
* @param bool $bHasIndex
*
* @return mixed
*/
/**
* @param string $sClass
* @param string $sClassAlias
* @param string $sAttCode
* @param \AttributeDefinition $oAttDef
* @param array $aFields
* @param bool $bHasIndex
*
* @return mixed
*
* @throws \CoreException
* @throws \MissingQueryArgument
* @throws \MySQLException
* @throws \MySQLHasGoneAwayException
*/
private function AppendField($sClass, $sClassAlias, $sAttCode, $oAttDef, $aFields, $bHasIndex = false)
{
if (!is_null($oAttDef) && ($oAttDef->GetSearchType() != AttributeDefinition::SEARCH_WIDGET_TYPE_RAW))
@@ -680,12 +687,14 @@ class SearchForm
return $aFields;
}
/**
* @param DBObjectSearch $oSearch
* @param $aContextParams
*
* @return array
*/
/**
* @param \DBObjectSearch $oSearch
* @param array $aContextParams
*
* @return array
*
* @throws \CoreException
*/
protected function GetDefaultCriterion($oSearch, &$aContextParams = array())
{
$aAndCriterion = array();