Skip to content

Fix \OC_App::getCurrentApp() when being called from CLI or phpunit #31876

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

Merged
PVince81 merged 2 commits into from
Apr 7, 2022
Merged

Fix \OC_App::getCurrentApp() when being called from CLI or phpunit #31876

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a06ba88
Fix \OC_App::getCurrentApp() when being called from CLI or phpunit
nickvergessen Apr 7, 2022
d966339
Log exception
nickvergessen Apr 7, 2022
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
Next Next commit
Fix \OC_App::getCurrentApp() when being called from CLI or phpunit 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Apr 7, 2022
commit a06ba8850243b93295e9c49ab820c0c46d9b220a
11 changes: 10 additions & 1 deletion lib/private/legacy/OC_App.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,11 +629,20 @@ public static function getSettingsNavigation(): array {
* @return string
*/
public static function getCurrentApp(): string {
if (\OC::$CLI) {
return '';
}
Comment on lines +632 to +634
Copy link
Contributor

@come-nc come-nc Apr 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this related? What does it fix?

Copy link
Member Author

@nickvergessen nickvergessen Apr 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It fixes the case when this is called via cron/cli/occ
We don't need to do anything in that case, but it's not set to true when running tests


$request = \OC::$server->getRequest();
$script = substr($request->getScriptName(), strlen(OC::$WEBROOT) + 1);
$topFolder = substr($script, 0, strpos($script, '/') ?: 0);
if (empty($topFolder)) {
$path_info = $request->getPathInfo();
try {
$path_info = $request->getPathInfo();
} catch (Exception $e) {
// Can happen from unit tests because the script name is `./vendor/bin/phpunit` or something a like then.
return '';
}
if ($path_info) {
$topFolder = substr($path_info, 1, strpos($path_info, '/', 1) - 1);
}
Expand Down