Issue #3495465: Drupal 11 + code standards update

src/Controller/ScannerController.php

@@ -3,43 +3,27 @@
 namespace Drupal\scanner\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Datetime\DateFormatter;
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Link;
 use Drupal\Core\Url;
+use Drupal\Core\Link;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Datetime\DateFormatter;
+use Drupal\Core\Database\Connection;
 
 /**
  * Controller for Search and Replace module.
  */
 class ScannerController extends ControllerBase {
 
-  /**
-   * Drupal\Core\Datetime\DateFormatter.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatter
-   */
-  protected $dateFormatter;
-
-  /**
-   * Drupal\Core\Database\Connection.
-   *
-   * @var Drupal\Core\Database\Connection
-   */
-  protected $database;
-
   /**
    * Class constructor.
    */
-  public function __construct(DateFormatter $dateFormatter, Connection $database) {
-    $this->dateFormatter = $dateFormatter;
-    $this->database = $database;
+  public function __construct(protected DateFormatter $dateFormatter, protected Connection $database) {
   }
 
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container) {
+  public static function create(ContainerInterface $container): static {
     // Instantiates this form class.
     return new static(
       // Load the service required to construct this class.
@@ -54,7 +38,7 @@ class ScannerController extends ControllerBase {
    * @return array
    *   A render array (table).
    */
-  public function undoListing() {
+  public function undoListing(): array {
     $query = $this->database->query('SELECT * from {scanner} WHERE undone = 0');
     $results = $query->fetchAll();
     $header = [
@@ -78,14 +62,12 @@ class ScannerController extends ControllerBase {
       ];
     }
 
-    $table = [
+    return [
       '#type' => 'table',
       '#header' => $header,
       '#rows' => $rows,
       '#attributes' => NULL,
     ];
-
-    return $table;
   }
 
 }