Skip to content

Commit 911b1c1

Browse files
chriskappchriskapp
committed
use improved filter
1 parent 772a304 commit 911b1c1

File tree

83 files changed

+279
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+279
-204
lines changed

‎src/Backend/Action/Action/GetAll.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use Fusio\Engine\ContextInterface;
2525
use Fusio\Engine\ParametersInterface;
2626
use Fusio\Engine\RequestInterface;
27-
use Fusio\Impl\Backend\Filter\TaxonomyQueryFilter;
27+
use Fusio\Impl\Backend\Filter\QueryFilter;
2828
use Fusio\Impl\Backend\View;
2929

3030
/**
@@ -46,7 +46,7 @@ public function __construct(View\Action $view)
4646
public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
4747
{
4848
return $this->view->getCollection(
49-
TaxonomyQueryFilter::from($request),
49+
QueryFilter::from($request),
5050
$context
5151
);
5252
}

‎src/Backend/Action/Cronjob/GetAll.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
use Fusio\Engine\ParametersInterface;
2626
use Fusio\Engine\RequestInterface;
2727
use Fusio\Impl\Backend\Filter\QueryFilter;
28-
use Fusio\Impl\Backend\Filter\TaxonomyQueryFilter;
2928
use Fusio\Impl\Backend\View;
3029

3130
/**
@@ -47,7 +46,7 @@ public function __construct(View\Cronjob $view)
4746
public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
4847
{
4948
return $this->view->getCollection(
50-
TaxonomyQueryFilter::from($request),
49+
QueryFilter::from($request),
5150
$context
5251
);
5352
}

‎src/Backend/Action/Event/GetAll.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
use Fusio\Engine\ParametersInterface;
2626
use Fusio\Engine\RequestInterface;
2727
use Fusio\Impl\Backend\Filter\QueryFilter;
28-
use Fusio\Impl\Backend\Filter\TaxonomyQueryFilter;
2928
use Fusio\Impl\Backend\View;
3029

3130
/**
@@ -47,7 +46,7 @@ public function __construct(View\Event $view)
4746
public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
4847
{
4948
return $this->view->getCollection(
50-
TaxonomyQueryFilter::from($request),
49+
QueryFilter::from($request),
5150
$context
5251
);
5352
}

‎src/Backend/Action/Operation/GetAll.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use Fusio\Engine\ContextInterface;
2525
use Fusio\Engine\ParametersInterface;
2626
use Fusio\Engine\RequestInterface;
27-
use Fusio\Impl\Backend\Filter\TaxonomyQueryFilter;
27+
use Fusio\Impl\Backend\Filter\QueryFilter;
2828
use Fusio\Impl\Backend\View;
2929

3030
/**
@@ -46,7 +46,7 @@ public function __construct(View\Operation $view)
4646
public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
4747
{
4848
return $this->view->getCollection(
49-
TaxonomyQueryFilter::from($request),
49+
QueryFilter::from($request),
5050
$context
5151
);
5252
}

‎src/Backend/Action/Schema/GetAll.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use Fusio\Engine\ContextInterface;
2525
use Fusio\Engine\ParametersInterface;
2626
use Fusio\Engine\RequestInterface;
27-
use Fusio\Impl\Backend\Filter\TaxonomyQueryFilter;
27+
use Fusio\Impl\Backend\Filter\QueryFilter;
2828
use Fusio\Impl\Backend\View;
2929

3030
/**
@@ -46,7 +46,7 @@ public function __construct(View\Schema $view)
4646
public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
4747
{
4848
return $this->view->getCollection(
49-
TaxonomyQueryFilter::from($request),
49+
QueryFilter::from($request),
5050
$context
5151
);
5252
}

‎src/Backend/Action/Trigger/GetAll.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use Fusio\Engine\ContextInterface;
2525
use Fusio\Engine\ParametersInterface;
2626
use Fusio\Engine\RequestInterface;
27-
use Fusio\Impl\Backend\Filter\TaxonomyQueryFilter;
27+
use Fusio\Impl\Backend\Filter\QueryFilter;
2828
use Fusio\Impl\Backend\View;
2929

3030
/**
@@ -46,7 +46,7 @@ public function __construct(View\Trigger $view)
4646
public function handle(RequestInterface $request, ParametersInterface $configuration, ContextInterface $context): mixed
4747
{
4848
return $this->view->getCollection(
49-
TaxonomyQueryFilter::from($request),
49+
QueryFilter::from($request),
5050
$context
5151
);
5252
}

‎src/Backend/Filter/App/Token/TokenQueryFilter.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020

2121
namespace Fusio\Impl\Backend\Filter\App\Token;
2222

23+
use DateTimeImmutable;
2324
use Fusio\Engine\RequestInterface;
2425
use Fusio\Impl\Backend\Filter\DateQueryFilter;
2526
use PSX\Sql\Condition;
27+
use PSX\Sql\TableInterface;
2628

2729
/**
2830
* TokenQueryFilter
@@ -39,7 +41,7 @@ class TokenQueryFilter extends DateQueryFilter
3941
private ?string $scope = null;
4042
private ?string $ip = null;
4143

42-
public function __construct(?int $appId, ?int $userId, ?int $status, ?string $scope, ?string $ip, \DateTimeImmutable $from, \DateTimeImmutable $to, int $startIndex, int $count, ?string $search = null, ?string $sortBy = null, ?string $sortOrder = null)
44+
public function __construct(?int $appId, ?int $userId, ?int $status, ?string $scope, ?string $ip, DateTimeImmutable $from, DateTimeImmutable $to, int $startIndex, int $count, ?string $search = null, ?string $sortBy = null, ?string $sortOrder = null)
4345
{
4446
parent::__construct($from, $to, $startIndex, $count, $search, $sortBy, $sortOrder);
4547

@@ -75,9 +77,9 @@ public function getIp(): ?string
7577
return $this->ip;
7678
}
7779

78-
public function getCondition(array $columnMapping, ?string $alias = null): Condition
80+
public function getCondition(TableInterface $table, array $columnMapping, ?string $alias = null): Condition
7981
{
80-
$condition = parent::getCondition($columnMapping, $alias);
82+
$condition = parent::getCondition($table, $columnMapping, $alias);
8183
$alias = $this->getAlias($alias);
8284

8385
if (!empty($this->appId)) {

‎src/Backend/Filter/Audit/AuditQueryFilter.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222

2323
use Fusio\Engine\RequestInterface;
2424
use Fusio\Impl\Backend\Filter\DateQueryFilter;
25+
use PSX\Sql\ColumnInterface;
2526
use PSX\Sql\Condition;
27+
use PSX\Sql\TableInterface;
2628

2729
/**
2830
* AuditQueryFilter
@@ -75,9 +77,9 @@ public function getMessage(): ?string
7577
return $this->message;
7678
}
7779

78-
public function getCondition(array $columnMapping, ?string $alias = null): Condition
80+
public function getCondition(TableInterface $table, array $columnMapping, ?string $alias = null): Condition
7981
{
80-
$condition = parent::getCondition($columnMapping, $alias);
82+
$condition = parent::getCondition($table, $columnMapping, $alias);
8183
$alias = $this->getAlias($alias);
8284

8385
if (!empty($this->appId)) {

‎src/Backend/Filter/ClassQueryFilter.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
use Fusio\Engine\RequestInterface;
2424
use PSX\Sql\Condition;
25+
use PSX\Sql\TableInterface;
2526

2627
/**
2728
* DateQueryFilter
@@ -48,9 +49,9 @@ public function getClass(): array
4849
return $this->class;
4950
}
5051

51-
public function getCondition(array $columnMapping, ?string $alias = null): Condition
52+
public function getCondition(TableInterface $table, array $columnMapping, ?string $alias = null): Condition
5253
{
53-
$condition = parent::getCondition($columnMapping, $alias);
54+
$condition = parent::getCondition($table, $columnMapping, $alias);
5455
$alias = $this->getAlias($alias);
5556

5657
if (isset($columnMapping[self::COLUMN_CLASS]) && count($this->class) > 0) {

‎src/Backend/Filter/DateQueryFilter.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
use DateTimeImmutable;
2424
use Exception;
2525
use Fusio\Engine\RequestInterface;
26+
use PSX\Sql\ColumnInterface;
2627
use PSX\Sql\Condition;
28+
use PSX\Sql\TableInterface;
2729

2830
/**
2931
* DateQueryFilter
@@ -57,9 +59,9 @@ public function getTo(): DateTimeImmutable
5759
return $this->to;
5860
}
5961

60-
public function getCondition(array $columnMapping, ?string $alias = null): Condition
62+
public function getCondition(TableInterface $table, array $columnMapping, ?string $alias = null): Condition
6163
{
62-
$condition = parent::getCondition($columnMapping, $alias);
64+
$condition = parent::getCondition($table, $columnMapping, $alias);
6365
$alias = $this->getAlias($alias);
6466

6567
if (isset($columnMapping[self::COLUMN_DATE])) {

0 commit comments

Comments
 (0)