Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / modules / contrib / security_review / src / Controller / HelpController.php

diff --git a/web/modules/contrib/security_review/src/Controller/HelpController.php b/web/modules/contrib/security_review/src/Controller/HelpController.php
index 89f10439702df9966c2b99213bac0c4475d9849f..048be73fbbd6544c00ea5e279797089f07f03a56 100644 (file)
--- a/web/modules/contrib/security_review/src/Controller/HelpController.php
+++ b/web/modules/contrib/security_review/src/Controller/HelpController.php
@@ -1,14 +1,10 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\security_review\Controller\HelpController.
- */
-
 namespace Drupal\security_review\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Url;
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Drupal\Core\Link;
 use Drupal\security_review\Checklist;
 use Drupal\security_review\CheckResult;
 use Drupal\security_review\SecurityReview;
@@ -34,6 +30,13 @@ class HelpController extends ControllerBase {
    */
   protected $securityReview;
 
+  /**
+   * The date.formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  private $dateFormatter;
+
   /**
    * Constructs a HelpController.
    *
@@ -41,11 +44,14 @@ class HelpController extends ControllerBase {
    *   The security_review service.
    * @param \Drupal\security_review\Checklist $checklist
    *   The security_review.checklist service.
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $dateFormatter
+   *   The date.formatter service.
    */
-  public function __construct(SecurityReview $security_review, Checklist $checklist) {
+  public function __construct(SecurityReview $security_review, Checklist $checklist, DateFormatterInterface $dateFormatter) {
     // Store the dependencies.
     $this->checklist = $checklist;
     $this->securityReview = $security_review;
+    $this->dateFormatter = $dateFormatter;
   }
 
   /**
@@ -54,7 +60,8 @@ class HelpController extends ControllerBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('security_review'),
-      $container->get('security_review.checklist')
+      $container->get('security_review.checklist'),
+      $container->get('date.formatter')
     );
   }
 
@@ -106,12 +113,13 @@ class HelpController extends ControllerBase {
       }
 
       // Add the link pointing to the check-specific help.
-      $check_namespace['check_links'][] = $this->l(
+      $check_namespace['check_links'][] = Link::createFromRoute(
         $this->t('@title', ['@title' => $check->getTitle()]),
-        Url::fromRoute('security_review.help', [
+        'security_review.help',
+        [
           'namespace' => $check->getMachineNamespace(),
           'title' => $check->getMachineTitle(),
-        ])
+        ]
       );
     }
 
@@ -154,10 +162,7 @@ class HelpController extends ControllerBase {
     if ($check->isSkipped()) {
 
       if ($check->skippedBy() != NULL) {
-        $user = $this->l(
-          $check->skippedBy()->getUsername(),
-          $check->skippedBy()->urlInfo()
-        );
+        $user = $check->skippedBy()->link();
       }
       else {
         $user = 'Anonymous';
@@ -166,7 +171,7 @@ class HelpController extends ControllerBase {
       $skip_message = $this->t(
         'Check marked for skipping on @date by @user',
         [
-          '@date' => format_date($check->skippedOn()),
+          '@date' => $this->dateFormatter->format($check->skippedOn()),
           '@user' => $user,
         ]
       );