@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | * Static Function to get the Instance of CustomView. |
275 | 275 | * |
276 | 276 | * @param string $moduleName |
277 | - * @param mixed $userModelOrId |
|
277 | + * @param User $userModelOrId |
|
278 | 278 | * |
279 | 279 | * @return \self |
280 | 280 | */ |
@@ -488,7 +488,6 @@ discard block |
||
488 | 488 | /** |
489 | 489 | * Sorting conditions. |
490 | 490 | * |
491 | - * @param array|null $array |
|
492 | 491 | * |
493 | 492 | * @return array|null |
494 | 493 | */ |
@@ -550,7 +549,7 @@ discard block |
||
550 | 549 | /** |
551 | 550 | * Get default cvId. |
552 | 551 | * |
553 | - * @return int|string |
|
552 | + * @return integer |
|
554 | 553 | */ |
555 | 554 | public function getDefaultCvId() |
556 | 555 | { |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | [$fieldModuleName, $fieldName, $sourceFieldName] = array_pad(explode(':', $rule['fieldname']), 3, false); |
453 | 453 | $operator = $rule['operator']; |
454 | 454 | $value = $rule['value']; |
455 | - if (!$this->get('advfilterlistDbFormat') && !in_array($operator, App\CustomView::FILTERS_WITHOUT_VALUES + array_keys(App\CustomView::DATE_FILTER_CONDITIONS))) { |
|
455 | + if (!$this->get('advfilterlistDbFormat') && !in_array($operator, App\CustomView::FILTERS_WITHOUT_VALUES + array_keys(App\CustomView::DATE_FILTER_CONDITIONS))) { |
|
456 | 456 | $value = Vtiger_Field_Model::getInstance($fieldName, Vtiger_Module_Model::getInstance($fieldModuleName)) |
457 | 457 | ->getUITypeModel() |
458 | 458 | ->getDbConditionBuilderValue($rule['value'], $operator); |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | ->innerJoin('vtiger_customview', 'vtiger_cvcolumnlist.cvid = vtiger_customview.cvid') |
613 | 613 | ->where(['vtiger_customview.cvid' => $cvId])->orderBy('vtiger_cvcolumnlist.columnindex') |
614 | 614 | ->createCommand()->queryAllByGroup(1); |
615 | - return array_map(function ($item) { |
|
615 | + return array_map(function($item) { |
|
616 | 616 | return "{$item['module_name']}:{$item['field_name']}" . ($item['source_field_name'] ? ":{$item['source_field_name']}" : ''); |
617 | 617 | }, $selectedFields); |
618 | 618 | } |
@@ -16,9 +16,9 @@ |
||
16 | 16 | */ |
17 | 17 | public function getDbConditionBuilderValue($value, string $operator) |
18 | 18 | { |
19 | - $values= []; |
|
19 | + $values = []; |
|
20 | 20 | foreach ($value as $val) { |
21 | - $values[]= parent::getDbConditionBuilderValue($val, $operator); |
|
21 | + $values[] = parent::getDbConditionBuilderValue($val, $operator); |
|
22 | 22 | } |
23 | 23 | return implode('##', $values); |
24 | 24 | } |
@@ -28,7 +28,7 @@ |
||
28 | 28 | $values = explode(',', $value); |
29 | 29 | foreach ($values as &$val) { |
30 | 30 | $this->validate($val, true); |
31 | - $val = $this->getDBValue($val); |
|
31 | + $val = $this->getDBValue($val); |
|
32 | 32 | } |
33 | 33 | return implode(',', $values); |
34 | 34 | } |