Skip to content

Commit

Permalink
Composer updated
Browse files Browse the repository at this point in the history
  • Loading branch information
JirsaR committed Jan 14, 2020
1 parent 696182a commit 3e98663
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 77 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "hanaboso/data-grid",
"license": "proprietary",
"version": "2.1.0",
"version": "2.1.1",
"description": "Data grid",
"autoload": {
"psr-4": {
Expand Down
131 changes: 65 additions & 66 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/GridFilterAbstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ abstract class GridFilterAbstract
/**
* @var QueryBuilder
*/
protected QueryBuilder $searchQuery;
private QueryBuilder $searchQuery;

/**
* @var QueryBuilder|NULL
Expand Down
2 changes: 1 addition & 1 deletion src/GridHandlerTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ protected function getGridResponse(GridRequestDtoInterface $dto, array $items):
];
}

}
}
4 changes: 2 additions & 2 deletions src/GridRequestDto.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function setItemsPerPage(int $itemsPerPage): GridRequestDto
}

/**
* @return null|string
* @return string|NULL
*/
private function getOrderByForHeader(): ?string
{
Expand Down Expand Up @@ -242,7 +242,7 @@ public function getParamsForHeader(): array
}

/**
* @return string|null
* @return string|NULL
*/
public function getSearch(): ?string
{
Expand Down
4 changes: 2 additions & 2 deletions src/GridRequestDtoInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function getFilter(bool $withAdditional = TRUE): array;
public function getPage(): int;

/**
* @return string|null
* @return string|NULL
*/
public function getSearch(): ?string;

Expand All @@ -49,4 +49,4 @@ public function setTotal(int $total): GridRequestDtoInterface;
*/
public function getTotal(): int;

}
}
10 changes: 8 additions & 2 deletions tests/Filter/EntityFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ protected function prepareSearchQuery(): QueryBuilder
}

/**
* @return QueryBuilder|null
* @return QueryBuilder|NULL
*/
protected function configCustomCountQuery(): ?QueryBuilder
{
Expand All @@ -99,7 +99,13 @@ protected function configFilterColsCallbacks(): array
parent::configFilterColsCallbacks();

return [
'custom_string' => function (QueryBuilder $qb, $value, $name, Composite $c, ?string $operator): void {
'custom_string' => static function (
QueryBuilder $qb,
$value,
$name,
Composite $c,
?string $operator
): void {
$c->add(GridFilterAbstract::getCondition($qb, $name, $value, $operator));
},
];
Expand Down
1 change: 0 additions & 1 deletion tests/Integration/GridHandlerTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ public function testGetGridResponse(): void
}

}

2 changes: 1 addition & 1 deletion tests/TestClass/TestClass.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ final class TestClass

use GridHandlerTrait;

}
}

0 comments on commit 3e98663

Please sign in to comment.