Skip to content

Commit ff5185a

Browse files
authored
Merge pull request #7998 from kenjis/refactor-service-request
refactor: replace deprecated `Services::request(config, false)`
2 parents eb1e7f6 + 93001f1 commit ff5185a

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

system/Commands/Utilities/Routes/FilterCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function get(string $method, string $uri): array
5151
];
5252
}
5353

54-
$request = Services::request(null, false);
54+
$request = Services::incomingrequest(null, false);
5555
$request->setMethod($method);
5656

5757
$router = $this->createRouter($request);

system/Test/ControllerTestTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ protected function setUpControllerTestTrait(): void
105105
}
106106

107107
if (empty($this->request)) {
108-
// Do some acrobatics so we can use the Request service with our own URI
108+
// Do some acrobatics, so we can use the Request service with our own URI
109109
$tempUri = Services::uri();
110110
Services::injectMock('uri', $this->uri);
111111

112-
$this->withRequest(Services::request($this->appConfig, false));
112+
$this->withRequest(Services::incomingrequest($this->appConfig, false));
113113

114114
// Restore the URI service
115115
Services::injectMock('uri', $tempUri);

system/Test/ControllerTester.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ protected function setUpControllerTester(): void
108108
$tempUri = Services::uri();
109109
Services::injectMock('uri', $this->uri);
110110

111-
$this->withRequest(Services::request($this->appConfig, false)->setBody($this->body));
111+
$this->withRequest(Services::incomingrequest($this->appConfig, false)->setBody($this->body));
112112

113113
// Restore the URI service
114114
Services::injectMock('uri', $tempUri);

system/Test/FeatureTestTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ protected function setupRequest(string $method, ?string $path = null): IncomingR
289289

290290
Services::injectMock('uri', $uri);
291291

292-
$request = Services::request($config, false);
292+
$request = Services::incomingrequest($config, false);
293293

294294
$request->setMethod($method);
295295
$request->setProtocolVersion('1.1');

0 commit comments

Comments
 (0)