summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDaniel Kesselberg <mail@danielkesselberg.de>2020-12-10 09:37:38 +0100
committerDaniel Kesselberg <mail@danielkesselberg.de>2020-12-10 17:06:32 +0100
commit8ebd31d6868b494789325ca6a5e81418242bcafe (patch)
tree3f4ffb5987c7e43451215cc62e5937846dd87f28 /lib
parent27fdc6575d71a039db75164842263a1ed864ca47 (diff)
downloadnextcloud-server-8ebd31d6868b494789325ca6a5e81418242bcafe.tar.gz
nextcloud-server-8ebd31d6868b494789325ca6a5e81418242bcafe.zip
Make $vars and $secureRandom required.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php2
-rw-r--r--lib/private/AppFramework/Http/Request.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php
index 115a0968af2..3e89cbe6c54 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -159,7 +159,7 @@ class OC {
'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'],
],
];
- $fakeRequest = new \OC\AppFramework\Http\Request($params, null, new \OC\AllConfig(new \OC\SystemConfig(self::$config)));
+ $fakeRequest = new \OC\AppFramework\Http\Request($params, new \OC\Security\SecureRandom(), new \OC\AllConfig(new \OC\SystemConfig(self::$config)));
$scriptName = $fakeRequest->getScriptName();
if (substr($scriptName, -1) == '/') {
$scriptName .= 'index.php';
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index 3705ab2e92d..a873ee96772 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -136,8 +136,8 @@ class Request implements \ArrayAccess, \Countable, IRequest {
* @param string $stream
* @see http://www.php.net/manual/en/reserved.variables.php
*/
- public function __construct(array $vars = [],
- ISecureRandom $secureRandom = null,
+ public function __construct(array $vars,
+ ISecureRandom $secureRandom,
IConfig $config,
CsrfTokenManager $csrfTokenManager = null,
string $stream = 'php://input') {