Skip to content

Commit a8fae2d

Browse files
silverkszloenjeck
authored andcommitted
Fix: make filter expressions null-safe to avoid deprecation warnings
Signed-off-by: silver <s.szmajduch@posteo.de>
1 parent c09a5eb commit a8fae2d

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

lib/Db/Row2Mapper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,11 +420,11 @@ private function getFilterExpression(IQueryBuilder $qb, Column $column, string $
420420

421421
switch ($operator) {
422422
case 'begins-with':
423-
$includeDefault = str_starts_with($defaultValue, $value);
423+
$includeDefault = str_starts_with((string)($defaultValue ?? ''), $value);
424424
$filterExpression = $qb->expr()->like('value', $qb->createNamedParameter($this->db->escapeLikeParameter($value) . '%', $paramType));
425425
break;
426426
case 'ends-with':
427-
$includeDefault = str_ends_with($defaultValue, $value);
427+
$includeDefault = str_ends_with((string)($defaultValue ?? ''), $value);
428428
$filterExpression = $qb->expr()->like('value', $qb->createNamedParameter('%' . $this->db->escapeLikeParameter($value), $paramType));
429429
break;
430430
case 'contains':
@@ -452,7 +452,7 @@ private function getFilterExpression(IQueryBuilder $qb, Column $column, string $
452452
break;
453453
}
454454

455-
$includeDefault = str_contains($defaultValue, $value);
455+
$includeDefault = str_contains((string)($defaultValue ?? ''), $value);
456456
if ($column->getType() === 'selection' && $column->getSubtype() === 'multi') {
457457
$value = str_replace(['"', '\''], '', $value);
458458
$filterExpression = $qb2->expr()->orX(
@@ -490,7 +490,7 @@ private function getFilterExpression(IQueryBuilder $qb, Column $column, string $
490490
break;
491491
}
492492

493-
$includeDefault = !str_contains($defaultValue, $value);
493+
$includeDefault = !str_contains((string)($defaultValue ?? ''), $value);
494494
if ($column->getType() === 'selection' && $column->getSubtype() === 'multi') {
495495
$value = str_replace(['"', '\''], '', $value);
496496
$filterExpression = $qb2->expr()->andX(

0 commit comments

Comments
 (0)