Skip to content

Commit 43ed82c

Browse files
Add types to implementations of RewriteColumnBehavior::rewriteColumn()
Add types and missing return statements for compatibility with ipl-orm.
1 parent d85cda2 commit 43ed82c

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

library/Notifications/Model/Behavior/IcingaCustomVars.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function isSelectableColumn(string $name): bool
2626
|| str_starts_with($name, self::SERVICE_PREFIX);
2727
}
2828

29-
public function rewriteColumn($column, ?string $relation = null): null
29+
public function rewriteColumn(mixed $column, ?string $relation = null): null
3030
{
3131
return null;
3232
}

library/Notifications/Model/Behavior/IdTagAggregator.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function setQuery(Query $query): static
3636
return $this;
3737
}
3838

39-
public function rewriteColumn($column, ?string $relation = null)
39+
public function rewriteColumn(mixed $column, ?string $relation = null): ?AliasedExpression
4040
{
4141
if ($column === 'id_tags') {
4242
$path = ($relation ?? $this->query->getModel()->getTableAlias()) . '.object_id_tag';
@@ -64,6 +64,8 @@ public function rewriteColumn($column, ?string $relation = null)
6464
$this->query->getResolver()->qualifyColumn('value', $pathAlias)
6565
));
6666
}
67+
68+
return null;
6769
}
6870

6971
public function isSelectableColumn(string $name): bool

library/Notifications/Model/Behavior/ObjectTags.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function rewriteCondition(Filter\Condition $condition, $relation = null):
4848
return $filterAll;
4949
}
5050

51-
public function rewriteColumn($column, $relation = null): AliasedExpression
51+
public function rewriteColumn(mixed $column, $relation = null): AliasedExpression
5252
{
5353
/** @var string $relation */
5454
/** @var string $column */

0 commit comments

Comments
 (0)