Skip to content

fix: Correctly reset static vars of OCP\Util between requests #64589

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
come-nc merged 3 commits into from
Sep 21, 2026
+15 −1
Merged

fix: Correctly reset static vars of OCP\Util between requests #64589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f25d0e6
fix: Correctly reset static vars of OCP\Util between requests
come-nc Sep 20, 2026
ab4d643
fix: Fix legacy files route with frankenphp
come-nc Sep 20, 2026
65e5ff1
chore: Fix psalm issue about internal method
come-nc Sep 20, 2026
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
2 changes: 2 additions & 0 deletions lib/OC.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,6 +1367,8 @@ private static function resetStaticProperties(): void {
\OC_App::reset();
\OC_Helper::reset();
Filesystem::reset();
/** @psalm-suppress InternalMethod */
\OCP\Util::resetStaticProperties();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Route/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ protected function includeLegacyFileRoute(array $parameters): void {
unset($param['_route']);
$_GET = array_merge($_GET, $param);
unset($param);
require_once $parameters['file'];
require $parameters['file'];
}

/**
Expand Down
12 changes: 12 additions & 0 deletions lib/public/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ class Util {
/** @psalm-suppress ImpureStaticProperty */
private static ?bool $needUpgradeCache = null;

/**
* Reset static vars
* @since 36.0.0
* @internal Only for internal use, may be removed at any point
*/
public static function resetStaticProperties(): void {
self::$scriptsInit = [];
self::$scripts = [];
self::$scriptDeps = [];
self::$needUpgradeCache = null;
}

/**
* get the current installed version of Nextcloud
* @return array
Expand Down
Loading