Skip to content

Commit 6caafd6

Browse files
hlecorchehlecorche
committed
Upgrade PHPUnit 10
1 parent efcd371 commit 6caafd6

8 files changed

+24
-24
lines changed

‎.php-cs-fixer.dist.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
'@DoctrineAnnotation' => true,
2323
'@PHP81Migration' => true,
2424
'@PHP80Migration:risky' => true,
25-
'@PHPUnit84Migration:risky' => true,
25+
'@PHPUnit100Migration:risky' => true,
2626
'array_syntax' => ['syntax' => 'short'],
2727
'fopen_flags' => true,
2828
'header_comment' => ['header' => $fileHeaderComment, 'separate' => 'both'],

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"doctrine/orm": "*",
2727
"friendsofphp/php-cs-fixer": "^3.0",
2828
"phpstan/phpstan": "^2.0",
29-
"phpunit/phpunit": "^9.3",
29+
"phpunit/phpunit": "^10.0",
3030
"symfony/cache": "*"
3131
},
3232
"suggest": {

tests/AbstractTest.php renamed to tests/AbstractTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use Ecommit\DoctrineUtils\Tests\App\Logging\SqlLogger;
2222
use PHPUnit\Framework\TestCase;
2323

24-
abstract class AbstractTest extends TestCase
24+
abstract class AbstractTestCase extends TestCase
2525
{
2626
protected EntityManagerInterface $em;
2727
protected SqlLogger $sqlLogger;

tests/Paginator/AbstractDoctrinePaginatorTest.php renamed to tests/Paginator/AbstractDoctrinePaginatorTestCase.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Ecommit\DoctrineUtils\Paginator\AbstractDoctrinePaginator;
1919
use Ecommit\DoctrineUtils\Paginator\DoctrineDBALPaginator;
2020
use Ecommit\DoctrineUtils\Paginator\DoctrineORMPaginator;
21-
use Ecommit\DoctrineUtils\Tests\AbstractTest;
21+
use Ecommit\DoctrineUtils\Tests\AbstractTestCase;
2222
use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
2323
use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
2424

@@ -31,7 +31,7 @@
3131
*
3232
* @template TOptions of array<string ,mixed>
3333
*/
34-
abstract class AbstractDoctrinePaginatorTest extends AbstractTest
34+
abstract class AbstractDoctrinePaginatorTestCase extends AbstractTestCase
3535
{
3636
/**
3737
* @return TQueryBuilder
@@ -134,7 +134,7 @@ public function testCount(mixed $page, int $maxPerPage, ?\Closure $queryBuilderU
134134
$this->checkIfQueryBuildNotChange($queryBuilder);
135135
}
136136

137-
public function getTestCountProvider(): array
137+
public static function getTestCountProvider(): array
138138
{
139139
$queryBuilderUpdaterNoData = function (QueryBuilderDBAL|QueryBuilderORM $queryBuilder): void {
140140
$queryBuilder->andWhere('0 = 1');
@@ -214,7 +214,7 @@ public function testItereatorWithoutByIdentiferOption(mixed $page, int $maxPerPa
214214
$this->checkIfQueryBuildNotChange($queryBuilder);
215215
}
216216

217-
public function getTestItereatorWithoutIdentiferOptionProvider(): array
217+
public static function getTestItereatorWithoutIdentiferOptionProvider(): array
218218
{
219219
return [
220220
[1, 5, range(1, 5), '/LIMIT 5$/'],

‎tests/Paginator/DoctrineDBALPaginatorTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
/**
2121
* @phpstan-import-type PaginatorOptions from DoctrineDBALPaginator
2222
*
23-
* @template-extends AbstractDoctrinePaginatorTest<QueryBuilderDBAL, DoctrineDBALPaginator, mixed, mixed, PaginatorOptions>
23+
* @template-extends AbstractDoctrinePaginatorTestCase<QueryBuilderDBAL, DoctrineDBALPaginator, mixed, mixed, PaginatorOptions>
2424
*/
25-
class DoctrineDBALPaginatorTest extends AbstractDoctrinePaginatorTest
25+
class DoctrineDBALPaginatorTest extends AbstractDoctrinePaginatorTestCase
2626
{
2727
public function testWithByIdentifierOption(): void
2828
{

‎tests/Paginator/DoctrineORMPaginatorTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
* @phpstan-import-type PaginatorOptions from DoctrineORMPaginator
2424
* @phpstan-import-type CountOptions from DoctrinePaginatorBuilder
2525
*
26-
* @template-extends AbstractDoctrinePaginatorTest<QueryBuilderORM, DoctrineORMPaginator, mixed, mixed, PaginatorOptions>
26+
* @template-extends AbstractDoctrinePaginatorTestCase<QueryBuilderORM, DoctrineORMPaginator, mixed, mixed, PaginatorOptions>
2727
*/
28-
class DoctrineORMPaginatorTest extends AbstractDoctrinePaginatorTest
28+
class DoctrineORMPaginatorTest extends AbstractDoctrinePaginatorTestCase
2929
{
3030
/**
3131
* @dataProvider getTestCopySimplifiedRequestToCountOptionProvider
@@ -45,7 +45,7 @@ public function testCopySimplifiedRequestToCountOption(array $options, mixed $co
4545
$this->assertSame($countOptionsExpected, $paginator->getOption('count'));
4646
}
4747

48-
public function getTestCopySimplifiedRequestToCountOptionProvider(): array
48+
public static function getTestCopySimplifiedRequestToCountOptionProvider(): array
4949
{
5050
return [
5151
[['count' => 8], 8], // With int options

‎tests/Paginator/DoctrinePaginatorBuilderTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
use Ecommit\DoctrineUtils\Paginator\DoctrineDBALPaginator;
1717
use Ecommit\DoctrineUtils\Paginator\DoctrineORMPaginator;
1818
use Ecommit\DoctrineUtils\Paginator\DoctrinePaginatorBuilder;
19-
use Ecommit\DoctrineUtils\Tests\AbstractTest;
19+
use Ecommit\DoctrineUtils\Tests\AbstractTestCase;
2020
use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
2121
use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
2222

23-
class DoctrinePaginatorBuilderTest extends AbstractTest
23+
class DoctrinePaginatorBuilderTest extends AbstractTestCase
2424
{
2525
public function testCountQueryBuilderBadQueryBuilder(): void
2626
{
@@ -48,7 +48,7 @@ public function testCountQueryBuilderDBALBadBehavior(string $behavior): void
4848
]);
4949
}
5050

51-
public function getTestCountQueryBuilderDBALBadBehaviorProvider(): array
51+
public static function getTestCountQueryBuilderDBALBadBehaviorProvider(): array
5252
{
5353
return [
5454
['bad'],
@@ -71,7 +71,7 @@ public function testCountQueryBuilderORMBadBehavior(string $behavior): void
7171
]);
7272
}
7373

74-
public function getTestCountQueryBuilderORMBadBehaviorProvider(): array
74+
public static function getTestCountQueryBuilderORMBadBehaviorProvider(): array
7575
{
7676
return [
7777
['bad'],
@@ -178,7 +178,7 @@ public function testCountQueryBuilderORMAliasOptionNotAllowed(string $behavior):
178178
]);
179179
}
180180

181-
public function getTestCountQueryBuilderORMAliasOptionNotAllowedProvider(): array
181+
public static function getTestCountQueryBuilderORMAliasOptionNotAllowedProvider(): array
182182
{
183183
return [
184184
['count_by_sub_request'],
@@ -319,7 +319,7 @@ public function testCountQueryBuilderORMSimplifiedRequestOptionNotAllowed(string
319319
]);
320320
}
321321

322-
public function getTestCountQueryBuilderORMSimplifiedRequestOptionNotAllowedProvider(): array
322+
public static function getTestCountQueryBuilderORMSimplifiedRequestOptionNotAllowedProvider(): array
323323
{
324324
return [
325325
['count_by_alias'],

‎tests/QueryBuilderFilterTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Doctrine\DBAL\Result;
1717
use Ecommit\DoctrineUtils\QueryBuilderFilter;
1818

19-
class QueryBuilderFilterTest extends AbstractTest
19+
class QueryBuilderFilterTest extends AbstractTestCase
2020
{
2121
public function testAddMultiFilterBadFilterSignDBAL(): void
2222
{
@@ -71,7 +71,7 @@ public function testAddMultiFilterORM(string $filterSign, array $filterValues, a
7171
$this->assertCount($expectedCountParameters, $this->sqlLogger->queries[1]['params']);
7272
}
7373

74-
public function getTestAddMultiFilterProvider(): array
74+
public static function getTestAddMultiFilterProvider(): array
7575
{
7676
$bigValues = array_merge(
7777
range(10, 1100),
@@ -178,7 +178,7 @@ public function testAddMultiFilterWithRestrictValuesORM(string $filterSign, arra
178178
$this->assertSame(1, $this->sqlLogger->currentQuery);
179179
}
180180

181-
public function getTestAddMultiFilterWithRestrictValuesProvider(): array
181+
public static function getTestAddMultiFilterWithRestrictValuesProvider(): array
182182
{
183183
return [
184184
// IN - WITHOUT VALUES
@@ -334,7 +334,7 @@ public function testAddEqualFilterORM(bool $equal, mixed $value, array $expected
334334
$this->assertCount($expectedCountParameters, $this->sqlLogger->queries[1]['params']);
335335
}
336336

337-
public function getTestAddEqualFilterProvider(): array
337+
public static function getTestAddEqualFilterProvider(): array
338338
{
339339
return [
340340
// EQUAL - TRUE
@@ -386,7 +386,7 @@ public function testAddComparatorFilterORM(string $sign, mixed $value, array $ex
386386
$this->assertCount($expectedCountParameters, $this->sqlLogger->queries[1]['params']);
387387
}
388388

389-
public function getTestAddComparatorFilterProvider(): array
389+
public static function getTestAddComparatorFilterProvider(): array
390390
{
391391
return [
392392
['>', 1, range(2, 52), 2],
@@ -427,7 +427,7 @@ public function testAddContainFilterORM(bool $contain, ?string $value, array $ex
427427
$this->assertCount($expectedCountParameters, $this->sqlLogger->queries[1]['params']);
428428
}
429429

430-
public function getTestAddContainFilterProvider(): array
430+
public static function getTestAddContainFilterProvider(): array
431431
{
432432
return [
433433
// CONTAIN - TRUE

0 commit comments

Comments
 (0)