Issue-139: Use JsonEncoded everywhere possible.

modules/oe_webtools_europa_search/src/Plugin/Block/EuropaSearchBlock.php

@@ -4,11 +4,11 @@
 
 namespace Drupal\oe_webtools_europa_search\Plugin\Block;
 
-use Drupal\Component\Serialization\Json;
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\oe_webtools\Component\Render\JsonEncoded;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -76,7 +76,7 @@ public function build() {
       '#attached' => ['library' => ['oe_webtools/drupal.webtools-smartloader']],
       '#type' => 'html_tag',
       '#tag' => 'script',
-      '#value' => Json::encode($search_widget_json),
+      '#value' => new JsonEncoded($search_widget_json),
       '#attributes' => ['type' => 'application/json'],
     ];
 

modules/oe_webtools_laco_widget/oe_webtools_laco_widget.module

@@ -8,6 +8,7 @@
 declare(strict_types=1);
 
 use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\oe_webtools\Component\Render\JsonEncoded;
 
 /**
  * Implements hook_page_bottom().
@@ -51,7 +52,7 @@ function oe_webtools_laco_widget_page_bottom(array &$page_bottom) {
   $page_bottom['oe_webtools_cookie_consent'][] = [
     '#type' => 'html_tag',
     '#tag' => 'script',
-    '#value' => json_encode($json),
+    '#value' => new JsonEncoded($json),
     '#attributes' => ['type' => 'application/json'],
   ];
 

modules/oe_webtools_maps/src/Plugin/Field/FieldFormatter/WebtoolsMapFormatter.php

@@ -7,7 +7,7 @@
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FormatterBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\oe_webtools_maps\Component\Render\JsonEncoded;
+use Drupal\oe_webtools\Component\Render\JsonEncoded;
 
 /**
  * Displays a Geofield as a map using the Webtools Maps service.

modules/oe_webtools_social_share/src/Plugin/Block/SocialShareBlock.php

@@ -4,11 +4,10 @@
 
 namespace Drupal\oe_webtools_social_share\Plugin\Block;
 
-use Drupal\Component\Serialization\Json;
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Render\Markup;
+use Drupal\oe_webtools\Component\Render\JsonEncoded;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -88,7 +87,7 @@ public function build() {
     return [
       '#theme' => 'oe_webtools_social_share',
       '#title' => $this->t('Share this page'),
-      '#icons_json' => Markup::create(Json::encode($social_share_json)),
+      '#icons_json' => new JsonEncoded($social_share_json),
       '#attached' => ['library' => ['oe_webtools/drupal.webtools-smartloader']],
     ];
   }

modules/oe_webtools_maps/src/Component/Render/JsonEncoded.php → src/Component/Render/JsonEncoded.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Drupal\oe_webtools_maps\Component\Render;
+namespace Drupal\oe_webtools\Component\Render;
 
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\Component\Serialization\Json;

src/Plugin/Field/FieldFormatter/WebtoolsSnippetFormatter.php

@@ -7,7 +7,7 @@
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FormatterBase;
-use Drupal\Core\Render\Markup;
+use Drupal\oe_webtools\Component\Render\JsonEncoded;
 
 /**
  * Plugin implementation of the 'webtools_snippet' formatter.
@@ -35,7 +35,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
         // We need to properly escape the json content before outputting in the
         // page. We cannot use twig escaping mechanism as it will use html
         // entities. Json::encode takes care of it.
-        '#value' => Markup::create(Json::encode(Json::decode($item->get('value')->getValue()))),
+        '#value' => new JsonEncoded(Json::decode($item->get('value')->getValue())),
         '#attributes' => ['type' => 'application/json'],
       ];
     }