diff --git a/core/modules/system/src/Tests/Session/SessionHttpsTest.php b/core/modules/system/src/Tests/Session/SessionHttpsTest.php index 0fc0305..846ee49 100644 --- a/core/modules/system/src/Tests/Session/SessionHttpsTest.php +++ b/core/modules/system/src/Tests/Session/SessionHttpsTest.php @@ -46,12 +46,12 @@ protected function setUp() { $request = Request::createFromGlobals(); if ($request->isSecure()) { - $this->secureSessionName = session_name(); - $this->insecureSessionName = substr(session_name(), 1); + $this->secureSessionName = $this->getSessionName(); + $this->insecureSessionName = substr($this->getSessionName(), 1); } else { - $this->secureSessionName = 'S' . session_name(); - $this->insecureSessionName = session_name(); + $this->secureSessionName = 'S' . $this->getSessionName(); + $this->insecureSessionName = $this->getSessionName(); } } @@ -318,7 +318,7 @@ protected function loginHttps(AccountInterface $account) { /** * Extract internal path from the location header on the response. */ - protected function getPathFromLocationHeader($https = FALSE, $response_code = 302) { + protected function getPathFromLocationHeader($https = FALSE, $response_code = 303) { // Generate the base_url. $base_url = $this->container->get('url_generator')->generateFromPath('', array('absolute' => TRUE)); if ($https) {