Issue #2208609 by sun, Jalandhar, damiankloip: Move Json utility class into Drupal\Component\Serialization.

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);

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.

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.

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;

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;

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;

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;
 

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;

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;
 

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;
 

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.

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;
 

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;
 

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;
 
 /**

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;

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;

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;
 
 /**

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;

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.

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;
 
 /**

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;

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;

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.

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;
 
 /**

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;
 

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;
 
 /**

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;

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;

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;
 

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;
 

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;
 
 /**

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;

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;
 

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;
 
 /**

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;
 
 /**

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;

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;

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;

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.

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;

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.

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 {