mirror of
https://github.com/pestphp/pest.git
synced 2026-09-05 22:33:35 +02:00
fix: static callable datasets
This commit is contained in:
@@ -141,7 +141,7 @@ final class DatasetsRepository
|
|||||||
$datasets[$index] = self::getScopedDataset($data, $currentTestFile);
|
$datasets[$index] = self::getScopedDataset($data, $currentTestFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_callable($datasets[$index])) {
|
if (! is_array($datasets[$index]) && is_callable($datasets[$index])) {
|
||||||
$datasets[$index] = call_user_func($datasets[$index]);
|
$datasets[$index] = call_user_func($datasets[$index]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1764,6 +1764,7 @@
|
|||||||
✓ it shows the correct description for long texts with newlines
|
✓ it shows the correct description for long texts with newlines
|
||||||
✓ it shows the correct description for arrays with many elements
|
✓ it shows the correct description for arrays with many elements
|
||||||
✓ it shows the correct description of datasets with html
|
✓ it shows the correct description of datasets with html
|
||||||
|
✓ it does not treat a two element dataset of class names as a callable
|
||||||
|
|
||||||
PASS Tests\Unit\Expectations\OppositeExpectation
|
PASS Tests\Unit\Expectations\OppositeExpectation
|
||||||
✓ it throw expectation failed exception with string argument
|
✓ it throw expectation failed exception with string argument
|
||||||
@@ -2225,4 +2226,4 @@
|
|||||||
✓ pass with dataset with ('my-datas-set-value')
|
✓ pass with dataset with ('my-datas-set-value')
|
||||||
✓ within describe → pass with dataset with ('my-datas-set-value')
|
✓ within describe → pass with dataset with ('my-datas-set-value')
|
||||||
|
|
||||||
Tests: 2 deprecated, 4 warnings, 5 incomplete, 2 notices, 40 todos, 35 skipped, 1572 passed (3413 assertions)
|
Tests: 2 deprecated, 4 warnings, 5 incomplete, 2 notices, 40 todos, 35 skipped, 1573 passed (3414 assertions)
|
||||||
@@ -109,3 +109,27 @@ it('shows the correct description of datasets with html', function (): void {
|
|||||||
|
|
||||||
expect($descriptions[0])->toBe('(\'<div class="flex items-center"></div>\')');
|
expect($descriptions[0])->toBe('(\'<div class="flex items-center"></div>\')');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('does not treat a two element dataset of class names as a callable', function (): void {
|
||||||
|
$datasets = DatasetsRepository::resolve([
|
||||||
|
[
|
||||||
|
MagicCallDataset::class,
|
||||||
|
AnotherMagicCallDataset::class,
|
||||||
|
],
|
||||||
|
], __FILE__);
|
||||||
|
|
||||||
|
expect(array_values($datasets))->toBe([
|
||||||
|
[MagicCallDataset::class],
|
||||||
|
[AnotherMagicCallDataset::class],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
class MagicCallDataset
|
||||||
|
{
|
||||||
|
public static function __callStatic(string $name, array $arguments): void
|
||||||
|
{
|
||||||
|
throw new RuntimeException('This dataset should not be called.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class AnotherMagicCallDataset {}
|
||||||
|
|||||||
@@ -26,13 +26,13 @@ test('parallel', function () use ($run): void {
|
|||||||
$file = file_get_contents(__FILE__);
|
$file = file_get_contents(__FILE__);
|
||||||
$file = preg_replace(
|
$file = preg_replace(
|
||||||
'/\$expected = \'.*?\';/',
|
'/\$expected = \'.*?\';/',
|
||||||
"\$expected = '2 deprecated, 4 warnings, 5 incomplete, 3 notices, 40 todos, 27 skipped, 1554 passed (3358 assertions)';",
|
"\$expected = '2 deprecated, 4 warnings, 5 incomplete, 3 notices, 40 todos, 27 skipped, 1555 passed (3359 assertions)';",
|
||||||
$file,
|
$file,
|
||||||
);
|
);
|
||||||
file_put_contents(__FILE__, $file);
|
file_put_contents(__FILE__, $file);
|
||||||
}
|
}
|
||||||
|
|
||||||
$expected = '2 deprecated, 4 warnings, 5 incomplete, 3 notices, 40 todos, 27 skipped, 1554 passed (3358 assertions)';
|
$expected = '2 deprecated, 4 warnings, 5 incomplete, 3 notices, 40 todos, 27 skipped, 1555 passed (3359 assertions)';
|
||||||
|
|
||||||
expect($output)
|
expect($output)
|
||||||
->toContain("Tests: {$expected}")
|
->toContain("Tests: {$expected}")
|
||||||
|
|||||||
Reference in New Issue
Block a user