summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2014-04-18 15:32:47 (GMT)
committerwebchick2014-04-18 15:32:47 (GMT)
commit268175050184464b80d31bea8e04a228ce39b4e4 (patch)
treea57c046c20d399ff4299f6d18910e3722c543aef
parentc9711dc849c172b70b3722148f95052f929309a0 (diff)
Issue #2208609 by sun, Jalandhar, damiankloip: Move Json utility class into Drupal\Component\Serialization.
-rw-r--r--core/includes/common.inc6
-rw-r--r--core/lib/Drupal/Component/Serialization/Json.php (renamed from core/lib/Drupal/Component/Utility/Json.php)4
-rw-r--r--core/lib/Drupal/Core/Asset/JsCollectionRenderer.php2
-rw-r--r--core/lib/Drupal/Core/Utility/LinkGenerator.php2
-rw-r--r--core/modules/block/lib/Drupal/block/BlockListBuilder.php2
-rw-r--r--core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php2
-rw-r--r--core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php2
-rw-r--r--core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php2
-rw-r--r--core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationContextualLinksTest.php2
-rw-r--r--core/modules/contextual/contextual.module2
-rw-r--r--core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php2
-rw-r--r--core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php2
-rw-r--r--core/modules/editor/lib/Drupal/editor/Tests/EditorSecurityTest.php2
-rw-r--r--core/modules/editor/lib/Drupal/editor/Tests/QuickEditIntegrationLoadingTest.php2
-rw-r--r--core/modules/editor/lib/Drupal/editor/Tests/QuickEditIntegrationTest.php2
-rw-r--r--core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutocompleteTest.php2
-rw-r--r--core/modules/history/lib/Drupal/history/Tests/HistoryTest.php2
-rw-r--r--core/modules/locale/locale.module2
-rw-r--r--core/modules/menu_ui/lib/Drupal/menu_ui/Tests/MenuTest.php2
-rw-r--r--core/modules/node/lib/Drupal/node/Tests/Views/NodeContextualLinksTest.php2
-rw-r--r--core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditAutocompleteTermTest.php2
-rw-r--r--core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditLoadingTest.php2
-rw-r--r--core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php2
-rw-r--r--core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php2
-rw-r--r--core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php2
-rw-r--r--core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php2
-rw-r--r--core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Controller/SystemController.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/Form/EmailTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/Form/LanguageSelectElementTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php2
-rw-r--r--core/modules/system/lib/Drupal/system/Tests/Form/UrlTest.php2
-rw-r--r--core/modules/system/tests/Drupal/system/Tests/Controller/SystemControllerTest.php2
-rw-r--r--core/modules/system/tests/modules/form_test/form_test.module2
-rw-r--r--core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php2
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/ViewAjaxTest.php3
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php2
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php2
-rw-r--r--core/tests/Drupal/Tests/Component/Serialization/JsonTest.php (renamed from core/tests/Drupal/Tests/Component/Utility/JsonTest.php)8
42 files changed, 49 insertions, 48 deletions
diff --git a/core/includes/common.inc b/core/includes/common.inc
index b7f84cb..d7cf3f0 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -8,8 +8,8 @@
* a cached page are instead located in bootstrap.inc.
*/
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\Json;
use Drupal\Component\Utility\Number;
use Drupal\Component\Utility\Settings;
use Drupal\Component\Utility\SortArray;
@@ -2824,7 +2824,7 @@ function drupal_clear_js_cache() {
* @ingroup php_wrappers
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- * Use \Drupal\Component\Utility\Json::encode().
+ * Use \Drupal\Component\Serialization\Json::encode().
*/
function drupal_json_encode($var) {
return Json::encode($var);
@@ -2838,7 +2838,7 @@ function drupal_json_encode($var) {
* @ingroup php_wrappers
*
* @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- * Use \Drupal\Component\Utility\Json::decode().
+ * Use \Drupal\Component\Serialization\Json::decode().
*/
function drupal_json_decode($var) {
return Json::decode($var);
diff --git a/core/lib/Drupal/Component/Utility/Json.php b/core/lib/Drupal/Component/Serialization/Json.php
index 8602d9b..91081d7 100644
--- a/core/lib/Drupal/Component/Utility/Json.php
+++ b/core/lib/Drupal/Component/Serialization/Json.php
@@ -2,10 +2,10 @@
/**
* @file
- * Contains \Drupal\Component\Utility\Json.
+ * Contains \Drupal\Component\Serialization\Json.
*/
-namespace Drupal\Component\Utility;
+namespace Drupal\Component\Serialization;
/**
* Provides helpers for dealing with json.
diff --git a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
index 8764789..807179f 100644
--- a/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
+++ b/core/lib/Drupal/Core/Asset/JsCollectionRenderer.php
@@ -6,8 +6,8 @@
namespace Drupal\Core\Asset;
+use Drupal\Component\Serialization\Json;
use Drupal\Core\State\StateInterface;
-use Drupal\Component\Utility\Json;
/**
* Renders JavaScript assets.
diff --git a/core/lib/Drupal/Core/Utility/LinkGenerator.php b/core/lib/Drupal/Core/Utility/LinkGenerator.php
index f8a2f90..c29b332 100644
--- a/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -7,7 +7,7 @@
namespace Drupal\Core\Utility;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\String;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Path\AliasManagerInterface;
diff --git a/core/modules/block/lib/Drupal/block/BlockListBuilder.php b/core/modules/block/lib/Drupal/block/BlockListBuilder.php
index aa40a4e..ddafc22 100644
--- a/core/modules/block/lib/Drupal/block/BlockListBuilder.php
+++ b/core/modules/block/lib/Drupal/block/BlockListBuilder.php
@@ -8,7 +8,7 @@
namespace Drupal\block;
use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\String;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
diff --git a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
index ca906ea..f54db91 100644
--- a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php
@@ -7,7 +7,7 @@
namespace Drupal\block\Tests\Views;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\String;
use Drupal\views\Views;
use Drupal\views\Tests\ViewTestBase;
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php
index 2a3a957..fbe36d2 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php
@@ -7,7 +7,7 @@
namespace Drupal\comment\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Core\Language\Language;
use Drupal\comment\CommentInterface;
diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php
index cb07cd4..551b7f2 100644
--- a/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/lib/Drupal/config_translation/Tests/ConfigTranslationUiTest.php
@@ -7,7 +7,7 @@
namespace Drupal\config_translation\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Config\FileStorage;
use Drupal\Core\Language\Language;
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationContextualLinksTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationContextualLinksTest.php
index 4b71a16..94972f2 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationContextualLinksTest.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationContextualLinksTest.php
@@ -7,7 +7,7 @@
namespace Drupal\content_translation\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\node\Entity\NodeType;
use Drupal\simpletest\WebTestBase;
diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module
index 30017b0..80e6b3f 100644
--- a/core/modules/contextual/contextual.module
+++ b/core/modules/contextual/contextual.module
@@ -5,7 +5,7 @@
* Adds contextual links to perform actions related to elements on a page.
*/
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Core\Template\Attribute;
diff --git a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
index f2d45a2..aff000c 100644
--- a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
+++ b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
@@ -7,10 +7,10 @@
namespace Drupal\contextual\Plugin\views\field;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\UrlHelper;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\ResultRow;
-use Drupal\Component\Utility\Json;
/**
* Provides a handler that adds contextual links.
diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php
index 4e1e6d0..fd9368a 100644
--- a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php
+++ b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php
@@ -7,7 +7,7 @@
namespace Drupal\contextual\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\simpletest\WebTestBase;
use Drupal\Core\Template\Attribute;
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorSecurityTest.php b/core/modules/editor/lib/Drupal/editor/Tests/EditorSecurityTest.php
index 39670cc..ccac981 100644
--- a/core/modules/editor/lib/Drupal/editor/Tests/EditorSecurityTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/EditorSecurityTest.php
@@ -7,7 +7,7 @@
namespace Drupal\editor\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\simpletest\WebTestBase;
use Drupal\Component\Utility\String;
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/QuickEditIntegrationLoadingTest.php b/core/modules/editor/lib/Drupal/editor/Tests/QuickEditIntegrationLoadingTest.php
index 6a45b9d..74ef6fe 100644
--- a/core/modules/editor/lib/Drupal/editor/Tests/QuickEditIntegrationLoadingTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/QuickEditIntegrationLoadingTest.php
@@ -7,7 +7,7 @@
namespace Drupal\editor\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\simpletest\WebTestBase;
/**
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/QuickEditIntegrationTest.php b/core/modules/editor/lib/Drupal/editor/Tests/QuickEditIntegrationTest.php
index e236714..881ee8e 100644
--- a/core/modules/editor/lib/Drupal/editor/Tests/QuickEditIntegrationTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/QuickEditIntegrationTest.php
@@ -7,7 +7,7 @@
namespace Drupal\editor\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Core\Language\Language;
use Drupal\quickedit\EditorSelector;
use Drupal\quickedit\MetadataGenerator;
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutocompleteTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutocompleteTest.php
index 7c7ba59..ff59b8b 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutocompleteTest.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAutocompleteTest.php
@@ -7,7 +7,7 @@
namespace Drupal\entity_reference\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Tags;
use Drupal\entity_reference\EntityReferenceController;
diff --git a/core/modules/history/lib/Drupal/history/Tests/HistoryTest.php b/core/modules/history/lib/Drupal/history/Tests/HistoryTest.php
index 88d3866..13b36ff 100644
--- a/core/modules/history/lib/Drupal/history/Tests/HistoryTest.php
+++ b/core/modules/history/lib/Drupal/history/Tests/HistoryTest.php
@@ -7,7 +7,7 @@
namespace Drupal\history\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\simpletest\WebTestBase;
/**
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index f9e17eb..afb4047 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -10,7 +10,7 @@
* object files are supported.
*/
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\UrlHelper;
use Drupal\Component\Utility\Xss;
use Drupal\Core\Cache\Cache;
diff --git a/core/modules/menu_ui/lib/Drupal/menu_ui/Tests/MenuTest.php b/core/modules/menu_ui/lib/Drupal/menu_ui/Tests/MenuTest.php
index 4ed747e1..fba3691 100644
--- a/core/modules/menu_ui/lib/Drupal/menu_ui/Tests/MenuTest.php
+++ b/core/modules/menu_ui/lib/Drupal/menu_ui/Tests/MenuTest.php
@@ -7,7 +7,7 @@
namespace Drupal\menu_ui\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
/**
* Defines a test class for testing menu and menu link functionality.
diff --git a/core/modules/node/lib/Drupal/node/Tests/Views/NodeContextualLinksTest.php b/core/modules/node/lib/Drupal/node/Tests/Views/NodeContextualLinksTest.php
index ff390e6..e8f6791 100644
--- a/core/modules/node/lib/Drupal/node/Tests/Views/NodeContextualLinksTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/Views/NodeContextualLinksTest.php
@@ -7,7 +7,7 @@
namespace Drupal\node\Tests\Views;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Symfony\Component\HttpFoundation\Request;
/**
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditAutocompleteTermTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditAutocompleteTermTest.php
index d679106..15d8ca9 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditAutocompleteTermTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditAutocompleteTermTest.php
@@ -7,7 +7,7 @@
namespace Drupal\quickedit\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Language\Language;
use Drupal\simpletest\WebTestBase;
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditLoadingTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditLoadingTest.php
index d54efb4..d41738d 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditLoadingTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/QuickEditLoadingTest.php
@@ -7,7 +7,7 @@
namespace Drupal\quickedit\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\simpletest\WebTestBase;
use Drupal\quickedit\Ajax\MetadataCommand;
use Drupal\Core\Ajax\AppendCommand;
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php b/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
index e33aebc..3ac369a 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
@@ -7,7 +7,7 @@
namespace Drupal\rest\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
/**
* Tests resource creation on user, node and test entities.
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php b/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php
index 53e5ed7..b4f1779 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php
@@ -7,7 +7,7 @@
namespace Drupal\rest\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\rest\Tests\RESTTestBase;
/**
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php b/core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php
index 44c5e15..15206f7 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/ReadTest.php
@@ -7,7 +7,7 @@
namespace Drupal\rest\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Core\Language\Language;
use Drupal\rest\Tests\RESTTestBase;
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php b/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
index adff21d..15ef7f3 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
@@ -7,7 +7,7 @@
namespace Drupal\rest\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\rest\Tests\RESTTestBase;
/**
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 23dcaec..50ba5c3 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -7,8 +7,8 @@
namespace Drupal\simpletest;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\Json;
use Drupal\Component\Utility\NestedArray;
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Xss;
diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemController.php b/core/modules/system/lib/Drupal/system/Controller/SystemController.php
index 308701c..eda620d 100644
--- a/core/modules/system/lib/Drupal/system/Controller/SystemController.php
+++ b/core/modules/system/lib/Drupal/system/Controller/SystemController.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Controller;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\Core\Extension\ThemeHandlerInterface;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
index 937b83c..f6f3da8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Common;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\simpletest\DrupalUnitTestBase;
use Drupal\Component\Utility\Crypt;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
index 28528e1..349a14e 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/RenderTest.php
@@ -7,8 +7,8 @@
namespace Drupal\system\Tests\Common;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Json;
use Drupal\Core\Render\Element;
use Drupal\simpletest\DrupalUnitTestBase;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/EmailTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/EmailTest.php
index dd80f29..633d4d6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/EmailTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/EmailTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Form;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\simpletest\WebTestBase;
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
index b006591..634b004 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Form;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\String;
use Drupal\Core\Render\Element;
use Drupal\simpletest\WebTestBase;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/LanguageSelectElementTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/LanguageSelectElementTest.php
index 021419a..f501ad1 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/LanguageSelectElementTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/LanguageSelectElementTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Form;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\simpletest\WebTestBase;
use Drupal\Core\Language\Language;
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php
index e6f844f..da5cdeb 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/StateValuesCleanTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Form;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\simpletest\WebTestBase;
/**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/UrlTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/UrlTest.php
index a068adc..81d76d1 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/UrlTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/UrlTest.php
@@ -7,7 +7,7 @@
namespace Drupal\system\Tests\Form;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\simpletest\WebTestBase;
/**
diff --git a/core/modules/system/tests/Drupal/system/Tests/Controller/SystemControllerTest.php b/core/modules/system/tests/Drupal/system/Tests/Controller/SystemControllerTest.php
index fb5dc88..a1cdfaf 100644
--- a/core/modules/system/tests/Drupal/system/Tests/Controller/SystemControllerTest.php
+++ b/core/modules/system/tests/Drupal/system/Tests/Controller/SystemControllerTest.php
@@ -7,8 +7,8 @@
namespace Drupal\system\Tests\Controller;
+use Drupal\Component\Serialization\Json;
use Symfony\Component\HttpFoundation\Request;
-use Drupal\Component\Utility\Json;
use Drupal\Core\Template\Attribute;
use Drupal\system\Controller\SystemController;
use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module
index 2c750ab..42ef667 100644
--- a/core/modules/system/tests/modules/form_test/form_test.module
+++ b/core/modules/system/tests/modules/form_test/form_test.module
@@ -5,7 +5,7 @@
* Helper module for the form API tests.
*/
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Core\Database\Database;
use Drupal\Core\Language\Language;
use Drupal\form_test\Callbacks;
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php
index d07ab4a..966d45a 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php
@@ -7,7 +7,7 @@
namespace Drupal\taxonomy\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\Tags;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Component\Utility\String;
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewAjaxTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewAjaxTest.php
index d8728d1..2217fac 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewAjaxTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewAjaxTest.php
@@ -6,7 +6,8 @@
*/
namespace Drupal\views\Tests;
-use Drupal\Component\Utility\Json;
+
+use Drupal\Component\Serialization\Json;
/**
* Tests the ajax view functionality.
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
index b3edc9a..a9db9f8 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views_ui\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Component\Utility\String;
use Drupal\views\Views;
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php
index d8b6a65..01feff6 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/PreviewTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views_ui\Tests;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
/**
* Tests the preview form in the UI.
diff --git a/core/tests/Drupal/Tests/Component/Utility/JsonTest.php b/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php
index c1a8343..015a14a 100644
--- a/core/tests/Drupal/Tests/Component/Utility/JsonTest.php
+++ b/core/tests/Drupal/Tests/Component/Serialization/JsonTest.php
@@ -2,18 +2,18 @@
/**
* @file
- * Contains \Drupal\Tests\Component\Utility\JsonTest.
+ * Contains \Drupal\Tests\Component\Serialization\JsonTest.
*/
-namespace Drupal\Tests\Component\Utility;
+namespace Drupal\Tests\Component\Serialization;
-use Drupal\Component\Utility\Json;
+use Drupal\Component\Serialization\Json;
use Drupal\Tests\UnitTestCase;
/**
* Tests the Json::encode() and Json::decode() functions.
*
- * @see \Drupal\Component\Utility\Json
+ * @see \Drupal\Component\Serialization\Json
*/
class JsonTest extends UnitTestCase {