1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
Date: Wed, 12 Mar 2025 07:42:17 +0100
Subject: Modernize PHPUnit syntax
---
src/Pimple/Tests/PimpleTest.php | 42 +++++++++++++++--------------------------
1 file changed, 15 insertions(+), 27 deletions(-)
diff --git a/src/Pimple/Tests/PimpleTest.php b/src/Pimple/Tests/PimpleTest.php
index b0f0f34..7aea669 100644
--- a/src/Pimple/Tests/PimpleTest.php
+++ b/src/Pimple/Tests/PimpleTest.php
@@ -26,6 +26,8 @@
namespace Pimple\Tests;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\TestCase;
use Pimple\Container;
@@ -147,9 +149,7 @@ class PimpleTest extends TestCase
$this->assertFalse(isset($pimple['service']));
}
- /**
- * @dataProvider serviceDefinitionProvider
- */
+ #[DataProvider('serviceDefinitionProvider')]
public function testShare($service)
{
$pimple = new Container();
@@ -164,9 +164,7 @@ class PimpleTest extends TestCase
$this->assertSame($serviceOne, $serviceTwo);
}
- /**
- * @dataProvider serviceDefinitionProvider
- */
+ #[DataProvider('serviceDefinitionProvider')]
public function testProtect($service)
{
$pimple = new Container();
@@ -225,9 +223,7 @@ class PimpleTest extends TestCase
$pimple->raw('foo');
}
- /**
- * @dataProvider serviceDefinitionProvider
- */
+ #[DataProvider('serviceDefinitionProvider')]
public function testExtend($service)
{
$pimple = new Container();
@@ -311,7 +307,7 @@ class PimpleTest extends TestCase
$this->assertEquals(['foo', 'bar'], $pimple->keys());
}
- /** @test */
+ #[Test]
public function settingAnInvokableObjectShouldTreatItAsFactory()
{
$pimple = new Container();
@@ -320,7 +316,7 @@ class PimpleTest extends TestCase
$this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['invokable']);
}
- /** @test */
+ #[Test]
public function settingNonInvokableObjectShouldTreatItAsParameter()
{
$pimple = new Container();
@@ -329,9 +325,7 @@ class PimpleTest extends TestCase
$this->assertInstanceOf('Pimple\Tests\Fixtures\NonInvokable', $pimple['non_invokable']);
}
- /**
- * @dataProvider badServiceDefinitionProvider
- */
+ #[DataProvider('badServiceDefinitionProvider')]
public function testFactoryFailsForInvalidServiceDefinitions($service)
{
$this->expectException(\Pimple\Exception\ExpectedInvokableException::class);
@@ -343,8 +337,8 @@ class PimpleTest extends TestCase
/**
* @group legacy
- * @dataProvider badServiceDefinitionProvider
*/
+ #[DataProvider('badServiceDefinitionProvider')]
public function testLegacyFactoryFailsForInvalidServiceDefinitions($service)
{
$this->expectException(\InvalidArgumentException::class);
@@ -354,9 +348,7 @@ class PimpleTest extends TestCase
$pimple->factory($service);
}
- /**
- * @dataProvider badServiceDefinitionProvider
- */
+ #[DataProvider('badServiceDefinitionProvider')]
public function testProtectFailsForInvalidServiceDefinitions($service)
{
$this->expectException(\Pimple\Exception\ExpectedInvokableException::class);
@@ -368,8 +360,8 @@ class PimpleTest extends TestCase
/**
* @group legacy
- * @dataProvider badServiceDefinitionProvider
*/
+ #[DataProvider('badServiceDefinitionProvider')]
public function testLegacyProtectFailsForInvalidServiceDefinitions($service)
{
$this->expectException(\InvalidArgumentException::class);
@@ -379,9 +371,7 @@ class PimpleTest extends TestCase
$pimple->protect($service);
}
- /**
- * @dataProvider badServiceDefinitionProvider
- */
+ #[DataProvider('badServiceDefinitionProvider')]
public function testExtendFailsForKeysNotContainingServiceDefinitions($service)
{
$this->expectException(\Pimple\Exception\InvalidServiceIdentifierException::class);
@@ -395,8 +385,8 @@ class PimpleTest extends TestCase
/**
* @group legacy
- * @dataProvider badServiceDefinitionProvider
*/
+ #[DataProvider('badServiceDefinitionProvider')]
public function testLegacyExtendFailsForKeysNotContainingServiceDefinitions($service)
{
$this->expectException(\InvalidArgumentException::class);
@@ -426,9 +416,7 @@ class PimpleTest extends TestCase
$this->assertSame('bar-baz', $pimple['foo']);
}
- /**
- * @dataProvider badServiceDefinitionProvider
- */
+ #[DataProvider('badServiceDefinitionProvider')]
public function testExtendFailsForInvalidServiceDefinitions($service)
{
$this->expectException(\Pimple\Exception\ExpectedInvokableException::class);
@@ -442,8 +430,8 @@ class PimpleTest extends TestCase
/**
* @group legacy
- * @dataProvider badServiceDefinitionProvider
*/
+ #[DataProvider('badServiceDefinitionProvider')]
public function testLegacyExtendFailsForInvalidServiceDefinitions($service)
{
$this->expectException(\InvalidArgumentException::class);
|
