Skip to content

Commit 336106c

Browse files
committed
Fix data providers
1 parent c8b48ab commit 336106c

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

src/Pimple/Tests/PimpleTest.php

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
namespace Pimple\Tests;
2828

29+
use PHPUnit\Framework\Attributes\DataProvider;
2930
use PHPUnit\Framework\TestCase;
3031
use Pimple\Container;
3132

@@ -150,6 +151,7 @@ public function testUnset()
150151
/**
151152
* @dataProvider serviceDefinitionProvider
152153
*/
154+
#[DataProvider('serviceDefinitionProvider')]
153155
public function testShare($service)
154156
{
155157
$pimple = new Container();
@@ -167,6 +169,7 @@ public function testShare($service)
167169
/**
168170
* @dataProvider serviceDefinitionProvider
169171
*/
172+
#[DataProvider('serviceDefinitionProvider')]
170173
public function testProtect($service)
171174
{
172175
$pimple = new Container();
@@ -228,6 +231,7 @@ public function testLegacyRawValidatesKeyIsPresent()
228231
/**
229232
* @dataProvider serviceDefinitionProvider
230233
*/
234+
#[DataProvider('serviceDefinitionProvider')]
231235
public function testExtend($service)
232236
{
233237
$pimple = new Container();
@@ -332,6 +336,7 @@ public function settingNonInvokableObjectShouldTreatItAsParameter()
332336
/**
333337
* @dataProvider badServiceDefinitionProvider
334338
*/
339+
#[DataProvider('badServiceDefinitionProvider')]
335340
public function testFactoryFailsForInvalidServiceDefinitions($service)
336341
{
337342
$this->expectException(\Pimple\Exception\ExpectedInvokableException::class);
@@ -345,6 +350,7 @@ public function testFactoryFailsForInvalidServiceDefinitions($service)
345350
* @group legacy
346351
* @dataProvider badServiceDefinitionProvider
347352
*/
353+
#[DataProvider('badServiceDefinitionProvider')]
348354
public function testLegacyFactoryFailsForInvalidServiceDefinitions($service)
349355
{
350356
$this->expectException(\InvalidArgumentException::class);
@@ -357,6 +363,7 @@ public function testLegacyFactoryFailsForInvalidServiceDefinitions($service)
357363
/**
358364
* @dataProvider badServiceDefinitionProvider
359365
*/
366+
#[DataProvider('badServiceDefinitionProvider')]
360367
public function testProtectFailsForInvalidServiceDefinitions($service)
361368
{
362369
$this->expectException(\Pimple\Exception\ExpectedInvokableException::class);
@@ -370,6 +377,7 @@ public function testProtectFailsForInvalidServiceDefinitions($service)
370377
* @group legacy
371378
* @dataProvider badServiceDefinitionProvider
372379
*/
380+
#[DataProvider('badServiceDefinitionProvider')]
373381
public function testLegacyProtectFailsForInvalidServiceDefinitions($service)
374382
{
375383
$this->expectException(\InvalidArgumentException::class);
@@ -382,6 +390,7 @@ public function testLegacyProtectFailsForInvalidServiceDefinitions($service)
382390
/**
383391
* @dataProvider badServiceDefinitionProvider
384392
*/
393+
#[DataProvider('badServiceDefinitionProvider')]
385394
public function testExtendFailsForKeysNotContainingServiceDefinitions($service)
386395
{
387396
$this->expectException(\Pimple\Exception\InvalidServiceIdentifierException::class);
@@ -397,6 +406,7 @@ public function testExtendFailsForKeysNotContainingServiceDefinitions($service)
397406
* @group legacy
398407
* @dataProvider badServiceDefinitionProvider
399408
*/
409+
#[DataProvider('badServiceDefinitionProvider')]
400410
public function testLegacyExtendFailsForKeysNotContainingServiceDefinitions($service)
401411
{
402412
$this->expectException(\InvalidArgumentException::class);
@@ -412,7 +422,8 @@ public function testLegacyExtendFailsForKeysNotContainingServiceDefinitions($ser
412422
* @group legacy
413423
* @expectedDeprecation How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure "foo" should be protected?
414424
*/
415-
public function testExtendingProtectedClosureDeprecation()
425+
#[DataProvider('badServiceDefinitionProvider')]
426+
public function testExtendingProtectedClosureDeprecation($service)
416427
{
417428
$pimple = new Container();
418429
$pimple['foo'] = $pimple->protect(function () {
@@ -429,6 +440,8 @@ public function testExtendingProtectedClosureDeprecation()
429440
/**
430441
* @dataProvider badServiceDefinitionProvider
431442
*/
443+
#[DataProvider('badServiceDefinitionProvider')]
444+
#[DataProvider('badServiceDefinitionProvider')]
432445
public function testExtendFailsForInvalidServiceDefinitions($service)
433446
{
434447
$this->expectException(\Pimple\Exception\ExpectedInvokableException::class);
@@ -444,6 +457,7 @@ public function testExtendFailsForInvalidServiceDefinitions($service)
444457
* @group legacy
445458
* @dataProvider badServiceDefinitionProvider
446459
*/
460+
#[DataProvider('badServiceDefinitionProvider')]
447461
public function testLegacyExtendFailsForInvalidServiceDefinitions($service)
448462
{
449463
$this->expectException(\InvalidArgumentException::class);
@@ -488,7 +502,7 @@ public function testExtendFailsIfFrozenServiceIsInvokable()
488502
/**
489503
* Provider for invalid service definitions.
490504
*/
491-
public function badServiceDefinitionProvider()
505+
public static function badServiceDefinitionProvider()
492506
{
493507
return [
494508
[123],
@@ -499,7 +513,7 @@ public function badServiceDefinitionProvider()
499513
/**
500514
* Provider for service definitions.
501515
*/
502-
public function serviceDefinitionProvider()
516+
public static function serviceDefinitionProvider()
503517
{
504518
return [
505519
[function ($value) {

0 commit comments

Comments
 (0)