Make $vars and $secureRandom required.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

diff --git a/lib/base.php b/lib/base.php
index 115a0968af2ccd7e84df5790c1577110e62eef71..3e89cbe6c54fc9aa0c94b3b8cc17f2905abb2d68 100644 (file)
--- 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 3705ab2e92d62ac718f1a8f9acd0f33ecebf9ff1..a873ee967723a73e0ec5ad983d15b6a76a126ef2 100644 (file)
--- 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') {