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

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

diff --git a/web/modules/contrib/security_review/src/Controller/ChecklistController.php b/web/modules/contrib/security_review/src/Controller/ChecklistController.php
index 38835223d7e353c40655f5ae4204219ed2b31a23..1ce78b6c2db1e2bcf6d5fe83460aa7866f5c1e7f 100644 (file)
--- a/web/modules/contrib/security_review/src/Controller/ChecklistController.php
+++ b/web/modules/contrib/security_review/src/Controller/ChecklistController.php
@@ -1,17 +1,12 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\security_review\Controller\ChecklistController.
- */
-
 namespace Drupal\security_review\Controller;
 
 use Drupal\Core\Access\CsrfTokenGenerator;
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\security_review\Checklist;
-use Drupal\security_review\CheckResult;
 use Drupal\security_review\SecurityReview;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -137,25 +132,21 @@ class ChecklistController extends ControllerBase {
       }
 
       // Determine help link.
-      $check_info['help_link'] = $this->l(
+      $check_info['help_link'] = Link::createFromRoute(
         'Details',
-        Url::fromRoute(
-          'security_review.help',
-          [
-            'namespace' => $check->getMachineNamespace(),
-            'title' => $check->getMachineTitle(),
-          ]
-        )
+        'security_review.help',
+        [
+          'namespace' => $check->getMachineNamespace(),
+          'title' => $check->getMachineTitle(),
+        ]
       );
 
       // Add toggle button.
       $toggle_text = $check->isSkipped() ? 'Enable' : 'Skip';
-      $check_info['toggle_link'] = $this->l($toggle_text,
-        Url::fromRoute(
-          'security_review.toggle',
-          ['check_id' => $check->id()],
-          ['query' => ['token' => $this->csrfToken->get($check->id())]]
-        )
+      $check_info['toggle_link'] = Link::createFromRoute($toggle_text,
+        'security_review.toggle',
+        ['check_id' => $check->id()],
+        ['query' => ['token' => $this->csrfToken->get($check->id())]]
       );
 
       // Add to array of completed checks.