From 477c52fad85126a7859429be210ca717fd06139c Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Wed, 28 Nov 2012 22:27:42 -0800
Subject: [PATCH] Issue #1848066 by ACF, Gaelan: Change variable
 xmlrpc_test_xmlrpc_alter() to the state system.

---
 .../xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php   | 6 +++---
 .../xmlrpc/tests/modules/xmlrpc_test/xmlrpc_test.module     | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php
index 014c60bcf96..d4ba19a7645 100644
--- a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php
+++ b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php
@@ -47,13 +47,13 @@ class XmlRpcMessagesTest extends WebTestBase {
    * Ensure that hook_xmlrpc_alter() can hide even builtin methods.
    */
   protected function testAlterListMethods() {
-    // Ensure xmlrpc_test_xmlrpc_alter() is disabled and retrieve regular list of methods.
-    variable_set('xmlrpc_test_xmlrpc_alter', FALSE);
+    // Ensure xmlrpc_test.alter() is disabled and retrieve regular list of methods.
+    state()->set('xmlrpc_test.alter', FALSE);
     $url = url('xmlrpc.php', array('absolute' => TRUE));
     $methods1 = xmlrpc($url, array('system.listMethods' => array()));
 
     // Enable the alter hook and retrieve the list of methods again.
-    variable_set('xmlrpc_test_xmlrpc_alter', TRUE);
+    state()->set('xmlrpc_test.alter', TRUE);
     $methods2 = xmlrpc($url, array('system.listMethods' => array()));
 
     $diff = array_diff($methods1, $methods2);
diff --git a/core/modules/xmlrpc/tests/modules/xmlrpc_test/xmlrpc_test.module b/core/modules/xmlrpc/tests/modules/xmlrpc_test/xmlrpc_test.module
index db8f113b6b5..11c86c3f6b0 100644
--- a/core/modules/xmlrpc/tests/modules/xmlrpc_test/xmlrpc_test.module
+++ b/core/modules/xmlrpc/tests/modules/xmlrpc_test/xmlrpc_test.module
@@ -68,7 +68,8 @@ function xmlrpc_test_xmlrpc() {
  * Hide (or not) the system.methodSignature() service depending on a variable.
  */
 function xmlrpc_test_xmlrpc_alter(&$services) {
-  if (variable_get('xmlrpc_test_xmlrpc_alter', FALSE)) {
+  $xmlprc_alter = state()->get('xmlrpc_test.alter') ?: FALSE;
+  if ($xmlprc_alter) {
     $remove = NULL;
     foreach ($services as $key => $value) {
       if (!is_array($value)) {