Fix code style in event subscriber template

Author: Chi-teck

templates/d8/service/event-subscriber.services.twig

@@ -1,6 +1,6 @@
 services:
   {{ machine_name }}.event_subscriber:
     class: Drupal\{{ machine_name }}\EventSubscriber\{{ class }}
-    arguments: ['@current_user']
+    arguments: ['@messenger']
     tags:
       - { name: event_subscriber }

templates/d8/service/event-subscriber.twig

@@ -2,7 +2,7 @@
 
 namespace Drupal\{{ machine_name }}\EventSubscriber;
 
-use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -14,20 +14,20 @@ use Symfony\Component\HttpKernel\KernelEvents;
 class {{ class }} implements EventSubscriberInterface {
 
   /**
-   * Current logged in user.
+   * The messenger.
    *
-   * @var \Drupal\Core\Session\AccountProxyInterface
+   * @var \Drupal\Core\Messenger\MessengerInterface
    */
-  protected $currentUser;
+  protected $messenger;
 
   /**
    * Constructs event subscriber.
    *
-   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
-   *   Current logged in user.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    */
-  public function __construct(AccountProxyInterface $current_user) {
-    $this->currentUser = $current_user;
+  public function __construct(MessengerInterface $messenger) {
+    $this->messenger = $messenger;
   }
 
   /**
@@ -37,7 +37,7 @@ class {{ class }} implements EventSubscriberInterface {
    *   Response event.
    */
   public function onKernelRequest(GetResponseEvent $event) {
-    drupal_set_message(__FUNCTION__);
+    $this->messenger->addStatus(__FUNCTION__);
   }
 
   /**
@@ -47,7 +47,7 @@ class {{ class }} implements EventSubscriberInterface {
    *   Response event.
    */
   public function onKernelResponse(FilterResponseEvent $event) {
-    drupal_set_message(__FUNCTION__);
+    $this->messenger->addStatus(__FUNCTION__);
   }
 
   /**

tests/dcg/Generator/Drupal_8/Module/_standard/foo.services.yml

@@ -1,6 +1,6 @@
 services:
   foo.event_subscriber:
     class: Drupal\foo\EventSubscriber\FooSubscriber
-    arguments: ['@current_user']
+    arguments: ['@messenger']
     tags:
       - { name: event_subscriber }

tests/dcg/Generator/Drupal_8/Module/_standard/src/EventSubscriber/FooSubscriber.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\foo\EventSubscriber;
 
-use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -14,20 +14,20 @@
 class FooSubscriber implements EventSubscriberInterface {
 
   /**
-   * Current logged in user.
+   * The messenger.
    *
-   * @var \Drupal\Core\Session\AccountProxyInterface
+   * @var \Drupal\Core\Messenger\MessengerInterface
    */
-  protected $currentUser;
+  protected $messenger;
 
   /**
    * Constructs event subscriber.
    *
-   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
-   *   Current logged in user.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    */
-  public function __construct(AccountProxyInterface $current_user) {
-    $this->currentUser = $current_user;
+  public function __construct(MessengerInterface $messenger) {
+    $this->messenger = $messenger;
   }
 
   /**
@@ -37,7 +37,7 @@ public function __construct(AccountProxyInterface $current_user) {
    *   Response event.
    */
   public function onKernelRequest(GetResponseEvent $event) {
-    drupal_set_message(__FUNCTION__);
+    $this->messenger->addStatus(__FUNCTION__);
   }
 
   /**
@@ -47,7 +47,7 @@ public function onKernelRequest(GetResponseEvent $event) {
    *   Response event.
    */
   public function onKernelResponse(FilterResponseEvent $event) {
-    drupal_set_message(__FUNCTION__);
+    $this->messenger->addStatus(__FUNCTION__);
   }
 
   /**

tests/dcg/Generator/Drupal_8/Service/_event_subscriber.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\foo\EventSubscriber;
 
-use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -14,20 +14,20 @@
 class FooSubscriber implements EventSubscriberInterface {
 
   /**
-   * Current logged in user.
+   * The messenger.
    *
-   * @var \Drupal\Core\Session\AccountProxyInterface
+   * @var \Drupal\Core\Messenger\MessengerInterface
    */
-  protected $currentUser;
+  protected $messenger;
 
   /**
    * Constructs event subscriber.
    *
-   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
-   *   Current logged in user.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
    */
-  public function __construct(AccountProxyInterface $current_user) {
-    $this->currentUser = $current_user;
+  public function __construct(MessengerInterface $messenger) {
+    $this->messenger = $messenger;
   }
 
   /**
@@ -37,7 +37,7 @@ public function __construct(AccountProxyInterface $current_user) {
    *   Response event.
    */
   public function onKernelRequest(GetResponseEvent $event) {
-    drupal_set_message(__FUNCTION__);
+    $this->messenger->addStatus(__FUNCTION__);
   }
 
   /**
@@ -47,7 +47,7 @@ public function onKernelRequest(GetResponseEvent $event) {
    *   Response event.
    */
   public function onKernelResponse(FilterResponseEvent $event) {
-    drupal_set_message(__FUNCTION__);
+    $this->messenger->addStatus(__FUNCTION__);
   }
 
   /**

tests/dcg/Generator/Drupal_8/Service/_event_subscriber.services.yml

@@ -1,6 +1,6 @@
 services:
   foo.event_subscriber:
     class: Drupal\foo\EventSubscriber\FooSubscriber
-    arguments: ['@current_user']
+    arguments: ['@messenger']
     tags:
       - { name: event_subscriber }