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
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
|
From: Peter Rehm <peter.rehm@renvest.de>
Date: Wed, 8 Feb 2017 08:24:27 +0100
Subject: Update to PHPUnit namespaces
Origin: https://github.com/symfony/security-acl/commit/795138b615e4c2dccb48cb9f6294e2ac301a51fd
Bug-Debian: https://bugs.debian.org/882924
---
Tests/Dbal/AclProviderBenchmarkTest.php | 3 ++-
Tests/Dbal/AclProviderTest.php | 3 ++-
Tests/Dbal/MutableAclProviderTest.php | 3 ++-
Tests/Domain/AclTest.php | 3 ++-
Tests/Domain/AuditLoggerTest.php | 4 +++-
Tests/Domain/DoctrineAclCacheTest.php | 3 ++-
Tests/Domain/EntryTest.php | 3 ++-
Tests/Domain/FieldEntryTest.php | 3 ++-
Tests/Domain/ObjectIdentityRetrievalStrategyTest.php | 3 ++-
Tests/Domain/ObjectIdentityTest.php | 4 +++-
Tests/Domain/PermissionGrantingStrategyTest.php | 3 ++-
Tests/Domain/RoleSecurityIdentityTest.php | 3 ++-
Tests/Domain/SecurityIdentityRetrievalStrategyTest.php | 3 ++-
Tests/Domain/UserSecurityIdentityTest.php | 3 ++-
Tests/Permission/BasicPermissionMapTest.php | 3 ++-
Tests/Permission/MaskBuilderTest.php | 3 ++-
Tests/Voter/AclVoterTest.php | 3 ++-
17 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/Tests/Dbal/AclProviderBenchmarkTest.php b/Tests/Dbal/AclProviderBenchmarkTest.php
index c95b474..b5b4dab 100644
--- a/Tests/Dbal/AclProviderBenchmarkTest.php
+++ b/Tests/Dbal/AclProviderBenchmarkTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Security\Acl\Tests\Dbal;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Dbal\AclProvider;
use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;
use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
@@ -20,7 +21,7 @@ use Doctrine\DBAL\DriverManager;
/**
* @group benchmark
*/
-class AclProviderBenchmarkTest extends \PHPUnit_Framework_TestCase
+class AclProviderBenchmarkTest extends TestCase
{
/** @var \Doctrine\DBAL\Connection */
protected $con;
diff --git a/Tests/Dbal/AclProviderTest.php b/Tests/Dbal/AclProviderTest.php
index 680c6c3..e0a47e7 100644
--- a/Tests/Dbal/AclProviderTest.php
+++ b/Tests/Dbal/AclProviderTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Security\Acl\Tests\Dbal;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Dbal\AclProvider;
use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;
use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
@@ -20,7 +21,7 @@ use Doctrine\DBAL\DriverManager;
/**
* @requires extension pdo_sqlite
*/
-class AclProviderTest extends \PHPUnit_Framework_TestCase
+class AclProviderTest extends TestCase
{
protected $con;
protected $insertClassStmt;
diff --git a/Tests/Dbal/MutableAclProviderTest.php b/Tests/Dbal/MutableAclProviderTest.php
index 6df2d79..e7de0b5 100644
--- a/Tests/Dbal/MutableAclProviderTest.php
+++ b/Tests/Dbal/MutableAclProviderTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Security\Acl\Tests\Dbal;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
use Symfony\Component\Security\Acl\Model\FieldEntryInterface;
use Symfony\Component\Security\Acl\Model\AuditableEntryInterface;
@@ -30,7 +31,7 @@ use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
/**
* @requires extension pdo_sqlite
*/
-class MutableAclProviderTest extends \PHPUnit_Framework_TestCase
+class MutableAclProviderTest extends TestCase
{
protected $con;
diff --git a/Tests/Domain/AclTest.php b/Tests/Domain/AclTest.php
index bfe85e2..6408591 100644
--- a/Tests/Domain/AclTest.php
+++ b/Tests/Domain/AclTest.php
@@ -11,13 +11,14 @@
namespace Symfony\Component\Security\Acl\Tests\Domain;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;
use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
use Symfony\Component\Security\Acl\Domain\Acl;
-class AclTest extends \PHPUnit_Framework_TestCase
+class AclTest extends TestCase
{
public function testConstructor()
{
diff --git a/Tests/Domain/AuditLoggerTest.php b/Tests/Domain/AuditLoggerTest.php
index ae11474..630d217 100644
--- a/Tests/Domain/AuditLoggerTest.php
+++ b/Tests/Domain/AuditLoggerTest.php
@@ -11,7 +11,9 @@
namespace Symfony\Component\Security\Acl\Tests\Domain;
-class AuditLoggerTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class AuditLoggerTest extends TestCase
{
/**
* @dataProvider getTestLogData
diff --git a/Tests/Domain/DoctrineAclCacheTest.php b/Tests/Domain/DoctrineAclCacheTest.php
index 255f7f4..09164f2 100644
--- a/Tests/Domain/DoctrineAclCacheTest.php
+++ b/Tests/Domain/DoctrineAclCacheTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Security\Acl\Tests\Domain;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;
@@ -18,7 +19,7 @@ use Symfony\Component\Security\Acl\Domain\Acl;
use Symfony\Component\Security\Acl\Domain\DoctrineAclCache;
use Doctrine\Common\Cache\ArrayCache;
-class DoctrineAclCacheTest extends \PHPUnit_Framework_TestCase
+class DoctrineAclCacheTest extends TestCase
{
protected $permissionGrantingStrategy;
diff --git a/Tests/Domain/EntryTest.php b/Tests/Domain/EntryTest.php
index 58f2786..454f8ff 100644
--- a/Tests/Domain/EntryTest.php
+++ b/Tests/Domain/EntryTest.php
@@ -11,9 +11,10 @@
namespace Symfony\Component\Security\Acl\Tests\Domain;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\Entry;
-class EntryTest extends \PHPUnit_Framework_TestCase
+class EntryTest extends TestCase
{
public function testConstructor()
{
diff --git a/Tests/Domain/FieldEntryTest.php b/Tests/Domain/FieldEntryTest.php
index 55b083c..6f72f1e 100644
--- a/Tests/Domain/FieldEntryTest.php
+++ b/Tests/Domain/FieldEntryTest.php
@@ -11,9 +11,10 @@
namespace Symfony\Component\Security\Acl\Tests\Domain;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\FieldEntry;
-class FieldEntryTest extends \PHPUnit_Framework_TestCase
+class FieldEntryTest extends TestCase
{
public function testConstructor()
{
diff --git a/Tests/Domain/ObjectIdentityRetrievalStrategyTest.php b/Tests/Domain/ObjectIdentityRetrievalStrategyTest.php
index 59fc3bd..a243f9a 100644
--- a/Tests/Domain/ObjectIdentityRetrievalStrategyTest.php
+++ b/Tests/Domain/ObjectIdentityRetrievalStrategyTest.php
@@ -11,9 +11,10 @@
namespace Symfony\Component\Security\Acl\Tests\Domain;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\ObjectIdentityRetrievalStrategy;
-class ObjectIdentityRetrievalStrategyTest extends \PHPUnit_Framework_TestCase
+class ObjectIdentityRetrievalStrategyTest extends TestCase
{
public function testGetObjectIdentityReturnsNullForInvalidDomainObject()
{
diff --git a/Tests/Domain/ObjectIdentityTest.php b/Tests/Domain/ObjectIdentityTest.php
index 70f89a3..ad2f2f5 100644
--- a/Tests/Domain/ObjectIdentityTest.php
+++ b/Tests/Domain/ObjectIdentityTest.php
@@ -11,9 +11,11 @@
namespace Symfony\Component\Security\Acl\Tests\Domain
{
+
+ use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
- class ObjectIdentityTest extends \PHPUnit_Framework_TestCase
+ class ObjectIdentityTest extends TestCase
{
public function testConstructor()
{
diff --git a/Tests/Domain/PermissionGrantingStrategyTest.php b/Tests/Domain/PermissionGrantingStrategyTest.php
index 463f2c1..f772626 100644
--- a/Tests/Domain/PermissionGrantingStrategyTest.php
+++ b/Tests/Domain/PermissionGrantingStrategyTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Security\Acl\Tests\Domain;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
use Symfony\Component\Security\Acl\Domain\Acl;
@@ -18,7 +19,7 @@ use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;
use Symfony\Component\Security\Acl\Exception\NoAceFoundException;
-class PermissionGrantingStrategyTest extends \PHPUnit_Framework_TestCase
+class PermissionGrantingStrategyTest extends TestCase
{
public function testIsGrantedObjectAcesHavePriority()
{
diff --git a/Tests/Domain/RoleSecurityIdentityTest.php b/Tests/Domain/RoleSecurityIdentityTest.php
index ad5f236..2e67936 100644
--- a/Tests/Domain/RoleSecurityIdentityTest.php
+++ b/Tests/Domain/RoleSecurityIdentityTest.php
@@ -11,11 +11,12 @@
namespace Symfony\Component\Security\Acl\Tests\Domain;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
use Symfony\Component\Security\Core\Role\Role;
use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
-class RoleSecurityIdentityTest extends \PHPUnit_Framework_TestCase
+class RoleSecurityIdentityTest extends TestCase
{
public function testConstructor()
{
diff --git a/Tests/Domain/SecurityIdentityRetrievalStrategyTest.php b/Tests/Domain/SecurityIdentityRetrievalStrategyTest.php
index f3d4491..63f3ece 100644
--- a/Tests/Domain/SecurityIdentityRetrievalStrategyTest.php
+++ b/Tests/Domain/SecurityIdentityRetrievalStrategyTest.php
@@ -11,11 +11,12 @@
namespace Symfony\Component\Security\Acl\Tests\Domain;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
use Symfony\Component\Security\Acl\Domain\SecurityIdentityRetrievalStrategy;
-class SecurityIdentityRetrievalStrategyTest extends \PHPUnit_Framework_TestCase
+class SecurityIdentityRetrievalStrategyTest extends TestCase
{
/**
* @dataProvider getSecurityIdentityRetrievalTests
diff --git a/Tests/Domain/UserSecurityIdentityTest.php b/Tests/Domain/UserSecurityIdentityTest.php
index 1eb5283..613de22 100644
--- a/Tests/Domain/UserSecurityIdentityTest.php
+++ b/Tests/Domain/UserSecurityIdentityTest.php
@@ -11,10 +11,11 @@
namespace Symfony\Component\Security\Acl\Tests\Domain;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
-class UserSecurityIdentityTest extends \PHPUnit_Framework_TestCase
+class UserSecurityIdentityTest extends TestCase
{
public function testConstructor()
{
diff --git a/Tests/Permission/BasicPermissionMapTest.php b/Tests/Permission/BasicPermissionMapTest.php
index 2afe588..41eb5b2 100644
--- a/Tests/Permission/BasicPermissionMapTest.php
+++ b/Tests/Permission/BasicPermissionMapTest.php
@@ -11,9 +11,10 @@
namespace Symfony\Component\Security\Acl\Tests\Permission;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Permission\BasicPermissionMap;
-class BasicPermissionMapTest extends \PHPUnit_Framework_TestCase
+class BasicPermissionMapTest extends TestCase
{
public function testGetMasksReturnsNullWhenNotSupportedMask()
{
diff --git a/Tests/Permission/MaskBuilderTest.php b/Tests/Permission/MaskBuilderTest.php
index 8245669..6e34e6d 100644
--- a/Tests/Permission/MaskBuilderTest.php
+++ b/Tests/Permission/MaskBuilderTest.php
@@ -11,9 +11,10 @@
namespace Symfony\Component\Security\Acl\Tests\Permission;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Permission\MaskBuilder;
-class MaskBuilderTest extends \PHPUnit_Framework_TestCase
+class MaskBuilderTest extends TestCase
{
/**
* @expectedException \InvalidArgumentException
diff --git a/Tests/Voter/AclVoterTest.php b/Tests/Voter/AclVoterTest.php
index bf8d674..508008d 100644
--- a/Tests/Voter/AclVoterTest.php
+++ b/Tests/Voter/AclVoterTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Security\Acl\Tests\Voter;
+use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Acl\Exception\NoAceFoundException;
use Symfony\Component\Security\Acl\Voter\FieldVote;
use Symfony\Component\Security\Acl\Exception\AclNotFoundException;
@@ -20,7 +21,7 @@ use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
use Symfony\Component\Security\Acl\Voter\AclVoter;
-class AclVoterTest extends \PHPUnit_Framework_TestCase
+class AclVoterTest extends TestCase
{
/**
* @dataProvider getSupportsAttributeTests
|
