malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: fix rector change on RedirectException (#9433)

Browse Source
This commit is contained in:
John Paul E. Balandan, CPA 2025-01-25 00:43:15 +08:00 committed by GitHub
parent b18a4067f6
commit b5e9715518
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -28,7 +28,7 @@
"phpunit/phpcov": "^9.0.2 || ^10.0",
"phpunit/phpunit": "^10.5.16 || ^11.2",
"predis/predis": "^1.1 || ^2.3",
"rector/rector": "2.0.6",
"rector/rector": "2.0.7",
"shipmonk/phpstan-baseline-per-identifier": "^2.0"
},
"replace": {

20
system/HTTP/Exceptions/RedirectException.php
View File

@ -51,7 +51,8 @@ class RedirectException extends RuntimeException implements ExceptionInterface,
if ($message instanceof ResponseInterface) {
$this->response = $message;
$message = '';
$message = '';
if ($this->response->getHeaderLine('Location') === '' && $this->response->getHeaderLine('Refresh') === '') {
throw new LogicException(
@ -70,14 +71,19 @@ class RedirectException extends RuntimeException implements ExceptionInterface,
public function getResponse(): ResponseInterface
{
if (! $this->response instanceof ResponseInterface) {
$this->response = service('response')
->redirect(base_url($this->getMessage()), 'auto', $this->getCode());
$this->response = service('response')->redirect(
base_url($this->getMessage()),
'auto',
$this->getCode(),
);
}
service('logger')->info(
'REDIRECTED ROUTE at '
. ($this->response->getHeaderLine('Location') ?: substr($this->response->getHeaderLine('Refresh'), 6)),
);
$location = $this->response->getHeaderLine('Location');
service(('logger'))->info(sprintf(
'REDIRECTED ROUTE at %s',
$location !== '' ? $location : substr($this->response->getHeaderLine('Refresh'), 6),
));
return $this->response;
}

7
utils/phpstan-baseline/ternary.shortNotAllowed.neon
View File

@ -1,4 +1,4 @@
# total 38 errors
# total 37 errors
parameters:
ignoreErrors:
@ -47,11 +47,6 @@ parameters:
count: 1
path: ../../system/HTTP/CURLRequest.php
-
message: '#^Short ternary operator is not allowed\. Use null coalesce operator if applicable or consider using long ternary\.$#'
count: 1
path: ../../system/HTTP/Exceptions/RedirectException.php
-
message: '#^Short ternary operator is not allowed\. Use null coalesce operator if applicable or consider using long ternary\.$#'
count: 2