Skip to content

Commit 2b14b78

Browse files
michalsnmichalsn
committed
more fluent api changes
1 parent f1e0aca commit 2b14b78

File tree

4 files changed

+113
-88
lines changed

4 files changed

+113
-88
lines changed

‎tests/system/CodeIgniterTest.php‎

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,11 @@ public function testControllersCanReturnResponseObject(): void
272272
*/
273273
public function testControllersCanReturnDownloadResponseObject(): void
274274
{
275-
service('superglobals')->setServer('argv', ['index.php', 'pages/about']);
276-
service('superglobals')->setServer('argc', 2);
277-
278-
service('superglobals')->setServer('REQUEST_URI', '/pages/about');
279-
service('superglobals')->setServer('SCRIPT_NAME', '/index.php');
275+
service('superglobals')
276+
->setServer('argv', ['index.php', 'pages/about'])
277+
->setServer('argc', 2)
278+
->setServer('REQUEST_URI', '/pages/about')
279+
->setServer('SCRIPT_NAME', '/index.php');
280280

281281
// Inject mock router.
282282
$routes = service('routes');
@@ -297,11 +297,11 @@ public function testControllersCanReturnDownloadResponseObject(): void
297297

298298
public function testRunExecuteFilterByClassName(): void
299299
{
300-
service('superglobals')->setServer('argv', ['index.php', 'pages/about']);
301-
service('superglobals')->setServer('argc', 2);
302-
303-
service('superglobals')->setServer('REQUEST_URI', '/pages/about');
304-
service('superglobals')->setServer('SCRIPT_NAME', '/index.php');
300+
service('superglobals')
301+
->setServer('argv', ['index.php', 'pages/about'])
302+
->setServer('argc', 2)
303+
->setServer('REQUEST_URI', '/pages/about')
304+
->setServer('SCRIPT_NAME', '/index.php');
305305

306306
// Inject mock router.
307307
$routes = service('routes');
@@ -325,11 +325,11 @@ public function testRunExecuteFilterByClassName(): void
325325

326326
public function testRegisterSameFilterTwiceWithDifferentArgument(): void
327327
{
328-
service('superglobals')->setServer('argv', ['index.php', 'pages/about']);
329-
service('superglobals')->setServer('argc', 2);
330-
331-
service('superglobals')->setServer('REQUEST_URI', '/pages/about');
332-
service('superglobals')->setServer('SCRIPT_NAME', '/index.php');
328+
service('superglobals')
329+
->setServer('argv', ['index.php', 'pages/about'])
330+
->setServer('argc', 2)
331+
->setServer('REQUEST_URI', '/pages/about')
332+
->setServer('SCRIPT_NAME', '/index.php');
333333

334334
$routes = service('routes');
335335
$routes->add(
@@ -363,11 +363,11 @@ public function testRegisterSameFilterTwiceWithDifferentArgument(): void
363363

364364
public function testDisableControllerFilters(): void
365365
{
366-
service('superglobals')->setServer('argv', ['index.php', 'pages/about']);
367-
service('superglobals')->setServer('argc', 2);
368-
369-
service('superglobals')->setServer('REQUEST_URI', '/pages/about');
370-
service('superglobals')->setServer('SCRIPT_NAME', '/index.php');
366+
service('superglobals')
367+
->setServer('argv', ['index.php', 'pages/about'])
368+
->setServer('argc', 2)
369+
->setServer('REQUEST_URI', '/pages/about')
370+
->setServer('SCRIPT_NAME', '/index.php');
371371

372372
// Inject mock router.
373373
$routes = service('routes');
@@ -391,8 +391,9 @@ public function testDisableControllerFilters(): void
391391

392392
public function testResponseConfigEmpty(): void
393393
{
394-
service('superglobals')->setServer('argv', ['index.php', '/']);
395-
service('superglobals')->setServer('argc', 2);
394+
service('superglobals')
395+
->setServer('argv', ['index.php', '/'])
396+
->setServer('argc', 2);
396397

397398
$response = service('response', null, false);
398399

@@ -401,8 +402,9 @@ public function testResponseConfigEmpty(): void
401402

402403
public function testRoutesIsEmpty(): void
403404
{
404-
service('superglobals')->setServer('argv', ['index.php', '/']);
405-
service('superglobals')->setServer('argc', 2);
405+
service('superglobals')
406+
->setServer('argv', ['index.php', '/'])
407+
->setServer('argc', 2);
406408

407409
// Inject mock router.
408410
$router = service('router', null, service('incomingrequest'), false);
@@ -417,10 +419,10 @@ public function testRoutesIsEmpty(): void
417419

418420
public function testTransfersCorrectHTTPVersion(): void
419421
{
420-
service('superglobals')->setServer('argv', ['index.php', '/']);
421-
service('superglobals')->setServer('argc', 2);
422-
423-
service('superglobals')->setServer('SERVER_PROTOCOL', 'HTTP/2.0');
422+
service('superglobals')
423+
->setServer('argv', ['index.php', '/'])
424+
->setServer('argc', 2)
425+
->setServer('SERVER_PROTOCOL', 'HTTP/2.0');
424426

425427
ob_start();
426428
$this->codeigniter->run();
@@ -433,10 +435,10 @@ public function testTransfersCorrectHTTPVersion(): void
433435

434436
public function testSupportsHttp3(): void
435437
{
436-
service('superglobals')->setServer('argv', ['index.php', '/']);
437-
service('superglobals')->setServer('argc', 2);
438-
439-
service('superglobals')->setServer('SERVER_PROTOCOL', 'HTTP/3.0');
438+
service('superglobals')
439+
->setServer('argv', ['index.php', '/'])
440+
->setServer('argc', 2)
441+
->setServer('SERVER_PROTOCOL', 'HTTP/3.0');
440442

441443
ob_start();
442444
$this->codeigniter->run();
@@ -449,8 +451,9 @@ public function testSupportsHttp3(): void
449451

450452
public function testIgnoringErrorSuppressedByAt(): void
451453
{
452-
service('superglobals')->setServer('argv', ['index.php', '/']);
453-
service('superglobals')->setServer('argc', 2);
454+
service('superglobals')
455+
->setServer('argv', ['index.php', '/'])
456+
->setServer('argc', 2);
454457

455458
ob_start();
456459
@unlink('inexistent-file');
@@ -462,8 +465,9 @@ public function testIgnoringErrorSuppressedByAt(): void
462465

463466
public function testRunForceSecure(): void
464467
{
465-
service('superglobals')->setServer('argv', ['index.php', '/']);
466-
service('superglobals')->setServer('argc', 2);
468+
service('superglobals')
469+
->setServer('argv', ['index.php', '/'])
470+
->setServer('argc', 2);
467471

468472
$filterConfig = config(FiltersConfig::class);
469473
$filterConfig->required['before'][] = 'forcehttps';

‎tests/system/HTTP/ResponseTest.php‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,10 @@ public function testRedirect(
281281
?int $code,
282282
int $expectedCode,
283283
): void {
284-
service('superglobals')->setServer('SERVER_SOFTWARE', $server);
285-
service('superglobals')->setServer('SERVER_PROTOCOL', $protocol);
286-
service('superglobals')->setServer('REQUEST_METHOD', $method);
284+
service('superglobals')
285+
->setServer('SERVER_SOFTWARE', $server)
286+
->setServer('SERVER_PROTOCOL', $protocol)
287+
->setServer('REQUEST_METHOD', $method);
287288

288289
$response = new Response(new App());
289290
$response->redirect('example.com', 'auto', $code);
@@ -324,9 +325,10 @@ public function testRedirectWithIIS(
324325
?int $code,
325326
int $expectedCode,
326327
): void {
327-
service('superglobals')->setServer('SERVER_SOFTWARE', 'Microsoft-IIS');
328-
service('superglobals')->setServer('SERVER_PROTOCOL', 'HTTP/1.1');
329-
service('superglobals')->setServer('REQUEST_METHOD', 'POST');
328+
service('superglobals')
329+
->setServer('SERVER_SOFTWARE', 'Microsoft-IIS')
330+
->setServer('SERVER_PROTOCOL', 'HTTP/1.1')
331+
->setServer('REQUEST_METHOD', 'POST');
330332

331333
$response = new Response(new App());
332334
$response->redirect('example.com', 'auto', $code);
@@ -521,8 +523,9 @@ public function testMisbehaving(): void
521523

522524
public function testTemporaryRedirectHTTP11(): void
523525
{
524-
service('superglobals')->setServer('SERVER_PROTOCOL', 'HTTP/1.1');
525-
service('superglobals')->setServer('REQUEST_METHOD', 'POST');
526+
service('superglobals')
527+
->setServer('SERVER_PROTOCOL', 'HTTP/1.1')
528+
->setServer('REQUEST_METHOD', 'POST');
526529
$response = new Response(new App());
527530

528531
$response->setProtocolVersion('HTTP/1.1');
@@ -533,8 +536,9 @@ public function testTemporaryRedirectHTTP11(): void
533536

534537
public function testTemporaryRedirectGetHTTP11(): void
535538
{
536-
service('superglobals')->setServer('SERVER_PROTOCOL', 'HTTP/1.1');
537-
service('superglobals')->setServer('REQUEST_METHOD', 'GET');
539+
service('superglobals')
540+
->setServer('SERVER_PROTOCOL', 'HTTP/1.1')
541+
->setServer('REQUEST_METHOD', 'GET');
538542
$response = new Response(new App());
539543

540544
$response->setProtocolVersion('HTTP/1.1');

‎tests/system/Security/SecurityCSRFSessionTest.php‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,9 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch(): void
130130
{
131131
$this->expectException(SecurityException::class);
132132

133-
service('superglobals')->setServer('REQUEST_METHOD', 'POST');
134-
service('superglobals')->setPost('csrf_test_name', '8b9218a55906f9dcc1dc263dce7f005b');
133+
service('superglobals')
134+
->setServer('REQUEST_METHOD', 'POST')
135+
->setPost('csrf_test_name', '8b9218a55906f9dcc1dc263dce7f005b');
135136

136137
$request = $this->createIncomingRequest();
137138
$security = $this->createSecurity();
@@ -148,9 +149,10 @@ private function createIncomingRequest(?App $config = null): IncomingRequest
148149

149150
public function testCSRFVerifyPostReturnsSelfOnMatch(): void
150151
{
151-
service('superglobals')->setServer('REQUEST_METHOD', 'POST');
152-
service('superglobals')->setPost('foo', 'bar');
153-
service('superglobals')->setPost('csrf_test_name', '8b9218a55906f9dcc1dc263dce7f005a');
152+
service('superglobals')
153+
->setServer('REQUEST_METHOD', 'POST')
154+
->setPost('foo', 'bar')
155+
->setPost('csrf_test_name', '8b9218a55906f9dcc1dc263dce7f005a');
154156

155157
$request = $this->createIncomingRequest();
156158
$security = $this->createSecurity();
@@ -174,8 +176,9 @@ public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch(): void
174176

175177
public function testCSRFVerifyPOSTHeaderReturnsSelfOnMatch(): void
176178
{
177-
service('superglobals')->setServer('REQUEST_METHOD', 'POST');
178-
service('superglobals')->setPost('foo', 'bar');
179+
service('superglobals')
180+
->setServer('REQUEST_METHOD', 'POST')
181+
->setPost('foo', 'bar');
179182

180183
$request = $this->createIncomingRequest();
181184
$request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
@@ -250,8 +253,9 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch(): void
250253

251254
public function testRegenerateWithFalseSecurityRegenerateProperty(): void
252255
{
253-
service('superglobals')->setServer('REQUEST_METHOD', 'POST');
254-
service('superglobals')->setPost('csrf_test_name', '8b9218a55906f9dcc1dc263dce7f005a');
256+
service('superglobals')
257+
->setServer('REQUEST_METHOD', 'POST')
258+
->setPost('csrf_test_name', '8b9218a55906f9dcc1dc263dce7f005a');
255259

256260
/**
257261
* @var SecurityConfig
@@ -272,8 +276,9 @@ public function testRegenerateWithFalseSecurityRegenerateProperty(): void
272276

273277
public function testRegenerateWithTrueSecurityRegenerateProperty(): void
274278
{
275-
service('superglobals')->setServer('REQUEST_METHOD', 'POST');
276-
service('superglobals')->setPost('csrf_test_name', '8b9218a55906f9dcc1dc263dce7f005a');
279+
service('superglobals')
280+
->setServer('REQUEST_METHOD', 'POST')
281+
->setPost('csrf_test_name', '8b9218a55906f9dcc1dc263dce7f005a');
277282

278283
/**
279284
* @var SecurityConfig

0 commit comments

Comments
 (0)