diff --git a/sharethis.services.yml b/sharethis.services.yml index bff458e..6d5607b 100644 --- a/sharethis.services.yml +++ b/sharethis.services.yml @@ -3,4 +3,4 @@ services: class: Drupal\sharethis\SharethisManager tags: - {name: sharethis_manager} - arguments: ['@config.factory', '@title_resolver', '@renderer', '@current_route_match', '@request_stack'] + arguments: ['@config.factory', '@title_resolver', '@current_route_match', '@request_stack'] diff --git a/src/SharethisManager.php b/src/SharethisManager.php index 674bdc3..7f27133 100644 --- a/src/SharethisManager.php +++ b/src/SharethisManager.php @@ -3,7 +3,6 @@ namespace Drupal\sharethis; use Drupal\Core\Config\ConfigFactoryInterface; -use Drupal\Core\Render\RendererInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Url; use Drupal\node\Entity\NodeType; @@ -33,13 +32,6 @@ class SharethisManager implements SharethisManagerInterface { protected $titleResolver; /** - * The renderer service. - * - * @var \Drupal\Core\Render\RendererInterface - */ - protected $renderer; - - /** * The currently active route match object. * * @var \Drupal\Core\Routing\RouteMatchInterface @@ -60,13 +52,10 @@ class SharethisManager implements SharethisManagerInterface { * The Configuration Factory. * @param \Drupal\Core\Controller\TitleResolverInterface $title_resolver * The Title Resolver. - * @param \Drupal\Core\Render\RendererInterface $renderer - * The renderer service. */ - public function __construct(ConfigFactoryInterface $config_factory, TitleResolverInterface $title_resolver, RendererInterface $renderer, RouteMatchInterface $route_match, RequestStack $request_stack) { + public function __construct(ConfigFactoryInterface $config_factory, TitleResolverInterface $title_resolver, RouteMatchInterface $route_match, RequestStack $request_stack) { $this->configFactory = $config_factory; $this->titleResolver = $title_resolver; - $this->renderer = $renderer; $this->routeMatch = $route_match; $this->requestStack = $request_stack; } @@ -214,7 +203,7 @@ class SharethisManager implements SharethisManagerInterface { $type = Unicode::substr($data_options['buttons'], 4); $type = $type == '_' ? '' : Html::escape($type); $service_array = explode(',', $data_options['services']); - $st_spans = ''; + $st_spans = []; foreach ($service_array as $service_full) { // Strip the quotes from element in array (They are there for javascript). $service = explode(':', $service_full); @@ -255,7 +244,7 @@ class SharethisManager implements SharethisManagerInterface { if (!empty($type)) { $attributes['displayText'] = Html::escape($display); } - $meta_generator = array( + $span_element = array( '#type' => 'html_tag', '#tag' => 'span', '#attributes' => $attributes, @@ -263,7 +252,7 @@ class SharethisManager implements SharethisManagerInterface { '#value' => '', ); // Render the span tag. - $st_spans .= $this->renderer->render($meta_generator); + $st_spans[] = $span_element; } return [ diff --git a/templates/sharethis-block.html.twig b/templates/sharethis-block.html.twig index c96d160..02302fe 100644 --- a/templates/sharethis-block.html.twig +++ b/templates/sharethis-block.html.twig @@ -1 +1,5 @@ -
{{ content.st_spans|raw }}
+
+ {% for span in content.st_spans %} + {{ span }} + {% endfor %} +