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

[4.5] fix: merge mistake #8359

Merged
merged 2 commits into from
Dec 22, 2023
Merged

[4.5] fix: merge mistake #8359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a8fed9
docs: update @param
kenjis Dec 21, 2023
21d03c1
fix: UndefinedVariable due to merge mistake
kenjis Dec 22, 2023
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
16 changes: 8 additions & 8 deletions system/Autoloader/FileLocatorInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ interface FileLocatorInterface
* Attempts to locate a file by examining the name for a namespace
* and looking through the PSR-4 namespaced files that we know about.
*
* @param string $file The relative file path or namespaced file to
* locate. If not namespaced, search in the app
* folder.
* @param string|null $folder The folder within the namespace that we should
* look for the file. If $file does not contain
* this value, it will be appended to the namespace
* folder.
* @param string $ext The file extension the file should have.
* @param string $file The relative file path or namespaced file to
* locate. If not namespaced, search in the app
* folder.
* @param non-empty-string|null $folder The folder within the namespace that we should
* look for the file. If $file does not contain
* this value, it will be appended to the namespace
* folder.
* @param string $ext The file extension the file should have.
*
* @return false|string The path to the file, or false if not found.
*/
Expand Down
3 changes: 1 addition & 2 deletions system/Test/FeatureTestTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@ protected function setupHeaders(IncomingRequest $request)
* Always populate the GET vars based on the URI.
*
* @param string $name Superglobal name (lowercase)
* @param string $method HTTP verb
* @param non-empty-array|null $params
*
* @return Request
Expand All @@ -370,7 +369,7 @@ protected function populateGlobals(string $name, Request $request, ?array $param
{
// $params should set the query vars if present,
// otherwise set it from the URL.
$get = ($params !== null && $params !== [] && $method === 'get')
$get = ($params !== null && $params !== [] && $name === 'get')
? $params
: $this->getPrivateProperty($request->getUri(), 'query');

Expand Down
Loading