Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"criteria",
"xoops"
],
"require-dev": {
"phpunit/phpunit": "^9.5"
},
"scripts": {
"test": "phpunit --testdox"
},
"require-dev": {
"phpunit/phpunit": "^12"
}
}
12 changes: 5 additions & 7 deletions tests/CriteriaCompoTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Imponeer\Database\Criteria\Enum\Condition;
use Imponeer\Database\Criteria\Enum\Order;
use JsonException;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
use Random\RandomException;

Expand All @@ -20,9 +21,8 @@ class CriteriaCompoTest extends TestCase
* @return array<string, array{0: CriteriaCompo, 1: string|Condition}>
*
* @throws RandomException
* @throws JsonException
*/
final public function provideCondition(): array
final public static function provideCondition(): array
{
$testsVariations = [];

Expand Down Expand Up @@ -66,10 +66,9 @@ final public function provideCondition(): array
* @param CriteriaCompo $compo Build criteria with such condition
* @param string|Condition $condition join condition
*
* @dataProvider provideCondition
*
* @throws Exception
*/
#[DataProvider('provideCondition')]
final public function testCondition(CriteriaCompo $compo, string|Condition $condition): void
{
if (is_string($condition)) {
Expand Down Expand Up @@ -114,7 +113,7 @@ final public function testEmptyRender(): void
*
* @return Generator
*/
final public function provideOrder(): Generator
final public static function provideOrder(): Generator
{
foreach (Order::cases() as $order) {
yield $order->name => [$order->value];
Expand All @@ -128,9 +127,8 @@ final public function provideOrder(): Generator
* Tests order with enums
*
* @param string|Order $order
*
* @dataProvider provideOrder
*/
#[DataProvider('provideOrder')]
final public function testOrder(Order|string $order): void
{
$criteria = new CriteriaCompo();
Expand Down
11 changes: 5 additions & 6 deletions tests/CriteriaItemTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Imponeer\Database\Criteria\Enum\ComparisonOperator;
use Imponeer\Database\Criteria\Enum\Order;
use JsonException;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
use Random\RandomException;
use stdClass;
Expand All @@ -21,7 +22,7 @@ class CriteriaItemTest extends TestCase
* @throws RandomException
* @throws JsonException
*/
final public function provideComparisonOperators(): array
final public static function provideComparisonOperators(): array
{
$column = sha1(random_int(PHP_INT_MIN, PHP_INT_MAX));
$specialOperators = [
Expand Down Expand Up @@ -92,10 +93,9 @@ final public function provideComparisonOperators(): array
* @param mixed $value Value to use
* @param string|ComparisonOperator $operator Comparison operator to be used for test
*
* @dataProvider provideComparisonOperators
*
* @throws JsonException
*/
#[DataProvider('provideComparisonOperators')]
final public function testIfOperatorRendersContent(string $column, mixed $value, ComparisonOperator|string $operator): void
{
$criteria = new CriteriaItem($column, $value, $operator);
Expand All @@ -122,7 +122,7 @@ final public function testIfOperatorRendersContent(string $column, mixed $value,
*
* @return Generator
*/
final public function provideOrder(): Generator
final public static function provideOrder(): Generator
{
foreach (Order::cases() as $order) {
yield $order->value => [$order->value];
Expand All @@ -137,10 +137,9 @@ final public function provideOrder(): Generator
*
* @param string|Order $order
*
* @dataProvider provideOrder
*
* @throws RandomException
*/
#[DataProvider('provideOrder')]
final public function testOrder(Order|string $order): void
{
$criteria = new CriteriaItem(sha1(random_int(PHP_INT_MIN, PHP_INT_MAX)));
Expand Down