Skip to content

Commit f355282

Browse files
paulbalandanpaulbalandan
authored
Merge pull request #6788 from paulbalandan/preserve-global-state
Group `runInSeparateProcess` and `preserveGlobalState`
2 parents bb45109 + 72412cf commit f355282

16 files changed

+74
-149
lines changed

‎tests/system/Commands/GenerateKeyTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ public function testGenerateKeyShowsEncodedKey()
8686

8787
/**
8888
* @runInSeparateProcess
89-
*
90-
* @preserveGlobalState disabled
89+
* @preserveGlobalState disabled
9190
*/
9291
public function testGenerateKeyCreatesNewKey()
9392
{

‎tests/system/CommonFunctionsSendTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ protected function setUp(): void
3232
* See https://github.com/codeigniter4/CodeIgniter4/issues/1393
3333
*
3434
* @runInSeparateProcess
35-
*
36-
* @preserveGlobalState disabled
35+
* @preserveGlobalState disabled
3736
*/
3837
public function testRedirectResponseCookiesSent()
3938
{

‎tests/system/CommonFunctionsTest.php‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ public function testEscapeBadContextZero()
185185

186186
/**
187187
* @runInSeparateProcess
188-
*
189-
* @preserveGlobalState disabled
188+
* @preserveGlobalState disabled
190189
*/
191190
public function testSessionInstance()
192191
{
@@ -197,8 +196,7 @@ public function testSessionInstance()
197196

198197
/**
199198
* @runInSeparateProcess
200-
*
201-
* @preserveGlobalState disabled
199+
* @preserveGlobalState disabled
202200
*/
203201
public function testSessionVariable()
204202
{
@@ -211,8 +209,7 @@ public function testSessionVariable()
211209

212210
/**
213211
* @runInSeparateProcess
214-
*
215-
* @preserveGlobalState disabled
212+
* @preserveGlobalState disabled
216213
*/
217214
public function testSessionVariableNotThere()
218215
{
@@ -295,8 +292,7 @@ public function testModelExistsAbsoluteClassname()
295292

296293
/**
297294
* @runInSeparateProcess
298-
*
299-
* @preserveGlobalState disabled
295+
* @preserveGlobalState disabled
300296
*/
301297
public function testOldInput()
302298
{
@@ -331,8 +327,7 @@ public function testOldInput()
331327

332328
/**
333329
* @runInSeparateProcess
334-
*
335-
* @preserveGlobalState disabled
330+
* @preserveGlobalState disabled
336331
*/
337332
public function testOldInputSerializeData()
338333
{
@@ -367,8 +362,7 @@ public function testOldInputSerializeData()
367362
* @see https://github.com/codeigniter4/CodeIgniter4/issues/1492
368363
*
369364
* @runInSeparateProcess
370-
*
371-
* @preserveGlobalState disabled
365+
* @preserveGlobalState disabled
372366
*/
373367
public function testOldInputArray()
374368
{
@@ -481,7 +475,6 @@ public function testRedirectResponseCookies1()
481475

482476
/**
483477
* @runInSeparateProcess
484-
*
485478
* @preserveGlobalState disabled
486479
*/
487480
public function testTrace()
@@ -505,8 +498,7 @@ public function testViewNotSaveData()
505498

506499
/**
507500
* @runInSeparateProcess
508-
*
509-
* @preserveGlobalState disabled
501+
* @preserveGlobalState disabled
510502
*/
511503
public function testForceHttpsNullRequestAndResponse()
512504
{
@@ -586,8 +578,7 @@ public function testDWithCSP()
586578

587579
/**
588580
* @runInSeparateProcess
589-
*
590-
* @preserveGlobalState disabled
581+
* @preserveGlobalState disabled
591582
*/
592583
public function testTraceWithCSP()
593584
{

‎tests/system/Config/BaseConfigTest.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ public function testUseDefaultValueTypeStringValue()
8080

8181
/**
8282
* @runInSeparateProcess
83-
*
84-
* @preserveGlobalState disabled
83+
* @preserveGlobalState disabled
8584
*/
8685
public function testServerValues()
8786
{
@@ -177,8 +176,7 @@ public function testSetsDefaultValues()
177176

178177
/**
179178
* @runInSeparateProcess
180-
*
181-
* @preserveGlobalState disabled
179+
* @preserveGlobalState disabled
182180
*/
183181
public function testSetsDefaultValuesEncryptionUsingHex2Bin()
184182
{
@@ -193,8 +191,7 @@ public function testSetsDefaultValuesEncryptionUsingHex2Bin()
193191

194192
/**
195193
* @runInSeparateProcess
196-
*
197-
* @preserveGlobalState disabled
194+
* @preserveGlobalState disabled
198195
*/
199196
public function testSetDefaultValuesEncryptionUsingBase64()
200197
{

‎tests/system/Config/ConfigTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public function testCreateNonConfig()
5555

5656
/**
5757
* @runInSeparateProcess
58-
*
59-
* @preserveGlobalState disabled
58+
* @preserveGlobalState disabled
6059
*/
6160
public function testInjection()
6261
{

‎tests/system/Config/DotEnvTest.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ public function provideLoadVars(): iterable
8383

8484
/**
8585
* @runInSeparateProcess
86-
*
87-
* @preserveGlobalState disabled
86+
* @preserveGlobalState disabled
8887
*/
8988
public function testLoadsHex2Bin()
9089
{
@@ -98,8 +97,7 @@ public function testLoadsHex2Bin()
9897

9998
/**
10099
* @runInSeparateProcess
101-
*
102-
* @preserveGlobalState disabled
100+
* @preserveGlobalState disabled
103101
*/
104102
public function testLoadsBase64()
105103
{

‎tests/system/Config/ServicesTest.php‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@ public function testNewViewcell()
238238

239239
/**
240240
* @runInSeparateProcess
241-
*
242-
* @preserveGlobalState disabled
241+
* @preserveGlobalState disabled
243242
*/
244243
public function testNewSession()
245244
{
@@ -249,8 +248,7 @@ public function testNewSession()
249248

250249
/**
251250
* @runInSeparateProcess
252-
*
253-
* @preserveGlobalState disabled
251+
* @preserveGlobalState disabled
254252
*/
255253
public function testNewSessionWithNullConfig()
256254
{
@@ -260,8 +258,7 @@ public function testNewSessionWithNullConfig()
260258

261259
/**
262260
* @runInSeparateProcess
263-
*
264-
* @preserveGlobalState disabled
261+
* @preserveGlobalState disabled
265262
*/
266263
public function testCallStatic()
267264
{
@@ -275,8 +272,7 @@ public function testCallStatic()
275272

276273
/**
277274
* @runInSeparateProcess
278-
*
279-
* @preserveGlobalState disabled
275+
* @preserveGlobalState disabled
280276
*/
281277
public function testCallStaticDirectly()
282278
{
@@ -287,8 +283,7 @@ public function testCallStaticDirectly()
287283

288284
/**
289285
* @runInSeparateProcess
290-
*
291-
* @preserveGlobalState disabled
286+
* @preserveGlobalState disabled
292287
*/
293288
public function testMockInjection()
294289
{
@@ -310,8 +305,7 @@ public function testMockInjection()
310305

311306
/**
312307
* @runInSeparateProcess
313-
*
314-
* @preserveGlobalState disabled
308+
* @preserveGlobalState disabled
315309
*/
316310
public function testReset()
317311
{
@@ -330,8 +324,7 @@ public function testReset()
330324

331325
/**
332326
* @runInSeparateProcess
333-
*
334-
* @preserveGlobalState disabled
327+
* @preserveGlobalState disabled
335328
*/
336329
public function testResetSingle()
337330
{

‎tests/system/Events/EventsTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ protected function tearDown(): void
4343

4444
/**
4545
* @runInSeparateProcess
46-
*
47-
* @preserveGlobalState disabled
46+
* @preserveGlobalState disabled
4847
*/
4948
public function testInitialize()
5049
{

‎tests/system/Filters/HoneypotTest.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ public function testBeforeClean()
8080

8181
/**
8282
* @runInSeparateProcess
83-
*
84-
* @preserveGlobalState disabled
83+
* @preserveGlobalState disabled
8584
*/
8685
public function testAfter()
8786
{
@@ -103,8 +102,7 @@ public function testAfter()
103102

104103
/**
105104
* @runInSeparateProcess
106-
*
107-
* @preserveGlobalState disabled
105+
* @preserveGlobalState disabled
108106
*/
109107
public function testAfterNotApplicable()
110108
{

0 commit comments

Comments
 (0)