From a66922a49e941ece2204cf2f32b6e8f59d1acd92 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 8 Jul 2014 11:32:21 +0100
Subject: [PATCH] Issue #2297535 by marcingy: Remove drupal_get_private_key.
---
core/includes/common.inc | 15 ---------------
core/modules/simpletest/src/WebTestBase.php | 2 +-
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 7f774cff22df..f8f669772cd3 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -2524,21 +2524,6 @@ function drupal_json_decode($var) {
return Json::decode($var);
}
-/**
- * Ensures the private key variable used to generate tokens is set.
- *
- * @return string
- * The private key.
- *
- * @see \Drupal\Core\Access\CsrfTokenGenerator
- *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- * Use \Drupal::service('private_key')->get().
- */
-function drupal_get_private_key() {
- return \Drupal::service('private_key')->get();
-}
-
/**
* Generates a token based on $value, the user session, and the private key.
*
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index f0c52571b1aa..351c84be3259 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -759,7 +759,7 @@ protected function drupalUserIsLoggedIn($account) {
* Generate a token for the currently logged in user.
*/
protected function drupalGetToken($value = '') {
- $private_key = drupal_get_private_key();
+ $private_key = \Drupal::service('private_key')->get();
return Crypt::hmacBase64($value, $this->session_id . $private_key);
}
--
GitLab