Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix chroot resolve null route #20161

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix chroot resolve null route #20161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions framework/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Yii Framework 2 Change Log
- New #20137: Added `yii\caching\CallbackDependency` to allow using a callback to determine if a cache dependency is still valid (laxity7)
- Enh #20134: Raise minimum `PHP` version to `7.3` (@terabytesoftw)
- Bug #20141: Update `ezyang/htmlpurifier` dependency to version `4.17` (@terabytesoftw)
- Bug #20159: Fixed chroot resolve null route (gozoro)

2.0.49.2 October 12, 2023
-------------------------
Expand Down
2 changes: 1 addition & 1 deletion framework/console/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function resolve()

if ($route === '--') {
$endOfOptionsFound = true;
$route = array_shift($rawParams);
$route = (string)array_shift($rawParams);
}
} else {
$route = '';
Expand Down
10 changes: 10 additions & 0 deletions tests/framework/console/RequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,16 @@ public function provider()
'-alias2=testValue',
],
],
],
[
// Case: Special argument "End of Options" placed instead of route
'params' => [
'--', // Special argument "End of Options"
],
'expected' => [
'route' => '',
'params' => [],
],
],
// Case: `--<option> <value>` and `-<alias> <value>` syntax
[
Expand Down
Loading