From 96a822e3cf43906085cd3f00dee56d74ac67a6e5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 2 Oct 2023 08:42:18 +0900 Subject: [PATCH 1/3] refactor: replace Services::request(config, false) with Services::incommingrequest() The parameter $config and $getShared are deprecated. --- system/Commands/Utilities/Routes/FilterCollector.php | 2 +- system/Test/ControllerTestTrait.php | 2 +- system/Test/ControllerTester.php | 2 +- system/Test/FeatureTestTrait.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/Commands/Utilities/Routes/FilterCollector.php b/system/Commands/Utilities/Routes/FilterCollector.php index fcb9b1512835..db32e649e32f 100644 --- a/system/Commands/Utilities/Routes/FilterCollector.php +++ b/system/Commands/Utilities/Routes/FilterCollector.php @@ -51,7 +51,7 @@ public function get(string $method, string $uri): array ]; } - $request = Services::request(null, false); + $request = Services::incommingrequest(null, false); $request->setMethod($method); $router = $this->createRouter($request); diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php index 7e4091be6175..131c1271a9d8 100644 --- a/system/Test/ControllerTestTrait.php +++ b/system/Test/ControllerTestTrait.php @@ -109,7 +109,7 @@ protected function setUpControllerTestTrait(): void $tempUri = Services::uri(); Services::injectMock('uri', $this->uri); - $this->withRequest(Services::request($this->appConfig, false)); + $this->withRequest(Services::incommingrequest($this->appConfig, false)); // Restore the URI service Services::injectMock('uri', $tempUri); diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php index 2fff82eeceb1..63955130c8e4 100644 --- a/system/Test/ControllerTester.php +++ b/system/Test/ControllerTester.php @@ -108,7 +108,7 @@ protected function setUpControllerTester(): void $tempUri = Services::uri(); Services::injectMock('uri', $this->uri); - $this->withRequest(Services::request($this->appConfig, false)->setBody($this->body)); + $this->withRequest(Services::incommingrequest($this->appConfig, false)->setBody($this->body)); // Restore the URI service Services::injectMock('uri', $tempUri); diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index 23e56990b45b..43ff9206ac86 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -289,7 +289,7 @@ protected function setupRequest(string $method, ?string $path = null): IncomingR Services::injectMock('uri', $uri); - $request = Services::request($config, false); + $request = Services::incommingrequest($config, false); $request->setMethod($method); $request->setProtocolVersion('1.1'); From 262c048b3f4d86fa647b908ee8caddcea128752e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 2 Oct 2023 08:43:47 +0900 Subject: [PATCH 2/3] docs: add "," --- system/Test/ControllerTestTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php index 131c1271a9d8..4573e07592cc 100644 --- a/system/Test/ControllerTestTrait.php +++ b/system/Test/ControllerTestTrait.php @@ -105,7 +105,7 @@ protected function setUpControllerTestTrait(): void } if (empty($this->request)) { - // Do some acrobatics so we can use the Request service with our own URI + // Do some acrobatics, so we can use the Request service with our own URI $tempUri = Services::uri(); Services::injectMock('uri', $this->uri); From 93001f101a059e38f8b03a40e41678f861cd2cda Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 3 Oct 2023 15:38:39 +0900 Subject: [PATCH 3/3] fix: typo in method name --- system/Commands/Utilities/Routes/FilterCollector.php | 2 +- system/Test/ControllerTestTrait.php | 2 +- system/Test/ControllerTester.php | 2 +- system/Test/FeatureTestTrait.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/Commands/Utilities/Routes/FilterCollector.php b/system/Commands/Utilities/Routes/FilterCollector.php index db32e649e32f..01d228a41704 100644 --- a/system/Commands/Utilities/Routes/FilterCollector.php +++ b/system/Commands/Utilities/Routes/FilterCollector.php @@ -51,7 +51,7 @@ public function get(string $method, string $uri): array ]; } - $request = Services::incommingrequest(null, false); + $request = Services::incomingrequest(null, false); $request->setMethod($method); $router = $this->createRouter($request); diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php index 4573e07592cc..2da65d1aa2f7 100644 --- a/system/Test/ControllerTestTrait.php +++ b/system/Test/ControllerTestTrait.php @@ -109,7 +109,7 @@ protected function setUpControllerTestTrait(): void $tempUri = Services::uri(); Services::injectMock('uri', $this->uri); - $this->withRequest(Services::incommingrequest($this->appConfig, false)); + $this->withRequest(Services::incomingrequest($this->appConfig, false)); // Restore the URI service Services::injectMock('uri', $tempUri); diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php index 63955130c8e4..c01e6a8ba2f3 100644 --- a/system/Test/ControllerTester.php +++ b/system/Test/ControllerTester.php @@ -108,7 +108,7 @@ protected function setUpControllerTester(): void $tempUri = Services::uri(); Services::injectMock('uri', $this->uri); - $this->withRequest(Services::incommingrequest($this->appConfig, false)->setBody($this->body)); + $this->withRequest(Services::incomingrequest($this->appConfig, false)->setBody($this->body)); // Restore the URI service Services::injectMock('uri', $tempUri); diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index 43ff9206ac86..43db39f93f47 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -289,7 +289,7 @@ protected function setupRequest(string $method, ?string $path = null): IncomingR Services::injectMock('uri', $uri); - $request = Services::incommingrequest($config, false); + $request = Services::incomingrequest($config, false); $request->setMethod($method); $request->setProtocolVersion('1.1');