Skip to content

Commit

Permalink
Ensure data provider parameters are consistent with test methods sign…
Browse files Browse the repository at this point in the history
…atures (#2627)

This addresses a deprecation notice that was introduced in PHPUnit 10.5.18
  • Loading branch information
jmikola authored Apr 22, 2024
1 parent 4325c11 commit 7972411
Showing 1 changed file with 13 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -606,30 +606,27 @@ public static function dataProviderTestWriteConcern(): array
{
return [
'default' => [
'className' => DocumentPersisterTestDocument::class,
'class' => DocumentPersisterTestDocument::class,
'writeConcern' => 1,
],
'acknowledged' => [
'className' => DocumentPersisterWriteConcernAcknowledged::class,
'class' => DocumentPersisterWriteConcernAcknowledged::class,
'writeConcern' => 1,
],
'unacknowledged' => [
'className' => DocumentPersisterWriteConcernUnacknowledged::class,
'class' => DocumentPersisterWriteConcernUnacknowledged::class,
'writeConcern' => 0,
],
'majority' => [
'className' => DocumentPersisterWriteConcernMajority::class,
'class' => DocumentPersisterWriteConcernMajority::class,
'writeConcern' => 'majority',
],
];
}

/**
* @param int|string $writeConcern
* @psalm-param class-string $class
*/
/** @psalm-param class-string $class */
#[DataProvider('dataProviderTestWriteConcern')]
public function testExecuteInsertsRespectsWriteConcern(string $class, $writeConcern): void
public function testExecuteInsertsRespectsWriteConcern(string $class, string|int $writeConcern): void
{
$this->skipTestIfTransactionalFlushEnabled();

Expand All @@ -651,7 +648,7 @@ public function testExecuteInsertsRespectsWriteConcern(string $class, $writeConc

/** @psalm-param class-string $class */
#[DataProvider('dataProviderTestWriteConcern')]
public function testExecuteInsertsOmitsWriteConcernInTransaction(string $class): void
public function testExecuteInsertsOmitsWriteConcernInTransaction(string $class, string|int $writeConcern): void
{
$this->skipTestIfTransactionalFlushDisabled();

Expand All @@ -671,12 +668,9 @@ public function testExecuteInsertsOmitsWriteConcernInTransaction(string $class):
$this->dm->flush();
}

/**
* @param int|string $writeConcern
* @psalm-param class-string $class
*/
/** @psalm-param class-string $class */
#[DataProvider('dataProviderTestWriteConcern')]
public function testExecuteUpsertsRespectsWriteConcern(string $class, $writeConcern): void
public function testExecuteUpsertsRespectsWriteConcern(string $class, string|int $writeConcern): void
{
$this->skipTestIfTransactionalFlushEnabled();

Expand All @@ -699,7 +693,7 @@ public function testExecuteUpsertsRespectsWriteConcern(string $class, $writeConc

/** @psalm-param class-string $class */
#[DataProvider('dataProviderTestWriteConcern')]
public function testExecuteUpsertsDoesNotUseWriteConcernInTransaction(string $class): void
public function testExecuteUpsertsDoesNotUseWriteConcernInTransaction(string $class, string|int $writeConcern): void
{
$this->skipTestIfTransactionalFlushDisabled();

Expand All @@ -720,12 +714,9 @@ public function testExecuteUpsertsDoesNotUseWriteConcernInTransaction(string $cl
$this->dm->flush();
}

/**
* @param int|string $writeConcern
* @psalm-param class-string $class
*/
/** @psalm-param class-string $class */
#[DataProvider('dataProviderTestWriteConcern')]
public function testRemoveRespectsWriteConcern(string $class, $writeConcern): void
public function testRemoveRespectsWriteConcern(string $class, string|int $writeConcern): void
{
$this->skipTestIfTransactionalFlushEnabled();

Expand All @@ -750,7 +741,7 @@ public function testRemoveRespectsWriteConcern(string $class, $writeConcern): vo

/** @psalm-param class-string $class */
#[DataProvider('dataProviderTestWriteConcern')]
public function testRemoveDoesNotUseWriteConcernInTransaction(string $class): void
public function testRemoveDoesNotUseWriteConcernInTransaction(string $class, string|int $writeConcern): void
{
$this->skipTestIfTransactionalFlushDisabled();

Expand Down

0 comments on commit 7972411

Please sign in to comment.